diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-01-19 14:07:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-01-19 14:07:23 +1100 |
| commit | 7fa8f5d8b04f8ce175a40009a86a0dba001b0311 (patch) | |
| tree | 8e2c42c04aca5eb1911319792adc6eb1c4334ed3 | |
| parent | b388815ec96aaa8811c4b91516072c7bd14f3290 (diff) | |
| download | linux-7fa8f5d8b04f8ce175a40009a86a0dba001b0311.tar.gz linux-7fa8f5d8b04f8ce175a40009a86a0dba001b0311.tar.xz | |
Add linux-next specific files for 20160119next-20160119
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 240 | ||||
| -rw-r--r-- | Next/Trees | 242 | ||||
| -rw-r--r-- | Next/merge.log | 4690 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5177 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..2515e25ac475 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,240 @@ +Name SHA1 +---- ---- +origin d05d82f7110b08fd36178a641b69a1f206e1142b +fixes 25cb62b76430a91cc6195f902e61c2cb84ade622 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current 74bf8efb5fa6e958d2d7c7917b8bb672085ec0c6 +arm-current 34bfbae33ae84107d0c257edd6c6a8689a09be26 +m68k-current eb37bc3f85b69f529d2ad06c41fad8dedd654c76 +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-fixes afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 5807fcaa9bf7dd87241df739161c119cf78a6bc4 +net b064d0d88ae5280c7e878f79d0c9a8e2876a4d14 +ipsec a8a572a6b5f2a79280d6e302cb3c1cb1fbaeb3e8 +ipvs 8e662164abb4a8fde701a46e1431980f9e325742 +wireless-drivers 01d85b9b2b6bec2b0773cf2afc58699dc4b052f8 +mac80211 da629cf111a2b9a182d1b43f03f2cb0d3f258af4 +sound-current c0bcdbdff3ff73a54161fca3cb8b6cdbd0bb8762 +pci-current 5c3b99d057525fe2befe6a7db9b1309035d93eee +driver-core.current afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +tty.current ece6267878aed4eadff766112f1079984315d8c8 +usb.current ece6267878aed4eadff766112f1079984315d8c8 +usb-gadget-fixes 7d32cdef535622c0aea39807989f62cdddea207e +usb-serial-fixes f7d7f59ab124748156ea551edf789994f05da342 +usb-chipidea-fixes 6f51bc340d2a1c71a2409f80f3e60fe2c44e35ae +staging.current f744c423cacf8f9666d0390e5068813afff756e5 +char-misc.current ece6267878aed4eadff766112f1079984315d8c8 +input-current 009f773836513960d3982e80c86e266d25528563 +crypto-current 1822793a523e5d5730b19cc21160ff1717421bc8 +ide e04a2bd6d8c95608cbb2c803ee2875cebfd89f52 +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 275d7d44d802ef271a42dc87ac091a495ba72fc5 +vfio-fixes ae5515d66362b9d96cdcfce504567f0b8b7bd83e +kselftest-fixes 2ce47b44b25d8fb0114ff117813742adbefec8ff +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +asm-generic 79529173266361d8e82a64981c734b76c08c79b8 +arc 4dc0323fd6bd0b87793ef339e8b517610abc2ad0 +arm 4ba1a28869c7e07d2343a9bd132ba6293279e661 +arm-perf 8fcf04067cb57a3cbdbdbe2d22f13c259944cd57 +arm-soc ce504c3d47508fd5590bc9b644e4318a2b5b9aa5 +at91 f2837af0c89d892f45c403ae80272a01e0d8e2b2 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +bcm2835-dt 53b6084357a44d7c34044504e1bf149d9156934f +bcm2835-soc 5234c34e4cd7695647ccc1cabb50c3e7720dd3fb +bcm2835-drivers a09cd356586d33f64cbe64ee4f5c1a7c4a6abee5 +bcm2835-defconfig b63074fccbeb81e46b2553a200de54ff3bfadd10 +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs c6abe665c94f20367e7308e9c871e4d031c1a6f1 +keystone 99d59777c0896a4b34cd4d10fc88a1c538fc0301 +mvebu 64c3c928aef284589541188760513dfbe1356e30 +omap 95c5bf2f05524fb3c3eeb15334fa54e9aa9ceda8 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +qcom e654927c5ff72c6178dee94a1e25856dffc1a221 +renesas 23a0d0a54a30ff2018d47156adba22f7d1d813bc +rockchip 755651cf0f313e40fe1fa1e317a5c07877236913 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 8005c49d9aea74d382f474ce11afbbc7d7130bec +samsung-krzk 94c286811b3b1bcb7dd015abf606845d1504759e +sunxi 97dd53d76893fce31d04a2a426c10f00220e89d5 +tegra 92b100361a4ea04201a147ab4381771ee67443f9 +arm64 2a803c4db615d85126c5c7afd5849a3cfde71422 +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 98b8502d97c05f9730ed35f4ab0f9821a48dfaa4 +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 7e26e9ff0a9301398bd7cf8d896536da3a54aa9a +m68k eb37bc3f85b69f529d2ad06c41fad8dedd654c76 +m68knommu 4693c2493a9b2d0c5d407496ea107676a690f1c0 +metag c8b6ad8b3f873ff5b971523f439f4b5a1ac75842 +microblaze c937adb7ec914b8ac66cdf6c00992537f4432860 +mips 544f742d0c2abaaffccab88fbcad9b85cb463597 +nios2 8e3d7c834ba0f79f200c155cf0647eacd39f2fbe +parisc-hd afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +powerpc be6bfc29bc759670fb3a2519325c4ab2edf259c9 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 44451d4d8f0e35153b3e7e3d40e198f2cf9ac36a +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 c2ab7282f0fcd11eea4d0ba45d1c65d89428c314 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 00d27c6336b00345724b2510f7c5b8cee3055f02 +uml 3e46b25376321db119bc8507ce8c8841c580e736 +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa afaa7c542cc9c4d8a99ba252a8ea5e8bc7c897e2 +btrfs 988f1f576d4f7531cb2175ee1b7cb7afd6d95d22 +ceph 583d0fef756a7615e50f0f68ea0892a497d03971 +cifs 01b9b0b28626db4a47d7f48744d70abca9914ef1 +configfs 1609bac8af31f4a21bf330583c8a447e6f3d6155 +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 bb00c898ad1ce40c4bb422a8207ae562e9aea7ae +ext4 9f053aee1bb8cad5c70e33367727d485ba39e86c +f2fs 7fdec82af6a9e190e53d07a1463d2a9ac49a8750 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 0b5da8db145bfd44266ac964a2636a0cf8d7c286 +gfs2 7508abc4bdac43dc87d2fdd31527063f72da7020 +jfs 26456955719b79cc4a011b18221aa68f599f6b6c +nfs 44aab3e09ef947e546ee61c5082c41b86dd15e53 +nfsd ee2bf98bbe908a4a9572886497a7dec0a3a4c003 +orangefs 5e1f3938f9e4ef539031d639879cb1cea870fab5 +overlayfs 84889d49335627bc770b32787c1ef9ebad1da232 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 4fdd1d51ad5d059548c6539ac9d281f74d24bcbe +xfs dde7f55bd000696acc38296c21241971e1840142 +file-locks b4d629a39e104a8326d5b281ce07c21240c130c9 +vfs 6f3925248b752402e147776aabb7ec87fb0eb4fe +pci 52e456bb39cc66b180be2d19ad8f89d10e2f3dd3 +hid 86243f383145b9a452e3437d0400dbbc274fd3e5 +i2c 4c791642795309fcd465f4a7f87397f512da4f80 +jdelvare-hwmon ef0303d2bba0e6dde90d0755c213937493857b64 +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging 91918d13eb17b8c11a9b6b76bfdd7cc0efab4f50 +v4l-dvb fef24ea1b8c1c0ead7d6396f0a2aa3c523816aee +kbuild 9ab3e1d71e5543c971c3af5e7bcf23e8fc2a461b +kconfig c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a +libata 44858e07ff879048f8f5cf315715ecc23d1a8462 +pm 5d33ad4d679645b4c2124120f265434699309ac3 +idle 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal efa2498bb8423ce1d06d45fbe8782f272350b7af +thermal-soc ce0265dd6f8e83d0bf3e7ee85205e4fb6b394ae5 +ieee1394 100ceb66d5c40cc0c7018e06a9474302470be73c +dlm a6b1533e9a57d76cd3d9b7649d29ac604b1874b8 +swiotlb 9d99c7123c9af5f47a2037933a3ffaec3e37efad +slave-dma 16e209d48fd32da5333d135389dcffae1cfa990f +net-next 7a26019fdecdb45ff784ae4e3b7e0cc9045100ca +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 4c50a8ce2b632ccbee9faa3edc9fc7f257ba5135 +wireless-drivers-next 42e0ed0d454c6ad7be67f2c18828391ecfdc9a62 +bluetooth 8e69d71996e485b5b8c8dcb5ea3a97a4f021d9f2 +mac80211-next 6f6239808cdfab1a750af641668be9c6b1d280e4 +rdma 59caaed7a72a0e3750dfb84636dae6b781559310 +mtd 9146cbd52b11d4ade62dba8f238ec5e421c3fa2b +l2-mtd f9bdbd6c46c8ce0bb95f5b708a4a4a4b6b9a5917 +crypto 48d627648141479c8be8acd110191072e24eba25 +drm 1df59b8497f47495e873c23abd6d3d290c730505 +drm-panel abf08d5efee4f96c9dec3905770d6b34aa190dd1 +drm-intel 48ea1e32c39db94c59b63580b965222c7782112f +drm-tegra ad906599c1919eda6f365ecec8d50198c9232131 +drm-misc c6c5c7fa7f3ec7d35541e9e4c6feb4ccd6cca7c9 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 2abd1c88345e9c10a8f34cf6d3b025bf7267ca85 +hdlcd 40eb4e27aa20a0ff33e8bfa3bab188cf4ab47a21 +drm-vc4 5645e785cea2f33acdc5e5cee62b3ce8a00f1169 +sound c0bcdbdff3ff73a54161fca3cb8b6cdbd0bb8762 +sound-asoc 9676f39059efb1bcde4d4f5c161bc6245564850d +modules b3212ec77dd1d267d0f2703ced3cef08108dca9f +input 809d9516da73345cca587743b57e45e9095d851e +block bb1192dd3fadf7f831d9b3ea0eb4c7a15034e225 +device-mapper 385277bfb57faac44e92497104ba542cdd82d5fe +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh d50f42384dbfcf5143de614710e132dc06cd2439 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 1501efadc524a0c99494b576923091589a52d2a4 +mfd 9fb41166076b197318807a5f1829911450b43218 +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 265b60497a57da56a4be7d5c72983ae89dc0765e +omap_dss2 caf05780f6ed5eb7fe168dbabd9a8d7cfb45d89b +regulator bd5e0c40ace214483c487b678874f9925d360309 +security 607259e17b37017e9ec0249a8b0a7d8b76b572aa +integrity 1d6d167c2efcfe9539d9cffb1a1be9c92e39c2c0 +selinux 76319946f321e30872dd72af7de867cb26e7a373 +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog ac36856fe4321454b6789c019c96c3ec854094ed +iommu dabc4de141323884f54cbb579d6b2ba0ed667842 +dwmw2-iommu fda3bec12d0979aae3f02ee645913d66fbc8a26e +vfio d4f50ee2f5b45fc4d9e4142a52edf8b7935a9275 +jc_docs ec3fc58b1e7a32cc9f552b306f8dbb4454e83798 +trivial bcf4299e6215a475259c3ac329d43e776cfe9c0c +audit 09eccd1da92b2cfcd32cc03a98970a1eec830c53 +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh 183223770ae8625df8966ed15811d1b3ee8720aa +mailbox bfbcfa770b1c316396162f9354872dc00cd572fe +spi ece19b812e99ab02ea7c2d490446fe9494be61d6 +tip 5b81f397d2faa7ba591f56e227915b5e93446131 +clockevents 1ddca16cc5b37628edca045c4c0db801eeea7406 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 1cac5503fbf751f121d0c9f96e69d1fdd3eb1471 +irqchip f290917dc209223d20828a6a1f0a651590db45f4 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace b7522056ec1a62a5f3246627e12ef48e6274c21c +rcu 984cf355aeaa8f2eda3861b50d0e8d3e3f77e83b +kvm 171b5682aa8597174e80ec4128c87538103f2213 +kvm-arm c7da6fa43cb1c5e649da0f478a491feb9208cae7 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus b4d7f161feb3015d6306e1d35b565c888ff70c9d +kvms390 c6e5f166373a20a433c38a34bd16f2b62bd0864c +xen-tip a4cdb556cae05cd3e7b602b3a44c01420c4e2258 +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues 6201171e3b2c02992e62448636631a0dfe4e9d20 +drivers-x86 46456416ccdf10ad666d6c2d438100ebcb1487a9 +chrome-platform ebaf31c46cce0dc8a6ed690b5456b295aa7586a6 +regmap 09d3ffbd636f229affd0c1cd504169d993b2e938 +hsi 525e1abc6b5a7d8bd9006de1da6e99722305ea2b +leds 522f17e1214cf112e62cff56150964d8b68b94b2 +ipmi 4193fcd31624f0a830a415c7275a2732584347ef +driver-core afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +tty ece6267878aed4eadff766112f1079984315d8c8 +usb ece6267878aed4eadff766112f1079984315d8c8 +usb-gadget 5072cfc40a80cea3749fd3413b3896630d8c787e +usb-serial 6ff9d2761b8655991f48f113f7edaefea5c92905 +usb-chipidea-next d0c40d9fda12a60a993d1f2f21e92687d7b3da35 +staging ece6267878aed4eadff766112f1079984315d8c8 +char-misc ece6267878aed4eadff766112f1079984315d8c8 +extcon f78bf950aec3279e964b54774f7ae52b1514f97f +cgroup 36ae3fad335f039a1fdddd62ba719939ef3e38f1 +scsi 4d45033f31a028d57a9773054a4f41da8460a075 +target-updates 4c1a6448e1ee6f6c197a56b1145edf634cdc9416 +target-merge bc0195aad0daa2ad5b0d76cce22b167bc3435590 +pinctrl 14da0a91bf4ac2a90d64446ddaa39a4869530f8c +vhost 43e361f23c49dbddf74f56ddf6cdd85c5dbff6da +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio c474e348778bdf5b453a2cdff4b2b1f9e000f343 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 074726402b82f14ca377da0b4a4767674c3d1ff8 +dma-buf 168309855a7d1e16db751e9c647119fe2d2dc878 +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest b953c0d234bc72e8489d3bf51a276c5c4ec85345 +clk 3da834e3e5a4a5d26882955298b55a9ed37a00bc +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 6a81013efc4013555c5de34c01530b805f45c92c +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 1b1fe542b6f010cf6bc7e1c92805e1c0e133e007 +y2038 477b8541b31fd4d32168514203a8da8b73884d90 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger fc7f9754db6ce0c12281da4055281f731d36bdee +livepatching 03f726f415f58c003857a070c1091a9504b7250a +coresight b23d8dc4ecdfc140ac88f31af07bf33ece95c093 +rtc 079062b28fb4c58e30d024fdf974e00de53158fd +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 8b63b6bfc1a551acf154061699028c7032d7890c +akpm-current 57fe72c3518863a6846bf82a27742eefb21a1b5f +akpm 4df70b18c99aab5af368b650864184fb9a9a540b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..088bc117f270 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,242 @@ +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-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +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 +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.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 +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 +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +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 +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 +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#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 +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +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 +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-next +bcm2835-dt git git://github.com/anholt/linux.git#bcm2835-dt-next +bcm2835-soc git git://github.com/anholt/linux.git#bcm2835-soc-next +bcm2835-drivers git git://github.com/anholt/linux.git#bcm2835-drivers-next +bcm2835-defconfig git git://github.com/anholt/linux.git#bcm2835-defconfig-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.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/tegra/linux.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://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-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 +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.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/powerpc/linux.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-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#linux-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.infradead.org/users/hch/configfs.git#for-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/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +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 +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-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://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-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://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +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 +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.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 +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 +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.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 +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +drm-vc4 git git://github.com/anholt/linux.git#drm-vc4-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 +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#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 +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 +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 +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 +jc_docs git git://git.lwn.net/linux.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/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-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 +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/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 +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 +kvm-ppc-paulus git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#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://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +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/j.anaszewski/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#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 +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-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 +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-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 +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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +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..69b0a8985dbe --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4690 @@ +$ date -R +Tue, 19 Jan 2016 09:56:41 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 984065055e6e Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux +Merging origin/master (d05d82f7110b Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) +$ git merge origin/master +Updating 984065055e6e..d05d82f7110b +Fast-forward + .../bindings/display/simple-framebuffer.txt | 13 +- + Documentation/security/keys-trusted-encrypted.txt | 31 +- + MAINTAINERS | 1 + + arch/arm64/kernel/insn.c | 165 +- + arch/arm64/net/bpf_jit_comp.c | 22 +- + arch/avr32/include/uapi/asm/unistd.h | 4 + + arch/avr32/kernel/syscall_table.S | 4 + + arch/avr32/mach-at32ap/at32ap700x.c | 31 +- + arch/tile/Kconfig | 1 + + arch/tile/include/asm/insn.h | 59 + + arch/tile/include/asm/io.h | 16 +- + arch/tile/include/asm/jump_label.h | 58 + + arch/tile/include/asm/page.h | 10 + + arch/tile/include/asm/processor.h | 2 +- + arch/tile/include/asm/thread_info.h | 8 +- + arch/tile/include/asm/topology.h | 3 - + arch/tile/kernel/Makefile | 1 + + arch/tile/kernel/ftrace.c | 13 +- + arch/tile/kernel/intvec_32.S | 51 +- + arch/tile/kernel/intvec_64.S | 56 +- + arch/tile/kernel/jump_label.c | 64 + + arch/tile/kernel/kgdb.c | 2 +- + arch/tile/kernel/kprobes.c | 4 +- + arch/tile/kernel/process.c | 79 +- + arch/tile/kernel/ptrace.c | 15 - + arch/tile/kernel/setup.c | 2 +- + arch/tile/kernel/single_step.c | 3 - + arch/tile/kernel/stack.c | 17 +- + arch/tile/kernel/traps.c | 13 +- + arch/tile/kernel/unaligned.c | 13 +- + arch/tile/mm/fault.c | 3 - + crypto/asymmetric_keys/x509_public_key.c | 2 + + crypto/hash_info.c | 2 + + drivers/char/tpm/tpm-interface.c | 23 +- + drivers/char/tpm/tpm.h | 11 +- + drivers/char/tpm/tpm2-cmd.c | 60 +- + drivers/char/tpm/tpm_crb.c | 14 +- + drivers/char/tpm/tpm_ibmvtpm.c | 22 +- + drivers/char/tpm/tpm_ibmvtpm.h | 1 + + drivers/char/tpm/tpm_tis.c | 256 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 10 +- + drivers/gpu/drm/omapdrm/Makefile | 3 + + .../drm/omapdrm/displays}/Kconfig | 3 +- + .../drm/omapdrm/displays}/Makefile | 0 + .../drm/omapdrm/displays}/connector-analog-tv.c | 0 + .../drm/omapdrm/displays}/connector-dvi.c | 0 + .../drm/omapdrm/displays}/connector-hdmi.c | 0 + .../drm/omapdrm/displays}/encoder-opa362.c | 0 + .../drm/omapdrm/displays}/encoder-tfp410.c | 0 + .../drm/omapdrm/displays}/encoder-tpd12s015.c | 0 + .../drm/omapdrm/displays}/panel-dpi.c | 8 +- + .../drm/omapdrm/displays}/panel-dsi-cm.c | 0 + .../omapdrm/displays}/panel-lgphilips-lb035q02.c | 0 + .../drm/omapdrm/displays}/panel-nec-nl8048hl11.c | 0 + .../omapdrm/displays}/panel-sharp-ls037v7dw01.c | 0 + .../drm/omapdrm/displays}/panel-sony-acx565akm.c | 0 + .../drm/omapdrm/displays}/panel-tpo-td028ttec1.c | 0 + .../drm/omapdrm/displays}/panel-tpo-td043mtea1.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c | 6 +- + .../omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c | 163 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h | 2 + + .../omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c | 2 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c | 4 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c | 6 + + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h | 8 +- + .../omap2 => gpu/drm/omapdrm}/dss/dss_features.c | 11 - + .../omap2 => gpu/drm/omapdrm}/dss/dss_features.h | 5 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c | 2 +- + .../omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c | 2 +- + .../omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h | 0 + .../omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c | 2 +- + .../drm/omapdrm}/dss/omapdss-boot-init.c | 4 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c | 2 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c | 2 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c | 2 +- + .../omap2 => gpu/drm/omapdrm}/dss/video-pll.c | 0 + drivers/gpu/drm/vc4/vc4_validate.c | 2 +- + drivers/ide/ide-scan-pci.c | 3 +- + drivers/ide/ide.c | 16 +- + drivers/ide/it821x.c | 2 +- + drivers/ide/trm290.c | 2 +- + drivers/infiniband/hw/mlx5/cq.c | 2 +- + drivers/media/platform/omap/Kconfig | 2 +- + drivers/mmc/host/atmel-mci.c | 18 +- + drivers/net/ethernet/brocade/bna/bnad.c | 37 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 13 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 3 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 +- + drivers/net/phy/at803x.c | 110 +- + drivers/net/team/team.c | 6 +- + .../broadcom/brcm80211/brcmfmac/firmware.h | 3 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-abx80x.c | 146 +- + drivers/rtc/rtc-cmos.c | 2 +- + drivers/rtc/rtc-da9063.c | 23 +- + drivers/rtc/rtc-ds1305.c | 8 +- + drivers/rtc/rtc-ds1307.c | 17 +- + drivers/rtc/rtc-ds1685.c | 22 +- + drivers/rtc/rtc-ds2404.c | 4 +- + drivers/rtc/rtc-efi.c | 66 +- + drivers/rtc/rtc-gemini.c | 1 - + drivers/rtc/rtc-imxdi.c | 2 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-pcf8523.c | 11 + + drivers/rtc/rtc-proc.c | 8 +- + drivers/rtc/rtc-rv8803.c | 3 +- + drivers/rtc/rtc-rx8010.c | 523 ++ + drivers/rtc/rtc-s5m.c | 138 +- + drivers/rtc/rtc-sunxi.c | 18 +- + drivers/rtc/rtc-sysfs.c | 11 +- + drivers/rtc/rtc-v3020.c | 6 +- + drivers/video/fbdev/Kconfig | 17 +- + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/auo_k190x.c | 11 +- + drivers/video/fbdev/core/Makefile | 2 +- + drivers/video/fbdev/core/fbmem.c | 14 +- + drivers/video/fbdev/geode/display_gx1.c | 2 +- + drivers/video/fbdev/geode/display_gx1.h | 2 +- + drivers/video/fbdev/geode/geodefb.h | 4 +- + drivers/video/fbdev/geode/video_cs5530.c | 2 +- + drivers/video/fbdev/geode/video_cs5530.h | 2 +- + drivers/video/fbdev/i740fb.c | 8 +- + drivers/video/fbdev/omap2/Kconfig | 5 - + drivers/video/fbdev/omap2/Makefile | 6 +- + drivers/video/fbdev/omap2/omapfb/Kconfig | 14 +- + drivers/video/fbdev/omap2/omapfb/Makefile | 3 + + drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 86 + + drivers/video/fbdev/omap2/omapfb/displays/Makefile | 14 + + .../omap2/omapfb/displays/connector-analog-tv.c | 320 ++ + .../fbdev/omap2/omapfb/displays/connector-dvi.c | 398 ++ + .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 348 ++ + .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 278 + + .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 320 ++ + .../omap2/omapfb/displays/encoder-tpd12s015.c | 328 ++ + .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 328 ++ + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 1388 +++++ + .../omapfb/displays/panel-lgphilips-lb035q02.c | 404 ++ + .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 437 ++ + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 415 ++ + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 917 ++++ + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 511 ++ + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 686 +++ + drivers/video/fbdev/omap2/omapfb/dss/Kconfig | 129 + + drivers/video/fbdev/omap2/omapfb/dss/Makefile | 18 + + drivers/video/fbdev/omap2/omapfb/dss/apply.c | 1702 ++++++ + drivers/video/fbdev/omap2/omapfb/dss/core.c | 343 ++ + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 667 +++ + .../video/fbdev/omap2/omapfb/dss/dispc-compat.h | 30 + + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 4234 +++++++++++++++ + drivers/video/fbdev/omap2/omapfb/dss/dispc.h | 918 ++++ + drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c | 325 ++ + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 356 ++ + drivers/video/fbdev/omap2/omapfb/dss/display.c | 338 ++ + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 899 ++++ + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 5607 ++++++++++++++++++++ + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 183 + + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 1329 +++++ + drivers/video/fbdev/omap2/omapfb/dss/dss.h | 468 ++ + .../video/fbdev/omap2/omapfb/dss/dss_features.c | 951 ++++ + .../video/fbdev/omap2/omapfb/dss/dss_features.h | 108 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 370 ++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 839 +++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 904 ++++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h | 273 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 876 +++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 916 ++++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h | 304 ++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c | 148 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 247 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 255 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c | 282 + + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 531 ++ + drivers/video/fbdev/omap2/omapfb/dss/manager.c | 263 + + .../fbdev/omap2/omapfb/dss/omapdss-boot-init.c | 225 + + drivers/video/fbdev/omap2/omapfb/dss/output.c | 267 + + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 456 ++ + drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 202 + + drivers/video/fbdev/omap2/omapfb/dss/pll.c | 389 ++ + drivers/video/fbdev/omap2/omapfb/dss/rfbi.c | 1078 ++++ + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 454 ++ + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 997 ++++ + drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 211 + + drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c | 0 + drivers/video/fbdev/pxafb.c | 210 +- + drivers/video/fbdev/pxafb.h | 2 + + drivers/video/fbdev/riva/fbdev.c | 1 + + drivers/video/fbdev/sh_mobile_hdmi.c | 1489 ------ + drivers/video/fbdev/simplefb.c | 120 +- + drivers/video/fbdev/sm712fb.c | 16 +- + fs/btrfs/Makefile | 5 +- + fs/btrfs/acl.c | 4 +- + fs/btrfs/async-thread.c | 4 +- + fs/btrfs/backref.c | 23 +- + fs/btrfs/btrfs_inode.h | 4 + + fs/btrfs/check-integrity.c | 105 +- + fs/btrfs/ctree.c | 11 +- + fs/btrfs/ctree.h | 178 +- + fs/btrfs/delayed-inode.c | 7 +- + fs/btrfs/delayed-ref.c | 4 +- + fs/btrfs/delayed-ref.h | 8 +- + fs/btrfs/disk-io.c | 49 +- + fs/btrfs/disk-io.h | 5 +- + fs/btrfs/extent-tree.c | 200 +- + fs/btrfs/extent-tree.h | 0 + fs/btrfs/extent_io.c | 310 +- + fs/btrfs/extent_io.h | 136 +- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 8 +- + fs/btrfs/free-space-cache.c | 28 +- + fs/btrfs/free-space-cache.h | 2 +- + fs/btrfs/free-space-tree.c | 1591 ++++++ + fs/btrfs/free-space-tree.h | 72 + + fs/btrfs/inode-map.c | 8 +- + fs/btrfs/inode.c | 312 +- + fs/btrfs/ioctl.c | 74 +- + fs/btrfs/locking.c | 2 - + fs/btrfs/raid56.c | 2 - + fs/btrfs/relocation.c | 12 +- + fs/btrfs/scrub.c | 16 +- + fs/btrfs/send.c | 16 +- + fs/btrfs/send.h | 4 +- + fs/btrfs/super.c | 84 +- + fs/btrfs/tests/btrfs-tests.c | 58 + + fs/btrfs/tests/btrfs-tests.h | 10 + + fs/btrfs/tests/extent-io-tests.c | 149 +- + fs/btrfs/tests/free-space-tests.c | 239 +- + fs/btrfs/tests/free-space-tree-tests.c | 571 ++ + fs/btrfs/tests/inode-tests.c | 2 +- + fs/btrfs/tests/qgroup-tests.c | 20 +- + fs/btrfs/transaction.c | 50 +- + fs/btrfs/transaction.h | 2 + + fs/btrfs/tree-defrag.c | 27 +- + fs/btrfs/volumes.c | 93 +- + fs/btrfs/volumes.h | 3 +- + fs/btrfs/xattr.c | 4 +- + fs/gfs2/glops.c | 2 + + include/crypto/hash_info.h | 3 + + include/keys/system_keyring.h | 24 + + include/keys/trusted-type.h | 5 + + include/linux/atmel-mci.h | 4 +- + include/linux/audit.h | 212 +- + include/linux/capability.h | 22 +- + include/linux/evm.h | 7 + + include/linux/fb.h | 18 + + include/linux/key.h | 1 + + include/linux/lsm_hooks.h | 10 +- + include/linux/mfd/samsung/rtc.h | 2 + + include/linux/mlx5/cq.h | 2 +- + include/linux/mlx5/driver.h | 5 +- + include/linux/platform_data/mmc-atmel-mci.h | 22 - + include/linux/security.h | 13 +- + include/linux/topology.h | 4 - + include/net/tcp_memcontrol.h | 3 + + include/trace/events/btrfs.h | 3 +- + include/uapi/linux/hash_info.h | 1 + + include/video/omapdss.h | 5 +- + include/video/sh_mobile_hdmi.h | 49 - + init/Kconfig | 11 +- + kernel/audit.c | 19 +- + kernel/audit.h | 2 +- + kernel/auditsc.c | 6 +- + mm/huge_memory.c | 2 +- + net/batman-adv/bridge_loop_avoidance.c | 10 +- + net/batman-adv/hard-interface.h | 12 - + net/batman-adv/network-coding.c | 19 +- + net/batman-adv/originator.c | 196 +- + net/batman-adv/originator.h | 1 - + net/batman-adv/translation-table.c | 28 +- + net/openvswitch/actions.c | 19 +- + net/sctp/endpointola.c | 2 +- + net/sctp/input.c | 8 +- + security/integrity/Kconfig | 11 + + security/integrity/digsig.c | 14 +- + security/integrity/digsig_asymmetric.c | 14 + + security/integrity/evm/Kconfig | 17 + + security/integrity/evm/evm.h | 3 + + security/integrity/evm/evm_crypto.c | 54 +- + security/integrity/evm/evm_main.c | 32 +- + security/integrity/evm/evm_secfs.c | 12 +- + security/integrity/iint.c | 1 + + security/integrity/ima/Kconfig | 44 +- + security/integrity/ima/Makefile | 1 + + security/integrity/ima/ima.h | 24 +- + security/integrity/ima/ima_fs.c | 53 +- + security/integrity/ima/ima_init.c | 2 +- + security/integrity/ima/ima_mok.c | 55 + + security/integrity/ima/ima_policy.c | 301 +- + security/integrity/integrity.h | 13 +- + security/keys/Kconfig | 1 + + security/keys/key.c | 5 +- + security/keys/keyctl.c | 49 +- + security/keys/trusted.c | 56 +- + security/security.c | 12 +- + security/selinux/hooks.c | 200 +- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/objsec.h | 6 + + security/selinux/include/security.h | 3 + + security/selinux/selinuxfs.c | 80 + + security/selinux/ss/services.c | 34 +- + security/smack/smack_lsm.c | 28 +- + 326 files changed, 43584 insertions(+), 3671 deletions(-) + create mode 100644 arch/tile/include/asm/insn.h + create mode 100644 arch/tile/include/asm/jump_label.h + create mode 100644 arch/tile/kernel/jump_label.c + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Kconfig (96%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Makefile (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-analog-tv.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-dvi.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-hdmi.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-opa362.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tfp410.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tpd12s015.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dpi.c (98%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dsi-cm.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-lgphilips-lb035q02.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-nec-nl8048hl11.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sharp-ls037v7dw01.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sony-acx565akm.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td028ttec1.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td043mtea1.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c (98%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c (96%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h (97%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.h (94%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/omapdss-boot-init.c (98%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/video-pll.c (100%) + create mode 100644 drivers/rtc/rtc-rx8010.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/Kconfig + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/Makefile + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/Kconfig + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/Makefile + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/apply.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/core.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/display.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dpi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dsi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss-of.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss_features.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss_features.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/manager.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/output.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/overlay.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/pll.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/sdi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/venc.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/video-pll.c + rename drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c (100%) + delete mode 100644 drivers/video/fbdev/sh_mobile_hdmi.c + delete mode 100644 fs/btrfs/extent-tree.h + create mode 100644 fs/btrfs/free-space-tree.c + create mode 100644 fs/btrfs/free-space-tree.h + create mode 100644 fs/btrfs/tests/free-space-tree-tests.c + delete mode 100644 include/linux/platform_data/mmc-atmel-mci.h + delete mode 100644 include/video/sh_mobile_hdmi.h + create mode 100644 security/integrity/ima/ima_mok.c +Merging fixes/master (25cb62b76430 Linux 4.3-rc5) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (34bfbae33ae8 ARM: 8475/1: SWP emulation: Restore original *data when failed) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys()) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) +$ git merge mips-fixes/mips-fixes +Already up-to-date. +Merging powerpc-fixes/fixes (afd2ff9b7e1b Linux 4.4) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (5807fcaa9bf7 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge sparc/master +Already up-to-date. +Merging net/master (b064d0d88ae5 ovs: limit ovs recursions in ovs_execute_actions to not corrupt stack) +$ git merge net/master +Already up-to-date. +Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops) +$ git merge ipsec/master +Already up-to-date. +Merging ipvs/master (8e662164abb4 netfilter: nfnetlink_queue: avoid harmless unnitialized variable warnings) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (01d85b9b2b6b Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (da629cf111a2 mac80211: Don't buffer non-bufferable MMPDUs) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 5 ++-- + net/mac80211/main.c | 6 +++++ + net/mac80211/offchannel.c | 16 +++++++------ + net/mac80211/scan.c | 8 +++++++ + net/mac80211/sta_info.c | 2 +- + net/mac80211/status.c | 5 ++++ + net/mac80211/util.c | 16 ++++++++++--- + net/wireless/reg.c | 45 +++++++++++++++++++---------------- + 8 files changed, 70 insertions(+), 33 deletions(-) +Merging sound-current/for-linus (c0bcdbdff3ff ALSA: control: Avoid kernel warnings from tlv ioctl with numid 0) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/control.c | 2 ++ + sound/core/hrtimer.c | 3 ++- + sound/core/pcm_compat.c | 13 +++++++++---- + sound/core/seq/seq_compat.c | 9 +++++---- + sound/pci/hda/patch_realtek.c | 1 + + 5 files changed, 19 insertions(+), 9 deletions(-) +Merging pci-current/for-linus (5c3b99d05752 PCI: dra7xx: Mark driver as broken) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (afd2ff9b7e1b Linux 4.4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (ece6267878ae Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (ece6267878ae Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (7d32cdef5356 usb: musb: fail with error when no DMA controller set) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (f7d7f59ab124 USB: cp210x: add ID for ELV Marble Sound Board 1) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (f744c423cacf Merge tag 'iio-fixes-for-4.4c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/imu/adis_buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging char-misc.current/char-misc-linus (ece6267878ae Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (009f77383651 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (1822793a523e crypto: algif_skcipher - Fix race condition in skcipher_check_key) +$ git merge crypto-current/master +Auto-merging lib/Kconfig +Auto-merging crypto/algif_skcipher.c +Merge made by the 'recursive' strategy. + crypto/af_alg.c | 55 +++++++++-- + crypto/ahash.c | 5 +- + crypto/algif_hash.c | 165 ++++++++++++++++++++++++++++++-- + crypto/algif_skcipher.c | 155 ++++++++++++++++++++++++++++-- + crypto/shash.c | 4 +- + crypto/skcipher.c | 2 + + drivers/crypto/Kconfig | 1 + + drivers/crypto/qat/qat_common/qat_hal.c | 23 +++-- + include/crypto/hash.h | 6 ++ + include/crypto/if_alg.h | 11 ++- + include/crypto/skcipher.h | 7 ++ + lib/Kconfig | 2 + + 12 files changed, 400 insertions(+), 36 deletions(-) +Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr()) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (ae5515d66362 Revert: "vfio: Include No-IOMMU mode") +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (afd2ff9b7e1b Linux 4.4) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page) +$ git merge asm-generic/master +Auto-merging drivers/hid/hid-sensor-hub.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_mode.c +Auto-merging arch/frv/include/asm/page.h +Merge made by the 'recursive' strategy. + arch/arc/include/asm/page.h | 3 - + arch/arm/include/asm/div64.h | 283 ++++++++---------------- + arch/arm/include/asm/page-nommu.h | 3 - + arch/frv/include/asm/page.h | 3 - + arch/m68k/include/asm/page_mm.h | 3 - + arch/m68k/include/asm/page_no.h | 3 - + arch/openrisc/include/asm/page.h | 3 - + drivers/clk/tegra/clk-divider.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 3 +- + drivers/hid/hid-sensor-hub.c | 3 +- + include/asm-generic/div64.h | 178 ++++++++++++++- + include/asm-generic/page.h | 3 - + lib/div64.c | 6 +- + 14 files changed, 280 insertions(+), 220 deletions(-) +Merging arc/for-next (4dc0323fd6bd ARCv2: STAR 9000950267: Handle return from intr to Delay Slot #2) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/kernel/entry-arcv2.S | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) +Merging arm/for-next (4ba1a28869c7 Merge branch 'amba-pl011' into for-next) +$ git merge arm/for-next +Resolved 'drivers/tty/serial/amba-pl011.c' using previous resolution. +Auto-merging drivers/tty/serial/amba-pl011.c +CONFLICT (content): Merge conflict in drivers/tty/serial/amba-pl011.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b6d54db82f9d] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging arm-perf/for-next/perf (8fcf04067cb5 Revert "arm64: kernel: enforce pmuserenr_el0 initialization and restore") +$ git merge arm-perf/for-next/perf +Auto-merging arch/arm64/mm/proc.S +Merge made by the 'recursive' strategy. + arch/arm64/kernel/perf_event.c | 3 +++ + arch/arm64/mm/proc.S | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging arm-soc/for-next (ce504c3d4750 ARM: SoC: document merges) +$ git merge arm-soc/for-next +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution. +Resolved 'arch/arm/mach-exynos/Kconfig' using previous resolution. +Resolved 'arch/arm/mach-pxa/mioa701.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/palmtreo.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/palmz72.c' using previous resolution. +Removing include/linux/clksrc-dbx500-prcmu.h +Auto-merging include/linux/clk/ti.h +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/soc/Makefile +Auto-merging drivers/soc/Kconfig +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/clk/mmp/clk-pxa910.c +Auto-merging drivers/clk/mmp/clk-pxa168.c +Auto-merging drivers/clk/mmp/clk-mmp2.c +Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8173-evb.dts +Auto-merging arch/arm/plat-samsung/gpio-samsung.c +Auto-merging arch/arm/plat-samsung/devs.c +Auto-merging arch/arm/mm/mmu.c +Removing arch/arm/mach-versatile/versatile_pb.c +Removing arch/arm/mach-versatile/versatile_ab.c +Removing arch/arm/mach-versatile/pci.c +Removing arch/arm/mach-versatile/include/mach/uncompress.h +Removing arch/arm/mach-versatile/include/mach/platform.h +Removing arch/arm/mach-versatile/include/mach/irqs.h +Removing arch/arm/mach-versatile/include/mach/hardware.h +Removing arch/arm/mach-versatile/include/mach/clkdev.h +Removing arch/arm/mach-versatile/core.h +Removing arch/arm/mach-versatile/core.c +Removing arch/arm/mach-versatile/Makefile.boot +Removing arch/arm/mach-ux500/timer.c +Auto-merging arch/arm/mach-ux500/Kconfig +Auto-merging arch/arm/mach-sti/Kconfig +Removing arch/arm/mach-shmobile/irqs.h +Removing arch/arm/mach-shmobile/include/mach/irqs.h +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c +Removing arch/arm/mach-s3c64xx/include/mach/debug-macro.S +Auto-merging arch/arm/mach-realview/platform.h +Auto-merging arch/arm/mach-realview/irqs-pbx.h +Auto-merging arch/arm/mach-realview/irqs-pba8.h +Auto-merging arch/arm/mach-realview/irqs-pb11mp.h +Auto-merging arch/arm/mach-realview/irqs-pb1176.h +Auto-merging arch/arm/mach-realview/irqs-eb.h +Removing arch/arm/mach-realview/include/mach/uncompress.h +Removing arch/arm/mach-realview/include/mach/memory.h +Removing arch/arm/mach-realview/include/mach/irqs.h +Removing arch/arm/mach-realview/include/mach/barriers.h +Auto-merging arch/arm/mach-realview/hardware.h +Auto-merging arch/arm/mach-realview/board-pbx.h +Auto-merging arch/arm/mach-realview/board-pba8.h +Auto-merging arch/arm/mach-realview/board-pb11mp.h +Auto-merging arch/arm/mach-realview/board-pb1176.h +Auto-merging arch/arm/mach-realview/board-eb.h +Auto-merging arch/arm/mach-pxa/pxa930.h +Auto-merging arch/arm/mach-pxa/pxa320.h +Auto-merging arch/arm/mach-pxa/pxa300.h +Auto-merging arch/arm/mach-pxa/pxa27x.h +Auto-merging arch/arm/mach-pxa/pxa25x.h +Auto-merging arch/arm/mach-pxa/pcm990_baseboard.h +Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c +Auto-merging arch/arm/mach-pxa/pcm027.h +Auto-merging arch/arm/mach-pxa/palmz72.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmz72.c +Auto-merging arch/arm/mach-pxa/palmtreo.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmtreo.c +Auto-merging arch/arm/mach-pxa/palmt5.h +Auto-merging arch/arm/mach-pxa/mioa701.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/mioa701.c +Auto-merging arch/arm/mach-pxa/mfp-pxa930.h +Auto-merging arch/arm/mach-pxa/mfp-pxa320.h +Auto-merging arch/arm/mach-pxa/mfp-pxa300.h +Auto-merging arch/arm/mach-pxa/mfp-pxa27x.h +Auto-merging arch/arm/mach-pxa/mfp-pxa25x.h +Auto-merging arch/arm/mach-pxa/idp.h +Auto-merging arch/arm/mach-pxa/h5000.h +Auto-merging arch/arm/mach-pxa/gumstix.h +Auto-merging arch/arm/mach-pxa/ezx.c +Auto-merging arch/arm/mach-pxa/em-x270.c +Auto-merging arch/arm/mach-pxa/devices.c +Auto-merging arch/arm/mach-pxa/csb726.h +Auto-merging arch/arm/mach-orion5x/orion5x.h +Auto-merging arch/arm/mach-orion5x/irqs.h +Removing arch/arm/mach-orion5x/include/mach/uncompress.h +Removing arch/arm/mach-orion5x/include/mach/hardware.h +Removing arch/arm/mach-orion5x/include/mach/entry-macro.S +Auto-merging arch/arm/mach-orion5x/bridge-regs.h +Removing arch/arm/mach-omap2/omap-iommu.c +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Auto-merging arch/arm/mach-omap1/board-ams-delta.c +Removing arch/arm/mach-mvebu/include/mach/gpio.h +Auto-merging arch/arm/mach-mv78xx0/mv78xx0.h +Auto-merging arch/arm/mach-mv78xx0/irqs.h +Removing arch/arm/mach-mv78xx0/include/mach/uncompress.h +Removing arch/arm/mach-mv78xx0/include/mach/hardware.h +Removing arch/arm/mach-mv78xx0/include/mach/entry-macro.S +Auto-merging arch/arm/mach-mv78xx0/bridge-regs.h +Auto-merging arch/arm/mach-mmp/teton_bga.h +Auto-merging arch/arm/mach-mmp/regs-timers.h +Auto-merging arch/arm/mach-mmp/regs-icu.h +Auto-merging arch/arm/mach-mmp/regs-apmu.h +Auto-merging arch/arm/mach-mmp/regs-apbc.h +Auto-merging arch/arm/mach-mmp/pxa910.h +Auto-merging arch/arm/mach-mmp/pxa168.h +Auto-merging arch/arm/mach-mmp/pm-mmp2.h +Auto-merging arch/arm/mach-mmp/mmp2.h +Auto-merging arch/arm/mach-mmp/mfp-pxa910.h +Auto-merging arch/arm/mach-mmp/mfp-pxa168.h +Auto-merging arch/arm/mach-mmp/mfp-mmp2.h +Removing arch/arm/mach-mmp/include/mach/uncompress.h +Removing arch/arm/mach-mmp/include/mach/regs-smc.h +Removing arch/arm/mach-mmp/include/mach/hardware.h +Removing arch/arm/mach-mmp/include/mach/dma.h +Auto-merging arch/arm/mach-mmp/addr-map.h +Removing arch/arm/mach-iop13xx/include/mach/pci.h +Auto-merging arch/arm/mach-exynos/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig +Removing arch/arm/mach-dove/include/mach/entry-macro.S +Auto-merging arch/arm/mach-davinci/board-dm355-evm.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging arch/arm/mach-bcm/platsmp.c +Auto-merging arch/arm/include/asm/psci.h +Removing arch/arm/boot/dts/tps65217.dtsi +Removing arch/arm/boot/dts/r8a7791-henninger.dts +Auto-merging arch/arm/boot/dts/mt2701-evb.dts +Auto-merging arch/arm/boot/dts/exynos5800-peach-pi.dts +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/watchdog/meson-wdt.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a7a4a01a00ff] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/pxa/mfp.txt | 26 +- + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + .../devicetree/bindings/arm/bcm/brcm,bcm4708.txt | 7 + + .../bindings/arm/bcm/brcm,nsp-cpu-method.txt | 39 + + .../devicetree/bindings/arm/compulab-boards.txt | 25 + + Documentation/devicetree/bindings/arm/cpus.txt | 3 + + Documentation/devicetree/bindings/arm/fsl.txt | 4 + + .../devicetree/bindings/arm/marvell,kirkwood.txt | 2 + + Documentation/devicetree/bindings/arm/mediatek.txt | 4 + + .../bindings/arm/mediatek/mediatek,infracfg.txt | 2 +- + .../bindings/arm/mediatek/mediatek,pericfg.txt | 2 +- + .../devicetree/bindings/arm/omap/omap.txt | 18 + + Documentation/devicetree/bindings/arm/rockchip.txt | 26 + + .../devicetree/bindings/arm/samsung/exynos-adc.txt | 3 + + Documentation/devicetree/bindings/arm/scu.txt | 3 + + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + .../devicetree/bindings/arm/technologic.txt | 6 + + .../bindings/bus/uniphier-system-bus.txt | 66 + + .../devicetree/bindings/clock/arm-syscon-icst.txt | 40 + + .../bindings/clock/dove-divider-clock.txt | 28 + + .../bindings/display/exynos/exynos_hdmi.txt | 7 +- + .../display/panel/startek,startek-kd050c.txt | 4 + + .../interrupt-controller/mediatek,sysirq.txt | 1 + + .../devicetree/bindings/regulator/tps65217.txt | 10 + + .../bindings/reset/hisilicon,hi6220-reset.txt | 34 + + .../devicetree/bindings/serial/mtk-uart.txt | 14 +- + .../bindings/soc/bcm/raspberrypi,bcm2835-power.txt | 47 + + Documentation/devicetree/bindings/soc/dove/pmu.txt | 56 + + .../devicetree/bindings/soc/mediatek/scpsys.txt | 12 + + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 104 ++ + .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 104 ++ + .../devicetree/bindings/soc/ti/wkup_m3_ipc.txt | 57 + + Documentation/devicetree/bindings/spi/ti_qspi.txt | 22 +- + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + .../watchdog/{meson6-wdt.txt => meson-wdt.txt} | 2 +- + .../devicetree/bindings/watchdog/mtk-wdt.txt | 6 +- + .../devicetree/bindings/watchdog/sp805-wdt.txt | 31 + + MAINTAINERS | 31 +- + arch/arm/Kconfig | 112 +- + arch/arm/Kconfig.debug | 401 +++--- + arch/arm/Makefile | 6 +- + arch/arm/arm-soc-for-next-contents.txt | 338 +++++ + arch/arm/boot/dts/Makefile | 63 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 186 ++- + arch/arm/boot/dts/am335x-bone-common.dtsi | 118 +- + arch/arm/boot/dts/am335x-boneblack.dts | 44 +- + arch/arm/boot/dts/am335x-bonegreen.dts | 4 +- + arch/arm/boot/dts/am335x-chiliboard.dts | 20 +- + arch/arm/boot/dts/am335x-chilisom.dtsi | 94 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 396 ++++++ + arch/arm/boot/dts/am335x-evm.dts | 233 ++-- + arch/arm/boot/dts/am335x-evmsk.dts | 280 ++--- + arch/arm/boot/dts/am335x-lxm.dts | 120 +- + arch/arm/boot/dts/am335x-nano.dts | 154 +-- + arch/arm/boot/dts/am335x-pepper.dts | 231 ++-- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 60 +- + arch/arm/boot/dts/am335x-sbc-t335.dts | 219 ++++ + arch/arm/boot/dts/am335x-shc.dts | 577 +++++++++ + arch/arm/boot/dts/am335x-sl50.dts | 13 +- + arch/arm/boot/dts/am335x-wega.dtsi | 58 +- + arch/arm/boot/dts/am33xx.dtsi | 96 +- + arch/arm/boot/dts/am3517-craneboard.dts | 2 +- + arch/arm/boot/dts/am4372.dtsi | 87 +- + arch/arm/boot/dts/am437x-cm-t43.dts | 422 +++++++ + arch/arm/boot/dts/am437x-gp-evm.dts | 389 +++--- + arch/arm/boot/dts/am437x-idk-evm.dts | 128 +- + arch/arm/boot/dts/am437x-sbc-t43.dts | 180 +++ + arch/arm/boot/dts/am437x-sk-evm.dts | 298 ++--- + arch/arm/boot/dts/am43x-epos-evm.dts | 246 ++-- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 198 +-- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 617 ++++++++++ + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 179 +++ + arch/arm/boot/dts/arm-realview-pb11mp.dts | 681 ++++++++++ + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +- + arch/arm/boot/dts/armada-388-clearfog.dts | 456 +++++++ + arch/arm/boot/dts/armada-388-gp.dts | 10 - + .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 115 ++ + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 72 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 21 + + arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 127 ++ + arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 170 +++ + arch/arm/boot/dts/at91-vinco.dts | 256 ++++ + arch/arm/boot/dts/bcm-cygnus.dtsi | 101 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 232 +++- + arch/arm/boot/dts/bcm11351.dtsi | 2 +- + arch/arm/boot/dts/bcm21664.dtsi | 2 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 - + arch/arm/boot/dts/bcm2835.dtsi | 194 +-- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 35 + + arch/arm/boot/dts/bcm2836.dtsi | 78 ++ + arch/arm/boot/dts/bcm283x.dtsi | 212 ++++ + arch/arm/boot/dts/bcm4708.dtsi | 2 + + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 30 + + arch/arm/boot/dts/bcm5301x.dtsi | 92 +- + arch/arm/boot/dts/bcm63138.dtsi | 36 +- + arch/arm/boot/dts/bcm94708.dts | 56 + + arch/arm/boot/dts/bcm94709.dts | 56 + + arch/arm/boot/dts/bcm953012k.dts | 63 + + arch/arm/boot/dts/bcm958625k.dts | 59 + + arch/arm/boot/dts/berlin2.dtsi | 23 + + arch/arm/boot/dts/berlin2cd.dtsi | 23 + + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 38 +- + arch/arm/boot/dts/berlin2q.dtsi | 34 +- + arch/arm/boot/dts/compulab-sb-som.dtsi | 49 + + arch/arm/boot/dts/da850-enbw-cmc.dts | 8 + + arch/arm/boot/dts/da850-evm.dts | 8 + + arch/arm/boot/dts/da850.dtsi | 58 +- + arch/arm/boot/dts/dm8148-evm.dts | 55 + + arch/arm/boot/dts/dm8148-t410.dts | 70 ++ + arch/arm/boot/dts/dm814x-clocks.dtsi | 109 +- + arch/arm/boot/dts/dm814x.dtsi | 259 +++- + arch/arm/boot/dts/dm816x.dtsi | 14 +- + arch/arm/boot/dts/dove-cubox.dts | 8 + + arch/arm/boot/dts/dove.dtsi | 22 + + arch/arm/boot/dts/dra62x-clocks.dtsi | 23 + + arch/arm/boot/dts/dra62x-j5eco-evm.dts | 80 ++ + arch/arm/boot/dts/dra62x.dtsi | 23 + + arch/arm/boot/dts/dra7-evm.dts | 255 ++-- + arch/arm/boot/dts/dra7.dtsi | 7 +- + arch/arm/boot/dts/dra72-evm.dts | 204 +-- + arch/arm/boot/dts/ea3250.dts | 41 +- + arch/arm/boot/dts/emev2.dtsi | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 14 + + arch/arm/boot/dts/exynos4.dtsi | 32 +- + arch/arm/boot/dts/exynos4210-origen.dts | 4 - + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 - + arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 + + arch/arm/boot/dts/exynos4210.dtsi | 14 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 - + arch/arm/boot/dts/exynos4412-odroidu3.dts | 1 - + arch/arm/boot/dts/exynos4412-origen.dts | 4 - + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 - + arch/arm/boot/dts/exynos4412-trats2.dts | 4 + + arch/arm/boot/dts/exynos4x12.dtsi | 5 +- + arch/arm/boot/dts/exynos5.dtsi | 14 + + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 6 +- + arch/arm/boot/dts/exynos5250.dtsi | 9 + + arch/arm/boot/dts/exynos5410.dtsi | 14 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +- + arch/arm/boot/dts/exynos5420.dtsi | 19 + + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 5 - + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 2 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +- + arch/arm/boot/dts/imx25-pinfunc.h | 3 + + arch/arm/boot/dts/imx25.dtsi | 4 + + arch/arm/boot/dts/imx28-cfa10057.dts | 4 +- + arch/arm/boot/dts/imx28.dtsi | 11 + + arch/arm/boot/dts/imx51-ts4800.dts | 302 +++++ + arch/arm/boot/dts/imx6dl.dtsi | 7 +- + arch/arm/boot/dts/imx6q-novena.dts | 785 ++++++++++++ + arch/arm/boot/dts/imx6q.dtsi | 52 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 36 + + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 48 + + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 33 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 47 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 24 + + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 24 + + arch/arm/boot/dts/imx6qdl.dtsi | 61 +- + arch/arm/boot/dts/imx6sl.dtsi | 11 +- + arch/arm/boot/dts/imx6sx.dtsi | 19 +- + arch/arm/boot/dts/imx6ul.dtsi | 18 + + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 286 +++++ + arch/arm/boot/dts/imx7d-sbc-imx7.dts | 42 + + arch/arm/boot/dts/imx7d-sdb.dts | 10 + + arch/arm/boot/dts/imx7d.dtsi | 22 +- + arch/arm/boot/dts/kirkwood-nsa325.dts | 238 ++++ + arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 178 +++ + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 155 ++- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 44 + + arch/arm/boot/dts/lpc18xx.dtsi | 11 + + arch/arm/boot/dts/lpc32xx.dtsi | 142 ++- + arch/arm/boot/dts/lpc4337-ciaa.dts | 34 + + arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 5 + + arch/arm/boot/dts/lpc4357.dtsi | 4 + + arch/arm/boot/dts/ls1021a-qds.dts | 4 + + arch/arm/boot/dts/ls1021a-twr.dts | 13 + + arch/arm/boot/dts/ls1021a.dtsi | 21 + + arch/arm/boot/dts/meson8b-odroidc1.dts | 11 + + arch/arm/boot/dts/meson8b.dtsi | 6 + + .../mach/param.h => boot/dts/mt2701-evb.dts} | 29 +- + arch/arm/boot/dts/mt2701.dtsi | 146 +++ + arch/arm/boot/dts/mt8135.dtsi | 2 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 20 +- + arch/arm/boot/dts/omap3-beagle.dts | 66 +- + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-evm-37xx.dts | 54 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- + arch/arm/boot/dts/omap3-igep0020.dts | 24 +- + arch/arm/boot/dts/omap3-igep0030.dts | 24 +- + arch/arm/boot/dts/omap3-ldp.dts | 60 +- + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +- + arch/arm/boot/dts/omap3-n900.dts | 116 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 12 +- + arch/arm/boot/dts/omap3-overo-alto35-common.dtsi | 2 +- + .../boot/dts/omap3-overo-chestnut43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-palo35-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-palo43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-pandora-common.dtsi | 34 +- + .../boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 2 +- + arch/arm/boot/dts/omap3-zoom3.dts | 60 +- + arch/arm/boot/dts/omap3.dtsi | 2 + + arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- + arch/arm/boot/dts/omap4-panda-a4.dts | 6 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 164 +-- + arch/arm/boot/dts/omap4-panda-es.dts | 10 +- + arch/arm/boot/dts/omap4-sdp-es23plus.dts | 6 +- + arch/arm/boot/dts/omap4-sdp.dts | 110 +- + arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 2 +- + arch/arm/boot/dts/omap4.dtsi | 10 + + arch/arm/boot/dts/omap5-board-common.dtsi | 94 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 4 +- + arch/arm/boot/dts/omap5-uevm.dts | 4 +- + arch/arm/boot/dts/omap5.dtsi | 2 + + arch/arm/boot/dts/phy3250.dts | 41 +- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 16 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 22 +- + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 436 +++++++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 130 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 2 + + arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 3 +- + arch/arm/boot/dts/qcom-apq8084-mtp.dts | 1 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 108 ++ + arch/arm/boot/dts/qcom-msm8960.dtsi | 23 + + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 382 ++++++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm/boot/dts/qcom-pm8841.dtsi | 10 +- + arch/arm/boot/dts/qcom-pm8941.dtsi | 21 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 12 +- + arch/arm/boot/dts/r7s72100.dtsi | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7740.dtsi | 15 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 33 +- + arch/arm/boot/dts/r8a7778.dtsi | 9 +- + arch/arm/boot/dts/r8a7790-lager.dts | 56 +- + arch/arm/boot/dts/r8a7790.dtsi | 32 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 320 ----- + arch/arm/boot/dts/r8a7791-koelsch.dts | 60 +- + arch/arm/boot/dts/r8a7791-porter.dts | 56 +- + arch/arm/boot/dts/r8a7791.dtsi | 65 +- + arch/arm/boot/dts/r8a7793-gose.dts | 77 +- + arch/arm/boot/dts/r8a7793.dtsi | 534 ++++++++ + arch/arm/boot/dts/r8a7794-alt.dts | 140 ++- + arch/arm/boot/dts/r8a7794-silk.dts | 76 +- + arch/arm/boot/dts/r8a7794.dtsi | 68 +- + arch/arm/boot/dts/rk3036-evb.dts | 64 + + arch/arm/boot/dts/rk3036-kylin.dts | 300 +++++ + arch/arm/boot/dts/rk3036.dtsi | 622 ++++++++++ + arch/arm/boot/dts/rk3066a.dtsi | 19 + + arch/arm/boot/dts/rk3188.dtsi | 15 + + arch/arm/boot/dts/rk3228-evb.dts | 66 + + arch/arm/boot/dts/rk3228.dtsi | 442 +++++++ + arch/arm/boot/dts/rk3288-evb-act8846.dts | 44 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 27 - + arch/arm/boot/dts/rk3288-evb.dtsi | 37 +- + arch/arm/boot/dts/rk3288-r89.dts | 13 + + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 1 + + arch/arm/boot/dts/rk3288-rock2-square.dts | 13 + + arch/arm/boot/dts/rk3288-thermal.dtsi | 14 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 139 +++ + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 250 ++++ + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 12 + + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 8 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 5 + + arch/arm/boot/dts/rk3288.dtsi | 30 +- + arch/arm/boot/dts/rk3xxx.dtsi | 1 + + arch/arm/boot/dts/sama5d2.dtsi | 31 + + arch/arm/boot/dts/sama5d4.dtsi | 26 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/sh73a0.dtsi | 86 +- + arch/arm/boot/dts/socfpga.dtsi | 1 + + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 1 + + arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 1 + + arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 34 + + arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts | 94 ++ + arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 1 + + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 1 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 33 - + arch/arm/boot/dts/ste-href-stuib.dtsi | 23 + + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 52 +- + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 18 - + arch/arm/boot/dts/ste-nomadik-s8815.dts | 2 +- + arch/arm/boot/dts/ste-snowball.dts | 7 +- + arch/arm/boot/dts/ste-u300.dts | 10 - + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 54 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 48 + + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 164 +++ + arch/arm/boot/dts/sun4i-a10-mk802.dts | 4 + + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 61 + + arch/arm/boot/dts/sun4i-a10.dtsi | 45 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 14 + + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 241 ++++ + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 30 + + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 85 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 4 + + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 169 +++ + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 4 + + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 77 ++ + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 4 + + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 4 + + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 4 + + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 57 + + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 12 + + arch/arm/boot/dts/sun7i-a20.dtsi | 41 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +- + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 77 ++ + arch/arm/boot/dts/sun8i-h3.dtsi | 497 ++++++++ + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 30 + + arch/arm/boot/dts/sun9i-a80-optimus.dts | 24 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 159 ++- + arch/arm/boot/dts/tango4-common.dtsi | 130 ++ + arch/arm/boot/dts/tango4-smp8758.dtsi | 31 + + arch/arm/boot/dts/tango4-vantage-1172.dts | 37 + + arch/arm/boot/dts/tps65217.dtsi | 56 - + arch/arm/boot/dts/twl4030_omap3.dtsi | 2 +- + arch/arm/boot/dts/twl6030_omap4.dtsi | 4 +- + arch/arm/boot/dts/uniphier-common32.dtsi | 135 ++ + arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 265 ++-- + arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 288 ++--- + arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 274 ++-- + arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 266 ++-- + arch/arm/boot/dts/uniphier-proxstream2.dtsi | 269 ++-- + arch/arm/boot/dts/versatile-ab.dts | 62 +- + arch/arm/boot/dts/vf-colibri.dtsi | 26 + + arch/arm/boot/dts/vf610m4-cosmic.dts | 90 ++ + arch/arm/boot/dts/vfxxx.dtsi | 24 + + arch/arm/boot/dts/wm8505.dtsi | 4 +- + arch/arm/boot/dts/zynq-7000.dtsi | 8 +- + arch/arm/boot/dts/zynq-zc702.dts | 4 +- + arch/arm/common/mcpm_platsmp.c | 2 +- + arch/arm/common/scoop.c | 2 +- + arch/arm/configs/bcm2835_defconfig | 29 +- + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/exynos_defconfig | 18 +- + arch/arm/configs/imx_v6_v7_defconfig | 5 +- + arch/arm/configs/lpc18xx_defconfig | 5 + + arch/arm/configs/lpc32xx_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 43 +- + arch/arm/configs/multi_v7_defconfig | 100 +- + arch/arm/configs/mv78xx0_defconfig | 4 +- + arch/arm/configs/mvebu_v5_defconfig | 40 +- + arch/arm/configs/netwinder_defconfig | 1 + + arch/arm/configs/orion5x_defconfig | 4 +- + arch/arm/configs/pxa_defconfig | 783 ++++++++++++ + arch/arm/configs/qcom_defconfig | 16 +- + arch/arm/configs/realview-smp_defconfig | 38 +- + arch/arm/configs/realview_defconfig | 34 +- + arch/arm/configs/s3c6400_defconfig | 2 + + arch/arm/configs/sama5_defconfig | 3 + + arch/arm/configs/shmobile_defconfig | 14 +- + arch/arm/configs/socfpga_defconfig | 6 +- + arch/arm/configs/sunxi_defconfig | 14 +- + arch/arm/configs/versatile_defconfig | 14 +- + arch/arm/configs/zx_defconfig | 1 - + arch/arm/include/asm/cputype.h | 22 +- + arch/arm/include/asm/psci.h | 2 +- + .../mach/debug-macro.S => include/debug/dc21285.S} | 0 + arch/arm/kernel/devtree.c | 2 +- + arch/arm/kernel/psci_smp.c | 2 +- + arch/arm/kernel/xscale-cp0.c | 7 + + arch/arm/mach-alpine/Kconfig | 3 +- + arch/arm/mach-alpine/platsmp.c | 2 +- + arch/arm/mach-at91/Kconfig | 15 +- + arch/arm/mach-axxia/Kconfig | 3 +- + arch/arm/mach-axxia/platsmp.c | 2 +- + arch/arm/mach-bcm/Kconfig | 41 +- + arch/arm/mach-bcm/Makefile | 11 +- + arch/arm/mach-bcm/bcm63xx_smp.c | 2 +- + arch/arm/mach-bcm/bcm_5301x.c | 35 - + arch/arm/mach-bcm/board_bcm2835.c | 5 + + arch/arm/mach-bcm/platsmp-brcmstb.c | 2 +- + arch/arm/mach-bcm/{kona_smp.c => platsmp.c} | 146 ++- + arch/arm/mach-berlin/Kconfig | 3 +- + arch/arm/mach-berlin/platsmp.c | 2 +- + arch/arm/mach-cns3xxx/Kconfig | 3 +- + arch/arm/mach-davinci/Kconfig | 3 +- + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 4 +- + arch/arm/mach-davinci/board-dm355-evm.c | 4 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 4 +- + arch/arm/mach-davinci/board-mityomapl138.c | 2 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- + arch/arm/mach-davinci/clock.c | 2 +- + arch/arm/mach-davinci/cp_intc.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/cp_intc.h | 0 + arch/arm/mach-davinci/cpuidle.c | 4 +- + arch/arm/mach-davinci/{include/mach => }/cpuidle.h | 0 + arch/arm/mach-davinci/da830.c | 2 +- + arch/arm/mach-davinci/da850.c | 2 +- + arch/arm/mach-davinci/da8xx-dt.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/ddr2.h | 0 + arch/arm/mach-davinci/devices-da8xx.c | 4 +- + arch/arm/mach-davinci/dm355.c | 2 +- + arch/arm/mach-davinci/dm365.c | 2 +- + arch/arm/mach-davinci/dm644x.c | 2 +- + arch/arm/mach-davinci/dm646x.c | 2 +- + arch/arm/mach-davinci/pm.c | 2 +- + arch/arm/mach-davinci/psc.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/psc.h | 0 + arch/arm/mach-davinci/sleep.S | 4 +- + arch/arm/mach-davinci/sram.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/sram.h | 0 + arch/arm/mach-dove/cm-a510.c | 1 + + arch/arm/mach-dove/common.c | 43 + + arch/arm/mach-dove/dove-db-setup.c | 1 + + arch/arm/mach-dove/include/mach/dove.h | 2 + + arch/arm/mach-dove/include/mach/entry-macro.S | 33 - + arch/arm/mach-dove/include/mach/irqs.h | 2 +- + arch/arm/mach-dove/include/mach/pm.h | 20 +- + arch/arm/mach-dove/irq.c | 100 +- + arch/arm/mach-exynos/Kconfig | 8 +- + arch/arm/mach-exynos/common.h | 2 +- + arch/arm/mach-exynos/platsmp.c | 2 +- + arch/arm/mach-exynos/pmu.c | 45 +- + arch/arm/mach-exynos/regs-pmu.h | 9 - + arch/arm/mach-highbank/Kconfig | 3 +- + arch/arm/mach-hisi/Kconfig | 12 +- + arch/arm/mach-hisi/core.h | 3 - + arch/arm/mach-hisi/platmcpm.c | 2 +- + arch/arm/mach-hisi/platsmp.c | 6 +- + arch/arm/mach-imx/Kconfig | 7 +- + arch/arm/mach-imx/common.h | 4 +- + arch/arm/mach-imx/iomux-imx31.c | 2 +- + arch/arm/mach-imx/mach-imx6ul.c | 2 +- + arch/arm/mach-imx/mach-imx7d.c | 6 + + arch/arm/mach-imx/platsmp.c | 4 +- + arch/arm/mach-integrator/Kconfig | 135 +- + arch/arm/mach-iop13xx/include/mach/pci.h | 57 - + arch/arm/mach-iop13xx/iq81340mc.c | 2 +- + arch/arm/mach-iop13xx/iq81340sc.c | 2 +- + arch/arm/mach-iop13xx/irq.c | 2 +- + arch/arm/mach-iop13xx/{include/mach => }/msi.h | 0 + arch/arm/mach-iop13xx/pci.c | 2 +- + arch/arm/mach-iop13xx/pci.h | 58 + + arch/arm/mach-keystone/keystone.h | 2 +- + arch/arm/mach-keystone/platsmp.c | 2 +- + arch/arm/mach-ks8695/board-acs5k.c | 2 +- + arch/arm/mach-ks8695/board-dsm320.c | 2 +- + arch/arm/mach-ks8695/board-micrel.c | 2 +- + arch/arm/mach-ks8695/board-og.c | 2 +- + arch/arm/mach-ks8695/board-sg.c | 2 +- + arch/arm/mach-ks8695/cpu.c | 2 +- + arch/arm/mach-ks8695/devices.c | 6 +- + arch/arm/mach-ks8695/{include/mach => }/devices.h | 0 + arch/arm/mach-ks8695/pci.c | 4 +- + .../arm/mach-ks8695/{include/mach => }/regs-hpna.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-lan.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-mem.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-pci.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-sys.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-wan.h | 0 + arch/arm/mach-mediatek/Kconfig | 3 +- + arch/arm/mach-mediatek/mediatek.c | 1 + + arch/arm/mach-mediatek/platsmp.c | 4 +- + arch/arm/mach-meson/Kconfig | 3 +- + arch/arm/mach-mmp/Kconfig | 34 +- + arch/arm/mach-mmp/Makefile | 1 + + arch/arm/mach-mmp/{include/mach => }/addr-map.h | 2 - + arch/arm/mach-mmp/aspenite.c | 8 +- + arch/arm/mach-mmp/avengers_lite.c | 8 +- + arch/arm/mach-mmp/brownstone.c | 8 +- + arch/arm/mach-mmp/clock-mmp2.c | 6 +- + arch/arm/mach-mmp/clock-pxa168.c | 6 +- + arch/arm/mach-mmp/clock-pxa910.c | 6 +- + arch/arm/mach-mmp/clock.c | 2 +- + arch/arm/mach-mmp/clock.h | 2 - + arch/arm/mach-mmp/common.c | 4 +- + arch/arm/mach-mmp/common.h | 3 - + arch/arm/mach-mmp/{include/mach => }/cputype.h | 0 + arch/arm/mach-mmp/devices.c | 13 +- + arch/arm/mach-mmp/{include/mach => }/devices.h | 0 + arch/arm/mach-mmp/flint.c | 8 +- + arch/arm/mach-mmp/gplugd.c | 6 +- + arch/arm/mach-mmp/include/mach/dma.h | 13 - + arch/arm/mach-mmp/include/mach/hardware.h | 4 - + arch/arm/mach-mmp/include/mach/regs-smc.h | 37 - + arch/arm/mach-mmp/include/mach/uncompress.h | 45 - + arch/arm/mach-mmp/{include/mach => }/irqs.h | 0 + arch/arm/mach-mmp/jasper.c | 8 +- + arch/arm/mach-mmp/{include/mach => }/mfp-mmp2.h | 2 +- + arch/arm/mach-mmp/{include/mach => }/mfp-pxa168.h | 2 +- + arch/arm/mach-mmp/{include/mach => }/mfp-pxa910.h | 2 +- + arch/arm/mach-mmp/{include/mach => }/mfp.h | 0 + arch/arm/mach-mmp/mmp2.c | 23 +- + arch/arm/mach-mmp/{include/mach => }/mmp2.h | 3 +- + arch/arm/mach-mmp/pm-mmp2.c | 12 +- + arch/arm/mach-mmp/{include/mach => }/pm-mmp2.h | 2 +- + arch/arm/mach-mmp/pm-pxa910.c | 12 +- + arch/arm/mach-mmp/{include/mach => }/pm-pxa910.h | 0 + arch/arm/mach-mmp/pxa168.c | 29 +- + arch/arm/mach-mmp/{include/mach => }/pxa168.h | 5 +- + arch/arm/mach-mmp/pxa910.c | 24 +- + arch/arm/mach-mmp/{include/mach => }/pxa910.h | 3 +- + arch/arm/mach-mmp/{include/mach => }/regs-apbc.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-apmu.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-icu.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-timers.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-usb.h | 0 + arch/arm/mach-mmp/tavorevb.c | 8 +- + arch/arm/mach-mmp/teton_bga.c | 10 +- + arch/arm/mach-mmp/{include/mach => }/teton_bga.h | 2 - + arch/arm/mach-mmp/time.c | 11 +- + arch/arm/mach-mmp/ttc_dkb.c | 10 +- + arch/arm/mach-moxart/Kconfig | 3 +- + arch/arm/mach-mv78xx0/Kconfig | 15 +- + arch/arm/mach-mv78xx0/Makefile | 2 + + .../mach-mv78xx0/{include/mach => }/bridge-regs.h | 4 +- + arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 3 +- + arch/arm/mach-mv78xx0/common.c | 4 +- + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 3 +- + arch/arm/mach-mv78xx0/include/mach/entry-macro.S | 41 - + arch/arm/mach-mv78xx0/include/mach/hardware.h | 14 - + arch/arm/mach-mv78xx0/include/mach/uncompress.h | 46 - + arch/arm/mach-mv78xx0/irq.c | 35 +- + arch/arm/mach-mv78xx0/{include/mach => }/irqs.h | 4 +- + arch/arm/mach-mv78xx0/mpp.c | 2 +- + arch/arm/mach-mv78xx0/{include/mach => }/mv78xx0.h | 4 +- + arch/arm/mach-mv78xx0/pcie.c | 2 +- + arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 3 +- + arch/arm/mach-mvebu/Kconfig | 24 +- + arch/arm/mach-mvebu/armada-370-xp.h | 2 +- + arch/arm/mach-mvebu/include/mach/gpio.h | 1 - + arch/arm/mach-mvebu/platsmp-a9.c | 4 +- + arch/arm/mach-mvebu/platsmp.c | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + arch/arm/mach-omap1/board-fsample.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-innovator.c | 2 +- + arch/arm/mach-omap1/board-osk.c | 2 +- + arch/arm/mach-omap1/board-palmte.c | 2 +- + arch/arm/mach-omap1/board-palmtt.c | 2 +- + arch/arm/mach-omap1/board-palmz71.c | 2 +- + arch/arm/mach-omap1/board-perseus2.c | 2 +- + arch/arm/mach-omap1/board-sx1-mmc.c | 2 +- + arch/arm/mach-omap1/board-sx1.c | 4 +- + arch/arm/mach-omap1/{include/mach => }/board-sx1.h | 0 + arch/arm/mach-omap1/{include/mach => }/camera.h | 0 + arch/arm/mach-omap1/devices.c | 21 +- + arch/arm/mach-omap1/flash.c | 2 +- + arch/arm/mach-omap1/{include/mach => }/flash.h | 0 + arch/arm/mach-omap2/Makefile | 2 - + arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- + arch/arm/mach-omap2/clockdomains81xx_data.c | 29 +- + arch/arm/mach-omap2/cm81xx.h | 6 +- + arch/arm/mach-omap2/common.h | 2 +- + arch/arm/mach-omap2/devices.c | 25 +- + arch/arm/mach-omap2/id.c | 4 +- + arch/arm/mach-omap2/io.c | 3 +- + arch/arm/mach-omap2/omap-iommu.c | 66 - + arch/arm/mach-omap2/omap-smp.c | 2 +- + arch/arm/mach-omap2/omap2-restart.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 42 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 41 - + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 178 ++- + arch/arm/mach-omap2/pdata-quirks.c | 26 +- + arch/arm/mach-omap2/powerdomains3xxx_data.c | 10 +- + arch/arm/mach-omap2/prm_common.c | 8 + + arch/arm/mach-omap2/serial.c | 2 +- + arch/arm/mach-omap2/timer.c | 6 +- + arch/arm/mach-orion5x/Kconfig | 18 +- + arch/arm/mach-orion5x/Makefile | 2 + + arch/arm/mach-orion5x/board-d2net.c | 2 +- + arch/arm/mach-orion5x/board-dt.c | 4 +- + arch/arm/mach-orion5x/board-mss2.c | 4 +- + arch/arm/mach-orion5x/board-rd88f5182.c | 2 +- + .../mach-orion5x/{include/mach => }/bridge-regs.h | 4 +- + arch/arm/mach-orion5x/common.c | 20 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 3 +- + arch/arm/mach-orion5x/dns323-setup.c | 3 +- + arch/arm/mach-orion5x/include/mach/entry-macro.S | 25 - + arch/arm/mach-orion5x/include/mach/hardware.h | 14 - + arch/arm/mach-orion5x/include/mach/uncompress.h | 48 - + arch/arm/mach-orion5x/irq.c | 13 +- + arch/arm/mach-orion5x/{include/mach => }/irqs.h | 4 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 +- + arch/arm/mach-orion5x/ls-chl-setup.c | 3 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 3 +- + arch/arm/mach-orion5x/mpp.c | 2 +- + arch/arm/mach-orion5x/mv2120-setup.c | 3 +- + arch/arm/mach-orion5x/net2big-setup.c | 3 +- + arch/arm/mach-orion5x/{include/mach => }/orion5x.h | 4 +- + arch/arm/mach-orion5x/pci.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 3 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 3 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 3 +- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 3 +- + arch/arm/mach-orion5x/terastation_pro2-setup.c | 3 +- + arch/arm/mach-orion5x/ts209-setup.c | 3 +- + arch/arm/mach-orion5x/ts409-setup.c | 3 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 3 +- + arch/arm/mach-orion5x/tsx09-common.c | 2 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 3 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 3 +- + arch/arm/mach-picoxcell/Kconfig | 3 +- + arch/arm/mach-prima2/Kconfig | 3 +- + arch/arm/mach-prima2/common.h | 2 +- + arch/arm/mach-prima2/platsmp.c | 2 +- + arch/arm/mach-pxa/am200epd.c | 4 +- + arch/arm/mach-pxa/am300epd.c | 4 +- + arch/arm/mach-pxa/balloon3.c | 6 +- + arch/arm/mach-pxa/capc7117.c | 4 +- + arch/arm/mach-pxa/cm-x255.c | 2 +- + arch/arm/mach-pxa/cm-x270.c | 2 +- + arch/arm/mach-pxa/cm-x2xx.c | 13 +- + arch/arm/mach-pxa/cm-x300.c | 4 +- + arch/arm/mach-pxa/colibri-evalboard.c | 6 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 4 +- + arch/arm/mach-pxa/colibri-pxa270.c | 4 +- + arch/arm/mach-pxa/colibri-pxa300.c | 4 +- + arch/arm/mach-pxa/colibri-pxa320.c | 8 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/colibri.h | 0 + arch/arm/mach-pxa/corgi.c | 6 +- + arch/arm/mach-pxa/corgi_pm.c | 2 +- + arch/arm/mach-pxa/csb726.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/csb726.h | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/eseries-irq.h | 0 + arch/arm/mach-pxa/eseries.c | 6 +- + arch/arm/mach-pxa/ezx.c | 12 +- + arch/arm/mach-pxa/gumstix.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/gumstix.h | 2 +- + arch/arm/mach-pxa/h5000.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/h5000.h | 2 +- + arch/arm/mach-pxa/himalaya.c | 2 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/icontrol.c | 4 +- + arch/arm/mach-pxa/idp.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/idp.h | 2 +- + arch/arm/mach-pxa/littleton.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/littleton.h | 0 + arch/arm/mach-pxa/lpd270.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/lpd270.h | 0 + arch/arm/mach-pxa/lubbock.c | 6 +- + arch/arm/mach-pxa/magician.c | 6 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa25x.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa27x.h | 2 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa2xx.h | 0 + arch/arm/mach-pxa/{include/mach => }/mfp-pxa300.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa320.h | 2 +- + arch/arm/mach-pxa/mfp-pxa3xx.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa3xx.h | 0 + arch/arm/mach-pxa/{include/mach => }/mfp-pxa930.h | 2 +- + arch/arm/mach-pxa/mioa701.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/mioa701.h | 0 + arch/arm/mach-pxa/mp900.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/mxm8x10.h | 0 + arch/arm/mach-pxa/palm27x.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/palm27x.h | 0 + arch/arm/mach-pxa/palmld.c | 4 +- + arch/arm/mach-pxa/palmt5.c | 8 +- + arch/arm/mach-pxa/{include/mach => }/palmt5.h | 2 +- + arch/arm/mach-pxa/palmtc.c | 4 +- + arch/arm/mach-pxa/palmte2.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/palmte2.h | 0 + arch/arm/mach-pxa/palmtreo.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/palmtreo.h | 0 + arch/arm/mach-pxa/palmtx.c | 6 +- + arch/arm/mach-pxa/palmz72.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/palmz72.h | 0 + arch/arm/mach-pxa/pcm027.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/pcm027.h | 2 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 4 +- + .../mach-pxa/{include/mach => }/pcm990_baseboard.h | 4 +- + arch/arm/mach-pxa/pm.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pm.h | 0 + arch/arm/mach-pxa/poodle.c | 4 +- + arch/arm/mach-pxa/pxa25x.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/pxa25x.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa27x-udc.h | 0 + arch/arm/mach-pxa/pxa27x.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/pxa27x.h | 2 +- + arch/arm/mach-pxa/pxa2xx.c | 2 +- + arch/arm/mach-pxa/pxa300.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa300.h | 4 +- + arch/arm/mach-pxa/pxa320.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa320.h | 4 +- + arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa3xx.h | 0 + arch/arm/mach-pxa/pxa930.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa930.h | 4 +- + arch/arm/mach-pxa/raumfeld.c | 8 +- + arch/arm/mach-pxa/{include/mach => }/regs-rtc.h | 0 + arch/arm/mach-pxa/{include/mach => }/regs-u2d.h | 0 + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/sharpsl_pm.h | 0 + arch/arm/mach-pxa/spitz.c | 6 +- + arch/arm/mach-pxa/spitz_pm.c | 4 +- + arch/arm/mach-pxa/stargate2.c | 6 +- + arch/arm/mach-pxa/tavorevb.c | 2 +- + arch/arm/mach-pxa/tosa-bt.c | 2 +- + arch/arm/mach-pxa/tosa.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/tosa_bt.h | 0 + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/udc.h | 0 + arch/arm/mach-pxa/viper.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/viper.h | 0 + arch/arm/mach-pxa/vpac270.c | 6 +- + arch/arm/mach-pxa/xcep.c | 2 +- + arch/arm/mach-pxa/z2.c | 6 +- + arch/arm/mach-pxa/zeus.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/zeus.h | 0 + arch/arm/mach-pxa/zylonite.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/zylonite.h | 0 + arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 4 +- + arch/arm/mach-qcom/Kconfig | 3 +- + arch/arm/mach-qcom/platsmp.c | 6 +- + arch/arm/mach-realview/Kconfig | 66 +- + arch/arm/mach-realview/Makefile | 9 +- + .../mach-realview/{include/mach => }/board-eb.h | 4 +- + .../{include/mach => }/board-pb1176.h | 4 +- + .../{include/mach => }/board-pb11mp.h | 4 +- + .../mach-realview/{include/mach => }/board-pba8.h | 4 +- + .../mach-realview/{include/mach => }/board-pbx.h | 4 +- + arch/arm/mach-realview/core.c | 6 +- + arch/arm/mach-realview/core.h | 4 +- + .../mach-realview/{include/mach => }/hardware.h | 2 - + arch/arm/mach-realview/include/mach/barriers.h | 8 - + arch/arm/mach-realview/include/mach/irqs.h | 40 - + arch/arm/mach-realview/include/mach/memory.h | 64 - + arch/arm/mach-realview/include/mach/uncompress.h | 77 -- + .../arm/mach-realview/{include/mach => }/irqs-eb.h | 20 +- + .../mach-realview/{include/mach => }/irqs-pb1176.h | 23 - + .../mach-realview/{include/mach => }/irqs-pb11mp.h | 27 +- + .../mach-realview/{include/mach => }/irqs-pba8.h | 23 - + .../mach-realview/{include/mach => }/irqs-pbx.h | 24 +- + .../mach-realview/{include/mach => }/platform.h | 2 - + arch/arm/mach-realview/platsmp-dt.c | 91 ++ + arch/arm/mach-realview/platsmp.c | 10 +- + arch/arm/mach-realview/realview-dt.c | 1 - + arch/arm/mach-realview/realview_eb.c | 13 +- + arch/arm/mach-realview/realview_pb1176.c | 6 +- + arch/arm/mach-realview/realview_pb11mp.c | 12 +- + arch/arm/mach-realview/realview_pba8.c | 14 +- + arch/arm/mach-realview/realview_pbx.c | 14 +- + arch/arm/mach-rockchip/Kconfig | 3 +- + arch/arm/mach-rockchip/platsmp.c | 47 +- + arch/arm/mach-rockchip/rockchip.c | 1 + + arch/arm/mach-s3c24xx/include/mach/pm-core.h | 14 + + arch/arm/mach-s3c24xx/irq-pm.c | 11 +- + arch/arm/mach-s3c64xx/Kconfig | 31 +- + arch/arm/mach-s3c64xx/Makefile | 24 +- + arch/arm/mach-s3c64xx/common.c | 5 +- + arch/arm/mach-s3c64xx/cpuidle.c | 5 +- + arch/arm/mach-s3c64xx/dev-uart.c | 1 + + arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 38 - + arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h | 3 + + arch/arm/mach-s3c64xx/include/mach/irqs.h | 20 +- + arch/arm/mach-s3c64xx/include/mach/pm-core.h | 9 +- + arch/arm/mach-s3c64xx/irq-pm.c | 2 +- + arch/arm/mach-s3c64xx/mach-anw6410.c | 3 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 6 + + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 + + arch/arm/mach-s3c64xx/mach-hmt.c | 2 + + arch/arm/mach-s3c64xx/mach-mini6410.c | 5 +- + arch/arm/mach-s3c64xx/mach-ncp.c | 2 + + arch/arm/mach-s3c64xx/mach-real6410.c | 6 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 16 +- + arch/arm/mach-s3c64xx/mach-smartq5.c | 2 + + arch/arm/mach-s3c64xx/mach-smartq7.c | 2 + + arch/arm/mach-s3c64xx/mach-smdk6400.c | 3 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 6 +- + arch/arm/mach-s3c64xx/pl080.c | 4 + + arch/arm/mach-s3c64xx/pm.c | 4 + + arch/arm/mach-s3c64xx/s3c6400.c | 2 +- + arch/arm/mach-s3c64xx/s3c6410.c | 2 +- + arch/arm/mach-s5pv210/Kconfig | 3 +- + arch/arm/mach-sa1100/simpad.c | 4 +- + arch/arm/mach-shmobile/Kconfig | 14 +- + arch/arm/mach-shmobile/include/mach/irqs.h | 10 - + arch/arm/mach-shmobile/irqs.h | 15 - + arch/arm/mach-shmobile/r8a7779.h | 2 +- + arch/arm/mach-shmobile/r8a7790.h | 2 +- + arch/arm/mach-shmobile/r8a7791.h | 2 +- + arch/arm/mach-shmobile/setup-emev2.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 1 - + arch/arm/mach-shmobile/sh73a0.h | 2 +- + arch/arm/mach-shmobile/smp-emev2.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7791.c | 2 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- + arch/arm/mach-socfpga/Kconfig | 3 +- + arch/arm/mach-socfpga/platsmp.c | 4 +- + arch/arm/mach-spear/Kconfig | 3 +- + arch/arm/mach-spear/generic.h | 2 +- + arch/arm/mach-spear/platsmp.c | 2 +- + arch/arm/mach-sti/Kconfig | 3 +- + arch/arm/mach-sti/platsmp.c | 2 +- + arch/arm/mach-sti/smp.h | 2 +- + arch/arm/mach-sunxi/Kconfig | 3 +- + arch/arm/mach-sunxi/platsmp.c | 4 +- + arch/arm/mach-tango/Kconfig | 12 + + arch/arm/mach-tango/Makefile | 5 + + arch/arm/mach-tango/platsmp.c | 16 + + arch/arm/mach-tango/setup.c | 17 + + arch/arm/mach-tango/smc.S | 9 + + arch/arm/mach-tango/smc.h | 5 + + arch/arm/mach-tegra/Kconfig | 55 +- + arch/arm/mach-tegra/common.h | 2 +- + arch/arm/mach-tegra/platsmp.c | 2 +- + arch/arm/mach-tegra/sleep-tegra20.S | 3 + + arch/arm/mach-tegra/sleep-tegra30.S | 3 + + arch/arm/mach-u300/Kconfig | 4 +- + arch/arm/mach-uniphier/Kconfig | 1 + + arch/arm/mach-uniphier/platsmp.c | 2 +- + arch/arm/mach-ux500/Kconfig | 4 +- + arch/arm/mach-ux500/Makefile | 2 +- + arch/arm/mach-ux500/cpu-db8500.c | 2 - + arch/arm/mach-ux500/cpu.c | 1 - + arch/arm/mach-ux500/platsmp.c | 2 +- + arch/arm/mach-ux500/setup.h | 3 - + arch/arm/mach-ux500/timer.c | 48 - + arch/arm/mach-versatile/Kconfig | 41 +- + arch/arm/mach-versatile/Makefile | 6 +- + arch/arm/mach-versatile/Makefile.boot | 4 - + arch/arm/mach-versatile/core.c | 808 ------------ + arch/arm/mach-versatile/core.h | 46 - + arch/arm/mach-versatile/include/mach/clkdev.h | 16 - + arch/arm/mach-versatile/include/mach/hardware.h | 38 - + arch/arm/mach-versatile/include/mach/irqs.h | 134 -- + arch/arm/mach-versatile/include/mach/platform.h | 416 ------- + arch/arm/mach-versatile/include/mach/uncompress.h | 45 - + arch/arm/mach-versatile/pci.c | 368 ------ + arch/arm/mach-versatile/versatile_ab.c | 44 - + arch/arm/mach-versatile/versatile_dt.c | 376 +++++- + arch/arm/mach-versatile/versatile_pb.c | 91 -- + arch/arm/mach-vexpress/Kconfig | 3 +- + arch/arm/mach-vexpress/core.h | 2 +- + arch/arm/mach-vexpress/platsmp.c | 2 +- + arch/arm/mach-w90x900/cpu.c | 4 +- + .../arm/mach-w90x900/{include/mach => }/regs-ebi.h | 0 + .../arm/mach-w90x900/{include/mach => }/regs-gcr.h | 0 + .../mach-w90x900/{include/mach => }/regs-timer.h | 0 + .../arm/mach-w90x900/{include/mach => }/regs-usb.h | 0 + arch/arm/mach-w90x900/time.c | 2 +- + arch/arm/mach-zx/Kconfig | 3 +- + arch/arm/mach-zx/platsmp.c | 2 +- + arch/arm/mach-zynq/Kconfig | 4 +- + arch/arm/mach-zynq/common.h | 2 +- + arch/arm/mach-zynq/platsmp.c | 2 +- + arch/arm/mm/Kconfig | 32 +- + arch/arm/mm/idmap.c | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm/mm/proc-mohawk.S | 2 + + arch/arm/plat-omap/dmtimer.c | 42 +- + arch/arm/plat-orion/common.c | 21 - + arch/arm/plat-orion/include/plat/common.h | 2 - + arch/arm/plat-orion/irq.c | 1 - + arch/arm/plat-orion/mpp.c | 1 - + arch/arm/plat-pxa/Makefile | 3 +- + arch/arm/plat-pxa/ssp.c | 1 - + arch/arm/plat-samsung/Kconfig | 5 +- + arch/arm/plat-samsung/Makefile | 5 +- + arch/arm/plat-samsung/devs.c | 22 +- + .../gpio => arch/arm/plat-samsung}/gpio-samsung.c | 12 +- + arch/arm/plat-samsung/include/plat/pm.h | 8 - + arch/arm/plat-samsung/init.c | 5 + + arch/arm/plat-samsung/pm.c | 4 - + arch/arm64/Kconfig.platforms | 37 +- + arch/arm64/boot/dts/Makefile | 3 + + arch/arm64/boot/dts/apm/apm-merlin.dts | 12 + + arch/arm64/boot/dts/apm/apm-mustang.dts | 4 + + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 391 +++++- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 114 +- + arch/arm64/boot/dts/arm/juno-r1.dts | 28 + + arch/arm64/boot/dts/arm/juno.dts | 28 + + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 26 +- + arch/arm64/boot/dts/broadcom/ns2.dtsi | 200 ++- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 282 ++++- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 7 + + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 116 ++ + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 527 ++++++++ + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 68 + + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 1 + + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 63 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 13 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 35 +- + arch/arm64/boot/dts/nvidia/Makefile | 7 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 1130 +++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 990 +++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 45 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 50 + + arch/arm64/boot/dts/nvidia/tegra210-p2571.dts | 1302 ++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi | 1272 +++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1270 +++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 805 ++++++++++++ + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 18 + + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 19 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 107 ++ + arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 +- + arch/arm64/boot/dts/renesas/Makefile | 4 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 251 ++++ + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 779 ++++++++++++ + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../arm64/boot/dts/rockchip/rk3368-evb-act8846.dts | 176 +++ + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 281 +++++ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 6 + + arch/arm64/boot/dts/rockchip/rk3368-thermal.dtsi | 112 ++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 105 +- + arch/arm64/boot/dts/socionext/Makefile | 4 + + .../boot/dts/socionext/uniphier-ph1-ld10-ref.dts | 95 ++ + .../boot/dts/socionext/uniphier-ph1-ld10.dtsi | 280 +++++ + .../arm64/boot/dts/socionext/uniphier-pinctrl.dtsi | 1 + + .../boot/dts/socionext/uniphier-support-card.dtsi | 1 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 + + arch/arm64/configs/defconfig | 27 +- + drivers/amba/Kconfig | 2 +- + drivers/bus/Kconfig | 8 + + drivers/bus/Makefile | 1 + + drivers/bus/uniphier-system-bus.c | 281 +++++ + drivers/clk/mmp/clk-mmp2.c | 11 +- + drivers/clk/mmp/clk-pxa168.c | 11 +- + drivers/clk/mmp/clk-pxa910.c | 13 +- + drivers/clk/pxa/clk-pxa25x.c | 1 - + drivers/clk/samsung/clk-exynos4.c | 1 + + drivers/clk/ti/clk-814x.c | 4 + + drivers/clk/versatile/Kconfig | 5 +- + drivers/clk/versatile/clk-icst.c | 194 ++- + drivers/clk/versatile/clk-realview.c | 10 +- + drivers/clocksource/clksrc-dbx500-prcmu.c | 9 +- + drivers/gpio/Kconfig | 7 - + drivers/gpio/Makefile | 1 - + drivers/iio/adc/exynos_adc.c | 224 +++- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/irqchip/irq-versatile-fpga.c | 5 - + drivers/memory/tegra/tegra124.c | 1 + + drivers/reset/Kconfig | 1 + + drivers/reset/Makefile | 3 +- + drivers/reset/core.c | 60 +- + drivers/reset/hisilicon/Kconfig | 5 + + drivers/reset/hisilicon/Makefile | 1 + + drivers/reset/hisilicon/hi6220_reset.c | 109 ++ + drivers/reset/reset-ath79.c | 30 +- + drivers/reset/reset-berlin.c | 4 +- + drivers/reset/reset-socfpga.c | 3 +- + drivers/reset/reset-sunxi.c | 5 +- + drivers/reset/reset-zynq.c | 3 +- + drivers/reset/sti/reset-stih407.c | 5 + + drivers/reset/sti/reset-syscfg.c | 27 +- + drivers/soc/Kconfig | 2 + + drivers/soc/Makefile | 2 + + drivers/soc/bcm/Kconfig | 9 + + drivers/soc/bcm/Makefile | 1 + + drivers/soc/bcm/raspberrypi-power.c | 247 ++++ + drivers/soc/dove/pmu.c | 43 + + drivers/soc/mediatek/mtk-scpsys.c | 32 +- + drivers/soc/qcom/Kconfig | 27 + + drivers/soc/qcom/Makefile | 4 + + drivers/soc/qcom/smd-rpm.c | 2 + + drivers/soc/qcom/smem_state.c | 201 +++ + drivers/soc/qcom/smp2p.c | 578 +++++++++ + drivers/soc/qcom/smsm.c | 625 ++++++++++ + drivers/soc/qcom/wcnss_ctrl.c | 272 ++++ + drivers/soc/tegra/Kconfig | 83 ++ + drivers/soc/ti/Kconfig | 10 + + drivers/soc/ti/Makefile | 1 + + drivers/soc/ti/wkup_m3_ipc.c | 508 ++++++++ + drivers/soc/versatile/soc-realview.c | 4 + + drivers/staging/board/armadillo800eva.c | 2 +- + drivers/staging/board/kzm9d.c | 2 +- + drivers/tty/serial/Kconfig | 2 +- + drivers/usb/host/Kconfig | 2 + + include/dt-bindings/clock/exynos4.h | 1 + + include/dt-bindings/clock/r8a7791-clock.h | 1 + + include/dt-bindings/clock/r8a7794-clock.h | 1 + + include/dt-bindings/clock/sh73a0-clock.h | 6 +- + include/dt-bindings/pinctrl/am43xx.h | 6 + + include/dt-bindings/pinctrl/dm814x.h | 48 + + include/dt-bindings/pinctrl/dra.h | 6 + + include/dt-bindings/pinctrl/omap.h | 3 +- + include/dt-bindings/power/raspberrypi-power.h | 41 + + include/dt-bindings/reset/hisi,hi6220-resets.h | 67 + + .../{reset-controller => reset}/mt8135-resets.h | 0 + .../{reset-controller => reset}/mt8173-resets.h | 0 + include/dt-bindings/reset/stih407-resets.h | 4 + + include/linux/clk/mmp.h | 17 + + include/linux/clk/ti.h | 1 + + include/linux/clksrc-dbx500-prcmu.h | 20 - + include/linux/platform_data/iommu-omap.h | 9 - + include/linux/platform_data/touchscreen-s3c2410.h | 1 + + include/linux/reset.h | 17 +- + include/linux/soc/dove/pmu.h | 19 + + include/linux/soc/qcom/smem_state.h | 18 + + include/linux/wkup_m3_ipc.h | 55 + + include/soc/bcm2835/raspberrypi-firmware.h | 2 + + sound/soc/samsung/smartq_wm8987.c | 76 +- + 1018 files changed, 38861 insertions(+), 9290 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt + create mode 100644 Documentation/devicetree/bindings/arm/compulab-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/technologic.txt + create mode 100644 Documentation/devicetree/bindings/bus/uniphier-system-bus.txt + create mode 100644 Documentation/devicetree/bindings/clock/arm-syscon-icst.txt + create mode 100644 Documentation/devicetree/bindings/clock/dove-divider-clock.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/startek,startek-kd050c.txt + create mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt + create mode 100644 Documentation/devicetree/bindings/soc/bcm/raspberrypi,bcm2835-power.txt + create mode 100644 Documentation/devicetree/bindings/soc/dove/pmu.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt + create mode 100644 Documentation/devicetree/bindings/soc/ti/wkup_m3_ipc.txt + rename Documentation/devicetree/bindings/watchdog/{meson6-wdt.txt => meson-wdt.txt} (75%) + create mode 100644 Documentation/devicetree/bindings/watchdog/sp805-wdt.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-cm-t335.dts + create mode 100644 arch/arm/boot/dts/am335x-sbc-t335.dts + create mode 100644 arch/arm/boot/dts/am335x-shc.dts + create mode 100644 arch/arm/boot/dts/am437x-cm-t43.dts + create mode 100644 arch/arm/boot/dts/am437x-sbc-t43.dts + create mode 100644 arch/arm/boot/dts/am57xx-cl-som-am57x.dts + create mode 100644 arch/arm/boot/dts/am57xx-sbc-am57x.dts + create mode 100644 arch/arm/boot/dts/arm-realview-pb11mp.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog.dts + create mode 100644 arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts + create mode 100644 arch/arm/boot/dts/at91-vinco.dts + create mode 100644 arch/arm/boot/dts/bcm2836-rpi-2-b.dts + create mode 100644 arch/arm/boot/dts/bcm2836.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x.dtsi + create mode 100644 arch/arm/boot/dts/bcm94708.dts + create mode 100644 arch/arm/boot/dts/bcm94709.dts + create mode 100644 arch/arm/boot/dts/bcm953012k.dts + create mode 100644 arch/arm/boot/dts/compulab-sb-som.dtsi + create mode 100644 arch/arm/boot/dts/dra62x-clocks.dtsi + create mode 100644 arch/arm/boot/dts/dra62x-j5eco-evm.dts + create mode 100644 arch/arm/boot/dts/dra62x.dtsi + create mode 100644 arch/arm/boot/dts/imx51-ts4800.dts + create mode 100644 arch/arm/boot/dts/imx6q-novena.dts + create mode 100644 arch/arm/boot/dts/imx7d-cl-som-imx7.dts + create mode 100644 arch/arm/boot/dts/imx7d-sbc-imx7.dts + create mode 100644 arch/arm/boot/dts/kirkwood-nsa325.dts + create mode 100644 arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts + rename arch/arm/{mach-netx/include/mach/param.h => boot/dts/mt2701-evb.dts} (50%) + create mode 100644 arch/arm/boot/dts/mt2701.dtsi + create mode 100644 arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts + delete mode 100644 arch/arm/boot/dts/r8a7791-henninger.dts + create mode 100644 arch/arm/boot/dts/rk3036-evb.dts + create mode 100644 arch/arm/boot/dts/rk3036-kylin.dts + create mode 100644 arch/arm/boot/dts/rk3036.dtsi + create mode 100644 arch/arm/boot/dts/rk3228-evb.dts + create mode 100644 arch/arm/boot/dts/rk3228.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-veyron-brain.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-mickey.dts + create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi + create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-icnova-swac.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3.dtsi + create mode 100644 arch/arm/boot/dts/tango4-common.dtsi + create mode 100644 arch/arm/boot/dts/tango4-smp8758.dtsi + create mode 100644 arch/arm/boot/dts/tango4-vantage-1172.dts + delete mode 100644 arch/arm/boot/dts/tps65217.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-common32.dtsi + create mode 100644 arch/arm/boot/dts/vf610m4-cosmic.dts + create mode 100644 arch/arm/configs/pxa_defconfig + rename arch/arm/{mach-footbridge/include/mach/debug-macro.S => include/debug/dc21285.S} (100%) + rename arch/arm/mach-bcm/{kona_smp.c => platsmp.c} (62%) + rename arch/arm/mach-davinci/{include/mach => }/cp_intc.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/cpuidle.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/ddr2.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/psc.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/sram.h (100%) + delete mode 100644 arch/arm/mach-dove/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-iop13xx/include/mach/pci.h + rename arch/arm/mach-iop13xx/{include/mach => }/msi.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/devices.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-hpna.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-lan.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-mem.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-pci.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-sys.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-wan.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/addr-map.h (96%) + rename arch/arm/mach-mmp/{include/mach => }/cputype.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/devices.h (100%) + delete mode 100644 arch/arm/mach-mmp/include/mach/dma.h + delete mode 100644 arch/arm/mach-mmp/include/mach/hardware.h + delete mode 100644 arch/arm/mach-mmp/include/mach/regs-smc.h + delete mode 100644 arch/arm/mach-mmp/include/mach/uncompress.h + rename arch/arm/mach-mmp/{include/mach => }/irqs.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/mfp-mmp2.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/mfp-pxa168.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/mfp-pxa910.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/mfp.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/mmp2.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/pm-mmp2.h (98%) + rename arch/arm/mach-mmp/{include/mach => }/pm-pxa910.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/pxa168.h (98%) + rename arch/arm/mach-mmp/{include/mach => }/pxa910.h (98%) + rename arch/arm/mach-mmp/{include/mach => }/regs-apbc.h (88%) + rename arch/arm/mach-mmp/{include/mach => }/regs-apmu.h (91%) + rename arch/arm/mach-mmp/{include/mach => }/regs-icu.h (96%) + rename arch/arm/mach-mmp/{include/mach => }/regs-timers.h (93%) + rename arch/arm/mach-mmp/{include/mach => }/regs-usb.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/teton_bga.h (92%) + rename arch/arm/mach-mv78xx0/{include/mach => }/bridge-regs.h (92%) + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/hardware.h + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/uncompress.h + rename arch/arm/mach-mv78xx0/{include/mach => }/irqs.h (95%) + rename arch/arm/mach-mv78xx0/{include/mach => }/mv78xx0.h (98%) + delete mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h + rename arch/arm/mach-omap1/{include/mach => }/board-sx1.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/camera.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/flash.h (100%) + delete mode 100644 arch/arm/mach-omap2/omap-iommu.c + rename arch/arm/mach-orion5x/{include/mach => }/bridge-regs.h (92%) + delete mode 100644 arch/arm/mach-orion5x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-orion5x/include/mach/hardware.h + delete mode 100644 arch/arm/mach-orion5x/include/mach/uncompress.h + rename arch/arm/mach-orion5x/{include/mach => }/irqs.h (94%) + rename arch/arm/mach-orion5x/{include/mach => }/orion5x.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/colibri.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/csb726.h (93%) + rename arch/arm/mach-pxa/{include/mach => }/eseries-irq.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/gumstix.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/h5000.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/idp.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/littleton.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/lpd270.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa25x.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa27x.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa2xx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa300.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa320.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa3xx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa930.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mioa701.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mxm8x10.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palm27x.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palmt5.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/palmte2.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palmtreo.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palmz72.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pcm027.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/pcm990_baseboard.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/pm.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pxa25x.h (84%) + rename arch/arm/mach-pxa/{include/mach => }/pxa27x-udc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pxa27x.h (97%) + rename arch/arm/mach-pxa/{include/mach => }/pxa300.h (59%) + rename arch/arm/mach-pxa/{include/mach => }/pxa320.h (59%) + rename arch/arm/mach-pxa/{include/mach => }/pxa3xx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pxa930.h (59%) + rename arch/arm/mach-pxa/{include/mach => }/regs-rtc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/regs-u2d.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/sharpsl_pm.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/tosa_bt.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/udc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/viper.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/zeus.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/zylonite.h (100%) + rename arch/arm/mach-realview/{include/mach => }/board-eb.h (97%) + rename arch/arm/mach-realview/{include/mach => }/board-pb1176.h (97%) + rename arch/arm/mach-realview/{include/mach => }/board-pb11mp.h (98%) + rename arch/arm/mach-realview/{include/mach => }/board-pba8.h (97%) + rename arch/arm/mach-realview/{include/mach => }/board-pbx.h (98%) + rename arch/arm/mach-realview/{include/mach => }/hardware.h (95%) + delete mode 100644 arch/arm/mach-realview/include/mach/barriers.h + delete mode 100644 arch/arm/mach-realview/include/mach/irqs.h + delete mode 100644 arch/arm/mach-realview/include/mach/memory.h + delete mode 100644 arch/arm/mach-realview/include/mach/uncompress.h + rename arch/arm/mach-realview/{include/mach => }/irqs-eb.h (91%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pb1176.h (87%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pb11mp.h (90%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pba8.h (87%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pbx.h (90%) + rename arch/arm/mach-realview/{include/mach => }/platform.h (99%) + create mode 100644 arch/arm/mach-realview/platsmp-dt.c + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h + delete mode 100644 arch/arm/mach-shmobile/irqs.h + create mode 100644 arch/arm/mach-tango/Kconfig + create mode 100644 arch/arm/mach-tango/Makefile + create mode 100644 arch/arm/mach-tango/platsmp.c + create mode 100644 arch/arm/mach-tango/setup.c + create mode 100644 arch/arm/mach-tango/smc.S + create mode 100644 arch/arm/mach-tango/smc.h + delete mode 100644 arch/arm/mach-ux500/timer.c + delete mode 100644 arch/arm/mach-versatile/Makefile.boot + delete mode 100644 arch/arm/mach-versatile/core.c + delete mode 100644 arch/arm/mach-versatile/core.h + delete mode 100644 arch/arm/mach-versatile/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-versatile/include/mach/hardware.h + delete mode 100644 arch/arm/mach-versatile/include/mach/irqs.h + delete mode 100644 arch/arm/mach-versatile/include/mach/platform.h + delete mode 100644 arch/arm/mach-versatile/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-versatile/pci.c + delete mode 100644 arch/arm/mach-versatile/versatile_ab.c + delete mode 100644 arch/arm/mach-versatile/versatile_pb.c + rename arch/arm/mach-w90x900/{include/mach => }/regs-ebi.h (100%) + rename arch/arm/mach-w90x900/{include/mach => }/regs-gcr.h (100%) + rename arch/arm/mach-w90x900/{include/mach => }/regs-timer.h (100%) + rename arch/arm/mach-w90x900/{include/mach => }/regs-usb.h (100%) + rename {drivers/gpio => arch/arm/plat-samsung}/gpio-samsung.c (99%) + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/Makefile + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2571.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/Makefile + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-thermal.dtsi + create mode 100644 arch/arm64/boot/dts/socionext/Makefile + create mode 100644 arch/arm64/boot/dts/socionext/uniphier-ph1-ld10-ref.dts + create mode 100644 arch/arm64/boot/dts/socionext/uniphier-ph1-ld10.dtsi + create mode 120000 arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi + create mode 120000 arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi + create mode 100644 drivers/bus/uniphier-system-bus.c + create mode 100644 drivers/reset/hisilicon/Kconfig + create mode 100644 drivers/reset/hisilicon/Makefile + create mode 100644 drivers/reset/hisilicon/hi6220_reset.c + create mode 100644 drivers/soc/bcm/Kconfig + create mode 100644 drivers/soc/bcm/Makefile + create mode 100644 drivers/soc/bcm/raspberrypi-power.c + create mode 100644 drivers/soc/qcom/smem_state.c + create mode 100644 drivers/soc/qcom/smp2p.c + create mode 100644 drivers/soc/qcom/smsm.c + create mode 100644 drivers/soc/qcom/wcnss_ctrl.c + create mode 100644 drivers/soc/tegra/Kconfig + create mode 100644 drivers/soc/ti/wkup_m3_ipc.c + create mode 100644 include/dt-bindings/pinctrl/dm814x.h + create mode 100644 include/dt-bindings/power/raspberrypi-power.h + create mode 100644 include/dt-bindings/reset/hisi,hi6220-resets.h + rename include/dt-bindings/{reset-controller => reset}/mt8135-resets.h (100%) + rename include/dt-bindings/{reset-controller => reset}/mt8173-resets.h (100%) + create mode 100644 include/linux/clk/mmp.h + delete mode 100644 include/linux/clksrc-dbx500-prcmu.h + create mode 100644 include/linux/soc/qcom/smem_state.h + create mode 100644 include/linux/wkup_m3_ipc.h +Merging at91/at91-next (f2837af0c89d Merge branch 'at91-4.5-defconfig' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging bcm2835-dt/bcm2835-dt-next (53b6084357a4 ARM: bcm2835: Add the auxiliary clocks to the device tree.) +$ git merge bcm2835-dt/bcm2835-dt-next +Merge made by the 'recursive' strategy. +Merging bcm2835-soc/bcm2835-soc-next (5234c34e4cd7 ARM: bcm2835: Add Kconfig support for bcm2836) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (a09cd356586d ARM: bcm2835: add rpi power domain driver) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (b63074fccbeb ARM: bcm2835: enable auxiliary spi driver in defconfig) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' 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 (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (c6abe665c94f Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (64c3c928aef2 Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. +Merging omap/for-next (95c5bf2f0552 Merge branch 'omap-for-v4.4/fixes' into for-next) +$ git merge omap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 72b64ba5cb56] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging qcom/for-next (e654927c5ff7 ARM: qcom: Drop ARCH_MSM* configs) +$ git merge qcom/for-next +Auto-merging arch/arm/mach-qcom/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + arch/arm/Makefile | 3 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm/mach-qcom/Kconfig | 17 +- + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 21 ++ + arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 30 +++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 267 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/pm8004.dtsi | 19 ++ + arch/arm64/boot/dts/qcom/pm8994.dtsi | 62 +++++ + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 19 ++ + drivers/firmware/qcom_scm-32.c | 82 +++++++ + drivers/firmware/qcom_scm-64.c | 25 ++ + drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++++- + drivers/firmware/qcom_scm.h | 12 + + include/linux/qcom_scm.h | 6 + + 17 files changed, 854 insertions(+), 18 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8996.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8004.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8994.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmi8994.dtsi +Merging renesas/next (23a0d0a54a30 Merge branch 'heads/dt-fixes-for-v4.5' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + drivers/sh/clk/core.c | 100 ++++++------------------------------------------- + include/linux/sh_clk.h | 4 -- + 2 files changed, 12 insertions(+), 92 deletions(-) +Merging rockchip/for-next (755651cf0f31 Merge tag 'v4.4-rc5' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-rockchip/rockchip.c | 44 ++++++++++++++++++++++++--------------- + 1 file changed, 27 insertions(+), 17 deletions(-) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (94c286811b3b Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig.platforms | 11 ++--------- + arch/arm64/boot/dts/exynos/Makefile | 2 +- + arch/arm64/configs/defconfig | 2 +- + drivers/clk/samsung/Kconfig | 6 ++++++ + drivers/clk/samsung/Makefile | 4 ++-- + 5 files changed, 12 insertions(+), 13 deletions(-) +Merging sunxi/sunxi/for-next (97dd53d76893 Merge branches 'sunxi/clocks-for-4.5' and 'sunxi/dt-for-4.5' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (92b100361a4e Merge branch for-4.5/defconfig into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (2a803c4db615 arm64: head.S: use memset to clear BSS) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. + arch/cris/arch-v10/kernel/debugport.c | 22 +++++++++++----------- + arch/cris/arch-v10/kernel/head.S | 6 ++++-- + arch/cris/arch-v32/kernel/head.S | 6 ++++-- + arch/cris/kernel/vmlinux.lds.S | 1 + + 4 files changed, 20 insertions(+), 15 deletions(-) +Merging h8300/h8300-next (98b8502d97c0 h8300: System call entry enable interrupt.) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + .../bindings/clock/renesas,h8300-div-clock.txt | 2 +- + arch/h8300/Kconfig | 2 + + arch/h8300/boot/compressed/Makefile | 11 +- + arch/h8300/boot/compressed/misc.c | 6 + + arch/h8300/boot/compressed/vmlinux.lds | 4 +- + arch/h8300/include/asm/io.h | 8 +- + arch/h8300/include/asm/kgdb.h | 45 +++++++ + arch/h8300/include/asm/traps.h | 2 +- + arch/h8300/kernel/Makefile | 2 + + arch/h8300/kernel/entry.S | 19 +++ + arch/h8300/kernel/kgdb.c | 135 +++++++++++++++++++++ + arch/h8300/kernel/signal.c | 8 +- + arch/h8300/kernel/traps.c | 20 ++- + drivers/irqchip/irq-renesas-h8s.c | 10 +- + 14 files changed, 243 insertions(+), 31 deletions(-) + create mode 100644 arch/h8300/include/asm/kgdb.h + create mode 100644 arch/h8300/kernel/kgdb.c +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys()) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (4693c2493a9b m68k: coldfire/gpio: Be sure to clamp return value) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init) +$ git merge metag/for-next +Auto-merging arch/metag/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/metag/kernel/ftrace.c | 1 - + 1 file changed, 1 deletion(-) +Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/uapi/asm/unistd.h | 3 +++ + arch/microblaze/kernel/syscall_table.S | 3 +++ + 3 files changed, 7 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (544f742d0c2a Merge branch '4.4-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/mediatek,mt7620-gsw.txt | 26 ++ + .../devicetree/bindings/net/ralink,rt2880-net.txt | 61 +++ + .../devicetree/bindings/net/ralink,rt3050-esw.txt | 32 ++ + .../devicetree/bindings/phy/phy-ath79-usb.txt | 18 + + MAINTAINERS | 12 + + arch/mips/ath79/common.h | 1 - + arch/mips/ath79/irq.c | 61 ++- + arch/mips/ath79/setup.c | 11 +- + arch/mips/bcm47xx/sprom.c | 12 +- + arch/mips/bmips/setup.c | 1 + + arch/mips/boot/dts/ingenic/ci20.dts | 127 ++++++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 52 +++ + arch/mips/boot/dts/qca/ar9132.dtsi | 26 ++ + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 8 + + arch/mips/include/asm/mach-ath79/ath79.h | 1 + + arch/mips/include/asm/mach-ralink/irq.h | 9 + + arch/mips/include/asm/mach-ralink/mt7621.h | 38 ++ + .../asm/mach-ralink/mt7621/cpu-feature-overrides.h | 65 ++++ + arch/mips/pci/Makefile | 1 + + arch/mips/pci/pci-mt7620.c | 426 +++++++++++++++++++++ + arch/mips/ralink/Kconfig | 16 + + arch/mips/ralink/Makefile | 10 +- + arch/mips/ralink/Platform | 5 + + arch/mips/ralink/irq-gic.c | 25 ++ + arch/mips/ralink/mt7620.c | 87 +++-- + arch/mips/ralink/mt7621.c | 226 +++++++++++ + arch/mips/ralink/rt288x.c | 2 +- + arch/mips/ralink/rt305x.c | 1 + + arch/mips/ralink/rt3883.c | 1 + + arch/mips/ralink/timer-gic.c | 24 ++ + 30 files changed, 1304 insertions(+), 81 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/mediatek,mt7620-gsw.txt + create mode 100644 Documentation/devicetree/bindings/net/ralink,rt2880-net.txt + create mode 100644 Documentation/devicetree/bindings/net/ralink,rt3050-esw.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-ath79-usb.txt + create mode 100644 arch/mips/include/asm/mach-ralink/irq.h + create mode 100644 arch/mips/include/asm/mach-ralink/mt7621.h + create mode 100644 arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h + create mode 100644 arch/mips/pci/pci-mt7620.c + create mode 100644 arch/mips/ralink/irq-gic.c + create mode 100644 arch/mips/ralink/mt7621.c + create mode 100644 arch/mips/ralink/timer-gic.c +Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (be6bfc29bc75 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (c2ab7282f0fc s390/sclp: fix possible control register corruption) +$ git merge s390/features +Already up-to-date. +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (00d27c6336b0 numa: remove stale node_has_online_mem() define) +$ git merge tile/master +Already up-to-date. +Merging uml/linux-next (3e46b2537632 um: Use race-free temporary file creation) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (afaa7c542cc9 Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (583d0fef756a libceph: clear msg->con in ceph_msg_release() only) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (01b9b0b28626 cifs_dbg() outputs an uninitialized buffer in cifs_readdir()) +$ git merge cifs/for-next +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 2 +- + fs/cifs/cifs_debug.h | 9 ++--- + fs/cifs/cifsfs.c | 17 ++++++++ + fs/cifs/cifsglob.h | 16 ++++++-- + fs/cifs/cifsproto.h | 5 ++- + fs/cifs/connect.c | 36 +++++++++++++---- + fs/cifs/inode.c | 24 +++++++++++- + fs/cifs/misc.c | 2 +- + fs/cifs/readdir.c | 1 + + fs/cifs/smb2misc.c | 36 ++++++++++++++--- + fs/cifs/smb2ops.c | 13 ++++-- + fs/cifs/smb2pdu.c | 10 ++--- + fs/cifs/smb2pdu.h | 8 ++-- + fs/cifs/smb2proto.h | 3 +- + fs/cifs/smb2transport.c | 102 +++++++++++++++++++++++++++++++++++++++++++++--- + fs/cifs/transport.c | 6 ++- + 16 files changed, 238 insertions(+), 52 deletions(-) +Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (bb00c898ad1c udf: Check output buffer length when converting name to CS0) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (9f053aee1bb8 fs: clean up the flags definition in uapi/linux/fs.h) +$ git merge ext4/dev +Auto-merging include/uapi/linux/fs.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/inode.c +Merge made by the 'recursive' strategy. + fs/ext4/crypto.c | 6 +- + fs/ext4/crypto_key.c | 4 + + fs/ext4/ext4.h | 62 ++++++-- + fs/ext4/extents.c | 153 +++++++++--------- + fs/ext4/file.c | 82 +++++++--- + fs/ext4/ialloc.c | 7 + + fs/ext4/inline.c | 10 +- + fs/ext4/inode.c | 268 ++++++++++++++++++++++++------- + fs/ext4/ioctl.c | 376 ++++++++++++++++++++++++++++++++++---------- + fs/ext4/namei.c | 34 ++-- + fs/ext4/super.c | 97 +++++++++++- + fs/ext4/truncate.h | 2 + + fs/xfs/libxfs/xfs_fs.h | 47 ++---- + include/trace/events/ext4.h | 2 +- + include/uapi/linux/fs.h | 63 +++++++- + 15 files changed, 907 insertions(+), 306 deletions(-) +Merging f2fs/dev (7fdec82af6a9 Merge tag 'xfs-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 73 +++++++++++++++++++++++++++++++++++++++++------ + fs/fuse/fuse_i.h | 3 ++ + include/uapi/linux/fuse.h | 17 ++++++++++- + 3 files changed, 84 insertions(+), 9 deletions(-) +Merging gfs2/for-next (7508abc4bdac GFS2: Check if iopen is held when deleting inode) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 1 + + fs/gfs2/super.c | 26 ++++++++++++++++---------- + 2 files changed, 17 insertions(+), 10 deletions(-) +Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (44aab3e09ef9 NFS: Fix a compile warning about unused variable in nfs_generic_pg_pgios()) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (ee2bf98bbe90 NFSv4: fix getacl ERANGE for some ACL buffer sizes) +$ git merge nfsd/nfsd-next +Auto-merging fs/nfs/nfs4proc.c +Merge made by the 'recursive' strategy. + fs/nfs/nfs4proc.c | 40 +++++++++++++++------------------------- + 1 file changed, 15 insertions(+), 25 deletions(-) +Merging orangefs/for-next (5e1f3938f9e4 Orangefs: merge with V4.4) +$ git merge orangefs/for-next +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ + Documentation/filesystems/orangefs.txt | 353 ++++++ + MAINTAINERS | 8 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 +++ + fs/orangefs/dcache.c | 120 ++ + fs/orangefs/devorangefs-req.c | 993 ++++++++++++++++ + fs/orangefs/dir.c | 446 +++++++ + fs/orangefs/downcall.h | 133 +++ + fs/orangefs/file.c | 712 +++++++++++ + fs/orangefs/inode.c | 466 ++++++++ + fs/orangefs/namei.c | 446 +++++++ + fs/orangefs/orangefs-bufmap.c | 579 +++++++++ + fs/orangefs/orangefs-bufmap.h | 47 + + fs/orangefs/orangefs-cache.c | 246 ++++ + fs/orangefs/orangefs-debug.h | 92 ++ + fs/orangefs/orangefs-debugfs.c | 457 +++++++ + fs/orangefs/orangefs-debugfs.h | 3 + + fs/orangefs/orangefs-dev-proto.h | 63 + + fs/orangefs/orangefs-kernel.h | 791 ++++++++++++ + fs/orangefs/orangefs-mod.c | 315 +++++ + fs/orangefs/orangefs-sysfs.c | 1787 ++++++++++++++++++++++++++++ + fs/orangefs/orangefs-sysfs.h | 2 + + fs/orangefs/orangefs-utils.c | 1156 ++++++++++++++++++ + fs/orangefs/protocol.h | 444 +++++++ + fs/orangefs/super.c | 545 +++++++++ + fs/orangefs/symlink.c | 31 + + fs/orangefs/upcall.h | 246 ++++ + fs/orangefs/waitqueue.c | 514 ++++++++ + fs/orangefs/xattr.c | 540 +++++++++ + 33 files changed, 11815 insertions(+) + create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs + create mode 100644 Documentation/filesystems/orangefs.txt + create mode 100644 fs/orangefs/Kconfig + create mode 100644 fs/orangefs/Makefile + create mode 100644 fs/orangefs/acl.c + create mode 100644 fs/orangefs/dcache.c + create mode 100644 fs/orangefs/devorangefs-req.c + create mode 100644 fs/orangefs/dir.c + create mode 100644 fs/orangefs/downcall.h + create mode 100644 fs/orangefs/file.c + create mode 100644 fs/orangefs/inode.c + create mode 100644 fs/orangefs/namei.c + create mode 100644 fs/orangefs/orangefs-bufmap.c + create mode 100644 fs/orangefs/orangefs-bufmap.h + create mode 100644 fs/orangefs/orangefs-cache.c + create mode 100644 fs/orangefs/orangefs-debug.h + create mode 100644 fs/orangefs/orangefs-debugfs.c + create mode 100644 fs/orangefs/orangefs-debugfs.h + create mode 100644 fs/orangefs/orangefs-dev-proto.h + create mode 100644 fs/orangefs/orangefs-kernel.h + create mode 100644 fs/orangefs/orangefs-mod.c + create mode 100644 fs/orangefs/orangefs-sysfs.c + create mode 100644 fs/orangefs/orangefs-sysfs.h + create mode 100644 fs/orangefs/orangefs-utils.c + create mode 100644 fs/orangefs/protocol.h + create mode 100644 fs/orangefs/super.c + create mode 100644 fs/orangefs/symlink.c + create mode 100644 fs/orangefs/upcall.h + create mode 100644 fs/orangefs/waitqueue.c + create mode 100644 fs/orangefs/xattr.c +$ git am -3 ../patches/0001-orangfs-update-for-follow_link-to-get_link-change.patch +Applying: orangfs: update for follow_link to get_link change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/orangefs/symlink.c +$ git add -A . +$ git commit -v -a --amend +[master cadf32212beb] Merge remote-tracking branch 'orangefs/for-next' + Date: Tue Jan 19 10:47:50 2016 +1100 +Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts()) +$ git merge overlayfs/overlayfs-next +Auto-merging include/uapi/linux/magic.h +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/overlayfs/copy_up.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 41 ++++++++++++++++++++++++++--------------- + fs/overlayfs/inode.c | 36 ++++++++++++++++++++++++++++++++++++ + fs/overlayfs/overlayfs.h | 3 +++ + fs/overlayfs/readdir.c | 3 ++- + fs/overlayfs/super.c | 35 +++++++++++++++++++++++++++++++++-- + include/uapi/linux/magic.h | 1 + + 6 files changed, 101 insertions(+), 18 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Auto-merging net/9p/trans_virtio.c +Merge made by the 'recursive' strategy. + net/9p/trans_fd.c | 88 +++++++++++++++++++++++++++------------------------ + net/9p/trans_virtio.c | 2 +- + 2 files changed, 47 insertions(+), 43 deletions(-) +Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (dde7f55bd000 Merge branch 'xfs-misc-fixes-for-4.5-2' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (b4d629a39e10 locks: rename __posix_lock_file to posix_lock_inode) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. +Merging pci/next (52e456bb39cc Merge branch 'pci/trivial' into next) +$ git merge pci/next +Resolved 'include/linux/pci_ids.h' using previous resolution. +Auto-merging kernel/irq/msi.c +Auto-merging kernel/irq/irqdomain.c +Auto-merging include/linux/pci_ids.h +CONFLICT (content): Merge conflict in include/linux/pci_ids.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/msi.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/pci/msi.c +Auto-merging drivers/pci/host/pcie-hisi.c +Auto-merging drivers/pci/host/pcie-designware.c +Auto-merging drivers/pci/host/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/kernel/eeh_driver.c +Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi +Auto-merging arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 82c7df672336] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/pci/brcm,iproc-pcie.txt | 40 +- + .../devicetree/bindings/pci/hisilicon-pcie.txt | 8 +- + .../devicetree/bindings/pci/pci-rcar-gen2.txt | 17 +- + .../devicetree/bindings/pci/qcom,pcie.txt | 233 +++++++ + Documentation/devicetree/bindings/pci/rcar-pci.txt | 14 +- + MAINTAINERS | 14 + + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 26 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 36 + + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/pci_of_scan.c | 3 - + arch/x86/Kconfig | 13 + + arch/x86/include/asm/device.h | 10 + + arch/x86/include/asm/hw_irq.h | 5 + + arch/x86/include/asm/pci_x86.h | 10 +- + arch/x86/pci/Makefile | 2 + + arch/x86/pci/common.c | 38 ++ + arch/x86/pci/pcbios.c | 108 ++- + arch/x86/pci/vmd.c | 723 ++++++++++++++++++++ + drivers/pci/access.c | 8 +- + drivers/pci/bus.c | 6 +- + drivers/pci/host/Kconfig | 36 +- + drivers/pci/host/Makefile | 2 + + drivers/pci/host/pci-dra7xx.c | 3 +- + drivers/pci/host/pci-exynos.c | 3 +- + drivers/pci/host/pci-host-generic.c | 9 - + drivers/pci/host/pci-imx6.c | 25 +- + drivers/pci/host/pci-rcar-gen2.c | 77 ++- + drivers/pci/host/pci-tegra.c | 2 +- + drivers/pci/host/pci-versatile.c | 5 +- + drivers/pci/host/pcie-designware.c | 62 +- + drivers/pci/host/pcie-hisi.c | 76 ++- + drivers/pci/host/pcie-iproc-bcma.c | 1 + + drivers/pci/host/pcie-iproc-msi.c | 675 +++++++++++++++++++ + drivers/pci/host/pcie-iproc-platform.c | 25 +- + drivers/pci/host/pcie-iproc.c | 230 ++++++- + drivers/pci/host/pcie-iproc.h | 42 +- + drivers/pci/host/pcie-qcom.c | 616 +++++++++++++++++ + drivers/pci/host/pcie-rcar.c | 206 ++++-- + drivers/pci/host/pcie-spear13xx.c | 3 +- + drivers/pci/host/pcie-xilinx.c | 3 +- + drivers/pci/hotplug/acpi_pcihp.c | 10 +- + drivers/pci/hotplug/acpiphp.h | 2 +- + drivers/pci/hotplug/acpiphp_core.c | 14 +- + drivers/pci/hotplug/acpiphp_glue.c | 2 +- + drivers/pci/hotplug/acpiphp_ibm.c | 19 +- + drivers/pci/hotplug/cpci_hotplug.h | 14 +- + drivers/pci/hotplug/cpci_hotplug_core.c | 16 +- + drivers/pci/hotplug/cpci_hotplug_pci.c | 10 +- + drivers/pci/hotplug/cpcihp_generic.c | 12 +- + drivers/pci/hotplug/cpcihp_zt5550.c | 14 +- + drivers/pci/hotplug/cpqphp.h | 14 +- + drivers/pci/hotplug/cpqphp_core.c | 32 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 200 +++--- + drivers/pci/hotplug/cpqphp_nvram.c | 92 +-- + drivers/pci/hotplug/cpqphp_pci.c | 84 +-- + drivers/pci/hotplug/cpqphp_sysfs.c | 6 +- + drivers/pci/hotplug/ibmphp.h | 12 +- + drivers/pci/hotplug/ibmphp_core.c | 54 +- + drivers/pci/hotplug/ibmphp_ebda.c | 532 ++++++++------- + drivers/pci/hotplug/ibmphp_hpc.c | 388 ++++++----- + drivers/pci/hotplug/ibmphp_pci.c | 730 ++++++++++----------- + drivers/pci/hotplug/ibmphp_res.c | 514 +++++++-------- + drivers/pci/hotplug/pci_hotplug_core.c | 14 +- + drivers/pci/hotplug/pciehp.h | 8 +- + drivers/pci/hotplug/pciehp_core.c | 16 +- + drivers/pci/hotplug/pciehp_ctrl.c | 2 + + drivers/pci/hotplug/pcihp_skeleton.c | 31 +- + drivers/pci/hotplug/rpadlpar_core.c | 7 +- + drivers/pci/hotplug/rpaphp.h | 8 +- + drivers/pci/hotplug/rpaphp_core.c | 9 +- + drivers/pci/hotplug/rpaphp_pci.c | 2 +- + drivers/pci/hotplug/rpaphp_slot.c | 2 +- + drivers/pci/hotplug/s390_pci_hpc.c | 7 +- + drivers/pci/hotplug/sgi_hotplug.c | 6 +- + drivers/pci/hotplug/shpchp.h | 14 +- + drivers/pci/hotplug/shpchp_core.c | 35 +- + drivers/pci/hotplug/shpchp_hpc.c | 4 +- + drivers/pci/hotplug/shpchp_sysfs.c | 10 +- + drivers/pci/msi.c | 4 - + drivers/pci/pci-label.c | 4 +- + drivers/pci/pci-sysfs.c | 58 +- + drivers/pci/pci.c | 4 +- + drivers/pci/pci.h | 2 - + drivers/pci/pcie/aer/aer_inject.c | 16 +- + drivers/pci/pcie/aer/aerdrv_core.c | 10 +- + drivers/pci/pcie/aspm.c | 16 +- + drivers/pci/probe.c | 33 +- + drivers/pci/quirks.c | 11 + + drivers/pci/rom.c | 23 +- + drivers/pci/setup-bus.c | 2 +- + include/linux/msi.h | 4 +- + include/linux/of_pci.h | 7 + + include/linux/pci.h | 2 - + include/linux/pci_ids.h | 4 + + kernel/irq/irqdomain.c | 1 + + kernel/irq/msi.c | 8 +- + 96 files changed, 4676 insertions(+), 1896 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie.txt + create mode 100644 arch/x86/pci/vmd.c + create mode 100644 drivers/pci/host/pcie-iproc-msi.c + create mode 100644 drivers/pci/host/pcie-qcom.c +Merging hid/for-next (86243f383145 Merge branch 'for-4.5/logitech' into for-next) +$ git merge hid/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (4c7916427953 Merge branch 'i2c/for-4.5' into i2c/for-next) +$ git merge i2c/i2c/for-next +Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution. +Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 04c5ff4c6f17] Merge remote-tracking branch 'i2c/i2c/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging jdelvare-hwmon/master (ef0303d2bba0 hwmon: (emc2103) Fix typo in MODULE_PARM_DESC) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + drivers/hwmon/emc2103.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (91918d13eb17 hwmon: (nct6683) Add basic support for NCT6683 on Mitac boards) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (fef24ea1b8c1 Merge branch 'topic/media-controller' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (9ab3e1d71e55 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Resolved 'scripts/tags.sh' using previous resolution. +Auto-merging scripts/tags.sh +CONFLICT (content): Merge conflict in scripts/tags.sh +Auto-merging scripts/link-vmlinux.sh +Auto-merging scripts/Makefile.lib +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging fs/logfs/logfs.h +Auto-merging drivers/gpu/drm/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d4f0c2e2d723] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/lto-build | 173 +++++++++++++++++ + Makefile | 27 ++- + arch/x86/Kconfig | 2 +- + drivers/gpu/drm/Makefile | 2 - + drivers/misc/ibmasm/ibmasm.h | 2 +- + drivers/net/wireless/ath/ath10k/thermal.h | 2 +- + drivers/scsi/aic7xxx/aic79xx.h | 4 +- + drivers/scsi/aic7xxx/aic79xx_osm.h | 5 - + drivers/scsi/aic7xxx/aic7xxx.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 5 - + drivers/scsi/aic7xxx/queue.h | 2 +- + drivers/staging/iio/adc/Kconfig | 4 +- + drivers/staging/iio/adc/Makefile | 7 +- + drivers/staging/iio/adc/ad7606_core.c | 4 + + drivers/usb/chipidea/otg_fsm.h | 2 +- + fs/logfs/logfs.h | 2 +- + init/Kconfig | 73 +++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.build | 8 +- + scripts/Makefile.extrawarn | 2 + + scripts/Makefile.lib | 4 +- + scripts/Makefile.lto | 84 ++++++++ + scripts/Makefile.modpost | 7 +- + scripts/basic/fixdep.c | 2 +- + .../tests/unsigned_lesser_than_zero.cocci | 75 +++++++ + scripts/genksyms/genksyms.c | 6 +- + scripts/kconfig/conf.c | 7 +- + scripts/kconfig/menu.c | 2 +- + scripts/kconfig/qconf.cc | 2 + + scripts/link-vmlinux.sh | 2 +- + scripts/package/Makefile | 4 +- + scripts/tags.sh | 215 ++++++++++----------- + 33 files changed, 586 insertions(+), 156 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto + create mode 100644 scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (44858e07ff87 Merge branch 'for-4.5' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (5d33ad4d6796 Merge branch 'pm-cpuidle' into linux-next) +$ git merge pm/linux-next +Auto-merging kernel/sched/idle.c +Auto-merging drivers/usb/core/usb.c +Auto-merging drivers/usb/core/port.c +Auto-merging drivers/gpu/vga/vga_switcheroo.c +Auto-merging arch/arm/mach-omap2/omap_device.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 13 ++++ + arch/arm/mach-omap2/omap_device.c | 7 +- + drivers/acpi/acpi_lpss.c | 5 +- + drivers/acpi/acpi_video.c | 52 +++++++++------ + drivers/acpi/acpica/acapps.h | 4 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 2 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dbcmds.c | 2 +- + drivers/acpi/acpica/dbconvert.c | 2 +- + drivers/acpi/acpica/dbdisply.c | 6 +- + drivers/acpi/acpica/dbexec.c | 2 +- + drivers/acpi/acpica/dbfileio.c | 2 +- + drivers/acpi/acpica/dbhistry.c | 2 +- + drivers/acpi/acpica/dbinput.c | 2 +- + drivers/acpi/acpica/dbmethod.c | 2 +- + drivers/acpi/acpica/dbnames.c | 2 +- + drivers/acpi/acpica/dbobject.c | 2 +- + drivers/acpi/acpica/dbstats.c | 2 +- + drivers/acpi/acpica/dbtest.c | 2 +- + drivers/acpi/acpica/dbutils.c | 2 +- + drivers/acpi/acpica/dbxface.c | 2 +- + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsdebug.c | 2 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsmthdat.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dsutils.c | 2 +- + drivers/acpi/acpica/dswexec.c | 2 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/dswload2.c | 2 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 2 +- + drivers/acpi/acpica/evsci.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/exconvrt.c | 2 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 2 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 2 +- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 2 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 2 +- + drivers/acpi/acpica/exstore.c | 2 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 2 +- + drivers/acpi/acpica/extrace.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 2 +- + drivers/acpi/acpica/hwpci.c | 2 +- + drivers/acpi/acpica/hwregs.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsaccess.c | 2 +- + drivers/acpi/acpica/nsalloc.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nseval.c | 15 +++-- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsnames.c | 2 +- + drivers/acpi/acpica/nsobject.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 2 +- + drivers/acpi/acpica/nssearch.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfeval.c | 2 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/nsxfobj.c | 2 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psloop.c | 2 +- + drivers/acpi/acpica/psobject.c | 2 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/rsaddr.c | 2 +- + drivers/acpi/acpica/rscalc.c | 2 +- + drivers/acpi/acpica/rscreate.c | 2 +- + drivers/acpi/acpica/rsdump.c | 2 +- + drivers/acpi/acpica/rsdumpinfo.c | 2 +- + drivers/acpi/acpica/rsinfo.c | 2 +- + drivers/acpi/acpica/rsio.c | 2 +- + drivers/acpi/acpica/rsirq.c | 2 +- + drivers/acpi/acpica/rslist.c | 2 +- + drivers/acpi/acpica/rsmemory.c | 2 +- + drivers/acpi/acpica/rsmisc.c | 2 +- + drivers/acpi/acpica/rsserial.c | 2 +- + drivers/acpi/acpica/rsutils.c | 2 +- + drivers/acpi/acpica/rsxface.c | 2 +- + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 2 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/utdelete.c | 2 +- + drivers/acpi/acpica/uterror.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utexcep.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utmath.c | 2 +- + drivers/acpi/acpica/utmisc.c | 2 +- + drivers/acpi/acpica/utmutex.c | 2 +- + drivers/acpi/acpica/utnonansi.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 2 +- + drivers/acpi/acpica/utownerid.c | 2 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utprint.c | 2 +- + drivers/acpi/acpica/utresrc.c | 2 +- + drivers/acpi/acpica/utstate.c | 2 +- + drivers/acpi/acpica/utstring.c | 2 +- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utuuid.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxferror.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/acpi/acpica/utxfmutex.c | 2 +- + drivers/acpi/device_pm.c | 5 +- + drivers/acpi/fan.c | 2 +- + drivers/base/dd.c | 21 +++++- + drivers/base/platform.c | 1 - + drivers/base/power/clock_ops.c | 5 +- + drivers/base/power/common.c | 24 +++++++ + drivers/base/power/domain.c | 18 ++--- + drivers/base/power/main.c | 35 ++++++++++ + drivers/base/power/power.h | 3 + + drivers/cpuidle/Kconfig | 2 - + drivers/cpuidle/cpuidle.c | 6 +- + drivers/cpuidle/governors/ladder.c | 9 +++ + drivers/cpuidle/governors/menu.c | 23 ++++--- + drivers/devfreq/devfreq-event.c | 16 ++--- + drivers/devfreq/devfreq.c | 78 +++++++++++++++++----- + drivers/gpu/vga/vga_switcheroo.c | 11 +-- + drivers/misc/mei/pci-me.c | 5 +- + drivers/misc/mei/pci-txe.c | 5 +- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/usb/core/port.c | 6 ++ + drivers/usb/core/usb.c | 8 ++- + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 2 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 4 +- + include/acpi/acrestyp.h | 2 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actbl2.h | 2 +- + include/acpi/actbl3.h | 2 +- + include/acpi/actypes.h | 2 +- + include/acpi/acuuid.h | 2 +- + include/acpi/platform/acenv.h | 2 +- + include/acpi/platform/acenvex.h | 2 +- + include/acpi/platform/acgcc.h | 2 +- + include/acpi/platform/aclinux.h | 2 +- + include/acpi/platform/aclinuxex.h | 2 +- + include/acpi/platform/acmsvcex.h | 2 +- + include/acpi/platform/acwinex.h | 2 +- + include/acpi/video.h | 4 ++ + include/linux/devfreq.h | 2 +- + include/linux/device.h | 2 + + include/linux/pm.h | 1 + + include/linux/pm_domain.h | 3 + + include/linux/tick.h | 2 + + kernel/sched/idle.c | 6 -- + kernel/time/tick-sched.c | 2 +- + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/acpi/common/getopt.c | 2 +- + .../acpi/os_specific/service_layers/oslibcfs.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + .../acpi/os_specific/service_layers/osunixdir.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 2 +- + tools/power/acpi/tools/acpidump/acpidump.h | 2 +- + tools/power/acpi/tools/acpidump/apdump.c | 2 +- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + 256 files changed, 519 insertions(+), 332 deletions(-) +Merging idle/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (efa2498bb842 Merge branches 'thermal-core', 'thermal-soc' and 'thermal-intel' into next) +$ git merge thermal/next +Auto-merging drivers/thermal/intel_soc_dts_iosf.c +Auto-merging Documentation/thermal/sysfs-api.txt +Merge made by the 'recursive' strategy. + .../bindings/thermal/rockchip-thermal.txt | 2 + + Documentation/thermal/sysfs-api.txt | 10 + + drivers/acpi/thermal.c | 2 +- + drivers/platform/x86/acerhdf.c | 2 +- + drivers/thermal/Kconfig | 12 + + drivers/thermal/Makefile | 1 + + drivers/thermal/db8500_thermal.c | 2 +- + drivers/thermal/hisi_thermal.c | 3 +- + drivers/thermal/imx_thermal.c | 4 +- + .../thermal/int340x_thermal/int340x_thermal_zone.h | 2 +- + .../int340x_thermal/processor_thermal_device.c | 10 + + drivers/thermal/intel_pch_thermal.c | 2 +- + drivers/thermal/intel_powerclamp.c | 45 ++- + drivers/thermal/intel_soc_dts_iosf.c | 3 +- + drivers/thermal/of-thermal.c | 2 +- + drivers/thermal/qcom-spmi-temp-alarm.c | 2 +- + drivers/thermal/rcar_thermal.c | 56 +-- + drivers/thermal/rockchip_thermal.c | 175 +++++++++- + drivers/thermal/samsung/exynos_tmu.c | 2 +- + drivers/thermal/st/st_thermal_memmap.c | 3 +- + drivers/thermal/step_wise.c | 17 +- + drivers/thermal/thermal_core.c | 195 +++++++++-- + drivers/thermal/thermal_core.h | 1 + + drivers/thermal/thermal_iio.c | 383 +++++++++++++++++++++ + drivers/thermal/thermal_iio.h | 45 +++ + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 4 +- + drivers/thermal/x86_pkg_temp_thermal.c | 11 +- + include/linux/thermal.h | 31 +- + 28 files changed, 922 insertions(+), 105 deletions(-) + create mode 100644 drivers/thermal/thermal_iio.c + create mode 100644 drivers/thermal/thermal_iio.h +Merging thermal-soc/next (ce0265dd6f8e thermal: trip_point_temp_store() calls thermal_zone_device_update()) +$ git merge thermal-soc/next +Resolved 'drivers/thermal/thermal_core.c' using previous resolution. +Auto-merging drivers/thermal/thermal_core.c +CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a962b641a260] Merge remote-tracking branch 'thermal-soc/next' +$ git diff -M --stat --summary HEAD^.. +Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (16e209d48fd3 Merge branch 'for-4.5' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/dw/core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 13 +++++-- + drivers/dma/at_xdmac.c | 3 ++ + drivers/dma/dw/core.c | 44 ++++++++-------------- + drivers/dma/edma.c | 2 +- + 4 files changed, 30 insertions(+), 32 deletions(-) +Merging net-next/master (7a26019fdecd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge net-next/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (4c50a8ce2b63 netfilter: ipvs: avoid unused variable warning) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_app.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging wireless-drivers-next/master (42e0ed0d454c brcmfmac: Do not handle link downs for ibss.) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (8e69d71996e4 Bluetooth: add LED trigger for indicating HCI is powered up) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + include/net/bluetooth/hci_core.h | 3 ++ + net/bluetooth/Kconfig | 9 +++++ + net/bluetooth/Makefile | 1 + + net/bluetooth/hci_core.c | 8 ++++ + net/bluetooth/leds.c | 80 ++++++++++++++++++++++++++++++++++++++++ + net/bluetooth/leds.h | 18 +++++++++ + 6 files changed, 119 insertions(+) + create mode 100644 net/bluetooth/leds.c + create mode 100644 net/bluetooth/leds.h +Merging mac80211-next/master (6f6239808cdf mac80211_hwsim: remove shadowing variable) +$ git merge mac80211-next/master +Auto-merging net/wireless/reg.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/sta_info.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/mac.c | 7 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 7 +- + drivers/net/wireless/ath/ath9k/main.c | 8 +- + drivers/net/wireless/ath/carl9170/main.c | 8 +- + drivers/net/wireless/ath/wcn36xx/main.c | 8 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 8 +- + drivers/net/wireless/intel/iwlegacy/4965.h | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 +- + drivers/net/wireless/mac80211_hwsim.c | 12 +- + drivers/net/wireless/marvell/mwl8k.c | 10 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 8 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 4 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 19 ++-- + drivers/net/wireless/st/cw1200/sta.c | 4 +- + drivers/net/wireless/st/cw1200/sta.h | 4 +- + drivers/net/wireless/ti/wlcore/main.c | 8 +- + include/linux/ieee80211.h | 26 +++++ + include/net/mac80211.h | 98 ++++++++++++++--- + net/mac80211/agg-rx.c | 49 ++++++++- + net/mac80211/agg-tx.c | 53 ++++++--- + net/mac80211/cfg.c | 29 +++++ + net/mac80211/chan.c | 2 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/driver-ops.c | 10 +- + net/mac80211/driver-ops.h | 4 +- + net/mac80211/ht.c | 5 + + net/mac80211/ibss.c | 10 +- + net/mac80211/ieee80211_i.h | 12 +- + net/mac80211/iface.c | 10 ++ + net/mac80211/mesh.c | 9 +- + net/mac80211/mlme.c | 51 ++------- + net/mac80211/rx.c | 13 ++- + net/mac80211/sta_info.c | 9 +- + net/mac80211/sta_info.h | 21 ++-- + net/mac80211/trace.h | 43 ++++---- + net/mac80211/util.c | 57 ++++++---- + net/mac80211/vht.c | 42 +++++++ + net/wireless/Kconfig | 13 --- + net/wireless/core.c | 10 ++ + net/wireless/mlme.c | 3 +- + net/wireless/reg.c | 122 ++++++--------------- + 46 files changed, 524 insertions(+), 344 deletions(-) +Merging rdma/for-next (59caaed7a72a IB/iser: Support the remote invalidation exception) +$ git merge rdma/for-next +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/vport.c' using previous resolution. +Resolved 'include/linux/mlx5/device.h' using previous resolution. +Resolved 'include/linux/mlx5/mlx5_ifc.h' using previous resolution. +Resolved 'include/linux/mlx5/vport.h' using previous resolution. +Auto-merging tools/lib/traceevent/event-parse.c +Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging net/sunrpc/xprtrdma/frwr_ops.c +Auto-merging lib/irq_poll.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging include/linux/mlx5/vport.h +CONFLICT (content): Merge conflict in include/linux/mlx5/vport.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/device.h +CONFLICT (content): Merge conflict in include/linux/mlx5/device.h +Auto-merging include/linux/interrupt.h +Removing include/linux/blk-iopoll.h +Auto-merging drivers/staging/rdma/hfi1/verbs.h +Auto-merging drivers/staging/rdma/hfi1/verbs.c +Auto-merging drivers/staging/rdma/ehca/ehca_mrmw.c +Auto-merging drivers/staging/rdma/ehca/ehca_main.c +Auto-merging drivers/staging/rdma/amso1100/c2_provider.c +Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/vport.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/vport.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Removing drivers/infiniband/ulp/isert/isert_proto.h +Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_main.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/cq.c +Auto-merging drivers/infiniband/hw/mlx4/srq.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging block/Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5991015d1cd1] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-rdma_cm | 22 + + Documentation/ABI/testing/sysfs-class-infiniband | 16 + + Documentation/infiniband/core_locking.txt | 2 - + Documentation/kernel-per-CPU-kthreads.txt | 2 +- + MAINTAINERS | 32 +- + block/Makefile | 2 +- + drivers/infiniband/Kconfig | 10 + + drivers/infiniband/core/Makefile | 4 +- + drivers/infiniband/core/addr.c | 185 +++++--- + drivers/infiniband/core/cache.c | 344 ++++++++++----- + drivers/infiniband/core/cm.c | 43 +- + drivers/infiniband/core/cma.c | 267 ++++++++++-- + drivers/infiniband/core/cma_configfs.c | 322 ++++++++++++++ + drivers/infiniband/core/core_priv.h | 45 ++ + drivers/infiniband/core/cq.c | 209 +++++++++ + drivers/infiniband/core/device.c | 51 ++- + drivers/infiniband/core/fmr_pool.c | 20 +- + drivers/infiniband/core/mad.c | 18 + + drivers/infiniband/core/multicast.c | 17 +- + drivers/infiniband/core/roce_gid_mgmt.c | 81 ++-- + drivers/infiniband/core/sa_query.c | 76 +++- + drivers/infiniband/core/sysfs.c | 375 ++++++++++++++-- + drivers/infiniband/core/ud_header.c | 155 ++++++- + drivers/infiniband/core/umem_odp.c | 2 +- + drivers/infiniband/core/uverbs.h | 2 + + drivers/infiniband/core/uverbs_cmd.c | 38 +- + drivers/infiniband/core/uverbs_main.c | 13 +- + drivers/infiniband/core/uverbs_marshall.c | 1 + + drivers/infiniband/core/verbs.c | 229 ++++++---- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 +- + drivers/infiniband/hw/cxgb3/iwch_cq.c | 4 - + drivers/infiniband/hw/cxgb3/iwch_mem.c | 102 ----- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 146 ++----- + drivers/infiniband/hw/cxgb3/iwch_provider.h | 15 - + drivers/infiniband/hw/cxgb3/iwch_qp.c | 82 ---- + drivers/infiniband/hw/cxgb4/cq.c | 3 - + drivers/infiniband/hw/cxgb4/device.c | 4 + + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 13 - + drivers/infiniband/hw/cxgb4/mem.c | 251 ----------- + drivers/infiniband/hw/cxgb4/provider.c | 3 - + drivers/infiniband/hw/cxgb4/qp.c | 5 - + drivers/infiniband/hw/cxgb4/t4.h | 7 + + drivers/infiniband/hw/cxgb4/user.h | 2 +- + drivers/infiniband/hw/mlx4/cq.c | 3 - + drivers/infiniband/hw/mlx4/main.c | 1 - + drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 - + drivers/infiniband/hw/mlx4/mr.c | 22 - + drivers/infiniband/hw/mlx4/qp.c | 40 +- + drivers/infiniband/hw/mlx4/srq.c | 3 +- + drivers/infiniband/hw/mlx5/ah.c | 32 +- + drivers/infiniband/hw/mlx5/cq.c | 34 +- + drivers/infiniband/hw/mlx5/main.c | 420 ++++++++++++++++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 38 +- + drivers/infiniband/hw/mlx5/qp.c | 96 ++++- + drivers/infiniband/hw/mlx5/user.h | 12 +- + drivers/infiniband/hw/mthca/mthca_cq.c | 3 - + drivers/infiniband/hw/mthca/mthca_provider.c | 84 ---- + drivers/infiniband/hw/mthca/mthca_qp.c | 2 +- + drivers/infiniband/hw/nes/nes_cm.c | 13 +- + drivers/infiniband/hw/nes/nes_cm.h | 2 +- + drivers/infiniband/hw/nes/nes_verbs.c | 216 ++-------- + drivers/infiniband/hw/nes/nes_verbs.h | 4 + + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 1 - + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 163 ------- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 3 - + drivers/infiniband/hw/qib/qib_mr.c | 51 +-- + drivers/infiniband/hw/qib/qib_verbs.c | 1 - + drivers/infiniband/hw/qib/qib_verbs.h | 4 - + drivers/infiniband/hw/usnic/usnic_debugfs.c | 5 +- + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 4 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 24 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 2 - + drivers/infiniband/hw/usnic/usnic_vnic.c | 54 +-- + drivers/infiniband/ulp/ipoib/ipoib.h | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 21 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 14 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 39 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 45 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 13 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 156 +++---- + drivers/infiniband/ulp/iser/iser_initiator.c | 323 +++++++++----- + drivers/infiniband/ulp/iser/iser_memory.c | 179 +++----- + drivers/infiniband/ulp/iser/iser_verbs.c | 337 +++++---------- + drivers/infiniband/ulp/isert/ib_isert.c | 118 ++--- + drivers/infiniband/ulp/isert/ib_isert.h | 41 +- + drivers/infiniband/ulp/isert/isert_proto.h | 47 -- + drivers/infiniband/ulp/srp/ib_srp.c | 205 ++++----- + drivers/infiniband/ulp/srp/ib_srp.h | 7 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 442 ++++++------------- + drivers/infiniband/ulp/srpt/ib_srpt.h | 51 +-- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 57 ++- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 103 +++++ + drivers/scsi/Kconfig | 1 + + drivers/scsi/be2iscsi/Kconfig | 1 + + drivers/scsi/be2iscsi/be.h | 4 +- + drivers/scsi/be2iscsi/be_iscsi.c | 4 +- + drivers/scsi/be2iscsi/be_main.c | 20 +- + drivers/scsi/ipr.c | 25 +- + drivers/scsi/ipr.h | 4 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 21 +- + drivers/staging/rdma/amso1100/c2_cq.c | 3 - + drivers/staging/rdma/amso1100/c2_provider.c | 72 +--- + drivers/staging/rdma/ehca/ehca_classes.h | 5 +- + drivers/staging/rdma/ehca/ehca_iverbs.h | 16 - + drivers/staging/rdma/ehca/ehca_main.c | 4 - + drivers/staging/rdma/ehca/ehca_mrmw.c | 477 ++------------------- + drivers/staging/rdma/ehca/ehca_mrmw.h | 5 - + drivers/staging/rdma/ehca/ehca_reqs.c | 1 - + drivers/staging/rdma/hfi1/mr.c | 51 +-- + drivers/staging/rdma/hfi1/verbs.c | 1 - + drivers/staging/rdma/hfi1/verbs.h | 4 - + drivers/staging/rdma/ipath/ipath_mr.c | 55 --- + drivers/staging/rdma/ipath/ipath_verbs.c | 1 - + drivers/staging/rdma/ipath/ipath_verbs.h | 4 - + include/linux/blk-iopoll.h | 46 -- + include/linux/interrupt.h | 2 +- + include/linux/irq_poll.h | 25 ++ + include/linux/mlx5/device.h | 28 +- + include/linux/mlx5/driver.h | 12 +- + include/linux/mlx5/mlx5_ifc.h | 47 +- + include/linux/mlx5/qp.h | 24 +- + include/linux/mlx5/vport.h | 8 + + include/rdma/ib_addr.h | 11 +- + include/rdma/ib_cache.h | 4 + + include/rdma/ib_pack.h | 45 +- + include/rdma/ib_pma.h | 1 + + include/rdma/ib_sa.h | 3 + + include/rdma/ib_verbs.h | 355 ++++++++------- + include/scsi/iser.h | 78 ++++ + include/trace/events/irq.h | 2 +- + lib/Kconfig | 5 + + lib/Makefile | 1 + + block/blk-iopoll.c => lib/irq_poll.c | 108 +++-- + net/rds/ib.c | 34 +- + net/rds/iw.c | 23 +- + net/sunrpc/xprtrdma/frwr_ops.c | 7 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 48 +-- + net/sunrpc/xprtrdma/verbs.c | 24 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 1 - + tools/lib/traceevent/event-parse.c | 2 +- + tools/perf/util/trace-event-parse.c | 2 +- + 142 files changed, 4516 insertions(+), 3978 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-rdma_cm + create mode 100644 Documentation/ABI/testing/sysfs-class-infiniband + create mode 100644 drivers/infiniband/core/cma_configfs.c + create mode 100644 drivers/infiniband/core/cq.c + delete mode 100644 drivers/infiniband/ulp/isert/isert_proto.h + delete mode 100644 include/linux/blk-iopoll.h + create mode 100644 include/linux/irq_poll.h + create mode 100644 include/scsi/iser.h + rename block/blk-iopoll.c => lib/irq_poll.c (55%) +$ git am -3 ../patches/0001-fixup-Merge-remote-tracking-branch-gerrit-ib-next-in.patch +Applying: fixup! Merge remote-tracking branch 'gerrit/ib-next' into HEAD +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/mellanox/mlx5/core/vport.c +$ git add -A . +$ git commit -v -a --amend +[master 58719422f24c] Merge remote-tracking branch 'rdma/for-next' + Date: Tue Jan 19 11:25:29 2016 +1100 +$ git am -3 ../patches/0001-IB-mlx5-merge-fix-for-mlx5_ib_port_link_layer-API-ch.patch +Applying: IB/mlx5: merge fix for mlx5_ib_port_link_layer API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/infiniband/hw/mlx5/main.c +$ git add -A . +$ git commit -v -a --amend +[master fbfe1feaeddb] Merge remote-tracking branch 'rdma/for-next' + Date: Tue Jan 19 11:25:29 2016 +1100 +Merging mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (f9bdbd6c46c8 mtd: nuc900_nand: read correct SMISR register) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/nuc900_nand.c | 2 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging crypto/master (48d627648141 crypto: hifn_795x, picoxcell - use ablkcipher_request_cast) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (1df59b8497f4 Merge tag 'drm-intel-next-fixes-2016-01-14' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. +Merging drm-intel/for-linux-next (48ea1e32c39d drm/i915/gen9: Set PIN_ZONE_4G end to 4GB - 1 page) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (ad906599c191 drm/tegra: Advertise DRIVER_ATOMIC) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (c6c5c7fa7f3e drm/atomic-helper: Remove redundant local var old_crtc_state in disable_outputs) +$ git merge drm-misc/topic/drm-misc +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_helper.c | 1 - + drivers/gpu/drm/drm_crtc_helper.c | 4 +--- + 2 files changed, 1 insertion(+), 4 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON()) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (40eb4e27aa20 arm64: Juno: Add HDLCD support to the Juno boards.) +$ git merge hdlcd/for-upstream/hdlcd +Auto-merging drivers/gpu/drm/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/arm,hdlcd.txt | 79 +++ + MAINTAINERS | 6 + + arch/arm64/boot/dts/arm/juno-base.dtsi | 46 +- + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/arm/Kconfig | 27 + + drivers/gpu/drm/arm/Makefile | 2 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 327 ++++++++++++ + drivers/gpu/drm/arm/hdlcd_drv.c | 567 +++++++++++++++++++++ + drivers/gpu/drm/arm/hdlcd_drv.h | 42 ++ + drivers/gpu/drm/arm/hdlcd_regs.h | 87 ++++ + 11 files changed, 1182 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.txt + create mode 100644 drivers/gpu/drm/arm/Kconfig + create mode 100644 drivers/gpu/drm/arm/Makefile + create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c + create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c + create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h + create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h +Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code) +$ git merge drm-vc4/drm-vc4-next +Already up-to-date. +Merging sound/for-next (c0bcdbdff3ff ALSA: control: Avoid kernel warnings from tlv ioctl with numid 0) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (9676f39059ef Merge remote-tracking branches 'asoc/fix/amd', 'asoc/fix/fsl', 'asoc/fix/mtk', 'asoc/fix/qcom' and 'asoc/fix/rt5659' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 ++ + sound/soc/amd/acp-pcm-dma.c | 1 + + sound/soc/codecs/rt5659.c | 16 ++++------------ + sound/soc/codecs/rt5659.h | 1 - + sound/soc/mediatek/Kconfig | 4 ++-- + sound/soc/qcom/lpass-platform.c | 15 ++++++--------- + 6 files changed, 15 insertions(+), 24 deletions(-) +Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab) +$ git merge modules/modules-next +Resolved 'arch/x86/kernel/livepatch.c' using previous resolution. +Auto-merging arch/x86/kernel/livepatch.c +CONFLICT (content): Merge conflict in arch/x86/kernel/livepatch.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c7d4b411d802] Merge remote-tracking branch 'modules/modules-next' +$ git diff -M --stat --summary HEAD^.. +Merging input/next (809d9516da73 Input: gpio-keys - allow disabling individual buttons in DT) +$ git merge input/next +Auto-merging drivers/input/touchscreen/atmel_mxt_ts.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/gpio-keys.txt | 1 + + drivers/input/joystick/xpad.c | 591 +++++++++++++++------ + drivers/input/keyboard/gpio_keys.c | 6 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 68 +-- + 4 files changed, 456 insertions(+), 210 deletions(-) +Merging block/for-next (bb1192dd3fad Merge branch 'for-4.5/drivers' into for-next) +$ git merge block/for-next +Resolved 'drivers/nvme/host/Makefile' using previous resolution. +Resolved 'drivers/nvme/host/lightnvm.c' using previous resolution. +Resolved 'drivers/nvme/host/pci.c' using previous resolution. +Resolved 'fs/block_dev.c' using previous resolution. +Auto-merging include/uapi/linux/Kbuild +Auto-merging include/linux/blkdev.h +Auto-merging fs/block_dev.c +CONFLICT (content): Merge conflict in fs/block_dev.c +Auto-merging drivers/nvme/host/pci.c +CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/nvme.h +Auto-merging drivers/nvme/host/lightnvm.c +CONFLICT (content): Merge conflict in drivers/nvme/host/lightnvm.c +Auto-merging drivers/nvme/host/Makefile +CONFLICT (content): Merge conflict in drivers/nvme/host/Makefile +Auto-merging drivers/block/xen-blkback/common.h +Auto-merging drivers/block/xen-blkback/blkback.c +Auto-merging drivers/block/null_blk.c +Auto-merging drivers/block/mtip32xx/mtip32xx.c +Auto-merging block/genhd.c +Auto-merging block/blk-merge.c +Auto-merging block/blk-core.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9472c13587f0] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 +- + block/bio-integrity.c | 13 +- + block/bio.c | 4 +- + block/blk-core.c | 23 +- + block/blk-merge.c | 22 +- + block/blk-mq-cpumap.c | 2 +- + block/blk-mq-tag.c | 11 +- + block/blk-mq.c | 44 +- + block/blk-mq.h | 11 +- + block/blk-timeout.c | 17 +- + block/blk.h | 2 +- + block/genhd.c | 2 +- + drivers/block/drbd/drbd_actlog.c | 323 ++-- + drivers/block/drbd/drbd_bitmap.c | 22 +- + drivers/block/drbd/drbd_debugfs.c | 10 + + drivers/block/drbd/drbd_int.h | 111 +- + drivers/block/drbd/drbd_main.c | 74 +- + drivers/block/drbd/drbd_nl.c | 1361 ++++++++++++++-- + drivers/block/drbd/drbd_proc.c | 6 +- + drivers/block/drbd/drbd_protocol.h | 2 +- + drivers/block/drbd/drbd_receiver.c | 254 +-- + drivers/block/drbd/drbd_req.c | 147 +- + drivers/block/drbd/drbd_req.h | 17 +- + drivers/block/drbd/drbd_state.c | 428 ++++- + drivers/block/drbd/drbd_state.h | 6 +- + drivers/block/drbd/drbd_state_change.h | 63 + + drivers/block/drbd/drbd_worker.c | 105 +- + drivers/block/mtip32xx/mtip32xx.c | 8 +- + drivers/block/null_blk.c | 10 +- + drivers/block/sx8.c | 7 +- + drivers/block/xen-blkback/blkback.c | 391 ++--- + drivers/block/xen-blkback/common.h | 86 +- + drivers/block/xen-blkback/xenbus.c | 416 +++-- + drivers/block/xen-blkfront.c | 1061 +++++++++---- + drivers/char/raw.c | 2 +- + drivers/md/bcache/btree.c | 5 +- + drivers/md/bcache/super.c | 16 +- + drivers/md/bcache/writeback.c | 37 +- + drivers/md/bcache/writeback.h | 3 +- + drivers/nvme/host/Kconfig | 11 + + drivers/nvme/host/Makefile | 5 +- + drivers/nvme/host/core.c | 1463 +++++++++++++++++ + drivers/nvme/host/lightnvm.c | 37 +- + drivers/nvme/host/nvme.h | 242 ++- + drivers/nvme/host/pci.c | 2723 +++++++++----------------------- + drivers/nvme/host/scsi.c | 212 +-- + drivers/target/target_core_iblock.c | 4 +- + fs/block_dev.c | 10 +- + include/linux/aer.h | 1 + + include/linux/bio.h | 32 +- + include/linux/blk-mq.h | 8 +- + include/linux/blk_types.h | 2 - + include/linux/blkdev.h | 3 +- + include/linux/drbd.h | 26 +- + include/linux/drbd_genl.h | 149 ++ + include/linux/idr.h | 14 + + include/linux/lru_cache.h | 2 +- + include/linux/nvme.h | 27 +- + include/uapi/linux/Kbuild | 2 +- + include/xen/interface/io/blkif.h | 48 + + lib/lru_cache.c | 4 +- + 61 files changed, 6565 insertions(+), 3593 deletions(-) + create mode 100644 drivers/block/drbd/drbd_state_change.h + create mode 100644 drivers/nvme/host/core.c +$ git am -3 ../patches/0001-nvme-merge-fix-up-for-ns-code-movement.patch +Applying: nvme: merge fix up for ns code movement +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/nvme/host/core.c +$ git add -A . +$ git commit -v -a --amend +[master c5a42383850c] Merge remote-tracking branch 'block/for-next' + Date: Tue Jan 19 11:38:17 2016 +1100 +Merging device-mapper/for-next (385277bfb57f dm snapshot: fix hung bios when copy error occurs) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ 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 (d50f42384dbf mmc: tmio_mmc_dma: don't print invalid DMA cookie) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + drivers/mmc/core/sd.c | 28 ++++++++++++++++++++-------- + drivers/mmc/core/sdio.c | 4 ++-- + drivers/mmc/host/mmci.c | 3 ++- + drivers/mmc/host/tmio_mmc_dma.c | 15 +++++++-------- + 4 files changed, 31 insertions(+), 19 deletions(-) +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (1501efadc524 md/raid: only permit hot-add of compatible integrity profiles) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (9fb41166076b mfd: davinci_voicecodec: Remove pointless 'out of memory' error message) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (265b60497a57 power: bq27xxx_battery: Fix bq27541 AveragePower register address) +$ git merge battery/master +Already up-to-date. +Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (bd5e0c40ace2 Merge remote-tracking branch 'regulator/fix/da9210' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/da9210-regulator.c | 5 +++++ + 1 file changed, 5 insertions(+) +Merging security/next (607259e17b37 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into ra-next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (1d6d167c2efc KEYS: refcount bug fix) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (76319946f321 selinux: rate-limit netlink message warnings in selinux_nlmsg_perm()) +$ git merge selinux/next +Already up-to-date. +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (ac36856fe432 watchdog: asm9260: remove __init and __exit annotations) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (dabc4de14132 Merge branches 'iommu/fixes', 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu', 'x86/amd' and 'x86/vt-d' into next) +$ git merge iommu/next +Removing drivers/iommu/shmobile-ipmmu.h +Removing drivers/iommu/shmobile-ipmmu.c +Removing drivers/iommu/shmobile-iommu.c +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 12 +- + drivers/iommu/Kconfig | 75 ---- + drivers/iommu/Makefile | 2 - + drivers/iommu/amd_iommu.c | 396 ++++++++++++-------- + drivers/iommu/amd_iommu_types.h | 40 -- + drivers/iommu/amd_iommu_v2.c | 38 +- + drivers/iommu/arm-smmu-v3.c | 210 ++++------- + drivers/iommu/arm-smmu.c | 23 +- + drivers/iommu/dmar.c | 12 +- + drivers/iommu/io-pgtable-arm.c | 49 +-- + drivers/iommu/io-pgtable.h | 6 +- + drivers/iommu/ipmmu-vmsa.c | 4 +- + drivers/iommu/msm_iommu_dev.c | 25 +- + drivers/iommu/s390-iommu.c | 4 +- + drivers/iommu/shmobile-iommu.c | 402 --------------------- + drivers/iommu/shmobile-ipmmu.c | 129 ------- + drivers/iommu/shmobile-ipmmu.h | 34 -- + 17 files changed, 411 insertions(+), 1050 deletions(-) + delete mode 100644 drivers/iommu/shmobile-iommu.c + delete mode 100644 drivers/iommu/shmobile-ipmmu.c + delete mode 100644 drivers/iommu/shmobile-ipmmu.h +Merging dwmw2-iommu/master (fda3bec12d09 iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG) +$ git merge dwmw2-iommu/master +Auto-merging drivers/iommu/intel_irq_remapping.c +Auto-merging drivers/iommu/dmar.c +Merge made by the 'recursive' strategy. + drivers/iommu/dmar.c | 2 +- + drivers/iommu/intel-svm.c | 33 +++++++++++++++++++++++++++------ + drivers/iommu/intel_irq_remapping.c | 2 +- + 3 files changed, 29 insertions(+), 8 deletions(-) +Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (ec3fc58b1e7a thermal: add description for integral_cutoff unit) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (bcf4299e6215 floppy: make local variable non-static) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (09eccd1da92b audit: always enable syscall auditing when supported and audit is enabled) +$ git merge audit/next +Recorded preimage for 'kernel/audit.c' +Auto-merging kernel/audit.c +CONFLICT (content): Merge conflict in kernel/audit.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/audit.c'. +[master 72e012cdfb87] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (183223770ae8 drivers/of: Export OF changeset functions) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (ece19b812e99 Merge remote-tracking branch 'spi/fix/loopback' into spi-linus) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-loopback-test.c | 1 + + 1 file changed, 1 insertion(+) +Merging tip/auto-latest (5b81f397d2fa Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging mm/mmap.c +Auto-merging mm/memory.c +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging drivers/firmware/efi/efi.c +Merge made by the 'recursive' strategy. + Documentation/efi-stub.txt | 4 +- + Documentation/x86/x86_64/mm.txt | 12 +-- + arch/x86/entry/vdso/vdso2c.h | 7 -- + arch/x86/entry/vdso/vma.c | 124 +++++++++++++++---------- + arch/x86/entry/vsyscall/vsyscall_gtod.c | 9 +- + arch/x86/include/asm/clocksource.h | 9 +- + arch/x86/include/asm/efi.h | 26 ++++++ + arch/x86/include/asm/mmu.h | 3 +- + arch/x86/include/asm/vdso.h | 3 - + arch/x86/include/asm/vgtod.h | 6 ++ + arch/x86/kernel/vmlinux.lds.S | 1 + + arch/x86/mm/pageattr.c | 17 ++-- + arch/x86/platform/efi/efi-bgrt.c | 42 ++++----- + arch/x86/platform/efi/efi.c | 39 +++----- + arch/x86/platform/efi/efi_32.c | 5 + + arch/x86/platform/efi/efi_64.c | 159 +++++++++++++++++++++++++------- + arch/x86/platform/efi/efi_stub_64.S | 43 --------- + arch/x86/platform/efi/quirks.c | 4 +- + drivers/firmware/efi/efi.c | 32 ------- + drivers/firmware/efi/esrt.c | 5 +- + include/linux/mm.h | 2 + + include/linux/mm_types.h | 22 ++++- + kernel/irq/handle.c | 5 +- + mm/memory.c | 25 ++++- + mm/mmap.c | 13 ++- + 25 files changed, 360 insertions(+), 257 deletions(-) +Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/h8300_timer16.c' using previous resolution. +Auto-merging drivers/clocksource/h8300_timer16.c +CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8e2af558fafc] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (1cac5503fbf7 EDAC, i5100: Use to_delayed_work()) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (b7522056ec1a ftrace: Remove unused nr_trampolines var) +$ git merge ftrace/for-next +Auto-merging include/linux/ftrace.h +Merge made by the 'recursive' strategy. + include/linux/ftrace.h | 1 - + kernel/trace/trace.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging rcu/rcu/next (984cf355aeaa sysrq: Fix warning in sysrq generated crash.) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next (171b5682aa85 Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD) +$ git merge kvm/linux-next +Auto-merging arch/powerpc/kvm/book3s_hv.c +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/kvm_host.h | 3 +-- + arch/powerpc/kvm/book3s_64_mmu.c | 3 --- + arch/powerpc/kvm/book3s_hv.c | 18 ++++++++++++++++++ + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +++- + arch/powerpc/kvm/powerpc.c | 20 ++++++++++---------- + 5 files changed, 32 insertions(+), 16 deletions(-) +Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (b4d7f161feb3 KVM: PPC: Fix ONE_REG AltiVec support) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (c6e5f166373a KVM: s390: implement the RI support of guest) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (6201171e3b2c workqueue: simplify the apply_workqueue_attrs_locked()) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (46456416ccdf thinkpad_acpi: Add support for keyboard backlight) +$ git merge drivers-x86/for-next +Resolved 'drivers/platform/x86/dell-wmi.c' using previous resolution. +Auto-merging drivers/platform/x86/dell-wmi.c +CONFLICT (content): Merge conflict in drivers/platform/x86/dell-wmi.c +Auto-merging drivers/platform/x86/apple-gmux.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4000f6415772] Merge remote-tracking branch 'drivers-x86/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 16 +- + arch/x86/include/asm/intel_punit_ipc.h | 101 +++++++++ + drivers/platform/x86/Kconfig | 33 +++ + drivers/platform/x86/Makefile | 3 + + drivers/platform/x86/apple-gmux.c | 10 +- + drivers/platform/x86/asus-wireless.c | 84 ++++++++ + drivers/platform/x86/asus-wmi.c | 3 - + drivers/platform/x86/dell-wmi.c | 182 ++++++++++++++--- + drivers/platform/x86/ideapad-laptop.c | 7 + + drivers/platform/x86/intel-hid.c | 289 ++++++++++++++++++++++++++ + drivers/platform/x86/intel_pmc_ipc.c | 118 +++++++---- + drivers/platform/x86/intel_punit_ipc.c | 338 +++++++++++++++++++++++++++++++ + drivers/platform/x86/sony-laptop.c | 65 ++++-- + drivers/platform/x86/tc1100-wmi.c | 2 + + drivers/platform/x86/thinkpad_acpi.c | 206 +++++++++++++++++++ + drivers/platform/x86/toshiba_acpi.c | 246 +++++++++++++++++++++- + drivers/platform/x86/toshiba_bluetooth.c | 2 +- + 17 files changed, 1601 insertions(+), 104 deletions(-) + create mode 100644 arch/x86/include/asm/intel_punit_ipc.h + create mode 100644 drivers/platform/x86/asus-wireless.c + create mode 100644 drivers/platform/x86/intel-hid.c + create mode 100644 drivers/platform/x86/intel_punit_ipc.c +Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging regmap/for-next (09d3ffbd636f Merge remote-tracking branch 'regmap/fix/raw' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging hsi/for-next (525e1abc6b5a HSI: omap_ssi_port: fix handling of_get_named_gpio result) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (522f17e1214c leds: add HAS_IOMEM dependency to LEDS_BCM6328/LEDS_BCM6358) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (4193fcd31624 ipmi: Remove unnecessary pci_disable_device.) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (afd2ff9b7e1b Linux 4.4) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (ece6267878ae Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (ece6267878ae Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (5072cfc40a80 usb: dwc3: of-simple: fix build warning on !PM) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (6ff9d2761b86 USB: mxu11x0: drop redundant function name from error messages) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (d0c40d9fda12 usb: chipidea: debug: use list_for_each_entry) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/debug.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging staging/staging-next (ece6267878ae Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (ece6267878ae Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (f78bf950aec3 extcon: arizona: Use DAPM mutex helper functions) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 4 ++-- + drivers/extcon/extcon-gpio.c | 2 +- + drivers/extcon/extcon-max14577.c | 3 +++ + drivers/extcon/extcon-max77693.c | 12 +++++++++++- + drivers/extcon/extcon-max77843.c | 3 +++ + drivers/extcon/extcon-max8997.c | 3 +++ + drivers/extcon/extcon-rt8973a.c | 8 ++++++-- + drivers/extcon/extcon-sm5502.c | 8 ++++++-- + 8 files changed, 35 insertions(+), 8 deletions(-) +Merging cgroup/for-next (36ae3fad335f Merge branch 'for-4.5' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (4d45033f31a0 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/Kconfig +Merge made by the 'recursive' strategy. + drivers/scsi/3w-xxxx.c | 3 + + drivers/scsi/Kconfig | 17 - + drivers/scsi/NCR5380.c | 2870 +++++++++++++++----------------- + drivers/scsi/NCR5380.h | 87 +- + drivers/scsi/arm/cumana_1.c | 31 +- + drivers/scsi/arm/oak.c | 27 +- + drivers/scsi/atari_NCR5380.c | 2272 +++++++++++-------------- + drivers/scsi/atari_scsi.c | 102 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 2 +- + drivers/scsi/dmx3191d.c | 33 +- + drivers/scsi/dtc.c | 115 +- + drivers/scsi/dtc.h | 45 +- + drivers/scsi/g_NCR5380.c | 408 +++-- + drivers/scsi/g_NCR5380.h | 66 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 40 +- + drivers/scsi/imm.c | 50 +- + drivers/scsi/ipr.c | 5 +- + drivers/scsi/mac_scsi.c | 117 +- + drivers/scsi/megaraid/megaraid_mm.c | 4 + + drivers/scsi/pas16.c | 116 +- + drivers/scsi/pas16.h | 40 +- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/storvsc_drv.c | 2 +- + drivers/scsi/sun3_scsi.c | 141 +- + drivers/scsi/t128.c | 102 +- + drivers/scsi/t128.h | 39 +- + 26 files changed, 3013 insertions(+), 3722 deletions(-) +Merging target-updates/for-next (4c1a6448e1ee target: Obtain se_node_acl->acl_kref during get_initiator_node_acl) +$ git merge target-updates/for-next +Resolved 'drivers/infiniband/ulp/isert/ib_isert.c' using previous resolution. +Auto-merging include/target/target_core_base.h +Auto-merging include/linux/configfs.h +Auto-merging fs/configfs/dir.c +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c +Auto-merging drivers/usb/gadget/function/tcm.h +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/target/target_core_tmr.c +Auto-merging drivers/target/target_core_sbc.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/target/iscsi/iscsi_target_parameters.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.h +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +CONFLICT (content): Merge conflict in drivers/infiniband/ulp/isert/ib_isert.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9785372b7239] Merge remote-tracking branch 'target-updates/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-tcm | 6 + + drivers/infiniband/ulp/isert/ib_isert.c | 5 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 103 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 8 - + drivers/scsi/qla2xxx/qla_attr.c | 36 + + drivers/scsi/qla2xxx/qla_dbg.c | 19 +- + drivers/scsi/qla2xxx/qla_def.h | 83 +- + drivers/scsi/qla2xxx/qla_dfs.c | 106 + + drivers/scsi/qla2xxx/qla_gbl.h | 18 +- + drivers/scsi/qla2xxx/qla_init.c | 58 +- + drivers/scsi/qla2xxx/qla_inline.h | 2 + + drivers/scsi/qla2xxx/qla_iocb.c | 188 ++ + drivers/scsi/qla2xxx/qla_isr.c | 126 +- + drivers/scsi/qla2xxx/qla_mbx.c | 265 ++- + drivers/scsi/qla2xxx/qla_os.c | 165 +- + drivers/scsi/qla2xxx/qla_target.c | 645 ++++-- + drivers/scsi/qla2xxx/qla_target.h | 34 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 38 +- + drivers/target/iscsi/iscsi_target.c | 7 +- + drivers/target/iscsi/iscsi_target_configfs.c | 15 +- + drivers/target/iscsi/iscsi_target_erl1.c | 7 +- + drivers/target/iscsi/iscsi_target_parameters.c | 2 +- + drivers/target/iscsi/iscsi_target_tmr.c | 2 +- + drivers/target/iscsi/iscsi_target_tpg.c | 10 - + drivers/target/iscsi/iscsi_target_tpg.h | 2 - + drivers/target/loopback/tcm_loop.c | 14 + + drivers/target/sbp/sbp_target.c | 2 - + drivers/target/target_core_configfs.c | 47 +- + drivers/target/target_core_device.c | 2 + + drivers/target/target_core_iblock.c | 2 + + drivers/target/target_core_pr.c | 11 +- + drivers/target/target_core_sbc.c | 10 +- + drivers/target/target_core_spc.c | 12 + + drivers/target/target_core_tmr.c | 2 +- + drivers/target/target_core_tpg.c | 197 +- + drivers/target/target_core_transport.c | 33 +- + drivers/target/target_core_user.c | 6 +- + drivers/target/tcm_fc/tcm_fc.h | 1 - + drivers/target/tcm_fc/tfc_conf.c | 47 +- + drivers/target/tcm_fc/tfc_io.c | 8 +- + drivers/target/tcm_fc/tfc_sess.c | 42 +- + drivers/usb/gadget/Kconfig | 17 + + drivers/usb/gadget/function/Makefile | 2 + + drivers/usb/gadget/function/f_tcm.c | 2381 ++++++++++++++++++++ + .../{legacy/tcm_usb_gadget.h => function/tcm.h} | 9 +- + drivers/usb/gadget/function/u_tcm.h | 50 + + drivers/usb/gadget/legacy/Kconfig | 1 + + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 2165 +----------------- + fs/configfs/dir.c | 150 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + include/linux/configfs.h | 21 +- + include/target/target_core_base.h | 6 +- + include/target/target_core_fabric.h | 9 +- + 53 files changed, 4503 insertions(+), 2696 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-tcm + create mode 100644 drivers/usb/gadget/function/f_tcm.c + rename drivers/usb/gadget/{legacy/tcm_usb_gadget.h => function/tcm.h} (95%) + create mode 100644 drivers/usb/gadget/function/u_tcm.h +Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (14da0a91bf4a pinctrl: mediatek: Modify pinctrl bindings for mt2701) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (43e361f23c49 checkpatch: add virt barriers) +$ git merge vhost/linux-next +Resolved 'arch/ia64/include/asm/barrier.h' using previous resolution. +Resolved 'arch/s390/include/asm/barrier.h' using previous resolution. +Resolved 'include/asm-generic/barrier.h' using previous resolution. +Auto-merging include/asm-generic/barrier.h +CONFLICT (content): Merge conflict in include/asm-generic/barrier.h +Auto-merging arch/s390/include/asm/barrier.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/barrier.h +Auto-merging arch/powerpc/include/asm/barrier.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/barrier.h +Auto-merging arch/ia64/include/asm/barrier.h +CONFLICT (content): Merge conflict in arch/ia64/include/asm/barrier.h +Auto-merging Documentation/memory-barriers.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/powerpc/include/asm/barrier.h'. +[master 56e9589adaa5] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/memory-barriers.txt | 28 +++++++-- + arch/arm/include/asm/barrier.h | 35 ++--------- + arch/arm64/include/asm/barrier.h | 19 ++---- + arch/blackfin/include/asm/barrier.h | 4 +- + arch/ia64/include/asm/barrier.h | 24 +++----- + arch/ia64/kernel/iosapic.c | 6 +- + arch/metag/include/asm/barrier.h | 55 +++++------------ + arch/mips/include/asm/barrier.h | 51 +++++----------- + arch/powerpc/include/asm/barrier.h | 31 ++++------ + arch/s390/include/asm/barrier.h | 23 ++++--- + arch/sh/include/asm/barrier.h | 3 +- + arch/sh/include/asm/cmpxchg-grb.h | 22 +++++++ + arch/sh/include/asm/cmpxchg-irq.h | 11 ++++ + arch/sh/include/asm/cmpxchg-llsc.h | 25 +------- + arch/sh/include/asm/cmpxchg-xchg.h | 51 ++++++++++++++++ + arch/sh/include/asm/cmpxchg.h | 3 + + arch/sparc/include/asm/barrier_32.h | 1 - + arch/sparc/include/asm/barrier_64.h | 29 ++------- + arch/sparc/include/asm/processor.h | 3 - + arch/tile/include/asm/barrier.h | 9 +-- + arch/x86/include/asm/barrier.h | 36 +++++------ + arch/x86/um/asm/barrier.h | 9 +-- + arch/xtensa/include/asm/barrier.h | 4 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 2 +- + drivers/misc/mic/card/mic_virtio.c | 2 +- + drivers/remoteproc/remoteproc_virtio.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + drivers/s390/virtio/kvm_virtio.c | 2 +- + drivers/s390/virtio/virtio_ccw.c | 2 +- + drivers/virtio/virtio_balloon.c | 4 +- + drivers/virtio/virtio_input.c | 2 +- + drivers/virtio/virtio_mmio.c | 2 +- + drivers/virtio/virtio_pci_common.c | 4 +- + drivers/virtio/virtio_pci_common.h | 2 +- + drivers/virtio/virtio_pci_modern.c | 2 +- + drivers/virtio/virtio_ring.c | 15 +++-- + drivers/xen/events/events_fifo.c | 3 +- + drivers/xen/xenbus/xenbus_comms.c | 8 +-- + include/asm-generic/barrier.h | 106 ++++++++++++++++++++++++++++++--- + include/linux/virtio_config.h | 2 +- + include/linux/virtio_ring.h | 21 +++++-- + include/xen/interface/io/ring.h | 16 ++--- + mm/balloon_compaction.c | 4 +- + scripts/checkpatch.pl | 33 +++++++++- + 44 files changed, 401 insertions(+), 317 deletions(-) + create mode 100644 arch/sh/include/asm/cmpxchg-xchg.h +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Auto-merging drivers/remoteproc/remoteproc_core.c +Merge made by the 'recursive' strategy. + drivers/remoteproc/remoteproc_core.c | 4 +++- + drivers/remoteproc/wkup_m3_rproc.c | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (c474e348778b gpio: generic: make bgpio_pdata always visible) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (074726402b82 pwm: omap-dmtimer: Potential NULL dereference on error) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/lpc32xx-pwm.txt | 9 +- + .../devicetree/bindings/pwm/pwm-omap-dmtimer.txt | 18 ++ + drivers/pwm/Kconfig | 25 +- + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-bcm2835.c | 18 +- + drivers/pwm/pwm-fsl-ftm.c | 58 ++-- + drivers/pwm/pwm-lpc32xx.c | 59 ++-- + drivers/pwm/pwm-lpss.c | 57 ++-- + drivers/pwm/pwm-lpss.h | 1 + + drivers/pwm/pwm-omap-dmtimer.c | 327 +++++++++++++++++++++ + drivers/pwm/pwm-rcar.c | 2 +- + include/linux/platform_data/pwm_omap_dmtimer.h | 69 +++++ + 12 files changed, 538 insertions(+), 106 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-omap-dmtimer.txt + create mode 100644 drivers/pwm/pwm-omap-dmtimer.c + create mode 100644 include/linux/platform_data/pwm_omap_dmtimer.h +Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (b953c0d234bc Linux 4.1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (3da834e3e5a4 clk: remove duplicated COMMON_CLK_NXP record from clk/Kconfig) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging aio/master (514c11dabdf2 aio: fix a compiler warning on 32 bit architectures in aio_renameat()) +$ git merge aio/master +Auto-merging net/unix/af_unix.c +Auto-merging net/sctp/socket.c +Auto-merging net/core/stream.c +Auto-merging net/atm/common.c +Auto-merging mm/readahead.c +Auto-merging mm/internal.h +Auto-merging mm/filemap.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/auditsc.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/fs.h +Auto-merging fs/splice.c +Auto-merging fs/read_write.c +Auto-merging fs/namei.c +Auto-merging fs/internal.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_lock.c | 2 +- + drivers/gpu/drm/ttm/ttm_lock.c | 6 +- + fs/aio.c | 729 ++++++++++++++++++++++++++++++++++++++--- + fs/attr.c | 2 +- + fs/binfmt_flat.c | 2 +- + fs/fuse/dev.c | 2 +- + fs/internal.h | 6 + + fs/namei.c | 2 +- + fs/pipe.c | 4 +- + fs/read_write.c | 5 +- + fs/splice.c | 8 +- + include/linux/aio.h | 9 + + include/linux/fs.h | 3 + + include/linux/sched.h | 6 + + include/uapi/linux/aio_abi.h | 15 +- + init/Kconfig | 13 + + kernel/auditsc.c | 6 +- + kernel/signal.c | 20 ++ + kernel/sysctl.c | 9 + + mm/filemap.c | 6 +- + mm/internal.h | 4 +- + mm/readahead.c | 13 +- + net/atm/common.c | 4 +- + net/ax25/af_ax25.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/core/stream.c | 2 +- + net/decnet/af_decnet.c | 2 +- + net/irda/af_irda.c | 4 +- + net/netrom/af_netrom.c | 2 +- + net/rose/af_rose.c | 2 +- + net/sctp/socket.c | 2 +- + net/unix/af_unix.c | 4 +- + net/x25/af_x25.c | 2 +- + 33 files changed, 819 insertions(+), 81 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at f42a8e856382 Merge remote-tracking branch 'pwm/for-next' +Merging next-20160111 version of aio +$ git merge -m next-20160111/aio 6a81013efc4013555c5de34c01530b805f45c92c +Auto-merging net/unix/af_unix.c +Auto-merging net/sctp/socket.c +Auto-merging net/core/stream.c +Auto-merging net/atm/common.c +Auto-merging mm/filemap.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/auditsc.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/fs.h +Auto-merging fs/splice.c +Auto-merging fs/read_write.c +Auto-merging fs/internal.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_lock.c | 2 +- + drivers/gpu/drm/ttm/ttm_lock.c | 6 +- + fs/aio.c | 382 ++++++++++++++++++++++++++++++++++++++--- + fs/attr.c | 2 +- + fs/binfmt_flat.c | 2 +- + fs/fuse/dev.c | 2 +- + fs/internal.h | 6 + + fs/pipe.c | 4 +- + fs/read_write.c | 5 +- + fs/splice.c | 8 +- + include/linux/aio.h | 8 + + include/linux/fs.h | 2 + + include/linux/sched.h | 6 + + include/uapi/linux/aio_abi.h | 2 +- + init/Kconfig | 13 ++ + kernel/auditsc.c | 6 +- + kernel/signal.c | 20 +++ + kernel/sysctl.c | 9 + + mm/filemap.c | 6 +- + net/atm/common.c | 4 +- + net/ax25/af_ax25.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/core/stream.c | 2 +- + net/decnet/af_decnet.c | 2 +- + net/irda/af_irda.c | 4 +- + net/netrom/af_netrom.c | 2 +- + net/rose/af_rose.c | 2 +- + net/sctp/socket.c | 2 +- + net/unix/af_unix.c | 4 +- + net/x25/af_x25.c | 2 +- + 30 files changed, 455 insertions(+), 64 deletions(-) +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (1b1fe542b6f0 selftests: firmware: add empty string and async tests) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval') +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_mr.c | 5 ++--- + fs/afs/main.c | 6 ++---- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging luto-misc/next (afd2ff9b7e1b Linux 4.4) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops) +$ git merge borntraeger/linux-next +Auto-merging lib/Makefile +Auto-merging include/linux/dma-mapping.h +Auto-merging arch/s390/pci/pci_dma.c +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci-noop.c | 46 ++--------------------- + arch/s390/Kconfig | 7 +--- + arch/s390/include/asm/device.h | 6 ++- + arch/s390/include/asm/dma-mapping.h | 6 ++- + arch/s390/pci/pci.c | 1 + + arch/s390/pci/pci_dma.c | 4 +- + include/linux/dma-mapping.h | 2 + + lib/Makefile | 1 + + lib/dma-noop.c | 75 +++++++++++++++++++++++++++++++++++++ + 9 files changed, 96 insertions(+), 52 deletions(-) + create mode 100644 lib/dma-noop.c +Merging livepatching/for-next (03f726f415f5 Merge branch 'for-4.5/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + arch/s390/include/asm/livepatch.h | 2 +- + arch/x86/include/asm/livepatch.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging coresight/next (b23d8dc4ecdf coresight: Fix a typo in Kconfig) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (079062b28fb4 rtc: cmos: prevent kernel warning on IRQ flags mismatch) +$ git merge rtc/rtc-next +Already up-to-date. +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (8b63b6bfc1a5 Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (57fe72c35188 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'include/net/tcp_memcontrol.h' +Recorded preimage for 'mm/huge_memory.c' +Resolved 'Makefile' using previous resolution. +Resolved 'arch/powerpc/include/asm/nohash/64/pgtable.h' using previous resolution. +Resolved 'fs/block_dev.c' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Resolved 'net/mac80211/debugfs.c' using previous resolution. +Resolved 'scripts/tags.sh' using previous resolution. +Auto-merging security/smack/smack_lsm.c +Auto-merging scripts/tags.sh +CONFLICT (content): Merge conflict in scripts/tags.sh +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging net/mac80211/debugfs.c +CONFLICT (content): Merge conflict in net/mac80211/debugfs.c +Auto-merging net/ipv4/tcp_ipv4.c +CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c +Auto-merging mm/vmscan.c +Auto-merging mm/util.c +CONFLICT (content): Merge conflict in mm/util.c +Auto-merging mm/page_alloc.c +Auto-merging mm/oom_kill.c +Auto-merging mm/memory.c +Auto-merging mm/memblock.c +Auto-merging mm/ksm.c +Auto-merging mm/internal.h +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging mm/backing-dev.c +Auto-merging lib/vsprintf.c +CONFLICT (content): Merge conflict in lib/vsprintf.c +Auto-merging lib/test_hexdump.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/sysctl.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/futex.c +Auto-merging init/Kconfig +Auto-merging include/trace/events/huge_memory.h +CONFLICT (add/add): Merge conflict in include/trace/events/huge_memory.h +Auto-merging include/net/tcp_memcontrol.h +CONFLICT (content): Merge conflict in include/net/tcp_memcontrol.h +Auto-merging include/net/sock.h +CONFLICT (content): Merge conflict in include/net/sock.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/string.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/printk.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memblock.h +CONFLICT (content): Merge conflict in include/linux/memblock.h +Auto-merging include/linux/io.h +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/ocfs2/quota_global.c +Auto-merging fs/ocfs2/localalloc.c +Auto-merging fs/ocfs2/journal.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/ocfs2/alloc.c +Auto-merging fs/logfs/Kconfig +CONFLICT (content): Merge conflict in fs/logfs/Kconfig +Auto-merging fs/fat/inode.c +Auto-merging fs/coredump.c +Auto-merging fs/block_dev.c +CONFLICT (content): Merge conflict in fs/block_dev.c +Auto-merging drivers/nvdimm/pmem.c +CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c +Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/omap_gem.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging block/genhd.c +Auto-merging arch/x86/kvm/mmu.c +CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/include/asm/nohash/64/pgtable.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/nohash/64/pgtable.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git merge --abort +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: fs/overlayfs/super.c needs pagemap.h +Applying: fs/adfs/adfs.h: tidy up comments +Applying: iio: core: fix ptr_ret.cocci warnings +Applying: dma-mapping: make the generic coherent dma mmap implementation optional +Applying: arc: convert to dma_map_ops +Applying: arc: dma mapping fixes +Applying: ARC: dma mapping fixes #2 +Applying: avr32: convert to dma_map_ops +Applying: blackfin: convert to dma_map_ops +Applying: c6x: convert to dma_map_ops +Applying: C6X: fix build breakage +Applying: c6x: dma mapping fixes +Applying: cris: convert to dma_map_ops +Applying: nios2: convert to dma_map_ops +Applying: nios2: dma mapping fixes +Applying: frv: convert to dma_map_ops +Applying: parisc: convert to dma_map_ops +Applying: mn10300: convert to dma_map_ops +Applying: m68k: convert to dma_map_ops +Applying: metag: convert to dma_map_ops +Applying: sparc: use generic dma_set_mask +Applying: tile: uninline dma_set_mask +Applying: dma-mapping: always provide the dma_map_ops based implementation +Applying: HAVE_DMA_ATTRS: remove leftovers in Kconfig +Applying: dma-mapping: remove <asm-generic/dma-coherent.h> +Applying: dma-mapping: use offset_in_page macro +Applying: memstick: use sector_div instead of do_div +Applying: mm: memcontrol: drop unused @css argument in memcg_init_kmem +Using index info to reconstruct a base tree... +M include/net/tcp_memcontrol.h +Falling back to patching base and 3-way merge... +Auto-merging include/net/tcp_memcontrol.h +CONFLICT (content): Merge conflict in include/net/tcp_memcontrol.h +error: Failed to merge in the changes. +Patch failed at 0028 mm: memcontrol: drop unused @css argument in memcg_init_kmem +The copy of the patch that failed is found in: .git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: mm: memcontrol: remove double kmem page_counter init +Applying: mm: memcontrol: give the kmem states more descriptive names +Applying: mm: memcontrol: group kmem init and exit functions together +Applying: mm: memcontrol: separate kmem code from legacy tcp accounting code +Applying: mm: memcontrol: move kmem accounting code to CONFIG_MEMCG +Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-v2 +Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-fix +Applying: mm: memcontrol: account "kmem" consumers in cgroup2 memory controller +Applying: mm: memcontrol: allow to disable kmem accounting for cgroup2 +Applying: mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM +Applying: mm: memcontrol: only manage socket pressure for CONFIG_INET +Applying: net: drop tcp_memcontrol.c +Using index info to reconstruct a base tree... +M include/net/tcp_memcontrol.h +Falling back to patching base and 3-way merge... +Removing net/ipv4/tcp_memcontrol.c +CONFLICT (modify/delete): include/net/tcp_memcontrol.h deleted in net: drop tcp_memcontrol.c and modified in 22bb2d22de44549c622f8d24df814a379a8eefd1. Version 22bb2d22de44549c622f8d24df814a379a8eefd1 of include/net/tcp_memcontrol.h left in tree. +error: Failed to merge in the changes. +Patch failed at 0040 net: drop tcp_memcontrol.c +The copy of the patch that failed is found in: .git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: net-drop-tcp_memcontrolc-fix +Applying: mm: memcontrol: rein in the CONFIG space madness +Applying: mm-memcontrol-reign-in-the-config-space-madness-fix +Applying: mm-memcontrol-reign-in-the-config-space-madness-fix-fix +Applying: mm: memcontrol: flatten struct cg_proto +Applying: mm: memcontrol: clean up alloc, online, offline, free functions +Applying: mm: memcontrol: clean up alloc, online, offline, free functions fix +Applying: memcg: fix SLOB build regression +Applying: mm: memcontrol: charge swap to cgroup2 +Applying: mm: vmscan: pass memcg to get_scan_count() +Applying: mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online +Applying: swap.h: move memcg related stuff to the end of the file +Applying: mm: vmscan: do not scan anon pages if memcg swap limit is hit +Applying: mm: free swap cache aggressively if memcg swap is full +Applying: Documentation: cgroup: add memory.swap.{current,max} description +Applying: MAINTAINERS: add git URL for APM driver +Applying: MAINTAINERS: add git URL for at91 +Applying: MAINTAINERS: add git URL for Rockchip +Applying: MAINTAINERS: add git URL for ARM64 +Applying: MAINTAINERS: update git URL for ath6kl +Applying: MAINTAINERS: add git URL for backlight +Applying: MAINTAINERS: add git URL for chrome +Applying: MAINTAINERS: add git URL for cris +Applying: MAINTAINERS: add git URL for cryptodev +Applying: MAINTAINERS: update git URL for DLM +Applying: MAINTAINERS: add git URL for eCryptfs +Applying: MAINTAINERS: add git URL for ext4 +Applying: MAINTAINERS: add git URL for hwspinlock +Applying: MAINTAINERS: add git URL for integrity +Applying: MAINTAINERS: add git URL for IPVS +Applying: MAINTAINERS: add git URL for nfsd +Applying: MAINTAINERS: add git URL for KVM/s390 +Applying: MAINTAINERS: add git URL for kgdb +Applying: MAINTAINERS: add git URL for nvdimm +Applying: MAINTAINERS: add git URL for metag +Applying: MAINTAINERS: add git URL for wireless drivers +Applying: MAINTAINERS: add git URL for devicetree +Applying: MAINTAINERS: update git URL for PCMCIA +Applying: MAINTAINERS: update git URL for pstore +Applying: MAINTAINERS: update git URL for ath10k +Applying: MAINTAINERS: add git URL for hexagon +Applying: MAINTAINERS: add git URL for reset +Applying: MAINTAINERS: add git URL for s390 +Applying: MAINTAINERS: fix tree format for SAMSUNG thermal +Applying: MAINTAINERS: add git URL for md +Applying: MAINTAINERS: add git URL for squashfs +Applying: MAINTAINERS: add git URL for swiotlb +Applying: MAINTAINERS: add git URL for xtensa +Applying: MAINTAINERS: fix tree format for TPM +Applying: MAINTAINERS: add git URL for UML +Applying: MAINTAINERS: add git URL for VFIO +Applying: MAINTAINERS: add git URL for vhost +Applying: MAINTAINERS: update git URL for XFS +Applying: MAINTAINERS: fix MIC maintainers entry +Applying: dax: fix NULL pointer dereference in __dax_dbg() +Applying: dax: fix conversion of holes to PMDs +Applying: pmem: add wb_cache_pmem() to the PMEM API +Applying: pmem-add-wb_cache_pmem-to-the-pmem-api-v6 +Applying: dax: support dirty DAX entries in radix tree +Applying: dax-support-dirty-dax-entries-in-radix-tree-v6 +Applying: mm: add find_get_entries_tag() +Applying: dax: add support for fsync/sync +Applying: dax-add-support-for-fsync-sync-v6 +Applying: dax: fix dax_pmd_dbg build warning +Applying: dax: add support for fsync/msync +Applying: dax-add-support-for-fsync-msync-v8 +Applying: ext2: call dax_pfn_mkwrite() for DAX fsync/msync +Applying: ext4: call dax_pfn_mkwrite() for DAX fsync/msync +Applying: xfs: call dax_pfn_mkwrite() for DAX fsync/msync +Applying: tree wide: use kvfree() than conditional kfree()/vfree() +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + f38542266185...4df70b18c99a akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4df70b18c99a tree wide: use kvfree() than conditional kfree()/vfree()) +$ git merge --no-ff akpm/master +Removing net/ipv4/tcp_memcontrol.c +Removing include/net/tcp_memcontrol.h +Removing include/asm-generic/dma-mapping-common.h +Removing include/asm-generic/dma-mapping-broken.h +Removing include/asm-generic/dma-coherent.h +Removing Documentation/features/io/dma_map_attrs/arch-support.txt +Merge made by the 'recursive' strategy. + Documentation/DMA-API-HOWTO.txt | 10 - + Documentation/cgroup-v2.txt | 33 + + .../features/io/dma_map_attrs/arch-support.txt | 40 -- + Documentation/kernel-parameters.txt | 1 + + MAINTAINERS | 53 +- + arch/Kconfig | 6 +- + arch/alpha/Kconfig | 1 - + arch/alpha/include/asm/dma-mapping.h | 2 - + arch/arc/include/asm/dma-mapping.h | 187 +---- + arch/arc/mm/dma.c | 152 +++-- + arch/arm/Kconfig | 1 - + arch/arm/include/asm/dma-mapping.h | 7 - + arch/arm/mm/dma-mapping.c | 11 +- + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/dma-mapping.h | 2 - + arch/avr32/include/asm/dma-mapping.h | 342 +--------- + arch/avr32/mm/dma-coherent.c | 115 +++- + arch/blackfin/include/asm/dma-mapping.h | 127 +--- + arch/blackfin/kernel/dma-mapping.c | 52 +- + arch/c6x/Kconfig | 1 + + arch/c6x/include/asm/dma-mapping.h | 98 +-- + arch/c6x/kernel/dma.c | 95 ++- + arch/c6x/mm/dma-coherent.c | 10 +- + arch/cris/arch-v32/drivers/pci/dma.c | 54 +- + arch/cris/include/asm/dma-mapping.h | 161 +---- + arch/frv/Kconfig | 1 + + arch/frv/include/asm/dma-mapping.h | 132 +--- + arch/frv/mb93090-mb00/pci-dma-nommu.c | 72 +- + arch/frv/mb93090-mb00/pci-dma.c | 74 +- + arch/h8300/Kconfig | 1 - + arch/h8300/include/asm/dma-mapping.h | 2 - + arch/hexagon/Kconfig | 1 - + arch/hexagon/include/asm/dma-mapping.h | 2 - + arch/ia64/Kconfig | 1 - + arch/ia64/include/asm/dma-mapping.h | 2 - + arch/m68k/include/asm/dma-mapping.h | 112 +-- + arch/m68k/kernel/dma.c | 61 +- + arch/metag/include/asm/dma-mapping.h | 179 +---- + arch/metag/kernel/dma.c | 146 +++- + arch/microblaze/Kconfig | 1 - + arch/microblaze/include/asm/dma-mapping.h | 2 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/dma-mapping.h | 2 - + arch/mn10300/Kconfig | 1 + + arch/mn10300/include/asm/dma-mapping.h | 161 +---- + arch/mn10300/mm/dma-alloc.c | 67 +- + arch/nios2/include/asm/dma-mapping.h | 123 +--- + arch/nios2/mm/dma-mapping.c | 149 ++-- + arch/openrisc/Kconfig | 3 - + arch/openrisc/include/asm/dma-mapping.h | 2 - + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/dma-mapping.h | 189 +----- + arch/parisc/kernel/drivers.c | 2 +- + arch/parisc/kernel/pci-dma.c | 92 +-- + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/dma-mapping.h | 2 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/dma-mapping.h | 2 - + arch/sh/Kconfig | 1 - + arch/sh/include/asm/dma-mapping.h | 2 - + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/dma-mapping.h | 17 - + arch/tile/Kconfig | 1 - + arch/tile/include/asm/dma-mapping.h | 32 +- + arch/tile/kernel/pci-dma.c | 29 + + arch/unicore32/Kconfig | 1 - + arch/unicore32/include/asm/dma-mapping.h | 2 - + arch/x86/Kconfig | 1 - + arch/x86/include/asm/dma-mapping.h | 2 - + arch/x86/include/asm/pmem.h | 11 +- + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/dma-mapping.h | 4 - + drivers/acpi/apei/erst.c | 6 +- + drivers/base/dma-mapping.c | 7 +- + drivers/block/drbd/drbd_bitmap.c | 26 +- + drivers/block/drbd/drbd_int.h | 3 - + drivers/char/mspec.c | 15 +- + drivers/gpu/drm/Kconfig | 4 +- + drivers/gpu/drm/drm_hashtab.c | 5 +- + drivers/gpu/drm/imx/Kconfig | 2 +- + drivers/gpu/drm/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/shmobile/Kconfig | 2 +- + drivers/gpu/drm/sti/Kconfig | 2 +- + drivers/gpu/drm/tilcdc/Kconfig | 2 +- + drivers/gpu/drm/vc4/Kconfig | 2 +- + drivers/iio/industrialio-sw-trigger.c | 4 +- + drivers/media/platform/Kconfig | 1 - + drivers/memstick/core/ms_block.c | 2 +- + drivers/parisc/ccio-dma.c | 57 +- + drivers/parisc/sba_iommu.c | 52 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 8 +- + fs/adfs/adfs.h | 28 +- + fs/block_dev.c | 2 +- + fs/coda/coda_linux.h | 3 +- + fs/dax.c | 215 +++++- + fs/ext2/file.c | 4 +- + fs/ext4/file.c | 4 +- + fs/inode.c | 2 +- + fs/jffs2/build.c | 8 +- + fs/jffs2/fs.c | 5 +- + fs/jffs2/super.c | 5 +- + fs/overlayfs/super.c | 1 + + fs/udf/super.c | 7 +- + fs/xfs/xfs_file.c | 7 +- + include/asm-generic/dma-coherent.h | 32 - + include/asm-generic/dma-mapping-broken.h | 95 --- + include/asm-generic/dma-mapping-common.h | 358 ---------- + include/linux/dax.h | 7 + + include/linux/dma-attrs.h | 10 - + include/linux/dma-mapping.h | 411 ++++++++++- + include/linux/fs.h | 3 +- + include/linux/list_lru.h | 4 +- + include/linux/memcontrol.h | 81 +-- + include/linux/pagemap.h | 3 + + include/linux/pmem.h | 22 +- + include/linux/radix-tree.h | 9 + + include/linux/sched.h | 4 +- + include/linux/slab.h | 2 +- + include/linux/slab_def.h | 3 +- + include/linux/slub_def.h | 2 +- + include/linux/swap.h | 76 ++- + include/net/tcp_memcontrol.h | 9 - + init/Kconfig | 23 +- + ipc/sem.c | 2 +- + ipc/util.c | 11 +- + ipc/util.h | 2 +- + mm/filemap.c | 91 ++- + mm/list_lru.c | 12 +- + mm/memcontrol.c | 752 ++++++++++++--------- + mm/memory.c | 3 +- + mm/percpu.c | 18 +- + mm/shmem.c | 4 + + mm/slab.h | 6 +- + mm/slab_common.c | 14 +- + mm/slub.c | 10 +- + mm/swap_state.c | 5 + + mm/swapfile.c | 6 +- + mm/truncate.c | 69 +- + mm/vmscan.c | 37 +- + mm/workingset.c | 4 +- + net/ipv4/Makefile | 1 - + net/ipv4/fib_trie.c | 4 +- + net/ipv4/sysctl_net_ipv4.c | 1 - + net/ipv4/tcp_ipv4.c | 1 - + net/ipv4/tcp_memcontrol.c | 200 ------ + net/ipv6/tcp_ipv6.c | 1 - + 146 files changed, 2375 insertions(+), 3781 deletions(-) + delete mode 100644 Documentation/features/io/dma_map_attrs/arch-support.txt + delete mode 100644 include/asm-generic/dma-coherent.h + delete mode 100644 include/asm-generic/dma-mapping-broken.h + delete mode 100644 include/asm-generic/dma-mapping-common.h + delete mode 100644 include/net/tcp_memcontrol.h + delete mode 100644 net/ipv4/tcp_memcontrol.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..c3fd2cba9ac9 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.4-rc8 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0e972de233f5 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160119 |