diff options
| -rw-r--r-- | Next/SHA1s | 260 | ||||
| -rw-r--r-- | Next/Trees | 262 | ||||
| -rw-r--r-- | Next/merge.log | 16045 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 16572 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..bcb75b4866c6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,260 @@ +Name SHA1 +---- ---- +origin ea839b41744dffe5c77b8d9842c9bb7073460901 +fixes 97da3854c526d3a6ee05c849c96e48d21527606c +kbuild-current 9be3213b14d44f6328281941193d97f3b97e7d4c +arc-current 3d5e80125a6e5649c6bdad8d5780e39ea422c67d +arm-current 3872fe83a2fbb7366daa93ca533a22138e2d483e +m68k-current e3b1ebd673876f2cdb0b84205e52a33b94a9860f +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes be5c5e843c4afa1c8397cb740b6032bd4142f32d +sparc f6ebf0bb1a983a7b60a26acf282975b5da5b3202 +fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51 +net fd2c83b35752f0a8236b976978ad4658df14a59f +ipsec 096f41d3a8fcbb8dde7f71379b1ca85fe213eded +netfilter 1debdc8f9ebd07daf140e417b3841596911e0066 +ipvs 8f8688b0d483ff06236808ab5fc8bc83c5eaa8d9 +wireless-drivers d77facb88448cdeaaa3adba5b9704a48ac2ac8d6 +mac80211 2f3bb64247b5b083d05ccecad9c2e139bbfdc294 +sound-current d4a2fbcee0c8449ce24d6de168f3d90c5e6d7596 +pci-current b9c1153f7a9cb2d53b845615a0edd510f7fe8341 +driver-core.current 39da7c509acff13fc8cb12ec1bb20337c988ed36 +tty.current 4f7d029b9bf009fbee76bb10c0c4351a1870d2f3 +usb.current a71c9a1c779f2499fb2afc0553e543f18aff6edf +usb-gadget-fixes 25cd9721c2b16ee0d775e36ec3af31f392003f80 +usb-serial-fixes c02ed2e75ef4c74e41e421acb4ef1494671585e8 +usb-chipidea-fixes c7fbb09b2ea13e283b9b0fd18a778f918ceb17b9 +phy 1a09b6a7c10e22c489a8b212dd6862b1fd9674ad +staging.current 39da7c509acff13fc8cb12ec1bb20337c988ed36 +char-misc.current c02ed2e75ef4c74e41e421acb4ef1494671585e8 +input-current 7c5bb4ac2b76d2a09256aec8a7d584bf3e2b0466 +crypto-current e6534aebb26e32fbab14df9c713c65e8507d17e4 +ide 96297aee8bce237961b0e1b99e22913c5726af12 +vfio-fixes 39da7c509acff13fc8cb12ec1bb20337c988ed36 +kselftest-fixes c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes b2376407f98920c9b0c411948675f58a9640be35 +v4l-dvb-fixes 24a47426066c8ba16a4db1b20a41d63187281195 +drm-intel-fixes 5a7ad1146caa895ad718a534399e38bd2ba721b7 +drm-misc-fixes 0c45b36f8acc89cb94c8696a27574f01e0e411dc +kbuild 03133d4beac09e87c03ec7f409ce0cf94acd1716 +asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c +arc d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c +arm 71899360f430ec07391a6762ea2a7656d0444213 +arm-perf f00fa5f4163b40c3ec8590d9a7bd845c19bf8d16 +arm-soc 6f714927c55377208e8570f3cf31719ceeb31827 +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic 715dcd20604177df66ed4d8aa6332abd58aea7ee +aspeed 4944e5dbb215cb99491bc5cd519045ae84536d2c +at91 ce60fdaa7e9ebcb97655f5c8497d1291d6398233 +bcm2835 7ea6e490ba7f0ded1f1a576733453db2f4576ffa +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 990df04806108758b5ae6f1dff53479a107e7abd +keystone 4495c08e84729385774601b5146d51d9e5849f81 +mvebu 4242642c21aad714713fbcac3e44a3787ed7c851 +omap 5a0bbcf7ab0f8e0b3d32253d9c72214d1752b5e3 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 9f514b0f9cf3017bd6d730ee0c5a704e8af36f30 +renesas 410c0b62ddfaa262333b9e630ef31bae20b68f76 +rockchip b1e842489772ec6c47fd0e3abe52d556097bcc1a +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1001354ca34179f3db924eb66672442a173147dc +samsung-krzk f4fcaa6cec044d6e2bbad6ac2f790a0c494f6900 +sunxi 5675caea945d205c7abbac476300028f949eb5f2 +tegra 29d04525797f3eee9946d40f978672e14e5e46de +arm64 faa9a08397f5034efad75b06879ac0ead83bd714 +clk ee7d74339df71015ae5b98d91393ea80b72a4546 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k f6ab4d59a5fe205f12287e515a43fc5e6de779b1 +m68knommu 99a2c395541f487f6636c2a8822625f67ceefbb3 +metag d3ba2e922d4d1d61806fcb6e09512d2bee734d06 +microblaze 3400606d8ffd64ea7ffb5969f7c96daebeff36f3 +mips d9c94cdf3bb50f7d1df3cb0ab2540f6028857333 +nios2 d8f347ba35cf994eb4ce3def4bc5bc63c71cf10c +openrisc a4d4426635804379d618dd28e29f574a2bc11184 +parisc-hd 4f7d029b9bf009fbee76bb10c0c4351a1870d2f3 +powerpc 9765ad134a00a01cbcc69c78ff6defbfad209bc5 +fsl 75b824727680a9d12c34d78096a5ac642e53f5d0 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 9b11c7912d00d0e5fe0d7f8973b77dac4f69d3df +sparc-next 94836ecf1e7378b64d37624fbb81fe48fbd4c772 +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile 0af0bc38175d9859753a08f07af3aa767601265b +uml f88f0bdfc32f3d1e2fd03ec8a7f7b456df4db725 +unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5 +xtensa d0c32cdc395cc4edfb66ae9178733a37319a2291 +fscrypt 94840e3c802daa1a62985957f36ac48faf8ceedd +befs 0bbabf98dd76229db3a1a2f2903a25c611fd68ae +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave 953a8bf6ceddb51cdf23a8425b2c20894cf3cb33 +ceph 8179a101eb5f4ef0ac9a915fcea9a9d3109efa90 +cifs f61143c45077df4fa78e2f1ba455a00bbe1d5b8c +configfs e16769d4bca67218531505ad1a8365d227fedcf9 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 07f7e3135e589716e9c9865ca0d276d5c6a58edf +ext4 d67d64f423147cf4fe8212658255e1160a4ef02c +f2fs d29fd17218515387c1eb36740f0f6f03d0d264d4 +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 0b6e9ea041e6c932f5b3a86fae2d60cbcfad4dd2 +jfs 684666e51585f3b136a3f505f8173d7580bc52cd +nfs 35a2442189015bf540197906e745c7b7c100f28c +nfsd c02ea6a0583a516fa9abc461f0de2b029f1301a7 +orangefs 96c641bc68a3c77110ecb506cbe3aeff8f47519f +overlayfs b0990fbbbd147da2096b24f2d462abe02ca251fd +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 32fe905c17f001c0eee13c59afddd0bf2eed509c +xfs c4cf1acdb186436b88cc9aeaf08322bc49fec183 +file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +vfs 2bb81bf9e14d8a1709a0385c08c37609554d306a +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk cf39bf58afdaabc0b86f141630fb3fd18190294e +pci 5b197c00850e8baa81eedb5660069ebe8ac833af +pstore eec50d76a6ee6d7bd507c7aaaaee776178e2e08e +hid b9ae71373285dd0ba8d40bec4bb18780877d9de3 +i2c f49ee0593cde3275ac22ec94c291b5de040d7f0a +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi b3398adc0da601b344204a1b9140eaf401ce2b69 +hwmon-staging 39c382a3109400f5abb5adc2040510e75f93b4cb +jc_docs 6e91b74d56e169797ecf8ba64def28d6f2fd5003 +v4l-dvb 3622d3e77ecef090b5111e3c5423313f11711dfa +v4l-dvb-next 6d95b3f24881c0fd0f345eca959a2a803a040930 +fbdev 3bbb5b8234161db431992e5d1f8b7cb88ad9dec3 +pm 6fdf90d2069db410f224d34555bb13de43d35654 +idle 306899f94804aece6d8fa8b4223ede3b48dbb59c +thermal f7b553c688c3987833e78346de5d53aacd38638b +thermal-soc 19fd1783c24ea4516253c60972588ee8dfb48d93 +ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de +dlm c0ae148576778de958a0d5ff9a5ba00044e371a8 +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next 7acedaf5c4355f812cfef883ac28bf15f7d9205e +ipsec-next e892d2d40445a14a19530a2be8c489b87bcd7c19 +netfilter-next 122868b378094853b376f3e2ac833bcee078eb3c +ipvs-next e81beb79da5b5ff673eff7e2493a0d1e61f1a816 +wireless-drivers-next a0597834dc0e1af68f48f92b31617b360a14dfc8 +bluetooth 0a44e632c3ce3506e78d25f14d9a0ed7c21b917f +mac80211-next 127f60bfa98f30f7f47ae362b9807f0d223cbcc2 +rdma cc47dd684ee04f9f49f081002a74ef1ba9d14cc8 +gfs2 d552a2b9b33eafdb5eb16c643e745deb564dda7f +mtd c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +l2-mtd da4b1caa49cbfac4e5be2c4b080b8d01b04358dd +nand 9d2ee0a60b8bd9bef2a0082c533736d6a7b39873 +spi-nor cc34efbfb797f0495accb108fb38eb20ed2d7d01 +crypto 2a2a251f110576b1d89efbd0662677d7e7db21a8 +drm 6b1462700b4a6a1244c018cdd2fa97ded43090a0 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel ab6eb211b07a42a6346e284056422fd9a8576a99 +drm-tegra b0d36daa0ab54714e05164f6e21d22f974a5eec1 +drm-misc f9b67f0014cba18f1aabb6fa9272335a043eb6fd +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 98db803f6413e6d4bf1f590ea57e9e7dfe1eb32b +hdlcd 1de3cd4fb49f3463679c49afe0aa9ceb133f3e49 +mali-dp c2e7f82d336a451ebb904b8bf9a5a558cf16c39b +sunxi-drm 2da042ac05e91b78e4484b731e8eb335c90385d3 +imx-drm 3d1df96ad46856ce850be5ac112eab919cbe1cab +etnaviv 78ec187f64fa5d8f837b8fc5bbbad88a89b63ab4 +kspp 62111ab351b894b858dab51d8584b04f1e260935 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap bbbed19517040c8940e4fa49d399ccd049b0551b +sound 610793fe2b1c7ced8ca5c06a8d8e892aae72c3f2 +sound-asoc f7190f9f96e7637579a4acce0fdf4cb9729e423f +modules 17586188276980ff10d1244a35aeb31ae199705e +input aea415b1d10ea25779a100da639b3e3989080971 +block a2db02ec349f229927cbfaefa62221654eead807 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper ccf0a6821d287ec7edd8139d0f52c28f688382dc +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc ff4143ccff314b22f03666c1d8eccd4de967df2c +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md 296617581eac713b3fda588216ae6d16d1e76dd5 +mfd a676b983ba81a0ccc39bc6b4e8327ca033b087ab +backlight e739c5bb20bebb74028d9262255dc1e470b60fcf +battery 6c381663bb3b4febc15b2fb33f046f0b986ce5c5 +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator f123e7b2a6e3443468e5c90b4b0df36bd51d5097 +security 8979b02aaf1d6de8d52cc143aa4da961ed32e5a2 +integrity 3dd0c8d06511c7c61c62305fcf431ca28884d263 +keys 4cd4ca7cc848bedc70b5d0acac9d1ae33d73513a +selinux cae303df3f379f04ce7efadb2e30de460918b302 +tpmdd 8979b02aaf1d6de8d52cc143aa4da961ed32e5a2 +watchdog 0a7472cbf2121975df501a4d295ffdaaa73ed3de +iommu efc2195bcc35eebf06805806eb525893f3b9ab5c +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 7cb671e7a34d73b29df77d0b53492277744e57e7 +trivial 6fbc8798d9461c0ff22fab9fbaddde13de815941 +audit 4acdad9bab28337530293b15c4ded8fbffdecb65 +devicetree b8475cbee5ab2eac05f9cd5dbcc94c453d3cbf10 +mailbox 73874913d5044fb5d81d34b2c760a8df8521bd0f +spi cec00ac5dad39d2e596af9abadb5f8e702b142dd +tip 8a86a1ec66098f701436fb81678e00fcfe7eb579 +clockevents 6f9c89000c3f771c47adacaca2df775a25f27205 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd bffc7dece92edd0b6445b76a378e2fa9e324c7ed +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace c486bbae781cce337a31cbbbc609f2313ab54542 +rcu 8a6ad489518e94e1cfae5a27b228342943f1be5e +kvm bd17117bb2af60d4bc44e0f9c859e800a3d99722 +kvm-arm 1edb632133efb6226b6bef3e7d9fa8c7134ac4e2 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc feafd13c96d6e2998d3da81bb55db379fcf02499 +kvms390 730cd632c4e485b90f97fe998e300045da094938 +xen-tip 7ecff7dc7ec52e7b6d957753ebae39be7ddfc372 +percpu 8a1df543de8ad879d3c80bdda4c67ac4f82e7ee0 +workqueues bacb71fc9187f288e98c3132e87f36c0362318df +drivers-x86 58688a7525b6b4224347f5d1c16d92e4a3db2559 +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 9b9aab2257ad51329b1987d24decd6306fa5a684 +leds 28c5fe99016d28f15d1b825df8acb1558a3a63a1 +ipmi 3f724c408a7bcf25609f6a0102b835d5970cadd3 +driver-core 523aa3586ffb1fc11a9bf88f77ebaf71a15eb998 +usb 19445816996d1a89682c37685fe95959631d9f32 +usb-gadget 48eab1f28d49a3eeda050ad03fddf24a594c1f79 +usb-serial 31c5d1922b90ddc1da6a6ddecef7cd31f17aa32b +usb-chipidea-next a932a8041ff9941a244619555f1c75ecf299f662 +phy-next 6239879b415eb7cf96d418c8a2090ecd6f310aad +tty 15a0654851382faaf41a8da6d4e10201091246b9 +char-misc 049a59db34eb4c41a0231f983f180053db8f80d4 +extcon 70641a0a84e1ae3c6eee3d47ed5a482f85b11e3e +staging f06ee95ce6b0b09c30e9344ca736d00d068c435c +mux 7816ffe4dcb61cdfdf81f461e5a22af24542b949 +slave-dma 068c69a2b43fdc2eb99aec977599c59b804a5ce2 +cgroup 8673d8769243eddc11d0883a86ad30eda63eb89e +scsi f506b0386683bd0eebe2a9775fa7484827bac534 +scsi-mkp 4da2b1eb230ba4ad19b58984dc52e05b1073df5f +target-updates 9f7ebfc64d2c4716087e637c8924d4d9770944c1 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +target-bva 762b6f00a995863afa274d6b5ffa3880dac1714b +libata b09754f570fa2207a568f88ac004850406e08f1c +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost d635daaa99c687d92964d7c8ed930ceaf617bcff +rpmsg 5e78de7eee7401362abceb2f2e182274c48c125f +gpio fa2f60ffa0e0a33406ef9538635a57ac499965ae +pinctrl 02101cb3f5a269c006c5b93f3c603dc31e473859 +pinctrl-samsung c8dd100397f367b64bd78b0bfce620b855fa55aa +dma-mapping 1001354ca34179f3db924eb66672442a173147dc +pwm 97512ceafaacf8cdb96d6a36ae55e8335c0a9e55 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns 6c478ae9204b489f6228e4b535c6ac72851e06d8 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random db61ffe3a71c697aaa91c42c862a5f7557a0e562 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 51c6bd7cbe0366b642d8ac90d98739c39ab091a9 +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d +livepatching 608822c0f7af9499f4ed20e58d8db2b9321a5e0d +coresight 5a99899065daa6378afbffee9e8d2195fea56aaf +rtc 5d05e81516cfe7606ee0cd8278fe225314dccfbe +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 51891c7db26633b97e8fa78981fb147626b821b8 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +akpm-current 02dff0ef2e7f6c991f010dbad1e59942d97d2115 +akpm b7796f38de8afef781e52f484599845de84f9cf4 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..434151b1b57a --- /dev/null +++ b/Next/Trees @@ -0,0 +1,262 @@ +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/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#for-stable +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 +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.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 +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes +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 +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 +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +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://git.armlinux.org.uk/~rmk/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 +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-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/sunxi/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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +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 +openrisc git git://github.com/openrisc/linux.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 +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 +sh git git://git.libc.org/linux-sh#for-next +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/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master +befs git git://github.com/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-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 +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +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 +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 +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/fs/xfs/xfs-linux.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 +vfs-jk git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +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 +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-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 +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 +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 +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-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 +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.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 +nand git git://github.com/linux-nand/linux.git#nand/next +spi-nor git git://github.com/spi-nor/linux.git#next +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/drm-misc#for-linux-next +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 +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +sunxi-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/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 +lightnvm git git://github.com/OpenChannelSSD/linux.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/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#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.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#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 +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/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 +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-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next +kvm-ppc 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 +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://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-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 +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#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 +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/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 +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.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 +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 +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 +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11 +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..95a9fcf35496 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,16045 @@ +$ date -R +Wed, 26 Apr 2017 08:02:28 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at e0f4e0134a79 Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (ea839b41744d Merge tag 'arc-4.11-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc) +$ git merge origin/master +Updating e0f4e0134a79..ea839b41744d +Fast-forward + Makefile | 2 +- + arch/arc/Kconfig | 8 ++++++ + arch/arc/include/asm/atomic.h | 3 ++- + arch/arc/include/asm/entry-arcv2.h | 10 +++++++ + arch/arc/include/asm/ptrace.h | 4 +++ + arch/arc/kernel/setup.c | 30 ++++++++++++++------- + arch/mips/Makefile | 6 ++--- + arch/mips/include/asm/asm-prototypes.h | 1 + + arch/mips/kernel/cevt-r4k.c | 2 +- + arch/mips/kernel/elf.c | 2 +- + arch/mips/kernel/kgdb.c | 48 +++++++++++++++++++++++----------- + arch/mips/kernel/perf_event_mipsxx.c | 9 ++++--- + arch/mips/kernel/relocate.c | 2 +- + arch/mips/kernel/smp-cps.c | 3 +-- + arch/mips/mti-malta/malta-int.c | 11 ++++++++ + arch/mips/pci/pci-legacy.c | 2 +- + drivers/mtd/ubi/upd.c | 8 +++--- + drivers/scsi/scsi_lib.c | 4 +-- + fs/ubifs/debug.c | 10 ++++--- + fs/ubifs/dir.c | 18 ++++++++----- + 20 files changed, 129 insertions(+), 54 deletions(-) +Merging fixes/master (97da3854c526 Linux 4.11-rc3) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading parentheses around a condition) +$ git merge kbuild-current/fixes +Already up-to-date. +Merging arc-current/for-curr (3d5e80125a6e ARCv2: entry: save Accumulator register pair (r58:59) if present) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (3872fe83a2fb Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (e3b1ebd67387 m68k: Wire up statx) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (f6ebf0bb1a98 sparc: Update syscall tables.) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/ptrace.h | 3 ++- + arch/sparc/include/uapi/asm/unistd.h | 8 +++++++- + arch/sparc/kernel/ptrace_64.c | 36 ++++++++++++++++++++++++++++++++++++ + arch/sparc/kernel/systbls_32.S | 1 + + arch/sparc/kernel/systbls_64.S | 2 ++ + 6 files changed, 49 insertions(+), 2 deletions(-) +Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) +$ git merge fscrypt-current/for-stable +Already up-to-date. +Merging net/master (fd2c83b35752 net/packet: check length in getsockopt() called with PACKET_HDRLEN) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/can/usb/Kconfig | 2 + + drivers/net/can/usb/gs_usb.c | 17 +++-- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 + + drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 + + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 72 ++++++++++++++++++ + drivers/net/dsa/b53/b53_common.c | 37 ++++++++- + drivers/net/dsa/b53/b53_regs.h | 5 ++ + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 87 ++++++++++++---------- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 36 ++++++--- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 10 +-- + drivers/net/ethernet/renesas/ravb_main.c | 7 +- + drivers/net/ethernet/sfc/efx.h | 5 +- + drivers/net/ethernet/sfc/workarounds.h | 1 + + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 1 - + drivers/net/hyperv/netvsc.c | 9 +-- + drivers/net/macsec.c | 2 +- + drivers/net/macvlan.c | 11 ++- + drivers/net/team/team.c | 8 +- + drivers/net/usb/Kconfig | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/net/usb/plusb.c | 15 +++- + net/bridge/br_device.c | 1 + + net/bridge/br_if.c | 1 - + net/ipv4/route.c | 3 +- + net/ipv4/udp_offload.c | 3 + + net/ipv6/addrconf.c | 14 +++- + net/ipv6/af_inet6.c | 6 +- + net/ipv6/exthdrs.c | 4 + + net/ipv6/ndisc.c | 3 +- + net/packet/af_packet.c | 2 + + net/tipc/socket.c | 4 +- + 37 files changed, 291 insertions(+), 95 deletions(-) +Merging ipsec/master (096f41d3a8fc af_key: Fix sadb_x_ipsecrequest parsing) +$ git merge ipsec/master +Already up-to-date. +Merging netfilter/master (1debdc8f9ebd sh_eth: unmap DMA buffers when freeing rings) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (8f8688b0d483 ipvs: explicitly forbid ipv6 service/dest creation if ipv6 mod is disabled) +$ git merge ipvs/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_ctl.c | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) +Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (2f3bb64247b5 ipv6: sr: fix out-of-bounds access in SRH validation) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (d4a2fbcee0c8 Merge tag 'asoc-fix-v4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/seq/seq_lock.c | 9 +++------ + sound/firewire/lib.h | 2 +- + sound/firewire/oxfw/oxfw.c | 4 ++-- + sound/soc/intel/boards/bytcr_rt5640.c | 4 ++-- + sound/soc/intel/boards/bytcr_rt5651.c | 2 -- + sound/soc/soc-topology.c | 1 + + sound/soc/sti/uniperif.h | 1 + + sound/soc/sti/uniperif_player.c | 35 ++++++++++++++++++++++++----------- + sound/soc/sti/uniperif_reader.c | 24 ++++++++++++++++++++---- + 9 files changed, 54 insertions(+), 28 deletions(-) +Merging pci-current/for-linus (b9c1153f7a9c PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam)) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (39da7c509acf Linux 4.11-rc6) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (4f7d029b9bf0 Linux 4.11-rc7) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (a71c9a1c779f Linux 4.11-rc5) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (25cd9721c2b1 usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (39da7c509acf Linux 4.11-rc6) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (c02ed2e75ef4 Linux 4.11-rc4) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (7c5bb4ac2b76 Input: i8042 - add Clevo P650RS to the i8042 reset list) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ + 1 file changed, 7 insertions(+) +Merging crypto-current/master (e6534aebb26e crypto: algif_aead - Fix bogus request dereference in completion function) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (96297aee8bce ide: palm_bk3710: add __initdata to palm_bk3710_port_info) +$ git merge ide/master +Already up-to-date. +Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (c1ae3cfa0e89 Linux 4.11-rc1) +$ 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 (b2376407f989 mfd: cros-ec: Fix host command buffer size) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats) +$ git merge v4l-dvb-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (5a7ad1146caa Linux 4.11-rc8) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging drm-misc-fixes/for-linux-next-fixes (0c45b36f8acc drm/udl: Fix unaligned memory access in udl_render_hline) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up-to-date. +Merging kbuild/for-next (03133d4beac0 Merge branch 'kbuild' into for-next) +$ git merge kbuild/for-next +Resolved 'include/uapi/linux/Kbuild' using previous resolution. +Auto-merging scripts/Kbuild.include +Removing include/video/Kbuild +Removing include/uapi/xen/Kbuild +Removing include/uapi/video/Kbuild +Removing include/uapi/sound/Kbuild +Removing include/uapi/scsi/fc/Kbuild +Removing include/uapi/scsi/Kbuild +Removing include/uapi/rdma/hfi/Kbuild +Removing include/uapi/rdma/Kbuild +Removing include/uapi/mtd/Kbuild +Removing include/uapi/misc/Kbuild +Removing include/uapi/linux/wimax/Kbuild +Removing include/uapi/linux/usb/Kbuild +Removing include/uapi/linux/tc_ematch/Kbuild +Removing include/uapi/linux/tc_act/Kbuild +Removing include/uapi/linux/sunrpc/Kbuild +Removing include/uapi/linux/spi/Kbuild +Removing include/uapi/linux/raid/Kbuild +Removing include/uapi/linux/nfsd/Kbuild +Removing include/uapi/linux/netfilter_ipv6/Kbuild +Removing include/uapi/linux/netfilter_ipv4/Kbuild +Removing include/uapi/linux/netfilter_bridge/Kbuild +Removing include/uapi/linux/netfilter_arp/Kbuild +Removing include/uapi/linux/netfilter/ipset/Kbuild +Removing include/uapi/linux/netfilter/Kbuild +Removing include/uapi/linux/mmc/Kbuild +Removing include/uapi/linux/isdn/Kbuild +Removing include/uapi/linux/iio/Kbuild +Removing include/uapi/linux/hsi/Kbuild +Removing include/uapi/linux/hdlc/Kbuild +Removing include/uapi/linux/dvb/Kbuild +Removing include/uapi/linux/can/Kbuild +Removing include/uapi/linux/caif/Kbuild +Removing include/uapi/linux/byteorder/Kbuild +Removing include/uapi/linux/android/Kbuild +Auto-merging include/uapi/linux/Kbuild +CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild +Removing include/uapi/drm/Kbuild +Removing include/uapi/asm-generic/Kbuild +Removing include/uapi/Kbuild +Removing include/scsi/fc/Kbuild +Auto-merging include/rdma/ib_verbs.h +Removing include/asm-generic/Kbuild.asm +Removing include/Kbuild +Removing arch/tile/include/uapi/arch/Kbuild +Removing arch/tile/include/arch/Kbuild +Auto-merging arch/h8300/include/uapi/asm/bitsperlong.h +Removing arch/cris/include/uapi/arch-v32/arch/Kbuild +Removing arch/cris/include/uapi/arch-v10/arch/Kbuild +Removing arch/cris/include/arch-v32/arch/Kbuild +Removing arch/cris/include/arch-v10/arch/Kbuild +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bb41c39fa476] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kbuild/makefiles.txt | 74 ++-- + Kbuild | 25 -- + Makefile | 38 +- + arch/alpha/include/uapi/asm/Kbuild | 41 -- + arch/arc/Makefile | 4 +- + arch/arc/include/uapi/asm/Kbuild | 3 - + arch/arm/Makefile | 8 +- + arch/arm/include/uapi/asm/Kbuild | 17 - + arch/arm64/Makefile | 6 +- + arch/arm64/include/uapi/asm/Kbuild | 18 - + arch/avr32/include/uapi/asm/Kbuild | 20 - + arch/blackfin/include/uapi/asm/Kbuild | 17 - + arch/c6x/include/uapi/asm/Kbuild | 8 - + arch/cris/include/arch-v10/arch/Kbuild | 1 - + arch/cris/include/arch-v32/arch/Kbuild | 1 - + arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - + arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - + arch/cris/include/uapi/asm/Kbuild | 42 -- + arch/frv/include/uapi/asm/Kbuild | 33 -- + arch/frv/kernel/asm-offsets.c | 19 +- + arch/h8300/include/uapi/asm/Kbuild | 28 -- + arch/h8300/include/{ => uapi}/asm/bitsperlong.h | 6 +- + arch/hexagon/include/asm/Kbuild | 3 - + arch/hexagon/include/uapi/asm/Kbuild | 13 - + arch/ia64/include/uapi/asm/Kbuild | 45 --- + arch/ia64/kernel/Makefile | 26 +- + arch/m32r/include/uapi/asm/Kbuild | 31 -- + arch/m68k/include/uapi/asm/Kbuild | 24 -- + arch/metag/include/uapi/asm/Kbuild | 8 - + arch/microblaze/include/uapi/asm/Kbuild | 32 -- + arch/mips/include/uapi/asm/Kbuild | 37 -- + arch/mn10300/include/uapi/asm/Kbuild | 32 -- + arch/nios2/include/uapi/asm/Kbuild | 4 +- + arch/openrisc/include/asm/Kbuild | 3 - + arch/openrisc/include/uapi/asm/Kbuild | 8 - + arch/parisc/include/uapi/asm/Kbuild | 28 -- + arch/powerpc/include/uapi/asm/Kbuild | 45 --- + arch/s390/include/uapi/asm/Kbuild | 53 --- + arch/score/include/asm/Kbuild | 3 - + arch/score/include/uapi/asm/Kbuild | 32 -- + arch/sh/Makefile | 7 +- + arch/sh/include/uapi/asm/Kbuild | 23 -- + arch/sparc/include/uapi/asm/Kbuild | 48 --- + arch/tile/include/arch/Kbuild | 1 - + arch/tile/include/asm/Kbuild | 3 - + arch/tile/include/uapi/arch/Kbuild | 17 - + arch/tile/include/uapi/asm/Kbuild | 17 - + arch/unicore32/Makefile | 4 +- + arch/unicore32/include/uapi/asm/Kbuild | 6 - + arch/x86/include/uapi/asm/Kbuild | 59 --- + arch/xtensa/include/uapi/asm/Kbuild | 23 -- + include/Kbuild | 2 - + include/asm-generic/Kbuild.asm | 1 - + include/linux/crypto.h | 2 +- + include/linux/kbuild.h | 6 +- + include/rdma/ib_verbs.h | 3 +- + include/scsi/fc/Kbuild | 0 + include/uapi/Kbuild | 15 - + include/uapi/asm-generic/Kbuild | 36 -- + include/uapi/asm-generic/Kbuild.asm | 76 ++-- + include/uapi/drm/Kbuild | 23 -- + include/uapi/linux/Kbuild | 492 +----------------------- + include/uapi/linux/android/Kbuild | 2 - + include/uapi/linux/bcache.h | 2 +- + include/uapi/linux/btrfs_tree.h | 3 + + include/uapi/linux/byteorder/Kbuild | 3 - + include/uapi/linux/caif/Kbuild | 3 - + include/uapi/linux/can/Kbuild | 6 - + include/uapi/linux/crypto.h | 14 + + include/uapi/linux/cryptouser.h | 8 + + include/uapi/linux/dvb/Kbuild | 9 - + include/uapi/linux/hdlc/Kbuild | 2 - + include/uapi/linux/hsi/Kbuild | 2 - + include/uapi/linux/iio/Kbuild | 3 - + include/uapi/linux/isdn/Kbuild | 2 - + include/uapi/linux/mmc/Kbuild | 2 - + include/uapi/linux/netfilter/Kbuild | 89 ----- + include/uapi/linux/netfilter/ipset/Kbuild | 5 - + include/uapi/linux/netfilter_arp/Kbuild | 3 - + include/uapi/linux/netfilter_bridge/Kbuild | 18 - + include/uapi/linux/netfilter_ipv4/Kbuild | 10 - + include/uapi/linux/netfilter_ipv6/Kbuild | 13 - + include/uapi/linux/nfsd/Kbuild | 6 - + include/uapi/linux/pr.h | 2 + + include/uapi/linux/qrtr.h | 1 + + include/uapi/linux/raid/Kbuild | 3 - + include/uapi/linux/smc_diag.h | 2 +- + include/uapi/linux/spi/Kbuild | 2 - + include/uapi/linux/sunrpc/Kbuild | 2 - + include/uapi/linux/tc_act/Kbuild | 16 - + include/uapi/linux/tc_ematch/Kbuild | 5 - + include/uapi/linux/usb/Kbuild | 12 - + include/uapi/linux/wimax/Kbuild | 2 - + include/uapi/misc/Kbuild | 2 - + include/uapi/mtd/Kbuild | 6 - + include/uapi/rdma/Kbuild | 20 - + include/uapi/rdma/bnxt_re-abi.h | 2 + + include/uapi/rdma/hfi/Kbuild | 3 - + include/uapi/rdma/ib_user_verbs.h | 2 + + include/uapi/scsi/Kbuild | 6 - + include/uapi/scsi/fc/Kbuild | 5 - + include/uapi/sound/Kbuild | 16 - + include/uapi/video/Kbuild | 4 - + include/uapi/xen/Kbuild | 5 - + include/video/Kbuild | 0 + scripts/Kbuild.include | 6 +- + scripts/Makefile.extrawarn | 1 - + scripts/Makefile.headersinst | 68 ++-- + scripts/Makefile.lib | 31 ++ + scripts/genksyms/parse.tab.c_shipped | 474 +++++++++++------------ + scripts/genksyms/parse.y | 2 - + scripts/mod/Makefile | 28 +- + scripts/objdiff | 5 +- + scripts/package/builddeb | 7 +- + 114 files changed, 461 insertions(+), 2192 deletions(-) + delete mode 100644 arch/cris/include/arch-v10/arch/Kbuild + delete mode 100644 arch/cris/include/arch-v32/arch/Kbuild + delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild + delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild + rename arch/h8300/include/{ => uapi}/asm/bitsperlong.h (67%) + delete mode 100644 arch/tile/include/arch/Kbuild + delete mode 100644 arch/tile/include/uapi/arch/Kbuild + delete mode 100644 include/Kbuild + delete mode 100644 include/asm-generic/Kbuild.asm + delete mode 100644 include/scsi/fc/Kbuild + delete mode 100644 include/uapi/Kbuild + delete mode 100644 include/uapi/asm-generic/Kbuild + delete mode 100644 include/uapi/drm/Kbuild + delete mode 100644 include/uapi/linux/android/Kbuild + delete mode 100644 include/uapi/linux/byteorder/Kbuild + delete mode 100644 include/uapi/linux/caif/Kbuild + delete mode 100644 include/uapi/linux/can/Kbuild + create mode 100644 include/uapi/linux/crypto.h + delete mode 100644 include/uapi/linux/dvb/Kbuild + delete mode 100644 include/uapi/linux/hdlc/Kbuild + delete mode 100644 include/uapi/linux/hsi/Kbuild + delete mode 100644 include/uapi/linux/iio/Kbuild + delete mode 100644 include/uapi/linux/isdn/Kbuild + delete mode 100644 include/uapi/linux/mmc/Kbuild + delete mode 100644 include/uapi/linux/netfilter/Kbuild + delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild + delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild + delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild + delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild + delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild + delete mode 100644 include/uapi/linux/nfsd/Kbuild + delete mode 100644 include/uapi/linux/raid/Kbuild + delete mode 100644 include/uapi/linux/spi/Kbuild + delete mode 100644 include/uapi/linux/sunrpc/Kbuild + delete mode 100644 include/uapi/linux/tc_act/Kbuild + delete mode 100644 include/uapi/linux/tc_ematch/Kbuild + delete mode 100644 include/uapi/linux/usb/Kbuild + delete mode 100644 include/uapi/linux/wimax/Kbuild + delete mode 100644 include/uapi/misc/Kbuild + delete mode 100644 include/uapi/mtd/Kbuild + delete mode 100644 include/uapi/rdma/Kbuild + delete mode 100644 include/uapi/rdma/hfi/Kbuild + delete mode 100644 include/uapi/scsi/Kbuild + delete mode 100644 include/uapi/scsi/fc/Kbuild + delete mode 100644 include/uapi/sound/Kbuild + delete mode 100644 include/uapi/video/Kbuild + delete mode 100644 include/uapi/xen/Kbuild + delete mode 100644 include/video/Kbuild +Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) +$ git merge asm-generic/master +Resolved 'include/asm-generic/percpu.h' using previous resolution. +Auto-merging include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7a73b0cad467] Merge remote-tracking branch 'asm-generic/master' +$ git diff -M --stat --summary HEAD^.. + include/asm-generic/page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (71899360f430 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2c2x0.txt | 3 + + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/r7s72100.dtsi | 11 +++ + arch/arm/include/asm/cpufeature.h | 38 +++++++++++ + arch/arm/include/asm/fixmap.h | 2 +- + arch/arm/include/asm/module.h | 9 ++- + arch/arm/kernel/ftrace.c | 11 +-- + arch/arm/kernel/module-plts.c | 87 ++++++++++++++++-------- + arch/arm/kernel/module.lds | 1 + + arch/arm/kernel/setup.c | 4 +- + arch/arm/mach-shmobile/setup-r7s72100.c | 2 + + arch/arm/mm/cache-l2x0.c | 13 +++- + arch/arm/mm/dump.c | 54 ++++++++++++--- + arch/arm/mm/mmu.c | 16 ++++- + 14 files changed, 200 insertions(+), 52 deletions(-) + create mode 100644 arch/arm/include/asm/cpufeature.h +Merging arm-perf/for-next/perf (f00fa5f4163b arm64: pmuv3: use arm_pmu ACPI framework) +$ git merge arm-perf/for-next/perf +Auto-merging arch/arm64/kernel/smp.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/perf/qcom_l3_pmu.txt | 25 ++ + MAINTAINERS | 1 + + arch/arm64/include/asm/acpi.h | 2 + + arch/arm64/kernel/perf_event.c | 113 +++-- + arch/arm64/kernel/smp.c | 10 + + drivers/perf/Kconfig | 14 + + drivers/perf/Makefile | 4 +- + drivers/perf/arm_pmu.c | 530 +++++++---------------- + drivers/perf/arm_pmu_acpi.c | 256 +++++++++++ + drivers/perf/arm_pmu_platform.c | 235 ++++++++++ + drivers/perf/qcom_l3_pmu.c | 849 +++++++++++++++++++++++++++++++++++++ + include/linux/cpuhotplug.h | 2 + + include/linux/perf/arm_pmu.h | 29 +- + 13 files changed, 1660 insertions(+), 410 deletions(-) + create mode 100644 Documentation/perf/qcom_l3_pmu.txt + create mode 100644 drivers/perf/arm_pmu_acpi.c + create mode 100644 drivers/perf/arm_pmu_platform.c + create mode 100644 drivers/perf/qcom_l3_pmu.c +Merging arm-soc/for-next (6f714927c553 ARM: SoC: Document merges) +$ git merge arm-soc/for-next +Resolved 'arch/arm/boot/dts/r7s72100.dtsi' using previous resolution. +Auto-merging include/soc/tegra/flowctrl.h +Auto-merging drivers/soc/tegra/flowctrl.c +Auto-merging drivers/clk/versatile/icst.h +Auto-merging drivers/clk/versatile/icst.c +Auto-merging arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi +Auto-merging arch/arm64/boot/dts/cavium/thunder2-99xx.dts +Removing arch/arm/plat-versatile/include/plat/clock.h +Removing arch/arm/mach-gemini/time.c +Removing arch/arm/mach-gemini/reset.c +Removing arch/arm/mach-gemini/mm.c +Removing arch/arm/mach-gemini/irq.c +Removing arch/arm/mach-gemini/include/mach/uncompress.h +Removing arch/arm/mach-gemini/include/mach/irqs.h +Removing arch/arm/mach-gemini/include/mach/hardware.h +Removing arch/arm/mach-gemini/include/mach/global_reg.h +Removing arch/arm/mach-gemini/include/mach/entry-macro.S +Removing arch/arm/mach-gemini/idle.c +Removing arch/arm/mach-gemini/gpio.c +Removing arch/arm/mach-gemini/devices.c +Removing arch/arm/mach-gemini/common.h +Removing arch/arm/mach-gemini/board-wbd222.c +Removing arch/arm/mach-gemini/board-wbd111.c +Removing arch/arm/mach-gemini/board-rut1xx.c +Removing arch/arm/mach-gemini/board-nas4220b.c +Removing arch/arm/mach-gemini/Makefile.boot +Removing arch/arm/mach-at91/soc.c +Auto-merging arch/arm/boot/dts/sun8i-a33.dtsi +Auto-merging arch/arm/boot/dts/r7s72100.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r7s72100.dtsi +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 10b8f1009ee3] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/00-INDEX | 2 + + Documentation/arm/stm32/stm32h743-overview.txt | 30 + + Documentation/devicetree/bindings/arm/amlogic.txt | 3 + + .../devicetree/bindings/arm/atmel-at91.txt | 3 +- + .../devicetree/bindings/arm/cavium-thunder2.txt | 8 + + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../bindings/arm/firmware/linaro,optee-tz.txt | 31 + + Documentation/devicetree/bindings/arm/fsl.txt | 23 + + Documentation/devicetree/bindings/arm/gemini.txt | 86 ++ + .../bindings/arm/hisilicon/hisilicon.txt | 8 + + Documentation/devicetree/bindings/arm/i2se.txt | 22 + + Documentation/devicetree/bindings/arm/rockchip.txt | 31 + + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + .../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 34 + + .../bindings/arm/tegra/nvidia,tegra20-flowctrl.txt | 8 +- + .../bindings/clock/amlogic,gxbb-clkc.txt | 3 +- + .../devicetree/bindings/clock/mvebu-core-clock.txt | 7 + + .../bindings/clock/mvebu-gated-clock.txt | 11 + + .../devicetree/bindings/clock/qoriq-clock.txt | 1 + + .../bindings/display/sunxi/sun4i-drm.txt | 2 + + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 8 + + .../devicetree/bindings/gpu/nvidia,gk20a.txt | 25 +- + .../devicetree/bindings/mtd/jedec,spi-nor.txt | 1 + + .../devicetree/bindings/net/marvell,prestera.txt | 13 +- + .../devicetree/bindings/power/fsl,imx-gpc.txt | 85 +- + .../devicetree/bindings/power/fsl,imx-gpcv2.txt | 71 ++ + .../devicetree/bindings/reset/fsl,imx7-src.txt | 47 + + .../devicetree/bindings/soc/rockchip/grf.txt | 1 + + .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 57 + + Documentation/devicetree/bindings/usb/dwc2.txt | 4 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + .../bindings/watchdog/cortina,gemini-watchdog.txt | 17 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/tee.txt | 118 ++ + MAINTAINERS | 45 +- + arch/arm/Kconfig | 33 +- + arch/arm/arm-soc-for-next-contents.txt | 242 ++++ + arch/arm/boot/dts/Makefile | 73 +- + arch/arm/boot/dts/alpine.dtsi | 20 +- + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 1 + + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 1 + + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 1 + + arch/arm/boot/dts/am335x-baltos-leds.dtsi | 50 + + arch/arm/boot/dts/am335x-boneblack.dts | 11 + + arch/arm/boot/dts/am335x-icev2.dts | 154 +++ + arch/arm/boot/dts/am33xx.dtsi | 87 +- + arch/arm/boot/dts/am3517.dtsi | 12 + + arch/arm/boot/dts/am4372.dtsi | 7 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 15 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 24 + + arch/arm/boot/dts/armada-385-linksys-shelby.dts | 114 ++ + arch/arm/boot/dts/armada-385-linksys.dtsi | 18 +- + arch/arm/boot/dts/armada-385-synology-ds116.dts | 321 +++++ + arch/arm/boot/dts/armada-385.dtsi | 20 +- + arch/arm/boot/dts/armada-388-clearfog.dts | 38 +- + arch/arm/boot/dts/armada-388.dtsi | 9 +- + arch/arm/boot/dts/armada-38x.dtsi | 49 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 211 +++- + arch/arm/boot/dts/armada-xp-98dx3336.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-98dx4251.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 2 +- + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 18 +- + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 22 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 18 + + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 36 + + arch/arm/boot/dts/aspeed-g4.dtsi | 109 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 156 ++- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 + + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 5 +- + arch/arm/boot/dts/at91-tse850-3.dts | 29 +- + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +- + arch/arm/boot/dts/axp209.dtsi | 5 + + arch/arm/boot/dts/axp22x.dtsi | 5 + + arch/arm/boot/dts/bcm-cygnus.dtsi | 4 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 36 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 14 + + arch/arm/boot/dts/bcm283x.dtsi | 60 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 17 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 14 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 5 - + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 41 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 3 - + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 15 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 10 - + arch/arm/boot/dts/bcm4708.dtsi | 8 + + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 14 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 16 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 12 +- + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 98 ++ + arch/arm/boot/dts/bcm47081.dtsi | 20 +- + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 14 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 8 - + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 42 + + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 19 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 41 +- + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 8 - + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 18 +- + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 36 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 8 - + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 6 - + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 39 +- + arch/arm/boot/dts/bcm5301x.dtsi | 79 +- + arch/arm/boot/dts/bcm53573.dtsi | 10 +- + arch/arm/boot/dts/bcm94708.dts | 8 - + arch/arm/boot/dts/bcm94709.dts | 8 - + arch/arm/boot/dts/bcm953012er.dts | 8 - + arch/arm/boot/dts/bcm953012hr.dts | 97 ++ + arch/arm/boot/dts/bcm953012k.dts | 62 +- + arch/arm/boot/dts/bcm958522er.dts | 10 +- + arch/arm/boot/dts/bcm958525er.dts | 10 +- + arch/arm/boot/dts/bcm958525xmc.dts | 10 + + arch/arm/boot/dts/bcm958622hr.dts | 10 +- + arch/arm/boot/dts/bcm958623hr.dts | 10 +- + arch/arm/boot/dts/bcm958625hr.dts | 8 + + arch/arm/boot/dts/bcm958625k.dts | 8 + + arch/arm/boot/dts/bcm988312hr.dts | 10 +- + arch/arm/boot/dts/da850-evm.dts | 31 +- + arch/arm/boot/dts/da850-lego-ev3.dts | 59 +- + arch/arm/boot/dts/da850.dtsi | 31 +- + arch/arm/boot/dts/dm8168-evm.dts | 10 + + arch/arm/boot/dts/dm816x.dtsi | 7 + + arch/arm/boot/dts/dra7.dtsi | 41 +- + arch/arm/boot/dts/dra74x.dtsi | 5 + + arch/arm/boot/dts/exynos3250-rinato.dts | 2 + + arch/arm/boot/dts/exynos4.dtsi | 10 +- + arch/arm/boot/dts/exynos4210-origen.dts | 4 - + arch/arm/boot/dts/exynos4210-trats.dts | 2 + + arch/arm/boot/dts/exynos4210.dtsi | 8 + + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 4 - + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 - + arch/arm/boot/dts/exynos4412-origen.dts | 4 - + arch/arm/boot/dts/exynos4412-trats2.dts | 2 + + arch/arm/boot/dts/exynos4412.dtsi | 9 + + arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi | 25 + + arch/arm/boot/dts/exynos5420.dtsi | 10 +- + arch/arm/boot/dts/exynos5440.dtsi | 32 +- + arch/arm/boot/dts/gemini-nas4220b.dts | 102 ++ + arch/arm/boot/dts/gemini-rut1xx.dts | 65 + + arch/arm/boot/dts/gemini-sq201.dts | 118 ++ + arch/arm/boot/dts/gemini-wbd111.dts | 102 ++ + arch/arm/boot/dts/gemini-wbd222.dts | 102 ++ + arch/arm/boot/dts/gemini.dtsi | 156 +++ + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 - + arch/arm/boot/dts/imx25-pdk.dts | 2 - + arch/arm/boot/dts/imx25-pinfunc.h | 5 +- + arch/arm/boot/dts/imx25.dtsi | 12 + + arch/arm/boot/dts/imx28-duckbill-2-485.dts | 189 +++ + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 220 ++++ + arch/arm/boot/dts/imx28-duckbill-2-spi.dts | 199 +++ + arch/arm/boot/dts/imx28-duckbill-2.dts | 183 +++ + arch/arm/boot/dts/imx28-duckbill.dts | 81 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 28 +- + arch/arm/boot/dts/imx50.dtsi | 8 +- + arch/arm/boot/dts/imx53-qsb.dts | 4 +- + arch/arm/boot/dts/imx53-qsrb.dts | 4 +- + arch/arm/boot/dts/imx6dl-gw5903.dts | 55 + + arch/arm/boot/dts/imx6dl-gw5904.dts | 55 + + arch/arm/boot/dts/imx6q-b450v3.dts | 7 + + arch/arm/boot/dts/imx6q-b650v3.dts | 7 + + arch/arm/boot/dts/imx6q-b850v3.dts | 70 ++ + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 16 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 83 ++ + arch/arm/boot/dts/imx6q-gw5903.dts | 55 + + arch/arm/boot/dts/imx6q-gw5904.dts | 59 + + arch/arm/boot/dts/imx6q-icore-ofcap10.dts | 76 ++ + arch/arm/boot/dts/imx6q-icore-ofcap12.dts | 76 ++ + arch/arm/boot/dts/imx6q-icore.dts | 34 + + arch/arm/boot/dts/imx6q-utilite-pro.dts | 10 +- + arch/arm/boot/dts/imx6q-zii-rdu2.dts | 50 + + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 654 ++++++++++ + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 641 ++++++++++ + arch/arm/boot/dts/imx6qdl-icore.dtsi | 19 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 12 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 932 +++++++++++++++ + arch/arm/boot/dts/imx6qdl.dtsi | 3 +- + arch/arm/boot/dts/imx6qp-nitrogen6_som2.dts | 55 + + arch/arm/boot/dts/imx6qp-sabresd.dts | 4 +- + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 50 + + arch/arm/boot/dts/imx6qp.dtsi | 99 +- + arch/arm/boot/dts/imx6sx.dtsi | 21 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 5 - + arch/arm/boot/dts/imx6ul-geam.dtsi | 45 + + arch/arm/boot/dts/imx6ul-isiot-common.dtsi | 141 +++ + arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 1 + + arch/arm/boot/dts/imx6ul-isiot-nand.dts | 1 + + arch/arm/boot/dts/imx6ul-isiot.dtsi | 73 ++ + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 55 +- + arch/arm/boot/dts/imx7-colibri.dtsi | 45 +- + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-sdb-sht11.dts | 74 ++ + arch/arm/boot/dts/imx7s.dtsi | 7 +- + arch/arm/boot/dts/include/arm | 1 + + arch/arm/boot/dts/include/arm64 | 1 + + arch/arm/boot/dts/meson8.dtsi | 2 + + arch/arm/boot/dts/meson8b.dtsi | 2 + + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 243 ++++ + arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +- + arch/arm/boot/dts/moxart.dtsi | 21 +- + arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 20 + + arch/arm/boot/dts/omap3-igep.dtsi | 52 + + arch/arm/boot/dts/omap3-n900.dts | 23 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 32 + + arch/arm/boot/dts/omap34xx.dtsi | 8 +- + arch/arm/boot/dts/omap36xx.dtsi | 8 +- + arch/arm/boot/dts/omap4-droid4-xt894.dts | 375 +++++- + arch/arm/boot/dts/omap443x.dtsi | 4 + + arch/arm/boot/dts/omap4460.dtsi | 4 + + arch/arm/boot/dts/omap5.dtsi | 9 + + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 6 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 30 + + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 8 - + arch/arm/boot/dts/qcom-msm8974.dtsi | 306 ++++- + arch/arm/boot/dts/r7s72100-genmai.dts | 8 + + arch/arm/boot/dts/r7s72100-rskrza1.dts | 8 + + arch/arm/boot/dts/r7s72100.dtsi | 65 +- + arch/arm/boot/dts/r8a73a4.dtsi | 19 +- + arch/arm/boot/dts/r8a7743.dtsi | 29 +- + arch/arm/boot/dts/r8a7745.dtsi | 29 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 1 - + arch/arm/boot/dts/r8a7779-marzen.dts | 1 - + arch/arm/boot/dts/r8a7790-lager.dts | 1 - + arch/arm/boot/dts/r8a7790.dtsi | 28 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +- + arch/arm/boot/dts/r8a7791-porter.dts | 5 +- + arch/arm/boot/dts/r8a7791.dtsi | 25 +- + arch/arm/boot/dts/r8a7792.dtsi | 25 +- + arch/arm/boot/dts/r8a7793-gose.dts | 1 - + arch/arm/boot/dts/r8a7793.dtsi | 25 +- + arch/arm/boot/dts/r8a7794-alt.dts | 3 +- + arch/arm/boot/dts/r8a7794-silk.dts | 3 +- + arch/arm/boot/dts/r8a7794.dtsi | 30 +- + arch/arm/boot/dts/rk3036.dtsi | 6 + + arch/arm/boot/dts/rk3188.dtsi | 4 +- + arch/arm/boot/dts/rk322x.dtsi | 2 + + arch/arm/boot/dts/rk3288-miqi.dts | 12 +- + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 298 +++++ + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 497 ++++++++ + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 62 + + arch/arm/boot/dts/rk3288-tinker.dts | 536 +++++++++ + arch/arm/boot/dts/rk3288.dtsi | 8 + + arch/arm/boot/dts/rk3xxx.dtsi | 16 +- + arch/arm/boot/dts/s3c64xx.dtsi | 3 +- + arch/arm/boot/dts/s5pv210.dtsi | 2 +- + arch/arm/boot/dts/sama5d2.dtsi | 5 + + arch/arm/boot/dts/socfpga.dtsi | 56 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 51 +- + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 7 +- + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts | 1 - + arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 8 +- + arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 23 +- + arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 2 +- + arch/arm/boot/dts/socfpga_vt.dts | 2 +- + arch/arm/boot/dts/spear600-evb.dts | 148 ++- + arch/arm/boot/dts/spear600.dtsi | 28 +- + arch/arm/boot/dts/stih407-family.dtsi | 18 +- + arch/arm/boot/dts/stm32429i-eval.dts | 28 + + arch/arm/boot/dts/stm32746g-eval.dts | 4 + + arch/arm/boot/dts/stm32f429-disco.dts | 16 + + arch/arm/boot/dts/stm32f429.dtsi | 37 + + arch/arm/boot/dts/stm32f469-disco.dts | 16 + + arch/arm/boot/dts/stm32f746.dtsi | 96 +- + arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 156 +++ + arch/arm/boot/dts/stm32h743.dtsi | 83 ++ + arch/arm/boot/dts/stm32h743i-eval.dts | 74 ++ + arch/arm/boot/dts/sun4i-a10-a1000.dts | 1 - + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 1 - + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 1 - + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 1 - + arch/arm/boot/dts/sun4i-a10-inet1.dts | 1 - + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 1 - + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 1 - + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 1 - + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 1 - + arch/arm/boot/dts/sun4i-a10-mk802.dts | 1 - + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 1 - + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 1 - + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 1 - + arch/arm/boot/dts/sun4i-a10.dtsi | 40 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 1 - + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 1 - + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 5 +- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 1 - + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 77 +- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 1 - + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 1 - + arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 1 - + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 1 - + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 1 - + arch/arm/boot/dts/sun5i-a13.dtsi | 140 --- + arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 4 +- + arch/arm/boot/dts/sun5i-gr8-evb.dts | 4 +- + arch/arm/boot/dts/sun5i-gr8.dtsi | 618 +--------- + arch/arm/boot/dts/sun5i-r8-chip.dts | 6 +- + arch/arm/boot/dts/sun5i-r8.dtsi | 40 - + arch/arm/boot/dts/sun5i.dtsi | 284 ++++- + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 1 - + arch/arm/boot/dts/sun6i-a31-colombus.dts | 1 - + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 1 - + arch/arm/boot/dts/sun6i-a31-i7.dts | 1 - + arch/arm/boot/dts/sun6i-a31-m9.dts | 1 - + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 1 - + arch/arm/boot/dts/sun6i-a31.dtsi | 1 - + arch/arm/boot/dts/sun6i-a31s-cs908.dts | 2 - + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 1 - + arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 1 - + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 23 + + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 57 + + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 1 - + .../boot/dts/sun6i-reference-design-tablet.dtsi | 1 - + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 1 - + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 1 - + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 9 +- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 1 - + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 1 - + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 1 - + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 1 - + arch/arm/boot/dts/sun7i-a20-m3.dts | 1 - + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 1 - + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 1 - + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 1 - + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 1 - + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 36 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 1 - + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 1 - + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 1 - + arch/arm/boot/dts/sun7i-a20.dtsi | 46 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +- + arch/arm/boot/dts/sun8i-a23-evb.dts | 1 - + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 10 - + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 23 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 155 +++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 2 - + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 21 +- + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 1 - + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 11 +- + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 96 ++ + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 1 - + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 1 - + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 1 - + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 23 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 1 - + arch/arm/boot/dts/sun8i-h3.dtsi | 602 +--------- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 1 - + arch/arm/boot/dts/sun9i-a80-optimus.dts | 1 - + arch/arm/boot/dts/sun9i-a80.dtsi | 2 - + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 1 - + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 601 ++++++++++ + .../boot/dts/sunxi-reference-design-tablet.dtsi | 1 - + arch/arm/boot/dts/uniphier-ld4-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-ld4.dtsi | 4 +- + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/uniphier-pro4-ace.dts | 11 +- + arch/arm/boot/dts/uniphier-pro4-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-pro4-sanji.dts | 11 +- + arch/arm/boot/dts/uniphier-pro4.dtsi | 4 +- + arch/arm/boot/dts/uniphier-pro5.dtsi | 4 +- + arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 11 +- + arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 10 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 4 +- + arch/arm/boot/dts/uniphier-ref-daughter.dtsi | 4 +- + arch/arm/boot/dts/uniphier-sld3-ref.dts | 12 +- + arch/arm/boot/dts/uniphier-sld3.dtsi | 4 +- + arch/arm/boot/dts/uniphier-sld8-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 4 +- + arch/arm/boot/dts/uniphier-support-card.dtsi | 5 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 14 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 77 ++ + arch/arm/boot/dts/vf610-zii-dev.dtsi | 12 + + arch/arm/common/Kconfig | 3 - + arch/arm/common/Makefile | 1 - + arch/arm/configs/aspeed_g4_defconfig | 112 +- + arch/arm/configs/aspeed_g5_defconfig | 111 +- + arch/arm/configs/bcm2835_defconfig | 5 +- + arch/arm/configs/davinci_all_defconfig | 11 +- + arch/arm/configs/dram_0xd0000000.config | 1 + + arch/arm/configs/exynos_defconfig | 5 +- + arch/arm/configs/imx_v6_v7_defconfig | 5 +- + arch/arm/configs/multi_v7_defconfig | 21 +- + arch/arm/configs/omap2plus_defconfig | 24 + + arch/arm/configs/qcom_defconfig | 7 + + arch/arm/configs/socfpga_defconfig | 1 + + arch/arm/configs/stm32_defconfig | 4 + + arch/arm/configs/sunxi_defconfig | 2 + + arch/arm/include/debug/brcmstb.S | 18 +- + arch/arm/mach-at91/Makefile | 34 +- + arch/arm/mach-at91/at91rm9200.c | 15 +- + arch/arm/mach-at91/at91sam9.c | 91 +- + arch/arm/mach-at91/generic.h | 8 +- + arch/arm/mach-at91/pm.c | 199 ++- + arch/arm/mach-at91/pm.h | 24 +- + arch/arm/mach-at91/pm_data-offsets.c | 13 + + arch/arm/mach-at91/pm_suspend.S | 31 +- + arch/arm/mach-at91/sama5.c | 52 +- + arch/arm/mach-at91/soc.c | 142 --- + arch/arm/mach-bcm/Kconfig | 2 + + arch/arm/mach-davinci/board-da850-evm.c | 4 + + arch/arm/mach-davinci/board-dm644x-evm.c | 3 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 3 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 3 +- + arch/arm/mach-davinci/da830.c | 6 + + arch/arm/mach-davinci/da850.c | 6 + + arch/arm/mach-davinci/da8xx-dt.c | 1 + + arch/arm/mach-davinci/pdata-quirks.c | 178 ++- + arch/arm/mach-davinci/pm.c | 1 - + arch/arm/mach-gemini/Kconfig | 53 +- + arch/arm/mach-gemini/Makefile | 15 +- + arch/arm/mach-gemini/Makefile.boot | 9 - + arch/arm/mach-gemini/board-dt.c | 62 + + arch/arm/mach-gemini/board-nas4220b.c | 106 -- + arch/arm/mach-gemini/board-rut1xx.c | 92 -- + arch/arm/mach-gemini/board-wbd111.c | 133 -- + arch/arm/mach-gemini/board-wbd222.c | 133 -- + arch/arm/mach-gemini/common.h | 33 - + arch/arm/mach-gemini/devices.c | 118 -- + arch/arm/mach-gemini/gpio.c | 231 ---- + arch/arm/mach-gemini/idle.c | 31 - + arch/arm/mach-gemini/include/mach/entry-macro.S | 33 - + arch/arm/mach-gemini/include/mach/global_reg.h | 278 ----- + arch/arm/mach-gemini/include/mach/hardware.h | 71 -- + arch/arm/mach-gemini/include/mach/irqs.h | 53 - + arch/arm/mach-gemini/include/mach/uncompress.h | 42 - + arch/arm/mach-gemini/irq.c | 105 -- + arch/arm/mach-gemini/mm.c | 82 -- + arch/arm/mach-gemini/reset.c | 25 - + arch/arm/mach-gemini/time.c | 239 ---- + arch/arm/mach-hisi/platmcpm.c | 2 + + arch/arm/mach-imx/gpc.c | 217 ---- + arch/arm/mach-imx/mach-imx25.c | 6 + + arch/arm/mach-imx/mach-mx31_3ds.c | 7 +- + arch/arm/mach-imx/mach-mx31moboard.c | 4 +- + arch/arm/mach-imx/mach-pcm037_eet.c | 4 +- + arch/arm/mach-imx/mmdc.c | 20 +- + arch/arm/mach-keystone/Kconfig | 1 + + arch/arm/mach-keystone/pm_domain.c | 4 +- + arch/arm/mach-mmp/clock.c | 3 + + arch/arm/mach-mxs/mach-mxs.c | 3 +- + arch/arm/mach-omap1/pm.c | 1 - + arch/arm/mach-omap2/clockdomains81xx_data.c | 10 + + arch/arm/mach-omap2/cm81xx.h | 1 + + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 208 +--- + arch/arm/mach-omap2/omap_hwmod.h | 23 +- + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 - + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 - + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 5 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 34 + + arch/arm/mach-omap2/pm.c | 1 - + arch/arm/mach-oxnas/Kconfig | 1 - + arch/arm/mach-stm32/Kconfig | 26 + + arch/arm/mach-stm32/board-dt.c | 1 + + arch/arm/mach-sunxi/Kconfig | 1 + + arch/arm/mach-tegra/Makefile | 1 - + arch/arm/mach-tegra/cpuidle-tegra20.c | 3 +- + arch/arm/mach-tegra/platsmp.c | 2 +- + arch/arm/mach-tegra/pm.c | 2 +- + arch/arm/mach-tegra/reset-handler.S | 2 +- + arch/arm/mach-tegra/sleep-tegra20.S | 3 +- + arch/arm/mach-tegra/sleep-tegra30.S | 2 +- + arch/arm/mach-tegra/sleep.S | 2 - + arch/arm/mach-tegra/tegra.c | 2 - + arch/arm/mach-w90x900/clock.c | 3 + + arch/arm/plat-versatile/include/plat/clock.h | 15 - + arch/arm64/Kconfig.platforms | 3 +- + arch/arm64/boot/dts/allwinner/Makefile | 1 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 29 + + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 188 +++ + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 124 ++ + arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 2 + + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 39 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 80 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 40 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 80 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 25 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 11 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 29 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 21 +- + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 26 + + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 26 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 172 ++- + arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 43 + + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 42 + + arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi | 1 + + .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 164 +++ + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 114 ++ + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 23 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 21 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 173 +++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 194 +++ + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 25 + + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 42 + + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 3 + + arch/arm64/boot/dts/broadcom/Makefile | 1 - + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 38 +- + arch/arm64/boot/dts/broadcom/ns2-xmc.dts | 20 +- + arch/arm64/boot/dts/broadcom/ns2.dtsi | 24 + + arch/arm64/boot/dts/cavium/Makefile | 1 + + .../vulcan-eval.dts => cavium/thunder2-99xx.dts} | 9 +- + .../vulcan.dtsi => cavium/thunder2-99xx.dtsi} | 15 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 43 +- + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 17 + + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 7 + + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 182 ++- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 123 ++ + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 107 ++ + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 275 +++++ + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 155 +-- + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 110 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 863 ++----------- + arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts | 64 + + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 64 + + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 165 +++ + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 196 +++ + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 151 +++ + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 737 ++++++++++++ + arch/arm64/boot/dts/hisilicon/Makefile | 1 + + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 1 + + .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 162 +++ + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 411 +++++++ + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 3 + + .../arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi | 407 +++++++ + arch/arm64/boot/dts/hisilicon/hip07-d05.dts | 20 + + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 479 ++++++++ + arch/arm64/boot/dts/include/arm | 1 + + arch/arm64/boot/dts/include/arm64 | 1 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 50 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 18 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 43 + + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 10 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 32 + + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 9 + + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 11 + + .../boot/dts/marvell/armada-cp110-master.dtsi | 70 ++ + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 60 + + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 91 ++ + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 319 ++++- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 59 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 19 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 11 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 26 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 46 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 7 + + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 29 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 39 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 181 ++- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 1 - + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 32 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 311 ++++- + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 57 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1264 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 94 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 306 +++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 1103 +++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 145 +++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 147 ++- + .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 10 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 13 +- + .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 10 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 +- + arch/arm64/boot/dts/zte/zx296718-evb.dts | 28 + + arch/arm64/boot/dts/zte/zx296718.dtsi | 126 +- + arch/arm64/configs/defconfig | 21 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/ata/Kconfig | 9 + + drivers/ata/Makefile | 1 + + drivers/ata/pata_bk3710.c | 382 ++++++ + drivers/base/power/domain.c | 2 - + drivers/base/soc.c | 52 +- + drivers/clk/meson/gxbb.h | 21 +- + drivers/clk/versatile/Kconfig | 3 + + drivers/clk/versatile/Makefile | 2 +- + drivers/clk/versatile/clk-icst.c | 1 + + drivers/clk/versatile/clk-icst.h | 2 - + drivers/clk/versatile/clk-impd1.c | 1 + + drivers/clk/versatile/clk-realview.c | 1 + + drivers/clk/versatile/clk-versatile.c | 1 + + {arch/arm/common => drivers/clk/versatile}/icst.c | 2 +- + .../asm/hardware => drivers/clk/versatile}/icst.h | 6 +- + drivers/firmware/arm_scpi.c | 7 +- + drivers/firmware/meson/meson_sm.c | 20 +- + drivers/firmware/qcom_scm-32.c | 18 + + drivers/firmware/qcom_scm-64.c | 58 + + drivers/firmware/qcom_scm.c | 18 + + drivers/firmware/qcom_scm.h | 11 + + drivers/nvmem/meson-efuse.c | 2 +- + drivers/reset/Kconfig | 14 + + drivers/reset/Makefile | 3 + + drivers/reset/reset-a10sr.c | 138 +++ + drivers/reset/reset-ath79.c | 27 +- + drivers/reset/reset-imx7.c | 158 +++ + drivers/reset/reset-meson.c | 12 +- + drivers/reset/reset-oxnas.c | 6 +- + drivers/reset/reset-pistachio.c | 9 +- + drivers/reset/reset-socfpga.c | 13 +- + drivers/reset/reset-sunxi.c | 18 +- + drivers/reset/reset-uniphier.c | 37 +- + drivers/soc/Kconfig | 2 + + drivers/soc/Makefile | 2 + + drivers/soc/atmel/Kconfig | 6 + + drivers/soc/atmel/Makefile | 1 + + drivers/soc/atmel/soc.c | 231 ++++ + {arch/arm/mach-at91 => drivers/soc/atmel}/soc.h | 0 + drivers/soc/bcm/brcmstb/common.c | 9 + + drivers/soc/imx/Kconfig | 9 + + drivers/soc/imx/Makefile | 2 + + drivers/soc/imx/gpc.c | 489 ++++++++ + drivers/soc/imx/gpcv2.c | 363 ++++++ + drivers/soc/renesas/r8a7795-sysc.c | 26 +- + drivers/soc/renesas/rcar-sysc.c | 25 +- + drivers/soc/renesas/rcar-sysc.h | 10 + + drivers/soc/renesas/renesas-soc.c | 18 +- + drivers/soc/samsung/Kconfig | 8 +- + drivers/soc/samsung/Makefile | 4 +- + drivers/soc/samsung/exynos-pmu.c | 22 +- + drivers/soc/samsung/exynos-pmu.h | 3 + + drivers/soc/tegra/Kconfig | 22 + + drivers/soc/tegra/Makefile | 4 +- + .../mach-tegra => drivers/soc/tegra}/flowctrl.c | 87 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 4 +- + drivers/soc/tegra/pmc-tegra186.c | 169 +++ + drivers/soc/ti/Kconfig | 12 + + drivers/soc/ti/Makefile | 1 + + drivers/soc/ti/ti_sci_pm_domains.c | 202 ++++ + drivers/soc/zte/zx296718_pm_domains.c | 1 - + drivers/soc/zte/zx2967_pm_domains.c | 4 +- + drivers/tee/Kconfig | 18 + + drivers/tee/Makefile | 5 + + drivers/tee/optee/Kconfig | 7 + + drivers/tee/optee/Makefile | 5 + + drivers/tee/optee/call.c | 444 +++++++ + drivers/tee/optee/core.c | 622 ++++++++++ + drivers/tee/optee/optee_msg.h | 418 +++++++ + drivers/tee/optee/optee_private.h | 183 +++ + drivers/tee/optee/optee_smc.h | 450 +++++++ + drivers/tee/optee/rpc.c | 396 ++++++ + drivers/tee/optee/supp.c | 273 +++++ + drivers/tee/tee_core.c | 893 ++++++++++++++ + drivers/tee/tee_private.h | 129 ++ + drivers/tee/tee_shm.c | 358 ++++++ + drivers/tee/tee_shm_pool.c | 156 +++ + include/dt-bindings/clock/gxbb-clkc.h | 11 + + include/dt-bindings/clock/r7s72100-clock.h | 9 +- + include/dt-bindings/clock/r8a73a4-clock.h | 1 + + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7791-clock.h | 1 + + include/dt-bindings/clock/r8a7792-clock.h | 2 +- + include/dt-bindings/clock/r8a7793-clock.h | 5 +- + include/dt-bindings/clock/r8a7794-clock.h | 2 + + include/dt-bindings/genpd/k2g.h | 90 ++ + include/dt-bindings/mfd/stm32f7-rcc.h | 112 ++ + include/dt-bindings/pinctrl/hisi.h | 15 + + include/dt-bindings/power/imx7-power.h | 16 + + include/dt-bindings/power/r8a7795-sysc.h | 2 +- + include/dt-bindings/reset/altr,rst-mgr-a10sr.h | 33 + + include/dt-bindings/reset/imx7-reset.h | 62 + + include/linux/firmware/meson/meson_sm.h | 4 +- + include/linux/pm_domain.h | 1 + + include/linux/qcom_scm.h | 6 + + include/linux/tee_drv.h | 277 +++++ + .../mach-tegra => include/soc/tegra}/flowctrl.h | 32 +- + include/soc/tegra/pmc.h | 29 +- + include/uapi/linux/tee.h | 346 ++++++ + 687 files changed, 32558 insertions(+), 7012 deletions(-) + create mode 100644 Documentation/arm/stm32/stm32h743-overview.txt + create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder2.txt + create mode 100644 Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt + create mode 100644 Documentation/devicetree/bindings/arm/gemini.txt + create mode 100644 Documentation/devicetree/bindings/arm/i2se.txt + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt + create mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt + create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx7-src.txt + create mode 100644 Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt + create mode 100644 Documentation/tee.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-baltos-leds.dtsi + create mode 100644 arch/arm/boot/dts/armada-385-linksys-shelby.dts + create mode 100644 arch/arm/boot/dts/armada-385-synology-ds116.dts + create mode 100644 arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts + create mode 100644 arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts + create mode 100644 arch/arm/boot/dts/bcm4709-linksys-ea9200.dts + create mode 100644 arch/arm/boot/dts/bcm47094-linksys-panamera.dts + create mode 100644 arch/arm/boot/dts/bcm953012hr.dts + create mode 100644 arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi + create mode 100644 arch/arm/boot/dts/gemini-nas4220b.dts + create mode 100644 arch/arm/boot/dts/gemini-rut1xx.dts + create mode 100644 arch/arm/boot/dts/gemini-sq201.dts + create mode 100644 arch/arm/boot/dts/gemini-wbd111.dts + create mode 100644 arch/arm/boot/dts/gemini-wbd222.dts + create mode 100644 arch/arm/boot/dts/gemini.dtsi + create mode 100644 arch/arm/boot/dts/imx28-duckbill-2-485.dts + create mode 100644 arch/arm/boot/dts/imx28-duckbill-2-enocean.dts + create mode 100644 arch/arm/boot/dts/imx28-duckbill-2-spi.dts + create mode 100644 arch/arm/boot/dts/imx28-duckbill-2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw5903.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw5904.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5903.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5904.dts + create mode 100644 arch/arm/boot/dts/imx6q-icore-ofcap10.dts + create mode 100644 arch/arm/boot/dts/imx6q-icore-ofcap12.dts + create mode 100644 arch/arm/boot/dts/imx6q-zii-rdu2.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-gw5903.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw5904.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-nitrogen6_som2.dts + create mode 100644 arch/arm/boot/dts/imx6qp-zii-rdu2.dts + create mode 100644 arch/arm/boot/dts/imx6ul-isiot-common.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-sdb-sht11.dts + create mode 120000 arch/arm/boot/dts/include/arm + create mode 120000 arch/arm/boot/dts/include/arm64 + create mode 100644 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi + create mode 100644 arch/arm/boot/dts/omap3-cpu-thermal.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-phycore-rdk.dts + create mode 100644 arch/arm/boot/dts/rk3288-phycore-som.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-tinker.dts + create mode 100644 arch/arm/boot/dts/stm32h743-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32h743.dtsi + create mode 100644 arch/arm/boot/dts/stm32h743i-eval.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts + create mode 100644 arch/arm/boot/dts/sunxi-h3-h5.dtsi + create mode 100644 arch/arm/configs/dram_0xd0000000.config + create mode 100644 arch/arm/mach-at91/pm_data-offsets.c + delete mode 100644 arch/arm/mach-at91/soc.c + delete mode 100644 arch/arm/mach-gemini/Makefile.boot + create mode 100644 arch/arm/mach-gemini/board-dt.c + delete mode 100644 arch/arm/mach-gemini/board-nas4220b.c + delete mode 100644 arch/arm/mach-gemini/board-rut1xx.c + delete mode 100644 arch/arm/mach-gemini/board-wbd111.c + delete mode 100644 arch/arm/mach-gemini/board-wbd222.c + delete mode 100644 arch/arm/mach-gemini/common.h + delete mode 100644 arch/arm/mach-gemini/devices.c + delete mode 100644 arch/arm/mach-gemini/gpio.c + delete mode 100644 arch/arm/mach-gemini/idle.c + delete mode 100644 arch/arm/mach-gemini/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-gemini/include/mach/global_reg.h + delete mode 100644 arch/arm/mach-gemini/include/mach/hardware.h + delete mode 100644 arch/arm/mach-gemini/include/mach/irqs.h + delete mode 100644 arch/arm/mach-gemini/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-gemini/irq.c + delete mode 100644 arch/arm/mach-gemini/mm.c + delete mode 100644 arch/arm/mach-gemini/reset.c + delete mode 100644 arch/arm/mach-gemini/time.c + create mode 100644 arch/arm/mach-stm32/Kconfig + delete mode 100644 arch/arm/plat-versatile/include/plat/clock.h + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi + create mode 120000 arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi + rename arch/arm64/boot/dts/{broadcom/vulcan-eval.dts => cavium/thunder2-99xx.dts} (72%) + rename arch/arm64/boot/dts/{broadcom/vulcan.dtsi => cavium/thunder2-99xx.dtsi} (88%) + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi + create mode 100644 arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi + create mode 120000 arch/arm64/boot/dts/include/arm + create mode 120000 arch/arm64/boot/dts/include/arm64 + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-evb.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi + create mode 100644 drivers/ata/pata_bk3710.c + rename {arch/arm/common => drivers/clk/versatile}/icst.c (98%) + rename {arch/arm/include/asm/hardware => drivers/clk/versatile}/icst.h (94%) + create mode 100644 drivers/reset/reset-a10sr.c + create mode 100644 drivers/reset/reset-imx7.c + create mode 100644 drivers/soc/atmel/Kconfig + create mode 100644 drivers/soc/atmel/Makefile + create mode 100644 drivers/soc/atmel/soc.c + rename {arch/arm/mach-at91 => drivers/soc/atmel}/soc.h (100%) + create mode 100644 drivers/soc/imx/Kconfig + create mode 100644 drivers/soc/imx/Makefile + create mode 100644 drivers/soc/imx/gpc.c + create mode 100644 drivers/soc/imx/gpcv2.c + rename {arch/arm/mach-tegra => drivers/soc/tegra}/flowctrl.c (67%) + create mode 100644 drivers/soc/tegra/pmc-tegra186.c + create mode 100644 drivers/soc/ti/ti_sci_pm_domains.c + create mode 100644 drivers/tee/Kconfig + create mode 100644 drivers/tee/Makefile + create mode 100644 drivers/tee/optee/Kconfig + create mode 100644 drivers/tee/optee/Makefile + create mode 100644 drivers/tee/optee/call.c + create mode 100644 drivers/tee/optee/core.c + create mode 100644 drivers/tee/optee/optee_msg.h + create mode 100644 drivers/tee/optee/optee_private.h + create mode 100644 drivers/tee/optee/optee_smc.h + create mode 100644 drivers/tee/optee/rpc.c + create mode 100644 drivers/tee/optee/supp.c + create mode 100644 drivers/tee/tee_core.c + create mode 100644 drivers/tee/tee_private.h + create mode 100644 drivers/tee/tee_shm.c + create mode 100644 drivers/tee/tee_shm_pool.c + create mode 100644 include/dt-bindings/genpd/k2g.h + create mode 100644 include/dt-bindings/mfd/stm32f7-rcc.h + create mode 100644 include/dt-bindings/power/imx7-power.h + create mode 100644 include/dt-bindings/reset/altr,rst-mgr-a10sr.h + create mode 100644 include/dt-bindings/reset/imx7-reset.h + create mode 100644 include/linux/tee_drv.h + rename {arch/arm/mach-tegra => include/soc/tegra}/flowctrl.h (77%) + create mode 100644 include/uapi/linux/tee.h +Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) +$ git merge alpine/alpine/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (715dcd206041 Merge branch 'v4.12/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (ce60fdaa7e9e Merge remote-tracking branch 'alex_korg/at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (7ea6e490ba7f Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' 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 (990df0480610 Merge branch 'zte/dt64' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (4495c08e8472 Linux 4.11-rc2) +$ git merge keystone/next +Already up-to-date. +Merging mvebu/for-next (4242642c21aa Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (5a0bbcf7ab0f Merge branch 'omap-for-v4.12/defconfig' into for-next) +$ git merge omap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (9f514b0f9cf3 Merge branch 'drivers-for-4.12' into all-for-4.12) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. +Merging renesas/next (410c0b62ddfa Merge branches 'arm64-dt-for-v4.12', 'dt-for-v4.12' and 'sysc-for-v4.12' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (b1e842489772 Merge branch 'v4.12-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging include/dt-bindings/clock/rv1108-cru.h +Auto-merging drivers/clk/rockchip/clk-rv1108.c +Auto-merging Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.txt +Merge made by the 'recursive' strategy. + ...chip,rk1108-cru.txt => rockchip,rv1108-cru.txt} | 12 +- + arch/arm/boot/dts/rk1108.dtsi | 2 +- + drivers/clk/rockchip/Makefile | 2 +- + drivers/clk/rockchip/clk-pll.c | 3 + + drivers/clk/rockchip/clk-rk3328.c | 9 + + drivers/clk/rockchip/clk-rk3368.c | 27 +- + drivers/clk/rockchip/clk-rk3399.c | 8 +- + .../clk/rockchip/{clk-rk1108.c => clk-rv1108.c} | 414 ++++++++++----------- + drivers/clk/rockchip/clk.h | 28 +- + include/dt-bindings/clock/rk3328-cru.h | 1 + + include/dt-bindings/clock/rk3368-cru.h | 19 +- + .../clock/{rk1108-cru.h => rv1108-cru.h} | 6 +- + 12 files changed, 276 insertions(+), 255 deletions(-) + rename Documentation/devicetree/bindings/clock/{rockchip,rk1108-cru.txt => rockchip,rv1108-cru.txt} (83%) + rename drivers/clk/rockchip/{clk-rk1108.c => clk-rv1108.c} (57%) + rename include/dt-bindings/clock/{rk1108-cru.h => rv1108-cru.h} (97%) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1001354ca341 Linux 4.9-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (f4fcaa6cec04 Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/devfreq/exynos-bus.txt | 46 +++++++-------- + arch/arm/boot/dts/exynos3250.dtsi | 46 +++++++-------- + arch/arm/boot/dts/exynos4210.dtsi | 32 +++++------ + arch/arm/boot/dts/exynos4412-prime.dtsi | 4 +- + arch/arm/boot/dts/exynos4412.dtsi | 66 +++++++++++----------- + arch/arm/boot/dts/exynos5420.dtsi | 40 ++++++------- + arch/arm/boot/dts/exynos5800.dtsi | 56 +++++++++--------- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 48 ++++++++-------- + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 11 ++++ + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 50 ++++++++-------- + 10 files changed, 205 insertions(+), 194 deletions(-) +Merging sunxi/sunxi/for-next (5675caea945d Merge branches 'sunxi/clk-for-4.12', 'sunxi/dt-for-4.12' and 'sunxi/fixes-for-4.11' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/clk/sunxi-ng/ccu_common.c +Auto-merging drivers/clk/sunxi-ng/ccu-sun8i-a33.c +Auto-merging drivers/clk/sunxi-ng/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/sunxi-ccu.txt | 18 +- + drivers/clk/sunxi-ng/Kconfig | 16 +- + drivers/clk/sunxi-ng/Makefile | 1 + + drivers/clk/sunxi-ng/ccu-sun5i.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 18 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 327 ++++++++++++++++++++- + drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 213 ++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun8i-r.h | 27 ++ + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 73 +++-- + drivers/clk/sunxi-ng/ccu_common.c | 4 +- + drivers/clk/sunxi-ng/ccu_gate.c | 47 +++ + drivers/clk/sunxi-ng/ccu_mult.c | 2 + + drivers/clk/sunxi-ng/ccu_mult.h | 2 + + drivers/clk/sunxi-ng/ccu_nk.c | 8 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 8 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 8 +- + drivers/clk/sunxi-ng/ccu_nm.c | 4 +- + include/dt-bindings/clock/sun8i-h3-ccu.h | 5 +- + include/dt-bindings/clock/sun8i-r-ccu.h | 59 ++++ + include/dt-bindings/reset/sun8i-h3-ccu.h | 5 +- + include/dt-bindings/reset/sun8i-r-ccu.h | 53 ++++ + 22 files changed, 847 insertions(+), 56 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r.h + create mode 100644 include/dt-bindings/clock/sun8i-r-ccu.h + create mode 100644 include/dt-bindings/reset/sun8i-r-ccu.h +Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-id.h | 17 + + drivers/clk/tegra/clk-periph-gate.c | 3 + + drivers/clk/tegra/clk-periph.c | 6 +- + drivers/clk/tegra/clk-pll.c | 174 --------- + drivers/clk/tegra/clk-super.c | 87 ++++- + drivers/clk/tegra/clk-tegra-audio.c | 85 ++-- + drivers/clk/tegra/clk-tegra-periph.c | 41 +- + drivers/clk/tegra/clk-tegra-pmc.c | 6 +- + drivers/clk/tegra/clk-tegra114.c | 1 + + drivers/clk/tegra/clk-tegra124.c | 1 + + drivers/clk/tegra/clk-tegra210.c | 499 ++++++++++++++++++++++-- + drivers/clk/tegra/clk-tegra30.c | 1 + + drivers/clk/tegra/clk.c | 16 + + drivers/clk/tegra/clk.h | 15 +- + include/dt-bindings/clock/tegra114-car.h | 2 +- + include/dt-bindings/clock/tegra124-car-common.h | 2 +- + include/dt-bindings/clock/tegra210-car.h | 33 +- + include/dt-bindings/clock/tegra30-car.h | 2 +- + include/dt-bindings/reset/tegra210-car.h | 13 + + include/linux/clk/tegra.h | 3 + + 20 files changed, 739 insertions(+), 268 deletions(-) + create mode 100644 include/dt-bindings/reset/tegra210-car.h +Merging arm64/for-next/core (faa9a08397f5 arm64: pmuv3: handle pmuv3+) +$ git merge arm64/for-next/core +Auto-merging drivers/acpi/glue.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/kernel/smp.c +Removing arch/arm64/include/asm/cachetype.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Makefile +Merge made by the 'recursive' strategy. + Documentation/arm64/cpu-feature-registers.txt | 12 + + Documentation/arm64/silicon-errata.txt | 1 + + Documentation/devicetree/bindings/chosen.txt | 45 ++++ + Documentation/kdump/kdump.txt | 16 +- + arch/arm64/Kconfig | 11 + + arch/arm64/Kconfig.debug | 4 + + arch/arm64/Makefile | 4 +- + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/arch_gicv3.h | 81 ++----- + arch/arm64/include/asm/bug.h | 33 +-- + arch/arm64/include/asm/cache.h | 38 +++- + arch/arm64/include/asm/cacheflush.h | 1 + + arch/arm64/include/asm/cachetype.h | 100 --------- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/cpufeature.h | 4 +- + arch/arm64/include/asm/cputype.h | 2 + + arch/arm64/include/asm/esr.h | 6 + + arch/arm64/include/asm/hardirq.h | 2 +- + arch/arm64/include/asm/hw_breakpoint.h | 4 +- + arch/arm64/include/asm/kexec.h | 52 ++++- + arch/arm64/include/asm/kvm_mmu.h | 13 +- + arch/arm64/include/asm/mmu.h | 1 + + arch/arm64/include/asm/module.h | 5 - + arch/arm64/include/asm/pgtable.h | 10 + + arch/arm64/include/asm/processor.h | 2 + + arch/arm64/include/asm/sections.h | 2 + + arch/arm64/include/asm/smp.h | 3 + + arch/arm64/include/asm/sysreg.h | 167 +++++++++++++- + arch/arm64/include/uapi/asm/hwcap.h | 3 + + arch/arm64/kernel/Makefile | 3 + + arch/arm64/kernel/alternative.c | 11 +- + arch/arm64/kernel/cacheinfo.c | 38 ---- + arch/arm64/kernel/cpu_errata.c | 15 ++ + arch/arm64/kernel/cpufeature.c | 43 +++- + arch/arm64/kernel/cpuinfo.c | 37 +-- + arch/arm64/kernel/crash_dump.c | 71 ++++++ + arch/arm64/kernel/debug-monitors.c | 2 +- + arch/arm64/kernel/efi-header.S | 155 +++++++++++++ + arch/arm64/kernel/head.S | 222 +++--------------- + arch/arm64/kernel/hibernate.c | 10 +- + arch/arm64/kernel/machine_kexec.c | 170 +++++++++++++- + arch/arm64/kernel/perf_event.c | 7 +- + arch/arm64/kernel/process.c | 2 - + arch/arm64/kernel/reloc_test_core.c | 81 +++++++ + arch/arm64/kernel/reloc_test_syms.S | 83 +++++++ + arch/arm64/kernel/setup.c | 7 +- + arch/arm64/kernel/smp.c | 69 ++++++ + arch/arm64/kernel/traps.c | 28 +++ + arch/arm64/kernel/vmlinux.lds.S | 27 ++- + arch/arm64/kvm/hyp/tlb.c | 22 ++ + arch/arm64/kvm/reset.c | 2 +- + arch/arm64/kvm/sys_regs.c | 4 +- + arch/arm64/mm/context.c | 3 - + arch/arm64/mm/dma-mapping.c | 63 ++++-- + arch/arm64/mm/fault.c | 55 +++-- + arch/arm64/mm/flush.c | 4 +- + arch/arm64/mm/init.c | 181 +++++++++++++++ + arch/arm64/mm/mmu.c | 311 +++++++++++++++++--------- + arch/arm64/mm/pageattr.c | 15 +- + drivers/acpi/arm64/iort.c | 158 ++++++++++--- + drivers/acpi/glue.c | 6 + + drivers/firmware/efi/libstub/fdt.c | 28 ++- + include/linux/acpi_iort.h | 3 + + include/linux/memblock.h | 2 + + include/linux/pe.h | 177 ++++++++------- + mm/memblock.c | 56 +++-- + virt/kvm/arm/vgic/vgic.c | 4 +- + 67 files changed, 2014 insertions(+), 787 deletions(-) + delete mode 100644 arch/arm64/include/asm/cachetype.h + create mode 100644 arch/arm64/kernel/crash_dump.c + create mode 100644 arch/arm64/kernel/efi-header.S + create mode 100644 arch/arm64/kernel/reloc_test_core.c + create mode 100644 arch/arm64/kernel/reloc_test_syms.S +Merging clk/clk-next (ee7d74339df7 clk: mvebu: Use kcalloc() in two functions) +$ git merge clk/clk-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,infracfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,topckgen.txt | 1 + + .../bindings/arm/mediatek/mediatek,vdecsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,vencsys.txt | 3 +- + .../devicetree/bindings/clock/idt,versaclock5.txt | 16 +- + MAINTAINERS | 10 + + arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 3 +- + arch/arm/mach-omap2/clock.c | 35 +- + arch/arm/mach-omap2/clock.h | 2 + + arch/arm/mach-omap2/cm.h | 5 +- + arch/arm/mach-omap2/cm2xxx.c | 9 +- + arch/arm/mach-omap2/cm3xxx.c | 10 +- + arch/arm/mach-omap2/cm_common.c | 2 +- + drivers/clk/Kconfig | 8 + + drivers/clk/Makefile | 1 + + drivers/clk/at91/clk-pll.c | 6 +- + drivers/clk/bcm/clk-iproc-pll.c | 2 +- + drivers/clk/bcm/clk-ns2.c | 2 +- + drivers/clk/clk-cs2000-cp.c | 52 +- + drivers/clk/clk-hi655x.c | 126 ++++ + drivers/clk/clk-nomadik.c | 12 +- + drivers/clk/clk-si5351.c | 8 +- + drivers/clk/clk-stm32f4.c | 43 +- + drivers/clk/clk-versaclock5.c | 76 ++- + drivers/clk/clk.c | 47 +- + drivers/clk/hisilicon/clk-hi3620.c | 16 +- + drivers/clk/hisilicon/clk-hi6220.c | 1 + + drivers/clk/hisilicon/clk.c | 18 +- + drivers/clk/imx/clk-imx6ul.c | 11 +- + drivers/clk/imx/clk-imx7d.c | 11 +- + drivers/clk/mediatek/Kconfig | 32 + + drivers/clk/mediatek/Makefile | 5 + + drivers/clk/mediatek/clk-mt2701-eth.c | 2 + + drivers/clk/mediatek/clk-mt6797-img.c | 76 +++ + drivers/clk/mediatek/clk-mt6797-mm.c | 136 ++++ + drivers/clk/mediatek/clk-mt6797-vdec.c | 93 +++ + drivers/clk/mediatek/clk-mt6797-venc.c | 78 +++ + drivers/clk/mediatek/clk-mt6797.c | 714 +++++++++++++++++++++ + drivers/clk/meson/Makefile | 2 +- + drivers/clk/meson/clk-audio-divider.c | 144 +++++ + drivers/clk/meson/clk-mpll.c | 154 ++++- + drivers/clk/meson/clk-pll.c | 53 +- + drivers/clk/meson/clkc.h | 39 +- + drivers/clk/meson/gxbb.c | 649 ++++++++++++++++++- + drivers/clk/meson/gxbb.h | 11 +- + drivers/clk/meson/meson8b.c | 127 +++- + drivers/clk/meson/meson8b.h | 20 +- + drivers/clk/mvebu/clk-cpu.c | 4 +- + drivers/clk/mvebu/common.c | 4 +- + drivers/clk/qcom/clk-smd-rpm.c | 2 +- + drivers/clk/qcom/mmcc-msm8996.c | 4 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 221 +++++-- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 18 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 64 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 2 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 50 ++ + drivers/clk/renesas/renesas-cpg-mssr.h | 22 + + drivers/clk/spear/spear6xx_clock.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.h | 2 +- + drivers/clk/ti/apll.c | 50 +- + drivers/clk/ti/autoidle.c | 18 +- + drivers/clk/ti/clk-3xxx.c | 55 +- + drivers/clk/ti/clk-44xx.c | 188 +----- + drivers/clk/ti/clk-dra7-atl.c | 11 +- + drivers/clk/ti/clk.c | 157 ++++- + drivers/clk/ti/clkt_dflt.c | 61 +- + drivers/clk/ti/clkt_dpll.c | 6 +- + drivers/clk/ti/clkt_iclk.c | 29 +- + drivers/clk/ti/clock.h | 41 +- + drivers/clk/ti/clockdomain.c | 38 +- + drivers/clk/ti/composite.c | 18 +- + drivers/clk/ti/divider.c | 111 ++-- + drivers/clk/ti/dpll.c | 63 +- + drivers/clk/ti/dpll3xxx.c | 38 +- + drivers/clk/ti/dpll44xx.c | 14 +- + drivers/clk/ti/fixed-factor.c | 1 + + drivers/clk/ti/gate.c | 44 +- + drivers/clk/ti/interface.c | 25 +- + drivers/clk/ti/mux.c | 59 +- + drivers/clk/x86/clk-pmc-atom.c | 7 + + drivers/clk/zte/clk-zx296718.c | 32 +- + drivers/clk/zte/clk.c | 12 +- + drivers/clk/zte/clk.h | 6 +- + include/dt-bindings/clock/hi6220-clock.h | 5 +- + include/dt-bindings/clock/mt6797-clk.h | 281 ++++++++ + include/dt-bindings/clock/r8a7795-cpg-mssr.h | 7 + + include/dt-bindings/reset/mt2701-resets.h | 7 + + include/linux/clk/ti.h | 55 +- + 92 files changed, 3868 insertions(+), 844 deletions(-) + create mode 100644 drivers/clk/clk-hi655x.c + create mode 100644 drivers/clk/mediatek/clk-mt6797-img.c + create mode 100644 drivers/clk/mediatek/clk-mt6797-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt6797-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt6797-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt6797.c + create mode 100644 drivers/clk/meson/clk-audio-divider.c + create mode 100644 include/dt-bindings/clock/mt6797-clk.h +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 (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/mac/config.c | 61 ++---- + arch/m68k/mac/iop.c | 93 ++++----- + arch/m68k/mac/misc.c | 23 +-- + drivers/nubus/nubus.c | 459 +++++++++++++++++++++------------------------ + include/uapi/linux/nubus.h | 4 +- + 5 files changed, 278 insertions(+), 362 deletions(-) +Merging m68knommu/for-next (99a2c395541f m68k/coldfire/pit: set ->min_delta_ticks and ->max_delta_ticks) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/pit.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging metag/for-next (d3ba2e922d4d metag/usercopy: Add 64-bit get_user support) +$ git merge metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/include/asm/uaccess.h | 9 +- + arch/metag/lib/usercopy.c | 236 +++++++++++++++++---------------------- + 2 files changed, 112 insertions(+), 133 deletions(-) +Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (d9c94cdf3bb5 Merge branch '4.11-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/include/asm/octeon/cvmx-l2d-defs.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/mips/Kbuild | 2 + + arch/mips/Kconfig | 24 +- + arch/mips/cavium-octeon/Kconfig | 9 - + arch/mips/cavium-octeon/Platform | 4 - + arch/mips/cavium-octeon/executive/cvmx-l2c.c | 139 +- + arch/mips/cavium-octeon/executive/octeon-model.c | 21 +- + arch/mips/cavium-octeon/octeon-platform.c | 113 +- + arch/mips/cavium-octeon/setup.c | 12 +- + arch/mips/configs/generic_defconfig | 3 + + arch/mips/include/asm/cache.h | 5 - + arch/mips/include/asm/cpu-info.h | 3 +- + arch/mips/include/asm/cpufeature.h | 26 + + .../include/asm/mach-rm/cpu-feature-overrides.h | 2 - + arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 3193 +----------------- + arch/mips/include/asm/octeon/cvmx-l2c.h | 59 +- + arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 526 --- + arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 286 +- + arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 3225 ++---------------- + arch/mips/include/asm/octeon/cvmx-sli-defs.h | 3541 +------------------- + arch/mips/include/asm/octeon/cvmx.h | 3 +- + arch/mips/include/asm/pgalloc.h | 26 + + arch/mips/include/asm/pgtable-64.h | 88 +- + arch/mips/include/asm/uasm.h | 88 +- + arch/mips/kernel/cpu-probe.c | 7 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 16 +- + arch/mips/kernel/process.c | 6 +- + arch/mips/kernel/r4k_switch.S | 6 - + arch/mips/kernel/smp-cps.c | 7 +- + arch/mips/kernel/smp-mt.c | 49 +- + arch/mips/kernel/smp.c | 20 +- + arch/mips/lantiq/irq.c | 52 - + arch/mips/math-emu/cp1emu.c | 10 +- + arch/mips/mm/fault.c | 16 +- + arch/mips/mm/init.c | 3 + + arch/mips/mm/pgtable-64.c | 33 +- + arch/mips/mm/tlbex.c | 22 + + arch/mips/mm/uasm-mips.c | 1 + + arch/mips/mm/uasm.c | 159 +- + arch/mips/mti-malta/malta-int.c | 83 +- + arch/mips/net/bpf_jit.c | 41 +- + arch/mips/net/bpf_jit_asm.S | 23 +- + arch/mips/pci/pcie-octeon.c | 4 +- + arch/mips/sibyte/bcm1480/setup.c | 1 + + arch/mips/sibyte/sb1250/setup.c | 1 + + drivers/cpufreq/loongson2_cpufreq.c | 7 - + drivers/irqchip/Kconfig | 2 + + drivers/irqchip/irq-mips-cpu.c | 146 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 1 + + 49 files changed, 1208 insertions(+), 10908 deletions(-) + create mode 100644 arch/mips/include/asm/cpufeature.h + delete mode 100644 arch/mips/include/asm/octeon/cvmx-l2d-defs.h +Merging nios2/for-next (d8f347ba35cf nios2: enable earlycon support) +$ git merge nios2/for-next +Removing arch/nios2/include/asm/cmpxchg.h +Merge made by the 'recursive' strategy. + arch/nios2/Kconfig.debug | 1 - + arch/nios2/boot/.gitignore | 2 ++ + arch/nios2/boot/dts/10m50_devboard.dts | 3 ++- + arch/nios2/include/asm/Kbuild | 1 + + arch/nios2/include/asm/cmpxchg.h | 14 -------------- + arch/nios2/kernel/.gitignore | 1 + + arch/nios2/kernel/early_printk.c | 7 +++++-- + arch/nios2/kernel/irq.c | 2 +- + arch/nios2/kernel/setup.c | 2 ++ + 9 files changed, 14 insertions(+), 19 deletions(-) + create mode 100644 arch/nios2/boot/.gitignore + delete mode 100644 arch/nios2/include/asm/cmpxchg.h + create mode 100644 arch/nios2/kernel/.gitignore +Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start) +$ git merge openrisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (4f7d029b9bf0 Linux 4.11-rc7) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (9765ad134a00 powerpc/mm: Ensure IRQs are off in switch_mm()) +$ git merge powerpc/next +Auto-merging tools/testing/selftests/powerpc/Makefile +Auto-merging drivers/misc/cxl/pci.c +Auto-merging arch/powerpc/mm/init_64.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/idle_book3s.S +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/entry_64.S +Auto-merging arch/powerpc/include/asm/exception-64s.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../debug/kprobes-on-ftrace/arch-support.txt | 2 +- + Documentation/powerpc/cxl.txt | 15 +- + Documentation/powerpc/firmware-assisted-dump.txt | 34 +- + MAINTAINERS | 3 +- + arch/powerpc/Kconfig | 57 +- + arch/powerpc/configs/powernv_defconfig | 6 +- + arch/powerpc/configs/ppc64_defconfig | 6 +- + arch/powerpc/configs/pseries_defconfig | 6 +- + arch/powerpc/include/asm/asm-prototypes.h | 4 + + arch/powerpc/include/asm/bitops.h | 8 + + arch/powerpc/include/asm/book3s/64/hash-4k.h | 2 +- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 10 +- + arch/powerpc/include/asm/book3s/64/hash.h | 16 +- + arch/powerpc/include/asm/book3s/64/hugetlb.h | 2 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 200 +-- + arch/powerpc/include/asm/book3s/64/mmu.h | 9 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 57 +- + arch/powerpc/include/asm/book3s/64/radix.h | 8 +- + arch/powerpc/include/asm/code-patching.h | 41 + + arch/powerpc/include/asm/cpuidle.h | 33 +- + arch/powerpc/include/asm/cputable.h | 5 +- + arch/powerpc/include/asm/dbell.h | 40 +- + arch/powerpc/include/asm/debug.h | 2 - + arch/powerpc/include/asm/debugfs.h | 17 + + arch/powerpc/include/asm/exception-64s.h | 23 +- + arch/powerpc/include/asm/feature-fixups.h | 3 + + arch/powerpc/include/asm/head-64.h | 1 + + arch/powerpc/include/asm/hvcall.h | 10 - + arch/powerpc/include/asm/io.h | 102 +- + arch/powerpc/include/asm/kprobes.h | 63 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 2 - + arch/powerpc/include/asm/kvm_book3s_asm.h | 2 +- + arch/powerpc/include/asm/kvm_ppc.h | 10 +- + arch/powerpc/include/asm/mce.h | 94 +- + arch/powerpc/include/asm/mmu-book3e.h | 5 - + arch/powerpc/include/asm/mmu.h | 19 +- + arch/powerpc/include/asm/mmu_context.h | 20 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 5 - + arch/powerpc/include/asm/opal-api.h | 77 +- + arch/powerpc/include/asm/opal.h | 41 + + arch/powerpc/include/asm/paca.h | 24 +- + arch/powerpc/include/asm/page_64.h | 14 - + arch/powerpc/include/asm/perf_event_server.h | 3 + + arch/powerpc/include/asm/powernv.h | 22 + + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/include/asm/processor.h | 41 +- + arch/powerpc/include/asm/reg.h | 4 + + arch/powerpc/include/asm/sections.h | 2 + + arch/powerpc/include/asm/smp.h | 6 +- + arch/powerpc/include/asm/syscalls.h | 4 +- + arch/powerpc/include/asm/thread_info.h | 10 +- + arch/powerpc/include/asm/xics.h | 2 +- + arch/powerpc/include/asm/xive-regs.h | 97 ++ + arch/powerpc/include/asm/xive.h | 163 +++ + arch/powerpc/include/asm/xmon.h | 2 + + arch/powerpc/include/uapi/asm/mman.h | 16 + + arch/powerpc/kernel/Makefile | 3 + + arch/powerpc/kernel/asm-offsets.c | 6 +- + arch/powerpc/kernel/cpu_setup_power.S | 15 +- + arch/powerpc/kernel/dbell.c | 58 +- + arch/powerpc/kernel/eeh.c | 3 +- + arch/powerpc/kernel/entry_64.S | 18 +- + arch/powerpc/kernel/exceptions-64s.S | 122 +- + arch/powerpc/kernel/fadump.c | 36 +- + arch/powerpc/kernel/ftrace.c | 1 + + arch/powerpc/kernel/head_32.S | 16 +- + arch/powerpc/kernel/head_64.S | 3 +- + arch/powerpc/kernel/idle_book3s.S | 285 ++++- + arch/powerpc/kernel/irq.c | 41 - + arch/powerpc/kernel/kprobes-ftrace.c | 104 ++ + arch/powerpc/kernel/kprobes.c | 214 +++- + arch/powerpc/kernel/mce.c | 16 +- + arch/powerpc/kernel/mce_power.c | 780 ++++++------ + arch/powerpc/kernel/optprobes.c | 6 +- + arch/powerpc/kernel/paca.c | 21 + + arch/powerpc/kernel/prom.c | 1 - + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/setup-common.c | 11 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/smp.c | 46 +- + arch/powerpc/kernel/stacktrace.c | 9 +- + arch/powerpc/kernel/swsusp.c | 1 + + arch/powerpc/kernel/syscalls.c | 16 +- + arch/powerpc/kernel/sysfs.c | 6 + + arch/powerpc/kernel/traps.c | 4 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 + + arch/powerpc/kvm/book3s.c | 8 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 10 +- + arch/powerpc/kvm/book3s_hv.c | 18 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 29 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 5 +- + arch/powerpc/kvm/book3s_xics.c | 5 +- + arch/powerpc/lib/code-patching.c | 4 +- + arch/powerpc/lib/sstep.c | 82 +- + arch/powerpc/mm/dump_hashpagetable.c | 2 +- + arch/powerpc/mm/dump_linuxpagetables.c | 31 +- + arch/powerpc/mm/fault.c | 84 +- + arch/powerpc/mm/hash_low_32.S | 2 - + arch/powerpc/mm/hash_utils_64.c | 26 +- + arch/powerpc/mm/hugetlbpage-book3e.c | 7 - + arch/powerpc/mm/hugetlbpage-radix.c | 11 +- + arch/powerpc/mm/hugetlbpage.c | 18 + + arch/powerpc/mm/init_64.c | 4 - + arch/powerpc/mm/mmap.c | 53 +- + arch/powerpc/mm/mmu_context_book3s64.c | 116 +- + arch/powerpc/mm/mmu_context_iommu.c | 4 +- + arch/powerpc/mm/mmu_context_nohash.c | 5 - + arch/powerpc/mm/numa.c | 7 - + arch/powerpc/mm/slb.c | 4 +- + arch/powerpc/mm/slb_low.S | 82 +- + arch/powerpc/mm/slice.c | 258 ++-- + arch/powerpc/mm/subpage-prot.c | 3 +- + arch/powerpc/mm/tlb-radix.c | 18 +- + arch/powerpc/mm/tlb_nohash.c | 2 +- + arch/powerpc/perf/core-book3s.c | 8 + + arch/powerpc/perf/isa207-common.c | 82 ++ + arch/powerpc/perf/isa207-common.h | 26 +- + arch/powerpc/perf/power8-events-list.h | 6 + + arch/powerpc/perf/power8-pmu.c | 4 + + arch/powerpc/perf/power9-pmu.c | 2 + + arch/powerpc/platforms/44x/sam440ep.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 11 +- + arch/powerpc/platforms/Kconfig.cputype | 14 +- + arch/powerpc/platforms/cell/axon_msi.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 3 + + arch/powerpc/platforms/powernv/idle.c | 109 +- + arch/powerpc/platforms/powernv/npu-dma.c | 462 +++++++ + arch/powerpc/platforms/powernv/opal-lpc.c | 3 +- + arch/powerpc/platforms/powernv/opal-sensor.c | 4 + + arch/powerpc/platforms/powernv/opal-wrappers.S | 71 +- + arch/powerpc/platforms/powernv/opal-xscom.c | 27 +- + arch/powerpc/platforms/powernv/opal.c | 78 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 9 +- + arch/powerpc/platforms/powernv/pci.c | 2 +- + arch/powerpc/platforms/powernv/pci.h | 15 +- + arch/powerpc/platforms/powernv/powernv.h | 2 - + arch/powerpc/platforms/powernv/rng.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 19 +- + arch/powerpc/platforms/powernv/smp.c | 102 +- + arch/powerpc/platforms/pseries/Kconfig | 3 +- + arch/powerpc/platforms/pseries/dlpar.c | 1 - + arch/powerpc/platforms/pseries/dtl.c | 3 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 10 + + arch/powerpc/platforms/pseries/lpar.c | 61 + + arch/powerpc/platforms/pseries/setup.c | 4 + + arch/powerpc/platforms/pseries/smp.c | 27 +- + arch/powerpc/sysdev/Kconfig | 1 + + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/scom.c | 3 +- + arch/powerpc/sysdev/xics/icp-hv.c | 2 +- + arch/powerpc/sysdev/xics/icp-native.c | 20 +- + arch/powerpc/sysdev/xics/icp-opal.c | 2 +- + arch/powerpc/sysdev/xics/xics-common.c | 3 - + arch/powerpc/sysdev/xive/Kconfig | 11 + + arch/powerpc/sysdev/xive/Makefile | 4 + + arch/powerpc/sysdev/xive/common.c | 1302 ++++++++++++++++++++ + arch/powerpc/sysdev/xive/native.c | 640 ++++++++++ + arch/powerpc/sysdev/xive/xive-internal.h | 62 + + arch/powerpc/xmon/xmon.c | 189 ++- + drivers/misc/cxl/api.c | 17 +- + drivers/misc/cxl/context.c | 68 +- + drivers/misc/cxl/cxl.h | 245 +++- + drivers/misc/cxl/debugfs.c | 41 +- + drivers/misc/cxl/fault.c | 136 +- + drivers/misc/cxl/file.c | 15 +- + drivers/misc/cxl/guest.c | 10 +- + drivers/misc/cxl/hcalls.c | 6 +- + drivers/misc/cxl/irq.c | 53 +- + drivers/misc/cxl/main.c | 12 +- + drivers/misc/cxl/native.c | 322 ++++- + drivers/misc/cxl/pci.c | 375 +++++- + drivers/misc/cxl/trace.h | 43 + + drivers/of/base.c | 31 + + drivers/pcmcia/electra_cf.c | 4 +- + include/linux/kprobes.h | 1 + + include/linux/of.h | 3 + + include/uapi/linux/perf_event.h | 16 + + kernel/kprobes.c | 32 +- + tools/include/uapi/linux/perf_event.h | 16 + + tools/testing/selftests/powerpc/Makefile | 1 + + .../selftests/powerpc/cache_shape/.gitignore | 1 + + .../testing/selftests/powerpc/cache_shape/Makefile | 10 + + .../selftests/powerpc/cache_shape/cache_shape.c | 125 ++ + tools/testing/selftests/powerpc/include/utils.h | 6 +- + tools/testing/selftests/powerpc/utils.c | 53 +- + 186 files changed, 7211 insertions(+), 2067 deletions(-) + create mode 100644 arch/powerpc/include/asm/debugfs.h + create mode 100644 arch/powerpc/include/asm/xive-regs.h + create mode 100644 arch/powerpc/include/asm/xive.h + create mode 100644 arch/powerpc/kernel/kprobes-ftrace.c + create mode 100644 arch/powerpc/sysdev/xive/Kconfig + create mode 100644 arch/powerpc/sysdev/xive/Makefile + create mode 100644 arch/powerpc/sysdev/xive/common.c + create mode 100644 arch/powerpc/sysdev/xive/native.c + create mode 100644 arch/powerpc/sysdev/xive/xive-internal.h + create mode 100644 tools/testing/selftests/powerpc/cache_shape/.gitignore + create mode 100644 tools/testing/selftests/powerpc/cache_shape/Makefile + create mode 100644 tools/testing/selftests/powerpc/cache_shape/cache_shape.c +Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx) +$ 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 (9b11c7912d00 s390/mm: simplify arch_get_unmapped_area[_topdown]) +$ git merge s390/features +Resolved 'arch/s390/include/uapi/asm/Kbuild' using previous resolution. +Removing arch/s390/include/uapi/asm/termbits.h +Removing arch/s390/include/uapi/asm/sockios.h +Removing arch/s390/include/uapi/asm/resource.h +Removing arch/s390/include/uapi/asm/poll.h +Removing arch/s390/include/uapi/asm/param.h +Removing arch/s390/include/uapi/asm/mman.h +Removing arch/s390/include/uapi/asm/ioctl.h +Removing arch/s390/include/uapi/asm/fcntl.h +Removing arch/s390/include/uapi/asm/errno.h +Auto-merging arch/s390/include/uapi/asm/Kbuild +CONFLICT (content): Merge conflict in arch/s390/include/uapi/asm/Kbuild +Auto-merging arch/s390/include/asm/pgtable.h +Removing arch/s390/include/asm/local64.h +Removing arch/s390/include/asm/local.h +Removing arch/s390/include/asm/kmap_types.h +Removing arch/s390/include/asm/irq_regs.h +Removing arch/s390/include/asm/emergency-restart.h +Removing arch/s390/include/asm/div64.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master beac6cb2cc80] Merge remote-tracking branch 's390/features' +$ git diff -M --stat --summary HEAD^.. + Documentation/s390/00-INDEX | 2 + + Documentation/s390/vfio-ccw.txt | 303 ++++++++++ + MAINTAINERS | 11 + + arch/s390/Kconfig | 24 +- + arch/s390/configs/default_defconfig | 1 + + arch/s390/configs/gcov_defconfig | 1 + + arch/s390/configs/performance_defconfig | 1 + + arch/s390/configs/zfcpdump_defconfig | 1 - + arch/s390/include/asm/Kbuild | 6 + + arch/s390/include/asm/atomic_ops.h | 22 +- + arch/s390/include/asm/bitops.h | 13 +- + arch/s390/include/asm/cio.h | 18 + + arch/s390/include/asm/cpu_mf.h | 6 +- + arch/s390/include/asm/div64.h | 1 - + arch/s390/include/asm/elf.h | 1 + + arch/s390/include/asm/emergency-restart.h | 6 - + arch/s390/include/asm/facility.h | 6 +- + arch/s390/include/asm/irq_regs.h | 1 - + arch/s390/include/asm/isc.h | 1 + + arch/s390/include/asm/kmap_types.h | 6 - + arch/s390/include/asm/local.h | 1 - + arch/s390/include/asm/local64.h | 1 - + arch/s390/include/asm/lowcore.h | 9 +- + arch/s390/include/asm/mman.h | 4 - + arch/s390/include/asm/mmu.h | 2 + + arch/s390/include/asm/mmu_context.h | 1 + + arch/s390/include/asm/nmi.h | 12 +- + arch/s390/include/asm/page-states.h | 19 + + arch/s390/include/asm/perf_event.h | 4 +- + arch/s390/include/asm/pgtable.h | 16 +- + arch/s390/include/asm/pkey.h | 21 + + arch/s390/include/asm/processor.h | 14 +- + arch/s390/include/asm/setup.h | 6 +- + arch/s390/include/asm/sparsemem.h | 2 +- + arch/s390/include/asm/spinlock.h | 45 +- + arch/s390/include/asm/spinlock_types.h | 6 +- + arch/s390/include/asm/switch_to.h | 3 + + arch/s390/include/asm/sysinfo.h | 12 +- + arch/s390/include/asm/thread_info.h | 12 +- + arch/s390/include/uapi/asm/Kbuild | 10 + + arch/s390/include/uapi/asm/errno.h | 11 - + arch/s390/include/uapi/asm/fcntl.h | 1 - + arch/s390/include/uapi/asm/guarded_storage.h | 77 +++ + arch/s390/include/uapi/asm/ioctl.h | 1 - + arch/s390/include/uapi/asm/mman.h | 6 - + arch/s390/include/uapi/asm/param.h | 6 - + arch/s390/include/uapi/asm/pkey.h | 19 + + arch/s390/include/uapi/asm/poll.h | 1 - + arch/s390/include/uapi/asm/resource.h | 13 - + arch/s390/include/uapi/asm/sockios.h | 6 - + arch/s390/include/uapi/asm/termbits.h | 6 - + arch/s390/include/uapi/asm/unistd.h | 2 +- + arch/s390/kernel/Makefile | 6 +- + arch/s390/kernel/asm-offsets.c | 2 +- + arch/s390/kernel/compat_wrapper.c | 1 + + arch/s390/kernel/crash_dump.c | 15 + + arch/s390/kernel/early.c | 66 ++- + arch/s390/kernel/entry.S | 28 +- + arch/s390/kernel/entry.h | 2 + + arch/s390/kernel/guarded_storage.c | 128 ++++ + arch/s390/kernel/head.S | 1 - + arch/s390/kernel/head64.S | 2 +- + arch/s390/kernel/kdebugfs.c | 15 + + arch/s390/kernel/machine_kexec.c | 13 +- + arch/s390/kernel/nmi.c | 19 +- + arch/s390/kernel/perf_cpum_cf.c | 128 ++-- + arch/s390/kernel/perf_cpum_cf_events.c | 148 ++++- + arch/s390/kernel/perf_cpum_sf.c | 7 +- + arch/s390/kernel/process.c | 7 +- + arch/s390/kernel/processor.c | 16 +- + arch/s390/kernel/ptrace.c | 132 ++++- + arch/s390/kernel/setup.c | 18 +- + arch/s390/kernel/smp.c | 43 +- + arch/s390/kernel/syscalls.S | 2 +- + arch/s390/kernel/sysinfo.c | 98 ++++ + arch/s390/kernel/topology.c | 6 +- + arch/s390/kvm/interrupt.c | 4 +- + arch/s390/kvm/kvm-s390.c | 4 +- + arch/s390/lib/spinlock.c | 84 +-- + arch/s390/mm/gmap.c | 37 +- + arch/s390/mm/gup.c | 2 +- + arch/s390/mm/mmap.c | 84 +-- + arch/s390/mm/page-states.c | 3 +- + arch/s390/mm/pgalloc.c | 4 +- + arch/s390/mm/pgtable.c | 153 +++++ + arch/s390/pci/pci.c | 22 +- + drivers/iommu/Kconfig | 8 + + drivers/s390/block/dasd_3990_erp.c | 5 +- + drivers/s390/block/dasd_eckd.c | 16 +- + drivers/s390/block/dasd_int.h | 2 +- + drivers/s390/cio/Makefile | 3 + + drivers/s390/cio/cio.c | 69 +++ + drivers/s390/cio/cio.h | 1 + + drivers/s390/cio/device_fsm.c | 54 +- + drivers/s390/cio/vfio_ccw_cp.c | 842 +++++++++++++++++++++++++++ + drivers/s390/cio/vfio_ccw_cp.h | 42 ++ + drivers/s390/cio/vfio_ccw_drv.c | 308 ++++++++++ + drivers/s390/cio/vfio_ccw_fsm.c | 203 +++++++ + drivers/s390/cio/vfio_ccw_ops.c | 425 ++++++++++++++ + drivers/s390/cio/vfio_ccw_private.h | 96 +++ + drivers/s390/crypto/pkey_api.c | 64 +- + include/uapi/linux/elf.h | 2 + + include/uapi/linux/vfio.h | 18 + + include/uapi/linux/vfio_ccw.h | 24 + + 104 files changed, 3750 insertions(+), 512 deletions(-) + create mode 100644 Documentation/s390/vfio-ccw.txt + delete mode 100644 arch/s390/include/asm/div64.h + delete mode 100644 arch/s390/include/asm/emergency-restart.h + delete mode 100644 arch/s390/include/asm/irq_regs.h + delete mode 100644 arch/s390/include/asm/kmap_types.h + delete mode 100644 arch/s390/include/asm/local.h + delete mode 100644 arch/s390/include/asm/local64.h + create mode 100644 arch/s390/include/asm/page-states.h + delete mode 100644 arch/s390/include/uapi/asm/errno.h + delete mode 100644 arch/s390/include/uapi/asm/fcntl.h + create mode 100644 arch/s390/include/uapi/asm/guarded_storage.h + delete mode 100644 arch/s390/include/uapi/asm/ioctl.h + delete mode 100644 arch/s390/include/uapi/asm/mman.h + delete mode 100644 arch/s390/include/uapi/asm/param.h + delete mode 100644 arch/s390/include/uapi/asm/poll.h + delete mode 100644 arch/s390/include/uapi/asm/resource.h + delete mode 100644 arch/s390/include/uapi/asm/sockios.h + delete mode 100644 arch/s390/include/uapi/asm/termbits.h + create mode 100644 arch/s390/kernel/guarded_storage.c + create mode 100644 arch/s390/kernel/kdebugfs.c + create mode 100644 drivers/s390/cio/vfio_ccw_cp.c + create mode 100644 drivers/s390/cio/vfio_ccw_cp.h + create mode 100644 drivers/s390/cio/vfio_ccw_drv.c + create mode 100644 drivers/s390/cio/vfio_ccw_fsm.c + create mode 100644 drivers/s390/cio/vfio_ccw_ops.c + create mode 100644 drivers/s390/cio/vfio_ccw_private.h + create mode 100644 include/uapi/linux/vfio_ccw.h +Merging sparc-next/master (94836ecf1e73 Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/uapi/arch/abi.h | 49 +++---------------------- + arch/tile/include/uapi/arch/intreg.h | 70 ++++++++++++++++++++++++++++++++++++ + arch/tile/mm/init.c | 30 ---------------- + 3 files changed, 74 insertions(+), 75 deletions(-) + create mode 100644 arch/tile/include/uapi/arch/intreg.h +Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Auto-merging arch/unicore32/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 3 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 3 deletions(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (d0c32cdc395c Merge branch 'xtensa-dma-map-fix' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (94840e3c802d fscrypt: eliminate ->prepare_context() operation) +$ git merge fscrypt/master +Already up-to-date. +Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/linuxvfs.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (953a8bf6cedd Merge branch 'for-next-next-v4.12-20170425' into for-next-20170425) +$ git merge btrfs-kdave/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + fs/btrfs/backref.c | 41 ++- + fs/btrfs/btrfs_inode.h | 7 + + fs/btrfs/compression.c | 18 +- + fs/btrfs/ctree.c | 20 +- + fs/btrfs/ctree.h | 46 ++- + fs/btrfs/delayed-inode.c | 46 +-- + fs/btrfs/delayed-inode.h | 6 +- + fs/btrfs/delayed-ref.c | 8 +- + fs/btrfs/delayed-ref.h | 8 +- + fs/btrfs/dev-replace.c | 9 +- + fs/btrfs/disk-io.c | 15 +- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 66 ++-- + fs/btrfs/extent_io.c | 59 +-- + fs/btrfs/extent_io.h | 22 +- + fs/btrfs/extent_map.c | 10 +- + fs/btrfs/extent_map.h | 3 +- + fs/btrfs/file.c | 128 +++++-- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode-map.c | 6 +- + fs/btrfs/inode.c | 353 +++++++++++++----- + fs/btrfs/ioctl.c | 44 +-- + fs/btrfs/ordered-data.c | 20 +- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/qgroup.c | 309 ++++++++++------ + fs/btrfs/qgroup.h | 59 ++- + fs/btrfs/raid56.c | 38 +- + fs/btrfs/reada.c | 37 +- + fs/btrfs/relocation.c | 13 +- + fs/btrfs/root-tree.c | 3 +- + fs/btrfs/scrub.c | 331 +++++++++++++++-- + fs/btrfs/send.c | 23 +- + fs/btrfs/super.c | 3 +- + fs/btrfs/tests/btrfs-tests.c | 1 - + fs/btrfs/transaction.c | 44 ++- + fs/btrfs/transaction.h | 6 +- + fs/btrfs/tree-log.c | 2 +- + fs/btrfs/volumes.c | 856 +++++++++++++++++++++++-------------------- + fs/btrfs/volumes.h | 8 +- + include/trace/events/btrfs.h | 187 +++++++++- + include/uapi/linux/btrfs.h | 10 +- + 42 files changed, 1914 insertions(+), 961 deletions(-) +Merging ceph/master (8179a101eb5f ceph: fix recursion between ceph_set_acl() and __ceph_setattr()) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/inode.c | 22 ++++++++++------------ + 1 file changed, 10 insertions(+), 12 deletions(-) +Merging cifs/for-next (f61143c45077 Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (07f7e3135e58 Merge branch 'fsnotify' into for_next) +$ git merge ext3/for_next +Auto-merging kernel/auditsc.c +Removing fs/notify/vfsmount_mark.c +Removing fs/notify/inode_mark.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + fs/ext2/ext2.h | 4 +- + fs/ext2/inode.c | 22 +- + fs/ext2/ioctl.c | 1 - + fs/ext2/super.c | 87 ++++- + fs/ext4/ext4.h | 1 - + fs/ext4/inode.c | 26 -- + fs/ext4/ioctl.c | 2 - + fs/ext4/super.c | 74 +++- + fs/inode.c | 3 - + fs/jfs/ioctl.c | 2 - + fs/jfs/jfs_imap.c | 1 - + fs/jfs/jfs_inode.c | 18 - + fs/jfs/jfs_inode.h | 1 - + fs/jfs/super.c | 79 ++++- + fs/mount.h | 2 +- + fs/namespace.c | 3 - + fs/notify/Makefile | 4 +- + fs/notify/dnotify/dnotify.c | 25 +- + fs/notify/fanotify/fanotify.c | 26 +- + fs/notify/fanotify/fanotify.h | 1 + + fs/notify/fanotify/fanotify_user.c | 77 +++-- + fs/notify/fdinfo.c | 16 +- + fs/notify/fsnotify.c | 107 +++++- + fs/notify/fsnotify.h | 48 +-- + fs/notify/group.c | 20 +- + fs/notify/inode_mark.c | 199 ----------- + fs/notify/inotify/inotify.h | 4 +- + fs/notify/inotify/inotify_fsnotify.c | 18 +- + fs/notify/inotify/inotify_user.c | 81 ++--- + fs/notify/mark.c | 642 +++++++++++++++++++++++------------ + fs/notify/vfsmount_mark.c | 108 ------ + fs/quota/dquot.c | 31 +- + fs/reiserfs/inode.c | 31 +- + fs/reiserfs/ioctl.c | 1 - + fs/reiserfs/journal.c | 2 +- + fs/reiserfs/lbalance.c | 2 +- + fs/reiserfs/reiserfs.h | 3 +- + fs/reiserfs/super.c | 92 ++++- + fs/udf/file.c | 10 +- + fs/udf/inode.c | 22 +- + fs/udf/namei.c | 2 +- + include/linux/fs.h | 4 +- + include/linux/fsnotify_backend.h | 95 ++++-- + include/linux/quotaops.h | 1 - + kernel/audit_fsnotify.c | 10 +- + kernel/audit_tree.c | 78 +++-- + kernel/audit_watch.c | 10 +- + kernel/auditsc.c | 5 +- + 48 files changed, 1150 insertions(+), 951 deletions(-) + delete mode 100644 fs/notify/inode_mark.c + delete mode 100644 fs/notify/vfsmount_mark.c +Merging ext4/dev (d67d64f42314 ext4: fix two spelling nits) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (d29fd1721851 f2fs: fix not to set fsync/dentry mark) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 62 ++++-- + fs/f2fs/data.c | 64 ++++-- + fs/f2fs/debug.c | 56 ++++-- + fs/f2fs/dir.c | 33 +--- + fs/f2fs/extent_cache.c | 291 +++++++++++++++------------ + fs/f2fs/f2fs.h | 167 +++++++++------- + fs/f2fs/file.c | 93 +++++---- + fs/f2fs/gc.c | 48 +++-- + fs/f2fs/inline.c | 34 ++-- + fs/f2fs/inode.c | 20 +- + fs/f2fs/namei.c | 53 ++--- + fs/f2fs/node.c | 130 ++++++------ + fs/f2fs/node.h | 31 +-- + fs/f2fs/segment.c | 470 +++++++++++++++++++++++++++----------------- + fs/f2fs/segment.h | 115 ++++++----- + fs/f2fs/super.c | 32 ++- + fs/f2fs/trace.c | 4 +- + fs/f2fs/xattr.c | 31 ++- + fs/f2fs/xattr.h | 8 +- + include/trace/events/f2fs.h | 14 +- + 20 files changed, 1022 insertions(+), 734 deletions(-) +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 24 +++++++++++++++--------- + fs/fuse/file.c | 30 +++++++++++++++++++++--------- + fs/fuse/fuse_i.h | 11 ++++++++--- + fs/fuse/inode.c | 9 ++++++--- + 4 files changed, 50 insertions(+), 24 deletions(-) +Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size) +$ git merge jfs/jfs-next +Auto-merging fs/jfs/super.c +Merge made by the 'recursive' strategy. + fs/jfs/resize.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (35a244218901 Merge tag 'nfs-rdma-4.12-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma) +$ git merge nfs/linux-next +Auto-merging include/linux/fs.h +Removing fs/nfs/objlayout/pnfs_osd_xdr_cli.c +Removing fs/nfs/objlayout/objlayout.h +Removing fs/nfs/objlayout/objlayout.c +Removing fs/nfs/objlayout/objio_osd.c +Removing fs/nfs/objlayout/Kbuild +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 - + Documentation/filesystems/nfs/pnfs.txt | 37 -- + fs/fuse/file.c | 2 +- + fs/lockd/clntlock.c | 1 + + fs/lockd/clntproc.c | 26 +- + fs/locks.c | 2 +- + fs/nfs/Kconfig | 5 - + fs/nfs/Makefile | 1 - + fs/nfs/callback_proc.c | 41 +- + fs/nfs/callback_xdr.c | 109 +--- + fs/nfs/client.c | 67 +-- + fs/nfs/dir.c | 37 +- + fs/nfs/direct.c | 21 +- + fs/nfs/file.c | 28 +- + fs/nfs/filelayout/filelayout.c | 2 + + fs/nfs/flexfilelayout/flexfilelayout.c | 2 + + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 10 +- + fs/nfs/namespace.c | 34 +- + fs/nfs/nfs3proc.c | 54 +- + fs/nfs/nfs42proc.c | 2 - + fs/nfs/nfs4client.c | 283 +++------- + fs/nfs/nfs4getroot.c | 3 - + fs/nfs/nfs4namespace.c | 7 +- + fs/nfs/nfs4proc.c | 74 +-- + fs/nfs/nfs4xdr.c | 17 +- + fs/nfs/objlayout/Kbuild | 5 - + fs/nfs/objlayout/objio_osd.c | 675 ---------------------- + fs/nfs/objlayout/objlayout.c | 706 ------------------------ + fs/nfs/objlayout/objlayout.h | 183 ------ + fs/nfs/objlayout/pnfs_osd_xdr_cli.c | 415 -------------- + fs/nfs/pagelist.c | 77 ++- + fs/nfs/pnfs.c | 31 +- + fs/nfs/pnfs.h | 6 +- + fs/nfs/pnfs_nfs.c | 17 +- + fs/nfs/proc.c | 2 +- + fs/nfs/read.c | 9 +- + fs/nfs/write.c | 66 ++- + include/linux/fs.h | 2 + + include/linux/lockd/bind.h | 24 +- + include/linux/lockd/lockd.h | 2 + + include/linux/nfs_fs.h | 3 +- + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_page.h | 5 +- + include/linux/nfs_xdr.h | 2 + + net/sunrpc/clnt.c | 8 - + net/sunrpc/sched.c | 5 - + net/sunrpc/xdr.c | 2 +- + net/sunrpc/xprt.c | 1 + + net/sunrpc/xprtrdma/rpc_rdma.c | 12 +- + net/sunrpc/xprtrdma/transport.c | 57 +- + net/sunrpc/xprtrdma/verbs.c | 323 +++++++---- + net/sunrpc/xprtrdma/xprt_rdma.h | 22 +- + 52 files changed, 755 insertions(+), 2777 deletions(-) + delete mode 100644 fs/nfs/objlayout/Kbuild + delete mode 100644 fs/nfs/objlayout/objio_osd.c + delete mode 100644 fs/nfs/objlayout/objlayout.c + delete mode 100644 fs/nfs/objlayout/objlayout.h + delete mode 100644 fs/nfs/objlayout/pnfs_osd_xdr_cli.c +Merging nfsd/nfsd-next (c02ea6a0583a svcrdma: Clean out old XDR encoders) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs3xdr.c | 23 +- + fs/nfsd/nfs4state.c | 25 +- + fs/nfsd/nfsxdr.c | 13 +- + fs/nfsd/vfs.c | 24 +- + include/linux/sunrpc/rpc_rdma.h | 3 + + include/linux/sunrpc/svc.h | 3 +- + include/linux/sunrpc/svc_rdma.h | 75 +-- + include/uapi/linux/nfsd/cld.h | 14 +- + net/sunrpc/Kconfig | 1 + + net/sunrpc/xprtrdma/Makefile | 2 +- + net/sunrpc/xprtrdma/svc_rdma.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 71 +-- + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 89 --- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 79 ++- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 512 +++++++++++++++ + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 978 ++++++++++++++--------------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 110 +--- + 17 files changed, 1193 insertions(+), 837 deletions(-) + create mode 100644 net/sunrpc/xprtrdma/svc_rdma_rw.c +Merging orangefs/for-next (96c641bc68a3 orangefs: move features validation to fix filesystem hang) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. +Merging overlayfs/overlayfs-next (b0990fbbbd14 ovl: check IS_APPEND() on real upper inode) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/util.c +Merge made by the 'recursive' strategy. + fs/open.c | 3 ++- + fs/overlayfs/inode.c | 37 +++++++++++++++++++++++++++++++++++++ + fs/overlayfs/super.c | 32 +++++++++++++++++++++++++++----- + fs/overlayfs/util.c | 2 +- + 4 files changed, 67 insertions(+), 7 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (32fe905c17f0 ubifs: Fix O_TMPFILE corner case in ubifs_link()) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (c4cf1acdb186 xfs: better log intent item refcount checking) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_inode.c +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/xfs/libxfs/xfs_inode_fork.c +Merge made by the 'recursive' strategy. + fs/iomap.c | 3 + + fs/xfs/Makefile | 1 + + fs/xfs/libxfs/xfs_alloc.c | 57 +++ + fs/xfs/libxfs/xfs_alloc.h | 12 + + fs/xfs/libxfs/xfs_alloc_btree.c | 172 ++++++-- + fs/xfs/libxfs/xfs_bmap.c | 354 +++++++-------- + fs/xfs/libxfs/xfs_bmap.h | 14 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 43 -- + fs/xfs/libxfs/xfs_bmap_btree.h | 22 +- + fs/xfs/libxfs/xfs_btree.c | 15 + + fs/xfs/libxfs/xfs_btree.h | 2 + + fs/xfs/libxfs/xfs_dquot_buf.c | 7 +- + fs/xfs/libxfs/xfs_format.h | 11 - + fs/xfs/libxfs/xfs_fs.h | 13 + + fs/xfs/libxfs/xfs_inode_buf.c | 2 +- + fs/xfs/libxfs/xfs_inode_fork.c | 90 ++-- + fs/xfs/libxfs/xfs_rmap.c | 56 ++- + fs/xfs/libxfs/xfs_rmap.h | 4 + + fs/xfs/libxfs/xfs_rtbitmap.c | 70 +++ + fs/xfs/xfs_aops.c | 8 +- + fs/xfs/xfs_bmap_item.c | 1 + + fs/xfs/xfs_bmap_util.c | 20 +- + fs/xfs/xfs_buf.c | 24 + + fs/xfs/xfs_buf.h | 2 +- + fs/xfs/xfs_dir2_readdir.c | 15 +- + fs/xfs/xfs_extfree_item.c | 1 + + fs/xfs/xfs_fsmap.c | 940 ++++++++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_fsmap.h | 53 +++ + fs/xfs/xfs_inode.c | 9 +- + fs/xfs/xfs_inode_item.c | 29 +- + fs/xfs/xfs_ioctl.c | 89 +++- + fs/xfs/xfs_ioctl32.c | 2 + + fs/xfs/xfs_iomap.c | 8 +- + fs/xfs/xfs_linux.h | 85 ---- + fs/xfs/xfs_log.c | 4 +- + fs/xfs/xfs_mount.h | 5 +- + fs/xfs/xfs_qm.c | 11 +- + fs/xfs/xfs_refcount_item.c | 1 + + fs/xfs/xfs_reflink.c | 21 +- + fs/xfs/xfs_rmap_item.c | 1 + + fs/xfs/xfs_rtalloc.h | 22 +- + fs/xfs/xfs_super.c | 8 + + fs/xfs/xfs_trace.c | 1 + + fs/xfs/xfs_trace.h | 144 ++++-- + fs/xfs/xfs_trans.c | 39 +- + fs/xfs/xfs_trans.h | 3 +- + fs/xfs/xfs_trans_ail.c | 71 ++- + fs/xfs/xfs_trans_priv.h | 15 +- + include/uapi/linux/fsmap.h | 112 +++++ + 49 files changed, 2048 insertions(+), 644 deletions(-) + create mode 100644 fs/xfs/xfs_fsmap.c + create mode 100644 fs/xfs/xfs_fsmap.h + create mode 100644 include/uapi/linux/fsmap.h +Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (2bb81bf9e14d Merge branch 'work.sane_pwd' into for-next) +$ git merge vfs/for-next +Resolved 'arch/mips/Kconfig' using previous resolution. +Resolved 'arch/s390/Kconfig' using previous resolution. +Resolved 'arch/sparc/Kconfig' using previous resolution. +Auto-merging net/core/skbuff.c +Auto-merging kernel/trace/trace.c +Auto-merging fs/open.c +Auto-merging fs/nfs/direct.c +Auto-merging fs/namespace.c +Auto-merging arch/unicore32/include/asm/Kbuild +Auto-merging arch/tile/include/asm/Kbuild +Auto-merging arch/sparc/Kconfig +CONFLICT (content): Merge conflict in arch/sparc/Kconfig +Removing arch/score/include/asm/extable.h +Auto-merging arch/score/include/asm/Kbuild +Auto-merging arch/s390/Kconfig +CONFLICT (content): Merge conflict in arch/s390/Kconfig +Removing arch/powerpc/lib/usercopy_64.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/include/asm/uaccess.h +Auto-merging arch/openrisc/include/asm/Kbuild +Auto-merging arch/nios2/include/asm/Kbuild +Auto-merging arch/mips/kernel/mips-r2-to-r6-emul.c +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging arch/metag/lib/usercopy.c +Auto-merging arch/metag/include/asm/uaccess.h +Auto-merging arch/hexagon/include/asm/Kbuild +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cc0461f41349] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/extable.h | 55 ++ + arch/alpha/include/asm/futex.h | 16 +- + arch/alpha/include/asm/uaccess.h | 305 ++------ + arch/alpha/kernel/traps.c | 152 +--- + arch/alpha/lib/clear_user.S | 66 +- + arch/alpha/lib/copy_user.S | 82 +- + arch/alpha/lib/csum_partial_copy.c | 10 +- + arch/alpha/lib/ev6-clear_user.S | 84 +- + arch/alpha/lib/ev6-copy_user.S | 104 ++- + arch/arc/include/asm/Kbuild | 1 + + arch/arc/include/asm/uaccess.h | 25 +- + arch/arc/mm/extable.c | 14 - + arch/arm/Kconfig | 1 - + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/uaccess.h | 87 +-- + arch/arm/lib/uaccess_with_memcpy.c | 4 +- + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/extable.h | 25 + + arch/arm64/include/asm/uaccess.h | 83 +- + arch/arm64/include/asm/unistd.h | 1 - + arch/arm64/include/asm/unistd32.h | 2 +- + arch/arm64/kernel/arm64ksyms.c | 2 +- + arch/arm64/lib/copy_in_user.S | 4 +- + arch/avr32/include/asm/Kbuild | 1 + + arch/avr32/include/asm/uaccess.h | 39 +- + arch/avr32/kernel/avr32_ksyms.c | 2 - + arch/avr32/lib/copy_user.S | 15 - + arch/blackfin/include/asm/Kbuild | 1 + + arch/blackfin/include/asm/uaccess.h | 47 +- + arch/blackfin/kernel/process.c | 2 +- + arch/c6x/include/asm/Kbuild | 1 + + arch/c6x/include/asm/uaccess.h | 19 +- + arch/c6x/kernel/sys_c6x.c | 2 +- + arch/cris/arch-v10/lib/usercopy.c | 31 +- + arch/cris/arch-v32/lib/usercopy.c | 30 +- + arch/cris/include/arch-v10/arch/uaccess.h | 46 +- + arch/cris/include/arch-v32/arch/uaccess.h | 54 +- + arch/cris/include/asm/Kbuild | 1 + + arch/cris/include/asm/uaccess.h | 77 +- + arch/frv/include/asm/Kbuild | 1 + + arch/frv/include/asm/uaccess.h | 84 +- + arch/frv/kernel/traps.c | 7 +- + arch/frv/mm/extable.c | 27 +- + arch/frv/mm/fault.c | 6 +- + arch/h8300/include/asm/Kbuild | 2 +- + arch/h8300/include/asm/uaccess.h | 54 ++ + arch/hexagon/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/uaccess.h | 26 +- + arch/hexagon/kernel/hexagon_ksyms.c | 4 +- + arch/hexagon/mm/copy_from_user.S | 2 +- + arch/hexagon/mm/copy_to_user.S | 2 +- + arch/ia64/Kconfig | 1 - + arch/ia64/include/asm/extable.h | 11 + + arch/ia64/include/asm/uaccess.h | 102 +-- + arch/ia64/lib/memcpy_mck.S | 13 +- + arch/ia64/mm/extable.c | 5 +- + arch/m32r/include/asm/Kbuild | 1 + + arch/m32r/include/asm/uaccess.h | 189 +---- + arch/m32r/kernel/m32r_ksyms.c | 2 - + arch/m32r/lib/usercopy.c | 21 - + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/asm/processor.h | 10 - + arch/m68k/include/asm/uaccess.h | 1 + + arch/m68k/include/asm/uaccess_mm.h | 103 ++- + arch/m68k/include/asm/uaccess_no.h | 43 +- + arch/m68k/kernel/signal.c | 2 +- + arch/m68k/kernel/traps.c | 9 +- + arch/m68k/lib/uaccess.c | 12 +- + arch/m68k/mm/fault.c | 2 +- + arch/metag/include/asm/Kbuild | 1 + + arch/metag/include/asm/uaccess.h | 60 +- + arch/metag/lib/usercopy.c | 6 +- + arch/microblaze/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/uaccess.h | 64 +- + arch/mips/Kconfig | 1 - + arch/mips/cavium-octeon/octeon-memcpy.S | 31 +- + arch/mips/include/asm/checksum.h | 4 +- + arch/mips/include/asm/r4kcache.h | 4 +- + arch/mips/include/asm/uaccess.h | 449 ++--------- + arch/mips/kernel/mips-r2-to-r6-emul.c | 24 +- + arch/mips/kernel/syscall.c | 2 +- + arch/mips/kernel/unaligned.c | 10 +- + arch/mips/lib/memcpy.S | 49 -- + arch/mips/oprofile/backtrace.c | 2 +- + arch/mn10300/include/asm/Kbuild | 1 + + arch/mn10300/include/asm/uaccess.h | 187 +---- + arch/mn10300/kernel/mn10300_ksyms.c | 2 - + arch/mn10300/lib/usercopy.c | 18 - + arch/nios2/include/asm/Kbuild | 1 + + arch/nios2/include/asm/uaccess.h | 55 +- + arch/nios2/mm/uaccess.c | 16 +- + arch/openrisc/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/uaccess.h | 53 +- + arch/parisc/Kconfig | 1 - + arch/parisc/include/asm/futex.h | 2 +- + arch/parisc/include/asm/uaccess.h | 69 +- + arch/parisc/lib/memcpy.c | 16 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/extable.h | 29 + + arch/powerpc/include/asm/uaccess.h | 96 +-- + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/copy_32.S | 14 - + arch/powerpc/lib/copyuser_64.S | 35 +- + arch/powerpc/lib/usercopy_64.c | 41 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/extable.h | 28 + + arch/s390/include/asm/uaccess.h | 153 +--- + arch/s390/lib/uaccess.c | 68 +- + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/extable.h | 11 - + arch/score/include/asm/uaccess.h | 59 +- + arch/sh/include/asm/extable.h | 10 + + arch/sh/include/asm/uaccess.h | 64 +- + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/uaccess.h | 2 +- + arch/sparc/include/asm/uaccess_32.h | 44 +- + arch/sparc/include/asm/uaccess_64.h | 44 +- + arch/sparc/kernel/head_32.S | 7 - + arch/sparc/lib/GENcopy_from_user.S | 2 +- + arch/sparc/lib/GENcopy_to_user.S | 2 +- + arch/sparc/lib/GENpatch.S | 4 +- + arch/sparc/lib/NG2copy_from_user.S | 2 +- + arch/sparc/lib/NG2copy_to_user.S | 2 +- + arch/sparc/lib/NG2patch.S | 4 +- + arch/sparc/lib/NG4copy_from_user.S | 2 +- + arch/sparc/lib/NG4copy_to_user.S | 2 +- + arch/sparc/lib/NG4patch.S | 4 +- + arch/sparc/lib/NGcopy_from_user.S | 2 +- + arch/sparc/lib/NGcopy_to_user.S | 2 +- + arch/sparc/lib/NGpatch.S | 4 +- + arch/sparc/lib/U1copy_from_user.S | 4 +- + arch/sparc/lib/U1copy_to_user.S | 4 +- + arch/sparc/lib/U3copy_to_user.S | 2 +- + arch/sparc/lib/U3patch.S | 4 +- + arch/sparc/lib/copy_in_user.S | 6 +- + arch/sparc/lib/copy_user.S | 16 +- + arch/tile/include/asm/Kbuild | 1 + + arch/tile/include/asm/uaccess.h | 166 +--- + arch/tile/lib/exports.c | 7 +- + arch/tile/lib/memcpy_32.S | 41 +- + arch/tile/lib/memcpy_user_64.c | 15 +- + arch/um/include/asm/Kbuild | 1 + + arch/um/include/asm/uaccess.h | 13 +- + arch/um/kernel/skas/uaccess.c | 18 +- + arch/unicore32/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/uaccess.h | 15 +- + arch/unicore32/kernel/ksyms.c | 4 +- + arch/unicore32/kernel/process.c | 2 +- + arch/unicore32/lib/copy_from_user.S | 16 +- + arch/unicore32/lib/copy_to_user.S | 6 +- + arch/x86/Kconfig | 1 - + arch/x86/entry/syscalls/syscall_32.tbl | 2 +- + arch/x86/include/asm/uaccess.h | 70 +- + arch/x86/include/asm/uaccess_32.h | 127 +-- + arch/x86/include/asm/uaccess_64.h | 128 +--- + arch/x86/include/asm/unistd.h | 1 - + arch/x86/lib/usercopy.c | 54 +- + arch/x86/lib/usercopy_32.c | 288 +------ + arch/x86/lib/usercopy_64.c | 13 - + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/asm/asm-uaccess.h | 3 - + arch/xtensa/include/asm/uaccess.h | 67 +- + arch/xtensa/lib/usercopy.S | 116 ++- + block/bsg.c | 2 +- + drivers/scsi/esas2r/esas2r_ioctl.c | 25 +- + drivers/scsi/sg.c | 2 +- + fs/compat.c | 1191 ----------------------------- + fs/fcntl.c | 157 ++++ + fs/fhandle.c | 13 + + fs/internal.h | 2 - + fs/namei.c | 104 ++- + fs/namespace.c | 18 +- + fs/nfs/direct.c | 27 +- + fs/ocfs2/cluster/tcp.c | 25 +- + fs/open.c | 29 +- + fs/orangefs/file.c | 3 +- + fs/orangefs/orangefs-bufmap.c | 4 +- + fs/read_write.c | 75 ++ + fs/readdir.c | 165 ++++ + fs/select.c | 421 +++++++++- + fs/splice.c | 20 +- + fs/stat.c | 90 ++- + fs/statfs.c | 140 ++++ + fs/utimes.c | 66 +- + include/asm-generic/extable.h | 26 + + include/asm-generic/uaccess.h | 135 +--- + include/linux/compat.h | 5 - + include/linux/namei.h | 3 + + include/linux/poll.h | 56 -- + include/linux/skbuff.h | 2 +- + include/linux/splice.h | 4 +- + include/linux/uaccess.h | 197 ++++- + include/rdma/ib.h | 2 +- + include/uapi/asm-generic/unistd.h | 3 +- + include/uapi/linux/fcntl.h | 1 + + kernel/relay.c | 1 - + kernel/trace/bpf_trace.c | 2 +- + kernel/trace/trace.c | 2 - + lib/Makefile | 2 +- + lib/iov_iter.c | 6 +- + lib/usercopy.c | 26 + + mm/filemap.c | 15 +- + mm/memory.c | 2 +- + net/9p/client.c | 9 +- + net/9p/protocol.c | 2 +- + net/core/skbuff.c | 1 - + net/rds/recv.c | 4 +- + net/rds/tcp.c | 5 +- + net/rds/tcp_send.c | 8 +- + net/sctp/sm_make_chunk.c | 4 +- + security/Kconfig | 9 - + security/tomoyo/network.c | 2 +- + 212 files changed, 2750 insertions(+), 5686 deletions(-) + create mode 100644 arch/alpha/include/asm/extable.h + create mode 100644 arch/arm64/include/asm/extable.h + create mode 100644 arch/h8300/include/asm/uaccess.h + create mode 100644 arch/ia64/include/asm/extable.h + create mode 100644 arch/powerpc/include/asm/extable.h + delete mode 100644 arch/powerpc/lib/usercopy_64.c + create mode 100644 arch/s390/include/asm/extable.h + delete mode 100644 arch/score/include/asm/extable.h + create mode 100644 arch/sh/include/asm/extable.h + create mode 100644 include/asm-generic/extable.h + create mode 100644 lib/usercopy.c +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up-to-date. +Merging printk/for-next (cf39bf58afda printk: fix double printing with earlycon) +$ git merge printk/for-next +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 81 ++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 56 insertions(+), 25 deletions(-) +Merging pci/next (5b197c00850e Merge branch 'pci/remove' into next) +$ git merge pci/next +Resolved 'include/uapi/linux/Kbuild' using previous resolution. +Auto-merging include/uapi/linux/Kbuild +CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild +Auto-merging drivers/pci/dwc/pcie-hisi.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/Makefile +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Auto-merging arch/arm/mm/nommu.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a114797d0ca8] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-pci | 22 + + Documentation/ABI/testing/sysfs-class-switchtec | 96 ++ + Documentation/PCI/00-INDEX | 10 + + .../PCI/endpoint/function/binding/pci-test.txt | 17 + + Documentation/PCI/endpoint/pci-endpoint-cfs.txt | 105 ++ + Documentation/PCI/endpoint/pci-endpoint.txt | 215 +++ + Documentation/PCI/endpoint/pci-test-function.txt | 66 + + Documentation/PCI/endpoint/pci-test-howto.txt | 179 +++ + Documentation/PCI/pci-iov-howto.txt | 12 + + .../devicetree/bindings/pci/designware-pcie.txt | 26 +- + .../devicetree/bindings/pci/faraday,ftpci100.txt | 129 ++ + .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 14 +- + Documentation/devicetree/bindings/pci/ti-pci.txt | 42 +- + Documentation/driver-model/devres.txt | 6 +- + Documentation/filesystems/sysfs-pci.txt | 15 +- + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/misc-devices/pci-endpoint-test.txt | 35 + + Documentation/switchtec.txt | 80 + + MAINTAINERS | 20 + + arch/arm/include/asm/io.h | 10 + + arch/arm/include/asm/pci.h | 3 +- + arch/arm/kernel/bios32.c | 19 - + arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +- + arch/arm/mm/ioremap.c | 7 + + arch/arm/mm/nommu.c | 12 + + arch/arm64/include/asm/io.h | 10 + + arch/arm64/include/asm/pci.h | 2 + + arch/cris/arch-v32/drivers/pci/bios.c | 22 - + arch/cris/include/asm/pci.h | 4 +- + arch/ia64/include/asm/pci.h | 5 +- + arch/ia64/pci/pci.c | 46 - + arch/microblaze/include/asm/pci.h | 6 +- + arch/microblaze/pci/pci-common.c | 2 +- + arch/mips/include/asm/pci.h | 5 +- + arch/mips/pci/pci.c | 24 - + arch/mn10300/include/asm/pci.h | 4 +- + arch/mn10300/unit-asb2305/pci-asb2305.c | 23 - + arch/parisc/include/asm/pci.h | 4 +- + arch/parisc/kernel/pci.c | 28 - + arch/powerpc/include/asm/machdep.h | 2 + + arch/powerpc/include/asm/pci.h | 9 +- + arch/powerpc/kernel/pci-common.c | 11 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 7 + + arch/sh/drivers/pci/pci.c | 21 - + arch/sh/include/asm/pci.h | 4 +- + arch/sparc/include/asm/pci_64.h | 5 +- + arch/sparc/kernel/pci.c | 6 +- + arch/unicore32/include/asm/pci.h | 3 +- + arch/unicore32/kernel/pci.c | 23 - + arch/x86/include/asm/pci.h | 7 +- + arch/x86/pci/i386.c | 47 - + arch/xtensa/include/asm/pci.h | 7 +- + arch/xtensa/kernel/pci.c | 24 +- + drivers/Makefile | 2 + + drivers/acpi/pci_mcfg.c | 14 +- + drivers/misc/Kconfig | 7 + + drivers/misc/Makefile | 1 + + drivers/misc/pci_endpoint_test.c | 534 +++++++ + drivers/nvme/host/pci.c | 30 +- + drivers/of/of_pci.c | 45 - + drivers/pci/Kconfig | 2 + + drivers/pci/Makefile | 3 +- + drivers/pci/access.c | 61 +- + drivers/pci/dwc/Kconfig | 36 +- + drivers/pci/dwc/Makefile | 5 +- + drivers/pci/dwc/pci-dra7xx.c | 293 +++- + drivers/pci/dwc/pci-exynos.c | 14 +- + drivers/pci/dwc/pci-imx6.c | 199 ++- + drivers/pci/dwc/pci-keystone-dw.c | 2 +- + drivers/pci/dwc/pci-layerscape.c | 3 +- + drivers/pci/dwc/pcie-armada8k.c | 3 +- + drivers/pci/dwc/pcie-artpec6.c | 12 +- + drivers/pci/dwc/pcie-designware-ep.c | 342 +++++ + drivers/pci/dwc/pcie-designware-host.c | 39 +- + drivers/pci/dwc/pcie-designware-plat.c | 1 + + drivers/pci/dwc/pcie-designware.c | 258 +++- + drivers/pci/dwc/pcie-designware.h | 135 +- + drivers/pci/dwc/pcie-hisi.c | 9 +- + drivers/pci/dwc/pcie-qcom.c | 2 +- + drivers/pci/dwc/pcie-spear13xx.c | 3 +- + drivers/pci/ecam.c | 6 +- + drivers/pci/endpoint/Kconfig | 31 + + drivers/pci/endpoint/Makefile | 7 + + drivers/pci/endpoint/functions/Kconfig | 12 + + drivers/pci/endpoint/functions/Makefile | 5 + + drivers/pci/endpoint/functions/pci-epf-test.c | 510 +++++++ + drivers/pci/endpoint/pci-ep-cfs.c | 509 +++++++ + drivers/pci/endpoint/pci-epc-core.c | 580 +++++++ + drivers/pci/endpoint/pci-epc-mem.c | 143 ++ + drivers/pci/endpoint/pci-epf-core.c | 359 +++++ + drivers/pci/host/Kconfig | 10 +- + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-aardvark.c | 173 +-- + drivers/pci/host/pci-ftpci100.c | 563 +++++++ + drivers/pci/host/pci-host-generic.c | 1 + + drivers/pci/host/pci-hyperv.c | 46 +- + drivers/pci/host/pci-mvebu.c | 22 +- + drivers/pci/host/pci-tegra.c | 4 +- + drivers/pci/host/pci-thunder-ecam.c | 1 + + drivers/pci/host/pci-thunder-pem.c | 1 + + drivers/pci/host/pci-versatile.c | 4 +- + drivers/pci/host/pci-xgene.c | 5 +- + drivers/pci/host/pcie-iproc-platform.c | 3 +- + drivers/pci/host/pcie-rockchip.c | 91 +- + drivers/pci/host/pcie-xilinx-nwl.c | 2 +- + drivers/pci/host/pcie-xilinx.c | 2 +- + drivers/pci/hotplug/pciehp_pci.c | 6 + + drivers/pci/iov.c | 1 + + drivers/pci/irq.c | 61 +- + drivers/pci/mmap.c | 99 ++ + drivers/pci/msi.c | 17 +- + drivers/pci/pci-driver.c | 24 +- + drivers/pci/pci-sysfs.c | 104 +- + drivers/pci/pci.c | 252 ++- + drivers/pci/pci.h | 19 +- + drivers/pci/pcie/pcie-dpc.c | 5 + + drivers/pci/probe.c | 4 +- + drivers/pci/proc.c | 41 +- + drivers/pci/quirks.c | 58 +- + drivers/pci/search.c | 4 + + drivers/pci/setup-bus.c | 4 +- + drivers/pci/setup-res.c | 2 +- + drivers/pci/switch/Kconfig | 13 + + drivers/pci/switch/Makefile | 1 + + drivers/pci/switch/switchtec.c | 1600 ++++++++++++++++++++ + include/linux/interrupt.h | 2 +- + include/linux/io.h | 40 + + include/linux/mfd/syscon/imx7-iomuxc-gpr.h | 4 + + include/linux/mod_devicetable.h | 10 + + include/linux/of_pci.h | 11 - + include/linux/pci-ecam.h | 3 +- + include/linux/pci-ep-cfs.h | 41 + + include/linux/pci-epc.h | 144 ++ + include/linux/pci-epf.h | 162 ++ + include/linux/pci.h | 84 +- + include/linux/pci_ids.h | 2 + + include/uapi/linux/pci_regs.h | 2 +- + include/uapi/linux/pcitest.h | 19 + + include/uapi/linux/switchtec_ioctl.h | 132 ++ + kernel/irq/manage.c | 15 +- + lib/devres.c | 6 +- + tools/pci/pcitest.c | 186 +++ + tools/pci/pcitest.sh | 56 + + 143 files changed, 8927 insertions(+), 957 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-switchtec + create mode 100644 Documentation/PCI/endpoint/function/binding/pci-test.txt + create mode 100644 Documentation/PCI/endpoint/pci-endpoint-cfs.txt + create mode 100644 Documentation/PCI/endpoint/pci-endpoint.txt + create mode 100644 Documentation/PCI/endpoint/pci-test-function.txt + create mode 100644 Documentation/PCI/endpoint/pci-test-howto.txt + create mode 100644 Documentation/devicetree/bindings/pci/faraday,ftpci100.txt + create mode 100644 Documentation/misc-devices/pci-endpoint-test.txt + create mode 100644 Documentation/switchtec.txt + create mode 100644 drivers/misc/pci_endpoint_test.c + create mode 100644 drivers/pci/dwc/pcie-designware-ep.c + create mode 100644 drivers/pci/endpoint/Kconfig + create mode 100644 drivers/pci/endpoint/Makefile + create mode 100644 drivers/pci/endpoint/functions/Kconfig + create mode 100644 drivers/pci/endpoint/functions/Makefile + create mode 100644 drivers/pci/endpoint/functions/pci-epf-test.c + create mode 100644 drivers/pci/endpoint/pci-ep-cfs.c + create mode 100644 drivers/pci/endpoint/pci-epc-core.c + create mode 100644 drivers/pci/endpoint/pci-epc-mem.c + create mode 100644 drivers/pci/endpoint/pci-epf-core.c + create mode 100644 drivers/pci/host/pci-ftpci100.c + create mode 100644 drivers/pci/mmap.c + create mode 100644 drivers/pci/switch/Kconfig + create mode 100644 drivers/pci/switch/Makefile + create mode 100644 drivers/pci/switch/switchtec.c + create mode 100644 include/linux/pci-ep-cfs.h + create mode 100644 include/linux/pci-epc.h + create mode 100644 include/linux/pci-epf.h + create mode 100644 include/uapi/linux/pcitest.h + create mode 100644 include/uapi/linux/switchtec_ioctl.h + create mode 100644 tools/pci/pcitest.c + create mode 100644 tools/pci/pcitest.sh +Merging pstore/for-next/pstore (eec50d76a6ee pstore: Drop needless inode lock during population) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/nvram_64.c | 88 +++++------- + drivers/acpi/apei/erst.c | 64 ++++----- + drivers/firmware/efi/efi-pstore.c | 148 ++++++++----------- + fs/pstore/ftrace.c | 11 +- + fs/pstore/inode.c | 122 ++++++++-------- + fs/pstore/internal.h | 5 +- + fs/pstore/platform.c | 289 ++++++++++++++++++++++---------------- + fs/pstore/pmsg.c | 11 +- + fs/pstore/ram.c | 130 ++++++++--------- + fs/pstore/ram_core.c | 2 +- + include/linux/pstore.h | 156 ++++++++++++++++---- + 11 files changed, 573 insertions(+), 453 deletions(-) +Merging hid/for-next (b9ae71373285 Merge branch 'for-4.11/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/input/event-codes.txt | 5 +- + drivers/hid/Kconfig | 11 +- + drivers/hid/hid-asus.c | 248 +++- + drivers/hid/hid-core.c | 6 +- + drivers/hid/hid-debug.c | 2 + + drivers/hid/hid-ids.h | 6 +- + drivers/hid/hid-logitech-dj.c | 19 +- + drivers/hid/hid-logitech-hidpp.c | 846 +++++++++++- + drivers/hid/hid-sony.c | 1674 ++++++++++++----------- + drivers/hid/usbhid/hid-core.c | 34 +- + drivers/hid/usbhid/hid-quirks.c | 11 +- + drivers/hid/wacom.h | 5 + + drivers/hid/wacom_sys.c | 53 +- + drivers/hid/wacom_wac.c | 306 +++-- + drivers/hid/wacom_wac.h | 10 + + include/linux/hid.h | 2 + + include/uapi/linux/input-event-codes.h | 1 + + include/uapi/linux/input.h | 11 +- + 19 files changed, 2222 insertions(+), 1031 deletions(-) +Merging i2c/i2c/for-next (f49ee0593cde Merge branch 'i2c/for-4.12' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-meson.txt | 2 + + .../devicetree/bindings/i2c/i2c-mux-ltc4306.txt | 61 ++++ + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 1 + + MAINTAINERS | 8 + + arch/x86/include/asm/iosf_mbi.h | 87 ++++++ + arch/x86/platform/intel/iosf_mbi.c | 49 ++++ + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/i915_drv.c | 6 +- + drivers/gpu/drm/i915/i915_drv.h | 7 +- + drivers/gpu/drm/i915/intel_uncore.c | 53 +++- + drivers/i2c/busses/Kconfig | 3 +- + drivers/i2c/busses/i2c-designware-baytrail.c | 87 ++++-- + drivers/i2c/busses/i2c-designware-core.c | 25 +- + drivers/i2c/busses/i2c-designware-core.h | 17 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 26 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 64 ++-- + drivers/i2c/busses/i2c-exynos5.c | 116 ++------ + drivers/i2c/busses/i2c-img-scb.c | 5 +- + drivers/i2c/busses/i2c-meson.c | 134 ++++----- + drivers/i2c/busses/i2c-mv64xxx.c | 15 +- + drivers/i2c/busses/i2c-rcar.c | 8 +- + drivers/i2c/busses/i2c-scmi.c | 4 + + drivers/i2c/busses/i2c-tegra-bpmp.c | 2 +- + drivers/i2c/busses/i2c-thunderx-pcidrv.c | 25 +- + drivers/i2c/busses/i2c-xlp9xx.c | 1 + + drivers/i2c/i2c-core.c | 62 +++- + drivers/i2c/i2c-mux.c | 9 +- + drivers/i2c/muxes/Kconfig | 11 + + drivers/i2c/muxes/Makefile | 1 + + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 4 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 4 +- + drivers/i2c/muxes/i2c-mux-ltc4306.c | 322 +++++++++++++++++++++ + drivers/i2c/muxes/i2c-mux-pca9541.c | 4 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 19 +- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 4 +- + drivers/i2c/muxes/i2c-mux-reg.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 15 +- + include/linux/i2c.h | 10 + + 38 files changed, 962 insertions(+), 314 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt + create mode 100644 drivers/i2c/muxes/i2c-mux-ltc4306.c +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (39c382a31094 hwmon: (tmp103) Use SIMPLE_DEV_PM_OPS helper macro) +$ git merge hwmon-staging/hwmon-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ads7828.txt | 25 + + .../devicetree/bindings/hwmon/aspeed-pwm-tacho.txt | 68 ++ + Documentation/devicetree/bindings/hwmon/lm87.txt | 30 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/hwmon/aspeed-pwm-tacho | 22 + + Documentation/hwmon/tc654 | 2 +- + drivers/hwmon/Kconfig | 9 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/ad7414.c | 7 + + drivers/hwmon/adc128d818.c | 7 + + drivers/hwmon/ads1015.c | 22 +- + drivers/hwmon/ads7828.c | 39 +- + drivers/hwmon/adt7475.c | 44 +- + drivers/hwmon/aspeed-pwm-tacho.c | 835 +++++++++++++++++++++ + drivers/hwmon/dell-smm-hwmon.c | 7 + + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/ina209.c | 11 +- + drivers/hwmon/ina2xx.c | 35 +- + drivers/hwmon/lm63.c | 23 + + drivers/hwmon/lm75.c | 98 ++- + drivers/hwmon/lm85.c | 56 +- + drivers/hwmon/lm87.c | 37 +- + drivers/hwmon/lm90.c | 100 ++- + drivers/hwmon/lm95245.c | 8 + + drivers/hwmon/max6697.c | 52 +- + drivers/hwmon/pmbus/adm1275.c | 4 +- + drivers/hwmon/pmbus/ucd9000.c | 39 +- + drivers/hwmon/pmbus/ucd9200.c | 48 +- + drivers/hwmon/stts751.c | 7 + + drivers/hwmon/tmp102.c | 7 + + drivers/hwmon/tmp103.c | 24 +- + drivers/hwmon/tmp421.c | 35 +- + drivers/hwmon/w83627ehf.c | 35 +- + include/linux/hwmon.h | 2 +- + 34 files changed, 1693 insertions(+), 49 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/ads7828.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/lm87.txt + create mode 100644 Documentation/hwmon/aspeed-pwm-tacho + create mode 100644 drivers/hwmon/aspeed-pwm-tacho.c +Merging jc_docs/docs-next (6e91b74d56e1 Documentation: allow installing man pages to a user defined directory) +$ git merge jc_docs/docs-next +Auto-merging mm/vmalloc.c +Auto-merging mm/page_alloc.c +Auto-merging mm/filemap.c +Auto-merging lib/Kconfig.debug +Auto-merging drivers/pci/irq.c +Auto-merging block/genhd.c +Auto-merging Makefile +Auto-merging Documentation/userspace-api/unshare.rst +Removing Documentation/usb/proc_usb_info.txt +Removing Documentation/usb/error-codes.txt +Auto-merging Documentation/translations/ja_JP/howto.rst +Auto-merging Documentation/media/v4l-drivers/philips.rst +Auto-merging Documentation/driver-api/usb/usb.rst +Auto-merging Documentation/driver-api/usb/power-management.rst +Auto-merging Documentation/driver-api/usb/persist.rst +Auto-merging Documentation/driver-api/usb/hotplug.rst +Auto-merging Documentation/driver-api/usb/dma.rst +Auto-merging Documentation/driver-api/usb/callbacks.rst +Auto-merging Documentation/driver-api/usb/bulk-streams.rst +Auto-merging Documentation/driver-api/usb/anchors.rst +Auto-merging Documentation/driver-api/usb/URB.rst +Removing Documentation/cpu-freq/user-guide.txt +Removing Documentation/cpu-freq/governors.txt +Removing Documentation/cpu-freq/boost.txt +Removing Documentation/DocBook/writing_usb_driver.tmpl +Removing Documentation/DocBook/writing_musb_glue_layer.tmpl +Removing Documentation/DocBook/kernel-api.tmpl +Removing Documentation/DocBook/genericirq.tmpl +Removing Documentation/DocBook/gadget.tmpl +Auto-merging Documentation/ABI/testing/sysfs-bus-pci +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-bus-usb | 2 +- + Documentation/ABI/stable/vdso | 3 +- + Documentation/ABI/testing/sysfs-bus-pci | 2 +- + Documentation/DocBook/Makefile | 22 +- + Documentation/DocBook/gadget.tmpl | 793 ------------------- + Documentation/DocBook/genericirq.tmpl | 520 ------------ + Documentation/DocBook/kernel-api.tmpl | 331 -------- + Documentation/DocBook/writing_musb_glue_layer.tmpl | 873 --------------------- + Documentation/DocBook/writing_usb_driver.tmpl | 412 ---------- + Documentation/PCI/pci-error-recovery.txt | 12 +- + Documentation/acpi/aml-debugger.txt | 2 +- + Documentation/acpi/enumeration.txt | 6 +- + Documentation/acpi/linuxized-acpica.txt | 6 +- + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.rst | 4 +- + Documentation/admin-guide/pm/cpufreq.rst | 700 +++++++++++++++++ + Documentation/admin-guide/pm/index.rst | 15 + + Documentation/admin-guide/ras.rst | 12 +- + Documentation/admin-guide/security-bugs.rst | 39 +- + Documentation/admin-guide/sysrq.rst | 3 +- + Documentation/arm/mem_alignment | 2 +- + Documentation/conf.py | 6 +- + Documentation/core-api/flexible-arrays.rst | 130 +++ + Documentation/core-api/genericirq.rst | 440 +++++++++++ + Documentation/core-api/index.rst | 3 + + Documentation/core-api/kernel-api.rst | 346 ++++++++ + Documentation/cpu-freq/boost.txt | 93 --- + Documentation/cpu-freq/cpu-drivers.txt | 2 +- + Documentation/cpu-freq/governors.txt | 301 ------- + Documentation/cpu-freq/index.txt | 7 - + Documentation/cpu-freq/user-guide.txt | 228 ------ + Documentation/device-mapper/cache.txt | 2 +- + Documentation/doc-guide/hello.dot | 3 + + Documentation/doc-guide/sphinx.rst | 115 ++- + Documentation/doc-guide/svg_image.svg | 10 + + Documentation/driver-api/basics.rst | 6 + + Documentation/driver-api/firmware/index.rst | 1 + + .../driver-api/firmware/other_interfaces.rst | 15 + + Documentation/driver-api/index.rst | 4 +- + Documentation/driver-api/misc_devices.rst | 5 + + Documentation/driver-api/pci.rst | 50 ++ + .../{usb/URB.txt => driver-api/usb/URB.rst} | 223 +++--- + .../anchors.txt => driver-api/usb/anchors.rst} | 36 +- + .../usb/bulk-streams.rst} | 13 +- + .../callbacks.txt => driver-api/usb/callbacks.rst} | 65 +- + .../{usb/dma.txt => driver-api/usb/dma.rst} | 51 +- + Documentation/driver-api/usb/error-codes.rst | 207 +++++ + Documentation/driver-api/usb/gadget.rst | 510 ++++++++++++ + .../hotplug.txt => driver-api/usb/hotplug.rst} | 68 +- + Documentation/driver-api/usb/index.rst | 26 + + .../persist.txt => driver-api/usb/persist.rst} | 22 +- + .../usb/power-management.rst} | 404 +++++----- + Documentation/driver-api/{ => usb}/usb.rst | 827 ++++++++++++------- + .../driver-api/usb/writing_musb_glue_layer.rst | 723 +++++++++++++++++ + .../driver-api/usb/writing_usb_driver.rst | 326 ++++++++ + Documentation/early-userspace/README | 2 +- + Documentation/filesystems/ext4.txt | 2 +- + Documentation/filesystems/nfs/nfs-rdma.txt | 4 +- + Documentation/hid/hidraw.txt | 2 +- + Documentation/index.rst | 20 + + Documentation/input/ff.txt | 6 +- + Documentation/input/input-programming.txt | 4 +- + Documentation/leds/leds-lp55xx.txt | 2 +- + Documentation/md/md-cluster.txt | 2 +- + Documentation/media/Makefile | 47 +- + Documentation/media/intro.rst | 6 +- + Documentation/media/uapi/dvb/intro.rst | 6 +- + Documentation/media/uapi/v4l/crop.rst | 4 +- + Documentation/media/uapi/v4l/dev-raw-vbi.rst | 22 +- + Documentation/media/uapi/v4l/dev-subdev.rst | 22 +- + Documentation/media/uapi/v4l/field-order.rst | 11 +- + Documentation/media/uapi/v4l/pixfmt-nv12mt.rst | 8 +- + Documentation/media/uapi/v4l/selection-api-003.rst | 6 +- + Documentation/media/uapi/v4l/subdev-formats.rst | 4 +- + Documentation/media/v4l-drivers/index.rst | 1 + + .../media/v4l-drivers/philips.rst | 21 +- + Documentation/media/v4l-drivers/zr364xx.rst | 2 +- + Documentation/mmc/mmc-dev-attrs.txt | 4 +- + Documentation/networking/cdc_mbim.txt | 2 +- + Documentation/networking/e100.txt | 2 +- + Documentation/networking/e1000.txt | 2 +- + Documentation/networking/e1000e.txt | 2 +- + Documentation/networking/igb.txt | 2 +- + Documentation/networking/igbvf.txt | 2 +- + Documentation/networking/ixgb.txt | 2 +- + Documentation/networking/ixgbe.txt | 2 +- + Documentation/phy.txt | 2 +- + Documentation/power/swsusp.txt | 2 +- + Documentation/process/4.Coding.rst | 17 +- + Documentation/process/applying-patches.rst | 12 +- + Documentation/process/changes.rst | 17 +- + Documentation/sphinx/cdomain.py | 2 +- + Documentation/sphinx/kfigure.py | 551 +++++++++++++ + Documentation/sphinx/tmplcvt | 13 +- + Documentation/sync_file.txt | 2 +- + Documentation/thermal/intel_powerclamp.txt | 20 +- + .../translations/ja_JP/{HOWTO => howto.rst} | 596 +++++++------- + Documentation/translations/ja_JP/index.rst | 12 + + Documentation/translations/zh_CN/sparse.txt | 4 +- + Documentation/usb/acm.txt | 2 +- + Documentation/usb/error-codes.txt | 175 ----- + Documentation/usb/gadget_serial.txt | 4 +- + Documentation/usb/proc_usb_info.txt | 390 --------- + Documentation/userspace-api/conf.py | 10 + + Documentation/userspace-api/index.rst | 26 + + .../{unshare.txt => userspace-api/unshare.rst} | 195 +++-- + Documentation/vfio-mediated-device.txt | 2 +- + Makefile | 4 +- + block/genhd.c | 7 +- + drivers/pci/irq.c | 2 +- + drivers/staging/most/hdm-usb/hdm_usb.c | 2 +- + drivers/usb/core/Kconfig | 2 +- + drivers/usb/core/message.c | 1 + + include/linux/clk.h | 4 +- + include/linux/flex_array.h | 67 ++ + include/linux/usb/composite.h | 6 +- + include/linux/usb/gadget.h | 2 +- + ipc/util.c | 12 +- + lib/Kconfig.debug | 9 +- + lib/bitmap.c | 28 +- + lib/string.c | 2 +- + lib/vsprintf.c | 6 +- + mm/filemap.c | 18 +- + mm/page_alloc.c | 3 +- + mm/vmalloc.c | 2 +- + scripts/kernel-doc | 19 +- + security/security.c | 12 +- + 127 files changed, 6104 insertions(+), 5410 deletions(-) + delete mode 100644 Documentation/DocBook/gadget.tmpl + delete mode 100644 Documentation/DocBook/genericirq.tmpl + delete mode 100644 Documentation/DocBook/kernel-api.tmpl + delete mode 100644 Documentation/DocBook/writing_musb_glue_layer.tmpl + delete mode 100644 Documentation/DocBook/writing_usb_driver.tmpl + create mode 100644 Documentation/admin-guide/pm/cpufreq.rst + create mode 100644 Documentation/admin-guide/pm/index.rst + create mode 100644 Documentation/core-api/flexible-arrays.rst + create mode 100644 Documentation/core-api/genericirq.rst + create mode 100644 Documentation/core-api/kernel-api.rst + delete mode 100644 Documentation/cpu-freq/boost.txt + delete mode 100644 Documentation/cpu-freq/governors.txt + delete mode 100644 Documentation/cpu-freq/user-guide.txt + create mode 100644 Documentation/doc-guide/hello.dot + create mode 100644 Documentation/doc-guide/svg_image.svg + create mode 100644 Documentation/driver-api/firmware/other_interfaces.rst + create mode 100644 Documentation/driver-api/misc_devices.rst + create mode 100644 Documentation/driver-api/pci.rst + rename Documentation/{usb/URB.txt => driver-api/usb/URB.rst} (50%) + rename Documentation/{usb/anchors.txt => driver-api/usb/anchors.rst} (75%) + rename Documentation/{usb/bulk-streams.txt => driver-api/usb/bulk-streams.rst} (94%) + rename Documentation/{usb/callbacks.txt => driver-api/usb/callbacks.rst} (76%) + rename Documentation/{usb/dma.txt => driver-api/usb/dma.rst} (79%) + create mode 100644 Documentation/driver-api/usb/error-codes.rst + create mode 100644 Documentation/driver-api/usb/gadget.rst + rename Documentation/{usb/hotplug.txt => driver-api/usb/hotplug.rst} (76%) + create mode 100644 Documentation/driver-api/usb/index.rst + rename Documentation/{usb/persist.txt => driver-api/usb/persist.rst} (94%) + rename Documentation/{usb/power-management.txt => driver-api/usb/power-management.rst} (69%) + rename Documentation/driver-api/{ => usb}/usb.rst (50%) + create mode 100644 Documentation/driver-api/usb/writing_musb_glue_layer.rst + create mode 100644 Documentation/driver-api/usb/writing_usb_driver.rst + rename drivers/media/usb/pwc/philips.txt => Documentation/media/v4l-drivers/philips.rst (95%) + create mode 100644 Documentation/sphinx/kfigure.py + rename Documentation/translations/ja_JP/{HOWTO => howto.rst} (53%) + create mode 100644 Documentation/translations/ja_JP/index.rst + delete mode 100644 Documentation/usb/error-codes.txt + delete mode 100644 Documentation/usb/proc_usb_info.txt + create mode 100644 Documentation/userspace-api/conf.py + create mode 100644 Documentation/userspace-api/index.rst + rename Documentation/{unshare.txt => userspace-api/unshare.rst} (67%) +Merging v4l-dvb/master (3622d3e77ece [media] ov2640: print error if devm_*_optional*() fails) +$ git merge v4l-dvb/master +Removing include/media/cec-edid.h +Removing drivers/staging/media/st-cec/TODO +Removing drivers/staging/media/st-cec/Kconfig +Removing drivers/staging/media/s5p-cec/TODO +Removing drivers/staging/media/s5p-cec/Kconfig +Removing drivers/staging/media/lirc/lirc_sir.c +Removing drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/media/usb/cx231xx/cx231xx-i2c.c +Removing drivers/media/rc/keymaps/rc-lirc.c +Auto-merging drivers/media/platform/sti/cec/stih-cec.c +Removing drivers/media/platform/soc_camera/atmel-isi.c +Auto-merging drivers/media/platform/s5p-cec/s5p_cec.h +Auto-merging drivers/media/platform/s5p-cec/s5p_cec.c +Auto-merging drivers/media/i2c/ov2640.c +Auto-merging drivers/media/cec/cec-edid.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging arch/arm/boot/dts/stih407-family.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/media/uapi/v4l/subdev-formats.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/atmel-isi.txt | 91 +- + .../devicetree/bindings/media/i2c/ov2640.txt | 23 +- + .../devicetree/bindings/media/i2c/ov5645.txt | 54 + + .../devicetree/bindings/media/i2c/ov5647.txt | 35 + + .../devicetree/bindings/media/i2c/ov7670.txt | 43 + + .../bindings/media/mediatek-jpeg-decoder.txt | 37 + + .../devicetree/bindings/media/s5p-cec.txt | 2 + + .../devicetree/bindings/media/s5p-mfc.txt | 2 +- + .../devicetree/bindings/media/stih-cec.txt | 2 + + .../devicetree/bindings/media/ti,da850-vpif.txt | 50 +- + Documentation/media/kapi/cec-core.rst | 12 +- + Documentation/media/kapi/csi2.rst | 9 +- + Documentation/media/kapi/v4l2-core.rst | 2 +- + Documentation/media/lirc.h.rst.exceptions | 1 - + Documentation/media/uapi/cec/cec-func-ioctl.rst | 2 +- + Documentation/media/uapi/cec/cec-func-open.rst | 2 +- + Documentation/media/uapi/cec/cec-func-poll.rst | 4 +- + .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 13 + + .../media/uapi/cec/cec-ioc-adap-g-phys-addr.rst | 13 + + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 13 +- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 12 + + Documentation/media/uapi/cec/cec-ioc-receive.rst | 55 +- + Documentation/media/uapi/mediactl/media-types.rst | 3 +- + Documentation/media/uapi/rc/lirc-dev-intro.rst | 53 +- + Documentation/media/uapi/rc/lirc-get-features.rst | 13 +- + Documentation/media/uapi/rc/lirc-get-length.rst | 3 +- + Documentation/media/uapi/rc/lirc-get-rec-mode.rst | 4 +- + Documentation/media/uapi/rc/lirc-get-send-mode.rst | 7 +- + Documentation/media/uapi/rc/lirc-read.rst | 16 +- + .../media/uapi/rc/lirc-set-rec-carrier-range.rst | 2 +- + .../media/uapi/rc/lirc-set-rec-timeout-reports.rst | 2 + + Documentation/media/uapi/rc/lirc-write.rst | 17 +- + Documentation/media/uapi/v4l/buffer.rst | 122 ++ + Documentation/media/uapi/v4l/depth-formats.rst | 1 + + Documentation/media/uapi/v4l/dev-capture.rst | 4 +- + Documentation/media/uapi/v4l/dev-meta.rst | 58 + + Documentation/media/uapi/v4l/dev-output.rst | 4 +- + Documentation/media/uapi/v4l/devices.rst | 1 + + Documentation/media/uapi/v4l/meta-formats.rst | 16 + + Documentation/media/uapi/v4l/pixfmt-007.rst | 13 +- + Documentation/media/uapi/v4l/pixfmt-inzi.rst | 81 ++ + .../media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst | 168 +++ + .../media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst | 120 ++ + Documentation/media/uapi/v4l/pixfmt.rst | 1 + + Documentation/media/uapi/v4l/subdev-formats.rst | 240 ++-- + Documentation/media/uapi/v4l/video.rst | 7 +- + Documentation/media/uapi/v4l/vidioc-enuminput.rst | 11 +- + Documentation/media/uapi/v4l/vidioc-enumoutput.rst | 15 +- + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 16 +- + Documentation/media/uapi/v4l/vidioc-querycap.rst | 3 + + Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 17 +- + Documentation/media/v4l-drivers/vivid.rst | 8 + + Documentation/media/videodev2.h.rst.exceptions | 3 + + MAINTAINERS | 38 +- + arch/arm/boot/dts/stih407-family.dtsi | 12 - + arch/arm/boot/dts/stih410.dtsi | 13 + + arch/arm/mach-davinci/board-da850-evm.c | 1 + + drivers/gpu/drm/exynos/exynos_hdmi.c | 19 +- + drivers/gpu/drm/sti/sti_hdmi.c | 11 + + drivers/gpu/drm/sti/sti_hdmi.h | 3 + + drivers/media/Kconfig | 22 +- + drivers/media/Makefile | 10 +- + drivers/media/cec/Kconfig | 19 + + drivers/media/cec/Makefile | 8 +- + drivers/media/cec/cec-adap.c | 141 +- + drivers/media/cec/cec-api.c | 21 +- + drivers/media/cec/cec-core.c | 40 +- + drivers/media/{ => cec}/cec-edid.c | 6 +- + drivers/media/cec/cec-notifier.c | 130 ++ + drivers/media/common/b2c2/flexcop-fe-tuner.c | 2 +- + drivers/media/common/saa7146/saa7146_vbi.c | 5 +- + drivers/media/common/saa7146/saa7146_video.c | 5 +- + drivers/media/common/tveeprom.c | 4 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 9 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 23 + + drivers/media/dvb-core/dvb_frontend.h | 2 + + drivers/media/dvb-frontends/cxd2841er.c | 4 +- + drivers/media/dvb-frontends/drxk_hard.c | 4 +- + drivers/media/dvb-frontends/mn88472.c | 134 +- + drivers/media/dvb-frontends/mn88472_priv.h | 1 + + drivers/media/dvb-frontends/si2168.c | 4 + + drivers/media/dvb-frontends/si2168_priv.h | 2 + + drivers/media/i2c/Kconfig | 43 +- + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/ad5820.c | 4 +- + drivers/media/i2c/adv7511.c | 6 +- + drivers/media/i2c/adv7604.c | 6 +- + drivers/media/i2c/adv7842.c | 6 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 2 + + drivers/media/i2c/{soc_camera => }/ov2640.c | 291 +++-- + drivers/media/i2c/ov5645.c | 1345 +++++++++++++++++++ + drivers/media/i2c/ov5647.c | 634 +++++++++ + drivers/media/i2c/ov7670.c | 75 +- + drivers/media/i2c/soc_camera/Kconfig | 6 - + drivers/media/i2c/soc_camera/Makefile | 1 - + drivers/media/i2c/soc_camera/imx074.c | 8 +- + drivers/media/i2c/soc_camera/mt9m001.c | 14 +- + drivers/media/i2c/soc_camera/mt9t031.c | 6 +- + drivers/media/i2c/soc_camera/mt9t112.c | 6 +- + drivers/media/i2c/soc_camera/mt9v022.c | 14 +- + drivers/media/i2c/soc_camera/ov5642.c | 17 +- + drivers/media/i2c/soc_camera/ov6650.c | 8 +- + drivers/media/i2c/soc_camera/ov772x.c | 47 +- + drivers/media/i2c/soc_camera/ov9640.c | 30 +- + drivers/media/i2c/soc_camera/ov9740.c | 24 +- + drivers/media/i2c/soc_camera/rj54n1cb0c.c | 6 +- + drivers/media/i2c/soc_camera/tw9910.c | 6 +- + drivers/media/i2c/tc358743.c | 59 +- + drivers/media/i2c/tvp5150.c | 4 +- + drivers/media/media-entity.c | 4 +- + drivers/media/pci/bt8xx/bttv-cards.c | 2 +- + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx18/cx18-streams.c | 4 +- + drivers/media/pci/cx23885/cx23885-cards.c | 3 +- + drivers/media/pci/cx88/cx88-cards.c | 4 +- + drivers/media/pci/cx88/cx88-core.c | 4 +- + drivers/media/pci/cx88/cx88-dvb.c | 2 +- + drivers/media/pci/cx88/cx88.h | 3 +- + drivers/media/pci/dm1105/dm1105.c | 2 +- + drivers/media/pci/ivtv/ivtv-driver.c | 7 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 4 +- + drivers/media/pci/ivtv/ivtv-udma.c | 2 +- + drivers/media/pci/mantis/mantis_vp1034.c | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 5 +- + drivers/media/pci/saa7134/saa7134-cards.c | 2 +- + drivers/media/pci/saa7134/saa7134-dvb.c | 4 +- + drivers/media/pci/saa7134/saa7134-ts.c | 5 +- + drivers/media/pci/saa7134/saa7134-vbi.c | 5 +- + drivers/media/pci/saa7134/saa7134-video.c | 5 +- + drivers/media/pci/saa7164/saa7164-cards.c | 4 +- + drivers/media/pci/saa7164/saa7164-cmd.c | 5 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 5 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 11 + + drivers/media/pci/ttpci/av7110_ir.c | 5 +- + drivers/media/pci/ttpci/budget-av.c | 8 +- + drivers/media/pci/ttpci/budget-ci.c | 2 +- + drivers/media/pci/ttpci/budget.c | 4 +- + drivers/media/pci/tw5864/tw5864-video.c | 11 +- + drivers/media/platform/Kconfig | 48 +- + drivers/media/platform/Makefile | 6 + + drivers/media/platform/atmel/Kconfig | 11 +- + drivers/media/platform/atmel/Makefile | 1 + + drivers/media/platform/atmel/atmel-isc-regs.h | 102 +- + drivers/media/platform/atmel/atmel-isc.c | 628 +++++++-- + drivers/media/platform/atmel/atmel-isi.c | 1368 ++++++++++++++++++++ + .../platform/{soc_camera => atmel}/atmel-isi.h | 0 + drivers/media/platform/coda/coda-bit.c | 100 +- + drivers/media/platform/coda/coda-common.c | 130 +- + drivers/media/platform/coda/coda-h264.c | 87 +- + drivers/media/platform/coda/coda.h | 10 +- + drivers/media/platform/coda/coda_regs.h | 1 + + drivers/media/platform/davinci/vpif_display.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 27 + + drivers/media/platform/fsl-viu.c | 5 +- + drivers/media/platform/m2m-deinterlace.c | 1 + + drivers/media/platform/mtk-jpeg/Makefile | 2 + + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 1292 ++++++++++++++++++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 139 ++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c | 417 ++++++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h | 91 ++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.c | 160 +++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.h | 25 + + drivers/media/platform/mtk-jpeg/mtk_jpeg_reg.h | 58 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 33 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 2 + + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 5 - + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 17 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 26 + + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 2 + + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 4 +- + .../media => media/platform}/s5p-cec/Makefile | 0 + .../platform}/s5p-cec/exynos_hdmi_cec.h | 0 + .../platform}/s5p-cec/exynos_hdmi_cecctrl.c | 0 + .../media => media/platform}/s5p-cec/regs-cec.h | 0 + .../media => media/platform}/s5p-cec/s5p_cec.c | 40 +- + .../media => media/platform}/s5p-cec/s5p_cec.h | 3 + + drivers/media/platform/s5p-g2d/g2d.c | 2 +- + drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 2 +- + drivers/media/platform/s5p-mfc/regs-mfc-v7.h | 2 +- + drivers/media/platform/s5p-mfc/regs-mfc-v8.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 245 ++-- + drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 43 +- + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 72 +- + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h | 1 - + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 8 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 10 +- + drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 51 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 93 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 12 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 48 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 16 +- + drivers/media/platform/sh_vou.c | 4 +- + drivers/media/platform/soc_camera/Kconfig | 12 - + drivers/media/platform/soc_camera/Makefile | 1 - + drivers/media/platform/soc_camera/atmel-isi.c | 1167 ----------------- + .../platform/soc_camera/sh_mobile_ceu_camera.c | 13 +- + drivers/media/platform/soc_camera/soc_camera.c | 103 +- + drivers/media/platform/soc_camera/soc_scale_crop.c | 11 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 5 +- + .../st-cec => media/platform/sti/cec}/Makefile | 0 + .../st-cec => media/platform/sti/cec}/stih-cec.c | 37 +- + drivers/media/platform/sti/delta/delta-mjpeg-dec.c | 2 +- + drivers/media/platform/ti-vpe/vpdma.c | 14 +- + drivers/media/platform/ti-vpe/vpdma.h | 6 +- + drivers/media/platform/ti-vpe/vpe.c | 34 +- + drivers/media/platform/vimc/Kconfig | 14 + + drivers/media/platform/vimc/Makefile | 3 + + drivers/media/platform/vimc/vimc-capture.c | 498 +++++++ + drivers/media/platform/vimc/vimc-capture.h | 28 + + drivers/media/platform/vimc/vimc-core.c | 695 ++++++++++ + drivers/media/platform/vimc/vimc-core.h | 112 ++ + drivers/media/platform/vimc/vimc-sensor.c | 276 ++++ + drivers/media/platform/vimc/vimc-sensor.h | 28 + + drivers/media/platform/vivid/Kconfig | 5 +- + drivers/media/platform/vivid/vivid-cec.c | 4 +- + drivers/media/platform/vivid/vivid-core.c | 32 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 13 +- + drivers/media/platform/vivid/vivid-vid-common.c | 4 +- + drivers/media/platform/vivid/vivid-vid-out.c | 26 +- + drivers/media/platform/vsp1/Makefile | 1 + + drivers/media/platform/vsp1/vsp1.h | 6 + + drivers/media/platform/vsp1/vsp1_bru.c | 27 +- + drivers/media/platform/vsp1/vsp1_dl.c | 27 +- + drivers/media/platform/vsp1/vsp1_drm.c | 42 +- + drivers/media/platform/vsp1/vsp1_drm.h | 2 +- + drivers/media/platform/vsp1/vsp1_drv.c | 82 +- + drivers/media/platform/vsp1/vsp1_entity.c | 163 ++- + drivers/media/platform/vsp1/vsp1_entity.h | 8 +- + drivers/media/platform/vsp1/vsp1_hgo.c | 230 ++++ + drivers/media/platform/vsp1/vsp1_hgo.h | 45 + + drivers/media/platform/vsp1/vsp1_hgt.c | 222 ++++ + drivers/media/platform/vsp1/vsp1_hgt.h | 42 + + drivers/media/platform/vsp1/vsp1_histo.c | 646 +++++++++ + drivers/media/platform/vsp1/vsp1_histo.h | 84 ++ + drivers/media/platform/vsp1/vsp1_hsit.c | 3 +- + drivers/media/platform/vsp1/vsp1_lif.c | 6 +- + drivers/media/platform/vsp1/vsp1_pipe.c | 59 +- + drivers/media/platform/vsp1/vsp1_pipe.h | 9 +- + drivers/media/platform/vsp1/vsp1_regs.h | 33 +- + drivers/media/platform/vsp1/vsp1_rpf.c | 54 +- + drivers/media/platform/vsp1/vsp1_rwpf.c | 11 +- + drivers/media/platform/vsp1/vsp1_rwpf.h | 7 +- + drivers/media/platform/vsp1/vsp1_sru.c | 3 +- + drivers/media/platform/vsp1/vsp1_uds.c | 3 +- + drivers/media/platform/vsp1/vsp1_video.c | 85 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 224 +++- + drivers/media/radio/si4713/si4713.c | 9 + + drivers/media/radio/wl128x/fmdrv_common.c | 5 +- + drivers/media/rc/Kconfig | 9 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/gpio-ir-recv.c | 2 +- + drivers/media/rc/igorplugusb.c | 2 +- + drivers/media/rc/imon.c | 5 +- + drivers/media/rc/ir-lirc-codec.c | 34 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 49 +- + drivers/media/rc/keymaps/Makefile | 1 - + drivers/media/rc/keymaps/rc-dvico-mce.c | 92 +- + drivers/media/rc/keymaps/rc-dvico-portable.c | 74 +- + drivers/media/rc/keymaps/rc-lirc.c | 42 - + drivers/media/rc/lirc_dev.c | 122 +- + drivers/media/rc/mceusb.c | 4 +- + drivers/media/rc/rc-core-priv.h | 2 +- + drivers/media/rc/rc-ir-raw.c | 6 +- + drivers/media/rc/rc-main.c | 8 +- + drivers/media/rc/serial_ir.c | 4 +- + drivers/media/rc/sir_ir.c | 438 +++++++ + drivers/media/rc/st_rc.c | 15 +- + drivers/media/rc/sunxi-cir.c | 21 +- + drivers/media/rc/winbond-cir.c | 4 +- + drivers/media/tuners/si2157.c | 23 +- + drivers/media/tuners/si2157_priv.h | 2 + + drivers/media/tuners/xc5000.c | 3 +- + drivers/media/usb/Kconfig | 1 + + drivers/media/usb/Makefile | 1 + + drivers/media/usb/au0828/au0828-cards.c | 2 +- + drivers/media/usb/au0828/au0828-video.c | 7 - + drivers/media/usb/cx231xx/cx231xx-audio.c | 42 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 48 +- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 16 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 16 +- + drivers/media/usb/dvb-usb/cxusb.c | 163 ++- + drivers/media/usb/dvb-usb/dib0700_core.c | 3 + + drivers/media/usb/dvb-usb/dibusb-mc-common.c | 2 + + drivers/media/usb/dvb-usb/digitv.c | 3 + + drivers/media/usb/dvb-usb/dw2102.c | 54 + + drivers/media/usb/dvb-usb/ttusb2.c | 19 + + drivers/media/usb/em28xx/Kconfig | 7 +- + drivers/media/usb/em28xx/em28xx-camera.c | 107 +- + drivers/media/usb/em28xx/em28xx-cards.c | 15 +- + drivers/media/usb/em28xx/em28xx-reg.h | 18 + + drivers/media/usb/em28xx/em28xx-video.c | 13 +- + drivers/media/usb/em28xx/em28xx.h | 1 - + drivers/media/usb/go7007/go7007-v4l2.c | 5 +- + drivers/media/usb/gspca/konica.c | 3 + + drivers/media/usb/pulse8-cec/Kconfig | 2 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 6 +- + drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 13 +- + drivers/media/usb/rainshadow-cec/Kconfig | 10 + + drivers/media/usb/rainshadow-cec/Makefile | 1 + + drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 388 ++++++ + drivers/media/usb/stk1160/Kconfig | 6 +- + drivers/media/usb/tm6000/tm6000-video.c | 2 +- + drivers/media/usb/usbvision/usbvision-video.c | 9 +- + drivers/media/usb/uvc/uvc_driver.c | 15 + + drivers/media/usb/uvc/uvc_video.c | 12 +- + drivers/media/usb/uvc/uvcvideo.h | 9 + + drivers/media/usb/zr364xx/zr364xx.c | 8 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 24 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 8 +- + drivers/media/v4l2-core/v4l2-dev.c | 16 +- + drivers/media/v4l2-core/v4l2-device.c | 3 + + drivers/media/v4l2-core/v4l2-ioctl.c | 37 + + drivers/media/v4l2-core/videobuf2-core.c | 14 +- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 11 +- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 11 +- + drivers/media/v4l2-core/videobuf2-memops.c | 6 +- + drivers/media/v4l2-core/videobuf2-v4l2.c | 3 + + drivers/media/v4l2-core/videobuf2-vmalloc.c | 11 +- + drivers/staging/media/Kconfig | 4 - + drivers/staging/media/Makefile | 2 - + drivers/staging/media/bcm2048/radio-bcm2048.c | 28 +- + drivers/staging/media/lirc/Kconfig | 12 - + drivers/staging/media/lirc/Makefile | 2 - + drivers/staging/media/lirc/lirc_sasem.c | 899 ------------- + drivers/staging/media/lirc/lirc_sir.c | 839 ------------ + drivers/staging/media/lirc/lirc_zilog.c | 9 +- + drivers/staging/media/omap4iss/iss_csi2.c | 2 +- + drivers/staging/media/omap4iss/iss_ipipe.c | 2 +- + drivers/staging/media/omap4iss/iss_ipipeif.c | 2 +- + drivers/staging/media/omap4iss/iss_resizer.c | 2 +- + drivers/staging/media/omap4iss/iss_video.c | 41 +- + drivers/staging/media/s5p-cec/Kconfig | 9 - + drivers/staging/media/s5p-cec/TODO | 7 - + drivers/staging/media/st-cec/Kconfig | 8 - + drivers/staging/media/st-cec/TODO | 7 - + include/media/cec-edid.h | 104 -- + include/media/cec-notifier.h | 111 ++ + include/media/cec.h | 119 +- + include/media/davinci/vpif_types.h | 1 + + include/media/rc-map.h | 79 +- + include/media/soc_camera.h | 14 +- + include/media/tveeprom.h | 3 +- + include/media/v4l2-ioctl.h | 17 + + include/media/videobuf2-core.h | 12 +- + include/media/videobuf2-memops.h | 3 +- + include/trace/events/v4l2.h | 1 + + include/uapi/linux/cec.h | 2 +- + include/uapi/linux/serio.h | 1 + + include/uapi/linux/videodev2.h | 25 +- + 351 files changed, 15000 insertions(+), 5238 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5645.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov7670.txt + create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt + create mode 100644 Documentation/media/uapi/v4l/dev-meta.rst + create mode 100644 Documentation/media/uapi/v4l/meta-formats.rst + create mode 100644 Documentation/media/uapi/v4l/pixfmt-inzi.rst + create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst + create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst + create mode 100644 drivers/media/cec/Kconfig + rename drivers/media/{ => cec}/cec-edid.c (96%) + create mode 100644 drivers/media/cec/cec-notifier.c + rename drivers/media/i2c/{soc_camera => }/ov2640.c (86%) + create mode 100644 drivers/media/i2c/ov5645.c + create mode 100644 drivers/media/i2c/ov5647.c + create mode 100644 drivers/media/platform/atmel/atmel-isi.c + rename drivers/media/platform/{soc_camera => atmel}/atmel-isi.h (100%) + create mode 100644 drivers/media/platform/mtk-jpeg/Makefile + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.c + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.h + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_reg.h + rename drivers/{staging/media => media/platform}/s5p-cec/Makefile (100%) + rename drivers/{staging/media => media/platform}/s5p-cec/exynos_hdmi_cec.h (100%) + rename drivers/{staging/media => media/platform}/s5p-cec/exynos_hdmi_cecctrl.c (100%) + rename drivers/{staging/media => media/platform}/s5p-cec/regs-cec.h (100%) + rename drivers/{staging/media => media/platform}/s5p-cec/s5p_cec.c (88%) + rename drivers/{staging/media => media/platform}/s5p-cec/s5p_cec.h (97%) + delete mode 100644 drivers/media/platform/soc_camera/atmel-isi.c + rename drivers/{staging/media/st-cec => media/platform/sti/cec}/Makefile (100%) + rename drivers/{staging/media/st-cec => media/platform/sti/cec}/stih-cec.c (92%) + create mode 100644 drivers/media/platform/vimc/Kconfig + create mode 100644 drivers/media/platform/vimc/Makefile + create mode 100644 drivers/media/platform/vimc/vimc-capture.c + create mode 100644 drivers/media/platform/vimc/vimc-capture.h + create mode 100644 drivers/media/platform/vimc/vimc-core.c + create mode 100644 drivers/media/platform/vimc/vimc-core.h + create mode 100644 drivers/media/platform/vimc/vimc-sensor.c + create mode 100644 drivers/media/platform/vimc/vimc-sensor.h + create mode 100644 drivers/media/platform/vsp1/vsp1_hgo.c + create mode 100644 drivers/media/platform/vsp1/vsp1_hgo.h + create mode 100644 drivers/media/platform/vsp1/vsp1_hgt.c + create mode 100644 drivers/media/platform/vsp1/vsp1_hgt.h + create mode 100644 drivers/media/platform/vsp1/vsp1_histo.c + create mode 100644 drivers/media/platform/vsp1/vsp1_histo.h + delete mode 100644 drivers/media/rc/keymaps/rc-lirc.c + create mode 100644 drivers/media/rc/sir_ir.c + create mode 100644 drivers/media/usb/rainshadow-cec/Kconfig + create mode 100644 drivers/media/usb/rainshadow-cec/Makefile + create mode 100644 drivers/media/usb/rainshadow-cec/rainshadow-cec.c + delete mode 100644 drivers/staging/media/lirc/lirc_sasem.c + delete mode 100644 drivers/staging/media/lirc/lirc_sir.c + delete mode 100644 drivers/staging/media/s5p-cec/Kconfig + delete mode 100644 drivers/staging/media/s5p-cec/TODO + delete mode 100644 drivers/staging/media/st-cec/Kconfig + delete mode 100644 drivers/staging/media/st-cec/TODO + delete mode 100644 include/media/cec-edid.h + create mode 100644 include/media/cec-notifier.h +Merging v4l-dvb-next/master (6d95b3f24881 Merge branch 'TTT' into to_next) +$ git merge v4l-dvb-next/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fbdev/fbdev-for-next (3bbb5b823416 video: console: Remove reference to CONFIG_8xx) +$ git merge fbdev/fbdev-for-next +Auto-merging drivers/video/fbdev/xen-fbfront.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/imx/fsl,imx-fb.txt | 2 ++ + drivers/video/console/Kconfig | 2 +- + drivers/video/fbdev/acornfb.c | 12 +++++------- + drivers/video/fbdev/amba-clcd.c | 4 ++-- + drivers/video/fbdev/aty/radeon_base.c | 4 ++-- + drivers/video/fbdev/core/fbmon.c | 4 ++-- + drivers/video/fbdev/i810/i810_main.c | 6 +++--- + drivers/video/fbdev/imxfb.c | 17 +++++++++++++++++ + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 16 +++++++++++----- + drivers/video/fbdev/pmag-aa-fb.c | 4 ++-- + drivers/video/fbdev/pmag-ba-fb.c | 4 ++-- + drivers/video/fbdev/pmagb-b-fb.c | 4 ++-- + drivers/video/fbdev/pxafb.c | 7 +++---- + drivers/video/fbdev/xen-fbfront.c | 10 ++++++++++ + drivers/video/logo/logo.c | 2 +- + include/linux/platform_data/video-imxfb.h | 1 + + 16 files changed, 66 insertions(+), 33 deletions(-) +Merging pm/linux-next (6fdf90d2069d Merge branches 'acpi-power', 'acpi-blacklist', 'acpi-video' and 'acpi-doc' into linux-next) +$ git merge pm/linux-next +Auto-merging tools/power/pm-graph/analyze_suspend.py +Auto-merging include/linux/pm_domain.h +Auto-merging include/linux/of.h +Removing drivers/thermal/db8500_cpufreq_cooling.c +Auto-merging drivers/base/power/domain.c +Auto-merging MAINTAINERS +Auto-merging Documentation/acpi/linuxized-acpica.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/obsolete/sysfs-firmware-acpi | 8 + + Documentation/ABI/testing/sysfs-firmware-acpi | 10 - + Documentation/acpi/dsd/graph.txt | 162 ++++ + Documentation/acpi/linuxized-acpica.txt | 4 +- + .../devicetree/bindings/power/power_domain.txt | 4 +- + .../bindings/power/rockchip-io-domain.txt | 1 + + Documentation/power/runtime_pm.txt | 19 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 5 - + drivers/acpi/Kconfig | 8 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/ac.c | 20 + + drivers/acpi/acpi_platform.c | 5 +- + drivers/acpi/acpi_processor.c | 5 - + drivers/acpi/acpi_video.c | 157 ++-- + drivers/acpi/acpica/Makefile | 2 +- + drivers/acpi/battery.c | 22 +- + drivers/acpi/blacklist.c | 8 + + drivers/acpi/cppc_acpi.c | 80 +- + drivers/acpi/internal.h | 2 - + drivers/acpi/pmic/intel_pmic_chtwc.c | 280 +++++++ + drivers/acpi/pmic/intel_pmic_xpower.c | 21 +- + drivers/acpi/property.c | 259 +++++- + drivers/acpi/scan.c | 24 +- + drivers/acpi/sysfs.c | 9 +- + drivers/acpi/tables.c | 16 - + drivers/acpi/utils.c | 66 ++ + drivers/base/power/domain.c | 68 +- + drivers/base/property.c | 364 ++++++-- + drivers/cpufreq/Kconfig.arm | 6 + + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/dbx500-cpufreq.c | 20 + + drivers/cpufreq/imx6q-cpufreq.c | 17 +- + drivers/cpufreq/intel_pstate.c | 910 +++++++++----------- + drivers/cpufreq/mt8173-cpufreq.c | 23 +- + drivers/cpufreq/qoriq-cpufreq.c | 24 +- + drivers/cpufreq/tegra186-cpufreq.c | 275 +++++++ + drivers/cpuidle/cpuidle-cps.c | 3 +- + drivers/cpuidle/cpuidle-powernv.c | 69 +- + drivers/devfreq/governor.h | 29 + + drivers/power/avs/rockchip-io-domain.c | 41 + + drivers/power/supply/axp288_charger.c | 28 +- + drivers/thermal/Kconfig | 12 - + drivers/thermal/Makefile | 1 - + drivers/thermal/db8500_cpufreq_cooling.c | 105 --- + include/acpi/acpi_bus.h | 2 + + include/acpi/cppc_acpi.h | 3 +- + include/linux/acpi.h | 47 +- + include/linux/cpufreq.h | 7 + + include/linux/devfreq.h | 30 +- + include/linux/fwnode.h | 12 + + include/linux/of.h | 4 + + include/linux/pm_domain.h | 1 + + include/linux/property.h | 26 + + include/linux/tick.h | 1 + + kernel/sched/cpufreq_schedutil.c | 82 +- + kernel/time/tick-sched.c | 12 + + tools/power/pm-graph/Makefile | 28 + + tools/power/pm-graph/analyze_boot.py | 824 ++++++++++++++++++ + .../power/pm-graph}/analyze_suspend.py | 916 +++++++++++---------- + tools/power/pm-graph/bootgraph.8 | 132 +++ + tools/power/pm-graph/sleepgraph.8 | 243 ++++++ + .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 17 + + 63 files changed, 4150 insertions(+), 1432 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-firmware-acpi + create mode 100644 Documentation/acpi/dsd/graph.txt + create mode 100644 drivers/acpi/pmic/intel_pmic_chtwc.c + create mode 100644 drivers/cpufreq/tegra186-cpufreq.c + delete mode 100644 drivers/thermal/db8500_cpufreq_cooling.c + create mode 100644 tools/power/pm-graph/Makefile + create mode 100755 tools/power/pm-graph/analyze_boot.py + rename {scripts => tools/power/pm-graph}/analyze_suspend.py (91%) + create mode 100644 tools/power/pm-graph/bootgraph.8 + create mode 100644 tools/power/pm-graph/sleepgraph.8 +Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) +$ git merge idle/next +Merge made by the 'recursive' strategy. +Merging thermal/next (f7b553c688c3 Merge branches 'for-rc' and 'thermal-core' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/devfreq_cooling.c | 123 ++++++++++++++++++++++++++------------ + include/linux/devfreq_cooling.h | 17 ++++++ + include/trace/events/thermal.h | 11 ++-- + 3 files changed, 110 insertions(+), 41 deletions(-) +Merging thermal-soc/next (19fd1783c24e Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Resolved 'drivers/thermal/Kconfig' using previous resolution. +Resolved 'drivers/thermal/Makefile' using previous resolution. +Auto-merging drivers/thermal/Makefile +CONFLICT (content): Merge conflict in drivers/thermal/Makefile +Auto-merging drivers/thermal/Kconfig +CONFLICT (content): Merge conflict in drivers/thermal/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 338828c86170] Merge remote-tracking branch 'thermal-soc/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/thermal/brcm,bcm2835-thermal.txt | 32 ++- + .../devicetree/bindings/thermal/brcm,ns-thermal | 37 +++ + .../devicetree/bindings/thermal/da9062-thermal.txt | 36 +++ + drivers/thermal/Kconfig | 15 + + drivers/thermal/Makefile | 2 + + drivers/thermal/broadcom/Kconfig | 16 ++ + drivers/thermal/broadcom/Makefile | 2 + + drivers/thermal/broadcom/bcm2835_thermal.c | 314 ++++++++++++++++++++ + drivers/thermal/broadcom/ns-thermal.c | 106 +++++++ + drivers/thermal/da9062-thermal.c | 315 +++++++++++++++++++++ + drivers/thermal/mtk_thermal.c | 2 +- + drivers/thermal/rcar_gen3_thermal.c | 199 ++++++++++++- + .../thermal/ti-soc-thermal/dra752-thermal-data.c | 10 - + .../thermal/ti-soc-thermal/omap3-thermal-data.c | 4 - + .../thermal/ti-soc-thermal/omap4-thermal-data.c | 6 - + .../thermal/ti-soc-thermal/omap5-thermal-data.c | 4 - + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 4 - + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 158 +---------- + drivers/thermal/ti-soc-thermal/ti-thermal.h | 16 -- + 19 files changed, 1061 insertions(+), 217 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/brcm,ns-thermal + create mode 100644 Documentation/devicetree/bindings/thermal/da9062-thermal.txt + create mode 100644 drivers/thermal/broadcom/Kconfig + create mode 100644 drivers/thermal/broadcom/Makefile + create mode 100644 drivers/thermal/broadcom/bcm2835_thermal.c + create mode 100644 drivers/thermal/broadcom/ns-thermal.c + create mode 100644 drivers/thermal/da9062-thermal.c +Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure) +$ git merge dlm/next +Auto-merging fs/dlm/user.c +Merge made by the 'recursive' strategy. + fs/dlm/user.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (7acedaf5c435 net: move xdp_prog field in RX cache lines) +$ git merge net-next/master +Resolved 'drivers/pci/msi.c' using previous resolution. +Resolved 'include/linux/pci.h' using previous resolution. +Recorded preimage for 'include/uapi/linux/Kbuild' +Auto-merging net/tipc/socket.c +Auto-merging net/packet/af_packet.c +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/ipv6/ndisc.c +Auto-merging net/ipv6/af_inet6.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/route.c +Auto-merging net/core/skbuff.c +Auto-merging net/bridge/br_if.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging include/uapi/linux/Kbuild +CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild +Removing include/linux/soc/qcom/smd.h +Auto-merging include/linux/skbuff.h +Removing include/linux/platform_data/st21nfca.h +Removing include/linux/platform_data/pn544.h +Auto-merging include/linux/pci.h +CONFLICT (content): Merge conflict in include/linux/pci.h +Removing include/linux/can/platform/ti_hecc.h +Auto-merging include/linux/can/dev/peak_canfd.h +Auto-merging fs/select.c +Removing drivers/soc/qcom/smd.c +Auto-merging drivers/pci/msi.c +CONFLICT (content): Merge conflict in drivers/pci/msi.c +Removing drivers/nfc/nfcwilink.c +Auto-merging drivers/net/team/team.c +Auto-merging drivers/net/macsec.c +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/hyperv/hyperv_net.h +Auto-merging drivers/net/ethernet/qlogic/qed/qed_dcbx.c +Auto-merging drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_cmds.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/ipoib.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h +Removing drivers/net/ethernet/ibm/emac/debug.c +Auto-merging drivers/net/can/usb/peak_usb/pcan_usb_fd.c +Auto-merging drivers/net/can/usb/Kconfig +Auto-merging arch/sparc/net/bpf_jit_comp_32.c +Auto-merging arch/sparc/net/bpf_jit_asm_32.S +Auto-merging arch/sparc/net/bpf_jit_32.h +Auto-merging arch/sparc/Kconfig +Auto-merging arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/uapi/linux/Kbuild'. +[master 44fdf44e22e0] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net-qmi | 27 + + .../devicetree/bindings/net/brcm,bcmgenet.txt | 19 +- + .../devicetree/bindings/net/brcm,unimac-mdio.txt | 5 +- + .../devicetree/bindings/net/can/holt_hi311x.txt | 24 + + .../devicetree/bindings/net/can/ti_hecc.txt | 32 + + .../devicetree/bindings/net/dsa/lan9303.txt | 105 + + .../devicetree/bindings/net/dsa/mt7530.txt | 92 + + .../devicetree/bindings/net/ftgmac100.txt | 35 + + .../devicetree/bindings/net/ieee802154/ca8210.txt | 28 + + .../devicetree/bindings/net/marvell-orion-mdio.txt | 19 +- + .../devicetree/bindings/net/marvell-pp2.txt | 62 +- + Documentation/devicetree/bindings/net/mdio.txt | 33 + + .../devicetree/bindings/net/nfc/trf7970a.txt | 8 +- + .../devicetree/bindings/net/nokia-bluetooth.txt | 51 + + Documentation/devicetree/bindings/net/stmmac.txt | 90 +- + .../devicetree/bindings/net/ti,wilink-st.txt | 35 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/driver-api/80211/cfg80211.rst | 9 + + Documentation/networking/filter.txt | 7 +- + Documentation/networking/i40e.txt | 72 + + Documentation/networking/ip-sysctl.txt | 45 +- + Documentation/networking/ipvs-sysctl.txt | 68 +- + Documentation/networking/mpls-sysctl.txt | 19 + + Documentation/sysctl/net.txt | 11 +- + MAINTAINERS | 42 +- + arch/alpha/include/uapi/asm/socket.h | 6 + + arch/arm/boot/dts/aspeed-g4.dtsi | 6 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 6 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 5 + + arch/avr32/include/uapi/asm/socket.h | 6 + + arch/frv/include/uapi/asm/socket.h | 6 + + arch/ia64/include/uapi/asm/socket.h | 6 + + arch/m32r/include/uapi/asm/socket.h | 6 + + arch/mips/include/uapi/asm/socket.h | 6 + + arch/mn10300/include/uapi/asm/socket.h | 6 + + arch/parisc/include/uapi/asm/socket.h | 6 + + arch/powerpc/include/uapi/asm/socket.h | 6 + + arch/s390/include/uapi/asm/socket.h | 6 + + arch/sparc/Kconfig | 3 +- + arch/sparc/include/uapi/asm/socket.h | 6 + + arch/sparc/net/Makefile | 2 +- + arch/sparc/net/{bpf_jit.h => bpf_jit_32.h} | 2 +- + arch/sparc/net/bpf_jit_64.h | 66 + + arch/sparc/net/{bpf_jit_asm.S => bpf_jit_asm_32.S} | 9 +- + arch/sparc/net/bpf_jit_asm_64.S | 161 + + .../net/{bpf_jit_comp.c => bpf_jit_comp_32.c} | 51 +- + arch/sparc/net/bpf_jit_comp_64.c | 1565 ++++++++ + arch/xtensa/include/uapi/asm/socket.h | 6 + + crypto/crypto_user.c | 5 +- + drivers/atm/ambassador.c | 5 +- + drivers/bcma/driver_gpio.c | 3 +- + drivers/bcma/main.c | 10 +- + drivers/block/drbd/drbd_nla.c | 2 +- + drivers/bluetooth/Kconfig | 20 +- + drivers/bluetooth/Makefile | 3 + + drivers/bluetooth/bluecard_cs.c | 5 +- + drivers/bluetooth/btmrvl_sdio.c | 32 +- + drivers/bluetooth/btqcomsmd.c | 32 +- + drivers/bluetooth/btrtl.c | 13 +- + drivers/bluetooth/btusb.c | 15 +- + drivers/bluetooth/hci_bcm.c | 59 +- + drivers/bluetooth/hci_h4.c | 17 + + drivers/bluetooth/hci_intel.c | 47 +- + drivers/bluetooth/hci_ldisc.c | 31 +- + drivers/bluetooth/hci_ll.c | 261 +- + drivers/bluetooth/hci_nokia.c | 820 ++++ + drivers/bluetooth/hci_serdev.c | 356 ++ + drivers/bluetooth/hci_uart.h | 8 +- + drivers/hv/ring_buffer.c | 94 +- + drivers/infiniband/core/addr.c | 2 +- + drivers/infiniband/core/iwpm_util.c | 6 +- + drivers/infiniband/core/netlink.c | 5 +- + drivers/infiniband/core/sa_query.c | 4 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 10 - + drivers/infiniband/hw/mlx5/qp.c | 1 + + drivers/infiniband/hw/nes/nes.h | 1 + + drivers/infiniband/hw/qedr/main.c | 5 +- + drivers/infiniband/hw/qedr/qedr.h | 3 +- + drivers/infiniband/hw/qedr/qedr_cm.c | 3 - + drivers/infiniband/hw/qedr/verbs.c | 3 +- + drivers/isdn/divert/isdn_divert.c | 9 +- + drivers/isdn/hardware/eicon/divasi.c | 5 +- + drivers/isdn/hardware/mISDN/Kconfig | 6 +- + drivers/isdn/hardware/mISDN/hfc_multi_8xx.h | 2 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 10 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 9 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 5 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 10 +- + drivers/isdn/hardware/mISDN/w6692.c | 5 +- + drivers/isdn/hisax/amd7930_fn.c | 4 +- + drivers/isdn/hisax/arcofi.c | 4 +- + drivers/isdn/hisax/diva.c | 5 +- + drivers/isdn/hisax/elsa.c | 4 +- + drivers/isdn/hisax/fsm.c | 4 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 5 +- + drivers/isdn/hisax/hfc_2bds0.c | 4 +- + drivers/isdn/hisax/hfc_pci.c | 8 +- + drivers/isdn/hisax/hfc_sx.c | 8 +- + drivers/isdn/hisax/hfc_usb.c | 8 +- + drivers/isdn/hisax/hfcscard.c | 4 +- + drivers/isdn/hisax/icc.c | 4 +- + drivers/isdn/hisax/ipacx.c | 4 +- + drivers/isdn/hisax/isac.c | 4 +- + drivers/isdn/hisax/isar.c | 10 +- + drivers/isdn/hisax/isdnl3.c | 4 +- + drivers/isdn/hisax/teleint.c | 4 +- + drivers/isdn/hisax/w6692.c | 5 +- + drivers/isdn/i4l/isdn_ppp.c | 5 +- + drivers/isdn/i4l/isdn_tty.c | 5 +- + drivers/isdn/mISDN/dsp_core.c | 4 +- + drivers/isdn/mISDN/fsm.c | 4 +- + drivers/isdn/mISDN/l1oip_core.c | 4 +- + drivers/net/Kconfig | 8 + + drivers/net/Makefile | 3 +- + drivers/net/bonding/bond_3ad.c | 26 +- + drivers/net/bonding/bond_alb.c | 88 +- + drivers/net/bonding/bond_main.c | 189 +- + drivers/net/bonding/bond_netlink.c | 5 + + drivers/net/bonding/bond_procfs.c | 3 +- + drivers/net/can/Kconfig | 19 + + drivers/net/can/Makefile | 2 + + drivers/net/can/m_can/m_can.c | 752 +++- + drivers/net/can/peak_canfd/Kconfig | 13 + + drivers/net/can/peak_canfd/Makefile | 5 + + drivers/net/can/peak_canfd/peak_canfd.c | 801 ++++ + drivers/net/can/peak_canfd/peak_canfd_user.h | 55 + + drivers/net/can/peak_canfd/peak_pciefd_main.c | 842 ++++ + drivers/net/can/spi/Kconfig | 6 + + drivers/net/can/spi/Makefile | 1 + + drivers/net/can/spi/hi311x.c | 1076 +++++ + drivers/net/can/ti_hecc.c | 170 +- + drivers/net/can/usb/Kconfig | 6 + + drivers/net/can/usb/Makefile | 1 + + drivers/net/can/usb/mcba_usb.c | 904 +++++ + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 25 +- + drivers/net/can/vcan.c | 7 +- + drivers/net/can/vxcan.c | 316 ++ + drivers/net/cris/eth_v10.c | 32 +- + drivers/net/dsa/Kconfig | 42 +- + drivers/net/dsa/Makefile | 6 +- + drivers/net/dsa/bcm_sf2_cfp.c | 3 +- + drivers/net/dsa/dsa_loop.c | 328 ++ + drivers/net/dsa/dsa_loop.h | 19 + + drivers/net/dsa/dsa_loop_bdinfo.c | 34 + + drivers/net/dsa/lan9303-core.c | 879 ++++ + drivers/net/dsa/lan9303.h | 19 + + drivers/net/dsa/lan9303_i2c.c | 113 + + drivers/net/dsa/lan9303_mdio.c | 148 + + drivers/net/dsa/mt7530.c | 1126 ++++++ + drivers/net/dsa/mt7530.h | 402 ++ + drivers/net/dsa/mv88e6xxx/Makefile | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 1028 +++-- + drivers/net/dsa/mv88e6xxx/global1.c | 3 +- + drivers/net/dsa/mv88e6xxx/global1.h | 14 +- + drivers/net/dsa/mv88e6xxx/global1_atu.c | 305 ++ + drivers/net/dsa/mv88e6xxx/global2.c | 101 +- + drivers/net/dsa/mv88e6xxx/global2.h | 18 +- + drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 82 +- + drivers/net/dsa/mv88e6xxx/port.c | 81 +- + drivers/net/dsa/mv88e6xxx/port.h | 19 +- + drivers/net/dummy.c | 15 + + drivers/net/ethernet/3com/typhoon.c | 7 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adi/bfin_mac.h | 7 - + drivers/net/ethernet/aeroflex/greth.c | 10 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 55 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 2 - + drivers/net/ethernet/amd/nmclan_cs.c | 49 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-i2c.c | 1 + + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 1 + + drivers/net/ethernet/apm/Kconfig | 1 + + drivers/net/ethernet/apm/Makefile | 1 + + drivers/net/ethernet/apm/xgene-v2/Kconfig | 11 + + drivers/net/ethernet/apm/xgene-v2/Makefile | 6 + + drivers/net/ethernet/apm/xgene-v2/enet.c | 83 + + drivers/net/ethernet/apm/xgene-v2/enet.h | 45 + + drivers/net/ethernet/apm/xgene-v2/ethtool.c | 187 + + drivers/net/ethernet/apm/xgene-v2/ethtool.h | 78 + + drivers/net/ethernet/apm/xgene-v2/mac.c | 116 + + drivers/net/ethernet/apm/xgene-v2/mac.h | 107 + + drivers/net/ethernet/apm/xgene-v2/main.c | 759 ++++ + drivers/net/ethernet/apm/xgene-v2/main.h | 80 + + drivers/net/ethernet/apm/xgene-v2/mdio.c | 168 + + drivers/net/ethernet/apm/xgene-v2/ring.c | 81 + + drivers/net/ethernet/apm/xgene-v2/ring.h | 119 + + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 3 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 2 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 74 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 7 + + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 5 + + drivers/net/ethernet/arc/emac_main.c | 4 +- + drivers/net/ethernet/atheros/alx/alx.h | 6 - + drivers/net/ethernet/atheros/alx/main.c | 128 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 11 +- + drivers/net/ethernet/broadcom/Kconfig | 8 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 82 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 5 + + drivers/net/ethernet/broadcom/bgmac-bcma.c | 103 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 34 + + drivers/net/ethernet/broadcom/bgmac.c | 52 + + drivers/net/ethernet/broadcom/bgmac.h | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 5 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 228 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 29 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 108 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 427 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 325 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 16 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 20 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 2 + + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 292 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 16 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 15 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 52 +- + drivers/net/ethernet/broadcom/tg3.c | 7 + + drivers/net/ethernet/cadence/macb.c | 40 +- + drivers/net/ethernet/cadence/macb.h | 1 - + .../ethernet/cavium/liquidio/cn23xx_pf_device.h | 2 + + drivers/net/ethernet/cavium/liquidio/lio_core.c | 86 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 459 ++- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 399 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 137 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 32 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 4 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 18 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 36 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 2 + + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 +- + .../net/ethernet/cavium/liquidio/octeon_network.h | 47 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 10 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.h | 4 + + .../net/ethernet/cavium/liquidio/request_manager.c | 13 +- + .../ethernet/cavium/liquidio/response_manager.c | 39 +- + .../ethernet/cavium/liquidio/response_manager.h | 5 + + drivers/net/ethernet/cavium/thunder/nic.h | 2 - + drivers/net/ethernet/cavium/thunder/nic_main.c | 64 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 78 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 10 +- + drivers/net/ethernet/chelsio/cxgb/common.h | 1 - + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/adapter.h | 1 - + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 75 +- + drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 4 + + drivers/net/ethernet/cirrus/cs89x0.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 42 +- + drivers/net/ethernet/dlink/dl2k.c | 45 +- + drivers/net/ethernet/dlink/dl2k.h | 1 - + drivers/net/ethernet/emulex/benet/be.h | 12 +- + drivers/net/ethernet/emulex/benet/be_main.c | 134 +- + drivers/net/ethernet/ethoc.c | 4 +- + drivers/net/ethernet/ezchip/nps_enet.c | 1 + + drivers/net/ethernet/faraday/ftgmac100.c | 1918 +++++---- + drivers/net/ethernet/faraday/ftgmac100.h | 45 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 184 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 8 +- + drivers/net/ethernet/freescale/fec_main.c | 45 +- + drivers/net/ethernet/freescale/fman/fman.c | 23 +- + drivers/net/ethernet/freescale/fman/fman.h | 10 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 8 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 5 +- + drivers/net/ethernet/freescale/fman/fman_memac.h | 1 + + drivers/net/ethernet/freescale/fman/fman_port.c | 76 +- + drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 6 - + drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 6 - + drivers/net/ethernet/hisilicon/hns/hnae.c | 9 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 47 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 127 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 61 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 41 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 249 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 14 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 17 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 143 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 26 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 6 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 13 - + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 400 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 3 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 34 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 20 +- + drivers/net/ethernet/ibm/emac/Makefile | 1 - + drivers/net/ethernet/ibm/emac/core.c | 9 +- + drivers/net/ethernet/ibm/emac/core.h | 1 - + drivers/net/ethernet/ibm/emac/debug.c | 270 -- + drivers/net/ethernet/ibm/emac/debug.h | 23 - + drivers/net/ethernet/ibm/emac/mal.c | 4 - + drivers/net/ethernet/ibm/ibmveth.h | 1 - + drivers/net/ethernet/ibm/ibmvnic.c | 1870 ++++----- + drivers/net/ethernet/ibm/ibmvnic.h | 50 +- + drivers/net/ethernet/intel/Kconfig | 11 - + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 117 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 15 - + drivers/net/ethernet/intel/e1000e/ethtool.c | 111 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 6 + + drivers/net/ethernet/intel/fm10k/fm10k.h | 68 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 68 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 16 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 119 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 106 +- + drivers/net/ethernet/intel/i40e/Makefile | 4 +- + drivers/net/ethernet/intel/i40e/i40e.h | 259 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 99 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 466 +-- + drivers/net/ethernet/intel/i40e/i40e_client.h | 8 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 247 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 70 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1579 ++++++-- + drivers/net/ethernet/intel/i40e/i40e_main.c | 1064 +++-- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 12 +- + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 3 - + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 20 +- + drivers/net/ethernet/intel/i40e/i40e_trace.h | 229 ++ + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 670 ++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 116 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 218 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 243 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 2 +- + drivers/net/ethernet/intel/i40evf/Makefile | 5 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 4 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 2 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 99 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 220 +- + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 17 + + drivers/net/ethernet/intel/i40evf/i40e_trace.h | 229 ++ + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 462 ++- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 122 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 80 + + drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 36 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 39 +- + drivers/net/ethernet/intel/i40evf/i40evf_client.c | 564 +++ + drivers/net/ethernet/intel/i40evf/i40evf_client.h | 166 + + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 135 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 201 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 57 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 21 + + drivers/net/ethernet/intel/igb/e1000_mbx.h | 4 + + drivers/net/ethernet/intel/igb/igb.h | 81 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 203 +- + drivers/net/ethernet/intel/igb/igb_main.c | 943 +++-- + drivers/net/ethernet/intel/igb/igb_ptp.c | 3 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 38 +- + drivers/net/ethernet/intel/igbvf/igbvf.h | 3 +- + drivers/net/ethernet/intel/igbvf/mbx.h | 4 + + drivers/net/ethernet/intel/igbvf/netdev.c | 70 +- + drivers/net/ethernet/intel/igbvf/vf.c | 41 + + drivers/net/ethernet/intel/igbvf/vf.h | 1 + + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 39 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 16 - + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 55 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 169 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 107 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 169 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 22 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 102 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 22 +- + drivers/net/ethernet/marvell/Kconfig | 4 +- + drivers/net/ethernet/marvell/mvmdio.c | 44 +- + drivers/net/ethernet/marvell/mvneta.c | 107 +- + drivers/net/ethernet/marvell/mvpp2.c | 1313 ++++-- + drivers/net/ethernet/marvell/pxa168_eth.c | 14 +- + drivers/net/ethernet/marvell/skge.c | 4 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 + + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_port.c | 2 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 607 +-- + drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 6 - + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 30 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 2 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 7 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 28 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 471 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 26 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 345 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 50 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2070 ++++++---- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 112 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 225 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 473 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 399 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 73 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 8 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 174 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 75 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 96 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/ipoib.c | 498 +++ + .../ethernet/mellanox/mlx5/core/ipoib.h} | 46 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 5 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +- + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 12 - + drivers/net/ethernet/mellanox/mlxsw/core.c | 223 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 2 + + .../mellanox/mlxsw/core_acl_flex_actions.c | 178 + + .../mellanox/mlxsw/core_acl_flex_actions.h | 5 + + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 6 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 153 +- + drivers/net/ethernet/mellanox/mlxsw/port.h | 10 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 247 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 10 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 995 ++--- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 149 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 196 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.h | 6 + + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 44 + + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 187 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c | 207 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h | 54 + + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 351 ++ + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.h | 43 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 88 +- + .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 1556 +++++-- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 58 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 39 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 7 +- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 1 + + drivers/net/ethernet/micrel/ks8851.c | 41 +- + drivers/net/ethernet/moxa/moxart_ether.c | 28 +- + drivers/net/ethernet/moxa/moxart_ether.h | 1 - + drivers/net/ethernet/netronome/nfp/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/nfp_main.c | 12 +- + drivers/net/ethernet/netronome/nfp/nfp_main.h | 11 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 181 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 1197 +++--- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 27 +- + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 26 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 243 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 238 +- + .../net/ethernet/netronome/nfp/nfp_net_offload.c | 31 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 19 +- + drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h | 30 +- + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 29 +- + .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 467 +-- + .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c | 345 ++ + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 104 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 174 + + .../nfp/nfpcore/{nfp_nsp_eth.h => nfp_nsp_cmds.c} | 94 +- + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 424 +- + .../ethernet/netronome/nfp/nfpcore/nfp_resource.c | 15 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 33 +- + .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed.h | 139 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 189 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 24 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 157 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 5 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 1566 +++++--- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 1705 +++++--- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 81 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 48 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 1110 ++++- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 59 +- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 3 - + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 185 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 82 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.h | 14 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 373 +- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 8 + + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 113 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 139 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 1316 ++++-- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 205 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.c | 102 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.h | 6 +- + drivers/net/ethernet/qlogic/qed/qed_ptp.c | 12 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 56 +- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 224 +- + drivers/net/ethernet/qlogic/qed/qed_roce.h | 11 +- + drivers/net/ethernet/qlogic/qed/qed_sp.h | 5 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 330 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 48 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 564 ++- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 19 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 183 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 62 +- + drivers/net/ethernet/qlogic/qede/qede.h | 92 +- + drivers/net/ethernet/qlogic/qede/qede_dcbnl.c | 5 + + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 85 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 536 ++- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 93 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 338 +- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 + + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 3 +- + .../ethernet/qualcomm/emac/emac-sgmii-qdf2400.c | 6 + + drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 1 + + drivers/net/ethernet/realtek/8139cp.c | 14 +- + drivers/net/ethernet/realtek/8139too.c | 14 +- + drivers/net/ethernet/realtek/r8169.c | 45 +- + drivers/net/ethernet/rocker/rocker_main.c | 72 +- + drivers/net/ethernet/sfc/ef10.c | 10 +- + drivers/net/ethernet/sfc/falcon/tx.c | 4 +- + drivers/net/ethernet/sfc/tx.c | 4 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 14 +- + drivers/net/ethernet/silan/sc92031.c | 83 +- + drivers/net/ethernet/sis/sis190.c | 14 +- + drivers/net/ethernet/sis/sis900.c | 18 +- + drivers/net/ethernet/smsc/epic100.c | 16 +- + drivers/net/ethernet/smsc/smc911x.c | 51 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 98 +- + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 51 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 81 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 371 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 53 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 7 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 3 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 103 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 412 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 225 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 20 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 56 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 15 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 55 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 49 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1875 ++++++--- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 11 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 156 +- + drivers/net/ethernet/sun/cassini.c | 98 +- + drivers/net/ethernet/sun/ldmvsw.c | 27 +- + drivers/net/ethernet/sun/niu.c | 37 +- + drivers/net/ethernet/sun/sunbmac.c | 18 +- + drivers/net/ethernet/sun/sunbmac.h | 1 - + drivers/net/ethernet/sun/sungem.c | 99 +- + drivers/net/ethernet/sun/sunhme.c | 84 +- + drivers/net/ethernet/sun/sunhme.h | 2 - + drivers/net/ethernet/sun/sunvnet.c | 116 +- + drivers/net/ethernet/sun/sunvnet_common.c | 56 +- + drivers/net/ethernet/sun/sunvnet_common.h | 27 +- + drivers/net/ethernet/synopsys/Kconfig | 41 + + drivers/net/ethernet/synopsys/Makefile | 10 + + drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 737 ++++ + drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 644 +++ + drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c | 275 ++ + drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 3147 +++++++++++++++ + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 1350 +++++++ + drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c | 78 + + drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h | 744 ++++ + drivers/net/ethernet/synopsys/dwc-xlgmac.h | 660 +++ + drivers/net/ethernet/tehuti/tehuti.c | 43 +- + drivers/net/ethernet/ti/netcp_core.c | 16 +- + drivers/net/ethernet/ti/netcp_ethss.c | 3 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 51 +- + drivers/net/ethernet/toshiba/spider_net_ethtool.c | 24 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 14 +- + drivers/net/ethernet/via/via-rhine.c | 14 +- + drivers/net/ethernet/via/via-velocity.c | 62 +- + drivers/net/ethernet/wiznet/w5100.c | 3 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/fjes/fjes_ethtool.c | 19 +- + drivers/net/gtp.c | 585 +-- + drivers/net/hyperv/hyperv_net.h | 19 +- + drivers/net/hyperv/netvsc.c | 256 +- + drivers/net/hyperv/netvsc_drv.c | 261 +- + drivers/net/hyperv/rndis_filter.c | 115 +- + drivers/net/ieee802154/Kconfig | 22 + + drivers/net/ieee802154/Makefile | 1 + + drivers/net/ieee802154/ca8210.c | 3242 +++++++++++++++ + drivers/net/ieee802154/mrf24j40.c | 1 + + drivers/net/ipvlan/ipvlan.h | 2 + + drivers/net/ipvlan/ipvlan_main.c | 83 +- + drivers/net/loopback.c | 34 +- + drivers/net/macsec.c | 10 +- + drivers/net/ntb_netdev.c | 25 +- + drivers/net/phy/Kconfig | 62 +- + drivers/net/phy/Makefile | 17 +- + drivers/net/phy/bcm-phy-lib.c | 18 +- + drivers/net/phy/bcm7xxx.c | 215 +- + drivers/net/phy/dp83867.c | 25 +- + drivers/net/phy/intel-xway.c | 26 +- + drivers/net/phy/mdio-bcm-unimac.c | 3 +- + drivers/net/phy/mdio-boardinfo.c | 21 +- + drivers/net/phy/mdio-boardinfo.h | 5 +- + drivers/net/phy/mdio-xgene.c | 2 +- + drivers/net/phy/mdio_bus.c | 88 +- + drivers/net/phy/micrel.c | 13 +- + drivers/net/phy/microchip.c | 5 +- + drivers/net/phy/phy-core.c | 101 + + drivers/net/phy/phy.c | 278 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/phy/smsc.c | 1 + + drivers/net/team/team.c | 3 +- + drivers/net/tun.c | 24 +- + drivers/net/usb/asix_devices.c | 15 +- + drivers/net/usb/ax88172a.c | 1 + + drivers/net/usb/ax88179_178a.c | 15 +- + drivers/net/usb/catc.c | 31 +- + drivers/net/usb/cdc_mbim.c | 1 + + drivers/net/usb/cdc_ncm.c | 5 +- + drivers/net/usb/dm9601.c | 5 +- + drivers/net/usb/int51x1.c | 1 + + drivers/net/usb/kaweth.c | 32 +- + drivers/net/usb/lan78xx.c | 11 +- + drivers/net/usb/mcs7830.c | 5 +- + drivers/net/usb/pegasus.c | 50 +- + drivers/net/usb/pegasus.h | 1 - + drivers/net/usb/qmi_wwan.c | 318 +- + drivers/net/usb/r8152.c | 172 +- + drivers/net/usb/rndis_host.c | 1 + + drivers/net/usb/rtl8150.c | 35 +- + drivers/net/usb/sierra_net.c | 5 +- + drivers/net/usb/smsc75xx.c | 5 +- + drivers/net/usb/smsc95xx.c | 29 +- + drivers/net/usb/smsc95xx.h | 490 ++- + drivers/net/usb/sr9700.c | 5 +- + drivers/net/usb/sr9800.c | 5 +- + drivers/net/usb/usbnet.c | 74 +- + drivers/net/veth.c | 22 +- + drivers/net/virtio_net.c | 255 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 25 +- + drivers/net/vrf.c | 184 +- + drivers/net/vsockmon.c | 170 + + drivers/net/vxlan.c | 39 +- + drivers/net/wan/pc300too.c | 1 + + drivers/net/wireless/admtek/adm8211.c | 2 + + drivers/net/wireless/ath/ar5523/ar5523.c | 2 + + drivers/net/wireless/ath/ath10k/ahb.c | 2 +- + drivers/net/wireless/ath/ath10k/bmi.c | 72 + + drivers/net/wireless/ath/ath10k/bmi.h | 5 +- + drivers/net/wireless/ath/ath10k/ce.c | 5 +- + drivers/net/wireless/ath/ath10k/core.c | 36 +- + drivers/net/wireless/ath/ath10k/core.h | 11 +- + drivers/net/wireless/ath/ath10k/debug.c | 105 +- + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 9 +- + drivers/net/wireless/ath/ath10k/hif.h | 6 +- + drivers/net/wireless/ath/ath10k/htc.c | 6 +- + drivers/net/wireless/ath/ath10k/htt.h | 24 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 9 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 6 +- + drivers/net/wireless/ath/ath10k/hw.c | 265 ++ + drivers/net/wireless/ath/ath10k/hw.h | 80 +- + drivers/net/wireless/ath/ath10k/mac.c | 81 +- + drivers/net/wireless/ath/ath10k/pci.c | 19 +- + drivers/net/wireless/ath/ath10k/rx_desc.h | 13 +- + drivers/net/wireless/ath/ath10k/spectral.c | 32 +- + drivers/net/wireless/ath/ath10k/targaddrs.h | 19 +- + drivers/net/wireless/ath/ath10k/testmode.c | 4 +- + drivers/net/wireless/ath/ath10k/thermal.c | 5 +- + drivers/net/wireless/ath/ath10k/txrx.c | 3 +- + drivers/net/wireless/ath/ath10k/wmi-ops.h | 3 +- + drivers/net/wireless/ath/ath10k/wmi.c | 27 +- + drivers/net/wireless/ath/ath10k/wmi.h | 34 +- + drivers/net/wireless/ath/ath5k/base.c | 2 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 9 +- + drivers/net/wireless/ath/ath6kl/debug.h | 2 + + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 2 +- + drivers/net/wireless/ath/ath6kl/testmode.c | 4 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 2 +- + drivers/net/wireless/ath/ath9k/calib.c | 5 +- + drivers/net/wireless/ath/ath9k/common-spectral.c | 3 + + drivers/net/wireless/ath/ath9k/debug.c | 62 + + drivers/net/wireless/ath/ath9k/eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 4 + + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 + + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/init.c | 2 + + drivers/net/wireless/ath/ath9k/pci.c | 5 + + drivers/net/wireless/ath/carl9170/main.c | 2 + + drivers/net/wireless/ath/regd.c | 19 +- + drivers/net/wireless/ath/wcn36xx/Kconfig | 2 +- + drivers/net/wireless/ath/wcn36xx/main.c | 13 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 10 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 6 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 2 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 94 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 5 +- + drivers/net/wireless/ath/wil6210/fw_inc.c | 4 +- + drivers/net/wireless/ath/wil6210/main.c | 140 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 16 + + drivers/net/wireless/ath/wil6210/pm.c | 27 +- + drivers/net/wireless/ath/wil6210/pmc.c | 21 +- + drivers/net/wireless/ath/wil6210/rx_reorder.c | 12 +- + drivers/net/wireless/ath/wil6210/txrx.c | 43 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 34 +- + drivers/net/wireless/ath/wil6210/wmi.c | 35 +- + drivers/net/wireless/ath/wil6210/wmi.h | 73 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 2 + + drivers/net/wireless/atmel/atmel.c | 2 +- + drivers/net/wireless/broadcom/b43/main.c | 2 + + drivers/net/wireless/broadcom/b43legacy/main.c | 2 + + drivers/net/wireless/broadcom/brcm80211/Kconfig | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 82 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 4 + + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 5 - + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 61 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 66 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 - + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 26 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 18 + + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 6 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 53 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 + + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 2 - + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 36 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 12 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 7 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 + + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 3 - + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 + + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 + + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 1 + + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 + + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 48 +- + drivers/net/wireless/intel/iwlwifi/iwl-a000.c | 31 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 25 +- + .../net/wireless/intel/iwlwifi/iwl-context-info.h | 203 + + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 34 +- + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 6 +- + drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 5 + + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 4 +- + .../net/wireless/intel/iwlwifi/iwl-notif-wait.c | 10 +- + .../net/wireless/intel/iwlwifi/iwl-notif-wait.h | 25 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 9 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 105 +- + drivers/net/wireless/intel/iwlwifi/mvm/binding.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 26 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-mac.h | 4 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-power.h | 43 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-scan.h | 14 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 50 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 91 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 107 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 287 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 520 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 51 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 83 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 26 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 111 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 87 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 85 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 486 ++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 22 +- + drivers/net/wireless/intel/iwlwifi/mvm/tof.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 132 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 108 +- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 277 ++ + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 93 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 57 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 374 ++ + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 284 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 1018 +++++ + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 237 +- + drivers/net/wireless/intersil/orinoco/cfg.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 94 +- + drivers/net/wireless/mac80211_hwsim.h | 4 +- + drivers/net/wireless/marvell/libertas/cfg.c | 2 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 2 + + drivers/net/wireless/marvell/mwifiex/11h.c | 3 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 54 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 4 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 54 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 15 +- + drivers/net/wireless/marvell/mwifiex/ioctl.h | 2 + + drivers/net/wireless/marvell/mwifiex/main.c | 64 +- + drivers/net/wireless/marvell/mwifiex/main.h | 3 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 192 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 16 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 37 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 36 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 52 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 4 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 8 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 61 +- + drivers/net/wireless/marvell/mwifiex/uap_event.c | 2 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 45 +- + drivers/net/wireless/marvell/mwifiex/usb.h | 8 +- + drivers/net/wireless/marvell/mwifiex/util.c | 6 +- + drivers/net/wireless/marvell/mwifiex/util.h | 5 + + drivers/net/wireless/marvell/mwl8k.c | 2 + + drivers/net/wireless/mediatek/mt7601u/init.c | 2 + + drivers/net/wireless/ralink/rt2x00/Kconfig | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800.h | 212 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 1552 ++++++- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 31 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 18 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 9 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 235 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 4 +- + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 2 + + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 18 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 + + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 2468 +++++------- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.h | 24 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 1005 +---- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 3294 +++++++++------ + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.h | 40 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 1814 +++++---- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.h | 4 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 4233 +++++++++++--------- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.h | 29 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 23 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 64 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.h | 4 + + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 69 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.h | 4 + + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 165 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.h | 2 + + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 385 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.c | 1858 +++------ + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.h | 28 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 18 + + drivers/net/wireless/rndis_wlan.c | 5 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 2 + + drivers/net/wireless/st/cw1200/cw1200_sdio.c | 1 + + drivers/net/wireless/ti/wlcore/debugfs.c | 2 +- + drivers/net/wireless/ti/wlcore/testmode.c | 3 +- + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 4 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 2 + + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 3 + + drivers/nfc/Kconfig | 11 - + drivers/nfc/Makefile | 1 - + drivers/nfc/fdp/i2c.c | 6 +- + drivers/nfc/nfcmrvl/fw_dnld.c | 7 +- + drivers/nfc/nfcmrvl/spi.c | 6 +- + drivers/nfc/nfcwilink.c | 578 --- + drivers/nfc/nxp-nci/firmware.c | 2 +- + drivers/nfc/nxp-nci/i2c.c | 7 +- + drivers/nfc/pn533/i2c.c | 34 +- + drivers/nfc/pn533/pn533.c | 82 +- + drivers/nfc/pn533/pn533.h | 1 + + drivers/nfc/pn533/usb.c | 8 +- + drivers/nfc/pn544/i2c.c | 221 +- + drivers/nfc/port100.c | 44 +- + drivers/nfc/st21nfca/core.c | 12 +- + drivers/nfc/st21nfca/i2c.c | 123 +- + drivers/nfc/trf7970a.c | 98 +- + drivers/of/of_mdio.c | 7 + + drivers/pci/msi.c | 21 - + drivers/remoteproc/Kconfig | 6 +- + drivers/rpmsg/Kconfig | 1 - + drivers/s390/net/ctcm_fsms.c | 2 +- + drivers/s390/net/ctcm_main.c | 12 +- + drivers/s390/net/netiucv.c | 2 +- + drivers/s390/net/qeth_core.h | 37 +- + drivers/s390/net/qeth_core_main.c | 384 +- + drivers/s390/net/qeth_core_mpc.h | 17 - + drivers/s390/net/qeth_l2_main.c | 154 +- + drivers/s390/net/qeth_l2_sys.c | 3 - + drivers/s390/net/qeth_l3_main.c | 186 +- + drivers/s390/net/qeth_l3_sys.c | 4 +- + drivers/scsi/qedf/Makefile | 2 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 190 + + drivers/scsi/qedf/drv_fcoe_fw_funcs.h | 93 + + drivers/scsi/qedf/drv_scsi_fw_funcs.c | 44 + + drivers/scsi/qedf/drv_scsi_fw_funcs.h | 85 + + drivers/scsi/qedf/qedf.h | 23 +- + drivers/scsi/qedf/qedf_els.c | 25 +- + drivers/scsi/qedf/qedf_io.c | 670 ++-- + drivers/scsi/qedi/Makefile | 2 +- + drivers/scsi/qedi/qedi_fw.c | 1068 +++-- + drivers/scsi/qedi/qedi_fw_api.c | 781 ++++ + drivers/scsi/qedi/qedi_fw_iscsi.h | 117 + + drivers/scsi/qedi/qedi_fw_scsi.h | 55 + + drivers/scsi/qedi/qedi_iscsi.c | 12 +- + drivers/scsi/qedi/qedi_iscsi.h | 2 +- + drivers/scsi/qedi/qedi_version.h | 4 +- + drivers/scsi/scsi_netlink.c | 2 +- + drivers/soc/qcom/Kconfig | 14 +- + drivers/soc/qcom/Makefile | 1 - + drivers/soc/qcom/smd-rpm.c | 44 +- + drivers/soc/qcom/smd.c | 1560 -------- + drivers/soc/qcom/wcnss_ctrl.c | 50 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 3 +- + drivers/staging/wlan-ng/cfg80211.c | 2 +- + drivers/tty/serdev/core.c | 33 + + drivers/tty/serdev/serdev-ttyport.c | 42 +- + drivers/tty/serial/omap-serial.c | 3 + + drivers/tty/sysrq.c | 2 +- + drivers/usb/gadget/function/f_ncm.c | 1 + + drivers/vhost/vsock.c | 8 + + fs/afs/rxrpc.c | 12 +- + fs/cifs/cifsfs.c | 1 + + fs/cifs/connect.c | 1 + + fs/cifs/smb2pdu.c | 1 + + fs/eventpoll.c | 93 + + fs/select.c | 16 +- + include/linux/bpf.h | 36 +- + include/linux/bpf_types.h | 36 + + include/linux/bpf_verifier.h | 5 +- + include/linux/brcmphy.h | 3 + + include/linux/can/core.h | 11 +- + .../linux/can/dev/peak_canfd.h | 86 +- + include/linux/can/platform/ti_hecc.h | 44 - + include/linux/etherdevice.h | 15 - + include/linux/ethtool.h | 2 + + include/linux/filter.h | 16 +- + include/linux/hyperv.h | 96 +- + include/linux/ieee80211.h | 20 +- + include/linux/inetdevice.h | 4 +- + include/linux/ipv6.h | 2 + + include/linux/mlx5/driver.h | 1 + + include/linux/mlx5/fs.h | 20 +- + include/linux/mlx5/mlx5_ifc.h | 125 +- + include/linux/mlx5/qp.h | 10 + + include/linux/mpls.h | 5 + + include/linux/net.h | 3 + + include/linux/netdev_features.h | 8 +- + include/linux/netdevice.h | 48 +- + include/linux/netlink.h | 33 +- + include/linux/of_mdio.h | 4 +- + include/linux/pci.h | 4 - + include/linux/phy.h | 108 +- + include/linux/platform_data/pn544.h | 43 - + include/linux/platform_data/st21nfca.h | 33 - + include/linux/qed/common_hsi.h | 30 +- + include/linux/qed/eth_common.h | 3 + + include/linux/qed/fcoe_common.h | 180 +- + include/linux/qed/iscsi_common.h | 241 +- + include/linux/qed/qed_eth_if.h | 9 + + include/linux/qed/qed_if.h | 62 +- + include/linux/qed/qed_iscsi_if.h | 2 + + include/linux/qed/rdma_common.h | 3 +- + include/linux/qed/roce_common.h | 17 + + include/linux/qed/storage_common.h | 30 +- + include/linux/qed/tcp_common.h | 1 + + include/linux/rhashtable.h | 43 +- + include/linux/rpmsg/qcom_smd.h | 2 +- + include/linux/serdev.h | 47 + + include/linux/skbuff.h | 5 +- + include/linux/soc/qcom/smd.h | 139 - + include/linux/soc/qcom/wcnss_ctrl.h | 11 +- + include/linux/sock_diag.h | 1 + + include/linux/stmmac.h | 41 + + include/linux/tcp.h | 1 + + include/linux/udp.h | 2 +- + include/linux/usb/usbnet.h | 12 +- + include/linux/virtio_vsock.h | 1 + + include/net/6lowpan.h | 15 + + include/net/addrconf.h | 4 +- + include/net/af_rxrpc.h | 2 +- + include/net/af_vsock.h | 13 + + include/net/bluetooth/l2cap.h | 2 +- + include/net/bluetooth/rfcomm.h | 8 +- + include/net/bonding.h | 35 +- + include/net/busy_poll.h | 102 +- + include/net/cfg80211.h | 192 +- + include/net/devlink.h | 261 ++ + include/net/dsa.h | 39 +- + include/net/esp.h | 19 + + include/net/fib_rules.h | 7 +- + include/net/flow.h | 2 +- + include/net/flow_dissector.h | 8 + + include/net/flowcache.h | 6 +- + include/net/genetlink.h | 20 +- + include/net/ip.h | 2 + + include/net/ip6_tunnel.h | 2 + + include/net/ip_fib.h | 38 +- + include/net/ip_tunnels.h | 5 +- + include/net/ip_vs.h | 16 +- + include/net/mac80211.h | 10 +- + include/net/mpls_iptunnel.h | 7 +- + include/net/ndisc.h | 2 + + include/net/neighbour.h | 7 +- + include/net/net_namespace.h | 4 + + include/net/netfilter/nf_conntrack_expect.h | 4 +- + include/net/netfilter/nf_conntrack_timeout.h | 3 +- + include/net/netfilter/nf_tables.h | 12 +- + include/net/netfilter/nft_fib.h | 2 +- + include/net/netlink.h | 36 +- + include/net/netns/can.h | 40 + + include/net/netns/ipv4.h | 4 +- + include/net/netns/mpls.h | 3 + + include/net/nfc/nfc.h | 1 + + include/net/pkt_sched.h | 2 +- + include/net/protocol.h | 7 +- + include/net/route.h | 6 +- + include/net/rtnetlink.h | 6 +- + include/net/sch_generic.h | 5 +- + include/net/sctp/sm.h | 16 + + include/net/sctp/structs.h | 3 + + include/net/sctp/ulpevent.h | 8 + + include/net/secure_seq.h | 6 +- + include/net/sock.h | 14 +- + include/net/tc_act/tc_pedit.h | 45 + + include/net/tc_act/tc_vlan.h | 8 +- + include/net/tcp.h | 28 +- + include/net/udp.h | 1 + + include/net/xfrm.h | 119 +- + include/trace/events/bpf.h | 10 +- + include/trace/events/rxrpc.h | 101 + + include/uapi/asm-generic/socket.h | 6 + + include/uapi/linux/bpf.h | 32 +- + include/uapi/linux/can/vxcan.h | 12 + + include/uapi/linux/devlink.h | 74 +- + include/uapi/linux/ethtool.h | 1 + + include/uapi/linux/gtp.h | 3 +- + include/uapi/linux/if_arp.h | 1 + + include/uapi/linux/if_link.h | 11 +- + include/uapi/linux/if_packet.h | 1 + + include/uapi/linux/if_tunnel.h | 3 + + include/uapi/linux/ipv6.h | 2 + + include/uapi/linux/mpls_iptunnel.h | 2 + + include/uapi/linux/netfilter/nf_tables.h | 26 +- + include/uapi/linux/netlink.h | 48 +- + include/uapi/linux/netlink_diag.h | 10 + + include/uapi/linux/nl80211.h | 100 +- + include/uapi/linux/openvswitch.h | 27 + + include/uapi/linux/pkt_cls.h | 5 + + include/uapi/linux/pkt_sched.h | 8 + + include/uapi/linux/rtnetlink.h | 4 + + include/uapi/linux/sctp.h | 32 + + include/uapi/linux/snmp.h | 2 +- + include/uapi/linux/sysctl.h | 1 + + include/uapi/linux/vsockmon.h | 60 + + include/uapi/linux/xfrm.h | 8 + + kernel/audit.c | 2 +- + kernel/bpf/Makefile | 2 +- + kernel/bpf/arraymap.c | 137 +- + kernel/bpf/bpf_lru_list.c | 2 +- + kernel/bpf/cgroup.c | 5 +- + kernel/bpf/hashtab.c | 185 +- + kernel/bpf/lpm_trie.c | 14 +- + kernel/bpf/map_in_map.c | 97 + + kernel/bpf/map_in_map.h | 23 + + kernel/bpf/stackmap.c | 14 +- + kernel/bpf/syscall.c | 186 +- + kernel/bpf/verifier.c | 187 +- + kernel/trace/bpf_trace.c | 30 +- + lib/nlattr.c | 28 +- + lib/rhashtable.c | 17 +- + net/6lowpan/core.c | 12 +- + net/6lowpan/iphc.c | 57 +- + net/8021q/vlan_dev.c | 3 +- + net/8021q/vlan_netlink.c | 3 +- + net/Makefile | 2 +- + net/atm/clip.c | 4 +- + net/atm/common.c | 22 +- + net/batman-adv/bat_iv_ogm.c | 17 +- + net/batman-adv/bridge_loop_avoidance.c | 123 +- + net/batman-adv/bridge_loop_avoidance.h | 11 + + net/batman-adv/distributed-arp-table.c | 64 +- + net/batman-adv/log.h | 5 +- + net/batman-adv/main.c | 3 + + net/batman-adv/main.h | 18 +- + net/batman-adv/multicast.c | 12 +- + net/batman-adv/routing.c | 25 +- + net/batman-adv/send.c | 76 +- + net/batman-adv/send.h | 4 +- + net/batman-adv/soft-interface.c | 238 +- + net/batman-adv/tp_meter.c | 7 +- + net/batman-adv/translation-table.c | 42 +- + net/batman-adv/types.h | 6 +- + net/bluetooth/6lowpan.c | 192 +- + net/bluetooth/af_bluetooth.c | 26 + + net/bluetooth/amp.c | 10 +- + net/bluetooth/hci_core.c | 4 +- + net/bluetooth/l2cap_core.c | 30 +- + net/bluetooth/rfcomm/core.c | 4 +- + net/bpf/Makefile | 1 + + net/bpf/test_run.c | 172 + + net/bridge/br_fdb.c | 7 + + net/bridge/br_if.c | 1 + + net/bridge/br_mdb.c | 9 +- + net/bridge/br_netfilter_hooks.c | 3 - + net/bridge/br_netlink.c | 4 +- + net/bridge/br_netlink_tunnel.c | 4 +- + net/bridge/netfilter/ebt_log.c | 34 +- + net/bridge/netfilter/nft_reject_bridge.c | 6 +- + net/can/af_can.c | 183 +- + net/can/af_can.h | 13 +- + net/can/bcm.c | 93 +- + net/can/gw.c | 80 +- + net/can/proc.c | 285 +- + net/can/raw.c | 92 +- + net/core/datagram.c | 8 +- + net/core/dev.c | 203 +- + net/core/devlink.c | 862 +++- + net/core/drop_monitor.c | 5 +- + net/core/ethtool.c | 4 + + net/core/fib_rules.c | 24 +- + net/core/filter.c | 167 +- + net/core/flow.c | 29 +- + net/core/flow_dissector.c | 445 +- + net/core/gro_cells.c | 2 +- + net/core/lwt_bpf.c | 5 +- + net/core/lwtunnel.c | 4 +- + net/core/neighbour.c | 49 +- + net/core/net_namespace.c | 10 +- + net/core/netprio_cgroup.c | 1 + + net/core/rtnetlink.c | 143 +- + net/core/secure_seq.c | 13 +- + net/core/skbuff.c | 2 +- + net/core/sock.c | 154 +- + net/core/sock_diag.c | 15 +- + net/core/sock_reuseport.c | 4 +- + net/core/sysctl_net_core.c | 8 + + net/core/utils.c | 2 +- + net/dcb/dcbnl.c | 60 +- + net/decnet/af_decnet.c | 13 +- + net/decnet/dn_dev.c | 12 +- + net/decnet/dn_fib.c | 12 +- + net/decnet/dn_route.c | 6 +- + net/decnet/netfilter/dn_rtmsg.c | 2 +- + net/dsa/Kconfig | 8 +- + net/dsa/Makefile | 4 +- + net/dsa/dsa.c | 795 +--- + net/dsa/dsa2.c | 50 +- + net/dsa/dsa_priv.h | 15 +- + net/dsa/legacy.c | 818 ++++ + net/dsa/slave.c | 13 +- + net/dsa/switch.c | 15 +- + net/dsa/tag_brcm.c | 27 +- + net/dsa/tag_dsa.c | 27 +- + net/dsa/tag_edsa.c | 27 +- + net/dsa/tag_lan9303.c | 136 + + net/dsa/tag_mtk.c | 100 + + net/dsa/tag_qca.c | 27 +- + net/dsa/tag_trailer.c | 26 +- + net/hsr/hsr_netlink.c | 4 +- + net/ieee802154/nl802154.c | 29 +- + net/ipv4/Makefile | 2 +- + net/ipv4/af_inet.c | 8 +- + net/ipv4/arp.c | 6 +- + net/ipv4/devinet.c | 117 +- + net/ipv4/esp4.c | 370 +- + net/ipv4/esp4_offload.c | 231 +- + net/ipv4/fib_frontend.c | 9 +- + net/ipv4/fib_notifier.c | 86 + + net/ipv4/fib_rules.c | 55 +- + net/ipv4/fib_semantics.c | 11 +- + net/ipv4/fib_trie.c | 108 +- + net/ipv4/icmp.c | 19 +- + net/ipv4/ip_gre.c | 24 +- + net/ipv4/ip_input.c | 5 +- + net/ipv4/ip_tunnel.c | 27 +- + net/ipv4/ip_tunnel_core.c | 5 +- + net/ipv4/ip_vti.c | 20 +- + net/ipv4/ipconfig.c | 1 + + net/ipv4/ipip.c | 24 +- + net/ipv4/ipmr.c | 23 +- + net/ipv4/netfilter/arp_tables.c | 2 - + net/ipv4/netfilter/ipt_CLUSTERIP.c | 19 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 15 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 3 - + net/ipv4/netfilter/nft_fib_ipv4.c | 4 +- + net/ipv4/proc.c | 2 +- + net/ipv4/protocol.c | 2 +- + net/ipv4/route.c | 123 +- + net/ipv4/sysctl_net_ipv4.c | 107 +- + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_cubic.c | 2 +- + net/ipv4/tcp_fastopen.c | 102 + + net/ipv4/tcp_input.c | 88 +- + net/ipv4/tcp_ipv4.c | 46 +- + net/ipv4/tcp_metrics.c | 147 +- + net/ipv4/tcp_minisocks.c | 26 +- + net/ipv4/tcp_output.c | 20 +- + net/ipv4/tcp_timer.c | 7 +- + net/ipv4/tcp_westwood.c | 4 +- + net/ipv4/xfrm4_mode_transport.c | 34 + + net/ipv4/xfrm4_mode_tunnel.c | 28 + + net/ipv4/xfrm4_output.c | 3 +- + net/ipv6/Kconfig | 1 + + net/ipv6/addrconf.c | 226 +- + net/ipv6/addrlabel.c | 12 +- + net/ipv6/af_inet6.c | 8 +- + net/ipv6/esp6.c | 292 +- + net/ipv6/esp6_offload.c | 233 +- + net/ipv6/ila/ila_lwt.c | 3 +- + net/ipv6/ip6_gre.c | 14 +- + net/ipv6/ip6_input.c | 6 +- + net/ipv6/ip6_tunnel.c | 15 +- + net/ipv6/ip6_vti.c | 10 +- + net/ipv6/ip6mr.c | 9 +- + net/ipv6/mcast.c | 49 +- + net/ipv6/ndisc.c | 6 +- + net/ipv6/netfilter/nft_fib_ipv6.c | 2 +- + net/ipv6/protocol.c | 2 +- + net/ipv6/route.c | 15 +- + net/ipv6/seg6_iptunnel.c | 51 +- + net/ipv6/sit.c | 37 +- + net/ipv6/tcp_ipv6.c | 37 +- + net/ipv6/udp.c | 68 +- + net/ipv6/xfrm6_mode_transport.c | 34 + + net/ipv6/xfrm6_mode_tunnel.c | 27 + + net/ipv6/xfrm6_output.c | 9 +- + net/kcm/kcmsock.c | 4 - + net/key/af_key.c | 1 - + net/l2tp/l2tp_core.c | 62 +- + net/l2tp/l2tp_core.h | 12 +- + net/l2tp/l2tp_eth.c | 70 +- + net/l2tp/l2tp_netlink.c | 5 - + net/mac80211/agg-rx.c | 12 +- + net/mac80211/agg-tx.c | 12 +- + net/mac80211/cfg.c | 203 +- + net/mac80211/ibss.c | 4 +- + net/mac80211/ieee80211_i.h | 3 + + net/mac80211/iface.c | 19 +- + net/mac80211/main.c | 1 + + net/mac80211/mesh.c | 10 +- + net/mac80211/mesh_hwmp.c | 23 +- + net/mac80211/mesh_pathtbl.c | 8 +- + net/mac80211/mlme.c | 41 +- + net/mac80211/rate.c | 43 +- + net/mac80211/rate.h | 3 +- + net/mac80211/rx.c | 50 +- + net/mac80211/spectmgmt.c | 4 +- + net/mac80211/sta_info.c | 11 +- + net/mac80211/sta_info.h | 18 +- + net/mac80211/tx.c | 8 - + net/mac80211/util.c | 22 +- + net/mac802154/ieee802154_i.h | 1 + + net/mpls/af_mpls.c | 367 +- + net/mpls/internal.h | 68 +- + net/mpls/mpls_iptunnel.c | 88 +- + net/netfilter/ipset/ip_set_core.c | 29 +- + net/netfilter/ipvs/ip_vs_conn.c | 24 +- + net/netfilter/ipvs/ip_vs_core.c | 6 +- + net/netfilter/ipvs/ip_vs_ctl.c | 24 +- + net/netfilter/ipvs/ip_vs_lblc.c | 2 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 6 +- + net/netfilter/ipvs/ip_vs_nq.c | 2 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- + net/netfilter/ipvs/ip_vs_rr.c | 2 +- + net/netfilter/ipvs/ip_vs_sed.c | 2 +- + net/netfilter/ipvs/ip_vs_wlc.c | 2 +- + net/netfilter/ipvs/ip_vs_wrr.c | 2 +- + net/netfilter/nf_conntrack_core.c | 57 +- + net/netfilter/nf_conntrack_expect.c | 10 +- + net/netfilter/nf_conntrack_netlink.c | 31 +- + net/netfilter/nf_conntrack_proto_dccp.c | 2 +- + net/netfilter/nf_conntrack_proto_sctp.c | 6 +- + net/netfilter/nf_conntrack_proto_tcp.c | 3 +- + net/netfilter/nf_nat_core.c | 5 +- + net/netfilter/nf_tables_api.c | 76 +- + net/netfilter/nfnetlink.c | 33 +- + net/netfilter/nfnetlink_acct.c | 18 +- + net/netfilter/nfnetlink_cthelper.c | 12 +- + net/netfilter/nfnetlink_cttimeout.c | 15 +- + net/netfilter/nfnetlink_log.c | 14 +- + net/netfilter/nfnetlink_queue.c | 2 +- + net/netfilter/nft_compat.c | 10 +- + net/netfilter/nft_counter.c | 3 +- + net/netfilter/nft_ct.c | 171 + + net/netfilter/nft_dynset.c | 14 +- + net/netfilter/nft_exthdr.c | 13 +- + net/netfilter/nft_fib.c | 16 +- + net/netfilter/nft_hash.c | 133 +- + net/netfilter/nft_limit.c | 10 +- + net/netfilter/nft_lookup.c | 14 +- + net/netfilter/nft_masq.c | 4 - + net/netfilter/nft_meta.c | 4 - + net/netfilter/nft_nat.c | 4 - + net/netfilter/nft_objref.c | 14 +- + net/netfilter/nft_quota.c | 3 +- + net/netfilter/nft_redir.c | 4 - + net/netfilter/nft_reject.c | 5 - + net/netfilter/nft_reject_inet.c | 6 +- + net/netfilter/nft_set_rbtree.c | 31 +- + net/netfilter/xt_limit.c | 11 +- + net/netlabel/netlabel_cipso_v4.c | 19 +- + net/netlink/af_netlink.c | 90 +- + net/netlink/af_netlink.h | 9 + + net/netlink/diag.c | 25 + + net/netlink/genetlink.c | 11 +- + net/nfc/netlink.c | 29 +- + net/openvswitch/actions.c | 271 +- + net/openvswitch/conntrack.c | 29 +- + net/openvswitch/datapath.c | 2 +- + net/openvswitch/datapath.h | 2 - + net/openvswitch/flow_netlink.c | 145 +- + net/openvswitch/vport-vxlan.c | 3 +- + net/packet/af_packet.c | 44 + + net/phonet/pn_netlink.c | 12 +- + net/qrtr/Kconfig | 2 +- + net/qrtr/qrtr.c | 5 +- + net/qrtr/smd.c | 42 +- + net/rds/connection.c | 10 +- + net/rds/ib_cm.c | 5 +- + net/rds/ib_fmr.c | 38 +- + net/rds/ib_mr.h | 2 - + net/rds/threads.c | 2 +- + net/rxrpc/ar-internal.h | 19 + + net/rxrpc/call_accept.c | 6 +- + net/rxrpc/call_event.c | 2 +- + net/rxrpc/call_object.c | 4 +- + net/rxrpc/conn_client.c | 1 + + net/rxrpc/conn_event.c | 17 +- + net/rxrpc/input.c | 17 +- + net/rxrpc/insecure.c | 10 +- + net/rxrpc/peer_event.c | 2 +- + net/rxrpc/recvmsg.c | 8 +- + net/rxrpc/rxkad.c | 184 +- + net/rxrpc/sendmsg.c | 17 +- + net/sched/Kconfig | 45 + + net/sched/act_api.c | 48 +- + net/sched/act_bpf.c | 2 +- + net/sched/act_connmark.c | 3 +- + net/sched/act_csum.c | 14 +- + net/sched/act_gact.c | 2 +- + net/sched/act_ife.c | 8 +- + net/sched/act_ipt.c | 2 +- + net/sched/act_mirred.c | 2 +- + net/sched/act_nat.c | 2 +- + net/sched/act_pedit.c | 4 +- + net/sched/act_police.c | 2 +- + net/sched/act_sample.c | 2 +- + net/sched/act_simple.c | 2 +- + net/sched/act_skbedit.c | 2 +- + net/sched/act_skbmod.c | 2 +- + net/sched/act_tunnel_key.c | 3 +- + net/sched/act_vlan.c | 2 +- + net/sched/cls_api.c | 32 +- + net/sched/cls_basic.c | 12 +- + net/sched/cls_bpf.c | 14 +- + net/sched/cls_cgroup.c | 10 +- + net/sched/cls_flow.c | 17 +- + net/sched/cls_flower.c | 87 +- + net/sched/cls_fw.c | 32 +- + net/sched/cls_matchall.c | 11 +- + net/sched/cls_route.c | 46 +- + net/sched/cls_rsvp.h | 38 +- + net/sched/cls_tcindex.c | 16 +- + net/sched/cls_u32.c | 73 +- + net/sched/em_meta.c | 2 +- + net/sched/ematch.c | 2 +- + net/sched/sch_api.c | 68 +- + net/sched/sch_atm.c | 2 +- + net/sched/sch_cbq.c | 9 +- + net/sched/sch_choke.c | 59 +- + net/sched/sch_codel.c | 2 +- + net/sched/sch_drr.c | 4 +- + net/sched/sch_dsmark.c | 6 +- + net/sched/sch_fq.c | 2 +- + net/sched/sch_fq_codel.c | 5 +- + net/sched/sch_generic.c | 2 +- + net/sched/sch_gred.c | 4 +- + net/sched/sch_hfsc.c | 6 +- + net/sched/sch_hhf.c | 2 +- + net/sched/sch_htb.c | 6 +- + net/sched/sch_mq.c | 2 +- + net/sched/sch_mqprio.c | 41 +- + net/sched/sch_multiq.c | 2 + + net/sched/sch_netem.c | 28 +- + net/sched/sch_pie.c | 2 +- + net/sched/sch_prio.c | 5 +- + net/sched/sch_qfq.c | 5 +- + net/sched/sch_red.c | 4 +- + net/sched/sch_sfb.c | 4 +- + net/sched/sch_sfq.c | 5 +- + net/sched/sch_tbf.c | 4 +- + net/sctp/chunk.c | 14 +- + net/sctp/outqueue.c | 10 + + net/sctp/sm_statefuns.c | 15 +- + net/sctp/socket.c | 149 +- + net/sctp/stream.c | 464 ++- + net/sctp/sysctl.c | 7 + + net/sctp/ulpevent.c | 56 + + net/smc/af_smc.c | 23 +- + net/smc/smc.h | 1 + + net/smc/smc_cdc.c | 11 +- + net/smc/smc_close.c | 74 +- + net/smc/smc_close.h | 2 +- + net/smc/smc_core.c | 2 +- + net/smc/smc_ib.c | 3 - + net/smc/smc_ib.h | 1 + + net/smc/smc_pnet.c | 9 +- + net/smc/smc_pnet.h | 1 - + net/smc/smc_rx.c | 3 +- + net/smc/smc_tx.c | 6 +- + net/smc/smc_wr.c | 2 +- + net/socket.c | 46 + + net/switchdev/switchdev.c | 2 +- + net/tipc/bearer.c | 14 +- + net/tipc/link.c | 2 +- + net/tipc/name_table.c | 2 + + net/tipc/net.c | 4 +- + net/tipc/netlink.c | 3 +- + net/tipc/netlink_compat.c | 32 +- + net/tipc/node.c | 14 +- + net/tipc/socket.c | 30 +- + net/tipc/subscr.c | 17 +- + net/tipc/subscr.h | 3 + + net/tipc/udp_media.c | 7 +- + net/unix/af_unix.c | 2 +- + net/vmw_vsock/Makefile | 2 +- + net/vmw_vsock/af_vsock_tap.c | 114 + + net/vmw_vsock/virtio_transport.c | 3 + + net/vmw_vsock/virtio_transport_common.c | 64 + + net/vmw_vsock/vmci_transport.c | 22 +- + net/wireless/ap.c | 5 + + net/wireless/chan.c | 117 + + net/wireless/core.c | 68 +- + net/wireless/core.h | 47 +- + net/wireless/ibss.c | 1 + + net/wireless/mesh.c | 1 + + net/wireless/mlme.c | 70 +- + net/wireless/nl80211.c | 546 ++- + net/wireless/nl80211.h | 10 +- + net/wireless/rdev-ops.h | 21 +- + net/wireless/reg.c | 148 + + net/wireless/reg.h | 36 + + net/wireless/scan.c | 5 +- + net/wireless/sme.c | 172 +- + net/wireless/trace.h | 22 + + net/wireless/util.c | 92 +- + net/wireless/wext-compat.c | 2 +- + net/xfrm/Makefile | 1 + + net/xfrm/xfrm_device.c | 208 + + net/xfrm/xfrm_hash.h | 4 +- + net/xfrm/xfrm_input.c | 41 +- + net/xfrm/xfrm_output.c | 46 +- + net/xfrm/xfrm_policy.c | 27 +- + net/xfrm/xfrm_replay.c | 162 +- + net/xfrm/xfrm_state.c | 147 + + net/xfrm/xfrm_user.c | 38 +- + samples/bpf/Makefile | 8 + + samples/bpf/bpf_helpers.h | 20 + + samples/bpf/bpf_load.c | 136 +- + samples/bpf/bpf_load.h | 13 + + samples/bpf/cookie_uid_helper_example.c | 321 ++ + samples/bpf/libbpf.h | 10 + + samples/bpf/map_perf_test_kern.c | 104 +- + samples/bpf/map_perf_test_user.c | 255 +- + samples/bpf/run_cookie_uid_helper_example.sh | 14 + + samples/bpf/test_lru_dist.c | 4 +- + samples/bpf/test_map_in_map_kern.c | 173 + + samples/bpf/test_map_in_map_user.c | 116 + + security/selinux/nlmsgtab.c | 1 + + tools/build/feature/test-bpf.c | 3 + + tools/hv/bondvf.sh | 18 + + tools/include/uapi/linux/bpf.h | 32 +- + tools/lib/bpf/bpf.c | 43 + + tools/lib/bpf/bpf.h | 6 +- + tools/lib/bpf/libbpf.c | 3 +- + tools/lib/bpf/libbpf.h | 2 + + tools/net/bpf_jit_disasm.c | 40 +- + tools/testing/selftests/bpf/Makefile | 17 +- + tools/testing/selftests/bpf/test_iptunnel_common.h | 37 + + tools/testing/selftests/bpf/test_l4lb.c | 474 +++ + tools/testing/selftests/bpf/test_lru_map.c | 104 +- + tools/testing/selftests/bpf/test_maps.c | 29 +- + tools/testing/selftests/bpf/test_pkt_access.c | 64 + + tools/testing/selftests/bpf/test_progs.c | 284 ++ + tools/testing/selftests/bpf/test_verifier.c | 132 +- + tools/testing/selftests/bpf/test_xdp.c | 236 ++ + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/netdevice.sh | 200 + + tools/testing/selftests/net/psock_fanout.c | 93 +- + 1505 files changed, 100157 insertions(+), 40563 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/can/holt_hi311x.txt + create mode 100644 Documentation/devicetree/bindings/net/can/ti_hecc.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/lan9303.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/mt7530.txt + create mode 100644 Documentation/devicetree/bindings/net/ftgmac100.txt + create mode 100644 Documentation/devicetree/bindings/net/ieee802154/ca8210.txt + create mode 100644 Documentation/devicetree/bindings/net/mdio.txt + create mode 100644 Documentation/devicetree/bindings/net/nokia-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/ti,wilink-st.txt + rename arch/sparc/net/{bpf_jit.h => bpf_jit_32.h} (96%) + create mode 100644 arch/sparc/net/bpf_jit_64.h + rename arch/sparc/net/{bpf_jit_asm.S => bpf_jit_asm_32.S} (95%) + create mode 100644 arch/sparc/net/bpf_jit_asm_64.S + rename arch/sparc/net/{bpf_jit_comp.c => bpf_jit_comp_32.c} (95%) + create mode 100644 arch/sparc/net/bpf_jit_comp_64.c + create mode 100644 drivers/bluetooth/hci_nokia.c + create mode 100644 drivers/bluetooth/hci_serdev.c + create mode 100644 drivers/net/can/peak_canfd/Kconfig + create mode 100644 drivers/net/can/peak_canfd/Makefile + create mode 100644 drivers/net/can/peak_canfd/peak_canfd.c + create mode 100644 drivers/net/can/peak_canfd/peak_canfd_user.h + create mode 100644 drivers/net/can/peak_canfd/peak_pciefd_main.c + create mode 100644 drivers/net/can/spi/hi311x.c + create mode 100644 drivers/net/can/usb/mcba_usb.c + create mode 100644 drivers/net/can/vxcan.c + create mode 100644 drivers/net/dsa/dsa_loop.c + create mode 100644 drivers/net/dsa/dsa_loop.h + create mode 100644 drivers/net/dsa/dsa_loop_bdinfo.c + create mode 100644 drivers/net/dsa/lan9303-core.c + create mode 100644 drivers/net/dsa/lan9303.h + create mode 100644 drivers/net/dsa/lan9303_i2c.c + create mode 100644 drivers/net/dsa/lan9303_mdio.c + create mode 100644 drivers/net/dsa/mt7530.c + create mode 100644 drivers/net/dsa/mt7530.h + create mode 100644 drivers/net/dsa/mv88e6xxx/global1_atu.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/Kconfig + create mode 100644 drivers/net/ethernet/apm/xgene-v2/Makefile + create mode 100644 drivers/net/ethernet/apm/xgene-v2/enet.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/enet.h + create mode 100644 drivers/net/ethernet/apm/xgene-v2/ethtool.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/ethtool.h + create mode 100644 drivers/net/ethernet/apm/xgene-v2/mac.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/mac.h + create mode 100644 drivers/net/ethernet/apm/xgene-v2/main.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/main.h + create mode 100644 drivers/net/ethernet/apm/xgene-v2/mdio.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/ring.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/ring.h + delete mode 100644 drivers/net/ethernet/ibm/emac/debug.c + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_trace.h + create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_trace.h + create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_client.c + create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_client.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/ipoib.c + rename drivers/{infiniband/hw/qedr/qedr_hsi.h => net/ethernet/mellanox/mlx5/core/ipoib.h} (60%) + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h + create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h + rename drivers/net/ethernet/netronome/nfp/nfpcore/{nfp_nsp_eth.h => nfp_nsp_cmds.c} (54%) + create mode 100644 drivers/net/ethernet/synopsys/Kconfig + create mode 100644 drivers/net/ethernet/synopsys/Makefile + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-common.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-net.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac.h + create mode 100644 drivers/net/ieee802154/ca8210.c + create mode 100644 drivers/net/phy/phy-core.c + create mode 100644 drivers/net/vsockmon.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-context-info.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c + delete mode 100644 drivers/nfc/nfcwilink.c + create mode 100644 drivers/scsi/qedf/drv_fcoe_fw_funcs.c + create mode 100644 drivers/scsi/qedf/drv_fcoe_fw_funcs.h + create mode 100644 drivers/scsi/qedf/drv_scsi_fw_funcs.c + create mode 100644 drivers/scsi/qedf/drv_scsi_fw_funcs.h + create mode 100644 drivers/scsi/qedi/qedi_fw_api.c + create mode 100644 drivers/scsi/qedi/qedi_fw_iscsi.h + create mode 100644 drivers/scsi/qedi/qedi_fw_scsi.h + delete mode 100644 drivers/soc/qcom/smd.c + create mode 100644 include/linux/bpf_types.h + rename drivers/net/can/usb/peak_usb/pcan_ucan.h => include/linux/can/dev/peak_canfd.h (73%) + delete mode 100644 include/linux/can/platform/ti_hecc.h + delete mode 100644 include/linux/platform_data/pn544.h + delete mode 100644 include/linux/platform_data/st21nfca.h + delete mode 100644 include/linux/soc/qcom/smd.h + create mode 100644 include/net/netns/can.h + create mode 100644 include/uapi/linux/can/vxcan.h + create mode 100644 include/uapi/linux/vsockmon.h + create mode 100644 kernel/bpf/map_in_map.c + create mode 100644 kernel/bpf/map_in_map.h + create mode 100644 net/bpf/Makefile + create mode 100644 net/bpf/test_run.c + create mode 100644 net/dsa/legacy.c + create mode 100644 net/dsa/tag_lan9303.c + create mode 100644 net/dsa/tag_mtk.c + create mode 100644 net/ipv4/fib_notifier.c + create mode 100644 net/vmw_vsock/af_vsock_tap.c + create mode 100644 net/xfrm/xfrm_device.c + create mode 100644 samples/bpf/cookie_uid_helper_example.c + create mode 100755 samples/bpf/run_cookie_uid_helper_example.sh + create mode 100644 samples/bpf/test_map_in_map_kern.c + create mode 100644 samples/bpf/test_map_in_map_user.c + create mode 100644 tools/testing/selftests/bpf/test_iptunnel_common.h + create mode 100644 tools/testing/selftests/bpf/test_l4lb.c + create mode 100644 tools/testing/selftests/bpf/test_pkt_access.c + create mode 100644 tools/testing/selftests/bpf/test_progs.c + create mode 100644 tools/testing/selftests/bpf/test_xdp.c + create mode 100755 tools/testing/selftests/net/netdevice.sh +Merging ipsec-next/master (e892d2d40445 esp: Fix misplaced spin_unlock_bh.) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + net/ipv4/esp4.c | 6 +----- + net/ipv6/esp6.c | 6 +----- + 2 files changed, 2 insertions(+), 10 deletions(-) +Merging netfilter-next/master (122868b37809 netfilter: tcp: Use TCP_MAX_WSCALE instead of literal 14) +$ git merge netfilter-next/master +Auto-merging net/openvswitch/conntrack.c +Auto-merging net/netfilter/nft_hash.c +Auto-merging net/netfilter/nft_compat.c +Auto-merging net/netfilter/nfnetlink_queue.c +Auto-merging net/netfilter/nfnetlink_cttimeout.c +Auto-merging net/netfilter/nfnetlink_cthelper.c +Auto-merging net/netfilter/nfnetlink_acct.c +Auto-merging net/netfilter/nfnetlink.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/nf_nat_core.c +Auto-merging net/netfilter/nf_conntrack_proto_tcp.c +Auto-merging net/netfilter/nf_conntrack_proto_sctp.c +Auto-merging net/netfilter/nf_conntrack_proto_dccp.c +Auto-merging net/netfilter/nf_conntrack_netlink.c +Auto-merging net/netfilter/nf_conntrack_helper.c +Auto-merging net/netfilter/nf_conntrack_expect.c +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/netfilter/ipset/ip_set_core.c +Merge made by the 'recursive' strategy. + include/linux/netfilter/nfnetlink.h | 5 + + include/net/ip_vs.h | 10 +- + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 1 - + include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 1 - + include/net/netfilter/nf_conntrack.h | 32 ------ + include/net/netfilter/nf_conntrack_core.h | 2 +- + include/net/netfilter/nf_conntrack_ecache.h | 4 +- + include/net/netfilter/nf_conntrack_expect.h | 2 + + include/net/netfilter/nf_conntrack_extend.h | 12 +- + include/net/netfilter/nf_conntrack_helper.h | 31 ++++- + include/net/netfilter/nf_conntrack_l4proto.h | 3 + + include/net/netfilter/nf_nat_helper.h | 36 +++--- + include/net/netfilter/nf_tables.h | 5 + + include/uapi/linux/netfilter/nf_conntrack_common.h | 9 +- + include/uapi/linux/netfilter/nf_tables.h | 2 + + net/bridge/netfilter/ebtables.c | 2 +- + net/bridge/netfilter/nft_meta_bridge.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 21 ++-- + net/ipv4/netfilter/ip_tables.c | 20 ++-- + net/ipv4/netfilter/nf_dup_ipv4.c | 3 +- + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 4 - + net/ipv4/netfilter/nf_nat_pptp.c | 20 ++-- + net/ipv4/netfilter/nf_socket_ipv4.c | 2 +- + net/ipv4/netfilter/nft_fib_ipv4.c | 2 +- + net/ipv6/netfilter/ip6_tables.c | 29 ++--- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 3 +- + net/ipv6/netfilter/nf_dup_ipv6.c | 3 +- + net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 4 - + net/ipv6/netfilter/nft_fib_ipv6.c | 2 +- + net/netfilter/ipset/ip_set_bitmap_gen.h | 5 +- + net/netfilter/ipset/ip_set_core.c | 14 +-- + net/netfilter/ipvs/ip_vs_ctl.c | 12 +- + net/netfilter/ipvs/ip_vs_ftp.c | 20 ++-- + net/netfilter/ipvs/ip_vs_nfct.c | 4 +- + net/netfilter/ipvs/ip_vs_sync.c | 4 +- + net/netfilter/ipvs/ip_vs_xmit.c | 8 +- + net/netfilter/nf_conntrack_amanda.c | 2 + + net/netfilter/nf_conntrack_core.c | 126 ++++++++++++++------- + net/netfilter/nf_conntrack_ecache.c | 7 +- + net/netfilter/nf_conntrack_expect.c | 36 +++--- + net/netfilter/nf_conntrack_extend.c | 16 ++- + net/netfilter/nf_conntrack_ftp.c | 8 +- + net/netfilter/nf_conntrack_h323_main.c | 6 +- + net/netfilter/nf_conntrack_helper.c | 16 ++- + net/netfilter/nf_conntrack_irc.c | 8 +- + net/netfilter/nf_conntrack_netbios_ns.c | 2 + + net/netfilter/nf_conntrack_netlink.c | 55 +++------ + net/netfilter/nf_conntrack_pptp.c | 3 +- + net/netfilter/nf_conntrack_proto.c | 5 +- + net/netfilter/nf_conntrack_proto_dccp.c | 16 +++ + net/netfilter/nf_conntrack_proto_sctp.c | 16 +++ + net/netfilter/nf_conntrack_proto_tcp.c | 25 +++- + net/netfilter/nf_conntrack_sane.c | 8 +- + net/netfilter/nf_conntrack_sip.c | 18 ++- + net/netfilter/nf_conntrack_standalone.c | 6 +- + net/netfilter/nf_conntrack_tftp.c | 6 +- + net/netfilter/nf_log.c | 4 +- + net/netfilter/nf_nat_amanda.c | 11 +- + net/netfilter/nf_nat_core.c | 30 ++--- + net/netfilter/nf_nat_helper.c | 40 +++---- + net/netfilter/nf_nat_irc.c | 9 +- + net/netfilter/nf_synproxy_core.c | 10 +- + net/netfilter/nf_tables_api.c | 54 ++++----- + net/netfilter/nf_tables_netdev.c | 2 +- + net/netfilter/nf_tables_trace.c | 3 +- + net/netfilter/nfnetlink.c | 2 +- + net/netfilter/nfnetlink_acct.c | 2 +- + net/netfilter/nfnetlink_cthelper.c | 18 ++- + net/netfilter/nfnetlink_cttimeout.c | 4 +- + net/netfilter/nfnetlink_log.c | 4 +- + net/netfilter/nfnetlink_queue.c | 6 +- + net/netfilter/nft_compat.c | 13 ++- + net/netfilter/nft_ct.c | 41 +++++-- + net/netfilter/nft_exthdr.c | 2 +- + net/netfilter/nft_hash.c | 2 +- + net/netfilter/nft_meta.c | 2 +- + net/netfilter/nft_numgen.c | 2 +- + net/netfilter/nft_queue.c | 2 +- + net/netfilter/nft_set_hash.c | 2 +- + net/netfilter/xt_CT.c | 16 +-- + net/netfilter/xt_HMARK.c | 2 +- + net/netfilter/xt_cluster.c | 3 - + net/netfilter/xt_connlabel.c | 2 +- + net/netfilter/xt_connmark.c | 4 +- + net/netfilter/xt_conntrack.c | 11 +- + net/netfilter/xt_hashlimit.c | 10 +- + net/netfilter/xt_ipvs.c | 2 +- + net/netfilter/xt_recent.c | 2 +- + net/netfilter/xt_state.c | 13 +-- + net/openvswitch/conntrack.c | 5 - + 90 files changed, 549 insertions(+), 510 deletions(-) +Merging ipvs-next/master (e81beb79da5b ipvs: change comparison on sync_refresh_period) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + include/net/ip_vs.h | 2 -- + net/netfilter/ipvs/ip_vs_proto.c | 22 ---------------------- + net/netfilter/ipvs/ip_vs_sync.c | 2 +- + 3 files changed, 1 insertion(+), 25 deletions(-) +Merging wireless-drivers-next/master (a0597834dc0e rt2800: fix mt7620 E2 channel registers) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (0a44e632c3ce Bluetooth: Fix user channel for 32bit userspace on 64bit kernel) +$ git merge bluetooth/master +Removing net/bluetooth/ecc.h +Removing net/bluetooth/ecc.c +Merge made by the 'recursive' strategy. + net/bluetooth/Kconfig | 1 + + net/bluetooth/Makefile | 2 +- + net/bluetooth/ecc.c | 816 -------------------------------------------- + net/bluetooth/ecc.h | 54 --- + net/bluetooth/ecdh_helper.c | 225 ++++++++++++ + net/bluetooth/ecdh_helper.h | 27 ++ + net/bluetooth/hci_sock.c | 3 +- + net/bluetooth/selftest.c | 22 +- + net/bluetooth/smp.c | 8 +- + 9 files changed, 274 insertions(+), 884 deletions(-) + delete mode 100644 net/bluetooth/ecc.c + delete mode 100644 net/bluetooth/ecc.h + create mode 100644 net/bluetooth/ecdh_helper.c + create mode 100644 net/bluetooth/ecdh_helper.h +Merging mac80211-next/master (127f60bfa98f mac80211: rewrite monitor mode delivery logic) +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + net/mac80211/rx.c | 151 ++++++++++++++++++++++++++++++++--------------------- + net/wireless/reg.c | 3 -- + 2 files changed, 92 insertions(+), 62 deletions(-) +Merging rdma/for-next (cc47dd684ee0 IB/vmw_pvrdma: Spare annotate imm_data) +$ git merge rdma/for-next +Auto-merging include/uapi/rdma/ib_user_verbs.h +Auto-merging include/rdma/ib_verbs.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/infiniband/opa_vnic.txt | 153 +++ + MAINTAINERS | 16 +- + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/Makefile | 3 +- + drivers/infiniband/core/cma.c | 3 + + drivers/infiniband/core/device.c | 33 +- + drivers/infiniband/core/fmr_pool.c | 49 +- + drivers/infiniband/core/mad.c | 3 +- + drivers/infiniband/core/rdma_core.c | 627 +++++++++ + drivers/infiniband/core/rdma_core.h | 78 ++ + drivers/infiniband/core/sysfs.c | 6 +- + drivers/infiniband/core/umem.c | 17 +- + drivers/infiniband/core/umem_odp.c | 81 +- + drivers/infiniband/core/uverbs.h | 69 +- + drivers/infiniband/core/uverbs_cmd.c | 1414 ++++++-------------- + drivers/infiniband/core/uverbs_main.c | 508 +++---- + drivers/infiniband/core/uverbs_std_types.c | 275 ++++ + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 22 +- + drivers/infiniband/hw/cxgb3/cxio_dbg.c | 35 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 201 ++- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 7 +- + drivers/infiniband/hw/cxgb3/cxio_resource.c | 25 +- + drivers/infiniband/hw/cxgb3/iwch.c | 19 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 269 ++-- + drivers/infiniband/hw/cxgb3/iwch_cm.h | 18 +- + drivers/infiniband/hw/cxgb3/iwch_cq.c | 21 +- + drivers/infiniband/hw/cxgb3/iwch_ev.c | 26 +- + drivers/infiniband/hw/cxgb3/iwch_mem.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 116 +- + drivers/infiniband/hw/cxgb3/iwch_provider.h | 9 +- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 67 +- + drivers/infiniband/hw/cxgb4/cm.c | 391 +++--- + drivers/infiniband/hw/cxgb4/cq.c | 79 +- + drivers/infiniband/hw/cxgb4/device.c | 141 +- + drivers/infiniband/hw/cxgb4/ev.c | 39 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 48 +- + drivers/infiniband/hw/cxgb4/mem.c | 44 +- + drivers/infiniband/hw/cxgb4/provider.c | 42 +- + drivers/infiniband/hw/cxgb4/qp.c | 96 +- + drivers/infiniband/hw/cxgb4/resource.c | 64 +- + drivers/infiniband/hw/cxgb4/t4.h | 24 +- + drivers/infiniband/hw/hfi1/Makefile | 2 +- + drivers/infiniband/hw/hfi1/aspm.h | 15 +- + drivers/infiniband/hw/hfi1/chip.c | 469 ++++++- + drivers/infiniband/hw/hfi1/chip.h | 20 +- + drivers/infiniband/hw/hfi1/debugfs.c | 238 +++- + drivers/infiniband/hw/hfi1/debugfs.h | 62 +- + drivers/infiniband/hw/hfi1/driver.c | 96 +- + drivers/infiniband/hw/hfi1/file_ops.c | 27 +- + drivers/infiniband/hw/hfi1/firmware.c | 14 +- + drivers/infiniband/hw/hfi1/hfi.h | 68 +- + drivers/infiniband/hw/hfi1/init.c | 58 +- + drivers/infiniband/hw/hfi1/mad.c | 10 +- + drivers/infiniband/hw/hfi1/pio.c | 19 +- + drivers/infiniband/hw/hfi1/pio.h | 34 +- + drivers/infiniband/hw/hfi1/rc.c | 12 +- + drivers/infiniband/hw/hfi1/ruc.c | 7 +- + drivers/infiniband/hw/hfi1/sdma.c | 43 +- + drivers/infiniband/hw/hfi1/sdma.h | 46 +- + drivers/infiniband/hw/hfi1/sysfs.c | 4 +- + drivers/infiniband/hw/hfi1/trace_misc.h | 48 + + drivers/infiniband/hw/hfi1/trace_rc.h | 7 +- + drivers/infiniband/hw/hfi1/trace_tx.h | 43 + + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 13 +- + drivers/infiniband/hw/hfi1/user_pages.c | 5 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 22 +- + drivers/infiniband/hw/hfi1/verbs.c | 103 +- + drivers/infiniband/hw/hfi1/verbs.h | 5 + + drivers/infiniband/hw/hfi1/vnic.h | 184 +++ + drivers/infiniband/hw/hfi1/vnic_main.c | 907 +++++++++++++ + drivers/infiniband/hw/hfi1/vnic_sdma.c | 323 +++++ + drivers/infiniband/hw/hns/hns_roce_cmd.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 + + drivers/infiniband/hw/hns/hns_roce_mr.c | 20 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 3 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 10 +- + drivers/infiniband/hw/mlx4/cq.c | 2 +- + drivers/infiniband/hw/mlx4/main.c | 33 +- + drivers/infiniband/hw/mlx4/mcg.c | 3 +- + drivers/infiniband/hw/mlx4/mr.c | 6 +- + drivers/infiniband/hw/mlx4/qp.c | 2 +- + drivers/infiniband/hw/mlx4/srq.c | 2 +- + drivers/infiniband/hw/mlx5/cmd.c | 11 + + drivers/infiniband/hw/mlx5/cmd.h | 2 + + drivers/infiniband/hw/mlx5/cq.c | 21 +- + drivers/infiniband/hw/mlx5/main.c | 397 ++++-- + drivers/infiniband/hw/mlx5/mem.c | 13 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 +- + drivers/infiniband/hw/mlx5/mr.c | 6 +- + drivers/infiniband/hw/mlx5/odp.c | 344 +++-- + drivers/infiniband/hw/mlx5/qp.c | 7 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 12 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 5 +- + drivers/infiniband/hw/nes/nes_verbs.c | 4 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 15 +- + drivers/infiniband/hw/qedr/verbs.c | 8 +- + drivers/infiniband/hw/qib/qib_rc.c | 10 +- + drivers/infiniband/hw/qib/qib_ruc.c | 5 +- + drivers/infiniband/hw/qib/qib_verbs.c | 13 + + drivers/infiniband/hw/usnic/usnic_common_util.h | 38 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c | 2 +- + drivers/infiniband/sw/rdmavt/cq.c | 3 + + drivers/infiniband/sw/rdmavt/mr.c | 57 +- + drivers/infiniband/sw/rdmavt/qp.c | 32 +- + drivers/infiniband/sw/rdmavt/trace.h | 4 +- + drivers/infiniband/sw/rdmavt/trace_cq.h | 127 ++ + drivers/infiniband/sw/rdmavt/trace_rc.h | 109 ++ + drivers/infiniband/sw/rdmavt/trace_tx.h | 34 +- + drivers/infiniband/sw/rxe/Kconfig | 1 + + drivers/infiniband/sw/rxe/Makefile | 3 +- + drivers/infiniband/sw/rxe/rxe.c | 6 +- + drivers/infiniband/sw/rxe/rxe.h | 20 + + drivers/infiniband/sw/rxe/rxe_comp.c | 14 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.c | 78 ++ + drivers/infiniband/sw/rxe/rxe_hw_counters.h | 61 + + drivers/infiniband/sw/rxe/rxe_icrc.c | 6 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 4 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 14 +- + drivers/infiniband/sw/rxe/rxe_net.c | 83 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 21 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 7 +- + drivers/infiniband/sw/rxe/rxe_req.c | 4 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 5 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 16 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 9 + + drivers/infiniband/ulp/Makefile | 1 + + drivers/infiniband/ulp/ipoib/ipoib.h | 39 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 67 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 7 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 358 ++--- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 361 +++-- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 50 +- + drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 13 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 64 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 12 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 2 +- + drivers/infiniband/ulp/opa_vnic/Kconfig | 8 + + drivers/infiniband/ulp/opa_vnic/Makefile | 7 + + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c | 475 +++++++ + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 489 +++++++ + drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 187 +++ + .../infiniband/ulp/opa_vnic/opa_vnic_internal.h | 329 +++++ + drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 389 ++++++ + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 1078 +++++++++++++++ + .../infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 390 ++++++ + include/linux/mlx4/device.h | 3 +- + include/linux/mlx5/mlx5_ifc.h | 24 +- + include/net/addrconf.h | 22 +- + include/rdma/ib_mad.h | 2 +- + include/rdma/ib_pack.h | 2 + + include/rdma/ib_umem.h | 8 +- + include/rdma/ib_umem_odp.h | 6 +- + include/rdma/ib_verbs.h | 96 +- + include/rdma/opa_port_info.h | 3 +- + include/rdma/opa_vnic.h | 141 ++ + include/rdma/rdmavt_qp.h | 7 +- + include/rdma/uverbs_std_types.h | 114 ++ + include/rdma/uverbs_types.h | 172 +++ + include/uapi/rdma/ib_user_verbs.h | 11 + + include/uapi/rdma/vmw_pvrdma-abi.h | 4 +- + 162 files changed, 11211 insertions(+), 3512 deletions(-) + create mode 100644 Documentation/infiniband/opa_vnic.txt + create mode 100644 drivers/infiniband/core/rdma_core.c + create mode 100644 drivers/infiniband/core/rdma_core.h + create mode 100644 drivers/infiniband/core/uverbs_std_types.c + create mode 100644 drivers/infiniband/hw/hfi1/vnic.h + create mode 100644 drivers/infiniband/hw/hfi1/vnic_main.c + create mode 100644 drivers/infiniband/hw/hfi1/vnic_sdma.c + create mode 100644 drivers/infiniband/sw/rdmavt/trace_cq.h + create mode 100644 drivers/infiniband/sw/rdmavt/trace_rc.h + create mode 100644 drivers/infiniband/sw/rxe/rxe_hw_counters.c + create mode 100644 drivers/infiniband/sw/rxe/rxe_hw_counters.h + create mode 100644 drivers/infiniband/ulp/opa_vnic/Kconfig + create mode 100644 drivers/infiniband/ulp/opa_vnic/Makefile + create mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c + create mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h + create mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c + create mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h + create mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c + create mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c + create mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c + create mode 100644 include/rdma/opa_vnic.h + create mode 100644 include/rdma/uverbs_std_types.h + create mode 100644 include/rdma/uverbs_types.h +Merging gfs2/for-next (d552a2b9b33e GFS2: Non-recursive delete) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 741 ++++++++++++++++++++++++++++++++++--------------------- + fs/gfs2/file.c | 6 +- + fs/gfs2/glock.c | 77 +++--- + fs/gfs2/incore.h | 8 +- + fs/gfs2/inode.c | 4 +- + fs/gfs2/rgrp.c | 7 - + fs/gfs2/rgrp.h | 7 + + fs/gfs2/super.c | 11 +- + 8 files changed, 515 insertions(+), 346 deletions(-) +Merging mtd/master (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (da4b1caa49cb mtd: physmap_of: use OF helpers for reading strings) +$ git merge l2-mtd/master +Auto-merging drivers/mtd/maps/physmap_of_core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +-- + drivers/mtd/chips/cfi_cmdset_0002.c | 12 ++++++--- + drivers/mtd/maps/Makefile | 10 +++----- + .../mtd/maps/{physmap_of.c => physmap_of_core.c} | 30 ++++++++-------------- + drivers/mtd/mtdswap.c | 6 ++--- + drivers/mtd/nand/cmx270_nand.c | 4 +-- + drivers/mtd/ofpart.c | 4 +-- + fs/jffs2/readinode.c | 2 +- + include/linux/mtd/mtd.h | 2 +- + 9 files changed, 32 insertions(+), 42 deletions(-) + rename drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} (96%) +Merging nand/nand/next (9d2ee0a60b8b mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program) +$ git merge nand/nand/next +Removing drivers/mtd/nand/atmel_nand_nfc.h +Removing drivers/mtd/nand/atmel_nand_ecc.h +Removing drivers/mtd/nand/atmel_nand.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/atmel-nand.txt | 107 +- + .../devicetree/bindings/mtd/denali-nand.txt | 7 +- + MAINTAINERS | 2 +- + arch/cris/arch-v32/drivers/Kconfig | 1 - + drivers/memory/Kconfig | 2 +- + drivers/mtd/nand/Kconfig | 23 +- + drivers/mtd/nand/Makefile | 11 +- + drivers/mtd/nand/atmel/Makefile | 4 + + drivers/mtd/nand/atmel/nand-controller.c | 2197 +++++++++++++++++ + drivers/mtd/nand/atmel/pmecc.c | 1020 ++++++++ + drivers/mtd/nand/atmel/pmecc.h | 73 + + drivers/mtd/nand/atmel_nand.c | 2479 -------------------- + drivers/mtd/nand/atmel_nand_ecc.h | 163 -- + drivers/mtd/nand/atmel_nand_nfc.h | 103 - + drivers/mtd/nand/brcmnand/brcmnand.c | 61 +- + drivers/mtd/nand/davinci_nand.c | 11 + + drivers/mtd/nand/denali.c | 567 +++-- + drivers/mtd/nand/denali.h | 192 +- + drivers/mtd/nand/denali_dt.c | 74 +- + drivers/mtd/nand/fsmc_nand.c | 236 +- + drivers/mtd/nand/gpio.c | 18 +- + drivers/mtd/nand/nand_amd.c | 51 + + drivers/mtd/nand/nand_base.c | 518 ++-- + drivers/mtd/nand/nand_hynix.c | 631 +++++ + drivers/mtd/nand/nand_ids.c | 39 +- + drivers/mtd/nand/nand_macronix.c | 30 + + drivers/mtd/nand/nand_micron.c | 86 + + drivers/mtd/nand/nand_samsung.c | 112 + + drivers/mtd/nand/nand_toshiba.c | 51 + + drivers/mtd/nand/nandsim.c | 2 +- + drivers/mtd/nand/omap2.c | 9 + + drivers/mtd/nand/orion_nand.c | 48 +- + drivers/mtd/nand/sunxi_nand.c | 20 +- + drivers/mtd/nand/tango_nand.c | 8 +- + include/linux/mtd/nand.h | 96 +- + 35 files changed, 5273 insertions(+), 3779 deletions(-) + create mode 100644 drivers/mtd/nand/atmel/Makefile + create mode 100644 drivers/mtd/nand/atmel/nand-controller.c + create mode 100644 drivers/mtd/nand/atmel/pmecc.c + create mode 100644 drivers/mtd/nand/atmel/pmecc.h + delete mode 100644 drivers/mtd/nand/atmel_nand.c + delete mode 100644 drivers/mtd/nand/atmel_nand_ecc.h + delete mode 100644 drivers/mtd/nand/atmel_nand_nfc.h + create mode 100644 drivers/mtd/nand/nand_amd.c + create mode 100644 drivers/mtd/nand/nand_hynix.c + create mode 100644 drivers/mtd/nand/nand_macronix.c + create mode 100644 drivers/mtd/nand/nand_micron.c + create mode 100644 drivers/mtd/nand/nand_samsung.c + create mode 100644 drivers/mtd/nand/nand_toshiba.c +Merging spi-nor/next (cc34efbfb797 mtd: spi-nor: introduce Octo SPI protocols) +$ git merge spi-nor/next +Auto-merging drivers/mtd/spi-nor/spi-nor.c +Merge made by the 'recursive' strategy. + drivers/mtd/devices/m25p80.c | 121 ++++-- + drivers/mtd/spi-nor/Kconfig | 7 + + drivers/mtd/spi-nor/Makefile | 1 + + drivers/mtd/spi-nor/aspeed-smc.c | 23 +- + drivers/mtd/spi-nor/atmel-quadspi.c | 83 ++-- + drivers/mtd/spi-nor/cadence-quadspi.c | 18 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 6 +- + drivers/mtd/spi-nor/hisi-sfc.c | 36 +- + drivers/mtd/spi-nor/intel-spi.c | 11 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 42 +- + drivers/mtd/spi-nor/nxp-spifi.c | 22 +- + drivers/mtd/spi-nor/spi-nor.c | 488 +++++++++++++++++++----- + drivers/mtd/spi-nor/stm32-quadspi.c | 697 ++++++++++++++++++++++++++++++++++ + include/linux/mtd/spi-nor.h | 161 +++++++- + 14 files changed, 1501 insertions(+), 215 deletions(-) + create mode 100644 drivers/mtd/spi-nor/stm32-quadspi.c +Merging crypto/master (2a2a251f1105 crypto: algif_aead - Require setkey before accept(2)) +$ git merge crypto/master +Resolved 'arch/arm/boot/dts/stm32746g-eval.dts' using previous resolution. +Resolved 'arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi' using previous resolution. +Resolved 'include/linux/crypto.h' using previous resolution. +Auto-merging net/xfrm/xfrm_user.c +Removing lib/md5.c +Auto-merging lib/Makefile +Auto-merging include/uapi/linux/cryptouser.h +Auto-merging include/linux/crypto.h +CONFLICT (content): Merge conflict in include/linux/crypto.h +Auto-merging include/dt-bindings/clock/gxbb-clkc.h +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/clk/meson/gxbb.h +Removing drivers/char/hw_random/exynos-rng.c +Auto-merging crypto/xts.c +Auto-merging crypto/crypto_user.c +Auto-merging crypto/algif_aead.c +Auto-merging arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-gx.dtsi +Auto-merging arch/arm/configs/stm32_defconfig +Auto-merging arch/arm/boot/dts/stm32f746.dtsi +Auto-merging arch/arm/boot/dts/stm32746g-eval.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/stm32746g-eval.dts +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4810fdfcd0de] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/crypto/api-samples.rst | 6 +- + .../devicetree/bindings/crypto/st,stm32-crc.txt | 16 + + .../devicetree/bindings/rng/amlogic,meson-rng.txt | 11 +- + Documentation/devicetree/bindings/rng/mtk-rng.txt | 18 + + MAINTAINERS | 18 +- + arch/arm/boot/dts/stm32746g-eval.dts | 4 + + arch/arm/boot/dts/stm32f746.dtsi | 7 + + arch/arm/configs/stm32_defconfig | 2 + + arch/arm/crypto/Kconfig | 2 +- + arch/arm/crypto/aes-neonbs-glue.c | 60 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 + + arch/metag/kernel/stacktrace.c | 2 - + arch/powerpc/crypto/Makefile | 3 + + arch/powerpc/crypto/crc-vpmsum_test.c | 137 ++ + arch/powerpc/crypto/crc32-vpmsum_core.S | 755 +++++++ + arch/powerpc/crypto/crc32c-vpmsum_asm.S | 715 +----- + arch/powerpc/crypto/crct10dif-vpmsum_asm.S | 850 +++++++ + arch/powerpc/crypto/crct10dif-vpmsum_glue.c | 128 ++ + arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 7 +- + arch/x86/crypto/camellia_glue.c | 4 +- + arch/x86/crypto/glue_helper.c | 3 +- + arch/x86/crypto/serpent_sse2_glue.c | 4 +- + arch/x86/crypto/twofish_glue_3way.c | 4 +- + arch/x86/include/asm/crypto/glue_helper.h | 10 - + crypto/Kconfig | 18 +- + crypto/acompress.c | 29 + + crypto/af_alg.c | 4 +- + crypto/algapi.c | 4 +- + crypto/algif_aead.c | 157 +- + crypto/cbc.c | 15 +- + crypto/crypto_user.c | 18 +- + crypto/ctr.c | 23 +- + crypto/deflate.c | 61 +- + crypto/dh.c | 3 +- + crypto/drbg.c | 5 +- + crypto/ecdh.c | 3 +- + crypto/gf128mul.c | 111 +- + crypto/lz4.c | 2 +- + crypto/lz4hc.c | 2 +- + crypto/md5.c | 95 +- + crypto/scompress.c | 29 + + crypto/testmgr.c | 112 +- + crypto/testmgr.h | 587 ++--- + crypto/xts.c | 38 +- + drivers/char/hw_random/Kconfig | 28 +- + drivers/char/hw_random/Makefile | 2 +- + drivers/char/hw_random/exynos-rng.c | 231 -- + drivers/char/hw_random/meson-rng.c | 22 + + drivers/char/hw_random/mtk-rng.c | 168 ++ + drivers/char/hw_random/n2-drv.c | 4 +- + drivers/char/hw_random/omap-rng.c | 22 +- + drivers/char/hw_random/timeriomem-rng.c | 157 +- + drivers/clk/meson/gxbb.h | 2 +- + drivers/crypto/Kconfig | 24 + + drivers/crypto/Makefile | 3 + + drivers/crypto/amcc/crypto4xx_core.c | 2 +- + drivers/crypto/amcc/crypto4xx_reg_def.h | 2 +- + drivers/crypto/bcm/util.c | 2 +- + drivers/crypto/caam/Kconfig | 20 +- + drivers/crypto/caam/Makefile | 5 + + drivers/crypto/caam/caamalg.c | 9 +- + drivers/crypto/caam/caamalg_desc.c | 77 +- + drivers/crypto/caam/caamalg_desc.h | 15 +- + drivers/crypto/caam/caamalg_qi.c | 2387 ++++++++++++++++++++ + drivers/crypto/caam/ctrl.c | 59 +- + drivers/crypto/caam/desc_constr.h | 5 + + drivers/crypto/caam/intern.h | 24 + + drivers/crypto/caam/qi.c | 805 +++++++ + drivers/crypto/caam/qi.h | 201 ++ + drivers/crypto/caam/sg_sw_qm.h | 108 + + drivers/crypto/cavium/Makefile | 4 + + drivers/crypto/cavium/zip/Makefile | 11 + + drivers/crypto/cavium/zip/common.h | 202 ++ + drivers/crypto/cavium/zip/zip_crypto.c | 313 +++ + drivers/crypto/cavium/zip/zip_crypto.h | 79 + + drivers/crypto/cavium/zip/zip_deflate.c | 200 ++ + drivers/crypto/cavium/zip/zip_deflate.h | 62 + + drivers/crypto/cavium/zip/zip_device.c | 202 ++ + drivers/crypto/cavium/zip/zip_device.h | 108 + + drivers/crypto/cavium/zip/zip_inflate.c | 223 ++ + drivers/crypto/cavium/zip/zip_inflate.h | 62 + + drivers/crypto/cavium/zip/zip_main.c | 729 ++++++ + drivers/crypto/cavium/zip/zip_main.h | 121 + + drivers/crypto/cavium/zip/zip_mem.c | 114 + + drivers/crypto/cavium/zip/zip_mem.h | 78 + + drivers/crypto/cavium/zip/zip_regs.h | 1347 +++++++++++ + drivers/crypto/ccp/Makefile | 2 + + drivers/crypto/ccp/ccp-crypto-aes-galois.c | 252 +++ + drivers/crypto/ccp/ccp-crypto-des3.c | 254 +++ + drivers/crypto/ccp/ccp-crypto-main.c | 22 + + drivers/crypto/ccp/ccp-crypto-sha.c | 22 + + drivers/crypto/ccp/ccp-crypto.h | 44 +- + drivers/crypto/ccp/ccp-dev-v3.c | 121 +- + drivers/crypto/ccp/ccp-dev-v5.c | 168 +- + drivers/crypto/ccp/ccp-dev.h | 30 +- + drivers/crypto/ccp/ccp-ops.c | 522 +++++ + drivers/crypto/ccp/ccp-pci.c | 2 + + drivers/crypto/chelsio/chcr_algo.c | 304 ++- + drivers/crypto/chelsio/chcr_algo.h | 4 + + drivers/crypto/chelsio/chcr_core.h | 2 + + drivers/crypto/chelsio/chcr_crypto.h | 10 +- + drivers/crypto/exynos-rng.c | 389 ++++ + drivers/crypto/ixp4xx_crypto.c | 2 +- + drivers/crypto/mediatek/mtk-aes.c | 421 ++-- + drivers/crypto/mediatek/mtk-platform.c | 15 +- + drivers/crypto/mediatek/mtk-platform.h | 56 +- + drivers/crypto/mediatek/mtk-sha.c | 309 +-- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 2 +- + drivers/crypto/s5p-sss.c | 35 +- + drivers/crypto/stm32/Kconfig | 7 + + drivers/crypto/stm32/Makefile | 2 + + drivers/crypto/stm32/stm32_crc32.c | 324 +++ + drivers/gpu/drm/udl/udl_fb.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 9 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 3 +- + drivers/soc/fsl/qbman/qman.c | 4 +- + drivers/soc/fsl/qbman/qman_ccsr.c | 6 +- + drivers/soc/fsl/qbman/qman_priv.h | 97 - + include/crypto/gf128mul.h | 87 +- + include/crypto/internal/acompress.h | 3 + + include/crypto/internal/scompress.h | 3 + + include/crypto/kpp.h | 6 +- + include/crypto/xts.h | 2 +- + include/dt-bindings/clock/gxbb-clkc.h | 3 +- + include/linux/ccp.h | 68 +- + include/linux/cryptohash.h | 5 - + include/linux/kernel.h | 1 + + include/soc/fsl/qman.h | 109 + + include/uapi/linux/cryptouser.h | 10 +- + include/video/udlfb.h | 2 +- + kernel/padata.c | 15 +- + lib/Makefile | 2 +- + lib/md5.c | 95 - + net/xfrm/xfrm_user.c | 6 +- + 136 files changed, 13709 insertions(+), 2479 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-crc.txt + create mode 100644 Documentation/devicetree/bindings/rng/mtk-rng.txt + create mode 100644 arch/powerpc/crypto/crc-vpmsum_test.c + create mode 100644 arch/powerpc/crypto/crc32-vpmsum_core.S + create mode 100644 arch/powerpc/crypto/crct10dif-vpmsum_asm.S + create mode 100644 arch/powerpc/crypto/crct10dif-vpmsum_glue.c + delete mode 100644 drivers/char/hw_random/exynos-rng.c + create mode 100644 drivers/char/hw_random/mtk-rng.c + create mode 100644 drivers/crypto/caam/caamalg_qi.c + create mode 100644 drivers/crypto/caam/qi.c + create mode 100644 drivers/crypto/caam/qi.h + create mode 100644 drivers/crypto/caam/sg_sw_qm.h + create mode 100644 drivers/crypto/cavium/Makefile + create mode 100644 drivers/crypto/cavium/zip/Makefile + create mode 100644 drivers/crypto/cavium/zip/common.h + create mode 100644 drivers/crypto/cavium/zip/zip_crypto.c + create mode 100644 drivers/crypto/cavium/zip/zip_crypto.h + create mode 100644 drivers/crypto/cavium/zip/zip_deflate.c + create mode 100644 drivers/crypto/cavium/zip/zip_deflate.h + create mode 100644 drivers/crypto/cavium/zip/zip_device.c + create mode 100644 drivers/crypto/cavium/zip/zip_device.h + create mode 100644 drivers/crypto/cavium/zip/zip_inflate.c + create mode 100644 drivers/crypto/cavium/zip/zip_inflate.h + create mode 100644 drivers/crypto/cavium/zip/zip_main.c + create mode 100644 drivers/crypto/cavium/zip/zip_main.h + create mode 100644 drivers/crypto/cavium/zip/zip_mem.c + create mode 100644 drivers/crypto/cavium/zip/zip_mem.h + create mode 100644 drivers/crypto/cavium/zip/zip_regs.h + create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-galois.c + create mode 100644 drivers/crypto/ccp/ccp-crypto-des3.c + create mode 100644 drivers/crypto/exynos-rng.c + create mode 100644 drivers/crypto/stm32/Kconfig + create mode 100644 drivers/crypto/stm32/Makefile + create mode 100644 drivers/crypto/stm32/stm32_crc32.c + delete mode 100644 lib/md5.c +$ git am -3 ../patches/0001-crypto-merge-fix-for-CRYPTO_MAX_ALG_NAME-move.patch +Applying: crypto: merge fix for CRYPTO_MAX_ALG_NAME move +$ git reset HEAD^ +Unstaged changes after reset: +M include/uapi/linux/crypto.h +$ git add -A . +$ git commit -v -a --amend +[master 603ad26f47b2] Merge remote-tracking branch 'crypto/master' + Date: Wed Apr 26 11:35:10 2017 +1000 +Merging drm/drm-next (6b1462700b4a Merge tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/exynos/exynos_hdmi.c' using previous resolution. +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/media/v4l2-core/videobuf2-vmalloc.c +Auto-merging drivers/media/v4l2-core/videobuf2-dma-sg.c +Auto-merging drivers/media/v4l2-core/videobuf2-dma-contig.c +Auto-merging drivers/gpu/drm/udl/udl_fb.c +Removing drivers/gpu/drm/rcar-du/rcar_du_vgacon.h +Removing drivers/gpu/drm/rcar-du/rcar_du_vgacon.c +Removing drivers/gpu/drm/rcar-du/rcar_du_hdmienc.h +Removing drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c +Auto-merging drivers/gpu/drm/i915/intel_dsi_vbt.c +Auto-merging drivers/gpu/drm/exynos/exynos_hdmi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_hdmi.c +Removing drivers/gpu/drm/drm_platform.c +Auto-merging drivers/gpu/drm/drm_file.c +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +Removing drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h +Removing drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c +Auto-merging MAINTAINERS +Auto-merging Documentation/media/uapi/v4l/subdev-formats.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bffa3608721e] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/EDID/edid.S | 6 +- + .../bindings/display/amlogic,meson-dw-hdmi.txt | 111 + + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 3 + + .../bindings/display/bridge/lvds-transmitter.txt | 64 + + .../bridge/megachips-stdpxxxx-ge-b850v3-fw.txt | 94 + + .../bindings/display/bridge/renesas,dw-hdmi.txt | 75 + + .../bindings/display/imx/fsl-imx-drm.txt | 59 +- + .../bindings/display/mediatek/mediatek,disp.txt | 2 + + .../bindings/display/mediatek/mediatek,dsi.txt | 2 + + .../display/panel/ampire,am-480272h3tmqw-t01h.txt | 26 + + .../display/panel/mitsubishi,aa104xd12.txt | 47 + + .../display/panel/mitsubishi,aa121td01.txt | 47 + + .../bindings/display/panel/panel-common.txt | 91 + + .../bindings/display/panel/panel-dpi.txt | 3 + + .../bindings/display/panel/panel-lvds.txt | 120 + + .../bindings/display/panel/samsung,s6e3ha2.txt | 28 + + .../bindings/display/panel/sitronix,st7789v.txt | 37 + + .../bindings/display/panel/winstar,wf35ltiacd.txt | 48 + + .../devicetree/bindings/display/renesas,du.txt | 3 + + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 12 +- + .../devicetree/bindings/vendor-prefixes.txt | 2 + + Documentation/gpu/bridge/dw-hdmi.rst | 15 + + Documentation/gpu/drm-internals.rst | 113 +- + Documentation/gpu/drm-kms-helpers.rst | 40 +- + Documentation/gpu/drm-kms.rst | 264 +- + Documentation/gpu/drm-mm.rst | 41 +- + Documentation/gpu/drm-uapi.rst | 40 + + Documentation/gpu/i915.rst | 9 + + Documentation/gpu/index.rst | 4 + + Documentation/gpu/introduction.rst | 35 + + Documentation/gpu/kms-properties.csv | 5 - + Documentation/gpu/meson.rst | 61 + + Documentation/gpu/todo.rst | 407 + + Documentation/gpu/vc4.rst | 89 + + Documentation/media/uapi/v4l/subdev-formats.rst | 3000 +- + Documentation/process/index.rst | 1 + + MAINTAINERS | 37 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/char/agp/intel-gtt.c | 16 +- + drivers/dma-buf/dma-buf.c | 53 +- + drivers/dma-buf/dma-fence-array.c | 26 + + drivers/dma-buf/dma-fence.c | 2 + + drivers/gpu/drm/Kconfig | 9 + + drivers/gpu/drm/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 314 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 57 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 112 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 33 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 533 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 129 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 115 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 157 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 243 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 481 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 127 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 106 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 96 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 112 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 19 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 29 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 25 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1098 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 17 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 90 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 2 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 305 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.h | 7 + + drivers/gpu/drm/amd/amdgpu/cik.c | 8 + + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 31 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h | 941 + + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 60 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 555 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3916 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 35 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 425 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 35 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 87 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 191 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 300 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 860 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 40 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 582 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 35 + + drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h | 87 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 340 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 52 + + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 102 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 266 + + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 54 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 269 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 517 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 50 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 34 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1616 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/si.c | 7 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 22 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 45 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 894 + + drivers/gpu/drm/amd/amdgpu/soc15.h | 35 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 57 + + drivers/gpu/drm/amd/amdgpu/soc15d.h | 288 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 5 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 30 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 29 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 37 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 1532 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 87 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 74 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 1129 + + drivers/gpu/drm/amd/amdgpu/vce_v4_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 424 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.h | 30 + + drivers/gpu/drm/amd/amdgpu/vega10_sdma_pkt_open.h | 3335 + + drivers/gpu/drm/amd/amdgpu/vi.c | 67 +- + drivers/gpu/drm/amd/amdgpu/vi.h | 112 - + drivers/gpu/drm/amd/amdgpu/vid.h | 83 + + drivers/gpu/drm/amd/include/amd_acpi.h | 12 + + drivers/gpu/drm/amd/include/amd_pcie_helpers.h | 4 +- + drivers/gpu/drm/amd/include/amd_shared.h | 20 + + .../drm/amd/include/asic_reg/gmc/gmc_6_0_sh_mask.h | 4 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h | 1 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h | 2 + + .../asic_reg/vega10/ATHUB/athub_1_0_default.h | 241 + + .../asic_reg/vega10/ATHUB/athub_1_0_offset.h | 453 + + .../asic_reg/vega10/ATHUB/athub_1_0_sh_mask.h | 2045 + + .../include/asic_reg/vega10/DC/dce_12_0_default.h | 9868 ++ + .../include/asic_reg/vega10/DC/dce_12_0_offset.h | 18193 +++ + .../include/asic_reg/vega10/DC/dce_12_0_sh_mask.h | 64636 +++++++++ + .../include/asic_reg/vega10/GC/gc_9_0_default.h | 3873 + + .../amd/include/asic_reg/vega10/GC/gc_9_0_offset.h | 7230 + + .../include/asic_reg/vega10/GC/gc_9_0_sh_mask.h | 29868 ++++ + .../include/asic_reg/vega10/HDP/hdp_4_0_default.h | 117 + + .../include/asic_reg/vega10/HDP/hdp_4_0_offset.h | 209 + + .../include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h | 601 + + .../asic_reg/vega10/MMHUB/mmhub_1_0_default.h | 1011 + + .../asic_reg/vega10/MMHUB/mmhub_1_0_offset.h | 1967 + + .../asic_reg/vega10/MMHUB/mmhub_1_0_sh_mask.h | 10127 ++ + .../include/asic_reg/vega10/MP/mp_9_0_default.h | 342 + + .../amd/include/asic_reg/vega10/MP/mp_9_0_offset.h | 375 + + .../include/asic_reg/vega10/MP/mp_9_0_sh_mask.h | 1463 + + .../asic_reg/vega10/NBIF/nbif_6_1_default.h | 1271 + + .../include/asic_reg/vega10/NBIF/nbif_6_1_offset.h | 1688 + + .../asic_reg/vega10/NBIF/nbif_6_1_sh_mask.h | 10281 ++ + .../asic_reg/vega10/NBIO/nbio_6_1_default.h | 22340 +++ + .../include/asic_reg/vega10/NBIO/nbio_6_1_offset.h | 3649 + + .../asic_reg/vega10/NBIO/nbio_6_1_sh_mask.h | 133884 ++++++++++++++++++ + .../asic_reg/vega10/OSSSYS/osssys_4_0_default.h | 176 + + .../asic_reg/vega10/OSSSYS/osssys_4_0_offset.h | 327 + + .../asic_reg/vega10/OSSSYS/osssys_4_0_sh_mask.h | 1196 + + .../asic_reg/vega10/SDMA0/sdma0_4_0_default.h | 286 + + .../asic_reg/vega10/SDMA0/sdma0_4_0_offset.h | 547 + + .../asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h | 1852 + + .../asic_reg/vega10/SDMA1/sdma1_4_0_default.h | 282 + + .../asic_reg/vega10/SDMA1/sdma1_4_0_offset.h | 539 + + .../asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h | 1810 + + .../asic_reg/vega10/SMUIO/smuio_9_0_default.h | 100 + + .../asic_reg/vega10/SMUIO/smuio_9_0_offset.h | 175 + + .../asic_reg/vega10/SMUIO/smuio_9_0_sh_mask.h | 258 + + .../include/asic_reg/vega10/THM/thm_9_0_default.h | 194 + + .../include/asic_reg/vega10/THM/thm_9_0_offset.h | 363 + + .../include/asic_reg/vega10/THM/thm_9_0_sh_mask.h | 1314 + + .../include/asic_reg/vega10/UVD/uvd_7_0_default.h | 127 + + .../include/asic_reg/vega10/UVD/uvd_7_0_offset.h | 222 + + .../include/asic_reg/vega10/UVD/uvd_7_0_sh_mask.h | 811 + + .../include/asic_reg/vega10/VCE/vce_4_0_default.h | 122 + + .../include/asic_reg/vega10/VCE/vce_4_0_offset.h | 208 + + .../include/asic_reg/vega10/VCE/vce_4_0_sh_mask.h | 488 + + .../gpu/drm/amd/include/asic_reg/vega10/soc15ip.h | 1343 + + .../drm/amd/include/asic_reg/vega10/vega10_enum.h | 22531 +++ + drivers/gpu/drm/amd/include/atomfirmware.h | 2385 + + drivers/gpu/drm/amd/include/atomfirmwareid.h | 86 + + drivers/gpu/drm/amd/include/cgs_linux.h | 19 +- + drivers/gpu/drm/amd/include/displayobject.h | 249 + + drivers/gpu/drm/amd/include/dm_pp_interface.h | 83 + + .../drm/amd/include/ivsrcid/ivsrcid_vislands30.h | 99 + + drivers/gpu/drm/amd/include/v9_structs.h | 743 + + drivers/gpu/drm/amd/include/vi_structs.h | 106 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 449 +- + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 34 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 73 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 9 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h | 16 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 396 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 140 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 170 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 4450 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 434 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h | 44 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 137 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.h | 65 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_pptable.h | 381 + + .../amd/powerplay/hwmgr/vega10_processpptables.c | 1190 + + .../amd/powerplay/hwmgr/vega10_processpptables.h | 62 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 761 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 83 + + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 46 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 43 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 137 +- + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/pp_soc15.h | 48 + + drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/smu9.h | 147 + + drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h | 467 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 8 + + drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 131 + + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 103 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h | 3 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 14 +- + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 68 +- + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.h | 2 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 19 + + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 67 +- + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h | 2 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 564 + + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 70 + + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 6 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 11 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 1 - + drivers/gpu/drm/arm/hdlcd_crtc.c | 20 + + drivers/gpu/drm/arm/hdlcd_drv.c | 55 +- + drivers/gpu/drm/arm/malidp_crtc.c | 21 + + drivers/gpu/drm/arm/malidp_drv.c | 64 +- + drivers/gpu/drm/armada/armada_crtc.c | 59 +- + drivers/gpu/drm/armada/armada_crtc.h | 2 - + drivers/gpu/drm/armada/armada_debugfs.c | 65 +- + drivers/gpu/drm/armada/armada_drm.h | 1 - + drivers/gpu/drm/armada/armada_drv.c | 34 +- + drivers/gpu/drm/armada/armada_fbdev.c | 2 - + drivers/gpu/drm/armada/armada_gem.c | 8 +- + drivers/gpu/drm/armada/armada_overlay.c | 6 +- + drivers/gpu/drm/ast/ast_fb.c | 9 +- + drivers/gpu/drm/ast/ast_mode.c | 3 +- + drivers/gpu/drm/ast/ast_ttm.c | 1 + + drivers/gpu/drm/atmel-hlcdc/Makefile | 1 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 93 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 147 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 369 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 666 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h | 399 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 72 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 642 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 16 +- + drivers/gpu/drm/bochs/bochs_kms.c | 3 +- + drivers/gpu/drm/bochs/bochs_mm.c | 1 + + drivers/gpu/drm/bridge/Kconfig | 38 +- + drivers/gpu/drm/bridge/Makefile | 6 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 28 + + drivers/gpu/drm/bridge/dumb-vga-dac.c | 16 +- + drivers/gpu/drm/bridge/lvds-encoder.c | 210 + + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 429 + + drivers/gpu/drm/bridge/nxp-ptn3460.c | 16 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 16 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 4 + + drivers/gpu/drm/bridge/synopsys/Kconfig | 23 + + drivers/gpu/drm/bridge/synopsys/Makefile | 5 + + .../drm/bridge/{ => synopsys}/dw-hdmi-ahb-audio.c | 0 + .../gpu/drm/bridge/{ => synopsys}/dw-hdmi-audio.h | 0 + .../drm/bridge/{ => synopsys}/dw-hdmi-i2s-audio.c | 0 + drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.c | 1030 +- + drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.h | 4 + + drivers/gpu/drm/bridge/tc358767.c | 27 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 89 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 1 - + drivers/gpu/drm/cirrus/cirrus_mode.c | 3 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 1 + + drivers/gpu/drm/drm_atomic.c | 190 +- + drivers/gpu/drm/drm_atomic_helper.c | 927 +- + drivers/gpu/drm/drm_blend.c | 23 +- + drivers/gpu/drm/drm_cache.c | 12 +- + drivers/gpu/drm/drm_color_mgmt.c | 51 +- + drivers/gpu/drm/drm_connector.c | 132 +- + drivers/gpu/drm/drm_crtc.c | 87 +- + drivers/gpu/drm/drm_crtc_helper.c | 46 +- + drivers/gpu/drm/drm_crtc_internal.h | 13 +- + drivers/gpu/drm/drm_debugfs.c | 85 +- + drivers/gpu/drm/drm_debugfs_crc.c | 17 +- + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 2 + + drivers/gpu/drm/drm_dp_helper.c | 127 + + drivers/gpu/drm/drm_dp_mst_topology.c | 35 +- + drivers/gpu/drm/drm_edid.c | 94 +- + drivers/gpu/drm/drm_edid_load.c | 17 +- + drivers/gpu/drm/drm_encoder.c | 8 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 22 +- + drivers/gpu/drm/drm_fb_helper.c | 337 +- + drivers/gpu/drm/{drm_fops.c => drm_file.c} | 75 +- + drivers/gpu/drm/drm_fourcc.c | 33 + + drivers/gpu/drm/drm_framebuffer.c | 217 +- + drivers/gpu/drm/drm_gem.c | 44 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 13 +- + drivers/gpu/drm/drm_internal.h | 4 +- + drivers/gpu/drm/drm_ioc32.c | 79 +- + drivers/gpu/drm/drm_ioctl.c | 54 +- + drivers/gpu/drm/drm_irq.c | 192 +- + drivers/gpu/drm/drm_kms_helper_common.c | 3 +- + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/drm_mode_config.c | 22 +- + drivers/gpu/drm/drm_mode_object.c | 44 +- + drivers/gpu/drm/drm_modes.c | 2 +- + drivers/gpu/drm/drm_modeset_helper.c | 2 +- + drivers/gpu/drm/drm_modeset_lock.c | 102 - + drivers/gpu/drm/drm_of.c | 52 + + drivers/gpu/drm/drm_pci.c | 7 + + drivers/gpu/drm/drm_plane.c | 102 +- + drivers/gpu/drm/drm_plane_helper.c | 20 +- + drivers/gpu/drm/drm_platform.c | 87 - + drivers/gpu/drm/drm_prime.c | 21 +- + drivers/gpu/drm/drm_print.c | 2 +- + drivers/gpu/drm/drm_probe_helper.c | 122 +- + drivers/gpu/drm/drm_property.c | 124 +- + drivers/gpu/drm/drm_scdc_helper.c | 244 + + drivers/gpu/drm/drm_simple_kms_helper.c | 8 +- + drivers/gpu/drm/drm_sysfs.c | 70 +- + drivers/gpu/drm/drm_trace.h | 20 +- + drivers/gpu/drm/etnaviv/Kconfig | 1 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 65 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 99 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- + drivers/gpu/drm/exynos/exynos_dp.c | 36 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 40 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 2 - + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 17 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 245 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 8 - + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 14 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 25 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 8 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 26 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 38 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 44 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +- + drivers/gpu/drm/gma500/framebuffer.c | 9 +- + drivers/gpu/drm/gma500/gma_display.c | 10 +- + drivers/gpu/drm/gma500/gma_display.h | 6 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 18 +- + drivers/gpu/drm/gma500/psb_drv.h | 5 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 20 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 23 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 - + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 27 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 11 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 42 +- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/Kconfig.debug | 29 + + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 78 +- + drivers/gpu/drm/i915/gvt/display.c | 22 +- + drivers/gpu/drm/i915/gvt/execlist.c | 9 +- + drivers/gpu/drm/i915/gvt/gtt.c | 3 +- + drivers/gpu/drm/i915/gvt/gvt.c | 19 +- + drivers/gpu/drm/i915/gvt/gvt.h | 13 + + drivers/gpu/drm/i915/gvt/handlers.c | 427 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 5 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 38 +- + drivers/gpu/drm/i915/gvt/mmio.h | 19 +- + drivers/gpu/drm/i915/gvt/render.c | 23 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 229 +- + drivers/gpu/drm/i915/gvt/sched_policy.h | 2 + + drivers/gpu/drm/i915/gvt/scheduler.c | 5 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 - + drivers/gpu/drm/i915/gvt/vgpu.c | 85 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 25 +- + drivers/gpu/drm/i915/i915_debugfs.c | 749 +- + drivers/gpu/drm/i915/i915_drv.c | 131 +- + drivers/gpu/drm/i915/i915_drv.h | 390 +- + drivers/gpu/drm/i915/i915_gem.c | 555 +- + drivers/gpu/drm/i915/i915_gem.h | 9 + + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 37 +- + drivers/gpu/drm/i915/i915_gem_clflush.c | 189 + + drivers/gpu/drm/i915/i915_gem_clflush.h | 37 + + drivers/gpu/drm/i915/i915_gem_context.c | 181 +- + drivers/gpu/drm/i915/i915_gem_context.h | 2 - + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 13 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 18 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 107 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 11 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2086 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 124 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 7 +- + drivers/gpu/drm/i915/i915_gem_object.h | 41 +- + drivers/gpu/drm/i915/i915_gem_request.c | 491 +- + drivers/gpu/drm/i915/i915_gem_request.h | 96 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 7 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 42 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 25 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 9 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 75 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 321 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 1026 +- + drivers/gpu/drm/i915/i915_irq.c | 321 +- + drivers/gpu/drm/i915/i915_params.c | 16 +- + drivers/gpu/drm/i915/i915_params.h | 83 +- + drivers/gpu/drm/i915/i915_pci.c | 32 +- + drivers/gpu/drm/i915/i915_perf.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 114 +- + drivers/gpu/drm/i915/i915_selftest.h | 106 + + drivers/gpu/drm/i915/i915_sw_fence.c | 8 +- + drivers/gpu/drm/i915/i915_sysfs.c | 63 +- + drivers/gpu/drm/i915/i915_trace.h | 472 +- + drivers/gpu/drm/i915/i915_utils.h | 31 + + drivers/gpu/drm/i915/i915_vgpu.c | 17 +- + drivers/gpu/drm/i915/i915_vma.c | 34 +- + drivers/gpu/drm/i915/i915_vma.h | 4 +- + drivers/gpu/drm/i915/intel_atomic.c | 15 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 17 +- + drivers/gpu/drm/i915/intel_audio.c | 4 +- + drivers/gpu/drm/i915/intel_bios.c | 46 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 590 +- + drivers/gpu/drm/i915/intel_cdclk.c | 1908 + + drivers/gpu/drm/i915/intel_color.c | 104 +- + drivers/gpu/drm/i915/intel_crt.c | 46 +- + drivers/gpu/drm/i915/intel_csr.c | 10 +- + drivers/gpu/drm/i915/intel_ddi.c | 585 +- + drivers/gpu/drm/i915/intel_device_info.c | 17 +- + drivers/gpu/drm/i915/intel_display.c | 4027 +- + drivers/gpu/drm/i915/intel_dp.c | 328 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 41 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 54 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 16 - + drivers/gpu/drm/i915/intel_drv.h | 261 +- + drivers/gpu/drm/i915/intel_dsi.c | 614 +- + drivers/gpu/drm/i915/intel_dsi.h | 13 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 135 +- + .../{intel_dsi_panel_vbt.c => intel_dsi_vbt.c} | 133 +- + drivers/gpu/drm/i915/intel_dvo.c | 1 + + drivers/gpu/drm/i915/intel_engine_cs.c | 734 +- + drivers/gpu/drm/i915/intel_fbc.c | 13 +- + drivers/gpu/drm/i915/intel_fbdev.c | 73 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 25 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 3 +- + drivers/gpu/drm/i915/intel_frontbuffer.h | 8 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 71 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 501 +- + drivers/gpu/drm/i915/intel_guc_log.c | 386 +- + drivers/gpu/drm/i915/intel_gvt.c | 2 + + drivers/gpu/drm/i915/intel_hangcheck.c | 4 + + drivers/gpu/drm/i915/intel_hdmi.c | 82 +- + drivers/gpu/drm/i915/intel_hotplug.c | 48 +- + drivers/gpu/drm/i915/intel_huc.c | 130 +- + drivers/gpu/drm/i915/intel_i2c.c | 4 +- + drivers/gpu/drm/i915/intel_lpe_audio.c | 1 + + drivers/gpu/drm/i915/intel_lrc.c | 941 +- + drivers/gpu/drm/i915/intel_lrc.h | 4 - + drivers/gpu/drm/i915/intel_lspcon.c | 17 +- + drivers/gpu/drm/i915/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/intel_mocs.c | 55 +- + drivers/gpu/drm/i915/intel_opregion.c | 89 +- + drivers/gpu/drm/i915/intel_overlay.c | 87 +- + drivers/gpu/drm/i915/intel_panel.c | 4 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 72 +- + drivers/gpu/drm/i915/intel_pm.c | 1099 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1186 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 229 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 637 +- + drivers/gpu/drm/i915/intel_sdvo.c | 1 + + drivers/gpu/drm/i915/intel_sideband.c | 34 +- + drivers/gpu/drm/i915/intel_sprite.c | 548 +- + drivers/gpu/drm/i915/intel_tv.c | 22 +- + drivers/gpu/drm/i915/intel_uc.c | 347 +- + drivers/gpu/drm/i915/intel_uc.h | 101 +- + drivers/gpu/drm/i915/intel_uncore.c | 368 +- + drivers/gpu/drm/i915/selftests/huge_gem_object.c | 135 + + drivers/gpu/drm/i915/selftests/huge_gem_object.h | 45 + + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 385 + + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 463 + + drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 303 + + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 350 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1562 + + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 600 + + drivers/gpu/drm/i915/selftests/i915_gem_request.c | 882 + + .../gpu/drm/i915/selftests/i915_live_selftests.h | 19 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 20 + + drivers/gpu/drm/i915/selftests/i915_random.c | 63 + + drivers/gpu/drm/i915/selftests/i915_random.h | 50 + + drivers/gpu/drm/i915/selftests/i915_selftest.c | 250 + + drivers/gpu/drm/i915/selftests/i915_vma.c | 746 + + drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 481 + + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 542 + + drivers/gpu/drm/i915/selftests/intel_uncore.c | 182 + + drivers/gpu/drm/i915/selftests/mock_context.c | 78 + + drivers/gpu/drm/i915/selftests/mock_context.h | 34 + + drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 176 + + drivers/gpu/drm/i915/selftests/mock_dmabuf.h | 41 + + drivers/gpu/drm/i915/selftests/mock_drm.c | 54 + + drivers/gpu/drm/i915/selftests/mock_drm.h | 31 + + drivers/gpu/drm/i915/selftests/mock_engine.c | 206 + + drivers/gpu/drm/i915/selftests/mock_engine.h | 54 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 226 + + drivers/gpu/drm/i915/selftests/mock_gem_device.h | 9 + + drivers/gpu/drm/i915/selftests/mock_gem_object.h | 8 + + drivers/gpu/drm/i915/selftests/mock_gtt.c | 138 + + drivers/gpu/drm/i915/selftests/mock_gtt.h | 35 + + drivers/gpu/drm/i915/selftests/mock_request.c | 63 + + drivers/gpu/drm/i915/selftests/mock_request.h | 46 + + drivers/gpu/drm/i915/selftests/scatterlist.c | 364 + + drivers/gpu/drm/imx/Kconfig | 7 - + drivers/gpu/drm/imx/Makefile | 3 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 2 - + drivers/gpu/drm/imx/imx-drm-core.c | 163 +- + drivers/gpu/drm/imx/imx-drm.h | 18 +- + drivers/gpu/drm/imx/imx-ldb.c | 27 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 90 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 344 +- + drivers/gpu/drm/imx/ipuv3-plane.h | 6 + + drivers/gpu/drm/imx/parallel-display.c | 36 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 64 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 39 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 83 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 2 - + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 138 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 2 + + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 69 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 2 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 58 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 9 + + drivers/gpu/drm/mediatek/mtk_dsi.c | 595 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 +- + drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 38 +- + drivers/gpu/drm/meson/Kconfig | 6 + + drivers/gpu/drm/meson/Makefile | 1 + + drivers/gpu/drm/meson/meson_canvas.c | 4 +- + drivers/gpu/drm/meson/meson_crtc.c | 37 +- + drivers/gpu/drm/meson/meson_drv.c | 153 +- + drivers/gpu/drm/meson/meson_drv.h | 3 + + drivers/gpu/drm/meson/meson_dw_hdmi.c | 919 + + drivers/gpu/drm/meson/meson_dw_hdmi.h | 146 + + drivers/gpu/drm/meson/meson_registers.h | 1 + + drivers/gpu/drm/meson/meson_vclk.c | 632 +- + drivers/gpu/drm/meson/meson_vclk.h | 6 +- + drivers/gpu/drm/meson/meson_venc.c | 1254 +- + drivers/gpu/drm/meson/meson_venc.h | 7 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 30 +- + drivers/gpu/drm/meson/meson_viu.c | 6 +- + drivers/gpu/drm/meson/meson_vpp.c | 8 +- + drivers/gpu/drm/meson/meson_vpp.h | 2 + + drivers/gpu/drm/mgag200/mgag200_fb.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 1 + + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 2 - + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 4 - + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 22 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 126 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 43 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 12 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 32 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 83 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 8 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 30 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 466 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 192 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 21 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 66 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 130 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 53 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.c | 172 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.h | 47 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c | 2 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h | 1 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 348 +- + drivers/gpu/drm/msm/mdp/mdp_kms.h | 6 + + drivers/gpu/drm/msm/msm_debugfs.c | 19 +- + drivers/gpu/drm/msm/msm_debugfs.h | 1 - + drivers/gpu/drm/msm/msm_drv.c | 21 +- + drivers/gpu/drm/msm/msm_drv.h | 9 +- + drivers/gpu/drm/msm/msm_fbdev.c | 1 - + drivers/gpu/drm/msm/msm_gem.h | 2 + + drivers/gpu/drm/msm/msm_gem_submit.c | 39 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 35 +- + drivers/gpu/drm/msm/msm_gpu.c | 183 +- + drivers/gpu/drm/msm/msm_gpu.h | 18 +- + drivers/gpu/drm/msm/msm_iommu.c | 69 +- + drivers/gpu/drm/msm/msm_kms.h | 1 - + drivers/gpu/drm/msm/msm_perf.c | 34 +- + drivers/gpu/drm/msm/msm_rd.c | 40 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 18 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 40 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 10 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 18 +- + drivers/gpu/drm/nouveau/include/nvif/class.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 7 +- + .../gpu/drm/nouveau/include/nvkm/core/msgqueue.h | 43 + + drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | 4 + + .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 9 + + drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 3 + + .../gpu/drm/nouveau/include/nvkm/engine/nvdec.h | 8 + + drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h | 13 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 8 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/secboot.h | 10 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 1 + + drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 62 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.h | 6 - + drivers/gpu/drm/nouveau/nouveau_display.c | 124 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 - + drivers/gpu/drm/nouveau/nouveau_platform.c | 12 + + drivers/gpu/drm/nouveau/nouveau_usif.c | 1 - + drivers/gpu/drm/nouveau/nouveau_vga.c | 14 +- + drivers/gpu/drm/nouveau/nv50_display.c | 127 +- + drivers/gpu/drm/nouveau/nvkm/core/mm.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 50 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 31 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp10b.c | 41 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild | 5 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 7 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c | 98 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c | 47 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 45 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 9 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c | 67 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c | 53 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c | 59 + + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c | 59 + + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gp102.c | 30 + + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h | 6 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c | 108 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c | 30 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h | 9 + + drivers/gpu/drm/nouveau/nvkm/falcon/Kbuild | 3 + + drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 40 +- + drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c | 575 + + drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.h | 213 + + .../drm/nouveau/nvkm/falcon/msgqueue_0137c63d.c | 436 + + .../drm/nouveau/nvkm/falcon/msgqueue_0148cdec.c | 264 + + drivers/gpu/drm/nouveau/nvkm/falcon/v1.c | 124 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 4 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c | 42 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp10b.c | 38 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 33 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c | 148 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c | 62 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 70 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c | 68 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 68 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gp10b.c | 59 + + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c | 49 + + drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h | 6 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild | 7 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.h | 14 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 565 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h | 147 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c | 149 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.h | 72 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r364.c | 117 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r367.c | 389 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r367.h | 36 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r375.c | 165 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c | 17 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c | 23 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.h | 6 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c | 25 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c | 252 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/gp10b.c | 93 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/hs_ucode.c | 97 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/hs_ucode.h | 81 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h | 12 +- + .../drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c | 10 +- + .../nvkm/subdev/secboot/ls_ucode_msgqueue.c | 205 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 9 - + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 37 +- + drivers/gpu/drm/omapdrm/dss/Kconfig | 4 + + drivers/gpu/drm/omapdrm/dss/Makefile | 8 +- + drivers/gpu/drm/omapdrm/dss/base.c | 140 + + drivers/gpu/drm/omapdrm/dss/dispc.c | 278 +- + drivers/gpu/drm/omapdrm/dss/dispc.h | 62 +- + drivers/gpu/drm/omapdrm/dss/display.c | 36 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 60 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 22 +- + drivers/gpu/drm/omapdrm/dss/dss-of.c | 105 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 77 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 37 +- + drivers/gpu/drm/omapdrm/dss/dss_features.c | 9 +- + drivers/gpu/drm/omapdrm/dss/dss_features.h | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 3 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 3 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 12 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 111 +- + drivers/gpu/drm/omapdrm/dss/output.c | 27 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 17 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 3 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 18 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 121 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 260 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 10 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 - + drivers/gpu/drm/omapdrm/omap_gem.c | 5 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 61 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 47 +- + drivers/gpu/drm/panel/Kconfig | 23 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-lvds.c | 286 + + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 739 + + drivers/gpu/drm/panel/panel-simple.c | 56 + + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 449 + + drivers/gpu/drm/qxl/qxl_debugfs.c | 22 - + drivers/gpu/drm/qxl/qxl_display.c | 822 +- + drivers/gpu/drm/qxl/qxl_drv.c | 32 +- + drivers/gpu/drm/qxl/qxl_drv.h | 12 +- + drivers/gpu/drm/qxl/qxl_fb.c | 39 +- + drivers/gpu/drm/qxl/qxl_kms.c | 28 +- + drivers/gpu/drm/qxl/qxl_object.c | 41 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 1 + + drivers/gpu/drm/r128/r128_cce.c | 7 +- + drivers/gpu/drm/radeon/atom.c | 46 +- + drivers/gpu/drm/radeon/cik.c | 63 +- + drivers/gpu/drm/radeon/cikd.h | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 7 +- + drivers/gpu/drm/radeon/ni.c | 22 +- + drivers/gpu/drm/radeon/r100.c | 20 +- + drivers/gpu/drm/radeon/r200.c | 3 +- + drivers/gpu/drm/radeon/r300.c | 13 +- + drivers/gpu/drm/radeon/r420.c | 9 +- + drivers/gpu/drm/radeon/r520.c | 3 +- + drivers/gpu/drm/radeon/r600.c | 21 +- + drivers/gpu/drm/radeon/r600_cs.c | 7 +- + drivers/gpu/drm/radeon/r600_dpm.c | 71 +- + drivers/gpu/drm/radeon/radeon.h | 4 +- + drivers/gpu/drm/radeon/radeon_acpi.h | 12 + + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 4 +- + drivers/gpu/drm/radeon/radeon_audio.c | 4 +- + drivers/gpu/drm/radeon/radeon_clocks.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 10 + + drivers/gpu/drm/radeon/radeon_device.c | 20 +- + drivers/gpu/drm/radeon/radeon_display.c | 17 +- + drivers/gpu/drm/radeon/radeon_dp_auxch.c | 3 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +- + drivers/gpu/drm/radeon/radeon_drv.c | 6 +- + drivers/gpu/drm/radeon/radeon_fb.c | 14 +- + drivers/gpu/drm/radeon/radeon_gem.c | 8 +- + drivers/gpu/drm/radeon/radeon_kms.c | 45 +- + drivers/gpu/drm/radeon/radeon_object.c | 5 + + drivers/gpu/drm/radeon/radeon_prime.c | 6 + + drivers/gpu/drm/radeon/radeon_test.c | 6 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 1 + + drivers/gpu/drm/radeon/rs400.c | 4 +- + drivers/gpu/drm/radeon/rs690.c | 3 +- + drivers/gpu/drm/radeon/rv515.c | 9 +- + drivers/gpu/drm/radeon/si.c | 45 +- + drivers/gpu/drm/rcar-du/Kconfig | 10 +- + drivers/gpu/drm/rcar-du/Makefile | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 123 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 64 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 187 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 14 +- + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 134 - + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.h | 35 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 143 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 68 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 11 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 13 + + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 23 + + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 82 - + drivers/gpu/drm/rcar-du/rcar_du_vgacon.h | 23 - + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 2 +- + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 100 + + drivers/gpu/drm/rockchip/Kconfig | 10 +- + drivers/gpu/drm/rockchip/Makefile | 16 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 38 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 23 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 6 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.h | 13 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 513 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 11 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 243 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 101 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 8 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 12 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 61 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 - + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 236 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 8 +- + drivers/gpu/drm/sti/sti_drv.c | 17 +- + drivers/gpu/drm/sti/sti_gdp.c | 12 +- + drivers/gpu/drm/sun4i/Makefile | 4 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 86 +- + drivers/gpu/drm/sun4i/sun4i_crtc.h | 8 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 85 +- + drivers/gpu/drm/sun4i/sun4i_drv.h | 4 - + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - + drivers/gpu/drm/sun4i/sun4i_layer.c | 32 +- + drivers/gpu/drm/sun4i/sun4i_layer.h | 4 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 41 +- + drivers/gpu/drm/sun4i/sun4i_rgb.h | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 126 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 3 + + drivers/gpu/drm/sun4i/sun4i_tv.c | 27 +- + drivers/gpu/drm/tegra/dc.c | 23 +- + drivers/gpu/drm/tegra/drm.c | 38 - + drivers/gpu/drm/tegra/drm.h | 3 - + drivers/gpu/drm/tegra/fb.c | 5 +- + drivers/gpu/drm/tegra/gem.c | 8 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 35 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 26 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 68 +- + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 19 +- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 2 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 3 + + drivers/gpu/drm/tinydrm/mipi-dbi.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 116 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 10 +- + drivers/gpu/drm/udl/udl_dmabuf.c | 8 +- + drivers/gpu/drm/udl/udl_fb.c | 5 +- + drivers/gpu/drm/udl/udl_modeset.c | 3 +- + drivers/gpu/drm/vc4/Kconfig | 4 + + drivers/gpu/drm/vc4/vc4_bo.c | 26 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 23 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 31 +- + drivers/gpu/drm/vc4/vc4_drv.c | 41 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 - + drivers/gpu/drm/vc4/vc4_dsi.c | 21 +- + drivers/gpu/drm/vc4/vc4_gem.c | 26 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 517 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 12 +- + drivers/gpu/drm/vc4/vc4_irq.c | 3 +- + drivers/gpu/drm/vc4/vc4_plane.c | 29 +- + drivers/gpu/drm/vc4/vc4_regs.h | 107 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 4 + + drivers/gpu/drm/vc4/vc4_validate.c | 34 +- + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 21 +- + drivers/gpu/drm/vc4/vc4_vec.c | 6 + + drivers/gpu/drm/vgem/vgem_drv.c | 4 +- + drivers/gpu/drm/via/via_dmablit.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 8 - + drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 6 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 63 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 73 + + drivers/gpu/drm/virtio/virtgpu_ttm.c | 1 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 57 +- + drivers/gpu/drm/vmwgfx/Makefile | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 85 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 1115 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 147 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 373 +- + drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 258 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 40 + + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 513 +- + drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 256 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 940 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_va.c | 168 + + drivers/gpu/drm/zte/zx_drm_drv.c | 17 +- + drivers/gpu/drm/zte/zx_hdmi.c | 1 - + drivers/gpu/drm/zte/zx_vou.c | 61 +- + drivers/gpu/drm/zte/zx_vou.h | 3 - + drivers/gpu/ipu-v3/Makefile | 4 + + drivers/gpu/ipu-v3/ipu-common.c | 46 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 78 +- + drivers/gpu/ipu-v3/ipu-dc.c | 61 +- + drivers/gpu/ipu-v3/ipu-dp.c | 15 +- + drivers/gpu/ipu-v3/ipu-image-convert.c | 7 +- + drivers/gpu/ipu-v3/ipu-pre.c | 289 + + drivers/gpu/ipu-v3/ipu-prg.c | 424 + + drivers/gpu/ipu-v3/ipu-prv.h | 27 +- + drivers/gpu/vga/vga_switcheroo.c | 28 +- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 +- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 +- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 +- + drivers/of/platform.c | 71 + + drivers/pci/pci.h | 2 + + drivers/pci/probe.c | 21 + + drivers/platform/x86/apple-gmux.c | 31 +- + drivers/staging/android/ion/ion.c | 8 +- + include/drm/bridge/analogix_dp.h | 3 + + include/drm/bridge/dw_hdmi.h | 101 +- + include/drm/drmP.h | 330 +- + include/drm/drm_atomic.h | 350 +- + include/drm/drm_atomic_helper.h | 47 +- + include/drm/drm_auth.h | 17 + + include/drm/drm_connector.h | 154 +- + include/drm/drm_crtc.h | 101 +- + include/drm/drm_crtc_helper.h | 42 +- + include/drm/drm_debugfs.h | 101 + + include/drm/drm_dp_helper.h | 66 + + include/drm/drm_dp_mst_helper.h | 15 +- + include/drm/drm_drv.h | 102 +- + include/drm/drm_edid.h | 8 +- + include/drm/drm_fb_helper.h | 16 +- + include/drm/drm_file.h | 375 + + include/drm/drm_fourcc.h | 6 + + include/drm/drm_framebuffer.h | 49 +- + include/drm/drm_gem.h | 110 +- + include/drm/drm_gem_cma_helper.h | 26 + + include/drm/drm_global.h | 8 +- + include/drm/drm_hashtab.h | 20 +- + include/drm/drm_ioctl.h | 188 + + include/drm/drm_irq.h | 1 - + include/drm/drm_mm.h | 5 +- + include/drm/drm_mode_config.h | 167 +- + include/drm/drm_mode_object.h | 36 +- + include/drm/drm_modeset_helper_vtables.h | 70 + + include/drm/drm_modeset_lock.h | 5 - + include/drm/drm_of.h | 37 +- + include/drm/drm_panel.h | 2 +- + include/drm/drm_pci.h | 75 + + include/drm/drm_plane.h | 43 +- + include/drm/drm_plane_helper.h | 6 +- + include/drm/drm_prime.h | 80 + + include/drm/drm_print.h | 3 + + include/drm/drm_property.h | 35 +- + include/drm/drm_scdc_helper.h | 161 + + include/drm/drm_simple_kms_helper.h | 2 +- + include/drm/drm_sysfs.h | 12 +- + include/drm/drm_vma_manager.h | 1 - + include/drm/i915_pciids.h | 11 +- + include/drm/tinydrm/tinydrm.h | 4 +- + include/drm/ttm/ttm_bo_api.h | 71 +- + include/drm/ttm/ttm_bo_driver.h | 11 +- + include/drm/ttm/ttm_placement.h | 1 + + include/linux/dma-buf.h | 22 +- + include/linux/dma-fence-array.h | 2 + + include/linux/hdmi.h | 1 + + include/linux/of_platform.h | 11 + + include/linux/pci.h | 23 + + include/linux/reservation.h | 20 + + include/uapi/drm/amdgpu_drm.h | 69 +- + include/uapi/drm/drm.h | 3 +- + include/uapi/drm/drm_fourcc.h | 14 + + include/uapi/drm/drm_mode.h | 4 + + include/uapi/drm/etnaviv_drm.h | 8 + + include/uapi/drm/i915_drm.h | 65 +- + include/uapi/drm/msm_drm.h | 1 + + include/uapi/drm/vmwgfx_drm.h | 24 + + include/uapi/linux/media-bus-format.h | 13 +- + include/video/imx-ipu-v3.h | 39 +- + kernel/locking/lockdep.c | 2 + + scripts/coccinelle/api/drm-get-put.cocci | 92 + + tools/testing/selftests/drivers/gpu/i915.sh | 1 + + 1042 files changed, 454853 insertions(+), 26961 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/lvds-transmitter.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-lvds.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e3ha2.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sitronix,st7789v.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/winstar,wf35ltiacd.txt + create mode 100644 Documentation/gpu/bridge/dw-hdmi.rst + create mode 100644 Documentation/gpu/meson.rst + create mode 100644 Documentation/gpu/todo.rst + create mode 100644 Documentation/gpu/vc4.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v3_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc15.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc15.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc15_common.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc15d.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega10_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega10_ih.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega10_sdma_pkt_open.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/GC/gc_9_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/GC/gc_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/GC/gc_9_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MMHUB/mmhub_1_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MMHUB/mmhub_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MMHUB/mmhub_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIF/nbif_6_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIF/nbif_6_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIF/nbif_6_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIO/nbio_6_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIO/nbio_6_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIO/nbio_6_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/OSSSYS/osssys_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/OSSSYS/osssys_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/OSSSYS/osssys_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SMUIO/smuio_9_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SMUIO/smuio_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SMUIO/smuio_9_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/THM/thm_9_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/THM/thm_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/THM/thm_9_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/UVD/uvd_7_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/UVD/uvd_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/UVD/uvd_7_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/VCE/vce_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/VCE/vce_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/VCE/vce_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/soc15ip.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/vega10_enum.h + create mode 100644 drivers/gpu/drm/amd/include/atomfirmware.h + create mode 100644 drivers/gpu/drm/amd/include/atomfirmwareid.h + create mode 100644 drivers/gpu/drm/amd/include/displayobject.h + create mode 100644 drivers/gpu/drm/amd/include/dm_pp_interface.h + create mode 100644 drivers/gpu/drm/amd/include/v9_structs.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_pptable.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_processpptables.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_processpptables.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_soc15.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu9.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h + delete mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c + delete mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h + create mode 100644 drivers/gpu/drm/bridge/lvds-encoder.c + create mode 100644 drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c + create mode 100644 drivers/gpu/drm/bridge/synopsys/Kconfig + create mode 100644 drivers/gpu/drm/bridge/synopsys/Makefile + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi-ahb-audio.c (100%) + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi-audio.h (100%) + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi-i2s-audio.c (100%) + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.c (74%) + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.h (99%) + rename drivers/gpu/drm/{drm_fops.c => drm_file.c} (90%) + delete mode 100644 drivers/gpu/drm/drm_platform.c + create mode 100644 drivers/gpu/drm/drm_scdc_helper.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_clflush.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_clflush.h + create mode 100644 drivers/gpu/drm/i915/i915_selftest.h + create mode 100644 drivers/gpu/drm/i915/intel_cdclk.c + rename drivers/gpu/drm/i915/{intel_dsi_panel_vbt.c => intel_dsi_vbt.c} (89%) + create mode 100644 drivers/gpu/drm/i915/selftests/huge_gem_object.c + create mode 100644 drivers/gpu/drm/i915/selftests/huge_gem_object.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_coherency.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_context.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_evict.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_object.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_request.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_live_selftests.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_mock_selftests.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_random.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_random.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_selftest.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_vma.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_hangcheck.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_uncore.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_context.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_context.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_dmabuf.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_dmabuf.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_drm.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_drm.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_engine.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_engine.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gem_device.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gem_device.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gem_object.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gtt.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gtt.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_request.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_request.h + create mode 100644 drivers/gpu/drm/i915/selftests/scatterlist.c + create mode 100644 drivers/gpu/drm/meson/meson_dw_hdmi.c + create mode 100644 drivers/gpu/drm/meson/meson_dw_hdmi.h + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/msgqueue.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp10b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue_0137c63d.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue_0148cdec.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp10b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gp10b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r364.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r367.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r367.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r375.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp10b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/hs_ucode.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/hs_ucode.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c + create mode 100644 drivers/gpu/drm/omapdrm/dss/base.c + create mode 100644 drivers/gpu/drm/panel/panel-lvds.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c + create mode 100644 drivers/gpu/drm/panel/panel-sitronix-st7789v.c + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.h + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vgacon.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_va.c + create mode 100644 drivers/gpu/ipu-v3/ipu-pre.c + create mode 100644 drivers/gpu/ipu-v3/ipu-prg.c + create mode 100644 include/drm/drm_debugfs.h + create mode 100644 include/drm/drm_file.h + create mode 100644 include/drm/drm_ioctl.h + create mode 100644 include/drm/drm_pci.h + create mode 100644 include/drm/drm_prime.h + create mode 100644 include/drm/drm_scdc_helper.h + create mode 100644 scripts/coccinelle/api/drm-get-put.cocci +$ git am -3 ../patches/0001-tee-merge-fix-for-dma-ops-field-name-changes.patch +Applying: tee: merge fix for dma-ops field name changes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/tee/tee_shm.c +$ git add -A . +$ git commit -v -a --amend +[master 6c518aaa2bd4] Merge remote-tracking branch 'drm/drm-next' + Date: Wed Apr 26 11:45:15 2017 +1000 +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (ab6eb211b07a Merge tag 'drm/panel/for-4.12-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown) +$ git merge drm-tegra/drm/tegra/for-next +Resolved 'drivers/gpu/drm/tegra/drm.c' using previous resolution. +Auto-merging include/uapi/drm/drm_fourcc.h +Auto-merging drivers/gpu/drm/tegra/gem.c +Auto-merging drivers/gpu/drm/tegra/fb.c +Auto-merging drivers/gpu/drm/tegra/drm.h +Auto-merging drivers/gpu/drm/tegra/drm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/drm.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2558bf451930] Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + .../display/tegra/nvidia,tegra20-host1x.txt | 13 + + MAINTAINERS | 2 + + drivers/gpu/drm/tegra/Kconfig | 1 + + drivers/gpu/drm/tegra/Makefile | 4 +- + drivers/gpu/drm/tegra/drm.c | 283 ++++++++++++--- + drivers/gpu/drm/tegra/drm.h | 15 +- + drivers/gpu/drm/tegra/falcon.c | 259 ++++++++++++++ + drivers/gpu/drm/tegra/falcon.h | 127 +++++++ + drivers/gpu/drm/tegra/fb.c | 23 +- + drivers/gpu/drm/tegra/gem.c | 12 +- + drivers/gpu/drm/tegra/vic.c | 396 +++++++++++++++++++++ + drivers/gpu/drm/tegra/vic.h | 31 ++ + drivers/gpu/host1x/bus.c | 68 ++-- + drivers/gpu/host1x/cdma.c | 74 +++- + drivers/gpu/host1x/cdma.h | 6 +- + drivers/gpu/host1x/dev.c | 76 +++- + drivers/gpu/host1x/dev.h | 14 +- + drivers/gpu/host1x/hw/cdma_hw.c | 16 +- + drivers/gpu/host1x/job.c | 72 +++- + drivers/gpu/host1x/job.h | 1 + + drivers/gpu/host1x/syncpt.c | 2 +- + drivers/iommu/iova.c | 87 ++--- + include/linux/host1x.h | 1 + + include/linux/iova.h | 91 +++++ + include/uapi/drm/drm_fourcc.h | 45 +++ + 25 files changed, 1517 insertions(+), 202 deletions(-) + create mode 100644 drivers/gpu/drm/tegra/falcon.c + create mode 100644 drivers/gpu/drm/tegra/falcon.h + create mode 100644 drivers/gpu/drm/tegra/vic.c + create mode 100644 drivers/gpu/drm/tegra/vic.h +Merging drm-misc/for-linux-next (f9b67f0014cb dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro) +$ git merge drm-misc/for-linux-next +Already up-to-date. +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address) +$ git merge hdlcd/for-upstream/hdlcd +Auto-merging drivers/gpu/drm/arm/hdlcd_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/hdlcd_crtc.c | 47 ++++++++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 16 deletions(-) +Merging mali-dp/for-upstream/mali-dp (c2e7f82d336a drm: mali-dp: Check the mclk rate and allow up/down scaling) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_crtc.c | 342 ++++++++++++++++++++++++++++++++++-- + drivers/gpu/drm/arm/malidp_drv.c | 307 +++++++++++++++++++++++++++++--- + drivers/gpu/drm/arm/malidp_drv.h | 13 ++ + drivers/gpu/drm/arm/malidp_hw.c | 213 ++++++++++++++++++++++ + drivers/gpu/drm/arm/malidp_hw.h | 81 +++++++++ + drivers/gpu/drm/arm/malidp_planes.c | 108 ++++++++++-- + drivers/gpu/drm/arm/malidp_regs.h | 72 +++++++- + 7 files changed, 1074 insertions(+), 62 deletions(-) +Merging sunxi-drm/sunxi-drm/for-next (2da042ac05e9 MAINTAINERS: Add sun4i-drm git repo) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up-to-date. +Merging imx-drm/imx-drm/next (3d1df96ad468 drm/imx: merge imx-drm-core and ipuv3-crtc in one module) +$ git merge imx-drm/imx-drm/next +Already up-to-date. +Merging etnaviv/etnaviv/next (78ec187f64fa drm/etnaviv: submit support for out-fences) +$ git merge etnaviv/etnaviv/next +Already up-to-date. +Merging kspp/for-next/kspp (62111ab351b8 Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp) +$ git merge kspp/for-next/kspp +Merge made by the 'recursive' strategy. + arch/Kconfig | 2 +- + arch/x86/include/asm/thread_info.h | 13 +++++++------ + include/linux/thread_info.h | 12 ++++++++++++ + mm/usercopy.c | 19 +------------------ + 4 files changed, 21 insertions(+), 25 deletions(-) +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next) +$ git merge regmap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (610793fe2b1c Merge branch 'topic/hda-dual-codecs' into for-next) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + Documentation/sound/hd-audio/notes.rst | 2 + + include/sound/hda_register.h | 30 +- + include/sound/hdaudio.h | 28 +- + include/uapi/sound/asound.h | 4 +- + include/uapi/sound/firewire.h | 10 +- + sound/core/timer.c | 19 +- + sound/drivers/vx/vx_core.c | 4 +- + sound/firewire/Kconfig | 20 ++ + sound/firewire/Makefile | 2 + + sound/firewire/amdtp-stream-trace.h | 94 +++++- + sound/firewire/amdtp-stream.c | 158 ++++++++-- + sound/firewire/amdtp-stream.h | 16 +- + sound/firewire/bebob/bebob_command.c | 30 +- + sound/firewire/digi00x/amdtp-dot.c | 55 ++-- + sound/firewire/digi00x/digi00x-midi.c | 208 +++++-------- + sound/firewire/digi00x/digi00x-transaction.c | 88 +----- + sound/firewire/digi00x/digi00x.c | 13 +- + sound/firewire/digi00x/digi00x.h | 7 +- + sound/firewire/fcp.c | 12 +- + sound/firewire/fireface/Makefile | 3 + + sound/firewire/fireface/amdtp-ff.c | 155 ++++++++++ + sound/firewire/fireface/ff-hwdep.c | 191 ++++++++++++ + sound/firewire/fireface/ff-midi.c | 131 ++++++++ + sound/firewire/fireface/ff-pcm.c | 409 +++++++++++++++++++++++++ + sound/firewire/fireface/ff-proc.c | 63 ++++ + sound/firewire/fireface/ff-protocol-ff400.c | 371 +++++++++++++++++++++++ + sound/firewire/fireface/ff-stream.c | 282 ++++++++++++++++++ + sound/firewire/fireface/ff-transaction.c | 295 ++++++++++++++++++ + sound/firewire/fireface/ff.c | 209 +++++++++++++ + sound/firewire/fireface/ff.h | 146 +++++++++ + sound/firewire/lib.c | 141 --------- + sound/firewire/lib.h | 54 ---- + sound/firewire/motu/Makefile | 6 + + sound/firewire/motu/amdtp-motu-trace.h | 123 ++++++++ + sound/firewire/motu/amdtp-motu.c | 427 +++++++++++++++++++++++++++ + sound/firewire/motu/motu-hwdep.c | 198 +++++++++++++ + sound/firewire/motu/motu-midi.c | 169 +++++++++++ + sound/firewire/motu/motu-pcm.c | 398 +++++++++++++++++++++++++ + sound/firewire/motu/motu-proc.c | 118 ++++++++ + sound/firewire/motu/motu-protocol-v2.c | 237 +++++++++++++++ + sound/firewire/motu/motu-protocol-v3.c | 311 +++++++++++++++++++ + sound/firewire/motu/motu-stream.c | 381 ++++++++++++++++++++++++ + sound/firewire/motu/motu-transaction.c | 137 +++++++++ + sound/firewire/motu/motu.c | 264 +++++++++++++++++ + sound/firewire/motu/motu.h | 161 ++++++++++ + sound/firewire/oxfw/oxfw-command.c | 12 +- + sound/firewire/tascam/tascam-midi.c | 13 +- + sound/firewire/tascam/tascam-transaction.c | 142 +++++++-- + sound/firewire/tascam/tascam.h | 39 ++- + sound/hda/ext/hdac_ext_controller.c | 6 +- + sound/hda/hdac_controller.c | 2 +- + sound/hda/hdac_stream.c | 4 +- + sound/isa/es1688/es1688_lib.c | 2 +- + sound/pci/au88x0/au88x0_a3d.c | 2 +- + sound/pci/au88x0/au88x0_core.c | 3 + + sound/pci/au88x0/au88x0_eq.c | 6 +- + sound/pci/au88x0/au88x0_pcm.c | 2 +- + sound/pci/aw2/aw2-alsa.c | 2 +- + sound/pci/bt87x.c | 6 +- + sound/pci/ca0106/ca0106_mixer.c | 4 +- + sound/pci/cmipci.c | 6 +- + sound/pci/cs4281.c | 4 +- + sound/pci/echoaudio/echoaudio.c | 26 +- + sound/pci/emu10k1/emu10k1x.c | 6 +- + sound/pci/emu10k1/emumixer.c | 30 +- + sound/pci/emu10k1/emupcm.c | 2 +- + sound/pci/ens1370.c | 4 +- + sound/pci/hda/hda_auto_parser.c | 1 + + sound/pci/hda/hda_codec.c | 4 +- + sound/pci/hda/hda_codec.h | 1 + + sound/pci/hda/hda_generic.c | 9 +- + sound/pci/hda/hda_generic.h | 1 + + sound/pci/hda/hda_intel.c | 139 ++++++++- + sound/pci/hda/patch_ca0132.c | 10 +- + sound/pci/hda/patch_conexant.c | 81 +++++ + sound/pci/hda/patch_hdmi.c | 29 +- + sound/pci/hda/patch_realtek.c | 185 +++++++++++- + sound/pci/ice1712/delta.c | 2 +- + sound/pci/ice1712/ews.c | 4 +- + sound/pci/ice1712/ice1712.c | 30 +- + sound/pci/ice1712/ice1724.c | 20 +- + sound/pci/lola/lola_mixer.c | 2 +- + sound/pci/lx6464es/lx6464es.c | 2 +- + sound/pci/mixart/mixart_mixer.c | 6 +- + sound/pci/oxygen/oxygen.c | 6 +- + sound/pci/pcxhr/pcxhr_mix22.c | 6 +- + sound/pci/pcxhr/pcxhr_mixer.c | 22 +- + sound/pci/trident/trident_main.c | 22 +- + sound/pci/via82xx.c | 6 +- + sound/pci/vx222/vx222_ops.c | 4 +- + sound/pci/ymfpci/ymfpci_main.c | 14 +- + sound/soc/intel/skylake/skl.h | 21 -- + sound/synth/emux/emux_oss.c | 4 +- + sound/usb/card.c | 6 +- + sound/usb/line6/pcm.c | 2 +- + sound/usb/line6/pod.c | 2 +- + sound/usb/line6/toneport.c | 4 +- + sound/usb/midi.c | 2 +- + sound/usb/mixer.c | 6 +- + sound/usb/mixer_scarlett.c | 12 +- + sound/usb/usx2y/us122l.c | 2 +- + sound/usb/usx2y/usX2Yhwdep.c | 2 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- + 103 files changed, 6438 insertions(+), 736 deletions(-) + create mode 100644 sound/firewire/fireface/Makefile + create mode 100644 sound/firewire/fireface/amdtp-ff.c + create mode 100644 sound/firewire/fireface/ff-hwdep.c + create mode 100644 sound/firewire/fireface/ff-midi.c + create mode 100644 sound/firewire/fireface/ff-pcm.c + create mode 100644 sound/firewire/fireface/ff-proc.c + create mode 100644 sound/firewire/fireface/ff-protocol-ff400.c + create mode 100644 sound/firewire/fireface/ff-stream.c + create mode 100644 sound/firewire/fireface/ff-transaction.c + create mode 100644 sound/firewire/fireface/ff.c + create mode 100644 sound/firewire/fireface/ff.h + create mode 100644 sound/firewire/motu/Makefile + create mode 100644 sound/firewire/motu/amdtp-motu-trace.h + create mode 100644 sound/firewire/motu/amdtp-motu.c + create mode 100644 sound/firewire/motu/motu-hwdep.c + create mode 100644 sound/firewire/motu/motu-midi.c + create mode 100644 sound/firewire/motu/motu-pcm.c + create mode 100644 sound/firewire/motu/motu-proc.c + create mode 100644 sound/firewire/motu/motu-protocol-v2.c + create mode 100644 sound/firewire/motu/motu-protocol-v3.c + create mode 100644 sound/firewire/motu/motu-stream.c + create mode 100644 sound/firewire/motu/motu-transaction.c + create mode 100644 sound/firewire/motu/motu.c + create mode 100644 sound/firewire/motu/motu.h +Merging sound-asoc/for-next (f7190f9f96e7 Merge remote-tracking branches 'asoc/topic/wm8903', 'asoc/topic/wm8960', 'asoc/topic/wm8978' and 'asoc/topic/zte-tdm' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/intel/skylake/skl.h +Auto-merging sound/hda/hdac_controller.c +Removing Documentation/devicetree/bindings/sound/max98926.txt +Removing Documentation/devicetree/bindings/sound/max98925.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/cs35l35.txt | 180 +++ + .../devicetree/bindings/sound/dioo,dio2125.txt | 12 + + .../devicetree/bindings/sound/everest,es7134.txt | 10 + + .../devicetree/bindings/sound/fsl,ssi.txt | 34 +- + .../bindings/sound/hisilicon,hi6210-i2s.txt | 42 + + .../devicetree/bindings/sound/max98925.txt | 22 - + .../devicetree/bindings/sound/max98926.txt | 32 - + .../devicetree/bindings/sound/max9892x.txt | 41 + + .../devicetree/bindings/sound/mt2701-wm8960.txt | 24 + + .../devicetree/bindings/sound/rockchip-i2s.txt | 1 + + .../devicetree/bindings/sound/samsung,odroid.txt | 57 + + .../devicetree/bindings/sound/sgtl5000.txt | 9 + + .../devicetree/bindings/sound/tas2552.txt | 10 +- + Documentation/devicetree/bindings/sound/wm8903.txt | 13 + + .../devicetree/bindings/sound/zte,tdm.txt | 30 + + include/sound/cs35l35.h | 108 ++ + include/sound/soc.h | 14 +- + sound/hda/hdac_controller.c | 2 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/blackfin/bfin-eval-adau1373.c | 2 +- + sound/soc/blackfin/bfin-eval-adav80x.c | 2 +- + sound/soc/codecs/Kconfig | 25 +- + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ak4613.c | 10 +- + sound/soc/codecs/cs35l35.c | 1580 ++++++++++++++++++++ + sound/soc/codecs/cs35l35.h | 294 ++++ + sound/soc/codecs/cs53l30.c | 1 + + sound/soc/codecs/da7213.c | 13 + + sound/soc/codecs/dio2125.c | 120 ++ + sound/soc/codecs/es7134.c | 116 ++ + sound/soc/codecs/es8328.c | 51 +- + sound/soc/codecs/hdac_hdmi.c | 4 +- + sound/soc/codecs/max9867.c | 4 +- + sound/soc/codecs/max98927.c | 841 +++++++++++ + sound/soc/codecs/max98927.h | 272 ++++ + sound/soc/codecs/nau8540.c | 1224 +++++++-------- + sound/soc/codecs/nau8540.h | 310 ++-- + sound/soc/codecs/rt5514.c | 36 +- + sound/soc/codecs/rt5645.c | 10 + + sound/soc/codecs/rt5665.c | 222 ++- + sound/soc/codecs/rt5665.h | 2 - + sound/soc/codecs/rt5670.c | 21 + + sound/soc/codecs/rt5677.c | 7 + + sound/soc/codecs/sgtl5000.c | 19 +- + sound/soc/codecs/ssm4567.c | 9 + + sound/soc/codecs/sta529.c | 7 + + sound/soc/codecs/tas2552.c | 6 +- + sound/soc/codecs/tlv320aic23.c | 7 +- + sound/soc/codecs/twl6040.c | 8 + + sound/soc/codecs/uda1380.c | 7 + + sound/soc/codecs/wm5100.c | 2 +- + sound/soc/codecs/wm8903.c | 31 + + sound/soc/codecs/wm8960.c | 187 ++- + sound/soc/codecs/wm8978.c | 7 + + sound/soc/codecs/wm_adsp.c | 324 +++- + sound/soc/codecs/wm_adsp.h | 24 + + sound/soc/fsl/eukrea-tlv320.c | 2 +- + sound/soc/fsl/fsl_asrc_dma.c | 2 +- + sound/soc/fsl/fsl_esai.c | 5 +- + sound/soc/fsl/fsl_ssi.c | 27 +- + sound/soc/fsl/imx-mc13783.c | 2 +- + sound/soc/fsl/imx-pcm-dma.c | 28 - + sound/soc/fsl/imx-pcm-fiq.c | 2 +- + sound/soc/fsl/imx-wm8962.c | 72 +- + sound/soc/fsl/mpc8610_hpcd.c | 2 +- + sound/soc/fsl/mx27vis-aic32x4.c | 2 +- + sound/soc/fsl/p1022_ds.c | 2 +- + sound/soc/fsl/p1022_rdk.c | 2 +- + sound/soc/fsl/phycore-ac97.c | 2 +- + sound/soc/fsl/wm1133-ev1.c | 2 +- + sound/soc/generic/simple-card.c | 43 +- + sound/soc/generic/simple-scu-card.c | 37 +- + sound/soc/hisilicon/Kconfig | 5 + + sound/soc/hisilicon/Makefile | 1 + + sound/soc/hisilicon/hi6210-i2s.c | 618 ++++++++ + sound/soc/hisilicon/hi6210-i2s.h | 276 ++++ + sound/soc/intel/Kconfig | 24 + + sound/soc/intel/atom/sst/sst_acpi.c | 41 +- + sound/soc/intel/atom/sst/sst_ipc.c | 4 +- + sound/soc/intel/boards/Makefile | 4 + + sound/soc/intel/boards/bdw-rt5677.c | 5 +- + sound/soc/intel/boards/broadwell.c | 3 - + sound/soc/intel/boards/bxt_da7219_max98357a.c | 97 +- + sound/soc/intel/boards/bxt_rt298.c | 3 + + sound/soc/intel/boards/bytcht_da7213.c | 283 ++++ + sound/soc/intel/boards/bytcht_nocodec.c | 208 +++ + sound/soc/intel/boards/bytcr_rt5640.c | 109 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 6 - + sound/soc/intel/skylake/bxt-sst.c | 98 +- + sound/soc/intel/skylake/skl-messages.c | 14 +- + sound/soc/intel/skylake/skl-nhlt.c | 7 +- + sound/soc/intel/skylake/skl-pcm.c | 116 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 26 +- + sound/soc/intel/skylake/skl-sst-cldma.h | 2 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 6 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 27 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 66 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 15 + + sound/soc/intel/skylake/skl-sst-utils.c | 60 +- + sound/soc/intel/skylake/skl-sst.c | 58 +- + sound/soc/intel/skylake/skl-topology.c | 235 ++- + sound/soc/intel/skylake/skl-topology.h | 17 +- + sound/soc/intel/skylake/skl.c | 2 +- + sound/soc/intel/skylake/skl.h | 1 + + sound/soc/mediatek/Kconfig | 10 + + sound/soc/mediatek/mt2701/Makefile | 1 + + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 16 + + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 176 +++ + sound/soc/mediatek/mt8173/mt8173-max98090.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 +- + sound/soc/omap/am3517evm.c | 2 +- + sound/soc/omap/n810.c | 2 +- + sound/soc/omap/omap-abe-twl6040.c | 2 +- + sound/soc/omap/omap-twl4030.c | 2 +- + sound/soc/omap/omap3pandora.c | 2 +- + sound/soc/omap/osk5912.c | 2 +- + sound/soc/omap/rx51.c | 7 +- + sound/soc/pxa/brownstone.c | 2 +- + sound/soc/pxa/corgi.c | 2 +- + sound/soc/pxa/e750_wm9705.c | 2 +- + sound/soc/pxa/e800_wm9712.c | 2 +- + sound/soc/pxa/em-x270.c | 2 +- + sound/soc/pxa/hx4700.c | 2 +- + sound/soc/pxa/imote2.c | 2 +- + sound/soc/pxa/magician.c | 4 +- + sound/soc/pxa/mioa701_wm9713.c | 2 +- + sound/soc/pxa/mmp-pcm.c | 1 - + sound/soc/pxa/mmp-sspa.c | 1 - + sound/soc/pxa/poodle.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 15 +- + sound/soc/pxa/pxa2xx-ac97.c | 5 +- + sound/soc/pxa/pxa2xx-i2s.c | 8 +- + sound/soc/pxa/pxa2xx-pcm.c | 2 +- + sound/soc/pxa/raumfeld.c | 8 +- + sound/soc/pxa/spitz.c | 6 +- + sound/soc/pxa/tosa.c | 4 +- + sound/soc/pxa/z2.c | 6 +- + sound/soc/pxa/zylonite.c | 2 +- + sound/soc/qcom/lpass-apq8016.c | 12 + + sound/soc/qcom/lpass-cpu.c | 22 +- + sound/soc/qcom/lpass-ipq806x.c | 6 + + sound/soc/qcom/lpass.h | 2 + + sound/soc/rockchip/rk3288_hdmi_analog.c | 3 + + sound/soc/samsung/Kconfig | 8 + + sound/soc/samsung/Makefile | 2 + + sound/soc/samsung/bells.c | 1 - + sound/soc/samsung/i2s-regs.h | 2 - + sound/soc/samsung/i2s.c | 1 - + sound/soc/samsung/odroid.c | 219 +++ + sound/soc/samsung/s3c-i2s-v2.c | 1 - + sound/soc/sh/rcar/adg.c | 75 +- + sound/soc/sh/rcar/core.c | 111 +- + sound/soc/sh/rcar/dvc.c | 24 +- + sound/soc/sh/rcar/rsnd.h | 55 +- + sound/soc/sh/rcar/src.c | 3 +- + sound/soc/sh/rcar/ssi.c | 9 + + sound/soc/sirf/sirf-audio-port.c | 1 + + sound/soc/sirf/sirf-audio.c | 1 + + sound/soc/sirf/sirf-usp.c | 3 + + sound/soc/soc-core.c | 27 +- + sound/soc/soc-jack.c | 48 + + sound/soc/soc-topology.c | 5 +- + sound/soc/sunxi/sun8i-codec-analog.c | 168 ++- + sound/soc/sunxi/sun8i-codec.c | 10 +- + sound/soc/tegra/tegra20_ac97.c | 1 - + sound/soc/tegra/tegra20_das.c | 2 +- + sound/soc/tegra/tegra20_i2s.c | 1 - + sound/soc/tegra/tegra20_spdif.c | 5 +- + sound/soc/tegra/tegra30_ahub.c | 5 +- + sound/soc/tegra/tegra30_i2s.c | 1 - + sound/soc/tegra/tegra_alc5632.c | 4 +- + sound/soc/tegra/tegra_max98090.c | 4 +- + sound/soc/tegra/tegra_rt5640.c | 4 +- + sound/soc/tegra/tegra_sgtl5000.c | 4 +- + sound/soc/tegra/tegra_wm8753.c | 4 +- + sound/soc/tegra/tegra_wm8903.c | 4 +- + sound/soc/tegra/tegra_wm9712.c | 4 +- + sound/soc/tegra/trimslice.c | 4 +- + sound/soc/txx9/txx9aclc.c | 5 +- + sound/soc/ux500/mop500.c | 4 - + sound/soc/ux500/ux500_msp_dai.c | 4 +- + sound/soc/ux500/ux500_msp_i2s.c | 1 - + sound/soc/zte/Kconfig | 8 + + sound/soc/zte/Makefile | 1 + + sound/soc/zte/zx-tdm.c | 461 ++++++ + 189 files changed, 8915 insertions(+), 1872 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cs35l35.txt + create mode 100644 Documentation/devicetree/bindings/sound/dioo,dio2125.txt + create mode 100644 Documentation/devicetree/bindings/sound/everest,es7134.txt + create mode 100644 Documentation/devicetree/bindings/sound/hisilicon,hi6210-i2s.txt + delete mode 100644 Documentation/devicetree/bindings/sound/max98925.txt + delete mode 100644 Documentation/devicetree/bindings/sound/max98926.txt + create mode 100644 Documentation/devicetree/bindings/sound/max9892x.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt2701-wm8960.txt + create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.txt + create mode 100644 Documentation/devicetree/bindings/sound/zte,tdm.txt + create mode 100644 include/sound/cs35l35.h + create mode 100644 sound/soc/codecs/cs35l35.c + create mode 100644 sound/soc/codecs/cs35l35.h + create mode 100644 sound/soc/codecs/dio2125.c + create mode 100644 sound/soc/codecs/es7134.c + create mode 100644 sound/soc/codecs/max98927.c + create mode 100644 sound/soc/codecs/max98927.h + create mode 100644 sound/soc/hisilicon/Kconfig + create mode 100644 sound/soc/hisilicon/Makefile + create mode 100644 sound/soc/hisilicon/hi6210-i2s.c + create mode 100644 sound/soc/hisilicon/hi6210-i2s.h + create mode 100644 sound/soc/intel/boards/bytcht_da7213.c + create mode 100644 sound/soc/intel/boards/bytcht_nocodec.c + create mode 100644 sound/soc/mediatek/mt2701/mt2701-wm8960.c + create mode 100644 sound/soc/samsung/odroid.c + create mode 100644 sound/soc/zte/zx-tdm.c +Merging modules/modules-next (175861882769 kallsyms: Use bounded strnchr() when parsing string) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + include/linux/module.h | 6 +++--- + kernel/module.c | 2 +- + scripts/module-common.lds | 3 +-- + 3 files changed, 5 insertions(+), 6 deletions(-) +Merging input/next (aea415b1d10e Input: add uinput documentation) +$ git merge input/next +Resolved 'Documentation/input/ff.rst' using previous resolution. +Removing include/linux/input/eeti_ts.h +Auto-merging include/linux/i2c.h +Auto-merging drivers/input/touchscreen/tsc2007_core.c +Auto-merging drivers/input/joystick/xpad.c +Auto-merging drivers/i2c/i2c-core.c +Auto-merging MAINTAINERS +Auto-merging Documentation/input/userio.rst +Removing Documentation/input/shape.fig +Removing Documentation/input/sentelic.txt +Auto-merging Documentation/input/notifier.rst +Auto-merging Documentation/input/multi-touch-protocol.rst +Removing Documentation/input/joystick.txt +Removing Documentation/input/joystick-parport.txt +Auto-merging Documentation/input/joydev/joystick-api.rst +Removing Documentation/input/interactive.fig +Removing Documentation/input/input.txt +Auto-merging Documentation/input/input-programming.rst +Removing Documentation/input/iforce-protocol.txt +Removing Documentation/input/gpio-tilt.txt +Auto-merging Documentation/input/gameport-programming.rst +Auto-merging Documentation/input/gamepad.rst +Auto-merging Documentation/input/ff.rst +CONFLICT (content): Merge conflict in Documentation/input/ff.rst +Auto-merging Documentation/input/event-codes.rst +Auto-merging Documentation/input/devices/yealink.rst +Auto-merging Documentation/input/devices/xpad.rst +Auto-merging Documentation/input/devices/walkera0701.rst +Auto-merging Documentation/input/devices/rotary-encoder.rst +Auto-merging Documentation/input/devices/ntrig.rst +Auto-merging Documentation/input/devices/elantech.rst +Auto-merging Documentation/input/devices/cs461x.rst +Auto-merging Documentation/input/devices/cma3000_d0x.rst +Auto-merging Documentation/input/devices/bcm5974.rst +Auto-merging Documentation/input/devices/atarikbd.rst +Auto-merging Documentation/input/devices/appletouch.rst +Auto-merging Documentation/input/devices/amijoy.rst +Auto-merging Documentation/input/devices/alps.rst +Removing Documentation/input/cd32.txt +Auto-merging Documentation/conf.py +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5e1b8a0d9848] Merge remote-tracking branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/conf.py | 2 + + .../bindings/input/gpio-matrix-keypad.txt | 2 + + .../devicetree/bindings/input/pwm-beeper.txt | 1 + + .../devicetree/bindings/input/qcom,pm8xxx-vib.txt | 1 + + .../devicetree/bindings/input/rotary-encoder.txt | 2 +- + .../bindings/input/touchscreen/ad7879.txt | 19 + + .../bindings/input/{ => touchscreen}/ads7846.txt | 0 + .../bindings/input/touchscreen/ar1021.txt | 16 + + .../bindings/input/touchscreen/max11801-ts.txt | 18 + + .../bindings/input/touchscreen/silead_gsl1680.txt | 7 +- + Documentation/input/cd32.txt | 19 - + Documentation/input/conf.py | 10 + + Documentation/input/{alps.txt => devices/alps.rst} | 45 +- + .../input/{amijoy.txt => devices/amijoy.rst} | 179 ++-- + .../{appletouch.txt => devices/appletouch.rst} | 45 +- + .../input/{atarikbd.txt => devices/atarikbd.rst} | 225 +++-- + .../input/{bcm5974.txt => devices/bcm5974.rst} | 43 +- + .../{cma3000_d0x.txt => devices/cma3000_d0x.rst} | 74 +- + .../input/{cs461x.txt => devices/cs461x.rst} | 28 +- + .../{edt-ft5x06.txt => devices/edt-ft5x06.rst} | 0 + .../input/{elantech.txt => devices/elantech.rst} | 306 ++++--- + Documentation/input/devices/gpio-tilt.rst | 103 +++ + Documentation/input/devices/iforce-protocol.rst | 381 ++++++++ + Documentation/input/devices/index.rst | 19 + + Documentation/input/devices/joystick-parport.rst | 611 +++++++++++++ + .../input/{ntrig.txt => devices/ntrig.rst} | 49 +- + .../rotary-encoder.rst} | 117 +-- + Documentation/input/devices/sentelic.rst | 901 +++++++++++++++++++ + .../{walkera0701.txt => devices/walkera0701.rst} | 51 +- + Documentation/input/{xpad.txt => devices/xpad.rst} | 143 +-- + .../input/{yealink.txt => devices/yealink.rst} | 173 ++-- + .../input/{event-codes.txt => event-codes.rst} | 134 ++- + Documentation/input/{ff.txt => ff.rst} | 207 +++-- + Documentation/input/{gamepad.txt => gamepad.rst} | 94 +- + ...rt-programming.txt => gameport-programming.rst} | 83 +- + Documentation/input/gpio-tilt.txt | 103 --- + Documentation/input/iforce-protocol.txt | 258 ------ + Documentation/input/index.rst | 20 + + ...input-programming.txt => input-programming.rst} | 268 +++--- + Documentation/input/input.rst | 281 ++++++ + Documentation/input/input.txt | 290 ------ + Documentation/input/input_kapi.rst | 17 + + Documentation/input/input_uapi.rst | 22 + + Documentation/input/interactive.fig | 42 - + Documentation/input/interactive.svg | 24 + + Documentation/input/joydev/index.rst | 18 + + .../{joystick-api.txt => joydev/joystick-api.rst} | 160 ++-- + Documentation/input/joydev/joystick.rst | 585 ++++++++++++ + Documentation/input/joystick-parport.txt | 542 ------------ + Documentation/input/joystick.txt | 586 ------------ + ...touch-protocol.txt => multi-touch-protocol.rst} | 206 +++-- + Documentation/input/{notifier.txt => notifier.rst} | 10 +- + Documentation/input/sentelic.txt | 873 ------------------ + Documentation/input/shape.fig | 65 -- + Documentation/input/shape.svg | 39 + + Documentation/input/uinput.rst | 245 ++++++ + Documentation/input/{userio.txt => userio.rst} | 79 +- + MAINTAINERS | 4 +- + arch/arm/mach-pxa/raumfeld.c | 24 +- + drivers/i2c/i2c-boardinfo.c | 24 + + drivers/i2c/i2c-core.c | 34 +- + drivers/input/gameport/gameport.c | 9 +- + drivers/input/joystick/db9.c | 4 +- + drivers/input/joystick/gamecon.c | 3 +- + drivers/input/joystick/turbografx.c | 4 +- + drivers/input/joystick/xpad.c | 114 ++- + drivers/input/keyboard/cros_ec_keyb.c | 7 + + drivers/input/keyboard/locomokbd.c | 5 +- + drivers/input/keyboard/matrix_keypad.c | 13 +- + drivers/input/keyboard/omap4-keypad.c | 2 +- + drivers/input/keyboard/qt1070.c | 9 + + drivers/input/keyboard/tca8418_keypad.c | 2 - + drivers/input/misc/Kconfig | 2 +- + drivers/input/misc/apanel.c | 3 +- + drivers/input/misc/axp20x-pek.c | 62 +- + drivers/input/misc/bma150.c | 11 +- + drivers/input/misc/dm355evm_keys.c | 79 +- + drivers/input/misc/drv260x.c | 4 +- + drivers/input/misc/pm8xxx-vibrator.c | 78 +- + drivers/input/misc/pwm-beeper.c | 15 +- + drivers/input/misc/soc_button_array.c | 182 +++- + drivers/input/misc/wistron_btns.c | 5 +- + drivers/input/misc/xen-kbdfront.c | 45 +- + drivers/input/misc/yealink.h | 2 +- + drivers/input/mouse/Kconfig | 16 + + drivers/input/mouse/Makefile | 2 + + drivers/input/mouse/alps.c | 76 +- + drivers/input/mouse/alps.h | 6 +- + drivers/input/mouse/psmouse-base.c | 216 +++-- + drivers/input/mouse/psmouse-smbus.c | 302 +++++++ + drivers/input/mouse/psmouse.h | 102 ++- + drivers/input/mouse/synaptics.c | 980 +++++++++++++-------- + drivers/input/mouse/synaptics.h | 154 ++-- + drivers/input/mouse/synaptics_i2c.c | 9 + + drivers/input/rmi4/rmi_driver.c | 13 +- + drivers/input/rmi4/rmi_f12.c | 18 +- + drivers/input/rmi4/rmi_f34.c | 27 +- + drivers/input/rmi4/rmi_f34.h | 7 +- + drivers/input/rmi4/rmi_f34v7.c | 117 +-- + drivers/input/rmi4/rmi_i2c.c | 51 +- + drivers/input/rmi4/rmi_smbus.c | 94 +- + drivers/input/rmi4/rmi_spi.c | 44 +- + drivers/input/serio/serio.c | 30 +- + drivers/input/sparse-keymap.c | 39 +- + drivers/input/touchscreen/Kconfig | 18 +- + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/ad7879-i2c.c | 67 +- + drivers/input/touchscreen/ad7879-spi.c | 131 +-- + drivers/input/touchscreen/ad7879.c | 152 ++-- + drivers/input/touchscreen/ad7879.h | 14 +- + drivers/input/touchscreen/ads7846.c | 2 +- + drivers/input/touchscreen/ar1021_i2c.c | 12 +- + drivers/input/touchscreen/eeti_ts.c | 226 ++--- + drivers/input/touchscreen/imx6ul_tsc.c | 15 +- + drivers/input/touchscreen/lpc32xx_ts.c | 13 +- + drivers/input/touchscreen/max11801_ts.c | 7 + + drivers/input/touchscreen/melfas_mip4.c | 11 + + drivers/input/touchscreen/silead.c | 13 + + drivers/input/touchscreen/sur40.c | 2 +- + drivers/input/touchscreen/tps6507x-ts.c | 33 +- + drivers/input/touchscreen/tsc2007.h | 101 +++ + .../touchscreen/{tsc2007.c => tsc2007_core.c} | 102 +-- + drivers/input/touchscreen/tsc2007_iio.c | 140 +++ + include/linux/i2c.h | 5 + + include/linux/input/eeti_ts.h | 10 - + include/linux/input/matrix_keypad.h | 3 + + include/linux/mfd/cros_ec_commands.h | 4 + + include/linux/serio.h | 1 + + 128 files changed, 7588 insertions(+), 5386 deletions(-) + rename Documentation/devicetree/bindings/input/{ => touchscreen}/ads7846.txt (100%) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ar1021.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/max11801-ts.txt + delete mode 100644 Documentation/input/cd32.txt + create mode 100644 Documentation/input/conf.py + rename Documentation/input/{alps.txt => devices/alps.rst} (94%) + rename Documentation/input/{amijoy.txt => devices/amijoy.rst} (60%) + rename Documentation/input/{appletouch.txt => devices/appletouch.rst} (79%) + rename Documentation/input/{atarikbd.txt => devices/atarikbd.rst} (90%) + rename Documentation/input/{bcm5974.txt => devices/bcm5974.rst} (55%) + rename Documentation/input/{cma3000_d0x.txt => devices/cma3000_d0x.rst} (66%) + rename Documentation/input/{cs461x.txt => devices/cs461x.rst} (80%) + rename Documentation/input/{edt-ft5x06.txt => devices/edt-ft5x06.rst} (100%) + rename Documentation/input/{elantech.txt => devices/elantech.rst} (88%) + create mode 100644 Documentation/input/devices/gpio-tilt.rst + create mode 100644 Documentation/input/devices/iforce-protocol.rst + create mode 100644 Documentation/input/devices/index.rst + create mode 100644 Documentation/input/devices/joystick-parport.rst + rename Documentation/input/{ntrig.txt => devices/ntrig.rst} (75%) + rename Documentation/input/{rotary-encoder.txt => devices/rotary-encoder.rst} (59%) + create mode 100644 Documentation/input/devices/sentelic.rst + rename Documentation/input/{walkera0701.txt => devices/walkera0701.rst} (86%) + rename Documentation/input/{xpad.txt => devices/xpad.rst} (73%) + rename Documentation/input/{yealink.txt => devices/yealink.rst} (60%) + rename Documentation/input/{event-codes.txt => event-codes.rst} (96%) + rename Documentation/input/{ff.txt => ff.rst} (62%) + rename Documentation/input/{gamepad.txt => gamepad.rst} (87%) + rename Documentation/input/{gameport-programming.txt => gameport-programming.rst} (85%) + delete mode 100644 Documentation/input/gpio-tilt.txt + delete mode 100644 Documentation/input/iforce-protocol.txt + create mode 100644 Documentation/input/index.rst + rename Documentation/input/{input-programming.txt => input-programming.rst} (69%) + create mode 100644 Documentation/input/input.rst + delete mode 100644 Documentation/input/input.txt + create mode 100644 Documentation/input/input_kapi.rst + create mode 100644 Documentation/input/input_uapi.rst + delete mode 100644 Documentation/input/interactive.fig + create mode 100644 Documentation/input/interactive.svg + create mode 100644 Documentation/input/joydev/index.rst + rename Documentation/input/{joystick-api.txt => joydev/joystick-api.rst} (72%) + create mode 100644 Documentation/input/joydev/joystick.rst + delete mode 100644 Documentation/input/joystick-parport.txt + delete mode 100644 Documentation/input/joystick.txt + rename Documentation/input/{multi-touch-protocol.txt => multi-touch-protocol.rst} (68%) + rename Documentation/input/{notifier.txt => notifier.rst} (90%) + delete mode 100644 Documentation/input/sentelic.txt + delete mode 100644 Documentation/input/shape.fig + create mode 100644 Documentation/input/shape.svg + create mode 100644 Documentation/input/uinput.rst + rename Documentation/input/{userio.txt => userio.rst} (56%) + create mode 100644 drivers/input/mouse/psmouse-smbus.c + create mode 100644 drivers/input/touchscreen/tsc2007.h + rename drivers/input/touchscreen/{tsc2007.c => tsc2007_core.c} (83%) + create mode 100644 drivers/input/touchscreen/tsc2007_iio.c + delete mode 100644 include/linux/input/eeti_ts.h +Merging block/for-next (a2db02ec349f Merge branch 'for-4.12/block' into for-next) +$ git merge block/for-next +Auto-merging net/core/utils.c +Auto-merging include/linux/nfs_fs_sb.h +Auto-merging include/linux/mtd/mtd.h +Removing include/linux/mg_disk.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/nfs/write.c +Auto-merging fs/nfs/client.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/dev.c +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/nvme/host/pci.c +Removing drivers/block/osdblk.c +Removing drivers/block/mg_disk.c +Removing drivers/block/hd.c +Auto-merging block/genhd.c +Auto-merging block/bsg.c +Removing Documentation/blockdev/mflash.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-block | 10 +- + Documentation/block/00-INDEX | 2 + + Documentation/block/bfq-iosched.txt | 531 ++ + Documentation/block/kyber-iosched.txt | 14 + + Documentation/block/queue-sysfs.txt | 11 +- + Documentation/blockdev/mflash.txt | 84 - + Documentation/lightnvm/pblk.txt | 21 + + block/Kconfig | 12 + + block/Kconfig.iosched | 30 + + block/Makefile | 3 + + block/bfq-cgroup.c | 1139 +++++ + block/bfq-iosched.c | 5047 ++++++++++++++++++++ + block/bfq-iosched.h | 941 ++++ + block/bfq-wf2q.c | 1616 +++++++ + block/bio.c | 19 +- + block/blk-cgroup.c | 123 +- + block/blk-core.c | 122 +- + block/blk-exec.c | 11 +- + block/blk-flush.c | 5 +- + block/blk-integrity.c | 24 +- + block/blk-lib.c | 78 +- + block/blk-merge.c | 17 +- + block/blk-mq-debugfs.c | 245 +- + block/blk-mq-pci.c | 2 +- + block/blk-mq-sched.c | 97 +- + block/blk-mq-sched.h | 18 +- + block/blk-mq-tag.c | 5 +- + block/blk-mq.c | 508 +- + block/blk-mq.h | 2 +- + block/blk-settings.c | 3 - + block/blk-stat.c | 323 +- + block/blk-stat.h | 204 +- + block/blk-sysfs.c | 76 +- + block/blk-throttle.c | 985 +++- + block/blk-timeout.c | 1 - + block/blk-wbt.c | 95 +- + block/blk-wbt.h | 16 +- + block/blk.h | 15 +- + block/bsg-lib.c | 8 +- + block/bsg.c | 12 +- + block/cfq-iosched.c | 17 +- + block/compat_ioctl.c | 2 +- + block/elevator.c | 3 + + block/genhd.c | 2 +- + block/ioctl.c | 4 +- + block/ioprio.c | 12 +- + block/kyber-iosched.c | 719 +++ + block/partition-generic.c | 1 - + block/scsi_ioctl.c | 23 +- + block/sed-opal.c | 153 +- + block/t10-pi.c | 8 +- + drivers/block/Kconfig | 47 +- + drivers/block/Makefile | 3 - + drivers/block/ataflop.c | 12 +- + drivers/block/brd.c | 54 - + drivers/block/cciss.c | 42 +- + drivers/block/drbd/drbd_debugfs.c | 3 - + drivers/block/drbd/drbd_int.h | 6 - + drivers/block/drbd/drbd_main.c | 5 +- + drivers/block/drbd/drbd_nl.c | 9 +- + drivers/block/drbd/drbd_receiver.c | 105 +- + drivers/block/drbd/drbd_req.c | 13 +- + drivers/block/drbd/drbd_worker.c | 4 +- + drivers/block/floppy.c | 10 +- + drivers/block/hd.c | 803 ---- + drivers/block/loop.c | 38 +- + drivers/block/loop.h | 1 + + drivers/block/mg_disk.c | 1112 ----- + drivers/block/mtip32xx/mtip32xx.c | 22 +- + drivers/block/mtip32xx/mtip32xx.h | 1 + + drivers/block/nbd.c | 1417 +++++- + drivers/block/null_blk.c | 22 +- + drivers/block/osdblk.c | 693 --- + drivers/block/paride/pcd.c | 57 +- + drivers/block/paride/pd.c | 57 +- + drivers/block/paride/pf.c | 57 +- + drivers/block/pktcdvd.c | 2 +- + drivers/block/rbd.c | 3 +- + drivers/block/rsxx/dev.c | 1 - + drivers/block/swim.c | 55 +- + drivers/block/swim3.c | 4 +- + drivers/block/virtio_blk.c | 21 +- + drivers/block/xen-blkfront.c | 41 +- + drivers/block/zram/zram_drv.c | 13 +- + drivers/cdrom/cdrom.c | 3 +- + drivers/ide/ide-atapi.c | 11 +- + drivers/ide/ide-cd.c | 21 +- + drivers/ide/ide-cd_ioctl.c | 3 +- + drivers/ide/ide-devsets.c | 6 +- + drivers/ide/ide-disk.c | 3 +- + drivers/ide/ide-dma.c | 2 +- + drivers/ide/ide-eh.c | 36 +- + drivers/ide/ide-floppy.c | 10 +- + drivers/ide/ide-io.c | 10 +- + drivers/ide/ide-ioctls.c | 7 +- + drivers/ide/ide-park.c | 3 +- + drivers/ide/ide-pm.c | 9 +- + drivers/ide/ide-tape.c | 4 +- + drivers/ide/ide-taskfile.c | 8 +- + drivers/lightnvm/Kconfig | 9 + + drivers/lightnvm/Makefile | 5 + + drivers/lightnvm/core.c | 147 +- + drivers/lightnvm/pblk-cache.c | 114 + + drivers/lightnvm/pblk-core.c | 1667 +++++++ + drivers/lightnvm/pblk-gc.c | 555 +++ + drivers/lightnvm/pblk-init.c | 962 ++++ + drivers/lightnvm/pblk-map.c | 136 + + drivers/lightnvm/pblk-rb.c | 852 ++++ + drivers/lightnvm/pblk-read.c | 529 ++ + drivers/lightnvm/pblk-recovery.c | 998 ++++ + drivers/lightnvm/pblk-rl.c | 184 + + drivers/lightnvm/pblk-sysfs.c | 507 ++ + drivers/lightnvm/pblk-write.c | 414 ++ + drivers/lightnvm/pblk.h | 1121 +++++ + drivers/lightnvm/rrpc.c | 25 +- + drivers/md/dm-cache-target.c | 1 - + drivers/md/dm-core.h | 1 + + drivers/md/dm-crypt.c | 1 - + drivers/md/dm-io.c | 18 +- + drivers/md/dm-kcopyd.c | 6 +- + drivers/md/dm-linear.c | 1 + + drivers/md/dm-mpath.c | 3 +- + drivers/md/dm-raid.c | 6 +- + drivers/md/dm-raid1.c | 1 - + drivers/md/dm-rq.c | 15 +- + drivers/md/dm-stripe.c | 2 + + drivers/md/dm-table.c | 49 +- + drivers/md/dm-thin.c | 2 - + drivers/md/dm.c | 32 +- + drivers/md/linear.c | 1 + + drivers/md/md.h | 7 + + drivers/md/multipath.c | 1 + + drivers/md/raid0.c | 2 + + drivers/md/raid1.c | 4 +- + drivers/md/raid10.c | 1 + + drivers/md/raid5.c | 53 +- + drivers/mmc/core/queue.c | 2 - + drivers/mtd/mtdcore.c | 23 +- + drivers/mtd/mtdsuper.c | 6 +- + drivers/mtd/ubi/block.c | 2 +- + drivers/nvme/host/core.c | 132 +- + drivers/nvme/host/fabrics.c | 28 + + drivers/nvme/host/fabrics.h | 10 + + drivers/nvme/host/fc.c | 223 +- + drivers/nvme/host/lightnvm.c | 49 +- + drivers/nvme/host/nvme.h | 48 +- + drivers/nvme/host/pci.c | 223 +- + drivers/nvme/host/rdma.c | 154 +- + drivers/nvme/target/admin-cmd.c | 31 +- + drivers/nvme/target/core.c | 21 +- + drivers/nvme/target/discovery.c | 19 +- + drivers/nvme/target/fabrics-cmd.c | 36 +- + drivers/nvme/target/fc.c | 274 +- + drivers/nvme/target/fcloop.c | 197 +- + drivers/nvme/target/io-cmd.c | 24 +- + drivers/nvme/target/loop.c | 92 +- + drivers/nvme/target/nvmet.h | 11 +- + drivers/nvme/target/rdma.c | 47 +- + drivers/sbus/char/jsflash.c | 50 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 126 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 7 +- + drivers/scsi/osd/osd_initiator.c | 9 +- + drivers/scsi/osst.c | 4 +- + drivers/scsi/qla2xxx/qla_bsg.c | 6 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_lib.c | 21 +- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/sd.c | 259 +- + drivers/scsi/sd.h | 8 + + drivers/scsi/sd_zbc.c | 1 + + drivers/scsi/sg.c | 4 +- + drivers/scsi/st.c | 8 +- + .../staging/lustre/lustre/include/lustre_disk.h | 4 - + drivers/staging/lustre/lustre/llite/llite_lib.c | 24 +- + drivers/target/iscsi/iscsi_target_configfs.c | 46 +- + drivers/target/target_core_device.c | 2 +- + drivers/target/target_core_pscsi.c | 4 +- + fs/9p/v9fs.c | 10 +- + fs/9p/v9fs.h | 1 - + fs/9p/vfs_super.c | 15 +- + fs/afs/internal.h | 1 - + fs/afs/super.c | 5 +- + fs/afs/volume.c | 8 - + fs/block_dev.c | 28 +- + fs/btrfs/ctree.h | 1 - + fs/btrfs/disk-io.c | 36 +- + fs/btrfs/super.c | 7 + + fs/ceph/addr.c | 6 +- + fs/ceph/debugfs.c | 2 +- + fs/ceph/super.c | 35 +- + fs/ceph/super.h | 2 - + fs/cifs/cifs_fs_sb.h | 1 - + fs/cifs/cifsfs.c | 7 +- + fs/cifs/connect.c | 10 - + fs/coda/inode.c | 11 +- + fs/dax.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/main.c | 4 +- + fs/exofs/exofs.h | 1 - + fs/exofs/super.c | 17 +- + fs/fuse/dev.c | 13 +- + fs/fuse/fuse_i.h | 6 - + fs/fuse/inode.c | 42 +- + fs/gfs2/ops_fstype.c | 8 +- + fs/ncpfs/inode.c | 8 +- + fs/ncpfs/ncp_fs_sb.h | 1 - + fs/nfs/client.c | 10 - + fs/nfs/internal.h | 6 +- + fs/nfs/super.c | 33 +- + fs/nfs/write.c | 13 +- + fs/nfsd/blocklayout.c | 7 +- + fs/nilfs2/super.c | 2 +- + fs/super.c | 53 +- + fs/ubifs/super.c | 25 +- + fs/ubifs/ubifs.h | 3 - + fs/xfs/xfs_bmap_util.c | 2 +- + include/linux/backing-dev-defs.h | 8 +- + include/linux/backing-dev.h | 16 +- + include/linux/bio.h | 2 +- + include/linux/blk-mq.h | 7 +- + include/linux/blk_types.h | 47 +- + include/linux/blkdev.h | 75 +- + include/linux/coda_psdev.h | 1 - + include/linux/device-mapper.h | 11 +- + include/linux/elevator.h | 4 +- + include/linux/fs.h | 3 + + include/linux/genhd.h | 12 +- + include/linux/ide.h | 2 +- + include/linux/inet.h | 6 + + include/linux/kobject.h | 2 + + include/linux/lightnvm.h | 13 +- + include/linux/mg_disk.h | 45 - + include/linux/mtd/mtd.h | 5 - + include/linux/nfs_fs_sb.h | 1 - + include/linux/nvme-fc-driver.h | 104 +- + include/linux/nvme-fc.h | 68 +- + include/linux/nvme.h | 13 + + include/linux/sbitmap.h | 55 + + include/linux/t10-pi.h | 8 +- + include/linux/writeback.h | 1 + + include/scsi/scsi_request.h | 2 + + include/trace/events/block.h | 61 +- + include/uapi/linux/lightnvm.h | 4 + + include/uapi/linux/nbd-netlink.h | 98 + + include/uapi/linux/nbd.h | 6 +- + kernel/trace/blktrace.c | 35 +- + lib/kobject.c | 5 +- + lib/sbitmap.c | 75 +- + mm/backing-dev.c | 186 +- + net/core/utils.c | 103 + + 250 files changed, 24424 insertions(+), 6062 deletions(-) + create mode 100644 Documentation/block/bfq-iosched.txt + create mode 100644 Documentation/block/kyber-iosched.txt + delete mode 100644 Documentation/blockdev/mflash.txt + create mode 100644 Documentation/lightnvm/pblk.txt + create mode 100644 block/bfq-cgroup.c + create mode 100644 block/bfq-iosched.c + create mode 100644 block/bfq-iosched.h + create mode 100644 block/bfq-wf2q.c + create mode 100644 block/kyber-iosched.c + delete mode 100644 drivers/block/hd.c + delete mode 100644 drivers/block/mg_disk.c + delete mode 100644 drivers/block/osdblk.c + create mode 100644 drivers/lightnvm/pblk-cache.c + create mode 100644 drivers/lightnvm/pblk-core.c + create mode 100644 drivers/lightnvm/pblk-gc.c + create mode 100644 drivers/lightnvm/pblk-init.c + create mode 100644 drivers/lightnvm/pblk-map.c + create mode 100644 drivers/lightnvm/pblk-rb.c + create mode 100644 drivers/lightnvm/pblk-read.c + create mode 100644 drivers/lightnvm/pblk-recovery.c + create mode 100644 drivers/lightnvm/pblk-rl.c + create mode 100644 drivers/lightnvm/pblk-sysfs.c + create mode 100644 drivers/lightnvm/pblk-write.c + create mode 100644 drivers/lightnvm/pblk.h + delete mode 100644 include/linux/mg_disk.h + create mode 100644 include/uapi/linux/nbd-netlink.h +$ git am -3 ../patches/0001-nbd-fix-up-for-nla_parse_nested-API-change.patch +Applying: nbd: fix up for nla_parse_nested() API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/block/nbd.c +$ git add -A . +$ git commit -v -a --amend +[master 03b600f368cf] Merge remote-tracking branch 'block/for-next' + Date: Wed Apr 26 12:18:19 2017 +1000 +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (ccf0a6821d28 Merge branch 'dm-4.12' into dm-4.12-merge-with-block) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-verity-fec.c +Auto-merging drivers/md/dm-raid.c +Removing drivers/md/dm-cache-policy-cleaner.c +Auto-merging drivers/md/dm-bio-prison-v1.h +Auto-merging drivers/md/dm-bio-prison-v1.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-crypt.txt | 53 +- + Documentation/device-mapper/dm-integrity.txt | 199 ++ + Documentation/device-mapper/dm-raid.txt | 14 +- + drivers/md/Kconfig | 19 +- + drivers/md/Makefile | 7 +- + drivers/md/{dm-bio-prison.c => dm-bio-prison-v1.c} | 46 +- + drivers/md/{dm-bio-prison.h => dm-bio-prison-v1.h} | 2 +- + drivers/md/dm-bio-prison-v2.c | 369 +++ + drivers/md/dm-bio-prison-v2.h | 152 + + drivers/md/dm-bufio.c | 51 +- + drivers/md/dm-bufio.h | 7 + + drivers/md/dm-cache-background-tracker.c | 238 ++ + drivers/md/dm-cache-background-tracker.h | 46 + + drivers/md/dm-cache-metadata.h | 2 + + drivers/md/dm-cache-policy-cleaner.c | 469 --- + drivers/md/dm-cache-policy-internal.h | 76 +- + drivers/md/dm-cache-policy-smq.c | 821 ++--- + drivers/md/dm-cache-policy.h | 187 +- + drivers/md/dm-cache-target.c | 2535 +++++++-------- + drivers/md/dm-crypt.c | 1238 ++++++-- + drivers/md/dm-delay.c | 1 + + drivers/md/dm-era-target.c | 8 +- + drivers/md/dm-integrity.c | 3249 ++++++++++++++++++++ + drivers/md/dm-ioctl.c | 12 +- + drivers/md/dm-linear.c | 1 + + drivers/md/dm-mpath.c | 5 +- + drivers/md/dm-raid.c | 164 +- + drivers/md/dm-rq.c | 2 +- + drivers/md/dm-stripe.c | 1 + + drivers/md/dm-table.c | 81 +- + drivers/md/dm-thin.c | 3 +- + drivers/md/dm-verity-fec.c | 4 +- + drivers/md/dm-verity-target.c | 201 +- + drivers/md/dm-verity.h | 23 +- + drivers/md/dm.c | 16 +- + drivers/md/persistent-data/dm-btree.c | 8 +- + drivers/md/raid5-cache.c | 62 +- + drivers/md/raid5.h | 11 + + include/linux/device-mapper.h | 12 + + 39 files changed, 7519 insertions(+), 2876 deletions(-) + create mode 100644 Documentation/device-mapper/dm-integrity.txt + rename drivers/md/{dm-bio-prison.c => dm-bio-prison-v1.c} (94%) + rename drivers/md/{dm-bio-prison.h => dm-bio-prison-v1.h} (99%) + create mode 100644 drivers/md/dm-bio-prison-v2.c + create mode 100644 drivers/md/dm-bio-prison-v2.h + create mode 100644 drivers/md/dm-cache-background-tracker.c + create mode 100644 drivers/md/dm-cache-background-tracker.h + delete mode 100644 drivers/md/dm-cache-policy-cleaner.c + create mode 100644 drivers/md/dm-integrity.c +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/next (ff4143ccff31 MIPS: Octeon: cavium_octeon_defconfig: Enable Octeon MMC) +$ git merge mmc/next +Auto-merging drivers/mmc/core/queue.c +Auto-merging arch/arm64/boot/dts/marvell/armada-ap806.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/mmc/mmc-dev-attrs.txt +Merge made by the 'recursive' strategy. + .../bindings/mmc/brcm,bcm2835-sdhost.txt | 23 + + .../devicetree/bindings/mmc/cavium-mmc.txt | 57 + + .../bindings/mmc/marvell,xenon-sdhci.txt | 170 +++ + Documentation/devicetree/bindings/mmc/mtk-sd.txt | 12 + + .../bindings/mmc/nvidia,tegra20-sdhci.txt | 12 +- + .../devicetree/bindings/mmc/renesas,mmcif.txt | 8 + + .../devicetree/bindings/mmc/samsung,s3cmci.txt | 42 + + .../devicetree/bindings/mmc/sdhci-cadence.txt | 48 + + Documentation/mmc/mmc-dev-attrs.txt | 1 + + MAINTAINERS | 15 + + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 3 +- + arch/mips/configs/cavium_octeon_defconfig | 5 + + drivers/clk/mvebu/ap806-system-controller.c | 21 +- + drivers/mmc/core/block.c | 300 ++-- + drivers/mmc/core/core.c | 193 +-- + drivers/mmc/core/mmc.c | 9 + + drivers/mmc/core/mmc_ops.c | 36 +- + drivers/mmc/core/mmc_ops.h | 2 + + drivers/mmc/core/mmc_test.c | 14 + + drivers/mmc/core/queue.c | 307 ++-- + drivers/mmc/core/queue.h | 12 +- + drivers/mmc/core/sd.c | 4 +- + drivers/mmc/core/sd_ops.c | 19 +- + drivers/mmc/core/sd_ops.h | 2 +- + drivers/mmc/core/sdio_io.c | 54 +- + drivers/mmc/core/sdio_ops.c | 9 +- + drivers/mmc/core/sdio_ops.h | 10 +- + drivers/mmc/host/Kconfig | 43 + + drivers/mmc/host/Makefile | 8 + + drivers/mmc/host/android-goldfish.c | 10 +- + drivers/mmc/host/atmel-mci.c | 30 +- + drivers/mmc/host/bcm2835.c | 1466 ++++++++++++++++++++ + drivers/mmc/host/cavium-octeon.c | 351 +++++ + drivers/mmc/host/cavium-thunderx.c | 187 +++ + drivers/mmc/host/cavium.c | 1090 +++++++++++++++ + drivers/mmc/host/cavium.h | 215 +++ + drivers/mmc/host/davinci_mmc.c | 14 +- + drivers/mmc/host/dw_mmc.c | 397 +++--- + drivers/mmc/host/jz4740_mmc.c | 9 +- + drivers/mmc/host/meson-gx-mmc.c | 590 +++++--- + drivers/mmc/host/mmc_spi.c | 5 +- + drivers/mmc/host/mmci.c | 20 +- + drivers/mmc/host/moxart-mmc.c | 8 +- + drivers/mmc/host/mtk-sd.c | 176 ++- + drivers/mmc/host/mvsdio.c | 11 +- + drivers/mmc/host/omap_hsmmc.c | 21 +- + drivers/mmc/host/s3cmci.c | 261 ++-- + drivers/mmc/host/sdhci-acpi.c | 18 +- + drivers/mmc/host/sdhci-brcmstb.c | 3 + + drivers/mmc/host/sdhci-cadence.c | 129 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 32 + + drivers/mmc/host/sdhci-esdhc.h | 7 + + drivers/mmc/host/sdhci-msm.c | 8 - + drivers/mmc/host/sdhci-of-arasan.c | 26 +- + drivers/mmc/host/sdhci-of-at91.c | 5 +- + drivers/mmc/host/sdhci-of-esdhc.c | 171 ++- + drivers/mmc/host/sdhci-pci-core.c | 562 ++++---- + drivers/mmc/host/sdhci-pci-data.c | 3 - + drivers/mmc/host/sdhci-pci-o2micro.c | 4 +- + drivers/mmc/host/sdhci-pci.h | 24 +- + drivers/mmc/host/sdhci-pltfm.c | 3 + + drivers/mmc/host/sdhci-pxav2.c | 9 +- + drivers/mmc/host/sdhci-pxav3.c | 12 +- + drivers/mmc/host/sdhci-s3c.c | 10 +- + drivers/mmc/host/sdhci-sirf.c | 3 + + drivers/mmc/host/sdhci-spear.c | 3 + + drivers/mmc/host/sdhci-st.c | 8 +- + drivers/mmc/host/sdhci-tegra.c | 59 +- + drivers/mmc/host/sdhci-xenon-phy.c | 832 +++++++++++ + drivers/mmc/host/sdhci-xenon.c | 548 ++++++++ + drivers/mmc/host/sdhci-xenon.h | 101 ++ + drivers/mmc/host/sdhci.c | 453 +++--- + drivers/mmc/host/sdhci.h | 65 +- + drivers/mmc/host/sunxi-mmc.c | 16 +- + drivers/mmc/host/tmio_mmc.h | 12 +- + drivers/mmc/host/tmio_mmc_dma.c | 61 +- + drivers/mmc/host/tmio_mmc_pio.c | 36 +- + include/linux/mmc/card.h | 10 + + include/linux/mmc/host.h | 6 + + 79 files changed, 7925 insertions(+), 1614 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhost.txt + create mode 100644 Documentation/devicetree/bindings/mmc/cavium-mmc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/samsung,s3cmci.txt + create mode 100644 drivers/mmc/host/bcm2835.c + create mode 100644 drivers/mmc/host/cavium-octeon.c + create mode 100644 drivers/mmc/host/cavium-thunderx.c + create mode 100644 drivers/mmc/host/cavium.c + create mode 100644 drivers/mmc/host/cavium.h + create mode 100644 drivers/mmc/host/sdhci-xenon-phy.c + create mode 100644 drivers/mmc/host/sdhci-xenon.c + create mode 100644 drivers/mmc/host/sdhci-xenon.h +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_io.c +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (296617581eac md/raid1/10: remove unused queue) +$ git merge md/for-next +Resolved 'drivers/md/linear.c' using previous resolution. +Resolved 'drivers/md/md.h' using previous resolution. +Resolved 'drivers/md/raid0.c' using previous resolution. +Resolved 'drivers/md/raid5.c' using previous resolution. +Resolved 'drivers/md/raid5.h' using previous resolution. +Auto-merging include/linux/bio.h +Auto-merging drivers/md/raid5.h +CONFLICT (content): Merge conflict in drivers/md/raid5.h +Auto-merging drivers/md/raid5.c +CONFLICT (content): Merge conflict in drivers/md/raid5.c +Auto-merging drivers/md/raid5-cache.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/raid0.c +CONFLICT (content): Merge conflict in drivers/md/raid0.c +Auto-merging drivers/md/md.h +CONFLICT (content): Merge conflict in drivers/md/md.h +Auto-merging drivers/md/linear.c +CONFLICT (content): Merge conflict in drivers/md/linear.c +Auto-merging drivers/md/Makefile +Auto-merging block/bio.c +Auto-merging Documentation/md/md-cluster.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e6cfe838dc9d] Merge remote-tracking branch 'md/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/md.rst | 32 +- + Documentation/md/md-cluster.txt | 2 +- + Documentation/md/raid5-ppl.txt | 44 ++ + block/bio.c | 61 +- + drivers/md/Makefile | 2 +- + drivers/md/bitmap.c | 59 +- + drivers/md/bitmap.h | 3 + + drivers/md/linear.c | 75 ++- + drivers/md/md-cluster.c | 223 ++++++- + drivers/md/md-cluster.h | 1 + + drivers/md/md.c | 414 ++++++++++--- + drivers/md/md.h | 72 ++- + drivers/md/raid0.c | 78 +-- + drivers/md/raid1.c | 666 +++++++++----------- + drivers/md/raid1.h | 12 +- + drivers/md/raid10.c | 728 +++++++++------------- + drivers/md/raid10.h | 1 + + drivers/md/raid5-cache.c | 362 ++++++++--- + drivers/md/raid5-log.h | 115 ++++ + drivers/md/raid5-ppl.c | 1271 ++++++++++++++++++++++++++++++++++++++ + drivers/md/raid5.c | 634 ++++++++++++------- + drivers/md/raid5.h | 106 +--- + include/linux/bio.h | 11 +- + include/linux/percpu-refcount.h | 1 + + include/uapi/linux/raid/md_p.h | 45 +- + lib/percpu-refcount.c | 17 + + 26 files changed, 3570 insertions(+), 1465 deletions(-) + create mode 100644 Documentation/md/raid5-ppl.txt + create mode 100644 drivers/md/raid5-log.h + create mode 100644 drivers/md/raid5-ppl.c +Merging mfd/for-mfd-next (a676b983ba81 dt-bindings: Add AXP803's regulator info) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/mfd/intel_soc_pmic_bxtwc.h +Auto-merging include/linux/mfd/cros_ec.h +Auto-merging drivers/thermal/Kconfig +Auto-merging drivers/pinctrl/samsung/pinctrl-exynos.c +Auto-merging drivers/memory/Kconfig +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Removing drivers/iio/adc/mxs-lradc.c +Auto-merging drivers/acpi/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/altera-a10sr.txt | 11 + + Documentation/devicetree/bindings/mfd/axp20x.txt | 43 +- + Documentation/devicetree/bindings/mfd/da9062.txt | 49 +- + Documentation/devicetree/bindings/mfd/mt6397.txt | 1 + + .../bindings/{iio/adc => mfd}/mxs-lradc.txt | 0 + .../bindings/mfd/samsung,exynos5433-lpass.txt | 8 +- + .../touchscreen/sun4i.txt => mfd/sun4i-gpadc.txt} | 21 + + Documentation/devicetree/bindings/mfd/ti-lmu.txt | 243 +++ + Documentation/devicetree/bindings/mfd/wm831x.txt | 81 + + MAINTAINERS | 1 + + drivers/acpi/Kconfig | 2 +- + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-wm831x.c | 5 +- + drivers/iio/adc/Kconfig | 37 +- + drivers/iio/adc/Makefile | 3 +- + drivers/iio/adc/axp20x_adc.c | 617 +++++++ + drivers/iio/adc/mxs-lradc-adc.c | 843 ++++++++++ + drivers/iio/adc/mxs-lradc.c | 1750 -------------------- + drivers/input/touchscreen/Kconfig | 10 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/mxs-lradc-ts.c | 714 ++++++++ + drivers/memory/Kconfig | 1 + + drivers/memory/atmel-ebi.c | 584 +++---- + drivers/mfd/Kconfig | 53 +- + drivers/mfd/Makefile | 10 +- + drivers/mfd/altera-a10sr.c | 4 + + drivers/mfd/arizona-core.c | 44 +- + drivers/mfd/asic3.c | 56 +- + drivers/mfd/atmel-smc.c | 314 ++++ + drivers/mfd/axp20x-rsb.c | 1 + + drivers/mfd/axp20x.c | 129 +- + drivers/mfd/cros_ec.c | 15 +- + drivers/mfd/cros_ec_acpi_gpe.c | 103 ++ + drivers/mfd/cros_ec_spi.c | 9 +- + drivers/mfd/da9062-core.c | 427 ++++- + drivers/mfd/db8500-prcmu.c | 2 +- + drivers/mfd/exynos-lpass.c | 50 +- + drivers/mfd/hi655x-pmic.c | 3 +- + drivers/mfd/intel-lpss-acpi.c | 4 - + drivers/mfd/intel_soc_pmic_bxtwc.c | 25 +- + drivers/mfd/intel_soc_pmic_core.c | 27 +- + drivers/mfd/ipaq-micro.c | 3 - + drivers/mfd/lpc_ich.c | 12 + + drivers/mfd/menelaus.c | 4 - + drivers/mfd/motorola-cpcap.c | 34 +- + drivers/mfd/mt6397-core.c | 3 +- + drivers/mfd/mxs-lradc.c | 267 +++ + drivers/mfd/omap-usb-tll.c | 7 +- + drivers/mfd/palmas.c | 16 +- + drivers/mfd/rtsx_pcr.c | 2 +- + drivers/mfd/sta2x11-mfd.c | 4 +- + drivers/mfd/stm32-timers.c | 10 +- + drivers/mfd/stmpe.c | 2 + + drivers/mfd/t7l66xb.c | 20 +- + drivers/mfd/tc6393xb.c | 52 +- + drivers/mfd/ti-lmu.c | 259 +++ + drivers/mfd/tps65912-spi.c | 4 +- + drivers/mfd/twl4030-power.c | 8 +- + drivers/mfd/wm831x-core.c | 29 +- + drivers/mfd/wm831x-i2c.c | 19 +- + drivers/mfd/wm831x-irq.c | 6 +- + drivers/mfd/wm831x-spi.c | 18 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 63 + + drivers/platform/x86/Kconfig | 2 +- + drivers/thermal/Kconfig | 2 +- + include/linux/mfd/axp20x.h | 44 +- + include/linux/mfd/cros_ec.h | 18 + + include/linux/mfd/da9062/core.h | 29 +- + include/linux/mfd/da9062/registers.h | 5 +- + .../mfd/{intel_bxtwc.h => intel_soc_pmic_bxtwc.h} | 4 +- + include/linux/mfd/motorola-cpcap.h | 5 + + include/linux/mfd/mxs-lradc.h | 187 +++ + include/linux/mfd/syscon/atmel-smc.h | 237 +-- + include/linux/mfd/syscon/exynos5-pmu.h | 3 - + include/linux/mfd/ti-lmu-register.h | 280 ++++ + include/linux/mfd/ti-lmu.h | 87 + + include/linux/mfd/wm831x/core.h | 9 +- + 77 files changed, 5491 insertions(+), 2566 deletions(-) + rename Documentation/devicetree/bindings/{iio/adc => mfd}/mxs-lradc.txt (100%) + rename Documentation/devicetree/bindings/{input/touchscreen/sun4i.txt => mfd/sun4i-gpadc.txt} (64%) + create mode 100644 Documentation/devicetree/bindings/mfd/ti-lmu.txt + create mode 100644 Documentation/devicetree/bindings/mfd/wm831x.txt + create mode 100644 drivers/iio/adc/axp20x_adc.c + create mode 100644 drivers/iio/adc/mxs-lradc-adc.c + delete mode 100644 drivers/iio/adc/mxs-lradc.c + create mode 100644 drivers/input/touchscreen/mxs-lradc-ts.c + create mode 100644 drivers/mfd/atmel-smc.c + create mode 100644 drivers/mfd/cros_ec_acpi_gpe.c + create mode 100644 drivers/mfd/mxs-lradc.c + create mode 100644 drivers/mfd/ti-lmu.c + rename include/linux/mfd/{intel_bxtwc.h => intel_soc_pmic_bxtwc.h} (94%) + create mode 100644 include/linux/mfd/mxs-lradc.h + create mode 100644 include/linux/mfd/ti-lmu-register.h + create mode 100644 include/linux/mfd/ti-lmu.h +Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/arcxcnn_bl.txt | 33 ++ + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/arcxcnn_bl.c | 419 +++++++++++++++++++++ + 4 files changed, 460 insertions(+) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/arcxcnn_bl.txt + create mode 100644 drivers/video/backlight/arcxcnn_bl.c +Merging battery/for-next (6c381663bb3b power: supply: bq24190_charger: Use new extcon_register_notifier_all()) +$ git merge battery/for-next +Removing include/linux/power/bq24190_charger.h +Merge made by the 'recursive' strategy. + .../bindings/power/reset/gemini-poweroff.txt | 17 + + .../bindings/power/reset/syscon-poweroff.txt | 11 +- + .../bindings/power/supply/cpcap-charger.txt | 37 ++ + .../bindings/power/supply/lego_ev3_battery.txt | 21 + + .../devicetree/bindings/power/supply/ltc2941.txt | 6 +- + .../{max8925_batter.txt => max8925_battery.txt} | 0 + drivers/extcon/devres.c | 61 ++ + drivers/extcon/extcon.c | 66 ++ + drivers/extcon/extcon.h | 3 + + drivers/power/reset/Kconfig | 9 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/gemini-poweroff.c | 160 +++++ + drivers/power/reset/syscon-poweroff.c | 19 +- + drivers/power/supply/Kconfig | 15 + + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500_bmdata.c | 8 +- + drivers/power/supply/bq24190_charger.c | 427 +++++++++---- + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/charger-manager.c | 35 +- + drivers/power/supply/cpcap-charger.c | 681 +++++++++++++++++++++ + drivers/power/supply/lego_ev3_battery.c | 228 +++++++ + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/ltc2941-battery-gauge.c | 19 +- + drivers/power/supply/max17040_battery.c | 8 + + drivers/power/supply/sbs-charger.c | 5 +- + drivers/power/supply/tps65217_charger.c | 4 - + drivers/power/supply/twl4030_charger.c | 4 +- + include/linux/extcon.h | 21 +- + include/linux/power/bq24190_charger.h | 16 - + 29 files changed, 1691 insertions(+), 197 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/reset/gemini-poweroff.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt + rename Documentation/devicetree/bindings/power/supply/{max8925_batter.txt => max8925_battery.txt} (100%) + create mode 100644 drivers/power/reset/gemini-poweroff.c + create mode 100644 drivers/power/supply/cpcap-charger.c + create mode 100644 drivers/power/supply/lego_ev3_battery.c + delete mode 100644 include/linux/power/bq24190_charger.h +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (f123e7b2a6e3 Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/regulator/anatop-regulator.txt | 1 + + .../bindings/regulator/lm363x-regulator.txt | 78 ++- + .../devicetree/bindings/regulator/pfuze100.txt | 8 +- + .../devicetree/bindings/regulator/regulator.txt | 3 + + .../bindings/regulator/tps65132-regulator.txt | 46 ++ + .../devicetree/bindings/regulator/vctrl.txt | 49 ++ + MAINTAINERS | 2 + + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 8 +- + drivers/regulator/Kconfig | 40 +- + drivers/regulator/Makefile | 6 +- + drivers/regulator/anatop-regulator.c | 19 +- + drivers/regulator/arizona-ldo1.c | 140 +++--- + drivers/regulator/arizona-micsupp.c | 119 +++-- + drivers/regulator/bd9571mwv-regulator.c | 178 +++++++ + drivers/regulator/core.c | 37 +- + drivers/regulator/helpers.c | 36 ++ + drivers/regulator/hi655x-regulator.c | 7 + + drivers/regulator/internal.h | 2 +- + drivers/regulator/lm363x-regulator.c | 4 +- + drivers/regulator/ltc3589.c | 25 +- + drivers/regulator/ltc3676.c | 7 + + drivers/regulator/max1586.c | 4 +- + drivers/regulator/max77693-regulator.c | 2 +- + drivers/regulator/max8660.c | 4 +- + drivers/regulator/of_regulator.c | 4 + + drivers/regulator/pfuze100-regulator.c | 24 + + drivers/regulator/rk808-regulator.c | 2 +- + drivers/regulator/s2mpa01.c | 14 +- + drivers/regulator/s2mps11.c | 16 +- + drivers/regulator/s5m8767.c | 4 +- + drivers/regulator/tps65023-regulator.c | 3 +- + drivers/regulator/tps65132-regulator.c | 284 +++++++++++ + drivers/regulator/twl6030-regulator.c | 2 - + drivers/regulator/vctrl-regulator.c | 546 +++++++++++++++++++++ + include/linux/mfd/arizona/pdata.h | 7 +- + include/linux/platform_data/isl9305.h | 2 +- + include/linux/regulator/arizona-ldo1.h | 24 + + include/linux/regulator/arizona-micsupp.h | 21 + + include/linux/regulator/consumer.h | 1 + + include/linux/regulator/driver.h | 18 + + include/linux/regulator/machine.h | 3 + + include/linux/regulator/pfuze100.h | 1 + + 42 files changed, 1626 insertions(+), 175 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/tps65132-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/vctrl.txt + create mode 100644 drivers/regulator/bd9571mwv-regulator.c + create mode 100644 drivers/regulator/tps65132-regulator.c + create mode 100644 drivers/regulator/vctrl-regulator.c + create mode 100644 include/linux/regulator/arizona-ldo1.h + create mode 100644 include/linux/regulator/arizona-micsupp.h +Merging security/next (8979b02aaf1d tpm: Fix reference count to main device) +$ git merge security/next +Auto-merging security/selinux/nlmsgtab.c +Auto-merging security/security.c +Auto-merging security/keys/process_keys.c +Auto-merging security/keys/keyctl.c +Auto-merging security/keys/gc.c +Auto-merging security/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/compat.h +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 51 +++ + Documentation/security/keys.txt | 100 ++++-- + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + certs/system_keyring.c | 39 ++- + crypto/asymmetric_keys/asymmetric_type.c | 102 +++++- + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 +- + crypto/asymmetric_keys/restrict.c | 161 +++++++++- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 + + drivers/char/tpm/Kconfig | 3 +- + drivers/char/tpm/Makefile | 3 +- + drivers/char/tpm/st33zp24/i2c.c | 23 +- + drivers/char/tpm/st33zp24/spi.c | 23 +- + drivers/char/tpm/st33zp24/st33zp24.c | 12 +- + drivers/char/tpm/tpm-chip.c | 71 ++++- + drivers/char/tpm/tpm-dev-common.c | 148 +++++++++ + drivers/char/tpm/tpm-dev.c | 143 +-------- + drivers/char/tpm/tpm-dev.h | 27 ++ + drivers/char/tpm/tpm-interface.c | 152 +++++++-- + drivers/char/tpm/tpm-sysfs.c | 2 +- + drivers/char/tpm/tpm.h | 52 ++- + drivers/char/tpm/tpm2-cmd.c | 173 +++++++--- + drivers/char/tpm/tpm2-space.c | 528 +++++++++++++++++++++++++++++++ + drivers/char/tpm/tpm2_eventlog.c | 14 +- + drivers/char/tpm/tpm_crb.c | 279 +++++++++++++--- + drivers/char/tpm/tpm_i2c_infineon.c | 12 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 24 +- + drivers/char/tpm/tpm_ibmvtpm.c | 8 +- + drivers/char/tpm/tpm_tis_core.c | 60 ++-- + drivers/char/tpm/tpm_tis_spi.c | 160 ++++------ + drivers/char/tpm/tpmrm-dev.c | 65 ++++ + fs/namei.c | 20 +- + include/acpi/actbl2.h | 1 + + include/crypto/public_key.h | 15 +- + include/keys/system_keyring.h | 18 +- + include/linux/compat.h | 7 + + include/linux/init_task.h | 7 + + include/linux/key-type.h | 8 + + include/linux/key.h | 39 ++- + include/linux/lsm_hooks.h | 34 +- + include/linux/sched.h | 4 + + include/linux/security.h | 20 ++ + include/linux/tpm.h | 3 +- + include/uapi/linux/keyctl.h | 8 + + kernel/fork.c | 7 +- + kernel/sys.c | 30 +- + scripts/selinux/genheaders/genheaders.c | 1 + + scripts/selinux/mdp/mdp.c | 1 + + security/Kconfig | 5 + + security/apparmor/crypto.c | 32 +- + security/apparmor/include/lib.h | 2 +- + security/apparmor/lib.c | 4 +- + security/apparmor/lsm.c | 53 ++-- + security/apparmor/policy.c | 6 +- + security/commoncap.c | 2 +- + security/integrity/digsig.c | 9 +- + security/integrity/ima/ima_appraise.c | 5 +- + security/integrity/ima/ima_mok.c | 11 +- + security/integrity/ima/ima_policy.c | 123 +++++-- + security/keys/Kconfig | 2 + + security/keys/Makefile | 3 +- + security/keys/compat.c | 9 +- + security/keys/compat_dh.c | 38 +++ + security/keys/dh.c | 220 ++++++++++++- + security/keys/gc.c | 13 +- + security/keys/internal.h | 32 +- + security/keys/key.c | 58 ++-- + security/keys/keyctl.c | 60 +++- + security/keys/keyring.c | 187 ++++++++++- + security/keys/proc.c | 4 +- + security/keys/process_keys.c | 2 +- + security/keys/request_key_auth.c | 2 +- + security/loadpin/loadpin.c | 2 +- + security/security.c | 370 ++-------------------- + security/selinux/Kconfig | 6 + + security/selinux/hooks.c | 26 +- + security/selinux/include/classmap.h | 2 +- + security/selinux/nlmsgtab.c | 10 +- + security/selinux/selinuxfs.c | 8 +- + security/selinux/ss/conditional.c | 14 +- + security/selinux/ss/hashtab.c | 10 +- + security/selinux/ss/policydb.c | 59 ++-- + security/selinux/ss/services.c | 2 +- + security/selinux/ss/sidtab.c | 6 +- + security/smack/smack_access.c | 2 +- + security/smack/smack_lsm.c | 6 +- + security/tomoyo/file.c | 12 +- + security/tomoyo/tomoyo.c | 22 +- + security/yama/yama_lsm.c | 2 +- + 95 files changed, 3240 insertions(+), 1120 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 drivers/char/tpm/tpm-dev-common.c + create mode 100644 drivers/char/tpm/tpm-dev.h + create mode 100644 drivers/char/tpm/tpm2-space.c + create mode 100644 drivers/char/tpm/tpmrm-dev.c + create mode 100644 security/keys/compat_dh.c +Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (4cd4ca7cc848 keys: select CONFIG_CRYPTO when selecting DH / KDF) +$ git merge keys/keys-next +Already up-to-date. +Merging selinux/next (cae303df3f37 selinux: Fix an uninitialized variable bug) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (8979b02aaf1d tpm: Fix reference count to main device) +$ git merge tpmdd/next +Already up-to-date. +Merging watchdog/master (0a7472cbf212 Merge branch 'watchdog-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/da9062-wdt.txt | 23 ++ + .../devicetree/bindings/watchdog/renesas-wdt.txt | 4 +- + .../devicetree/bindings/watchdog/st,stm32-iwdg.txt | 19 ++ + Documentation/watchdog/watchdog-parameters.txt | 2 +- + drivers/watchdog/Kconfig | 29 ++- + drivers/watchdog/Makefile | 2 + + drivers/watchdog/cadence_wdt.c | 2 +- + drivers/watchdog/f71808e_wdt.c | 27 ++- + drivers/watchdog/gpio_wdt.c | 73 ++---- + drivers/watchdog/iTCO_wdt.c | 105 +++++---- + drivers/watchdog/intel-mid_wdt.c | 17 +- + drivers/watchdog/orion_wdt.c | 2 +- + drivers/watchdog/pcwd_usb.c | 3 + + drivers/watchdog/rza_wdt.c | 199 ++++++++++++++++ + drivers/watchdog/s3c2410_wdt.c | 58 +++-- + drivers/watchdog/sama5d4_wdt.c | 96 +++++--- + drivers/watchdog/stm32_iwdg.c | 253 +++++++++++++++++++++ + drivers/watchdog/wdt_pci.c | 2 +- + 18 files changed, 733 insertions(+), 183 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/da9062-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt + create mode 100644 drivers/watchdog/rza_wdt.c + create mode 100644 drivers/watchdog/stm32_iwdg.c +Merging iommu/next (efc2195bcc35 Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging include/linux/acpi_iort.h +Auto-merging include/linux/acpi.h +Auto-merging include/acpi/acpi_bus.h +Auto-merging drivers/pci/probe.c +Auto-merging drivers/of/platform.c +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/acpi/glue.c +Auto-merging drivers/acpi/arm64/iort.c +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 + + .../devicetree/bindings/iommu/arm,smmu.txt | 28 ++ + arch/arm64/mm/dma-mapping.c | 142 +------- + drivers/acpi/arm64/iort.c | 48 ++- + drivers/acpi/glue.c | 5 - + drivers/acpi/scan.c | 11 +- + drivers/base/dd.c | 9 + + drivers/base/dma-mapping.c | 41 +++ + drivers/iommu/amd_iommu_v2.c | 2 +- + drivers/iommu/arm-smmu-v3.c | 124 +++---- + drivers/iommu/arm-smmu.c | 373 ++++++++++++--------- + drivers/iommu/dma-iommu.c | 283 ++++++++++------ + drivers/iommu/dmar.c | 35 +- + drivers/iommu/exynos-iommu.c | 32 +- + drivers/iommu/intel-iommu.c | 18 +- + drivers/iommu/io-pgtable-arm.c | 2 +- + drivers/iommu/iommu.c | 36 +- + drivers/iommu/iova.c | 2 +- + drivers/iommu/mtk_iommu_v1.c | 25 +- + drivers/iommu/of_iommu.c | 126 +++++-- + drivers/iommu/omap-iommu.c | 190 +++++++---- + drivers/iommu/omap-iommu.h | 34 ++ + drivers/iommu/rockchip-iommu.c | 30 +- + drivers/media/platform/omap3isp/isp.c | 17 - + drivers/media/platform/omap3isp/isp.h | 1 - + drivers/of/device.c | 23 +- + drivers/of/platform.c | 10 +- + drivers/pci/probe.c | 28 -- + include/acpi/acpi_bus.h | 2 +- + include/asm-generic/vmlinux.lds.h | 1 - + include/linux/acpi.h | 7 +- + include/linux/acpi_iort.h | 3 - + include/linux/dma-iommu.h | 5 + + include/linux/dma-mapping.h | 12 + + include/linux/intel-iommu.h | 18 +- + include/linux/iommu.h | 11 +- + include/linux/of_device.h | 10 +- + include/linux/platform_data/iommu-omap.h | 20 -- + 38 files changed, 1057 insertions(+), 713 deletions(-) +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote()) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/vfio_iommu_spapr_tce.c | 13 ++++ + drivers/vfio/vfio_iommu_type1.c | 150 +++++++++++++++--------------------- + 2 files changed, 77 insertions(+), 86 deletions(-) +Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver()) +$ git merge trivial/for-next +Auto-merging tools/testing/selftests/powerpc/Makefile +Auto-merging scripts/package/builddeb +Auto-merging init/main.c +Auto-merging include/linux/sched.h +Auto-merging drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/md/Kconfig +Auto-merging drivers/block/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/trace/ftrace.txt | 2 +- + MAINTAINERS | 2 +- + drivers/block/Kconfig | 2 +- + drivers/gpu/drm/sti/sti_compositor.c | 2 +- + drivers/hid/hid-picolcd_debugfs.c | 2 +- + drivers/macintosh/via-macii.c | 2 +- + drivers/md/Kconfig | 2 +- + drivers/media/dvb-frontends/horus3a.c | 2 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 +- + drivers/misc/cxl/flash.c | 2 +- + drivers/mtd/ubi/Kconfig | 2 +- + drivers/mtd/ubi/io.c | 2 +- + drivers/mtd/ubi/ubi.h | 3 +-- + drivers/net/ethernet/freescale/fec_main.c | 4 ++-- + drivers/net/phy/dp83848.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/scsi/mac_esp.c | 2 +- + drivers/scsi/snic/snic_scsi.c | 2 +- + drivers/tty/tty_io.c | 2 +- + fs/autofs4/Kconfig | 2 +- + include/linux/sched.h | 2 +- + init/main.c | 10 +++++----- + kernel/sched/fair.c | 2 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/timer.c | 2 +- + scripts/ksymoops/README | 5 ++--- + scripts/package/builddeb | 4 ++-- + tools/perf/builtin-probe.c | 2 +- + tools/testing/selftests/powerpc/Makefile | 2 +- + tools/testing/selftests/timers/Makefile | 4 ++-- + 31 files changed, 39 insertions(+), 41 deletions(-) +Merging audit/next (4acdad9bab28 audit: use kmem_cache to manage the audit_buffer cache) +$ git merge audit/next +Auto-merging kernel/module.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit_watch.c +Auto-merging kernel/audit_tree.c +Auto-merging kernel/audit_fsnotify.c +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + include/linux/audit.h | 7 +- + kernel/audit.c | 200 ++++++++++++++++++++++------------------------- + kernel/audit.h | 7 +- + kernel/audit_fsnotify.c | 2 +- + kernel/audit_tree.c | 9 ++- + kernel/audit_watch.c | 11 +-- + kernel/auditfilter.c | 18 ++--- + kernel/auditsc.c | 6 +- + kernel/module.c | 2 + + net/netfilter/xt_AUDIT.c | 126 +++++++---------------------- + 10 files changed, 151 insertions(+), 237 deletions(-) +Merging devicetree/for-next (b8475cbee5ab of: fix "/cpus" reference leak in of_numa_parse_cpu_nodes()) +$ git merge devicetree/for-next +Auto-merging scripts/Makefile.lib +Auto-merging include/linux/of_device.h +Auto-merging drivers/tty/serdev/core.c +Auto-merging drivers/of/device.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/net/faraday,ftmac.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/atmel/hlcdc-dc.txt | 2 +- + .../bindings/interrupt-controller/arm,nvic.txt | 36 ++ + .../devicetree/bindings/mfd/atmel-hlcdc.txt | 2 +- + .../net/{moxa,moxart-mac.txt => faraday,ftmac.txt} | 7 +- + .../bindings/{i2c => }/trivial-devices.txt | 0 + .../devicetree/bindings/vendor-prefixes.txt | 2 + + arch/powerpc/platforms/pseries/ibmebus.c | 5 +- + drivers/base/platform.c | 2 +- + drivers/macintosh/macio_sysfs.c | 7 +- + drivers/of/device.c | 20 +- + drivers/of/of_numa.c | 2 + + drivers/tty/serdev/core.c | 5 +- + drivers/usb/common/ulpi.c | 2 +- + include/linux/of_device.h | 7 +- + scripts/Makefile.lib | 12 +- + scripts/dtc/checks.c | 361 ++++++++++++++++++--- + scripts/dtc/data.c | 16 +- + scripts/dtc/dtc-lexer.l | 3 +- + scripts/dtc/dtc-lexer.lex.c_shipped | 77 ++--- + scripts/dtc/dtc-parser.tab.c_shipped | 6 +- + scripts/dtc/dtc-parser.y | 6 +- + scripts/dtc/dtc.c | 9 +- + scripts/dtc/dtc.h | 11 +- + scripts/dtc/flattree.c | 58 ++-- + scripts/dtc/libfdt/fdt_rw.c | 3 +- + scripts/dtc/libfdt/libfdt.h | 51 ++- + scripts/dtc/libfdt/libfdt_env.h | 26 +- + scripts/dtc/livetree.c | 22 +- + scripts/dtc/srcpos.c | 2 +- + scripts/dtc/srcpos.h | 11 +- + scripts/dtc/treesource.c | 6 +- + scripts/dtc/update-dtc-source.sh | 20 +- + scripts/dtc/util.c | 11 +- + scripts/dtc/util.h | 24 +- + scripts/dtc/version_gen.h | 2 +- + 35 files changed, 625 insertions(+), 211 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/arm,nvic.txt + rename Documentation/devicetree/bindings/net/{moxa,moxart-mac.txt => faraday,ftmac.txt} (68%) + rename Documentation/devicetree/bindings/{i2c => }/trivial-devices.txt (100%) +Merging mailbox/mailbox-for-next (73874913d504 mailbox: Remove depends on COMPILE_TEST for BCM_FLEXRM_MBOX) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../bindings/mailbox/brcm,iproc-flexrm-mbox.txt | 59 + + .../bindings/mailbox/brcm,iproc-pdc-mbox.txt | 6 +- + drivers/mailbox/Kconfig | 18 +- + drivers/mailbox/Makefile | 2 + + drivers/mailbox/bcm-flexrm-mailbox.c | 1595 ++++++++++++++++++++ + drivers/mailbox/bcm-pdc-mailbox.c | 61 +- + drivers/mailbox/hi6220-mailbox.c | 2 +- + drivers/mailbox/mailbox-xgene-slimpro.c | 2 +- + drivers/mailbox/mailbox.c | 6 + + include/linux/mailbox/brcm-message.h | 14 +- + 10 files changed, 1738 insertions(+), 27 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/brcm,iproc-flexrm-mbox.txt + create mode 100644 drivers/mailbox/bcm-flexrm-mailbox.c +Merging spi/for-next (cec00ac5dad3 Merge remote-tracking branch 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 7 + + .../devicetree/bindings/spi/spi-bcm63xx-hsspi.txt | 33 ++ + .../devicetree/bindings/spi/spi-bcm63xx.txt | 33 ++ + .../devicetree/bindings/spi/spi_pl022.txt | 8 +- + drivers/acpi/acpi_apd.c | 1 + + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-atmel.c | 44 ++- + drivers/spi/spi-bcm63xx-hsspi.c | 35 +- + drivers/spi/spi-bcm63xx.c | 51 ++- + drivers/spi/spi-davinci.c | 95 ++--- + drivers/spi/spi-dw-mmio.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 3 +- + drivers/spi/spi-fsl-spi.c | 3 +- + drivers/spi/spi-imx.c | 20 +- + drivers/spi/spi-lantiq-ssc.c | 438 +++++++++++---------- + drivers/spi/spi-loopback-test.c | 154 +++++--- + drivers/spi/spi-omap2-mcspi.c | 9 +- + drivers/spi/spi-orion.c | 11 +- + drivers/spi/spi-pl022.c | 2 +- + drivers/spi/spi-sc18is602.c | 24 +- + drivers/spi/spi-sun6i.c | 94 ++++- + drivers/spi/spi-tegra114.c | 2 +- + drivers/spi/spi-tegra20-sflash.c | 2 +- + drivers/spi/spi-tegra20-slink.c | 2 +- + drivers/spi/spi-test.h | 21 +- + drivers/spi/spi-ti-qspi.c | 70 +++- + drivers/spi/spi-xlp.c | 1 + + drivers/spi/spi.c | 38 +- + drivers/spi/spidev.c | 1 + + include/linux/spi/spi.h | 10 +- + tools/spi/spidev_test.c | 93 ++++- + 31 files changed, 899 insertions(+), 410 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx-hsspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx.txt +Merging tip/auto-latest (8a86a1ec6609 Merge branch 'x86/vdso') +$ git merge tip/auto-latest +Resolved 'arch/arm/boot/dts/rk3188.dtsi' using previous resolution. +Resolved 'arch/arm64/include/asm/bug.h' using previous resolution. +Resolved 'drivers/firmware/efi/efi-pstore.c' using previous resolution. +Recorded preimage for 'kernel/kprobes.c' +Removing tools/perf/util/alias.c +Auto-merging tools/perf/builtin-probe.c +Auto-merging tools/include/uapi/linux/perf_event.h +Auto-merging net/smc/af_smc.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/core/sock.c +Auto-merging net/core/dev.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/time/hrtimer.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/padata.c +Auto-merging kernel/module.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/kprobes.c +CONFLICT (content): Merge conflict in kernel/kprobes.c +Auto-merging kernel/irq/manage.c +Auto-merging kernel/fork.c +Auto-merging include/uapi/linux/perf_event.h +Auto-merging include/net/sock.h +Auto-merging include/linux/thread_info.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/module.h +Auto-merging include/linux/kprobes.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/init_task.h +Auto-merging include/linux/cpuhotplug.h +Auto-merging include/linux/compat.h +Auto-merging include/linux/acpi.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging fs/nfsd/vfs.c +Auto-merging drivers/pci/pci-driver.c +Removing drivers/irqchip/irq-moxart.c +Removing drivers/irqchip/irq-gemini.c +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/gpu/drm/i915/i915_gem_request.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/firmware/efi/libstub/fdt.c +Auto-merging drivers/firmware/efi/efi-pstore.c +CONFLICT (content): Merge conflict in drivers/firmware/efi/efi-pstore.c +Auto-merging drivers/clocksource/timer-fttmr010.c +Auto-merging drivers/block/nbd.c +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/Kconfig +Removing arch/x86/um/bug.c +Auto-merging arch/x86/pci/i386.c +Auto-merging arch/x86/kernel/ftrace_64.S +Auto-merging arch/x86/kernel/early-quirks.c +Auto-merging arch/x86/include/asm/thread_info.h +Removing arch/x86/include/asm/e820.h +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/include/asm/mmu_context.h +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/vmlinux.lds.S +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/include/asm/mmu_context.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/include/asm/bug.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/bug.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/boot/dts/rk322x.dtsi +Auto-merging arch/arm/boot/dts/rk3188.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188.dtsi +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt +Auto-merging Documentation/devicetree/bindings/interrupt-controller/faraday,ftintc010.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/kprobes.c'. +[master 633ec081a30e] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/00-INDEX | 2 +- + .../Design/Data-Structures/Data-Structures.html | 233 ++-- + .../RCU/Design/Data-Structures/nxtlist.svg | 34 +- + .../Expedited-Grace-Periods.html | 47 +- + .../RCU/Design/Requirements/Requirements.html | 195 +++- + Documentation/RCU/rcu_dereference.txt | 9 + + Documentation/RCU/rculist_nulls.txt | 6 +- + Documentation/RCU/stallwarn.txt | 190 ++-- + Documentation/RCU/whatisRCU.txt | 32 +- + Documentation/admin-guide/kernel-parameters.txt | 7 + + ...errupt-controller.txt => faraday,ftintc010.txt} | 11 +- + .../interrupt-controller/mediatek,cirq.txt | 35 + + .../interrupt-controller/mediatek,sysirq.txt | 11 +- + .../bindings/timer/cortina,gemini-timer.txt | 22 - + .../devicetree/bindings/timer/faraday,fttmr010.txt | 33 + + .../bindings/timer/rockchip,rk-timer.txt | 12 +- + Documentation/memory-barriers.txt | 2 +- + Documentation/scheduler/sched-pelt.c | 108 ++ + Documentation/trace/kprobetrace.txt | 5 +- + Documentation/usb/usb3-debug-port.rst | 100 ++ + Documentation/x86/intel_rdt_ui.txt | 124 ++- + Documentation/x86/x86_64/mm.txt | 36 +- + Documentation/x86/zero-page.txt | 6 +- + MAINTAINERS | 18 + + arch/Kconfig | 10 + + arch/alpha/kernel/osf_sys.c | 4 +- + arch/arm/boot/dts/rk3188.dtsi | 17 + + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/include/asm/efi.h | 14 +- + arch/arm/kernel/hw_breakpoint.c | 5 +- + arch/arm/kernel/vmlinux-xip.lds.S | 2 + + arch/arm/kernel/vmlinux.lds.S | 2 + + arch/arm/mach-moxart/Kconfig | 2 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/arch_timer.h | 43 +- + arch/arm64/include/asm/bug.h | 3 +- + arch/arm64/include/asm/efi.h | 24 +- + arch/arm64/kernel/acpi.c | 3 + + arch/avr32/kernel/vmlinux.lds.S | 1 + + arch/blackfin/kernel/time-ts.c | 4 + + arch/blackfin/kernel/vmlinux.lds.S | 2 + + arch/c6x/kernel/vmlinux.lds.S | 2 + + arch/c6x/platforms/timer64.c | 2 + + arch/cris/kernel/vmlinux.lds.S | 2 + + arch/frv/kernel/vmlinux.lds.S | 2 + + arch/hexagon/kernel/time.c | 2 + + arch/ia64/kernel/salinfo.c | 31 +- + arch/ia64/kernel/topology.c | 6 - + arch/ia64/kernel/vmlinux.lds.S | 2 + + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 17 +- + arch/mips/alchemy/common/time.c | 4 +- + arch/mips/jz4740/time.c | 2 + + arch/mips/kernel/cevt-bcm1480.c | 2 + + arch/mips/kernel/cevt-ds1287.c | 2 + + arch/mips/kernel/cevt-gt641xx.c | 2 + + arch/mips/kernel/cevt-sb1250.c | 2 + + arch/mips/kernel/cevt-txx9.c | 2 + + arch/mips/kernel/jump_label.c | 2 - + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/mips/loongson32/common/time.c | 2 + + arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c | 2 + + arch/mips/loongson64/loongson-3/hpet.c | 2 + + arch/mips/mti-malta/malta-time.c | 31 +- + arch/mips/ralink/cevt-rt3352.c | 2 + + arch/mips/sgi-ip27/ip27-timer.c | 2 + + arch/mn10300/kernel/cevt-mn10300.c | 2 + + arch/parisc/include/asm/bug.h | 8 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/bug.h | 4 +- + arch/powerpc/include/asm/mmu_context.h | 6 - + arch/powerpc/kernel/smp.c | 26 +- + arch/powerpc/kernel/time.c | 2 + + arch/powerpc/kernel/vmlinux.lds.S | 2 + + arch/powerpc/kvm/book3s_hv.c | 8 +- + arch/powerpc/platforms/powernv/subcore.c | 3 +- + arch/s390/include/asm/bug.h | 4 +- + arch/s390/include/asm/mmu_context.h | 6 - + arch/s390/kernel/time.c | 4 +- + arch/score/kernel/time.c | 2 + + arch/sh/include/asm/bug.h | 4 +- + arch/sparc/kernel/jump_label.c | 2 - + arch/sparc/kernel/sysfs.c | 39 +- + arch/sparc/kernel/time_32.c | 2 + + arch/sparc/kernel/time_64.c | 2 + + arch/tile/kernel/jump_label.c | 2 - + arch/tile/kernel/time.c | 2 + + arch/um/Kconfig.common | 5 - + arch/um/include/asm/mmu_context.h | 6 - + arch/um/include/shared/os.h | 4 +- + arch/um/kernel/time.c | 4 +- + arch/unicore32/include/asm/mmu_context.h | 6 - + arch/unicore32/kernel/time.c | 2 + + arch/x86/Kconfig | 20 +- + arch/x86/Kconfig.debug | 27 +- + arch/x86/Makefile | 12 +- + arch/x86/boot/boot.h | 2 +- + arch/x86/boot/compressed/eboot.c | 44 +- + arch/x86/boot/compressed/kaslr.c | 6 +- + arch/x86/boot/cpucheck.c | 9 + + arch/x86/boot/cpuflags.c | 12 +- + arch/x86/boot/header.S | 1 - + arch/x86/boot/memory.c | 6 +- + arch/x86/configs/i386_defconfig | 2 + + arch/x86/configs/x86_64_defconfig | 2 + + arch/x86/entry/entry_32.S | 171 +-- + arch/x86/entry/entry_64.S | 22 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/vdso/vclock_gettime.c | 24 + + arch/x86/entry/vdso/vdso-layout.lds.S | 3 +- + arch/x86/entry/vdso/vdso2c.c | 3 + + arch/x86/entry/vdso/vma.c | 9 +- + arch/x86/events/amd/iommu.c | 325 +++--- + arch/x86/events/amd/iommu.h | 18 +- + arch/x86/events/amd/uncore.c | 77 +- + arch/x86/events/core.c | 1 - + arch/x86/events/intel/bts.c | 16 +- + arch/x86/events/intel/core.c | 28 +- + arch/x86/events/intel/cqm.c | 12 +- + arch/x86/events/intel/ds.c | 2 +- + arch/x86/events/intel/pt.c | 129 ++- + arch/x86/events/intel/pt.h | 2 +- + arch/x86/events/perf_event.h | 1 + + arch/x86/hyperv/hv_init.c | 48 +- + arch/x86/include/asm/acpi.h | 2 + + arch/x86/include/asm/apic.h | 7 +- + arch/x86/include/asm/atomic.h | 33 +- + arch/x86/include/asm/atomic64_64.h | 46 +- + arch/x86/include/asm/bug.h | 80 +- + arch/x86/include/asm/clocksource.h | 3 +- + arch/x86/include/asm/cmpxchg.h | 70 ++ + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/desc.h | 147 ++- + arch/x86/include/asm/disabled-features.h | 8 +- + arch/x86/include/asm/e820.h | 73 -- + arch/x86/include/asm/e820/api.h | 50 + + arch/x86/include/asm/e820/types.h | 104 ++ + arch/x86/include/asm/elf.h | 28 +- + arch/x86/include/asm/fixmap.h | 4 + + arch/x86/include/asm/gart.h | 4 +- + arch/x86/include/asm/intel-family.h | 6 +- + arch/x86/include/asm/intel_rdt.h | 157 ++- + arch/x86/include/asm/kasan.h | 9 +- + arch/x86/include/asm/kexec.h | 1 + + arch/x86/include/asm/kprobes.h | 7 +- + arch/x86/include/asm/mce.h | 12 +- + arch/x86/include/asm/mmu_context.h | 4 - + arch/x86/include/asm/mpspec.h | 4 +- + arch/x86/include/asm/mshyperv.h | 54 + + arch/x86/include/asm/msr-index.h | 11 +- + arch/x86/include/asm/page_64.h | 16 +- + arch/x86/include/asm/page_64_types.h | 10 + + arch/x86/include/asm/paravirt.h | 54 +- + arch/x86/include/asm/paravirt_types.h | 17 +- + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/include/asm/pgalloc.h | 37 +- + arch/x86/include/asm/pgtable-2level_types.h | 1 + + arch/x86/include/asm/pgtable-3level_types.h | 1 + + arch/x86/include/asm/pgtable.h | 87 +- + arch/x86/include/asm/pgtable_32.h | 1 - + arch/x86/include/asm/pgtable_64.h | 23 +- + arch/x86/include/asm/pgtable_64_types.h | 32 +- + arch/x86/include/asm/pgtable_types.h | 46 +- + arch/x86/include/asm/processor.h | 19 +- + arch/x86/include/asm/proto.h | 4 +- + arch/x86/include/asm/reboot.h | 1 + + arch/x86/include/asm/required-features.h | 8 +- + arch/x86/include/asm/smp.h | 35 +- + arch/x86/include/asm/sparsemem.h | 9 +- + arch/x86/include/asm/stackprotector.h | 2 +- + arch/x86/include/asm/thread_info.h | 6 +- + arch/x86/include/asm/tlbflush.h | 10 + + arch/x86/include/asm/unwind.h | 2 + + arch/x86/include/asm/uv/uv_bau.h | 82 +- + arch/x86/include/asm/vdso.h | 1 + + arch/x86/include/asm/xen/page.h | 9 +- + arch/x86/include/uapi/asm/bootparam.h | 18 +- + arch/x86/include/uapi/asm/prctl.h | 11 +- + arch/x86/kernel/Makefile | 5 +- + arch/x86/kernel/acpi/boot.c | 11 +- + arch/x86/kernel/acpi/sleep.c | 2 +- + arch/x86/kernel/aperture_64.c | 10 +- + arch/x86/kernel/apic/apic.c | 12 +- + arch/x86/kernel/apic/apic_noop.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 1 + + arch/x86/kernel/apm_32.c | 6 +- + arch/x86/kernel/cpu/centaur.c | 2 +- + arch/x86/kernel/cpu/common.c | 59 +- + arch/x86/kernel/cpu/intel.c | 40 +- + arch/x86/kernel/cpu/intel_rdt.c | 350 +++++-- + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 125 ++- + arch/x86/kernel/cpu/intel_rdt_schemata.c | 181 ++-- + arch/x86/kernel/cpu/mcheck/Makefile | 2 + + arch/x86/kernel/cpu/mcheck/dev-mcelog.c | 397 +++++++ + arch/x86/kernel/cpu/mcheck/mce-internal.h | 8 + + arch/x86/kernel/cpu/mcheck/mce.c | 561 +++------- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 3 + + arch/x86/kernel/cpu/microcode/amd.c | 2 - + arch/x86/kernel/cpu/mtrr/cleanup.c | 6 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/proc.c | 5 +- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/crash.c | 23 +- + arch/x86/kernel/dumpstack.c | 5 +- + arch/x86/kernel/dumpstack_32.c | 12 - + arch/x86/kernel/dumpstack_64.c | 10 - + arch/x86/kernel/e820.c | 1053 +++++++++---------- + arch/x86/kernel/early-quirks.c | 4 +- + arch/x86/kernel/early_printk.c | 5 + + arch/x86/kernel/espfix_64.c | 12 +- + arch/x86/kernel/ftrace.c | 18 +- + arch/x86/kernel/ftrace_32.S | 244 +++++ + arch/x86/kernel/{mcount_64.S => ftrace_64.S} | 6 - + arch/x86/kernel/head32.c | 2 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/head_64.S | 10 +- + arch/x86/kernel/irq.c | 9 +- + arch/x86/kernel/irqinit.c | 2 - + arch/x86/kernel/jump_label.c | 2 - + arch/x86/kernel/kexec-bzimage64.c | 18 +- + arch/x86/kernel/kprobes/common.h | 4 +- + arch/x86/kernel/kprobes/core.c | 149 ++- + arch/x86/kernel/kprobes/ftrace.c | 2 +- + arch/x86/kernel/kprobes/opt.c | 13 +- + arch/x86/kernel/machine_kexec_32.c | 4 +- + arch/x86/kernel/machine_kexec_64.c | 14 +- + arch/x86/kernel/mpparse.c | 6 +- + arch/x86/kernel/paravirt.c | 13 +- + arch/x86/kernel/pci-calgary_64.c | 5 +- + arch/x86/kernel/probe_roms.c | 2 +- + arch/x86/kernel/process.c | 151 ++- + arch/x86/kernel/process_32.c | 7 + + arch/x86/kernel/process_64.c | 115 +- + arch/x86/kernel/ptrace.c | 8 +- + arch/x86/kernel/reboot.c | 5 +- + arch/x86/kernel/resource.c | 8 +- + arch/x86/kernel/setup.c | 130 +-- + arch/x86/kernel/setup_percpu.c | 23 +- + arch/x86/kernel/smp.c | 5 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/sys_x86_64.c | 15 +- + arch/x86/kernel/tboot.c | 22 +- + arch/x86/kernel/tls.c | 11 +- + arch/x86/kernel/traps.c | 46 +- + arch/x86/kernel/unwind_frame.c | 192 ++-- + arch/x86/kernel/unwind_guess.c | 4 +- + arch/x86/kernel/vm86_32.c | 6 +- + arch/x86/kernel/vmlinux.lds.S | 1 + + arch/x86/kernel/x86_init.c | 4 +- + arch/x86/kvm/svm.c | 4 +- + arch/x86/kvm/vmx.c | 12 +- + arch/x86/lguest/boot.c | 10 +- + arch/x86/lib/clear_page_64.S | 17 +- + arch/x86/lib/kaslr.c | 2 +- + arch/x86/mm/amdtopology.c | 2 +- + arch/x86/mm/dump_pagetables.c | 59 +- + arch/x86/mm/fault.c | 66 +- + arch/x86/mm/gup.c | 33 +- + arch/x86/mm/hugetlbpage.c | 9 +- + arch/x86/mm/ident_map.c | 51 +- + arch/x86/mm/init.c | 59 +- + arch/x86/mm/init_32.c | 73 +- + arch/x86/mm/init_64.c | 209 +++- + arch/x86/mm/ioremap.c | 6 +- + arch/x86/mm/kasan_init_64.c | 38 +- + arch/x86/mm/mmap.c | 125 ++- + arch/x86/mm/mmio-mod.c | 2 +- + arch/x86/mm/mpx.c | 10 +- + arch/x86/mm/numa.c | 6 +- + arch/x86/mm/pageattr.c | 56 +- + arch/x86/mm/pat.c | 3 +- + arch/x86/mm/pgtable.c | 36 +- + arch/x86/mm/pgtable_32.c | 10 +- + arch/x86/mm/srat.c | 2 +- + arch/x86/pci/i386.c | 4 +- + arch/x86/pci/mmconfig-shared.c | 22 +- + arch/x86/pci/mmconfig_32.c | 2 +- + arch/x86/pci/mmconfig_64.c | 2 +- + arch/x86/pci/pcbios.c | 2 + + arch/x86/platform/efi/Makefile | 1 - + arch/x86/platform/efi/efi.c | 19 +- + arch/x86/platform/efi/efi_32.c | 4 +- + arch/x86/platform/efi/efi_64.c | 45 +- + arch/x86/platform/efi/quirks.c | 8 +- + arch/x86/platform/intel-mid/device_libs/Makefile | 3 +- + .../platform/intel-mid/device_libs/platform_bt.c | 108 ++ + arch/x86/platform/uv/tlb_uv.c | 195 ++-- + arch/x86/platform/uv/uv_time.c | 2 + + arch/x86/power/cpu.c | 7 +- + arch/x86/power/hibernate_32.c | 7 +- + arch/x86/power/hibernate_64.c | 63 +- + arch/x86/ras/Kconfig | 14 + + arch/x86/um/Makefile | 4 +- + arch/x86/um/asm/ptrace.h | 2 +- + arch/x86/um/bug.c | 21 - + arch/x86/um/os-Linux/prctl.c | 4 +- + arch/x86/um/syscalls_32.c | 7 + + arch/x86/um/syscalls_64.c | 20 +- + arch/x86/xen/enlighten.c | 30 +- + arch/x86/xen/mmu.c | 400 ++++--- + arch/x86/xen/mmu.h | 1 + + arch/x86/xen/setup.c | 118 ++- + arch/x86/xen/smp.c | 2 +- + arch/x86/xen/time.c | 4 + + drivers/acpi/Kconfig | 2 +- + drivers/acpi/apei/ghes.c | 5 +- + drivers/acpi/arm64/Kconfig | 3 + + drivers/acpi/arm64/Makefile | 1 + + drivers/acpi/arm64/gtdt.c | 417 ++++++++ + drivers/acpi/bgrt.c | 6 + + drivers/acpi/processor_driver.c | 10 +- + drivers/acpi/processor_throttling.c | 62 +- + drivers/acpi/tables.c | 2 +- + drivers/base/platform-msi.c | 3 +- + drivers/block/nbd.c | 2 +- + drivers/char/agp/amd64-agp.c | 2 +- + drivers/char/mmtimer.c | 28 +- + drivers/clocksource/Kconfig | 19 +- + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/arc_timer.c | 14 +- + drivers/clocksource/arm_arch_timer.c | 1108 +++++++++++++------- + drivers/clocksource/asm9260_timer.c | 2 +- + drivers/clocksource/bcm2835_timer.c | 6 +- + drivers/clocksource/bcm_kona_timer.c | 2 +- + drivers/clocksource/clksrc-probe.c | 2 +- + drivers/clocksource/dw_apb_timer.c | 4 +- + drivers/clocksource/em_sti.c | 46 +- + drivers/clocksource/h8300_timer8.c | 8 - + drivers/clocksource/meson6_timer.c | 4 +- + drivers/clocksource/metag_generic.c | 2 + + drivers/clocksource/mips-gic-timer.c | 15 +- + drivers/clocksource/nomadik-mtu.c | 8 +- + drivers/clocksource/numachip.c | 2 + + drivers/clocksource/pxa_timer.c | 6 +- + drivers/clocksource/rockchip_timer.c | 218 ++-- + drivers/clocksource/samsung_pwm_timer.c | 6 +- + drivers/clocksource/sh_cmt.c | 47 +- + drivers/clocksource/sh_tmu.c | 26 +- + drivers/clocksource/sun4i_timer.c | 10 +- + drivers/clocksource/tegra20_timer.c | 2 +- + drivers/clocksource/time-armada-370-xp.c | 16 +- + drivers/clocksource/time-efm32.c | 2 +- + drivers/clocksource/time-orion.c | 34 +- + drivers/clocksource/timer-atlas7.c | 2 + + drivers/clocksource/timer-atmel-pit.c | 2 +- + drivers/clocksource/timer-digicolor.c | 6 +- + .../{timer-gemini.c => timer-fttmr010.c} | 164 +-- + drivers/clocksource/timer-integrator-ap.c | 4 +- + drivers/clocksource/timer-nps.c | 6 +- + drivers/clocksource/timer-prima2.c | 10 +- + drivers/clocksource/timer-sp804.c | 4 +- + drivers/clocksource/timer-sun5i.c | 6 +- + drivers/clocksource/vf_pit_timer.c | 2 +- + drivers/cpufreq/cpufreq.c | 9 +- + drivers/cpufreq/ia64-acpi-cpufreq.c | 92 +- + drivers/cpufreq/sh-cpufreq.c | 45 +- + drivers/cpufreq/sparc-us2e-cpufreq.c | 45 +- + drivers/cpufreq/sparc-us3-cpufreq.c | 46 +- + drivers/crypto/n2_core.c | 31 +- + drivers/firmware/efi/Makefile | 1 + + .../platform => drivers/firmware}/efi/efi-bgrt.c | 0 + drivers/firmware/efi/efi-pstore.c | 6 +- + drivers/firmware/efi/libstub/arm-stub.c | 87 +- + drivers/firmware/efi/libstub/arm32-stub.c | 150 ++- + drivers/firmware/efi/libstub/arm64-stub.c | 4 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 32 +- + drivers/firmware/efi/libstub/efistub.h | 9 + + drivers/firmware/efi/libstub/fdt.c | 57 +- + drivers/firmware/efi/libstub/secureboot.c | 2 + + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_request.h | 2 +- + drivers/hv/Kconfig | 3 + + drivers/hwtracing/coresight/coresight-etb10.c | 9 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 9 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 12 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 12 +- + drivers/hwtracing/coresight/coresight-priv.h | 2 - + drivers/hwtracing/coresight/coresight-tmc-etf.c | 7 +- + drivers/iommu/amd_iommu.c | 6 +- + drivers/iommu/amd_iommu_init.c | 101 +- + drivers/iommu/amd_iommu_proto.h | 8 +- + drivers/iommu/amd_iommu_types.h | 3 - + drivers/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 5 +- + drivers/irqchip/irq-atmel-aic5.c | 29 +- + drivers/irqchip/irq-ftintc010.c | 194 ++++ + drivers/irqchip/irq-gemini.c | 185 ---- + drivers/irqchip/irq-gic-v3-its-platform-msi.c | 113 +- + drivers/irqchip/irq-gic-v3-its.c | 2 +- + drivers/irqchip/irq-imx-gpcv2.c | 5 + + drivers/irqchip/irq-mbigen.c | 115 +- + drivers/irqchip/irq-mips-gic.c | 338 ++---- + drivers/irqchip/irq-moxart.c | 116 -- + drivers/irqchip/irq-mtk-cirq.c | 306 ++++++ + drivers/irqchip/irq-mtk-sysirq.c | 116 +- + drivers/lguest/x86/core.c | 6 +- + drivers/pci/pci-driver.c | 47 +- + drivers/pnp/pnpbios/bioscalls.c | 10 +- + drivers/ptp/ptp_clock.c | 18 +- + drivers/ras/Makefile | 3 +- + drivers/ras/cec.c | 532 ++++++++++ + drivers/ras/debugfs.c | 2 +- + drivers/ras/debugfs.h | 8 + + drivers/ras/ras.c | 11 + + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 2 +- + drivers/usb/Makefile | 2 +- + drivers/usb/early/Makefile | 1 + + drivers/usb/early/xhci-dbc.c | 1014 ++++++++++++++++++ + drivers/usb/early/xhci-dbc.h | 211 ++++ + drivers/usb/serial/usb_debug.c | 28 +- + fs/exec.c | 1 + + fs/jbd2/journal.c | 2 +- + fs/nfsd/vfs.c | 2 +- + fs/signalfd.c | 2 +- + include/asm-generic/bug.h | 20 +- + include/asm-generic/mm_hooks.h | 6 - + include/asm-generic/pgtable.h | 25 + + include/asm-generic/vmlinux.lds.h | 5 +- + include/clocksource/arm_arch_timer.h | 34 + + include/linux/acpi.h | 7 + + include/linux/atomic.h | 46 + + include/linux/bug.h | 2 +- + include/linux/clockchips.h | 1 - + include/linux/clocksource.h | 2 +- + include/linux/compat.h | 2 + + include/linux/coresight.h | 2 +- + include/linux/cpu.h | 2 + + include/linux/cpuhotplug.h | 38 + + include/linux/cpumask.h | 10 + + include/linux/dma-fence.h | 4 +- + include/linux/efi-bgrt.h | 5 + + include/linux/efi.h | 5 +- + include/linux/hrtimer.h | 6 +- + include/linux/init_task.h | 1 + + include/linux/irqchip/mips-gic.h | 1 - + include/linux/jump_label.h | 20 +- + include/linux/kernel.h | 1 + + include/linux/kprobes.h | 2 + + include/linux/kvm_host.h | 4 +- + include/linux/lockdep.h | 3 + + include/linux/mm.h | 4 + + include/linux/mm_types.h | 5 + + include/linux/module.h | 6 + + include/linux/padata.h | 3 - + include/linux/pagemap.h | 4 +- + include/linux/pci.h | 1 + + include/linux/percpu.h | 1 + + include/linux/perf_event.h | 17 +- + include/linux/posix-clock.h | 10 +- + include/linux/posix-timers.h | 20 +- + include/linux/ras.h | 13 +- + include/linux/rcu_node_tree.h | 99 ++ + include/linux/rcu_segcblist.h | 712 +++++++++++++ + include/linux/rculist.h | 3 +- + include/linux/rcupdate.h | 17 +- + include/linux/rcutiny.h | 24 +- + include/linux/rcutree.h | 5 +- + include/linux/refcount.h | 19 + + include/linux/sched.h | 8 +- + include/linux/sched/rt.h | 23 +- + include/linux/slab.h | 6 +- + include/linux/smp.h | 12 + + include/linux/srcu.h | 84 +- + include/linux/srcuclassic.h | 101 ++ + include/linux/srcutiny.h | 81 ++ + include/linux/srcutree.h | 139 +++ + include/linux/stop_machine.h | 26 +- + include/linux/thread_info.h | 4 + + include/linux/timekeeping.h | 20 +- + include/linux/types.h | 2 +- + include/linux/usb/xhci-dbgp.h | 29 + + include/linux/workqueue.h | 5 + + include/net/sock.h | 2 +- + include/trace/events/sched.h | 16 +- + include/trace/events/xen.h | 28 +- + include/uapi/linux/perf_event.h | 33 +- + include/xen/page.h | 2 +- + init/Kconfig | 39 +- + kernel/compat.c | 10 +- + kernel/cpu.c | 179 ++-- + kernel/events/core.c | 154 ++- + kernel/events/ring_buffer.c | 34 +- + kernel/fork.c | 7 +- + kernel/futex.c | 518 ++++++--- + kernel/irq/chip.c | 5 +- + kernel/irq/manage.c | 6 +- + kernel/jump_label.c | 47 +- + kernel/kprobes.c | 71 +- + kernel/locking/lockdep.c | 328 +++--- + kernel/locking/rtmutex-debug.c | 18 +- + kernel/locking/rtmutex-debug.h | 3 - + kernel/locking/rtmutex.c | 390 ++++--- + kernel/locking/rtmutex.h | 2 - + kernel/locking/rtmutex_common.h | 25 +- + kernel/locking/rwsem.c | 6 +- + kernel/locking/test-ww_mutex.c | 29 +- + kernel/module.c | 42 +- + kernel/nsproxy.c | 3 + + kernel/padata.c | 43 +- + kernel/params.c | 52 - + kernel/rcu/Makefile | 4 +- + kernel/rcu/rcu.h | 153 ++- + kernel/rcu/rcutorture.c | 35 +- + kernel/rcu/srcu.c | 12 +- + kernel/rcu/srcutiny.c | 215 ++++ + kernel/rcu/srcutree.c | 996 ++++++++++++++++++ + kernel/rcu/tiny.c | 20 +- + kernel/rcu/tiny_plugin.h | 13 +- + kernel/rcu/tree.c | 696 +++++------- + kernel/rcu/tree.h | 164 +-- + kernel/rcu/tree_exp.h | 25 +- + kernel/rcu/tree_plugin.h | 64 +- + kernel/rcu/tree_trace.c | 26 +- + kernel/rcu/update.c | 53 +- + kernel/sched/core.c | 265 +++-- + kernel/sched/fair.c | 418 ++++---- + kernel/sched/features.h | 7 + + kernel/sched/rt.c | 81 ++ + kernel/sched/sched-pelt.h | 13 + + kernel/sched/sched.h | 65 +- + kernel/signal.c | 2 +- + kernel/softirq.c | 2 +- + kernel/stop_machine.c | 7 +- + kernel/sysctl.c | 2 + + kernel/time/alarmtimer.c | 27 +- + kernel/time/clockevents.c | 2 +- + kernel/time/hrtimer.c | 15 +- + kernel/time/posix-clock.c | 10 +- + kernel/time/posix-cpu-timers.c | 75 +- + kernel/time/posix-stubs.c | 20 +- + kernel/time/posix-timers.c | 97 +- + kernel/time/sched_clock.c | 5 + + kernel/time/tick-sched.c | 33 +- + kernel/time/tick-sched.h | 2 + + kernel/time/time.c | 4 +- + kernel/time/timekeeping.c | 3 +- + kernel/time/timer.c | 2 +- + kernel/time/timer_list.c | 6 + + kernel/trace/Kconfig | 2 +- + kernel/trace/trace.c | 1 + + kernel/trace/trace_events.c | 6 + + kernel/trace/trace_kprobe.c | 9 +- + kernel/tracepoint.c | 4 +- + kernel/workqueue.c | 23 + + lib/bug.c | 28 +- + lib/cmdline.c | 57 + + lib/refcount.c | 169 ++- + mm/gup.c | 148 ++- + mm/kasan/kasan.c | 6 +- + mm/kmemcheck.c | 2 +- + mm/mmu_notifier.c | 14 +- + mm/percpu.c | 40 +- + mm/rmap.c | 4 +- + mm/slab.c | 6 +- + mm/slab.h | 4 +- + mm/slab_common.c | 6 +- + mm/slob.c | 6 +- + mm/slub.c | 12 +- + net/core/dev.c | 2 +- + net/core/sock.c | 2 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/llc/af_llc.c | 2 +- + net/llc/llc_conn.c | 4 +- + net/llc/llc_sap.c | 2 +- + net/netfilter/nf_conntrack_core.c | 8 +- + net/smc/af_smc.c | 2 +- + scripts/checksyscalls.sh | 1 + + tools/arch/arm/include/uapi/asm/kvm.h | 13 + + tools/arch/arm64/include/uapi/asm/kvm.h | 13 + + tools/arch/powerpc/include/uapi/asm/kvm.h | 22 + + tools/arch/x86/include/asm/atomic.h | 7 + + tools/arch/x86/include/asm/cmpxchg.h | 89 ++ + tools/arch/x86/include/asm/cpufeatures.h | 8 +- + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 18 +- + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-sched_getcpu.c | 7 + + tools/include/asm-generic/atomic-gcc.h | 8 + + tools/include/linux/atomic.h | 6 + + tools/include/linux/bug.h | 10 + + tools/include/linux/compiler-gcc.h | 7 + + tools/include/linux/compiler.h | 9 + + tools/include/linux/hashtable.h | 4 - + tools/include/linux/kernel.h | 7 + + tools/include/linux/log2.h | 3 + + tools/include/linux/refcount.h | 151 +++ + tools/include/linux/types.h | 1 + + tools/include/uapi/linux/fcntl.h | 72 ++ + tools/include/uapi/linux/perf_event.h | 33 +- + tools/include/uapi/linux/stat.h | 176 ++++ + tools/lguest/lguest.c | 2 +- + tools/lib/api/fs/fs.c | 29 + + tools/lib/api/fs/fs.h | 1 + + tools/lib/symbol/kallsyms.c | 1 + + tools/objtool/builtin-check.c | 3 +- + tools/objtool/objtool.c | 3 +- + tools/perf/.gitignore | 2 + + tools/perf/Build | 1 + + tools/perf/Documentation/perf-ftrace.txt | 18 + + tools/perf/Documentation/perf-list.txt | 8 +- + tools/perf/Documentation/perf-record.txt | 3 + + tools/perf/Documentation/perf-report.txt | 13 +- + tools/perf/Documentation/perf-sched.txt | 4 + + tools/perf/Documentation/perf-script.txt | 16 +- + tools/perf/Documentation/perf-stat.txt | 6 +- + tools/perf/Documentation/perf-trace.txt | 3 +- + tools/perf/Documentation/perf.data-file-format.txt | 19 +- + tools/perf/MANIFEST | 5 + + tools/perf/Makefile.config | 39 +- + tools/perf/arch/arm/util/dwarf-regs.c | 4 +- + tools/perf/arch/arm64/util/dwarf-regs.c | 4 +- + tools/perf/arch/arm64/util/unwind-libunwind.c | 2 +- + tools/perf/arch/common.c | 2 + + tools/perf/arch/powerpc/util/dwarf-regs.c | 5 +- + tools/perf/arch/powerpc/util/kvm-stat.c | 1 + + tools/perf/arch/powerpc/util/perf_regs.c | 112 ++ + tools/perf/arch/powerpc/util/sym-handling.c | 14 +- + tools/perf/arch/s390/annotate/instructions.c | 30 + + tools/perf/arch/s390/util/kvm-stat.c | 1 + + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 1 + + tools/perf/arch/x86/tests/intel-cqm.c | 1 + + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 + + tools/perf/arch/x86/util/auxtrace.c | 1 + + tools/perf/arch/x86/util/intel-bts.c | 1 + + tools/perf/arch/x86/util/intel-pt.c | 1 + + tools/perf/arch/x86/util/kvm-stat.c | 1 + + tools/perf/arch/x86/util/perf_regs.c | 227 ++++ + tools/perf/bench/bench.h | 20 +- + tools/perf/bench/futex-hash.c | 4 +- + tools/perf/bench/futex-lock-pi.c | 4 +- + tools/perf/bench/futex-requeue.c | 4 +- + tools/perf/bench/futex-wake-parallel.c | 4 +- + tools/perf/bench/futex-wake.c | 4 +- + tools/perf/bench/futex.h | 10 +- + tools/perf/bench/mem-functions.c | 5 +- + tools/perf/bench/numa.c | 7 +- + tools/perf/bench/sched-messaging.c | 3 +- + tools/perf/bench/sched-pipe.c | 2 +- + tools/perf/builtin-annotate.c | 6 +- + tools/perf/builtin-bench.c | 12 +- + tools/perf/builtin-buildid-cache.c | 4 +- + tools/perf/builtin-buildid-list.c | 4 +- + tools/perf/builtin-c2c.c | 10 +- + tools/perf/builtin-config.c | 2 +- + tools/perf/builtin-data.c | 9 +- + tools/perf/builtin-diff.c | 5 +- + tools/perf/builtin-evlist.c | 2 +- + tools/perf/builtin-ftrace.c | 156 ++- + tools/perf/builtin-help.c | 21 +- + tools/perf/builtin-inject.c | 18 +- + tools/perf/builtin-kallsyms.c | 3 +- + tools/perf/builtin-kmem.c | 10 +- + tools/perf/builtin-kvm.c | 22 +- + tools/perf/builtin-list.c | 16 +- + tools/perf/builtin-lock.c | 32 +- + tools/perf/builtin-mem.c | 8 +- + tools/perf/builtin-probe.c | 12 +- + tools/perf/builtin-record.c | 39 +- + tools/perf/builtin-report.c | 12 +- + tools/perf/builtin-sched.c | 37 +- + tools/perf/builtin-script.c | 321 +++++- + tools/perf/builtin-stat.c | 219 +++- + tools/perf/builtin-timechart.c | 27 +- + tools/perf/builtin-top.c | 5 +- + tools/perf/builtin-trace.c | 93 +- + tools/perf/builtin-version.c | 3 +- + tools/perf/builtin.h | 58 +- + tools/perf/check-headers.sh | 2 + + tools/perf/command-list.txt | 1 + + tools/perf/perf.c | 123 +-- + tools/perf/perf.h | 1 + + .../perf/pmu-events/arch/x86/broadwell/uncore.json | 278 +++++ + .../arch/x86/broadwellde/uncore-cache.json | 28 +- + .../arch/x86/broadwellde/uncore-memory.json | 29 +- + .../arch/x86/broadwellde/uncore-power.json | 26 +- + .../arch/x86/broadwellx/uncore-cache.json | 28 +- + .../arch/x86/broadwellx/uncore-interconnect.json | 6 +- + .../arch/x86/broadwellx/uncore-memory.json | 21 +- + .../arch/x86/broadwellx/uncore-power.json | 26 +- + tools/perf/pmu-events/arch/x86/haswell/uncore.json | 374 +++++++ + .../pmu-events/arch/x86/haswellx/uncore-cache.json | 28 +- + .../arch/x86/haswellx/uncore-interconnect.json | 6 +- + .../arch/x86/haswellx/uncore-memory.json | 21 +- + .../pmu-events/arch/x86/haswellx/uncore-power.json | 26 +- + .../perf/pmu-events/arch/x86/ivybridge/uncore.json | 314 ++++++ + .../pmu-events/arch/x86/ivytown/uncore-cache.json | 22 +- + .../arch/x86/ivytown/uncore-interconnect.json | 12 +- + .../pmu-events/arch/x86/ivytown/uncore-memory.json | 19 +- + .../pmu-events/arch/x86/ivytown/uncore-power.json | 53 +- + .../pmu-events/arch/x86/jaketown/uncore-cache.json | 13 +- + .../arch/x86/jaketown/uncore-interconnect.json | 12 +- + .../arch/x86/jaketown/uncore-memory.json | 21 +- + .../pmu-events/arch/x86/jaketown/uncore-power.json | 53 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 1 + + .../pmu-events/arch/x86/sandybridge/uncore.json | 314 ++++++ + tools/perf/pmu-events/arch/x86/skylake/uncore.json | 254 +++++ + tools/perf/pmu-events/jevents.c | 28 +- + tools/perf/pmu-events/jevents.h | 3 +- + tools/perf/pmu-events/pmu-events.h | 2 + + tools/perf/tests/Build | 1 + + tools/perf/tests/attr.c | 2 + + tools/perf/tests/backward-ring-buffer.c | 1 + + tools/perf/tests/bpf.c | 2 + + tools/perf/tests/builtin-test.c | 8 +- + tools/perf/tests/clang.c | 1 + + tools/perf/tests/code-reading.c | 6 +- + tools/perf/tests/cpumap.c | 2 +- + tools/perf/tests/dso-data.c | 2 + + tools/perf/tests/dwarf-unwind.c | 1 + + tools/perf/tests/event-times.c | 2 + + tools/perf/tests/evsel-roundtrip-name.c | 2 + + tools/perf/tests/expr.c | 56 + + tools/perf/tests/hists_common.c | 2 + + tools/perf/tests/hists_cumulate.c | 1 + + tools/perf/tests/hists_filter.c | 1 + + tools/perf/tests/hists_link.c | 2 + + tools/perf/tests/hists_output.c | 1 + + tools/perf/tests/is_printable_array.c | 3 +- + tools/perf/tests/mmap-basic.c | 3 + + tools/perf/tests/mmap-thread-lookup.c | 2 + + tools/perf/tests/openat-syscall-all-cpus.c | 6 + + tools/perf/tests/openat-syscall-tp-fields.c | 1 + + tools/perf/tests/openat-syscall.c | 5 + + tools/perf/tests/parse-events.c | 5 +- + tools/perf/tests/parse-no-sample-id-all.c | 1 + + tools/perf/tests/perf-record.c | 2 + + tools/perf/tests/pmu.c | 2 + + tools/perf/tests/sample-parsing.c | 2 + + tools/perf/tests/sdt.c | 3 +- + tools/perf/tests/sw-clock.c | 2 + + tools/perf/tests/switch-tracking.c | 1 + + tools/perf/tests/task-exit.c | 1 + + tools/perf/tests/tests.h | 1 + + tools/perf/tests/thread-map.c | 6 +- + tools/perf/tests/thread-mg-share.c | 12 +- + tools/perf/tests/unit_number__scnprintf.c | 1 + + tools/perf/tests/vmlinux-kallsyms.c | 1 + + tools/perf/trace/beauty/Build | 1 + + tools/perf/trace/beauty/beauty.h | 24 + + tools/perf/trace/beauty/statx.c | 72 ++ + tools/perf/ui/browser.c | 4 +- + tools/perf/ui/browsers/annotate.c | 3 + + tools/perf/ui/browsers/header.c | 2 + + tools/perf/ui/browsers/hists.c | 191 +++- + tools/perf/ui/browsers/map.c | 2 + + tools/perf/ui/gtk/annotate.c | 2 +- + tools/perf/ui/gtk/hists.c | 1 + + tools/perf/ui/hist.c | 1 + + tools/perf/ui/setup.c | 1 + + tools/perf/ui/stdio/hist.c | 90 +- + tools/perf/ui/tui/setup.c | 1 + + tools/perf/util/Build | 10 +- + tools/perf/util/alias.c | 78 -- + tools/perf/util/annotate.c | 89 +- + tools/perf/util/annotate.h | 2 +- + tools/perf/util/auxtrace.c | 10 +- + tools/perf/util/auxtrace.h | 1 + + tools/perf/util/bpf-loader.c | 3 + + tools/perf/util/bpf-loader.h | 2 + + tools/perf/util/bpf-prologue.c | 1 + + tools/perf/util/bpf-prologue.h | 2 + + tools/perf/util/build-id.c | 17 +- + tools/perf/util/build-id.h | 4 +- + tools/perf/util/c++/clang-c.h | 1 + + tools/perf/util/cache.h | 1 - + tools/perf/util/callchain.c | 168 ++- + tools/perf/util/callchain.h | 3 +- + tools/perf/util/cgroup.c | 11 +- + tools/perf/util/cgroup.h | 4 +- + tools/perf/util/cloexec.c | 1 + + tools/perf/util/cloexec.h | 6 - + tools/perf/util/comm.c | 16 +- + tools/perf/util/config.c | 57 +- + tools/perf/util/counts.c | 2 + + tools/perf/util/cpumap.c | 65 +- + tools/perf/util/cpumap.h | 5 +- + tools/perf/util/ctype.c | 2 +- + tools/perf/util/data-convert-bt.c | 5 + + tools/perf/util/data.c | 1 + + tools/perf/util/debug.c | 4 + + tools/perf/util/demangle-java.c | 2 + + tools/perf/util/drv_configs.c | 1 + + tools/perf/util/dso.c | 10 +- + tools/perf/util/dso.h | 4 +- + tools/perf/util/dump-insn.c | 14 + + tools/perf/util/dump-insn.h | 22 + + tools/perf/util/dwarf-aux.c | 3 + + tools/perf/util/dwarf-regs.c | 1 + + tools/perf/util/env.c | 1 + + tools/perf/util/event.c | 179 +++- + tools/perf/util/event.h | 20 + + tools/perf/util/evlist.c | 33 +- + tools/perf/util/evlist.h | 5 +- + tools/perf/util/evsel.c | 23 +- + tools/perf/util/evsel.h | 5 + + tools/perf/util/evsel_fprintf.c | 2 + + tools/perf/util/expr.h | 25 + + tools/perf/util/expr.y | 173 +++ + tools/perf/util/header.c | 16 +- + tools/perf/util/help-unknown-cmd.c | 8 +- + tools/perf/util/hist.c | 16 +- + tools/perf/util/hist.h | 2 + + tools/perf/util/intel-bts.c | 2 + + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 26 + + tools/perf/util/intel-pt.c | 1 + + tools/perf/util/jitdump.c | 7 +- + tools/perf/util/lzma.c | 1 + + tools/perf/util/machine.c | 44 +- + tools/perf/util/machine.h | 3 + + tools/perf/util/map.c | 15 +- + tools/perf/util/map.h | 10 +- + tools/perf/util/mem-events.c | 1 + + tools/perf/util/namespaces.c | 36 + + tools/perf/util/namespaces.h | 26 + + tools/perf/util/ordered-events.c | 5 +- + tools/perf/util/parse-events.c | 90 +- + tools/perf/util/parse-events.h | 30 +- + tools/perf/util/parse-events.y | 73 +- + tools/perf/util/path.c | 28 +- + tools/perf/util/path.h | 9 + + tools/perf/util/perf-hooks.c | 1 + + tools/perf/util/perf_regs.c | 6 + + tools/perf/util/perf_regs.h | 7 + + tools/perf/util/pmu.c | 37 +- + tools/perf/util/pmu.h | 6 +- + tools/perf/util/print_binary.c | 55 + + tools/perf/util/print_binary.h | 28 + + tools/perf/util/probe-event.c | 29 +- + tools/perf/util/probe-event.h | 7 +- + tools/perf/util/probe-file.c | 215 +++- + tools/perf/util/probe-file.h | 8 +- + tools/perf/util/probe-finder.c | 3 + + tools/perf/util/probe-finder.h | 2 +- + tools/perf/util/python-ext-sources | 1 + + tools/perf/util/python.c | 1 + + tools/perf/util/quote.c | 1 + + tools/perf/util/record.c | 1 + + tools/perf/util/sane_ctype.h | 51 + + .../perf/util/scripting-engines/trace-event-perl.c | 1 + + .../util/scripting-engines/trace-event-python.c | 2 + + tools/perf/util/session.c | 53 +- + tools/perf/util/session.h | 1 + + tools/perf/util/sort.c | 108 +- + tools/perf/util/sort.h | 13 +- + tools/perf/util/srcline.c | 248 ++++- + tools/perf/util/srcline.h | 34 + + tools/perf/util/stat-shadow.c | 197 ++++ + tools/perf/util/stat.c | 2 + + tools/perf/util/stat.h | 2 + + tools/perf/util/strbuf.c | 1 + + tools/perf/util/strfilter.c | 5 +- + tools/perf/util/string.c | 24 +- + tools/perf/util/string2.h | 42 + + tools/perf/util/symbol-elf.c | 33 +- + tools/perf/util/symbol-minimal.c | 8 + + tools/perf/util/symbol.c | 3 + + tools/perf/util/symbol.h | 8 +- + tools/perf/util/term.c | 6 +- + tools/perf/util/thread-stack.c | 1 + + tools/perf/util/thread.c | 52 +- + tools/perf/util/thread.h | 10 +- + tools/perf/util/thread_map.c | 22 +- + tools/perf/util/thread_map.h | 4 +- + tools/perf/util/tool.h | 2 + + tools/perf/util/trace-event-parse.c | 3 +- + tools/perf/util/trace-event-read.c | 4 +- + tools/perf/util/unwind-libdw.c | 1 + + tools/perf/util/unwind-libunwind-local.c | 2 + + tools/perf/util/util.c | 67 +- + tools/perf/util/util.h | 239 +---- + tools/perf/util/values.c | 63 +- + tools/perf/util/vdso.c | 2 +- + tools/scripts/Makefile.include | 9 + + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +- + tools/testing/selftests/x86/ldt_gdt.c | 46 + + tools/testing/selftests/x86/mpx-mini-test.c | 5 +- + 880 files changed, 24602 insertions(+), 8988 deletions(-) + rename Documentation/devicetree/bindings/interrupt-controller/{cortina,gemini-interrupt-controller.txt => faraday,ftintc010.txt} (63%) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mediatek,cirq.txt + delete mode 100644 Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/faraday,fttmr010.txt + create mode 100644 Documentation/scheduler/sched-pelt.c + create mode 100644 Documentation/usb/usb3-debug-port.rst + delete mode 100644 arch/x86/include/asm/e820.h + create mode 100644 arch/x86/include/asm/e820/api.h + create mode 100644 arch/x86/include/asm/e820/types.h + create mode 100644 arch/x86/kernel/cpu/mcheck/dev-mcelog.c + create mode 100644 arch/x86/kernel/ftrace_32.S + rename arch/x86/kernel/{mcount_64.S => ftrace_64.S} (98%) + create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_bt.c + delete mode 100644 arch/x86/um/bug.c + create mode 100644 arch/x86/um/syscalls_32.c + create mode 100644 drivers/acpi/arm64/gtdt.c + rename drivers/clocksource/{timer-gemini.c => timer-fttmr010.c} (72%) + rename {arch/x86/platform => drivers/firmware}/efi/efi-bgrt.c (100%) + create mode 100644 drivers/irqchip/irq-ftintc010.c + delete mode 100644 drivers/irqchip/irq-gemini.c + delete mode 100644 drivers/irqchip/irq-moxart.c + create mode 100644 drivers/irqchip/irq-mtk-cirq.c + create mode 100644 drivers/ras/cec.c + create mode 100644 drivers/ras/debugfs.h + create mode 100644 drivers/usb/early/xhci-dbc.c + create mode 100644 drivers/usb/early/xhci-dbc.h + create mode 100644 include/linux/rcu_node_tree.h + create mode 100644 include/linux/rcu_segcblist.h + create mode 100644 include/linux/srcuclassic.h + create mode 100644 include/linux/srcutiny.h + create mode 100644 include/linux/srcutree.h + create mode 100644 include/linux/usb/xhci-dbgp.h + create mode 100644 kernel/rcu/srcutiny.c + create mode 100644 kernel/rcu/srcutree.c + create mode 100644 kernel/sched/sched-pelt.h + create mode 100644 tools/arch/x86/include/asm/cmpxchg.h + create mode 100644 tools/build/feature/test-sched_getcpu.c + create mode 100644 tools/include/linux/bug.h + create mode 100644 tools/include/linux/refcount.h + create mode 100644 tools/include/uapi/linux/fcntl.h + create mode 100644 tools/include/uapi/linux/stat.h + create mode 100644 tools/perf/arch/s390/annotate/instructions.c + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/uncore.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/uncore.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/uncore.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore.json + create mode 100644 tools/perf/tests/expr.c + create mode 100644 tools/perf/trace/beauty/Build + create mode 100644 tools/perf/trace/beauty/beauty.h + create mode 100644 tools/perf/trace/beauty/statx.c + delete mode 100644 tools/perf/util/alias.c + create mode 100644 tools/perf/util/dump-insn.c + create mode 100644 tools/perf/util/dump-insn.h + create mode 100644 tools/perf/util/expr.h + create mode 100644 tools/perf/util/expr.y + create mode 100644 tools/perf/util/namespaces.c + create mode 100644 tools/perf/util/namespaces.h + create mode 100644 tools/perf/util/path.h + create mode 100644 tools/perf/util/print_binary.c + create mode 100644 tools/perf/util/print_binary.h + create mode 100644 tools/perf/util/sane_ctype.h + create mode 100644 tools/perf/util/srcline.h + create mode 100644 tools/perf/util/string2.h +$ git am -3 ../patches/0001-drm-i915-merge-fix-for-mm-Rename-SLAB_DESTROY_BY_RCU.patch +Applying: drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/selftests/mock_gem_device.c +$ git add -A . +$ git commit -v -a --amend +[master cb84c93d527f] Merge remote-tracking branch 'tip/auto-latest' + Date: Wed Apr 26 13:45:01 2017 +1000 +Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (bffc7dece92e EDAC: Rename report status accessors) +$ git merge edac-amd/for-next +Removing drivers/edac/edac_stub.c +Auto-merging drivers/acpi/Kconfig +Auto-merging arch/x86/kernel/nmi.c +Auto-merging arch/powerpc/configs/ppc64_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 3 +- + arch/powerpc/configs/85xx-hw.config | 3 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 - + arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 1 - + arch/powerpc/configs/cell_defconfig | 1 - + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc64e_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 3 +- + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 1 - + arch/x86/kernel/nmi.c | 11 - + drivers/acpi/Kconfig | 3 +- + drivers/acpi/acpi_extlog.c | 8 +- + drivers/edac/Kconfig | 128 +- + drivers/edac/Makefile | 8 +- + drivers/edac/altera_edac.c | 22 +- + drivers/edac/edac_mc.c | 99 +- + drivers/edac/edac_stub.c | 68 - + drivers/edac/pnd2_edac.c | 2 +- + drivers/edac/sb_edac.c | 4 +- + drivers/edac/skx_edac.c | 2 +- + drivers/edac/thunderx_edac.c | 2174 +++++++++++++++++++++++ + include/linux/edac.h | 30 +- + 26 files changed, 2343 insertions(+), 235 deletions(-) + delete mode 100644 drivers/edac/edac_stub.c + create mode 100644 drivers/edac/thunderx_edac.c +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging ftrace/for-next (c486bbae781c Merge branch 'trace/ftrace/core' into trace/ftrace/next) +$ git merge ftrace/for-next +Auto-merging mm/page_alloc.c +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/rcu/tree.c +Auto-merging init/main.c +Auto-merging include/linux/rcupdate.h +Auto-merging arch/x86/kernel/ftrace.c +Auto-merging Documentation/trace/kprobetrace.txt +Merge made by the 'recursive' strategy. + Documentation/trace/kprobetrace.txt | 5 +- + arch/x86/kernel/ftrace.c | 8 +- + include/linux/ftrace.h | 92 +- + include/linux/init.h | 4 +- + include/linux/rcupdate.h | 5 + + include/linux/trace_events.h | 11 +- + include/linux/tracepoint.h | 19 +- + init/main.c | 10 +- + kernel/rcu/tree.c | 62 +- + kernel/trace/Kconfig | 3 +- + kernel/trace/ftrace.c | 996 +++++++++++++-------- + kernel/trace/trace.c | 224 ++++- + kernel/trace/trace.h | 77 +- + kernel/trace/trace_benchmark.c | 14 +- + kernel/trace/trace_events.c | 151 +++- + kernel/trace/trace_functions.c | 227 +++-- + kernel/trace/trace_kprobe.c | 39 +- + kernel/trace/trace_stack.c | 35 +- + mm/page_alloc.c | 1 + + scripts/recordmcount.c | 1 + + scripts/recordmcount.pl | 1 + + tools/testing/selftests/ftrace/ftracetest | 23 +- + .../selftests/ftrace/test.d/00basic/basic2.tc | 1 + + .../selftests/ftrace/test.d/00basic/basic3.tc | 1 + + .../selftests/ftrace/test.d/event/event-enable.tc | 1 + + .../selftests/ftrace/test.d/event/event-pid.tc | 1 + + .../ftrace/test.d/event/subsystem-enable.tc | 1 + + .../ftrace/test.d/ftrace/func_event_triggers.tc | 114 +++ + .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 132 +++ + .../test.d/ftrace/func_traceonoff_triggers.tc | 172 ++++ + tools/testing/selftests/ftrace/test.d/functions | 21 + + .../ftrace/test.d/kprobe/kretprobe_maxactive.tc | 39 + + .../ftrace/test.d/trigger/trigger-eventonoff.tc | 1 + + .../ftrace/test.d/trigger/trigger-filter.tc | 1 + + .../ftrace/test.d/trigger/trigger-hist-mod.tc | 1 + + .../ftrace/test.d/trigger/trigger-hist.tc | 1 + + .../ftrace/test.d/trigger/trigger-multihist.tc | 1 + + 37 files changed, 1850 insertions(+), 646 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_maxactive.tc +Merging rcu/rcu/next (8a6ad489518e rcuperf: Set more user-friendly defaults) +$ git merge rcu/rcu/next +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree.c +Auto-merging include/linux/sched.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 11 ++ + Documentation/core-api/atomic_ops.rst | 5 + + Documentation/memory-barriers.txt | 2 +- + include/linux/sched.h | 3 +- + include/linux/spinlock.h | 20 ++++ + include/linux/srcuclassic.h | 14 +++ + include/linux/srcutiny.h | 20 +++- + include/linux/srcutree.h | 8 ++ + include/trace/events/rcu.h | 1 + + init/Kconfig | 5 +- + kernel/rcu/rcuperf.c | 124 ++++++++++++++++++--- + kernel/rcu/rcutorture.c | 10 +- + kernel/rcu/srcu.c | 7 ++ + kernel/rcu/srcutree.c | 82 +++++++++++--- + kernel/rcu/tree.c | 30 +++-- + kernel/rcu/tree.h | 2 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 14 ++- + kernel/sched/core.c | 1 + + scripts/checkpatch.pl | 17 --- + .../selftests/rcutorture/bin/configcheck.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 2 +- + .../selftests/rcutorture/configs/rcu/CFLIST | 3 + + .../selftests/rcutorture/configs/rcu/SRCU-C | 11 ++ + .../selftests/rcutorture/configs/rcu/SRCU-C.boot | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-N | 2 +- + .../selftests/rcutorture/configs/rcu/SRCU-P | 6 +- + .../selftests/rcutorture/configs/rcu/SRCU-t | 10 ++ + .../selftests/rcutorture/configs/rcu/SRCU-t.boot | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-u | 9 ++ + .../selftests/rcutorture/configs/rcu/SRCU-u.boot | 1 + + .../selftests/rcutorture/configs/rcu/TINY02 | 3 +- + .../selftests/rcutorture/configs/rcu/TREE01 | 1 + + .../selftests/rcutorture/configs/rcu/TREE02 | 2 +- + .../selftests/rcutorture/configs/rcu/TREE04 | 1 - + .../selftests/rcutorture/configs/rcu/TREE06 | 1 + + .../selftests/rcutorture/configs/rcu/TREE07 | 2 - + .../rcutorture/configs/rcuperf/SRCUCLASSIC | 16 +++ + .../selftests/rcutorture/configs/rcuperf/TINY | 16 +++ + .../selftests/rcutorture/configs/rcuperf/TREE | 1 - + .../selftests/rcutorture/configs/rcuperf/TREE54 | 1 - + 41 files changed, 374 insertions(+), 96 deletions(-) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-t + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-t.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-u + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-u.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/SRCUCLASSIC + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/TINY +Merging kvm/linux-next (bd17117bb2af Merge tag 'kvm-s390-next-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge kvm/linux-next +Auto-merging include/linux/kvm_host.h +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Removing arch/x86/kvm/iommu.c +Removing arch/x86/kvm/assigned-dev.h +Removing arch/x86/kvm/assigned-dev.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kvm/gaccess.c +Auto-merging arch/powerpc/platforms/powernv/pci.c +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Auto-merging arch/powerpc/mm/mmu_context_iommu.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c +Auto-merging arch/powerpc/kvm/book3s.c +Auto-merging arch/powerpc/include/asm/ppc-opcode.h +Auto-merging arch/powerpc/include/asm/mmu_context.h +Auto-merging arch/powerpc/include/asm/kvm_ppc.h +Auto-merging arch/mips/mm/init.c +Auto-merging arch/mips/kernel/cpu-probe.c +Auto-merging arch/mips/include/asm/cpu-info.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm/kvm/arm.c +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 311 +-- + Documentation/virtual/kvm/devices/s390_flic.txt | 41 +- + Documentation/virtual/kvm/devices/vfio.txt | 18 +- + Documentation/virtual/kvm/hypercalls.txt | 5 + + arch/arm/include/asm/kvm_host.h | 1 - + arch/arm/include/uapi/asm/kvm.h | 2 + + arch/arm/kvm/arm.c | 3 - + arch/arm64/include/asm/kvm_host.h | 1 - + arch/arm64/include/uapi/asm/kvm.h | 2 + + arch/mips/Kconfig | 1 + + arch/mips/include/asm/cpu-features.h | 10 + + arch/mips/include/asm/cpu-info.h | 2 + + arch/mips/include/asm/cpu.h | 1 + + arch/mips/include/asm/kvm_host.h | 468 +++- + arch/mips/include/asm/maar.h | 10 +- + arch/mips/include/asm/mipsregs.h | 62 +- + arch/mips/include/asm/tlb.h | 6 +- + arch/mips/include/uapi/asm/inst.h | 2 +- + arch/mips/include/uapi/asm/kvm.h | 22 +- + arch/mips/kernel/cpu-probe.c | 13 +- + arch/mips/kernel/time.c | 1 + + arch/mips/kvm/Kconfig | 27 +- + arch/mips/kvm/Makefile | 9 +- + arch/mips/kvm/emulate.c | 500 ++-- + arch/mips/kvm/entry.c | 132 +- + arch/mips/kvm/hypcall.c | 53 + + arch/mips/kvm/interrupt.h | 5 + + arch/mips/kvm/mips.c | 123 +- + arch/mips/kvm/mmu.c | 20 + + arch/mips/kvm/tlb.c | 441 ++++ + arch/mips/kvm/trace.h | 74 +- + arch/mips/kvm/trap_emul.c | 73 +- + arch/mips/kvm/vz.c | 3223 +++++++++++++++++++++++ + arch/mips/mm/cache.c | 1 + + arch/mips/mm/init.c | 2 +- + arch/powerpc/include/asm/disassemble.h | 5 + + arch/powerpc/include/asm/iommu.h | 32 +- + arch/powerpc/include/asm/kvm_host.h | 35 +- + arch/powerpc/include/asm/kvm_ppc.h | 22 +- + arch/powerpc/include/asm/mmu_context.h | 4 + + arch/powerpc/include/asm/ppc-opcode.h | 58 + + arch/powerpc/include/uapi/asm/kvm.h | 3 + + arch/powerpc/kernel/iommu.c | 91 +- + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/kvm/book3s.c | 18 + + arch/powerpc/kvm/book3s_64_mmu.c | 1 + + arch/powerpc/kvm/book3s_64_mmu_host.c | 7 +- + arch/powerpc/kvm/book3s_64_vio.c | 315 ++- + arch/powerpc/kvm/book3s_64_vio_hv.c | 303 ++- + arch/powerpc/kvm/book3s_emulate.c | 34 +- + arch/powerpc/kvm/book3s_hv.c | 8 +- + arch/powerpc/kvm/book3s_pr.c | 12 +- + arch/powerpc/kvm/booke.c | 5 + + arch/powerpc/kvm/e500_mmu_host.c | 5 +- + arch/powerpc/kvm/emulate.c | 8 + + arch/powerpc/kvm/emulate_loadstore.c | 472 +++- + arch/powerpc/kvm/powerpc.c | 325 ++- + arch/powerpc/mm/mmu_context_iommu.c | 39 + + arch/powerpc/platforms/powernv/pci-ioda.c | 46 +- + arch/powerpc/platforms/powernv/pci.c | 1 + + arch/powerpc/platforms/pseries/iommu.c | 3 +- + arch/powerpc/platforms/pseries/vio.c | 2 +- + arch/s390/include/asm/kvm_host.h | 42 +- + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/uapi/asm/kvm.h | 26 +- + arch/s390/kvm/gaccess.c | 6 +- + arch/s390/kvm/intercept.c | 27 +- + arch/s390/kvm/interrupt.c | 133 +- + arch/s390/kvm/kvm-s390.c | 135 +- + arch/s390/kvm/kvm-s390.h | 4 +- + arch/s390/kvm/priv.c | 50 +- + arch/s390/kvm/sthyi.c | 3 + + arch/s390/kvm/trace-s390.h | 52 + + arch/s390/kvm/vsie.c | 78 +- + arch/x86/include/asm/kvm_host.h | 8 +- + arch/x86/include/asm/vmx.h | 4 + + arch/x86/include/uapi/asm/kvm.h | 3 + + arch/x86/include/uapi/asm/vmx.h | 25 +- + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kvm/Kconfig | 12 - + arch/x86/kvm/Makefile | 2 - + arch/x86/kvm/assigned-dev.c | 1058 -------- + arch/x86/kvm/assigned-dev.h | 32 - + arch/x86/kvm/i8259.c | 72 +- + arch/x86/kvm/ioapic.c | 28 +- + arch/x86/kvm/ioapic.h | 16 +- + arch/x86/kvm/iommu.c | 356 --- + arch/x86/kvm/irq.c | 2 +- + arch/x86/kvm/irq.h | 32 +- + arch/x86/kvm/irq_comm.c | 45 +- + arch/x86/kvm/mmu.c | 4 +- + arch/x86/kvm/mmu.h | 3 +- + arch/x86/kvm/paging_tmpl.h | 54 +- + arch/x86/kvm/svm.c | 7 + + arch/x86/kvm/vmx.c | 260 +- + arch/x86/kvm/x86.c | 140 +- + drivers/s390/char/sclp_early.c | 4 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 2 +- + include/linux/kvm_host.h | 22 +- + include/uapi/linux/kvm.h | 16 + + tools/kvm/kvm_stat/kvm_stat | 381 ++- + tools/kvm/kvm_stat/kvm_stat.txt | 26 + + virt/kvm/eventfd.c | 4 +- + virt/kvm/irqchip.c | 11 +- + virt/kvm/kvm_main.c | 32 +- + virt/kvm/vfio.c | 105 + + 106 files changed, 8028 insertions(+), 2819 deletions(-) + create mode 100644 arch/mips/kvm/hypcall.c + create mode 100644 arch/mips/kvm/vz.c + delete mode 100644 arch/x86/kvm/assigned-dev.c + delete mode 100644 arch/x86/kvm/assigned-dev.h + delete mode 100644 arch/x86/kvm/iommu.c +Merging kvm-arm/next (1edb632133ef ARM: KVM: Fix idmap stub entry when running Thumb-2 code) +$ git merge kvm-arm/next +Resolved 'Documentation/virtual/kvm/api.txt' using previous resolution. +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Resolved 'virt/kvm/arm/vgic/vgic-v2.c' using previous resolution. +Resolved 'virt/kvm/arm/vgic/vgic.h' using previous resolution. +Auto-merging virt/kvm/arm/vgic/vgic.h +CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic.h +Auto-merging virt/kvm/arm/vgic/vgic.c +Auto-merging virt/kvm/arm/vgic/vgic-v2.c +CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic-v2.c +Auto-merging virt/kvm/arm/vgic/vgic-init.c +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging include/kvm/arm_vgic.h +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/include/uapi/asm/kvm.h +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm/mm/mmu.c +Auto-merging arch/arm/kvm/mmu.c +Auto-merging arch/arm/kvm/arm.c +Auto-merging arch/arm/include/uapi/asm/kvm.h +Auto-merging arch/arm/include/asm/kvm_host.h +Auto-merging Documentation/virtual/kvm/api.txt +CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f6b8ea908a6d] Merge remote-tracking branch 'kvm-arm/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 41 +++ + Documentation/virtual/kvm/arm/hyp-abi.txt | 53 ++++ + arch/arm/boot/compressed/head.S | 12 +- + arch/arm/include/asm/kvm_asm.h | 7 +- + arch/arm/include/asm/kvm_host.h | 6 - + arch/arm/include/asm/kvm_mmu.h | 1 - + arch/arm/include/asm/proc-fns.h | 4 +- + arch/arm/include/asm/virt.h | 14 +- + arch/arm/include/uapi/asm/kvm.h | 2 + + arch/arm/kernel/hyp-stub.S | 43 ++- + arch/arm/kernel/reboot.c | 7 +- + arch/arm/kvm/arm.c | 66 ++-- + arch/arm/kvm/coproc.c | 24 +- + arch/arm/kvm/coproc.h | 18 -- + arch/arm/kvm/handle_exit.c | 8 + + arch/arm/kvm/hyp/hyp-entry.S | 28 +- + arch/arm/kvm/init.S | 51 ++- + arch/arm/kvm/interrupts.S | 4 - + arch/arm/kvm/mmu.c | 36 +-- + arch/arm/kvm/psci.c | 8 +- + arch/arm/mm/mmu.c | 5 + + arch/arm/mm/proc-v7.S | 15 +- + arch/arm64/include/asm/kvm_asm.h | 5 +- + arch/arm64/include/asm/kvm_host.h | 7 - + arch/arm64/include/asm/kvm_mmu.h | 1 - + arch/arm64/include/asm/virt.h | 31 +- + arch/arm64/include/uapi/asm/kvm.h | 2 + + arch/arm64/kernel/hyp-stub.S | 38 +-- + arch/arm64/kvm/hyp-init.S | 46 ++- + arch/arm64/kvm/hyp.S | 5 +- + arch/arm64/kvm/hyp/hyp-entry.S | 43 ++- + arch/arm64/kvm/sys_regs.c | 496 +++++++++++------------------- + arch/arm64/kvm/sys_regs.h | 23 +- + arch/arm64/kvm/sys_regs_generic_v8.c | 4 +- + include/kvm/arm_arch_timer.h | 2 + + include/kvm/arm_pmu.h | 7 + + include/kvm/arm_vgic.h | 9 +- + include/uapi/linux/kvm.h | 8 + + virt/kvm/arm/arch_timer.c | 124 ++++++-- + virt/kvm/arm/hyp/vgic-v2-sr.c | 78 +---- + virt/kvm/arm/hyp/vgic-v3-sr.c | 87 ++---- + virt/kvm/arm/pmu.c | 39 ++- + virt/kvm/arm/vgic/vgic-init.c | 108 ++++--- + virt/kvm/arm/vgic/vgic-v2.c | 90 +++--- + virt/kvm/arm/vgic/vgic-v3.c | 87 +++--- + virt/kvm/arm/vgic/vgic.c | 60 +++- + virt/kvm/arm/vgic/vgic.h | 7 +- + 47 files changed, 1001 insertions(+), 859 deletions(-) + create mode 100644 Documentation/virtual/kvm/arm/hyp-abi.txt +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (feafd13c96d6 KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (730cd632c4e4 KVM: s390: Support keyless subset guest mode) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (7ecff7dc7ec5 xen/pvh: Do not fill kernel's e820 map in init_pvh_bootparams()) +$ git merge xen-tip/linux-next +Resolved 'arch/x86/xen/enlighten.c' using previous resolution. +Resolved 'arch/x86/xen/mmu.c' using previous resolution. +Auto-merging arch/x86/xen/mmu.c +CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c +Auto-merging arch/x86/xen/enlighten.c +CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c +Auto-merging arch/x86/include/asm/xen/page.h +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging arch/arm/mm/dma-mapping.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 777e374d1f4c] Merge remote-tracking branch 'xen-tip/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/device.h | 3 + + arch/arm/include/asm/dma-mapping.h | 12 +- + arch/arm/mm/dma-mapping.c | 7 + + arch/arm64/include/asm/device.h | 3 + + arch/arm64/include/asm/dma-mapping.h | 13 +- + arch/arm64/mm/dma-mapping.c | 7 + + arch/x86/include/asm/hypervisor.h | 8 +- + arch/x86/include/asm/xen/page.h | 25 + + arch/x86/kernel/cpu/common.c | 1 - + arch/x86/kernel/cpu/hypervisor.c | 15 +- + arch/x86/kernel/cpu/vmware.c | 39 +- + arch/x86/kernel/process_64.c | 2 +- + arch/x86/xen/Kconfig | 33 +- + arch/x86/xen/Makefile | 16 +- + arch/x86/xen/enlighten.c | 1923 +---------------------- + arch/x86/xen/enlighten_hvm.c | 213 +++ + arch/x86/xen/enlighten_pv.c | 1513 ++++++++++++++++++ + arch/x86/xen/enlighten_pvh.c | 105 ++ + arch/x86/xen/mmu.c | 2858 +--------------------------------- + arch/x86/xen/mmu_hvm.c | 79 + + arch/x86/xen/mmu_pv.c | 2730 ++++++++++++++++++++++++++++++++ + arch/x86/xen/pmu.h | 5 + + arch/x86/xen/smp.c | 517 +----- + arch/x86/xen/smp.h | 16 + + arch/x86/xen/smp_hvm.c | 58 + + arch/x86/xen/smp_pv.c | 490 ++++++ + arch/x86/xen/suspend.c | 54 - + arch/x86/xen/suspend_hvm.c | 22 + + arch/x86/xen/suspend_pv.c | 46 + + arch/x86/xen/xen-head.S | 4 + + arch/x86/xen/xen-ops.h | 23 + + drivers/scsi/xen-scsifront.c | 2 +- + drivers/xen/balloon.c | 30 +- + drivers/xen/swiotlb-xen.c | 8 +- + include/xen/arm/page-coherent.h | 26 +- + include/xen/interface/io/9pfs.h | 36 + + include/xen/interface/io/displif.h | 854 ++++++++++ + include/xen/interface/io/kbdif.h | 458 +++++- + include/xen/interface/io/ring.h | 143 ++ + include/xen/interface/io/sndif.h | 793 ++++++++++ + include/xen/xen-ops.h | 14 + + net/9p/Kconfig | 9 + + net/9p/Makefile | 4 + + net/9p/trans_xen.c | 545 +++++++ + 44 files changed, 8406 insertions(+), 5356 deletions(-) + create mode 100644 arch/x86/xen/enlighten_hvm.c + create mode 100644 arch/x86/xen/enlighten_pv.c + create mode 100644 arch/x86/xen/enlighten_pvh.c + create mode 100644 arch/x86/xen/mmu_hvm.c + create mode 100644 arch/x86/xen/mmu_pv.c + create mode 100644 arch/x86/xen/smp_hvm.c + create mode 100644 arch/x86/xen/smp_pv.c + create mode 100644 arch/x86/xen/suspend_hvm.c + create mode 100644 arch/x86/xen/suspend_pv.c + create mode 100644 include/xen/interface/io/9pfs.h + create mode 100644 include/xen/interface/io/displif.h + create mode 100644 include/xen/interface/io/sndif.h + create mode 100644 net/9p/trans_xen.c +$ git am -3 ../patches/0001-x86-xen-merge-fix-up-for-arch-x86-xen-mmu.c-code-mov.patch +Applying: x86/xen: merge fix up for arch/x86/xen/mmu.c code movement +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/xen/mmu_pv.c +$ git add -A . +$ git commit -v -a --amend +[master c2cc4f4b8a48] Merge remote-tracking branch 'xen-tip/linux-next' + Date: Wed Apr 26 14:21:18 2017 +1000 +$ git am -3 ../patches/0001-x86-xen-merge-fix-for-arch-x86-xen-enlighten.c-code-.patch +Applying: x86/xen: merge fix for arch/x86/xen/enlighten.c code movement +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/xen/enlighten_pvh.c +$ git add -A . +$ git commit -v -a --amend +[master 5f8ed6315e0b] Merge remote-tracking branch 'xen-tip/linux-next' + Date: Wed Apr 26 14:21:18 2017 +1000 +Merging percpu/for-next (8a1df543de8a percpu: remove unused chunk_alloc parameter from pcpu_get_pages()) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging drivers-x86/for-next (58688a7525b6 platform/x86: INT33FE: add i2c dependency) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/dell-wmi-led.c +Auto-merging drivers/platform/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/include/asm/intel_scu_ipc.h | 8 +- + drivers/leds/Kconfig | 9 - + drivers/leds/Makefile | 1 - + drivers/leds/trigger/ledtrig-cpu.c | 33 +- + drivers/platform/x86/Kconfig | 24 +- + drivers/platform/x86/Makefile | 2 + + drivers/platform/x86/acer-wmi.c | 5 +- + drivers/platform/x86/asus-laptop.c | 8 +- + drivers/platform/x86/asus-nb-wmi.c | 9 + + drivers/platform/x86/asus-wmi.c | 8 +- + drivers/platform/x86/dell-laptop.c | 217 +++- + drivers/platform/x86/dell-smbios.c | 20 + + drivers/platform/x86/dell-smbios.h | 11 + + drivers/platform/x86/dell-wmi-aio.c | 6 +- + .../dell-led.c => platform/x86/dell-wmi-led.c} | 141 +-- + drivers/platform/x86/dell-wmi.c | 20 +- + drivers/platform/x86/eeepc-laptop.c | 10 +- + drivers/platform/x86/fujitsu-laptop.c | 1220 ++++++++------------ + drivers/platform/x86/hp-wireless.c | 8 +- + drivers/platform/x86/hp-wmi.c | 414 ++++--- + drivers/platform/x86/ideapad-laptop.c | 12 +- + drivers/platform/x86/intel-hid.c | 51 +- + drivers/platform/x86/intel_cht_int33fe.c | 143 +++ + drivers/platform/x86/intel_scu_ipc.c | 106 +- + drivers/platform/x86/msi-laptop.c | 14 +- + drivers/platform/x86/msi-wmi.c | 9 +- + drivers/platform/x86/panasonic-laptop.c | 18 +- + drivers/platform/x86/silead_dmi.c | 80 +- + drivers/platform/x86/thinkpad_acpi.c | 99 +- + drivers/platform/x86/topstar-laptop.c | 5 +- + drivers/platform/x86/toshiba-wmi.c | 5 +- + drivers/platform/x86/toshiba_acpi.c | 8 +- + include/linux/dell-led.h | 6 +- + sound/pci/hda/dell_wmi_helper.c | 30 +- + 34 files changed, 1409 insertions(+), 1351 deletions(-) + rename drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} (56%) + create mode 100644 drivers/platform/x86/intel_cht_int33fe.c +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (9b9aab2257ad MAINTAINERS: update file entry for HSI subsystem) +$ git merge hsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/hsi/clients/ssi_protocol.c | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging leds/for-next (28c5fe99016d leds: pca9532: Extend pca9532 device tree support) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-cpcap.txt | 29 ++ + .../devicetree/bindings/leds/leds-mt6323.txt | 60 +++ + .../devicetree/bindings/leds/leds-pca9532.txt | 10 + + drivers/leds/Kconfig | 18 +- + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 26 +- + drivers/leds/leds-cpcap.c | 239 ++++++++++ + drivers/leds/leds-gpio.c | 12 +- + drivers/leds/leds-lp3952.c | 18 +- + drivers/leds/leds-mt6323.c | 502 +++++++++++++++++++++ + drivers/leds/leds-pca9532.c | 27 +- + include/linux/leds-pca9532.h | 4 +- + include/linux/leds.h | 14 +- + 13 files changed, 923 insertions(+), 38 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-cpcap.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-mt6323.txt + create mode 100644 drivers/leds/leds-cpcap.c + create mode 100644 drivers/leds/leds-mt6323.c +Merging ipmi/for-next (3f724c408a7b ipmi_si: use smi_num for init_name) +$ git merge ipmi/for-next +Auto-merging drivers/acpi/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 4 +++- + drivers/acpi/Kconfig | 2 +- + drivers/acpi/acpi_ipmi.c | 3 +-- + drivers/char/ipmi/bt-bmc.c | 1 + + drivers/char/ipmi/ipmi_si_intf.c | 19 ++++++++++++++++--- + drivers/char/ipmi/ipmi_ssif.c | 9 +++++---- + 6 files changed, 27 insertions(+), 11 deletions(-) +Merging driver-core/driver-core-next (523aa3586ffb Merge 4.11-rc6 into driver-core-next) +$ git merge driver-core/driver-core-next +Auto-merging drivers/base/dma-mapping.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 7 +++++++ + Documentation/kref.txt | 1 + + drivers/base/core.c | 2 +- + drivers/base/dma-mapping.c | 5 ++--- + include/linux/debugfs.h | 2 +- + include/uapi/linux/eventpoll.h | 21 +++++++++++++++++---- + 6 files changed, 29 insertions(+), 9 deletions(-) +Merging usb/usb-next (19445816996d USB: Revert "cdc-wdm: fix "out-of-sync" due to missing notifications") +$ git merge usb/usb-next +Resolved 'Documentation/media/v4l-drivers/philips.rst' using previous resolution. +Auto-merging lib/string.c +Auto-merging include/linux/mfd/syscon/exynos5-pmu.h +Auto-merging drivers/usb/serial/usb_debug.c +Auto-merging drivers/usb/Makefile +Auto-merging drivers/Makefile +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Auto-merging arch/arm64/boot/dts/marvell/armada-3720-db.dts +Auto-merging MAINTAINERS +Auto-merging Documentation/media/v4l-drivers/philips.rst +CONFLICT (content): Merge conflict in Documentation/media/v4l-drivers/philips.rst +Auto-merging Documentation/devicetree/bindings/soc/rockchip/grf.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dfc194a47644] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-typec | 276 +++++ + .../ABI/testing/sysfs-platform-chipidea-usb2 | 9 + + .../ABI/testing/sysfs-platform-renesas_usb3 | 15 + + .../devicetree/bindings/phy/phy-mt65xx-usb.txt | 93 +- + .../bindings/phy/phy-rockchip-inno-usb2.txt | 6 + + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 106 ++ + .../devicetree/bindings/phy/qcom-qusb2-phy.txt | 43 + + .../devicetree/bindings/phy/rockchip-usb-phy.txt | 1 + + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 + + .../devicetree/bindings/soc/rockchip/grf.txt | 4 + + .../devicetree/bindings/usb/ehci-orion.txt | 4 +- + Documentation/devicetree/bindings/usb/generic.txt | 1 + + Documentation/media/v4l-drivers/philips.rst | 2 +- + Documentation/usb/typec.rst | 184 +++ + MAINTAINERS | 9 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 6 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 7 + + drivers/Makefile | 1 + + drivers/phy/Kconfig | 19 + + drivers/phy/Makefile | 2 + + drivers/phy/phy-bcm-ns-usb3.c | 69 +- + drivers/phy/phy-exynos-dp-video.c | 6 +- + drivers/phy/phy-exynos-mipi-video.c | 71 +- + drivers/phy/phy-exynos-pcie.c | 8 +- + drivers/phy/phy-exynos5-usbdrd.c | 6 +- + drivers/phy/phy-meson8b-usb2.c | 6 +- + drivers/phy/phy-mt65xx-usb3.c | 477 +++++--- + drivers/phy/phy-qcom-qmp.c | 1153 ++++++++++++++++++ + drivers/phy/phy-qcom-qusb2.c | 493 ++++++++ + drivers/phy/phy-rcar-gen3-usb2.c | 31 +- + drivers/phy/phy-rockchip-inno-usb2.c | 53 +- + drivers/phy/phy-rockchip-usb.c | 19 + + drivers/phy/phy-sun4i-usb.c | 58 +- + drivers/usb/Kconfig | 14 +- + drivers/usb/Makefile | 4 +- + drivers/usb/atm/cxacru.c | 2 +- + drivers/usb/chipidea/Kconfig | 2 +- + drivers/usb/chipidea/ci.h | 2 + + drivers/usb/chipidea/core.c | 67 +- + drivers/usb/chipidea/host.c | 3 +- + drivers/usb/chipidea/udc.c | 33 +- + drivers/usb/class/Kconfig | 2 +- + drivers/usb/class/cdc-acm.c | 151 ++- + drivers/usb/class/cdc-acm.h | 4 +- + drivers/usb/class/cdc-wdm.c | 103 +- + drivers/usb/class/usblp.c | 37 +- + drivers/usb/class/usbtmc.c | 56 +- + drivers/usb/common/usb-otg-fsm.c | 7 + + drivers/usb/core/Makefile | 2 +- + drivers/usb/core/buffer.c | 12 +- + drivers/usb/core/devices.c | 4 +- + drivers/usb/core/driver.c | 21 + + drivers/usb/core/file.c | 9 +- + drivers/usb/core/hcd.c | 82 +- + drivers/usb/core/hub.c | 11 +- + drivers/usb/core/of.c | 23 + + drivers/usb/core/usb.c | 152 ++- + drivers/usb/dwc2/Kconfig | 2 +- + drivers/usb/dwc2/core.h | 5 + + drivers/usb/dwc2/hcd.c | 16 +- + drivers/usb/dwc2/hw.h | 2 + + drivers/usb/dwc2/params.c | 19 + + drivers/usb/dwc2/platform.c | 18 +- + drivers/usb/dwc3/Kconfig | 3 +- + drivers/usb/dwc3/Makefile | 4 + + drivers/usb/dwc3/core.c | 109 +- + drivers/usb/dwc3/core.h | 261 ++-- + drivers/usb/dwc3/debug.h | 28 + + drivers/usb/dwc3/debugfs.c | 105 +- + drivers/usb/dwc3/drd.c | 85 ++ + drivers/usb/dwc3/dwc3-exynos.c | 22 +- + drivers/usb/dwc3/dwc3-omap.c | 48 +- + drivers/usb/dwc3/ep0.c | 151 +-- + drivers/usb/dwc3/gadget.c | 197 +-- + drivers/usb/dwc3/gadget.h | 20 +- + drivers/usb/dwc3/trace.h | 58 +- + drivers/usb/gadget/Kconfig | 11 +- + drivers/usb/gadget/function/f_fs.c | 80 +- + drivers/usb/gadget/function/u_ether.c | 24 +- + drivers/usb/gadget/function/u_fs.h | 14 +- + drivers/usb/gadget/function/uvc_configfs.c | 16 +- + drivers/usb/gadget/legacy/inode.c | 17 +- + drivers/usb/gadget/udc/Kconfig | 32 +- + drivers/usb/gadget/udc/Makefile | 3 +- + drivers/usb/gadget/udc/amd5536udc.c | 266 +---- + drivers/usb/gadget/udc/amd5536udc.h | 40 +- + drivers/usb/gadget/udc/amd5536udc_pci.c | 217 ++++ + drivers/usb/gadget/udc/atmel_usba_udc.c | 49 +- + drivers/usb/gadget/udc/bdc/Kconfig | 2 +- + drivers/usb/gadget/udc/core.c | 1 + + drivers/usb/gadget/udc/dummy_hcd.c | 20 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 2 + + drivers/usb/gadget/udc/mv_u3d_core.c | 15 +- + drivers/usb/gadget/udc/mv_udc_core.c | 13 +- + drivers/usb/gadget/udc/net2272.c | 8 +- + drivers/usb/gadget/udc/net2272.h | 2 +- + drivers/usb/gadget/udc/net2280.c | 12 +- + drivers/usb/gadget/udc/net2280.h | 2 +- + drivers/usb/gadget/udc/pch_udc.c | 32 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 3 - + drivers/usb/gadget/udc/renesas_usb3.c | 164 ++- + drivers/usb/host/Kconfig | 12 +- + drivers/usb/host/Makefile | 4 +- + drivers/usb/host/ehci-dbg.c | 2 +- + drivers/usb/host/ehci-fsl.c | 4 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-mem.c | 12 +- + drivers/usb/host/ehci-orion.c | 36 + + drivers/usb/host/ehci-platform.c | 10 + + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 5 +- + drivers/usb/host/ohci-pci.c | 16 + + drivers/usb/host/ohci-platform.c | 3 + + drivers/usb/host/ohci.h | 3 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/host/pci-quirks.h | 4 +- + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/usb/host/uhci-hcd.h | 2 +- + drivers/usb/host/xhci-dbg.c | 308 +---- + drivers/usb/host/xhci-hub.c | 167 ++- + drivers/usb/host/xhci-mem.c | 53 +- + drivers/usb/host/xhci-pci.c | 3 + + drivers/usb/host/xhci-plat.c | 119 +- + drivers/usb/host/xhci-plat.h | 1 + + drivers/usb/host/xhci-rcar.c | 11 + + drivers/usb/host/xhci-rcar.h | 6 + + drivers/usb/host/xhci-ring.c | 266 +++-- + drivers/usb/host/xhci-trace.h | 174 ++- + drivers/usb/host/xhci.c | 334 +++--- + drivers/usb/host/xhci.h | 328 +++-- + drivers/usb/isp1760/isp1760-if.c | 8 +- + drivers/usb/misc/adutux.c | 55 +- + drivers/usb/misc/appledisplay.c | 19 +- + drivers/usb/misc/chaoskey.c | 22 +- + drivers/usb/misc/ftdi-elan.c | 42 +- + drivers/usb/misc/idmouse.c | 28 +- + drivers/usb/misc/iowarrior.c | 25 +- + drivers/usb/misc/ldusb.c | 53 +- + drivers/usb/misc/legousbtower.c | 29 +- + drivers/usb/misc/lvstest.c | 12 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 2 +- + drivers/usb/misc/usblcd.c | 47 +- + drivers/usb/misc/usbtest.c | 50 +- + drivers/usb/misc/uss720.c | 10 +- + drivers/usb/misc/yurex.c | 16 +- + drivers/usb/mtu3/mtu3_dr.c | 19 +- + drivers/usb/musb/Kconfig | 4 +- + drivers/usb/musb/cppi_dma.c | 11 +- + drivers/usb/musb/da8xx.c | 43 +- + drivers/usb/musb/musb_core.c | 2 +- + drivers/usb/musb/musb_core.h | 1 + + drivers/usb/musb/musb_cppi41.c | 4 + + drivers/usb/phy/Kconfig | 7 - + drivers/usb/phy/Makefile | 1 - + drivers/usb/phy/phy-fsl-usb.c | 7 + + drivers/usb/serial/aircable.c | 36 +- + drivers/usb/serial/ark3116.c | 17 +- + drivers/usb/serial/cyberjack.c | 11 +- + drivers/usb/serial/digi_acceleport.c | 23 +- + drivers/usb/serial/f81534.c | 137 +-- + drivers/usb/serial/ftdi_sio.c | 54 +- + drivers/usb/serial/ftdi_sio_ids.h | 6 + + drivers/usb/serial/generic.c | 32 +- + drivers/usb/serial/io_edgeport.c | 28 +- + drivers/usb/serial/io_ti.c | 49 +- + drivers/usb/serial/ipaq.c | 51 +- + drivers/usb/serial/iuu_phoenix.c | 22 +- + drivers/usb/serial/keyspan_pda.c | 16 +- + drivers/usb/serial/kobil_sct.c | 13 +- + drivers/usb/serial/mos7720.c | 75 +- + drivers/usb/serial/mos7840.c | 36 +- + drivers/usb/serial/mxuport.c | 133 +-- + drivers/usb/serial/omninet.c | 130 +- + drivers/usb/serial/opticon.c | 12 +- + drivers/usb/serial/oti6858.c | 19 +- + drivers/usb/serial/pl2303.c | 82 +- + drivers/usb/serial/quatech2.c | 7 +- + drivers/usb/serial/sierra.c | 3 +- + drivers/usb/serial/spcp8x5.c | 16 +- + drivers/usb/serial/symbolserial.c | 12 +- + drivers/usb/serial/ti_usb_3410_5052.c | 10 +- + drivers/usb/serial/usb-serial.c | 230 ++-- + drivers/usb/serial/usb_debug.c | 2 +- + drivers/usb/serial/visor.c | 146 +-- + drivers/usb/serial/whiteheat.c | 32 +- + drivers/usb/storage/karma.c | 6 +- + drivers/usb/storage/unusual_devs.h | 4 +- + drivers/usb/storage/usb.c | 40 +- + drivers/usb/typec/Kconfig | 22 + + drivers/usb/typec/Makefile | 2 + + drivers/usb/typec/typec.c | 1262 ++++++++++++++++++++ + drivers/usb/typec/typec_wcove.c | 377 ++++++ + drivers/usb/usb-skeleton.c | 59 +- + drivers/usb/usbip/vhci_hcd.c | 32 +- + include/linux/mfd/syscon/exynos5-pmu.h | 30 - + include/linux/soc/samsung/exynos-regs-pmu.h | 16 +- + include/linux/string.h | 10 + + include/linux/usb.h | 73 +- + include/linux/usb/hcd.h | 7 +- + include/linux/usb/of.h | 5 + + include/linux/usb/otg-fsm.h | 15 - + include/linux/usb/serial.h | 42 +- + include/linux/usb/typec.h | 243 ++++ + include/uapi/linux/capability.h | 2 +- + include/uapi/linux/usb/ch9.h | 3 +- + include/uapi/linux/usb/functionfs.h | 2 +- + lib/string.c | 26 + + tools/usb/.gitignore | 2 + + tools/usb/usbip/README | 2 +- + tools/usb/usbip/libsrc/usbip_common.c | 9 +- + tools/usb/usbip/libsrc/usbip_host_common.c | 28 +- + tools/usb/usbip/libsrc/vhci_driver.c | 28 +- + tools/usb/usbip/src/usbip.c | 2 + + 213 files changed, 8648 insertions(+), 3789 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-typec + create mode 100644 Documentation/ABI/testing/sysfs-platform-chipidea-usb2 + create mode 100644 Documentation/ABI/testing/sysfs-platform-renesas_usb3 + create mode 100644 Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt + create mode 100644 Documentation/usb/typec.rst + create mode 100644 drivers/phy/phy-qcom-qmp.c + create mode 100644 drivers/phy/phy-qcom-qusb2.c + create mode 100644 drivers/usb/dwc3/drd.c + create mode 100644 drivers/usb/gadget/udc/amd5536udc_pci.c + create mode 100644 drivers/usb/typec/Kconfig + create mode 100644 drivers/usb/typec/Makefile + create mode 100644 drivers/usb/typec/typec.c + create mode 100644 drivers/usb/typec/typec_wcove.c + create mode 100644 include/linux/usb/typec.h + create mode 100644 tools/usb/.gitignore +Merging usb-gadget/next (48eab1f28d49 usb: gadget: udc: atmel: Update Kconfig help for fifo_mode = 0) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (31c5d1922b90 USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (a932a8041ff9 usb: chipidea: core: add sysfs group) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging phy-next/next (6239879b415e phy: qcom-qusb2: add NVMEM dependency) +$ git merge phy-next/next +Already up-to-date. +Merging tty/tty-next (15a065485138 Merge 4.11-rc7 into tty-next) +$ git merge tty/tty-next +Resolved 'include/linux/serdev.h' using previous resolution. +Auto-merging include/linux/serdev.h +CONFLICT (content): Merge conflict in include/linux/serdev.h +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/tty/serial/omap-serial.c +Auto-merging drivers/tty/serdev/core.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d9fb08416ca2] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/sprd.txt | 13 +-- + .../devicetree/bindings/serial/sprd-uart.txt | 14 ++- + MAINTAINERS | 2 +- + drivers/tty/hvc/hvc_console.c | 4 +- + drivers/tty/hvc/hvcs.c | 2 +- + drivers/tty/n_gsm.c | 21 ++--- + drivers/tty/pty.c | 7 +- + drivers/tty/serdev/core.c | 36 ++++++-- + drivers/tty/serial/8250/8250_core.c | 2 +- + drivers/tty/serial/8250/8250_dw.c | 13 ++- + drivers/tty/serial/8250/8250_exar.c | 2 +- + drivers/tty/serial/8250/8250_fintek.c | 43 ++++++++-- + drivers/tty/serial/8250/8250_lpss.c | 3 +- + drivers/tty/serial/Kconfig | 11 +++ + drivers/tty/serial/altera_jtaguart.c | 20 +++++ + drivers/tty/serial/altera_uart.c | 32 +++++++ + drivers/tty/serial/amba-pl011.c | 23 +++-- + drivers/tty/serial/atmel_serial.c | 7 +- + .../linux => drivers/tty/serial}/atmel_serial.h | 0 + drivers/tty/serial/fsl_lpuart.c | 20 +++++ + drivers/tty/serial/imx.c | 99 ++++++++++++++++------ + drivers/tty/serial/omap-serial.c | 9 +- + drivers/tty/serial/samsung.c | 44 ++++++---- + drivers/tty/serial/sb1250-duart.c | 18 ++-- + drivers/tty/serial/serial_core.c | 34 ++++---- + drivers/tty/serial/sh-sci.c | 43 +++++++--- + drivers/tty/serial/sprd_serial.c | 2 +- + drivers/tty/serial/st-asc.c | 10 +-- + drivers/tty/serial/uartlite.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 71 +++++++++++----- + drivers/tty/tty_io.c | 62 ++++++++------ + drivers/tty/vt/selection.c | 18 ++-- + drivers/tty/vt/vt.c | 2 +- + include/linux/serdev.h | 21 ++++- + include/linux/serial_core.h | 1 + + kernel/printk/braille.c | 15 ++-- + kernel/printk/braille.h | 13 ++- + 37 files changed, 506 insertions(+), 233 deletions(-) + rename {include/linux => drivers/tty/serial}/atmel_serial.h (100%) +Merging char-misc/char-misc-next (049a59db34eb firmware: Google VPD sysfs driver) +$ git merge char-misc/char-misc-next +Resolved 'drivers/char/tpm/tpm-chip.c' using previous resolution. +Resolved 'drivers/misc/Makefile' using previous resolution. +Auto-merging include/linux/hyperv.h +Removing drivers/w1/w1_log.h +Removing drivers/misc/mei/amthif.c +Auto-merging drivers/misc/Makefile +CONFLICT (content): Merge conflict in drivers/misc/Makefile +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/media/cec/cec-core.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/hv/ring_buffer.c +Auto-merging drivers/dax/dax.c +Auto-merging drivers/char/virtio_console.c +Auto-merging drivers/char/tpm/tpm-chip.c +CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c +Auto-merging drivers/auxdisplay/panel.c +Auto-merging arch/x86/hyperv/hv_init.c +Auto-merging MAINTAINERS +Removing Documentation/extcon/porting-android-switch-class +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 859d9327c58f] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/rapidio.tmpl | 3 - + .../devicetree/bindings/auxdisplay/hit,hd44780.txt | 45 ++ + .../devicetree/bindings/firmware/coreboot.txt | 33 + + .../devicetree/bindings/fpga/altera-pr-ip.txt | 12 + + .../devicetree/bindings/fpga/fpga-region.txt | 1 + + .../bindings/fpga/lattice-ice40-fpga-mgr.txt | 21 + + .../bindings/fpga/xilinx-slave-serial.txt | 44 ++ + .../bindings/nvmem/allwinner,sunxi-sid.txt | 6 +- + .../devicetree/bindings/nvmem/imx-iim.txt | 22 + + .../devicetree/bindings/nvmem/imx-ocotp.txt | 5 + + Documentation/driver-api/vme.rst | 363 +++------ + Documentation/extcon/porting-android-switch-class | 123 --- + Documentation/w1/slaves/00-INDEX | 4 + + Documentation/w1/slaves/w1_ds2413 | 50 ++ + Documentation/w1/slaves/w1_ds2438 | 63 ++ + MAINTAINERS | 8 +- + arch/arm/mach-ep93xx/ts72xx.c | 26 + + arch/x86/hyperv/hv_init.c | 2 +- + arch/x86/include/uapi/asm/hyperv.h | 7 +- + arch/x86/kernel/cpu/mshyperv.c | 3 + + drivers/android/Kconfig | 2 +- + drivers/auxdisplay/Kconfig | 304 ++++++++ + drivers/auxdisplay/Makefile | 4 + + drivers/{misc => auxdisplay}/arm-charlcd.c | 0 + drivers/auxdisplay/charlcd.c | 818 ++++++++++++++++++++ + drivers/auxdisplay/hd44780.c | 326 ++++++++ + drivers/auxdisplay/ht16k33.c | 20 +- + drivers/auxdisplay/img-ascii-lcd.c | 1 + + drivers/{misc => auxdisplay}/panel.c | 827 +++------------------ + drivers/char/hangcheck-timer.c | 2 +- + drivers/char/hpet.c | 2 +- + drivers/char/misc.c | 11 +- + drivers/char/mspec.c | 9 +- + drivers/char/tpm/tpm-chip.c | 41 +- + drivers/char/virtio_console.c | 2 +- + drivers/dax/dax.c | 33 +- + drivers/extcon/Kconfig | 7 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-arizona.c | 46 ++ + drivers/extcon/extcon-intel-cht-wc.c | 395 ++++++++++ + drivers/extcon/extcon-palmas.c | 6 + + drivers/extcon/extcon-usb-gpio.c | 10 +- + drivers/extcon/extcon.c | 22 +- + drivers/firewire/core-topology.c | 2 +- + drivers/firewire/core.h | 8 +- + drivers/firmware/google/Kconfig | 59 +- + drivers/firmware/google/Makefile | 10 +- + drivers/firmware/google/coreboot_table-acpi.c | 88 +++ + drivers/firmware/google/coreboot_table-of.c | 82 ++ + drivers/firmware/google/coreboot_table.c | 94 +++ + drivers/firmware/google/coreboot_table.h | 50 ++ + drivers/firmware/google/memconsole-coreboot.c | 109 +++ + drivers/firmware/google/memconsole-x86-legacy.c | 154 ++++ + drivers/firmware/google/memconsole.c | 155 +--- + drivers/firmware/google/memconsole.h | 43 ++ + drivers/firmware/google/vpd.c | 332 +++++++++ + drivers/firmware/google/vpd_decode.c | 99 +++ + drivers/firmware/google/vpd_decode.h | 58 ++ + drivers/fpga/Kconfig | 42 ++ + drivers/fpga/Makefile | 6 + + drivers/fpga/altera-freeze-bridge.c | 2 +- + drivers/fpga/altera-pr-ip-core-plat.c | 68 ++ + drivers/fpga/altera-pr-ip-core.c | 220 ++++++ + drivers/fpga/fpga-bridge.c | 17 +- + drivers/fpga/fpga-mgr.c | 2 +- + drivers/fpga/fpga-region.c | 11 +- + drivers/fpga/ice40-spi.c | 207 ++++++ + drivers/fpga/ts73xx-fpga.c | 156 ++++ + drivers/fpga/xilinx-pr-decoupler.c | 161 ++++ + drivers/fpga/xilinx-spi.c | 198 +++++ + drivers/fpga/zynq-fpga.c | 28 +- + drivers/gpio/gpiolib.c | 23 +- + drivers/hv/channel.c | 10 +- + drivers/hv/channel_mgmt.c | 48 +- + drivers/hv/connection.c | 65 +- + drivers/hv/hv.c | 5 +- + drivers/hv/hv_balloon.c | 2 - + drivers/hv/hv_fcopy.c | 2 - + drivers/hv/hv_kvp.c | 12 +- + drivers/hv/hv_snapshot.c | 2 - + drivers/hv/hyperv_vmbus.h | 29 +- + drivers/hv/ring_buffer.c | 22 +- + drivers/hv/vmbus_drv.c | 4 +- + drivers/hwtracing/coresight/of_coresight.c | 2 +- + drivers/iio/industrialio-core.c | 15 +- + drivers/infiniband/core/ucm.c | 35 +- + drivers/infiniband/core/user_mad.c | 4 +- + drivers/infiniband/core/uverbs_main.c | 2 +- + drivers/infiniband/hw/hfi1/device.c | 2 +- + drivers/input/evdev.c | 11 +- + drivers/input/joydev.c | 11 +- + drivers/input/mousedev.c | 11 +- + drivers/media/cec/cec-core.c | 16 +- + drivers/media/media-devnode.c | 20 +- + drivers/misc/Kconfig | 293 +------- + drivers/misc/Makefile | 5 +- + drivers/misc/aspeed-lpc-ctrl.c | 266 +++++++ + drivers/misc/ds1682.c | 7 + + drivers/misc/eeprom/idt_89hpesx.c | 57 ++ + drivers/misc/lkdtm.h | 1 + + drivers/misc/lkdtm_bugs.c | 13 +- + drivers/misc/lkdtm_core.c | 1 + + drivers/misc/mei/Makefile | 1 - + drivers/misc/mei/amthif.c | 340 --------- + drivers/misc/mei/bus-fixup.c | 9 +- + drivers/misc/mei/bus.c | 6 - + drivers/misc/mei/client.c | 14 +- + drivers/misc/mei/client.h | 5 - + drivers/misc/mei/hbm.c | 29 +- + drivers/misc/mei/init.c | 14 +- + drivers/misc/mei/interrupt.c | 38 +- + drivers/misc/mei/main.c | 125 ++-- + drivers/misc/mei/mei_dev.h | 51 -- + drivers/misc/mei/pci-me.c | 31 +- + drivers/misc/mei/pci-txe.c | 29 +- + drivers/misc/tsl2550.c | 7 + + drivers/mtd/ubi/build.c | 91 +-- + drivers/mtd/ubi/vmt.c | 49 +- + drivers/nvmem/Kconfig | 11 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 3 +- + drivers/nvmem/imx-iim.c | 173 +++++ + drivers/nvmem/imx-ocotp.c | 254 ++++++- + drivers/nvmem/sunxi_sid.c | 89 ++- + drivers/platform/chrome/cros_ec_dev.c | 31 +- + drivers/pps/pps.c | 123 ++- + drivers/rapidio/devices/rio_mport_cdev.c | 24 +- + drivers/rapidio/rio-sysfs.c | 76 +- + drivers/rapidio/rio.c | 3 - + drivers/rapidio/rio.h | 2 - + drivers/rtc/class.c | 14 +- + drivers/rtc/rtc-core.h | 10 - + drivers/rtc/rtc-dev.c | 17 - + drivers/scsi/osd/osd_uld.c | 56 +- + drivers/uio/uio.c | 2 +- + drivers/uio/uio_mf624.c | 48 +- + drivers/vme/vme.c | 469 +++++++++++- + drivers/w1/masters/matrox_w1.c | 6 - + drivers/w1/slaves/Kconfig | 6 + + drivers/w1/slaves/Makefile | 1 + + drivers/w1/slaves/w1_ds2438.c | 390 ++++++++++ + drivers/w1/slaves/w1_ds2760.h | 10 +- + drivers/w1/w1.c | 1 - + drivers/w1/w1_family.h | 1 + + drivers/w1/w1_int.c | 1 - + drivers/w1/w1_io.c | 1 - + drivers/w1/w1_log.h | 31 - + drivers/w1/w1_netlink.c | 5 +- + drivers/zorro/zorro-driver.c | 15 +- + drivers/zorro/zorro-sysfs.c | 76 +- + drivers/zorro/zorro.c | 3 - + drivers/zorro/zorro.h | 3 +- + fs/char_dev.c | 86 +++ + include/linux/cdev.h | 5 + + include/linux/fpga/altera-pr-ip-core.h | 29 + + include/linux/fpga/fpga-mgr.h | 4 + + include/linux/hyperv.h | 31 +- + include/linux/uio_driver.h | 13 +- + include/linux/vme.h | 12 +- + include/misc/charlcd.h | 42 ++ + include/uapi/linux/aspeed-lpc-ctrl.h | 61 ++ + include/uapi/linux/pps.h | 19 + + scripts/ver_linux | 2 +- + 163 files changed, 7385 insertions(+), 2902 deletions(-) + create mode 100644 Documentation/devicetree/bindings/auxdisplay/hit,hd44780.txt + create mode 100644 Documentation/devicetree/bindings/firmware/coreboot.txt + create mode 100644 Documentation/devicetree/bindings/fpga/altera-pr-ip.txt + create mode 100644 Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt + create mode 100644 Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/imx-iim.txt + delete mode 100644 Documentation/extcon/porting-android-switch-class + create mode 100644 Documentation/w1/slaves/w1_ds2413 + create mode 100644 Documentation/w1/slaves/w1_ds2438 + rename drivers/{misc => auxdisplay}/arm-charlcd.c (100%) + create mode 100644 drivers/auxdisplay/charlcd.c + create mode 100644 drivers/auxdisplay/hd44780.c + rename drivers/{misc => auxdisplay}/panel.c (71%) + create mode 100644 drivers/extcon/extcon-intel-cht-wc.c + create mode 100644 drivers/firmware/google/coreboot_table-acpi.c + create mode 100644 drivers/firmware/google/coreboot_table-of.c + create mode 100644 drivers/firmware/google/coreboot_table.c + create mode 100644 drivers/firmware/google/coreboot_table.h + create mode 100644 drivers/firmware/google/memconsole-coreboot.c + create mode 100644 drivers/firmware/google/memconsole-x86-legacy.c + create mode 100644 drivers/firmware/google/memconsole.h + create mode 100644 drivers/firmware/google/vpd.c + create mode 100644 drivers/firmware/google/vpd_decode.c + create mode 100644 drivers/firmware/google/vpd_decode.h + create mode 100644 drivers/fpga/altera-pr-ip-core-plat.c + create mode 100644 drivers/fpga/altera-pr-ip-core.c + create mode 100644 drivers/fpga/ice40-spi.c + create mode 100644 drivers/fpga/ts73xx-fpga.c + create mode 100644 drivers/fpga/xilinx-pr-decoupler.c + create mode 100644 drivers/fpga/xilinx-spi.c + create mode 100644 drivers/misc/aspeed-lpc-ctrl.c + delete mode 100644 drivers/misc/mei/amthif.c + create mode 100644 drivers/nvmem/imx-iim.c + create mode 100644 drivers/w1/slaves/w1_ds2438.c + delete mode 100644 drivers/w1/w1_log.h + create mode 100644 include/linux/fpga/altera-pr-ip-core.h + create mode 100644 include/misc/charlcd.h + create mode 100644 include/uapi/linux/aspeed-lpc-ctrl.h +$ git am -3 ../patches/0001-firmware-google-memconsole-merge-fix-for-e820.h-move.patch +Applying: firmware: google memconsole: merge fix for e820.h move +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/firmware/google/memconsole-x86-legacy.c +$ git add -A . +$ git commit -v -a --amend +[master c899062594bc] Merge remote-tracking branch 'char-misc/char-misc-next' + Date: Wed Apr 26 15:16:07 2017 +1000 +Merging extcon/extcon-next (70641a0a84e1 extcon: Use BIT() macro for the left-shift operation) +$ git merge extcon/extcon-next +Already up-to-date. +Merging staging/staging-next (f06ee95ce6b0 staging: most: aim-sound style fixess) +$ git merge staging/staging-next +Resolved 'drivers/staging/media/Kconfig' using previous resolution. +Resolved 'drivers/staging/media/Makefile' using previous resolution. +Auto-merging include/linux/sched.h +Auto-merging drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-msg-port.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/controls.c +Auto-merging drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +Auto-merging drivers/staging/vc04_services/bcm2835-camera/TODO +Auto-merging drivers/staging/vc04_services/bcm2835-camera/Kconfig +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c +Auto-merging drivers/staging/most/hdm-usb/hdm_usb.c +CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_sir.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_sir.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_sasem.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_sasem.c left in tree. +Auto-merging drivers/staging/media/Makefile +CONFLICT (content): Merge conflict in drivers/staging/media/Makefile +Auto-merging drivers/staging/media/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig +Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c +Auto-merging drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +Removing drivers/staging/lustre/lustre/include/lustre_eacl.h +Removing drivers/staging/iio/meter/ade7759.h +Removing drivers/staging/iio/meter/ade7754.h +Removing drivers/staging/iio/meter/ade7753.h +Removing drivers/staging/iio/accel/adis16240.h +Auto-merging drivers/staging/iio/accel/adis16240.c +Removing drivers/staging/iio/accel/adis16209.h +Auto-merging drivers/staging/iio/accel/adis16209.c +Removing drivers/staging/iio/accel/adis16203.h +Auto-merging drivers/staging/iio/accel/adis16203.c +Removing drivers/staging/iio/accel/adis16201.h +Auto-merging drivers/staging/iio/accel/adis16201.c +Removing drivers/staging/bcm2835-audio/bcm2835.c +Removing drivers/staging/bcm2835-audio/Kconfig +Removing drivers/staging/android/uapi/ion_test.h +Removing drivers/staging/android/lowmemorykiller.c +Removing drivers/staging/android/ion/tegra/tegra_ion.c +Removing drivers/staging/android/ion/tegra/Makefile +Removing drivers/staging/android/ion/ion_test.c +Removing drivers/staging/android/ion/ion_priv.h +Removing drivers/staging/android/ion/ion_of.h +Removing drivers/staging/android/ion/ion_of.c +Removing drivers/staging/android/ion/ion_dummy_driver.c +Auto-merging drivers/staging/android/ion/ion.c +Removing drivers/staging/android/ion/hisilicon/hi6220_ion.c +Removing drivers/staging/android/ion/hisilicon/Makefile +Removing drivers/staging/android/ion/hisilicon/Kconfig +Removing drivers/staging/android/ion/compat_ion.h +Removing drivers/staging/android/ion/compat_ion.c +Auto-merging drivers/media/dvb-frontends/drxk_hard.c +Auto-merging drivers/iio/adc/lpc32xx_adc.c +Auto-merging drivers/iio/adc/Makefile +Auto-merging drivers/iio/adc/Kconfig +Auto-merging arch/powerpc/kvm/book3s_hv_builtin.c +Auto-merging MAINTAINERS +Auto-merging .mailmap +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/media/lirc/lirc_sasem.c drivers/staging/media/lirc/lirc_sir.c +drivers/staging/media/lirc/lirc_sasem.c: needs merge +drivers/staging/media/lirc/lirc_sir.c: needs merge +rm 'drivers/staging/media/lirc/lirc_sasem.c' +rm 'drivers/staging/media/lirc/lirc_sir.c' +$ git commit -v -a +[master bde8550d9791] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/ABI/testing/sysfs-bus-iio | 19 +- + .../ABI/testing/sysfs-bus-iio-adc-max9611 | 17 + + .../ABI/testing/sysfs-bus-iio-counter-104-quad-8 | 24 +- + .../ABI/testing/sysfs-bus-iio-timer-stm32 | 71 +- + .../devicetree/bindings/iio/accel/adxl345.txt | 38 + + .../bindings/iio/adc/amlogic,meson-saradc.txt | 2 + + .../devicetree/bindings/iio/adc/aspeed_adc.txt | 20 + + .../devicetree/bindings/iio/adc/cpcap-adc.txt | 18 + + .../devicetree/bindings/iio/adc/ltc2497.txt | 13 + + .../devicetree/bindings/iio/adc/max1118.txt | 21 + + .../devicetree/bindings/iio/adc/max9611.txt | 27 + + .../bindings/iio/adc/qcom,pm8xxx-xoadc.txt | 76 +- + .../bindings/iio/adc/rockchip-saradc.txt | 1 + + .../devicetree/bindings/iio/adc/st,stm32-adc.txt | 4 + + .../devicetree/bindings/iio/dac/ltc2632.txt | 23 + + .../devicetree/bindings/iio/dac/st,stm32-dac.txt | 61 + + .../devicetree/bindings/iio/health/max30102.txt | 30 + + .../devicetree/bindings/iio/imu/inv_mpu6050.txt | 27 +- + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 2 + + .../devicetree/bindings/iio/light/vl6180.txt | 15 + + .../bindings/iio/proximity/devantech-srf04.txt | 28 + + MAINTAINERS | 14 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 3 +- + drivers/base/dma-contiguous.c | 5 +- + drivers/iio/accel/Kconfig | 31 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/adxl345.h | 18 + + drivers/iio/accel/adxl345_core.c | 179 + + drivers/iio/accel/adxl345_i2c.c | 73 + + drivers/iio/accel/adxl345_spi.c | 81 + + drivers/iio/accel/bma180.c | 32 +- + drivers/iio/accel/mma7455_i2c.c | 8 + + drivers/iio/accel/mma7660.c | 7 + + drivers/iio/adc/Kconfig | 112 +- + drivers/iio/adc/Makefile | 10 + + drivers/iio/adc/ad799x.c | 2 +- + drivers/iio/adc/aspeed_adc.c | 295 + + drivers/iio/adc/cpcap-adc.c | 1007 ++ + drivers/iio/adc/exynos_adc.c | 2 +- + drivers/iio/adc/hx711.c | 2 +- + drivers/iio/adc/imx7d_adc.c | 2 +- + drivers/iio/adc/ina2xx-adc.c | 34 +- + drivers/{staging => }/iio/adc/lpc32xx_adc.c | 100 +- + drivers/iio/adc/ltc2497.c | 279 + + drivers/iio/adc/max1027.c | 2 +- + drivers/iio/adc/max11100.c | 5 +- + drivers/iio/adc/max1118.c | 307 + + drivers/iio/adc/max1363.c | 2 +- + drivers/iio/adc/max9611.c | 585 + + drivers/iio/adc/meson_saradc.c | 165 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 1036 ++ + drivers/iio/adc/qcom-spmi-vadc.c | 325 +- + drivers/iio/adc/qcom-vadc-common.c | 230 + + drivers/iio/adc/qcom-vadc-common.h | 108 + + drivers/iio/adc/rockchip_saradc.c | 2 +- + drivers/{staging => }/iio/adc/spear_adc.c | 0 + drivers/iio/adc/stm32-adc.c | 50 +- + drivers/iio/adc/stx104.c | 1 + + drivers/iio/adc/sun4i-gpadc-iio.c | 719 ++ + drivers/iio/adc/ti-ads1015.c | 24 +- + drivers/iio/adc/vf610_adc.c | 2 +- + drivers/iio/chemical/ams-iaq-core.c | 2 +- + drivers/iio/chemical/vz89x.c | 2 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 26 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 37 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 24 +- + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 +- + drivers/iio/counter/104-quad-8.c | 1 + + drivers/iio/counter/Kconfig | 2 +- + drivers/iio/dac/Kconfig | 25 + + drivers/iio/dac/Makefile | 3 + + drivers/iio/dac/ad5504.c | 4 +- + drivers/iio/dac/ad7303.c | 6 +- + drivers/iio/dac/cio-dac.c | 1 + + drivers/iio/dac/ltc2632.c | 314 + + drivers/iio/dac/max5821.c | 1 + + drivers/iio/dac/mcp4725.c | 24 +- + drivers/iio/dac/stm32-dac-core.c | 180 + + drivers/iio/dac/stm32-dac-core.h | 51 + + drivers/iio/dac/stm32-dac.c | 334 + + drivers/iio/gyro/itg3200_core.c | 7 + + drivers/iio/gyro/mpu3050-i2c.c | 5 +- + drivers/iio/health/Kconfig | 13 + + drivers/iio/health/Makefile | 1 + + drivers/iio/health/max30100.c | 1 + + drivers/iio/health/max30102.c | 486 + + drivers/iio/humidity/Kconfig | 14 + + drivers/iio/humidity/Makefile | 3 + + drivers/iio/humidity/hdc100x.c | 2 +- + drivers/iio/humidity/hid-sensor-humidity.c | 315 + + drivers/iio/humidity/hts221_buffer.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 6 + + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 43 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 1 + + drivers/iio/imu/st_lsm6dsx/Kconfig | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 11 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 13 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 105 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 12 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 12 +- + drivers/iio/light/Kconfig | 20 + + drivers/iio/light/Makefile | 2 + + drivers/iio/light/apds9960.c | 11 +- + drivers/iio/light/bh1750.c | 2 +- + drivers/iio/light/cros_ec_light_prox.c | 289 + + drivers/iio/light/hid-sensor-prox.c | 7 + + drivers/iio/light/lm3533-als.c | 4 +- + drivers/iio/light/tsl2563.c | 10 + + drivers/iio/light/us5182d.c | 7 + + drivers/iio/light/vl6180.c | 543 + + drivers/iio/magnetometer/bmc150_magn_i2c.c | 9 + + drivers/iio/magnetometer/mag3110.c | 7 + + drivers/iio/potentiostat/lmp91000.c | 1 + + drivers/iio/pressure/bmp280-core.c | 11 +- + drivers/iio/pressure/hp03.c | 7 + + drivers/iio/pressure/mpl3115.c | 7 + + drivers/iio/pressure/zpa2326.c | 4 +- + drivers/iio/proximity/Kconfig | 11 + + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/as3935.c | 5 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 1 + + drivers/iio/proximity/srf04.c | 304 + + drivers/iio/temperature/Kconfig | 14 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/hid-sensor-temperature.c | 311 + + drivers/iio/temperature/maxim_thermocouple.c | 1 + + drivers/iio/temperature/mlx90614.c | 7 + + drivers/iio/temperature/tmp007.c | 277 +- + drivers/iio/trigger/stm32-timer-trigger.c | 320 +- + drivers/media/dvb-frontends/drxk_hard.c | 1 - + drivers/staging/Kconfig | 4 +- + drivers/staging/Makefile | 2 +- + drivers/staging/android/Kconfig | 10 - + drivers/staging/android/Makefile | 1 - + drivers/staging/android/TODO | 21 +- + drivers/staging/android/ion/Kconfig | 56 +- + drivers/staging/android/ion/Makefile | 18 +- + drivers/staging/android/ion/compat_ion.c | 195 - + drivers/staging/android/ion/compat_ion.h | 29 - + drivers/staging/android/ion/hisilicon/Kconfig | 5 - + drivers/staging/android/ion/hisilicon/Makefile | 1 - + drivers/staging/android/ion/hisilicon/hi6220_ion.c | 113 - + drivers/staging/android/ion/ion-ioctl.c | 85 +- + drivers/staging/android/ion/ion.c | 1168 +- + drivers/staging/android/ion/ion.h | 387 +- + drivers/staging/android/ion/ion_carveout_heap.c | 37 +- + drivers/staging/android/ion/ion_chunk_heap.c | 27 +- + drivers/staging/android/ion/ion_cma_heap.c | 125 +- + drivers/staging/android/ion/ion_dummy_driver.c | 156 - + drivers/staging/android/ion/ion_heap.c | 68 - + drivers/staging/android/ion/ion_of.c | 184 - + drivers/staging/android/ion/ion_of.h | 37 - + drivers/staging/android/ion/ion_page_pool.c | 6 +- + drivers/staging/android/ion/ion_priv.h | 473 - + drivers/staging/android/ion/ion_system_heap.c | 53 +- + drivers/staging/android/ion/ion_test.c | 305 - + drivers/staging/android/ion/tegra/Makefile | 1 - + drivers/staging/android/ion/tegra/tegra_ion.c | 80 - + drivers/staging/android/lowmemorykiller.c | 212 - + drivers/staging/android/uapi/ion.h | 86 +- + drivers/staging/android/uapi/ion_test.h | 69 - + drivers/staging/bcm2835-audio/Kconfig | 7 - + drivers/staging/bcm2835-audio/bcm2835.c | 250 - + drivers/staging/comedi/Kconfig | 5 +- + drivers/staging/comedi/comedi_buf.c | 24 + + drivers/staging/comedi/comedi_fops.c | 22 +- + drivers/staging/comedi/comedi_internal.h | 2 + + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 4 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 24 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 12 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 6 +- + drivers/staging/comedi/drivers/comedi_test.c | 8 +- + drivers/staging/comedi/drivers/jr3_pci.c | 330 +- + drivers/staging/comedi/drivers/jr3_pci.h | 18 +- + drivers/staging/comedi/drivers/ni_atmio.c | 2 +- + drivers/staging/comedi/drivers/ni_usb6501.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 50 +- + drivers/staging/dgnc/TODO | 3 - + drivers/staging/dgnc/dgnc_cls.c | 154 +- + drivers/staging/dgnc/dgnc_cls.h | 42 +- + drivers/staging/dgnc/dgnc_driver.c | 109 +- + drivers/staging/dgnc/dgnc_driver.h | 340 +- + drivers/staging/dgnc/dgnc_mgmt.c | 67 +- + drivers/staging/dgnc/dgnc_mgmt.h | 7 +- + drivers/staging/dgnc/dgnc_neo.c | 228 +- + drivers/staging/dgnc/dgnc_neo.h | 85 +- + drivers/staging/dgnc/dgnc_pci.h | 13 +- + drivers/staging/dgnc/dgnc_tty.c | 577 +- + drivers/staging/dgnc/dgnc_tty.h | 6 +- + drivers/staging/dgnc/dgnc_utils.c | 9 +- + drivers/staging/dgnc/dgnc_utils.h | 6 +- + drivers/staging/dgnc/digi.h | 134 +- + drivers/staging/emxx_udc/emxx_udc.h | 2 +- + drivers/staging/fbtft/Kconfig | 6 + + drivers/staging/fbtft/Makefile | 1 + + drivers/staging/fbtft/fb_agm1264k-fl.c | 2 +- + drivers/staging/fbtft/fb_ili9163.c | 2 +- + drivers/staging/fbtft/fb_ili9325.c | 2 +- + drivers/staging/fbtft/fb_ili9481.c | 2 +- + drivers/staging/fbtft/fb_ili9486.c | 2 +- + drivers/staging/fbtft/fb_ra8875.c | 2 +- + drivers/staging/fbtft/fb_s6d02a1.c | 2 +- + drivers/staging/fbtft/fb_sh1106.c | 195 + + drivers/staging/fbtft/fb_ssd1289.c | 2 +- + drivers/staging/fbtft/fb_ssd1331.c | 8 +- + drivers/staging/fbtft/fb_st7735r.c | 2 +- + drivers/staging/fbtft/fb_watterott.c | 6 +- + drivers/staging/fbtft/fbtft-bus.c | 33 +- + drivers/staging/fbtft/fbtft-core.c | 74 +- + drivers/staging/fbtft/fbtft-sysfs.c | 2 +- + drivers/staging/fbtft/fbtft.h | 5 +- + drivers/staging/fbtft/fbtft_device.c | 23 +- + drivers/staging/fbtft/flexfb.c | 20 +- + drivers/staging/fsl-mc/bus/Kconfig | 10 + + drivers/staging/fsl-mc/bus/Makefile | 3 + + drivers/staging/fsl-mc/bus/dpio/Makefile | 9 + + drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h | 75 + + drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 296 + + drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt | 135 + + drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 618 + + drivers/staging/fsl-mc/bus/dpio/dpio.c | 224 + + drivers/staging/fsl-mc/bus/dpio/dpio.h | 109 + + drivers/staging/fsl-mc/bus/dpio/qbman-portal.c | 1035 ++ + drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 469 + + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 4 +- + drivers/staging/fsl-mc/include/dpaa2-fd.h | 448 + + drivers/staging/fsl-mc/include/dpaa2-global.h | 202 + + drivers/staging/fsl-mc/include/dpaa2-io.h | 139 + + drivers/staging/gdm724x/gdm_lte.c | 17 +- + drivers/staging/gdm724x/gdm_lte.h | 2 +- + drivers/staging/gdm724x/gdm_mux.c | 4 +- + drivers/staging/gdm724x/gdm_tty.c | 3 +- + drivers/staging/goldfish/goldfish_nand.c | 16 +- + .../greybus/Documentation/firmware/authenticate.c | 2 +- + .../greybus/Documentation/firmware/firmware.c | 21 +- + drivers/staging/greybus/connection.c | 3 + + drivers/staging/greybus/gbphy.c | 1 - + drivers/staging/greybus/light.c | 1 - + drivers/staging/greybus/loopback.c | 5 +- + drivers/staging/greybus/tools/loopback_test.c | 6 +- + drivers/staging/greybus/uart.c | 3 +- + drivers/staging/iio/accel/Makefile | 7 - + .../iio/accel/{adis16201_core.c => adis16201.c} | 150 +- + drivers/staging/iio/accel/adis16201.h | 144 - + .../iio/accel/{adis16203_core.c => adis16203.c} | 146 +- + drivers/staging/iio/accel/adis16203.h | 125 - + .../iio/accel/{adis16209_core.c => adis16209.c} | 153 +- + drivers/staging/iio/accel/adis16209.h | 144 - + .../iio/accel/{adis16240_core.c => adis16240.c} | 206 +- + drivers/staging/iio/accel/adis16240.h | 179 - + drivers/staging/iio/adc/Kconfig | 22 - + drivers/staging/iio/adc/Makefile | 2 - + drivers/staging/iio/adc/ad7192.c | 20 +- + drivers/staging/iio/adc/ad7280a.c | 34 +- + drivers/staging/iio/adc/ad7606.c | 9 +- + drivers/staging/iio/adc/ad7606.h | 3 + + drivers/staging/iio/adc/ad7780.c | 2 +- + drivers/staging/iio/addac/adt7316.c | 113 +- + drivers/staging/iio/cdc/ad7150.c | 2 +- + drivers/staging/iio/cdc/ad7152.c | 23 +- + drivers/staging/iio/cdc/ad7746.c | 50 +- + drivers/staging/iio/frequency/ad9832.c | 119 +- + drivers/staging/iio/frequency/ad9832.h | 92 - + drivers/staging/iio/frequency/ad9834.c | 86 +- + drivers/staging/iio/frequency/ad9834.h | 72 - + drivers/staging/iio/gyro/adis16060_core.c | 37 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 66 +- + drivers/staging/iio/light/isl29028.c | 37 +- + drivers/staging/iio/light/tsl2x7x_core.c | 4 +- + drivers/staging/iio/meter/ade7753.c | 82 +- + drivers/staging/iio/meter/ade7753.h | 72 - + drivers/staging/iio/meter/ade7754.c | 124 +- + drivers/staging/iio/meter/ade7754.h | 90 - + drivers/staging/iio/meter/ade7759.c | 74 +- + drivers/staging/iio/meter/ade7759.h | 53 - + drivers/staging/iio/meter/ade7854.c | 4 +- + drivers/staging/iio/meter/meter.h | 60 +- + drivers/staging/iio/resolver/ad2s1200.c | 2 +- + drivers/staging/iio/resolver/ad2s1210.c | 28 +- + drivers/staging/iio/resolver/ad2s90.c | 2 +- + drivers/staging/ks7010/TODO | 4 +- + drivers/staging/ks7010/eap_packet.h | 9 +- + drivers/staging/ks7010/ks7010_sdio.c | 895 +- + drivers/staging/ks7010/ks7010_sdio.h | 102 +- + drivers/staging/ks7010/ks_hostif.c | 781 +- + drivers/staging/ks7010/ks_hostif.h | 395 +- + drivers/staging/ks7010/ks_wlan.h | 54 +- + drivers/staging/ks7010/ks_wlan_ioctl.h | 68 +- + drivers/staging/ks7010/ks_wlan_net.c | 1051 +- + drivers/staging/ks7010/michael_mic.c | 12 +- + drivers/staging/ks7010/michael_mic.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 51 +- + drivers/staging/lustre/include/linux/lnet/api.h | 65 +- + .../staging/lustre/include/linux/lnet/lib-lnet.h | 232 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 137 +- + drivers/staging/lustre/include/linux/lnet/lnetst.h | 12 +- + drivers/staging/lustre/include/linux/lnet/nidstr.h | 2 +- + .../staging/lustre/include/linux/lnet/socklnd.h | 14 +- + drivers/staging/lustre/include/linux/lnet/types.h | 155 +- + drivers/staging/lustre/lnet/Kconfig | 1 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 109 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 24 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 88 +- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 14 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 69 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 76 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 62 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 4 +- + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 38 +- + drivers/staging/lustre/lnet/libcfs/debug.c | 8 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 51 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 2 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 151 +- + drivers/staging/lustre/lnet/lnet/config.c | 8 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 26 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 29 +- + drivers/staging/lustre/lnet/lnet/lib-me.c | 28 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 195 +- + drivers/staging/lustre/lnet/lnet/lib-msg.c | 41 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 32 +- + drivers/staging/lustre/lnet/lnet/lo.c | 12 +- + drivers/staging/lustre/lnet/lnet/nidstrings.c | 2 +- + drivers/staging/lustre/lnet/lnet/peer.c | 38 +- + drivers/staging/lustre/lnet/lnet/router.c | 164 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 34 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 4 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 17 +- + drivers/staging/lustre/lnet/selftest/console.c | 39 +- + drivers/staging/lustre/lnet/selftest/console.h | 14 +- + drivers/staging/lustre/lnet/selftest/framework.c | 4 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 2 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 31 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 2 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 42 +- + drivers/staging/lustre/lustre/include/cl_object.h | 13 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 120 +- + drivers/staging/lustre/lustre/include/lu_object.h | 10 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 8 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 11 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 3 + + .../staging/lustre/lustre/include/lustre_eacl.h | 74 - + drivers/staging/lustre/lustre/include/lustre_net.h | 32 +- + .../staging/lustre/lustre/include/obd_support.h | 1 + + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 13 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 47 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 178 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 7 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 14 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 +- + drivers/staging/lustre/lustre/llite/dcache.c | 1 + + drivers/staging/lustre/lustre/llite/file.c | 49 +- + drivers/staging/lustre/lustre/llite/glimpse.c | 4 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 8 +- + drivers/staging/lustre/lustre/llite/lcommon_misc.c | 2 +- + .../staging/lustre/lustre/llite/llite_internal.h | 3 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 16 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 4 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 4 +- + drivers/staging/lustre/lustre/llite/namei.c | 1 + + drivers/staging/lustre/lustre/llite/range_lock.c | 2 +- + drivers/staging/lustre/lustre/llite/rw.c | 2 +- + drivers/staging/lustre/lustre/llite/rw26.c | 26 - + drivers/staging/lustre/lustre/llite/super25.c | 2 +- + drivers/staging/lustre/lustre/llite/symlink.c | 1 + + drivers/staging/lustre/lustre/llite/vvp_dev.c | 10 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 2 + + drivers/staging/lustre/lustre/llite/xattr.c | 3 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 4 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 41 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 24 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 2 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 6 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 1 + + .../lustre/lustre/obdclass/lprocfs_status.c | 111 + + .../staging/lustre/lustre/obdclass/obd_config.c | 7 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 6 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 4 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 4 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 3 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 48 +- + drivers/staging/lustre/lustre/osc/osc_lock.c | 60 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 12 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 77 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 17 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 7 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 1 - + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 26 +- + drivers/staging/lustre/lustre/ptlrpc/pers.c | 2 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- + drivers/staging/media/Kconfig | 4 +- + drivers/staging/media/Makefile | 2 +- + drivers/staging/media/atomisp/Kconfig | 11 + + drivers/staging/media/atomisp/Makefile | 6 + + drivers/staging/media/atomisp/TODO | 64 + + drivers/staging/media/atomisp/i2c/Kconfig | 106 + + drivers/staging/media/atomisp/i2c/Makefile | 23 + + drivers/staging/media/atomisp/i2c/ap1302.c | 1260 ++ + drivers/staging/media/atomisp/i2c/ap1302.h | 198 + + drivers/staging/media/atomisp/i2c/gc0310.c | 1490 +++ + drivers/staging/media/atomisp/i2c/gc0310.h | 459 + + drivers/staging/media/atomisp/i2c/gc2235.c | 1219 ++ + drivers/staging/media/atomisp/i2c/gc2235.h | 672 ++ + drivers/staging/media/atomisp/i2c/imx/Kconfig | 9 + + drivers/staging/media/atomisp/i2c/imx/Makefile | 8 + + drivers/staging/media/atomisp/i2c/imx/ad5816g.c | 225 + + drivers/staging/media/atomisp/i2c/imx/ad5816g.h | 49 + + drivers/staging/media/atomisp/i2c/imx/common.h | 65 + + drivers/staging/media/atomisp/i2c/imx/drv201.c | 218 + + drivers/staging/media/atomisp/i2c/imx/drv201.h | 38 + + drivers/staging/media/atomisp/i2c/imx/dw9714.c | 235 + + drivers/staging/media/atomisp/i2c/imx/dw9714.h | 63 + + drivers/staging/media/atomisp/i2c/imx/dw9718.c | 238 + + drivers/staging/media/atomisp/i2c/imx/dw9718.h | 64 + + drivers/staging/media/atomisp/i2c/imx/dw9719.c | 209 + + drivers/staging/media/atomisp/i2c/imx/dw9719.h | 58 + + drivers/staging/media/atomisp/i2c/imx/imx.c | 2512 ++++ + drivers/staging/media/atomisp/i2c/imx/imx.h | 766 ++ + drivers/staging/media/atomisp/i2c/imx/imx132.h | 566 + + drivers/staging/media/atomisp/i2c/imx/imx134.h | 2464 ++++ + drivers/staging/media/atomisp/i2c/imx/imx135.h | 3374 ++++++ + drivers/staging/media/atomisp/i2c/imx/imx175.h | 1959 ++++ + drivers/staging/media/atomisp/i2c/imx/imx208.h | 550 + + drivers/staging/media/atomisp/i2c/imx/imx219.h | 227 + + drivers/staging/media/atomisp/i2c/imx/imx227.h | 726 ++ + drivers/staging/media/atomisp/i2c/imx/otp.c | 39 + + .../media/atomisp/i2c/imx/otp_brcc064_e2prom.c | 80 + + drivers/staging/media/atomisp/i2c/imx/otp_e2prom.c | 89 + + drivers/staging/media/atomisp/i2c/imx/otp_imx.c | 191 + + drivers/staging/media/atomisp/i2c/imx/vcm.c | 45 + + .../staging/media/atomisp/i2c/libmsrlisthelper.c | 209 + + drivers/staging/media/atomisp/i2c/lm3554.c | 1009 ++ + drivers/staging/media/atomisp/i2c/mt9m114.c | 1963 ++++ + drivers/staging/media/atomisp/i2c/mt9m114.h | 1786 +++ + drivers/staging/media/atomisp/i2c/ov2680.c | 1559 +++ + drivers/staging/media/atomisp/i2c/ov2680.h | 940 ++ + drivers/staging/media/atomisp/i2c/ov2722.c | 1373 +++ + drivers/staging/media/atomisp/i2c/ov2722.h | 1267 +++ + drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 11 + + drivers/staging/media/atomisp/i2c/ov5693/Makefile | 3 + + drivers/staging/media/atomisp/i2c/ov5693/ad5823.h | 67 + + drivers/staging/media/atomisp/i2c/ov5693/ov5693.c | 2066 ++++ + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 1381 +++ + drivers/staging/media/atomisp/i2c/ov8858.c | 2221 ++++ + drivers/staging/media/atomisp/i2c/ov8858.h | 1482 +++ + drivers/staging/media/atomisp/i2c/ov8858_btns.h | 1284 +++ + .../atomisp/include/asm/intel_mid_pcihelpers.h | 37 + + .../staging/media/atomisp/include/linux/atomisp.h | 1367 +++ + .../atomisp/include/linux/atomisp_gmin_platform.h | 40 + + .../media/atomisp/include/linux/atomisp_platform.h | 262 + + .../media/atomisp/include/linux/libmsrlisthelper.h | 32 + + .../media/atomisp/include/linux/vlv2_plat_clock.h | 30 + + .../staging/media/atomisp/include/media/lm3554.h | 136 + + .../staging/media/atomisp/include/media/lm3642.h | 153 + + drivers/staging/media/atomisp/pci/Kconfig | 13 + + drivers/staging/media/atomisp/pci/Makefile | 5 + + .../staging/media/atomisp/pci/atomisp2/Makefile | 367 + + .../media/atomisp/pci/atomisp2/atomisp-regs.h | 209 + + .../media/atomisp/pci/atomisp2/atomisp_acc.c | 608 + + .../media/atomisp/pci/atomisp2/atomisp_acc.h | 124 + + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 6751 +++++++++++ + .../media/atomisp/pci/atomisp2/atomisp_cmd.h | 457 + + .../media/atomisp/pci/atomisp2/atomisp_common.h | 79 + + .../media/atomisp/pci/atomisp2/atomisp_compat.h | 668 ++ + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 4722 ++++++++ + .../atomisp/pci/atomisp2/atomisp_compat_css20.h | 282 + + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 1263 +++ + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.h | 369 + + .../media/atomisp/pci/atomisp2/atomisp_csi2.c | 446 + + .../media/atomisp/pci/atomisp2/atomisp_csi2.h | 61 + + .../atomisp/pci/atomisp2/atomisp_dfs_tables.h | 412 + + .../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 209 + + .../media/atomisp/pci/atomisp2/atomisp_drvfs.h | 29 + + .../media/atomisp/pci/atomisp2/atomisp_file.c | 245 + + .../media/atomisp/pci/atomisp2/atomisp_file.h | 47 + + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 1304 +++ + .../media/atomisp/pci/atomisp2/atomisp_fops.h | 54 + + .../media/atomisp/pci/atomisp2/atomisp_helper.h | 33 + + .../media/atomisp/pci/atomisp2/atomisp_internal.h | 331 + + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 3130 +++++ + .../media/atomisp/pci/atomisp2/atomisp_ioctl.h | 73 + + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 1437 +++ + .../media/atomisp/pci/atomisp2/atomisp_subdev.h | 471 + + .../media/atomisp/pci/atomisp2/atomisp_tables.h | 191 + + .../media/atomisp/pci/atomisp2/atomisp_tpg.c | 181 + + .../media/atomisp/pci/atomisp2/atomisp_tpg.h | 42 + + .../atomisp/pci/atomisp2/atomisp_trace_event.h | 133 + + .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 1618 +++ + .../media/atomisp/pci/atomisp2/atomisp_v4l2.h | 44 + + .../media/atomisp/pci/atomisp2/css2400/Makefile | 4 + + .../base/circbuf/interface/ia_css_circbuf.h | 377 + + .../base/circbuf/interface/ia_css_circbuf_comm.h | 56 + + .../base/circbuf/interface/ia_css_circbuf_desc.h | 170 + + .../atomisp2/css2400/base/circbuf/src/circbuf.c | 321 + + .../base/refcount/interface/ia_css_refcount.h | 83 + + .../atomisp2/css2400/base/refcount/src/refcount.c | 281 + + .../camera/pipe/interface/ia_css_pipe_binarydesc.h | 297 + + .../camera/pipe/interface/ia_css_pipe_stagedesc.h | 52 + + .../camera/pipe/interface/ia_css_pipe_util.h | 39 + + .../css2400/camera/pipe/src/pipe_binarydesc.c | 883 ++ + .../css2400/camera/pipe/src/pipe_stagedesc.c | 115 + + .../atomisp2/css2400/camera/pipe/src/pipe_util.c | 51 + + .../css2400/camera/util/interface/ia_css_util.h | 141 + + .../pci/atomisp2/css2400/camera/util/src/util.c | 227 + + .../ia_css_isp_configs.c | 360 + + .../ia_css_isp_configs.h | 189 + + .../ia_css_isp_params.c | 3221 ++++++ + .../ia_css_isp_params.h | 399 + + .../ia_css_isp_states.c | 214 + + .../ia_css_isp_states.h | 72 + + .../atomisp2/css2400/css_2400_system/hrt/bits.h | 104 + + .../css2400/css_2400_system/hrt/cell_params.h | 42 + + .../hrt/css_receiver_2400_common_defs.h | 200 + + .../css_2400_system/hrt/css_receiver_2400_defs.h | 258 + + .../atomisp2/css2400/css_2400_system/hrt/defs.h | 36 + + .../css2400/css_2400_system/hrt/dma_v2_defs.h | 199 + + .../css2400/css_2400_system/hrt/gdc_v2_defs.h | 170 + + .../css2400/css_2400_system/hrt/gp_regs_defs.h | 22 + + .../css2400/css_2400_system/hrt/gp_timer_defs.h | 36 + + .../css2400/css_2400_system/hrt/gpio_block_defs.h | 42 + + .../css_2400_system/hrt/hive_isp_css_defs.h | 416 + + .../hrt/hive_isp_css_host_ids_hrt.h | 84 + + .../hrt/hive_isp_css_irq_types_hrt.h | 72 + + .../hrt/hive_isp_css_streaming_to_mipi_types_hrt.h | 26 + + .../css2400/css_2400_system/hrt/hive_types.h | 128 + + .../atomisp2/css2400/css_2400_system/hrt/if_defs.h | 22 + + .../hrt/input_formatter_subsystem_defs.h | 53 + + .../css_2400_system/hrt/input_selector_defs.h | 89 + + .../css_2400_system/hrt/input_switch_2400_defs.h | 30 + + .../css_2400_system/hrt/input_system_ctrl_defs.h | 254 + + .../css_2400_system/hrt/input_system_defs.h | 126 + + .../css_2400_system/hrt/irq_controller_defs.h | 28 + + .../css_2400_system/hrt/isp2400_mamoiada_params.h | 254 + + .../css2400/css_2400_system/hrt/isp2400_support.h | 38 + + .../css_2400_system/hrt/isp_acquisition_defs.h | 234 + + .../css2400/css_2400_system/hrt/isp_capture_defs.h | 310 + + .../css2400/css_2400_system/hrt/mmu_defs.h | 23 + + .../hrt/scalar_processor_2400_params.h | 20 + + .../atomisp2/css2400/css_2400_system/hrt/sp_hrt.h | 24 + + .../css2400/css_2400_system/hrt/str2mem_defs.h | 39 + + .../css_2400_system/hrt/streaming_to_mipi_defs.h | 28 + + .../css_2400_system/hrt/timed_controller_defs.h | 22 + + .../pci/atomisp2/css2400/css_2400_system/hrt/var.h | 74 + + .../atomisp2/css2400/css_2400_system/hrt/version.h | 20 + + .../atomisp2/css2400/css_2400_system/spmem_dump.c | 3634 ++++++ + .../css2400/css_2401_csi2p_system/csi_rx_global.h | 63 + + .../ia_css_isp_configs.c | 360 + + .../ia_css_isp_configs.h | 189 + + .../ia_css_isp_params.c | 3220 ++++++ + .../ia_css_isp_params.h | 399 + + .../ia_css_isp_states.c | 214 + + .../ia_css_isp_states.h | 72 + + .../css2400/css_2401_csi2p_system/host/csi_rx.c | 41 + + .../css_2401_csi2p_system/host/csi_rx_local.h | 61 + + .../css_2401_csi2p_system/host/csi_rx_private.h | 282 + + .../css2400/css_2401_csi2p_system/host/ibuf_ctrl.c | 22 + + .../css_2401_csi2p_system/host/ibuf_ctrl_local.h | 58 + + .../css_2401_csi2p_system/host/ibuf_ctrl_private.h | 233 + + .../host/input_system_local.h | 106 + + .../host/input_system_private.h | 128 + + .../css2400/css_2401_csi2p_system/host/isys_dma.c | 40 + + .../css_2401_csi2p_system/host/isys_dma_local.h | 20 + + .../css_2401_csi2p_system/host/isys_dma_private.h | 60 + + .../css2400/css_2401_csi2p_system/host/isys_irq.c | 39 + + .../css_2401_csi2p_system/host/isys_irq_local.h | 35 + + .../css_2401_csi2p_system/host/isys_irq_private.h | 108 + + .../css_2401_csi2p_system/host/isys_stream2mmio.c | 21 + + .../host/isys_stream2mmio_local.h | 36 + + .../host/isys_stream2mmio_private.h | 168 + + .../css_2401_csi2p_system/host/pixelgen_local.h | 50 + + .../css_2401_csi2p_system/host/pixelgen_private.h | 164 + + .../css_2401_csi2p_system/host/system_local.h | 381 + + .../hrt/PixelGen_SysBlock_defs.h | 126 + + .../css2400/css_2401_csi2p_system/hrt/bits.h | 104 + + .../css_2401_csi2p_system/hrt/cell_params.h | 42 + + .../hrt/css_receiver_2400_common_defs.h | 200 + + .../hrt/css_receiver_2400_defs.h | 258 + + .../css2400/css_2401_csi2p_system/hrt/defs.h | 36 + + .../css_2401_csi2p_system/hrt/dma_v2_defs.h | 199 + + .../css_2401_csi2p_system/hrt/gdc_v2_defs.h | 170 + + .../css_2401_csi2p_system/hrt/gp_regs_defs.h | 22 + + .../css_2401_csi2p_system/hrt/gp_timer_defs.h | 36 + + .../css_2401_csi2p_system/hrt/gpio_block_defs.h | 42 + + .../hrt/hive_isp_css_2401_irq_types_hrt.h | 68 + + .../css_2401_csi2p_system/hrt/hive_isp_css_defs.h | 435 + + .../hrt/hive_isp_css_host_ids_hrt.h | 119 + + .../hrt/hive_isp_css_streaming_to_mipi_types_hrt.h | 26 + + .../css2400/css_2401_csi2p_system/hrt/hive_types.h | 128 + + .../css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h | 138 + + .../css2400/css_2401_csi2p_system/hrt/if_defs.h | 22 + + .../hrt/input_formatter_subsystem_defs.h | 53 + + .../hrt/input_selector_defs.h | 89 + + .../hrt/input_switch_2400_defs.h | 30 + + .../hrt/input_system_ctrl_defs.h | 254 + + .../css_2401_csi2p_system/hrt/input_system_defs.h | 126 + + .../hrt/irq_controller_defs.h | 28 + + .../css_2401_csi2p_system/hrt/isp2400_support.h | 38 + + .../hrt/isp2401_mamoiada_params.h | 258 + + .../hrt/isp_acquisition_defs.h | 234 + + .../css_2401_csi2p_system/hrt/isp_capture_defs.h | 310 + + .../hrt/mipi_backend_common_defs.h | 210 + + .../css_2401_csi2p_system/hrt/mipi_backend_defs.h | 215 + + .../css2400/css_2401_csi2p_system/hrt/mmu_defs.h | 23 + + .../css_2401_csi2p_system/hrt/rx_csi_defs.h | 175 + + .../hrt/scalar_processor_2400_params.h | 20 + + .../css2400/css_2401_csi2p_system/hrt/sp_hrt.h | 24 + + .../css_2401_csi2p_system/hrt/str2mem_defs.h | 39 + + .../css_2401_csi2p_system/hrt/stream2mmio_defs.h | 71 + + .../hrt/streaming_to_mipi_defs.h | 28 + + .../hrt/timed_controller_defs.h | 22 + + .../css2400/css_2401_csi2p_system/hrt/var.h | 99 + + .../css2400/css_2401_csi2p_system/hrt/version.h | 20 + + .../css_2401_csi2p_system/ibuf_ctrl_global.h | 80 + + .../css_2401_csi2p_system/input_system_global.h | 206 + + .../css_2401_csi2p_system/isys_dma_global.h | 87 + + .../css_2401_csi2p_system/isys_irq_global.h | 35 + + .../isys_stream2mmio_global.h | 39 + + .../css_2401_csi2p_system/pixelgen_global.h | 91 + + .../css2400/css_2401_csi2p_system/spmem_dump.c | 3686 ++++++ + .../css2400/css_2401_csi2p_system/system_global.h | 458 + + .../ia_css_isp_configs.c | 360 + + .../ia_css_isp_configs.h | 189 + + .../ia_css_isp_params.c | 3220 ++++++ + .../ia_css_isp_params.h | 399 + + .../ia_css_isp_states.c | 214 + + .../ia_css_isp_states.h | 72 + + .../atomisp2/css2400/css_2401_system/hrt/bits.h | 104 + + .../css2400/css_2401_system/hrt/cell_params.h | 42 + + .../hrt/css_receiver_2400_common_defs.h | 200 + + .../css_2401_system/hrt/css_receiver_2400_defs.h | 258 + + .../atomisp2/css2400/css_2401_system/hrt/defs.h | 36 + + .../css2400/css_2401_system/hrt/dma_v2_defs.h | 199 + + .../css2400/css_2401_system/hrt/gdc_v2_defs.h | 170 + + .../css2400/css_2401_system/hrt/gp_regs_defs.h | 22 + + .../css2400/css_2401_system/hrt/gp_timer_defs.h | 36 + + .../css2400/css_2401_system/hrt/gpio_block_defs.h | 42 + + .../hrt/hive_isp_css_2401_irq_types_hrt.h | 69 + + .../css_2401_system/hrt/hive_isp_css_defs.h | 435 + + .../hrt/hive_isp_css_host_ids_hrt.h | 119 + + .../hrt/hive_isp_css_streaming_to_mipi_types_hrt.h | 26 + + .../css2400/css_2401_system/hrt/hive_types.h | 128 + + .../atomisp2/css2400/css_2401_system/hrt/if_defs.h | 22 + + .../hrt/input_formatter_subsystem_defs.h | 53 + + .../css_2401_system/hrt/input_selector_defs.h | 89 + + .../css_2401_system/hrt/input_switch_2400_defs.h | 30 + + .../css_2401_system/hrt/input_system_ctrl_defs.h | 254 + + .../css_2401_system/hrt/input_system_defs.h | 126 + + .../css_2401_system/hrt/irq_controller_defs.h | 28 + + .../css2400/css_2401_system/hrt/isp2400_support.h | 38 + + .../css_2401_system/hrt/isp2401_mamoiada_params.h | 258 + + .../css_2401_system/hrt/isp_acquisition_defs.h | 234 + + .../css2400/css_2401_system/hrt/isp_capture_defs.h | 310 + + .../css2400/css_2401_system/hrt/mmu_defs.h | 23 + + .../hrt/scalar_processor_2400_params.h | 20 + + .../atomisp2/css2400/css_2401_system/hrt/sp_hrt.h | 24 + + .../css2400/css_2401_system/hrt/str2mem_defs.h | 39 + + .../css_2401_system/hrt/streaming_to_mipi_defs.h | 28 + + .../css_2401_system/hrt/timed_controller_defs.h | 22 + + .../pci/atomisp2/css2400/css_2401_system/hrt/var.h | 99 + + .../atomisp2/css2400/css_2401_system/hrt/version.h | 20 + + .../atomisp2/css2400/css_2401_system/spmem_dump.c | 3634 ++++++ + .../atomisp/pci/atomisp2/css2400/css_api_version.h | 673 ++ + .../media/atomisp/pci/atomisp2/css2400/css_trace.h | 388 + + .../css2400/hive_isp_css_common/debug_global.h | 83 + + .../css2400/hive_isp_css_common/dma_global.h | 255 + + .../hive_isp_css_common/event_fifo_global.h | 20 + + .../hive_isp_css_common/fifo_monitor_global.h | 32 + + .../css2400/hive_isp_css_common/gdc_global.h | 90 + + .../css2400/hive_isp_css_common/gp_device_global.h | 85 + + .../css2400/hive_isp_css_common/gp_timer_global.h | 33 + + .../css2400/hive_isp_css_common/gpio_global.h | 45 + + .../css2400/hive_isp_css_common/hmem_global.h | 45 + + .../css2400/hive_isp_css_common/host/debug.c | 72 + + .../css2400/hive_isp_css_common/host/debug_local.h | 21 + + .../hive_isp_css_common/host/debug_private.h | 99 + + .../css2400/hive_isp_css_common/host/dma.c | 299 + + .../css2400/hive_isp_css_common/host/dma_local.h | 207 + + .../css2400/hive_isp_css_common/host/dma_private.h | 41 + + .../css2400/hive_isp_css_common/host/event_fifo.c | 19 + + .../hive_isp_css_common/host/event_fifo_local.h | 57 + + .../hive_isp_css_common/host/event_fifo_private.h | 75 + + .../hive_isp_css_common/host/fifo_monitor.c | 567 + + .../hive_isp_css_common/host/fifo_monitor_local.h | 99 + + .../host/fifo_monitor_private.h | 79 + + .../css2400/hive_isp_css_common/host/gdc.c | 127 + + .../css2400/hive_isp_css_common/host/gdc_local.h | 20 + + .../css2400/hive_isp_css_common/host/gdc_private.h | 20 + + .../css2400/hive_isp_css_common/host/gp_device.c | 108 + + .../hive_isp_css_common/host/gp_device_local.h | 143 + + .../hive_isp_css_common/host/gp_device_private.h | 46 + + .../css2400/hive_isp_css_common/host/gp_timer.c | 70 + + .../hive_isp_css_common/host/gp_timer_local.h | 45 + + .../hive_isp_css_common/host/gp_timer_private.h | 22 + + .../css2400/hive_isp_css_common/host/gpio_local.h | 20 + + .../hive_isp_css_common/host/gpio_private.h | 44 + + .../host/hive_isp_css_ddr_hrt_modified.h | 148 + + .../host/hive_isp_css_hrt_modified.h | 79 + + .../css2400/hive_isp_css_common/host/hmem.c | 19 + + .../css2400/hive_isp_css_common/host/hmem_local.h | 20 + + .../hive_isp_css_common/host/hmem_private.h | 30 + + .../hive_isp_css_common/host/input_formatter.c | 227 + + .../host/input_formatter_local.h | 120 + + .../host/input_formatter_private.h | 46 + + .../hive_isp_css_common/host/input_system.c | 1823 +++ + .../hive_isp_css_common/host/input_system_local.h | 533 + + .../host/input_system_private.h | 116 + + .../css2400/hive_isp_css_common/host/irq.c | 448 + + .../css2400/hive_isp_css_common/host/irq_local.h | 136 + + .../css2400/hive_isp_css_common/host/irq_private.h | 44 + + .../css2400/hive_isp_css_common/host/isp.c | 129 + + .../css2400/hive_isp_css_common/host/isp_local.h | 57 + + .../css2400/hive_isp_css_common/host/isp_private.h | 157 + + .../css2400/hive_isp_css_common/host/mmu.c | 50 + + .../css2400/hive_isp_css_common/host/mmu_local.h | 20 + + .../css2400/hive_isp_css_common/host/mmu_private.h | 44 + + .../atomisp2/css2400/hive_isp_css_common/host/sp.c | 81 + + .../css2400/hive_isp_css_common/host/sp_local.h | 101 + + .../css2400/hive_isp_css_common/host/sp_private.h | 163 + + .../hive_isp_css_common/host/system_local.h | 306 + + .../css2400/hive_isp_css_common/host/timed_ctrl.c | 74 + + .../hive_isp_css_common/host/timed_ctrl_local.h | 20 + + .../hive_isp_css_common/host/timed_ctrl_private.h | 34 + + .../css2400/hive_isp_css_common/host/vamem_local.h | 20 + + .../hive_isp_css_common/host/vamem_private.h | 37 + + .../css2400/hive_isp_css_common/host/vmem.c | 258 + + .../css2400/hive_isp_css_common/host/vmem_local.h | 55 + + .../hive_isp_css_common/host/vmem_private.h | 20 + + .../hive_isp_css_common/input_formatter_global.h | 130 + + .../hive_isp_css_common/input_system_global.h | 155 + + .../css2400/hive_isp_css_common/irq_global.h | 45 + + .../css2400/hive_isp_css_common/isp_global.h | 115 + + .../css2400/hive_isp_css_common/mmu_global.h | 22 + + .../css2400/hive_isp_css_common/resource_global.h | 35 + + .../css2400/hive_isp_css_common/sp_global.h | 93 + + .../css2400/hive_isp_css_common/system_global.h | 348 + + .../hive_isp_css_common/timed_ctrl_global.h | 56 + + .../css2400/hive_isp_css_common/vamem_global.h | 34 + + .../css2400/hive_isp_css_common/vmem_global.h | 28 + + .../css2400/hive_isp_css_common/xmem_global.h | 20 + + .../css2400/hive_isp_css_include/assert_support.h | 103 + + .../atomisp2/css2400/hive_isp_css_include/bamem.h | 47 + + .../css2400/hive_isp_css_include/bbb_config.h | 27 + + .../css2400/hive_isp_css_include/bitop_support.h | 25 + + .../css2400/hive_isp_css_include/cpu_mem_support.h | 59 + + .../atomisp2/css2400/hive_isp_css_include/csi_rx.h | 48 + + .../atomisp2/css2400/hive_isp_css_include/debug.h | 48 + + .../device_access/device_access.h | 194 + + .../atomisp2/css2400/hive_isp_css_include/dma.h | 48 + + .../css2400/hive_isp_css_include/error_support.h | 70 + + .../css2400/hive_isp_css_include/event_fifo.h | 47 + + .../css2400/hive_isp_css_include/fifo_monitor.h | 47 + + .../css2400/hive_isp_css_include/gdc_device.h | 49 + + .../css2400/hive_isp_css_include/gp_device.h | 47 + + .../css2400/hive_isp_css_include/gp_timer.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/gpio.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/hmem.h | 47 + + .../hive_isp_css_include/host/csi_rx_public.h | 135 + + .../hive_isp_css_include/host/debug_public.h | 99 + + .../css2400/hive_isp_css_include/host/dma_public.h | 73 + + .../hive_isp_css_include/host/event_fifo_public.h | 79 + + .../host/fifo_monitor_public.h | 110 + + .../css2400/hive_isp_css_include/host/gdc_public.h | 59 + + .../hive_isp_css_include/host/gp_device_public.h | 58 + + .../hive_isp_css_include/host/gp_timer_public.h | 34 + + .../hive_isp_css_include/host/gpio_public.h | 45 + + .../hive_isp_css_include/host/hmem_public.h | 32 + + .../hive_isp_css_include/host/ibuf_ctrl_public.h | 93 + + .../host/input_formatter_public.h | 115 + + .../host/input_system_public.h | 376 + + .../css2400/hive_isp_css_include/host/irq_public.h | 184 + + .../hive_isp_css_include/host/isp2400_config.h | 24 + + .../hive_isp_css_include/host/isp2500_config.h | 29 + + .../hive_isp_css_include/host/isp2600_config.h | 34 + + .../hive_isp_css_include/host/isp2601_config.h | 70 + + .../css2400/hive_isp_css_include/host/isp_config.h | 24 + + .../css2400/hive_isp_css_include/host/isp_op1w.h | 845 ++ + .../hive_isp_css_include/host/isp_op1w_types.h | 54 + + .../css2400/hive_isp_css_include/host/isp_op2w.h | 675 ++ + .../hive_isp_css_include/host/isp_op2w_types.h | 49 + + .../hive_isp_css_include/host/isp_op_count.h | 226 + + .../css2400/hive_isp_css_include/host/isp_public.h | 186 + + .../hive_isp_css_include/host/isys_dma_public.h | 38 + + .../hive_isp_css_include/host/isys_irq_public.h | 45 + + .../hive_isp_css_include/host/isys_public.h | 37 + + .../host/isys_stream2mmio_public.h | 101 + + .../css2400/hive_isp_css_include/host/mmu_public.h | 82 + + .../hive_isp_css_include/host/osys_public.h | 20 + + .../hive_isp_css_include/host/pipeline_public.h | 18 + + .../hive_isp_css_include/host/pixelgen_public.h | 79 + + .../hive_isp_css_include/host/ref_vector_func.h | 1222 ++ + .../host/ref_vector_func_types.h | 385 + + .../css2400/hive_isp_css_include/host/sp_public.h | 223 + + .../css2400/hive_isp_css_include/host/tag_public.h | 41 + + .../hive_isp_css_include/host/timed_ctrl_public.h | 59 + + .../hive_isp_css_include/host/vamem_public.h | 20 + + .../hive_isp_css_include/host/vmem_public.h | 20 + + .../css2400/hive_isp_css_include/ibuf_ctrl.h | 49 + + .../css2400/hive_isp_css_include/input_formatter.h | 47 + + .../css2400/hive_isp_css_include/input_system.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/irq.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/isp.h | 47 + + .../css2400/hive_isp_css_include/isys_dma.h | 49 + + .../css2400/hive_isp_css_include/isys_irq.h | 40 + + .../hive_isp_css_include/isys_stream2mmio.h | 49 + + .../css2400/hive_isp_css_include/math_support.h | 224 + + .../memory_access/memory_access.h | 180 + + .../css2400/hive_isp_css_include/memory_realloc.h | 38 + + .../css2400/hive_isp_css_include/misc_support.h | 26 + + .../css2400/hive_isp_css_include/mmu_device.h | 49 + + .../atomisp2/css2400/hive_isp_css_include/mpmath.h | 330 + + .../atomisp2/css2400/hive_isp_css_include/osys.h | 48 + + .../css2400/hive_isp_css_include/pixelgen.h | 49 + + .../hive_isp_css_include/platform_support.h | 42 + + .../css2400/hive_isp_css_include/print_support.h | 45 + + .../atomisp2/css2400/hive_isp_css_include/queue.h | 47 + + .../css2400/hive_isp_css_include/resource.h | 48 + + .../atomisp2/css2400/hive_isp_css_include/socket.h | 48 + + .../pci/atomisp2/css2400/hive_isp_css_include/sp.h | 47 + + .../css2400/hive_isp_css_include/storage_class.h | 34 + + .../css2400/hive_isp_css_include/stream_buffer.h | 48 + + .../css2400/hive_isp_css_include/string_support.h | 167 + + .../css2400/hive_isp_css_include/system_types.h | 25 + + .../atomisp2/css2400/hive_isp_css_include/tag.h | 46 + + .../css2400/hive_isp_css_include/timed_ctrl.h | 47 + + .../css2400/hive_isp_css_include/type_support.h | 82 + + .../atomisp2/css2400/hive_isp_css_include/vamem.h | 47 + + .../css2400/hive_isp_css_include/vector_func.h | 39 + + .../css2400/hive_isp_css_include/vector_ops.h | 32 + + .../atomisp2/css2400/hive_isp_css_include/vmem.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/xmem.h | 47 + + .../css2400/hive_isp_css_shared/host/queue_local.h | 20 + + .../hive_isp_css_shared/host/queue_private.h | 18 + + .../css2400/hive_isp_css_shared/host/tag.c | 95 + + .../css2400/hive_isp_css_shared/host/tag_local.h | 22 + + .../css2400/hive_isp_css_shared/host/tag_private.h | 18 + + .../css2400/hive_isp_css_shared/queue_global.h | 19 + + .../css2400/hive_isp_css_shared/socket_global.h | 53 + + .../hive_isp_css_shared/stream_buffer_global.h | 26 + + .../css2400/hive_isp_css_shared/sw_event_global.h | 36 + + .../css2400/hive_isp_css_shared/tag_global.h | 56 + + .../media/atomisp/pci/atomisp2/css2400/ia_css.h | 57 + + .../media/atomisp/pci/atomisp2/css2400/ia_css_3a.h | 188 + + .../pci/atomisp2/css2400/ia_css_acc_types.h | 468 + + .../atomisp/pci/atomisp2/css2400/ia_css_buffer.h | 84 + + .../atomisp/pci/atomisp2/css2400/ia_css_control.h | 157 + + .../pci/atomisp2/css2400/ia_css_device_access.c | 95 + + .../pci/atomisp2/css2400/ia_css_device_access.h | 59 + + .../atomisp/pci/atomisp2/css2400/ia_css_dvs.h | 299 + + .../atomisp/pci/atomisp2/css2400/ia_css_env.h | 94 + + .../atomisp/pci/atomisp2/css2400/ia_css_err.h | 63 + + .../pci/atomisp2/css2400/ia_css_event_public.h | 196 + + .../atomisp/pci/atomisp2/css2400/ia_css_firmware.h | 74 + + .../atomisp/pci/atomisp2/css2400/ia_css_frac.h | 37 + + .../pci/atomisp2/css2400/ia_css_frame_format.h | 101 + + .../pci/atomisp2/css2400/ia_css_frame_public.h | 365 + + .../pci/atomisp2/css2400/ia_css_host_data.h | 46 + + .../pci/atomisp2/css2400/ia_css_input_port.h | 66 + + .../atomisp/pci/atomisp2/css2400/ia_css_irq.h | 235 + + .../pci/atomisp2/css2400/ia_css_memory_access.c | 88 + + .../atomisp/pci/atomisp2/css2400/ia_css_metadata.h | 71 + + .../atomisp/pci/atomisp2/css2400/ia_css_mipi.h | 82 + + .../atomisp/pci/atomisp2/css2400/ia_css_mmu.h | 32 + + .../pci/atomisp2/css2400/ia_css_mmu_private.h | 31 + + .../atomisp/pci/atomisp2/css2400/ia_css_morph.h | 39 + + .../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 228 + + .../pci/atomisp2/css2400/ia_css_pipe_public.h | 659 ++ + .../atomisp/pci/atomisp2/css2400/ia_css_prbs.h | 53 + + .../pci/atomisp2/css2400/ia_css_properties.h | 41 + + .../atomisp/pci/atomisp2/css2400/ia_css_shading.h | 40 + + .../atomisp/pci/atomisp2/css2400/ia_css_stream.h | 110 + + .../pci/atomisp2/css2400/ia_css_stream_format.h | 94 + + .../pci/atomisp2/css2400/ia_css_stream_public.h | 582 + + .../atomisp/pci/atomisp2/css2400/ia_css_timer.h | 84 + + .../atomisp/pci/atomisp2/css2400/ia_css_tpg.h | 78 + + .../atomisp/pci/atomisp2/css2400/ia_css_types.h | 654 ++ + .../atomisp/pci/atomisp2/css2400/ia_css_version.h | 40 + + .../pci/atomisp2/css2400/ia_css_version_data.h | 33 + + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c | 32 + + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h | 27 + + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h | 24 + + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2_state.h | 41 + + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h | 48 + + .../isp/kernels/anr/anr_1.0/ia_css_anr.host.c | 60 + + .../isp/kernels/anr/anr_1.0/ia_css_anr.host.h | 39 + + .../isp/kernels/anr/anr_1.0/ia_css_anr_param.h | 25 + + .../isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 36 + + .../isp/kernels/anr/anr_2/ia_css_anr2.host.c | 46 + + .../isp/kernels/anr/anr_2/ia_css_anr2.host.h | 35 + + .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.c | 52 + + .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.h | 22 + + .../isp/kernels/anr/anr_2/ia_css_anr2_types.h | 32 + + .../isp/kernels/anr/anr_2/ia_css_anr_param.h | 27 + + .../bayer_ls_1.0/ia_css_bayer_load_param.h | 20 + + .../bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h | 42 + + .../bayer_ls_1.0/ia_css_bayer_store_param.h | 21 + + .../css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c | 66 + + .../css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h | 32 + + .../css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h | 40 + + .../css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h | 37 + + .../css2400/isp/kernels/bnlm/ia_css_bnlm.host.c | 183 + + .../css2400/isp/kernels/bnlm/ia_css_bnlm.host.h | 41 + + .../isp/kernels/bnlm/ia_css_bnlm_default.host.c | 71 + + .../isp/kernels/bnlm/ia_css_bnlm_default.host.h | 22 + + .../css2400/isp/kernels/bnlm/ia_css_bnlm_param.h | 63 + + .../css2400/isp/kernels/bnlm/ia_css_bnlm_state.h | 31 + + .../css2400/isp/kernels/bnlm/ia_css_bnlm_types.h | 106 + + .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c | 122 + + .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h | 35 + + .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h | 47 + + .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h | 71 + + .../isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c | 64 + + .../isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h | 34 + + .../isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h | 30 + + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c | 28 + + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h | 25 + + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h | 24 + + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h | 33 + + .../isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c | 76 + + .../isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h | 43 + + .../isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h | 32 + + .../isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h | 55 + + .../isp/kernels/cnr/cnr_2/ia_css_cnr_param.h | 20 + + .../isp/kernels/cnr/cnr_2/ia_css_cnr_state.h | 33 + + .../conversion_1.0/ia_css_conversion.host.c | 36 + + .../conversion_1.0/ia_css_conversion.host.h | 33 + + .../conversion_1.0/ia_css_conversion_param.h | 28 + + .../conversion_1.0/ia_css_conversion_types.h | 32 + + .../copy_output_1.0/ia_css_copy_output.host.c | 47 + + .../copy_output_1.0/ia_css_copy_output.host.h | 34 + + .../copy_output_1.0/ia_css_copy_output_param.h | 26 + + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.c | 64 + + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.h | 41 + + .../isp/kernels/crop/crop_1.0/ia_css_crop_param.h | 32 + + .../isp/kernels/crop/crop_1.0/ia_css_crop_types.h | 35 + + .../isp/kernels/csc/csc_1.0/ia_css_csc.host.c | 132 + + .../isp/kernels/csc/csc_1.0/ia_css_csc.host.h | 54 + + .../isp/kernels/csc/csc_1.0/ia_css_csc_param.h | 34 + + .../isp/kernels/csc/csc_1.0/ia_css_csc_types.h | 78 + + .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c | 120 + + .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h | 33 + + .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h | 46 + + .../isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h | 20 + + .../isp/kernels/ctc/ctc2/ia_css_ctc2.host.c | 156 + + .../isp/kernels/ctc/ctc2/ia_css_ctc2.host.h | 33 + + .../isp/kernels/ctc/ctc2/ia_css_ctc2_param.h | 49 + + .../isp/kernels/ctc/ctc2/ia_css_ctc2_types.h | 55 + + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c | 63 + + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h | 36 + + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h | 44 + + .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c | 215 + + .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h | 24 + + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h | 110 + + .../css2400/isp/kernels/de/de_1.0/ia_css_de.host.c | 79 + + .../css2400/isp/kernels/de/de_1.0/ia_css_de.host.h | 44 + + .../isp/kernels/de/de_1.0/ia_css_de_param.h | 27 + + .../isp/kernels/de/de_1.0/ia_css_de_state.h | 26 + + .../isp/kernels/de/de_1.0/ia_css_de_types.h | 43 + + .../css2400/isp/kernels/de/de_2/ia_css_de2.host.c | 54 + + .../css2400/isp/kernels/de/de_2/ia_css_de2.host.h | 38 + + .../css2400/isp/kernels/de/de_2/ia_css_de2_param.h | 30 + + .../css2400/isp/kernels/de/de_2/ia_css_de2_types.h | 42 + + .../css2400/isp/kernels/de/de_2/ia_css_de_param.h | 20 + + .../css2400/isp/kernels/de/de_2/ia_css_de_state.h | 21 + + .../css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c | 132 + + .../css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h | 47 + + .../isp/kernels/dp/dp_1.0/ia_css_dp_param.h | 36 + + .../isp/kernels/dp/dp_1.0/ia_css_dp_state.h | 36 + + .../isp/kernels/dp/dp_1.0/ia_css_dp_types.h | 50 + + .../css2400/isp/kernels/dpc2/ia_css_dpc2.host.c | 65 + + .../css2400/isp/kernels/dpc2/ia_css_dpc2.host.h | 40 + + .../isp/kernels/dpc2/ia_css_dpc2_default.host.c | 26 + + .../isp/kernels/dpc2/ia_css_dpc2_default.host.h | 23 + + .../css2400/isp/kernels/dpc2/ia_css_dpc2_param.h | 53 + + .../css2400/isp/kernels/dpc2/ia_css_dpc2_state.h | 30 + + .../css2400/isp/kernels/dpc2/ia_css_dpc2_types.h | 59 + + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 306 + + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 60 + + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h | 39 + + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h | 30 + + .../isp/kernels/eed1_8/ia_css_eed1_8.host.c | 321 + + .../isp/kernels/eed1_8/ia_css_eed1_8.host.h | 46 + + .../kernels/eed1_8/ia_css_eed1_8_default.host.c | 94 + + .../kernels/eed1_8/ia_css_eed1_8_default.host.h | 22 + + .../isp/kernels/eed1_8/ia_css_eed1_8_param.h | 154 + + .../isp/kernels/eed1_8/ia_css_eed1_8_state.h | 40 + + .../isp/kernels/eed1_8/ia_css_eed1_8_types.h | 86 + + .../isp/kernels/fc/fc_1.0/ia_css_formats.host.c | 62 + + .../isp/kernels/fc/fc_1.0/ia_css_formats.host.h | 45 + + .../isp/kernels/fc/fc_1.0/ia_css_formats_param.h | 25 + + .../isp/kernels/fc/fc_1.0/ia_css_formats_types.h | 38 + + .../fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h | 33 + + .../fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h | 26 + + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 89 + + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h | 44 + + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h | 35 + + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h | 52 + + .../css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c | 118 + + .../css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h | 65 + + .../isp/kernels/gc/gc_1.0/ia_css_gc_param.h | 61 + + .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c | 214 + + .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h | 24 + + .../isp/kernels/gc/gc_1.0/ia_css_gc_types.h | 97 + + .../css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c | 110 + + .../css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h | 79 + + .../css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h | 43 + + .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.c | 132 + + .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.h | 26 + + .../css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h | 54 + + .../css2400/isp/kernels/hdr/ia_css_hdr.host.c | 41 + + .../css2400/isp/kernels/hdr/ia_css_hdr.host.h | 31 + + .../css2400/isp/kernels/hdr/ia_css_hdr_param.h | 53 + + .../css2400/isp/kernels/hdr/ia_css_hdr_types.h | 64 + + .../io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 86 + + .../io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 31 + + .../io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 22 + + .../io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 22 + + .../kernels/io_ls/common/ia_css_common_io_param.h | 22 + + .../kernels/io_ls/common/ia_css_common_io_types.h | 31 + + .../io_ls/plane_io_ls/ia_css_plane_io_param.h | 22 + + .../io_ls/plane_io_ls/ia_css_plane_io_types.h | 30 + + .../io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h | 22 + + .../io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h | 22 + + .../io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h | 22 + + .../io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h | 22 + + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 86 + + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 31 + + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 22 + + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 22 + + .../ipu2_io_ls/common/ia_css_common_io_param.h | 22 + + .../ipu2_io_ls/common/ia_css_common_io_types.h | 31 + + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h | 22 + + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h | 30 + + .../yuv420_io_ls/ia_css_yuv420_io_param.h | 22 + + .../yuv420_io_ls/ia_css_yuv420_io_types.h | 22 + + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 86 + + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 31 + + .../yuv444_io_ls/ia_css_yuv444_io_param.h | 22 + + .../yuv444_io_ls/ia_css_yuv444_io_types.h | 22 + + .../iterator/iterator_1.0/ia_css_iterator.host.c | 80 + + .../iterator/iterator_1.0/ia_css_iterator.host.h | 34 + + .../iterator/iterator_1.0/ia_css_iterator_param.h | 38 + + .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c | 74 + + .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h | 41 + + .../kernels/macc/macc1_5/ia_css_macc1_5_param.h | 31 + + .../macc/macc1_5/ia_css_macc1_5_table.host.c | 32 + + .../macc/macc1_5/ia_css_macc1_5_table.host.h | 22 + + .../kernels/macc/macc1_5/ia_css_macc1_5_types.h | 74 + + .../isp/kernels/macc/macc_1.0/ia_css_macc.host.c | 49 + + .../isp/kernels/macc/macc_1.0/ia_css_macc.host.h | 42 + + .../isp/kernels/macc/macc_1.0/ia_css_macc_param.h | 25 + + .../kernels/macc/macc_1.0/ia_css_macc_table.host.c | 47 + + .../kernels/macc/macc_1.0/ia_css_macc_table.host.h | 23 + + .../isp/kernels/macc/macc_1.0/ia_css_macc_types.h | 63 + + .../isp/kernels/norm/norm_1.0/ia_css_norm.host.c | 16 + + .../isp/kernels/norm/norm_1.0/ia_css_norm.host.h | 20 + + .../isp/kernels/norm/norm_1.0/ia_css_norm_param.h | 19 + + .../isp/kernels/norm/norm_1.0/ia_css_norm_types.h | 21 + + .../css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c | 79 + + .../css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h | 40 + + .../css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h | 29 + + .../css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h | 45 + + .../css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c | 159 + + .../css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h | 53 + + .../isp/kernels/ob/ob_1.0/ia_css_ob_param.h | 48 + + .../isp/kernels/ob/ob_1.0/ia_css_ob_types.h | 69 + + .../kernels/output/output_1.0/ia_css_output.host.c | 162 + + .../kernels/output/output_1.0/ia_css_output.host.h | 75 + + .../output/output_1.0/ia_css_output_param.h | 36 + + .../output/output_1.0/ia_css_output_types.h | 48 + + .../kernels/qplane/qplane_2/ia_css_qplane.host.c | 61 + + .../kernels/qplane/qplane_2/ia_css_qplane.host.h | 43 + + .../kernels/qplane/qplane_2/ia_css_qplane_param.h | 30 + + .../kernels/qplane/qplane_2/ia_css_qplane_types.h | 33 + + .../isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 136 + + .../isp/kernels/raw/raw_1.0/ia_css_raw.host.h | 38 + + .../isp/kernels/raw/raw_1.0/ia_css_raw_param.h | 38 + + .../isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 37 + + .../raw_aa_binning_1.0/ia_css_raa.host.c | 35 + + .../raw_aa_binning_1.0/ia_css_raa.host.h | 27 + + .../isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 74 + + .../isp/kernels/ref/ref_1.0/ia_css_ref.host.h | 41 + + .../isp/kernels/ref/ref_1.0/ia_css_ref_param.h | 36 + + .../isp/kernels/ref/ref_1.0/ia_css_ref_state.h | 26 + + .../isp/kernels/ref/ref_1.0/ia_css_ref_types.h | 28 + + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 386 + + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h | 77 + + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h | 54 + + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 266 + + .../kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h | 45 + + .../s3a_stat_ls/ia_css_s3a_stat_store_param.h | 21 + + .../css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c | 130 + + .../css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 77 + + .../isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 71 + + .../isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 136 + + .../kernels/scale/scale_1.0/ia_css_scale_param.h | 20 + + .../kernels/sdis/common/ia_css_sdis_common.host.h | 99 + + .../kernels/sdis/common/ia_css_sdis_common_types.h | 232 + + .../isp/kernels/sdis/common/ia_css_sdis_param.h | 22 + + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 424 + + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h | 101 + + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h | 21 + + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h | 53 + + .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 338 + + .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h | 95 + + .../isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h | 69 + + .../isp/kernels/sdis/sdis_2/ia_css_sdis_param.h | 21 + + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 76 + + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 39 + + .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c | 36 + + .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h | 23 + + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h | 43 + + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h | 53 + + .../isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 61 + + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 130 + + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h | 56 + + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 48 + + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h | 26 + + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h | 60 + + .../isp/kernels/uds/uds_1.0/ia_css_uds_param.h | 31 + + .../css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 140 + + .../css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 47 + + .../isp/kernels/vf/vf_1.0/ia_css_vf_param.h | 37 + + .../isp/kernels/vf/vf_1.0/ia_css_vf_types.h | 32 + + .../css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c | 89 + + .../css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h | 39 + + .../isp/kernels/wb/wb_1.0/ia_css_wb_param.h | 29 + + .../isp/kernels/wb/wb_1.0/ia_css_wb_types.h | 47 + + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c | 66 + + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h | 47 + + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 51 + + .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c | 81 + + .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h | 22 + + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h | 71 + + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c | 265 + + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h | 42 + + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h | 96 + + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 98 + + .../xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h | 20 + + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c | 219 + + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h | 60 + + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h | 49 + + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h | 26 + + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h | 81 + + .../isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c | 125 + + .../isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h | 56 + + .../isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h | 45 + + .../isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h | 94 + + .../isp/kernels/ynr/ynr_2/ia_css_ynr_param.h | 20 + + .../isp/kernels/ynr/ynr_2/ia_css_ynr_state.h | 21 + + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h | 20 + + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h | 39 + + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h | 21 + + .../css2400/isp/modes/interface/input_buf.isp.h | 73 + + .../css2400/isp/modes/interface/isp_const.h | 498 + + .../css2400/isp/modes/interface/isp_exprs.h | 309 + + .../css2400/isp/modes/interface/isp_types.h | 128 + + .../atomisp/pci/atomisp2/css2400/memory_realloc.c | 81 + + .../runtime/binary/interface/ia_css_binary.h | 333 + + .../atomisp2/css2400/runtime/binary/src/binary.c | 1873 +++ + .../css2400/runtime/bufq/interface/ia_css_bufq.h | 197 + + .../runtime/bufq/interface/ia_css_bufq_comm.h | 66 + + .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 590 + + .../css2400/runtime/debug/interface/ia_css_debug.h | 508 + + .../debug/interface/ia_css_debug_internal.h | 31 + + .../runtime/debug/interface/ia_css_debug_pipe.h | 84 + + .../css2400/runtime/debug/src/ia_css_debug.c | 3611 ++++++ + .../css2400/runtime/event/interface/ia_css_event.h | 46 + + .../pci/atomisp2/css2400/runtime/event/src/event.c | 126 + + .../runtime/eventq/interface/ia_css_eventq.h | 69 + + .../atomisp2/css2400/runtime/eventq/src/eventq.c | 77 + + .../css2400/runtime/frame/interface/ia_css_frame.h | 180 + + .../runtime/frame/interface/ia_css_frame_comm.h | 132 + + .../pci/atomisp2/css2400/runtime/frame/src/frame.c | 1026 ++ + .../css2400/runtime/ifmtr/interface/ia_css_ifmtr.h | 49 + + .../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 568 + + .../runtime/inputfifo/interface/ia_css_inputfifo.h | 69 + + .../css2400/runtime/inputfifo/src/inputfifo.c | 613 + + .../runtime/isp_param/interface/ia_css_isp_param.h | 118 + + .../isp_param/interface/ia_css_isp_param_types.h | 107 + + .../css2400/runtime/isp_param/src/isp_param.c | 227 + + .../css2400/runtime/isys/interface/ia_css_isys.h | 201 + + .../runtime/isys/interface/ia_css_isys_comm.h | 69 + + .../css2400/runtime/isys/src/csi_rx_rmgr.c | 179 + + .../css2400/runtime/isys/src/csi_rx_rmgr.h | 43 + + .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.c | 141 + + .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.h | 55 + + .../css2400/runtime/isys/src/isys_dma_rmgr.c | 103 + + .../css2400/runtime/isys/src/isys_dma_rmgr.h | 41 + + .../atomisp2/css2400/runtime/isys/src/isys_init.c | 141 + + .../runtime/isys/src/isys_stream2mmio_rmgr.c | 105 + + .../runtime/isys/src/isys_stream2mmio_rmgr.h | 41 + + .../pci/atomisp2/css2400/runtime/isys/src/rx.c | 607 + + .../css2400/runtime/isys/src/virtual_isys.c | 898 ++ + .../css2400/runtime/isys/src/virtual_isys.h | 41 + + .../runtime/pipeline/interface/ia_css_pipeline.h | 308 + + .../pipeline/interface/ia_css_pipeline_common.h | 42 + + .../css2400/runtime/pipeline/src/pipeline.c | 806 ++ + .../css2400/runtime/queue/interface/ia_css_queue.h | 192 + + .../runtime/queue/interface/ia_css_queue_comm.h | 69 + + .../pci/atomisp2/css2400/runtime/queue/src/queue.c | 412 + + .../css2400/runtime/queue/src/queue_access.c | 192 + + .../css2400/runtime/queue/src/queue_access.h | 101 + + .../css2400/runtime/rmgr/interface/ia_css_rmgr.h | 89 + + .../runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 115 + + .../pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c | 55 + + .../atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 330 + + .../runtime/spctrl/interface/ia_css_spctrl.h | 87 + + .../runtime/spctrl/interface/ia_css_spctrl_comm.h | 61 + + .../atomisp2/css2400/runtime/spctrl/src/spctrl.c | 199 + + .../tagger/interface/ia_css_tagger_common.h | 59 + + .../pci/atomisp2/css2400/runtime/timer/src/timer.c | 48 + + .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 11364 +++++++++++++++++++ + .../atomisp/pci/atomisp2/css2400/sh_css_defs.h | 410 + + .../atomisp/pci/atomisp2/css2400/sh_css_dvs_info.h | 36 + + .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 342 + + .../atomisp/pci/atomisp2/css2400/sh_css_firmware.h | 54 + + .../atomisp/pci/atomisp2/css2400/sh_css_frac.h | 40 + + .../pci/atomisp2/css2400/sh_css_host_data.c | 42 + + .../atomisp/pci/atomisp2/css2400/sh_css_hrt.c | 84 + + .../atomisp/pci/atomisp2/css2400/sh_css_hrt.h | 34 + + .../atomisp/pci/atomisp2/css2400/sh_css_internal.h | 1096 ++ + .../atomisp/pci/atomisp2/css2400/sh_css_irq.c | 16 + + .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 88 + + .../atomisp/pci/atomisp2/css2400/sh_css_metadata.c | 16 + + .../atomisp/pci/atomisp2/css2400/sh_css_metrics.c | 176 + + .../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 76 + + .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 749 ++ + .../atomisp/pci/atomisp2/css2400/sh_css_mipi.h | 49 + + .../atomisp/pci/atomisp2/css2400/sh_css_mmu.c | 62 + + .../atomisp/pci/atomisp2/css2400/sh_css_morph.c | 16 + + .../pci/atomisp2/css2400/sh_css_param_dvs.c | 267 + + .../pci/atomisp2/css2400/sh_css_param_dvs.h | 86 + + .../pci/atomisp2/css2400/sh_css_param_shading.c | 419 + + .../pci/atomisp2/css2400/sh_css_param_shading.h | 39 + + .../atomisp/pci/atomisp2/css2400/sh_css_params.c | 5268 +++++++++ + .../atomisp/pci/atomisp2/css2400/sh_css_params.h | 188 + + .../pci/atomisp2/css2400/sh_css_params_internal.h | 21 + + .../atomisp/pci/atomisp2/css2400/sh_css_pipe.c | 16 + + .../pci/atomisp2/css2400/sh_css_properties.c | 43 + + .../atomisp/pci/atomisp2/css2400/sh_css_shading.c | 16 + + .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 1814 +++ + .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.h | 248 + + .../atomisp/pci/atomisp2/css2400/sh_css_stream.c | 16 + + .../pci/atomisp2/css2400/sh_css_stream_format.c | 76 + + .../pci/atomisp2/css2400/sh_css_stream_format.h | 23 + + .../atomisp/pci/atomisp2/css2400/sh_css_struct.h | 80 + + .../atomisp/pci/atomisp2/css2400/sh_css_uds.h | 37 + + .../atomisp/pci/atomisp2/css2400/sh_css_version.c | 30 + + .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 738 ++ + .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 1543 +++ + .../media/atomisp/pci/atomisp2/hmm/hmm_bo_dev.c | 333 + + .../atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c | 241 + + .../atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c | 258 + + .../media/atomisp/pci/atomisp2/hmm/hmm_vm.c | 218 + + .../media/atomisp/pci/atomisp2/hrt/device_access.c | 116 + + .../atomisp2/hrt/hive_isp_css_custom_host_hrt.h | 107 + + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 182 + + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h | 85 + + .../media/atomisp/pci/atomisp2/hrt/memory_access.c | 110 + + .../media/atomisp/pci/atomisp2/include/hmm/hmm.h | 106 + + .../atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 323 + + .../atomisp/pci/atomisp2/include/hmm/hmm_bo_dev.h | 130 + + .../atomisp/pci/atomisp2/include/hmm/hmm_common.h | 100 + + .../atomisp/pci/atomisp2/include/hmm/hmm_pool.h | 119 + + .../atomisp/pci/atomisp2/include/hmm/hmm_vm.h | 68 + + .../atomisp/pci/atomisp2/include/mmu/isp_mmu.h | 175 + + .../atomisp/pci/atomisp2/include/mmu/sh_mmu.h | 76 + + .../pci/atomisp2/include/mmu/sh_mmu_mrfld.h | 28 + + .../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 594 + + .../media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c | 93 + + drivers/staging/media/atomisp/platform/Makefile | 6 + + .../staging/media/atomisp/platform/clock/Makefile | 6 + + .../platform/clock/platform_vlv2_plat_clk.c | 40 + + .../platform/clock/platform_vlv2_plat_clk.h | 27 + + .../media/atomisp/platform/clock/vlv2_plat_clock.c | 247 + + .../media/atomisp/platform/intel-mid/Makefile | 5 + + .../platform/intel-mid/atomisp_gmin_platform.c | 758 ++ + .../platform/intel-mid/intel_mid_pcihelpers.c | 297 + + drivers/staging/media/cxd2099/cxd2099.c | 101 +- + .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 24 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 12 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 4 +- + .../staging/media/davinci_vpfe/dm365_isif_regs.h | 20 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 6 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 4 +- + drivers/staging/most/aim-cdev/cdev.c | 16 +- + drivers/staging/most/aim-sound/sound.c | 2 +- + drivers/staging/most/hdm-dim2/dim2_hal.c | 7 +- + drivers/staging/most/hdm-usb/hdm_usb.c | 39 +- + drivers/staging/most/mostcore/core.c | 163 +- + drivers/staging/nvec/nvec-keytable.h | 3 +- + drivers/staging/nvec/nvec_kbd.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 4 +- + drivers/staging/rtl8188eu/Kconfig | 1 + + drivers/staging/rtl8188eu/core/rtw_ap.c | 25 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 15 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 135 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 39 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 16 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 11 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 37 +- + .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 2 +- + drivers/staging/rtl8188eu/hal/odm.c | 3 + + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 5 +- + drivers/staging/rtl8188eu/hal/phy.c | 1 + + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 1 + + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 3 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 17 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h | 2 +- + drivers/staging/rtl8188eu/include/drv_types.h | 2 - + drivers/staging/rtl8188eu/include/hal_intf.h | 1 - + drivers/staging/rtl8188eu/include/ieee80211.h | 6 +- + .../staging/rtl8188eu/include/odm_RegDefine11N.h | 4 +- + drivers/staging/rtl8188eu/include/odm_debug.h | 2 +- + drivers/staging/rtl8188eu/include/pwrseq.h | 2 +- + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_cmd.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 6 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 1 - + .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_recv.h | 4 +- + drivers/staging/rtl8188eu/include/rtw_security.h | 2 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 7 - + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 34 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 2 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 80 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 17 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 22 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.h | 2 +- + drivers/staging/rtl8192e/rtl819x_BA.h | 2 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 4 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- + drivers/staging/rtl8192e/rtl819x_Qos.h | 2 +- + drivers/staging/rtl8192e/rtl819x_TS.h | 2 +- + drivers/staging/rtl8192e/rtllib.h | 6 +- + drivers/staging/rtl8192e/rtllib_debug.h | 2 +- + drivers/staging/rtl8192e/rtllib_module.c | 52 +- + drivers/staging/rtl8192e/rtllib_wx.c | 54 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 6 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 3 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 60 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 6 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 6 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 4 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 4 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 15 +- + drivers/staging/rtl8192u/r8192U.h | 4 +- + drivers/staging/rtl8192u/r8192U_core.c | 10 +- + drivers/staging/rtl8192u/r8192U_dm.c | 21 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 +- + drivers/staging/rtl8712/ieee80211.c | 5 +- + drivers/staging/rtl8712/mlme_linux.c | 10 +- + drivers/staging/rtl8712/os_intfs.c | 14 +- + drivers/staging/rtl8712/rtl8712_led.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 11 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 2 +- + drivers/staging/rtl8712/rtl871x_event.h | 8 +- + drivers/staging/rtl8712/rtl871x_io.h | 14 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 143 +- + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 10 +- + drivers/staging/rtl8712/rtl871x_mlme.h | 16 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 191 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 10 +- + drivers/staging/rtl8712/rtl871x_recv.h | 12 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 11 +- + drivers/staging/rtl8712/wifi.h | 12 +- + drivers/staging/rtl8712/wlan_bssdef.h | 6 +- + drivers/staging/rtl8723bs/Kconfig | 11 + + drivers/staging/rtl8723bs/Makefile | 70 + + drivers/staging/rtl8723bs/TODO | 16 + + drivers/staging/rtl8723bs/core/rtw_ap.c | 2678 +++++ + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 243 + + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2224 ++++ + drivers/staging/rtl8723bs/core/rtw_debug.c | 1452 +++ + drivers/staging/rtl8723bs/core/rtw_eeprom.c | 369 + + drivers/staging/rtl8723bs/core/rtw_efuse.c | 635 ++ + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 1430 +++ + drivers/staging/rtl8723bs/core/rtw_io.c | 203 + + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 698 ++ + drivers/staging/rtl8723bs/core/rtw_mlme.c | 3150 +++++ + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6941 +++++++++++ + drivers/staging/rtl8723bs/core/rtw_odm.c | 197 + + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 1421 +++ + drivers/staging/rtl8723bs/core/rtw_recv.c | 2688 +++++ + drivers/staging/rtl8723bs/core/rtw_rf.c | 64 + + drivers/staging/rtl8723bs/core/rtw_security.c | 2437 ++++ + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 641 ++ + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2328 ++++ + drivers/staging/rtl8723bs/core/rtw_xmit.c | 3100 +++++ + drivers/staging/rtl8723bs/hal/Hal8723BPwrSeq.c | 138 + + drivers/staging/rtl8723bs/hal/Hal8723BReg.h | 442 + + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 3779 ++++++ + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 193 + + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 3729 ++++++ + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 155 + + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 565 + + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 643 ++ + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h | 48 + + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 302 + + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h | 28 + + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 799 ++ + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h | 49 + + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 662 ++ + drivers/staging/rtl8723bs/hal/HalPhyRf.h | 63 + + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 2091 ++++ + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h | 83 + + drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 205 + + drivers/staging/rtl8723bs/hal/Mp_Precomp.h | 33 + + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 1720 +++ + drivers/staging/rtl8723bs/hal/hal_com.c | 1751 +++ + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 3286 ++++++ + drivers/staging/rtl8723bs/hal/hal_intf.c | 474 + + drivers/staging/rtl8723bs/hal/hal_phy.c | 224 + + drivers/staging/rtl8723bs/hal/hal_sdio.c | 115 + + drivers/staging/rtl8723bs/hal/odm.c | 1446 +++ + drivers/staging/rtl8723bs/hal/odm.h | 1465 +++ + drivers/staging/rtl8723bs/hal/odm_AntDiv.c | 70 + + drivers/staging/rtl8723bs/hal/odm_AntDiv.h | 38 + + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 338 + + drivers/staging/rtl8723bs/hal/odm_CfoTracking.h | 47 + + drivers/staging/rtl8723bs/hal/odm_DIG.c | 1221 ++ + drivers/staging/rtl8723bs/hal/odm_DIG.h | 195 + + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.c | 89 + + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.h | 39 + + drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c | 30 + + drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h | 37 + + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 186 + + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.h | 31 + + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 535 + + drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 162 + + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 175 + + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h | 47 + + drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 42 + + drivers/staging/rtl8723bs/hal/odm_PathDiv.h | 29 + + drivers/staging/rtl8723bs/hal/odm_RTL8723B.c | 45 + + drivers/staging/rtl8723bs/hal/odm_RTL8723B.h | 22 + + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 257 + + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h | 65 + + drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h | 172 + + drivers/staging/rtl8723bs/hal/odm_debug.c | 52 + + drivers/staging/rtl8723bs/hal/odm_debug.h | 165 + + drivers/staging/rtl8723bs/hal/odm_interface.h | 59 + + drivers/staging/rtl8723bs/hal/odm_precomp.h | 60 + + drivers/staging/rtl8723bs/hal/odm_reg.h | 103 + + drivers/staging/rtl8723bs/hal/odm_types.h | 102 + + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2358 ++++ + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 300 + + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4545 ++++++++ + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 1050 ++ + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 224 + + drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c | 86 + + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 490 + + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 686 ++ + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1928 ++++ + drivers/staging/rtl8723bs/hal/sdio_ops.c | 1294 +++ + drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h | 1126 ++ + drivers/staging/rtl8723bs/include/Hal8723BPhyCfg.h | 128 + + drivers/staging/rtl8723bs/include/Hal8723BPhyReg.h | 77 + + drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h | 232 + + drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h | 132 + + drivers/staging/rtl8723bs/include/HalVerDef.h | 127 + + drivers/staging/rtl8723bs/include/autoconf.h | 71 + + drivers/staging/rtl8723bs/include/basic_types.h | 209 + + drivers/staging/rtl8723bs/include/cmd_osdep.h | 26 + + drivers/staging/rtl8723bs/include/drv_conf.h | 37 + + drivers/staging/rtl8723bs/include/drv_types.h | 720 ++ + drivers/staging/rtl8723bs/include/drv_types_sdio.h | 39 + + drivers/staging/rtl8723bs/include/ethernet.h | 22 + + drivers/staging/rtl8723bs/include/hal_btcoex.h | 68 + + drivers/staging/rtl8723bs/include/hal_com.h | 309 + + drivers/staging/rtl8723bs/include/hal_com_h2c.h | 293 + + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 273 + + drivers/staging/rtl8723bs/include/hal_com_reg.h | 1725 +++ + drivers/staging/rtl8723bs/include/hal_data.h | 483 + + drivers/staging/rtl8723bs/include/hal_intf.h | 410 + + drivers/staging/rtl8723bs/include/hal_pg.h | 81 + + drivers/staging/rtl8723bs/include/hal_phy.h | 183 + + drivers/staging/rtl8723bs/include/hal_phy_reg.h | 25 + + drivers/staging/rtl8723bs/include/hal_sdio.h | 26 + + drivers/staging/rtl8723bs/include/ieee80211.h | 1345 +++ + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 128 + + drivers/staging/rtl8723bs/include/mlme_osdep.h | 27 + + drivers/staging/rtl8723bs/include/osdep_intf.h | 88 + + drivers/staging/rtl8723bs/include/osdep_service.h | 281 + + .../rtl8723bs/include/osdep_service_linux.h | 178 + + drivers/staging/rtl8723bs/include/recv_osdep.h | 48 + + drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 50 + + drivers/staging/rtl8723bs/include/rtl8192c_rf.h | 39 + + drivers/staging/rtl8723bs/include/rtl8723b_cmd.h | 199 + + drivers/staging/rtl8723bs/include/rtl8723b_dm.h | 41 + + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 279 + + drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 144 + + drivers/staging/rtl8723bs/include/rtl8723b_rf.h | 26 + + drivers/staging/rtl8723bs/include/rtl8723b_spec.h | 262 + + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 458 + + drivers/staging/rtl8723bs/include/rtw_ap.h | 47 + + .../staging/rtl8723bs/include/rtw_beamforming.h | 135 + + drivers/staging/rtl8723bs/include/rtw_br_ext.h | 63 + + drivers/staging/rtl8723bs/include/rtw_btcoex.h | 64 + + drivers/staging/rtl8723bs/include/rtw_byteorder.h | 24 + + drivers/staging/rtl8723bs/include/rtw_cmd.h | 980 ++ + drivers/staging/rtl8723bs/include/rtw_debug.h | 355 + + drivers/staging/rtl8723bs/include/rtw_eeprom.h | 128 + + drivers/staging/rtl8723bs/include/rtw_efuse.h | 132 + + drivers/staging/rtl8723bs/include/rtw_event.h | 117 + + drivers/staging/rtl8723bs/include/rtw_ht.h | 118 + + drivers/staging/rtl8723bs/include/rtw_io.h | 373 + + drivers/staging/rtl8723bs/include/rtw_ioctl.h | 80 + + drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 41 + + drivers/staging/rtl8723bs/include/rtw_mlme.h | 695 ++ + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 888 ++ + drivers/staging/rtl8723bs/include/rtw_mp.h | 512 + + drivers/staging/rtl8723bs/include/rtw_odm.h | 36 + + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 375 + + drivers/staging/rtl8723bs/include/rtw_qos.h | 27 + + drivers/staging/rtl8723bs/include/rtw_recv.h | 553 + + drivers/staging/rtl8723bs/include/rtw_rf.h | 159 + + drivers/staging/rtl8723bs/include/rtw_security.h | 440 + + drivers/staging/rtl8723bs/include/rtw_version.h | 2 + + drivers/staging/rtl8723bs/include/rtw_wifi_regd.h | 28 + + drivers/staging/rtl8723bs/include/rtw_xmit.h | 528 + + drivers/staging/rtl8723bs/include/sdio_hal.h | 28 + + drivers/staging/rtl8723bs/include/sdio_ops.h | 49 + + drivers/staging/rtl8723bs/include/sdio_ops_linux.h | 40 + + drivers/staging/rtl8723bs/include/sdio_osintf.h | 24 + + drivers/staging/rtl8723bs/include/sta_info.h | 392 + + drivers/staging/rtl8723bs/include/wifi.h | 1158 ++ + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 278 + + drivers/staging/rtl8723bs/include/xmit_osdep.h | 54 + + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3582 ++++++ + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 5808 ++++++++++ + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 206 + + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1916 ++++ + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 481 + + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 365 + + drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 787 ++ + drivers/staging/rtl8723bs/os_dep/rtw_proc.h | 45 + + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 690 ++ + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 599 + + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 164 + + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 296 + + drivers/staging/rts5208/ms.c | 2 +- + drivers/staging/rts5208/rtsx_chip.c | 4 +- + drivers/staging/rts5208/rtsx_transport.c | 3 +- + drivers/staging/sm750fb/ddk750_chip.c | 16 +- + drivers/staging/sm750fb/ddk750_chip.h | 2 +- + drivers/staging/sm750fb/ddk750_display.c | 3 +- + drivers/staging/sm750fb/ddk750_display.h | 7 +- + drivers/staging/sm750fb/ddk750_dvi.c | 6 +- + drivers/staging/sm750fb/ddk750_hwi2c.c | 2 +- + drivers/staging/sm750fb/ddk750_mode.c | 107 +- + drivers/staging/sm750fb/ddk750_mode.h | 21 +- + drivers/staging/sm750fb/ddk750_power.c | 5 - + drivers/staging/sm750fb/ddk750_power.h | 3 +- + drivers/staging/sm750fb/ddk750_reg.h | 4 - + drivers/staging/sm750fb/sm750.c | 57 +- + drivers/staging/sm750fb/sm750.h | 6 +- + drivers/staging/sm750fb/sm750_accel.c | 9 +- + drivers/staging/sm750fb/sm750_cursor.c | 21 +- + drivers/staging/sm750fb/sm750_hw.c | 2 +- + drivers/staging/speakup/buffers.c | 36 +- + drivers/staging/speakup/fakekey.c | 2 +- + drivers/staging/speakup/i18n.c | 77 +- + drivers/staging/speakup/keyhelp.c | 14 +- + drivers/staging/speakup/kobjects.c | 96 +- + drivers/staging/speakup/main.c | 309 +- + drivers/staging/speakup/selection.c | 6 +- + drivers/staging/speakup/serialio.c | 108 +- + drivers/staging/speakup/speakup.h | 15 +- + drivers/staging/speakup/speakup_acntpc.c | 21 +- + drivers/staging/speakup/speakup_acntsa.c | 5 +- + drivers/staging/speakup/speakup_apollo.c | 15 +- + drivers/staging/speakup/speakup_audptr.c | 16 +- + drivers/staging/speakup/speakup_bns.c | 3 +- + drivers/staging/speakup/speakup_decext.c | 24 +- + drivers/staging/speakup/speakup_decpc.c | 119 +- + drivers/staging/speakup/speakup_dectlk.c | 22 +- + drivers/staging/speakup/speakup_dtlk.c | 6 +- + drivers/staging/speakup/speakup_dtlk.h | 10 +- + drivers/staging/speakup/speakup_dummy.c | 3 +- + drivers/staging/speakup/speakup_keypc.c | 9 +- + drivers/staging/speakup/speakup_ltlk.c | 7 +- + drivers/staging/speakup/speakup_soft.c | 93 +- + drivers/staging/speakup/speakup_spkout.c | 12 +- + drivers/staging/speakup/speakup_txprt.c | 3 +- + drivers/staging/speakup/spk_priv.h | 17 +- + drivers/staging/speakup/spk_types.h | 11 +- + drivers/staging/speakup/synth.c | 105 +- + drivers/staging/speakup/varhandlers.c | 18 +- + drivers/staging/unisys/include/channel.h | 213 +- + drivers/staging/unisys/include/iochannel.h | 87 +- + drivers/staging/unisys/include/visorbus.h | 8 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 208 +- + drivers/staging/unisys/visorbus/vbuschannel.h | 57 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 388 +- + drivers/staging/unisys/visorbus/visorbus_private.h | 26 +- + drivers/staging/unisys/visorbus/visorchannel.c | 60 +- + drivers/staging/unisys/visorbus/visorchipset.c | 835 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 73 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 87 +- + drivers/staging/unisys/visorinput/visorinput.c | 21 +- + drivers/staging/unisys/visornic/visornic_main.c | 258 +- + drivers/staging/vc04_services/Kconfig | 32 +- + drivers/staging/vc04_services/Makefile | 3 + + .../staging/vc04_services/bcm2835-audio/Kconfig | 8 + + .../{ => vc04_services}/bcm2835-audio/Makefile | 0 + .../staging/{ => vc04_services}/bcm2835-audio/TODO | 0 + .../bcm2835-audio/bcm2835-ctl.c | 113 +- + .../bcm2835-audio/bcm2835-pcm.c | 70 +- + .../bcm2835-audio/bcm2835-vchiq.c | 175 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 472 + + .../{ => vc04_services}/bcm2835-audio/bcm2835.h | 34 +- + .../bcm2835-audio/vc_vchi_audioserv_defs.h | 0 + .../bcm2835-camera}/Kconfig | 7 +- + .../bcm2835-camera}/Makefile | 0 + .../bcm2835 => vc04_services/bcm2835-camera}/TODO | 5 - + .../bcm2835-camera}/bcm2835-camera.c | 136 +- + .../bcm2835-camera}/bcm2835-camera.h | 6 +- + .../bcm2835-camera}/controls.c | 34 +- + .../bcm2835-camera}/mmal-common.h | 0 + .../bcm2835-camera}/mmal-encodings.h | 1 - + .../bcm2835-camera}/mmal-msg-common.h | 0 + .../bcm2835-camera}/mmal-msg-format.h | 30 +- + .../bcm2835-camera}/mmal-msg-port.h | 16 +- + .../bcm2835-camera}/mmal-msg.h | 49 +- + .../bcm2835-camera}/mmal-parameters.h | 2 - + .../bcm2835-camera}/mmal-vchiq.c | 267 +- + .../bcm2835-camera}/mmal-vchiq.h | 12 +- + drivers/staging/vc04_services/interface/vchi/TODO | 21 +- + .../vc04_services/interface/vchi/vchi_cfg.h | 2 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 550 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 259 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 7 +- + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 4 +- + .../interface/vchiq_arm/vchiq_ioctl.h | 2 +- + .../interface/vchiq_arm/vchiq_kern_lib.c | 4 + + .../interface/vchiq_arm/vchiq_memdrv.h | 12 - + .../interface/vchiq_arm/vchiq_pagelist.h | 3 - + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 56 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.h | 2 - + .../interface/vchiq_arm/vchiq_version.c | 16 +- + drivers/staging/vme/devices/vme_user.c | 10 +- + drivers/staging/vt6655/baseband.h | 12 +- + drivers/staging/vt6655/card.c | 25 +- + drivers/staging/vt6655/rf.h | 2 +- + drivers/staging/vt6655/rxtx.h | 10 +- + drivers/staging/vt6656/rf.c | 13 +- + drivers/staging/vt6656/usbpipe.c | 4 +- + drivers/staging/vt6656/wcmd.c | 3 - + drivers/staging/wilc1000/coreconfigurator.h | 19 +- + drivers/staging/wilc1000/host_interface.c | 57 +- + drivers/staging/wilc1000/linux_wlan.c | 7 +- + drivers/staging/wilc1000/wilc_sdio.c | 21 +- + drivers/staging/wilc1000/wilc_spi.c | 78 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 54 +- + drivers/staging/wilc1000/wilc_wlan.c | 10 +- + drivers/staging/wilc1000/wilc_wlan.h | 6 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 59 +- + drivers/staging/wlan-ng/hfa384x.h | 58 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 4 +- + drivers/staging/wlan-ng/p80211conv.c | 2 +- + drivers/staging/wlan-ng/p80211conv.h | 28 +- + drivers/staging/wlan-ng/prism2fw.c | 2 +- + drivers/staging/wlan-ng/prism2mgmt.c | 1 - + drivers/staging/wlan-ng/prism2sta.c | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 55 +- + drivers/staging/xgifb/vb_init.h | 3 +- + drivers/staging/xgifb/vb_setmode.c | 12 +- + include/linux/cma.h | 6 +- + include/linux/hid-sensor-hub.h | 2 + + include/linux/hid-sensor-ids.h | 8 + + include/linux/mfd/stm32-timers.h | 2 + + include/linux/mfd/sun4i-gpadc.h | 6 + + include/linux/sched.h | 4 - + mm/cma.c | 31 +- + mm/cma.h | 1 + + mm/cma_debug.c | 2 +- + 1713 files changed, 334422 insertions(+), 14530 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-max9611 + create mode 100644 Documentation/devicetree/bindings/iio/accel/adxl345.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/aspeed_adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/cpcap-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/ltc2497.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/max1118.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/max9611.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ltc2632.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/st,stm32-dac.txt + create mode 100644 Documentation/devicetree/bindings/iio/health/max30102.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/vl6180.txt + create mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt + create mode 100644 drivers/iio/accel/adxl345.h + create mode 100644 drivers/iio/accel/adxl345_core.c + create mode 100644 drivers/iio/accel/adxl345_i2c.c + create mode 100644 drivers/iio/accel/adxl345_spi.c + create mode 100644 drivers/iio/adc/aspeed_adc.c + create mode 100644 drivers/iio/adc/cpcap-adc.c + rename drivers/{staging => }/iio/adc/lpc32xx_adc.c (68%) + create mode 100644 drivers/iio/adc/ltc2497.c + create mode 100644 drivers/iio/adc/max1118.c + create mode 100644 drivers/iio/adc/max9611.c + create mode 100644 drivers/iio/adc/qcom-pm8xxx-xoadc.c + create mode 100644 drivers/iio/adc/qcom-vadc-common.c + create mode 100644 drivers/iio/adc/qcom-vadc-common.h + rename drivers/{staging => }/iio/adc/spear_adc.c (100%) + create mode 100644 drivers/iio/adc/sun4i-gpadc-iio.c + create mode 100644 drivers/iio/dac/ltc2632.c + create mode 100644 drivers/iio/dac/stm32-dac-core.c + create mode 100644 drivers/iio/dac/stm32-dac-core.h + create mode 100644 drivers/iio/dac/stm32-dac.c + create mode 100644 drivers/iio/health/max30102.c + create mode 100644 drivers/iio/humidity/hid-sensor-humidity.c + create mode 100644 drivers/iio/light/cros_ec_light_prox.c + create mode 100644 drivers/iio/light/vl6180.c + create mode 100644 drivers/iio/proximity/srf04.c + create mode 100644 drivers/iio/temperature/hid-sensor-temperature.c + delete mode 100644 drivers/staging/android/ion/compat_ion.c + delete mode 100644 drivers/staging/android/ion/compat_ion.h + delete mode 100644 drivers/staging/android/ion/hisilicon/Kconfig + delete mode 100644 drivers/staging/android/ion/hisilicon/Makefile + delete mode 100644 drivers/staging/android/ion/hisilicon/hi6220_ion.c + delete mode 100644 drivers/staging/android/ion/ion_dummy_driver.c + delete mode 100644 drivers/staging/android/ion/ion_of.c + delete mode 100644 drivers/staging/android/ion/ion_of.h + delete mode 100644 drivers/staging/android/ion/ion_priv.h + delete mode 100644 drivers/staging/android/ion/ion_test.c + delete mode 100644 drivers/staging/android/ion/tegra/Makefile + delete mode 100644 drivers/staging/android/ion/tegra/tegra_ion.c + delete mode 100644 drivers/staging/android/lowmemorykiller.c + delete mode 100644 drivers/staging/android/uapi/ion_test.h + delete mode 100644 drivers/staging/bcm2835-audio/Kconfig + delete mode 100644 drivers/staging/bcm2835-audio/bcm2835.c + create mode 100644 drivers/staging/fbtft/fb_sh1106.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/Makefile + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-service.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.h + create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.h + create mode 100644 drivers/staging/fsl-mc/include/dpaa2-fd.h + create mode 100644 drivers/staging/fsl-mc/include/dpaa2-global.h + create mode 100644 drivers/staging/fsl-mc/include/dpaa2-io.h + rename drivers/staging/iio/accel/{adis16201_core.c => adis16201.c} (63%) + delete mode 100644 drivers/staging/iio/accel/adis16201.h + rename drivers/staging/iio/accel/{adis16203_core.c => adis16203.c} (63%) + delete mode 100644 drivers/staging/iio/accel/adis16203.h + rename drivers/staging/iio/accel/{adis16209_core.c => adis16209.c} (62%) + delete mode 100644 drivers/staging/iio/accel/adis16209.h + rename drivers/staging/iio/accel/{adis16240_core.c => adis16240.c} (60%) + delete mode 100644 drivers/staging/iio/accel/adis16240.h + delete mode 100644 drivers/staging/iio/meter/ade7753.h + delete mode 100644 drivers/staging/iio/meter/ade7754.h + delete mode 100644 drivers/staging/iio/meter/ade7759.h + delete mode 100644 drivers/staging/lustre/lustre/include/lustre_eacl.h + create mode 100644 drivers/staging/media/atomisp/Kconfig + create mode 100644 drivers/staging/media/atomisp/Makefile + create mode 100644 drivers/staging/media/atomisp/TODO + create mode 100644 drivers/staging/media/atomisp/i2c/Kconfig + create mode 100644 drivers/staging/media/atomisp/i2c/Makefile + create mode 100644 drivers/staging/media/atomisp/i2c/ap1302.c + create mode 100644 drivers/staging/media/atomisp/i2c/ap1302.h + create mode 100644 drivers/staging/media/atomisp/i2c/gc0310.c + create mode 100644 drivers/staging/media/atomisp/i2c/gc0310.h + create mode 100644 drivers/staging/media/atomisp/i2c/gc2235.c + create mode 100644 drivers/staging/media/atomisp/i2c/gc2235.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/Kconfig + create mode 100644 drivers/staging/media/atomisp/i2c/imx/Makefile + create mode 100644 drivers/staging/media/atomisp/i2c/imx/ad5816g.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/ad5816g.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/common.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/drv201.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/drv201.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9714.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9714.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9718.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9718.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9719.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9719.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx132.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx134.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx135.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx175.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx208.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx219.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx227.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/otp.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_brcc064_e2prom.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_e2prom.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_imx.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/vcm.c + create mode 100644 drivers/staging/media/atomisp/i2c/libmsrlisthelper.c + create mode 100644 drivers/staging/media/atomisp/i2c/lm3554.c + create mode 100644 drivers/staging/media/atomisp/i2c/mt9m114.c + create mode 100644 drivers/staging/media/atomisp/i2c/mt9m114.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov2680.c + create mode 100644 drivers/staging/media/atomisp/i2c/ov2680.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov2722.c + create mode 100644 drivers/staging/media/atomisp/i2c/ov2722.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Kconfig + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Makefile + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ad5823.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ov5693.c + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov8858.c + create mode 100644 drivers/staging/media/atomisp/i2c/ov8858.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov8858_btns.h + create mode 100644 drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h + create mode 100644 drivers/staging/media/atomisp/include/linux/atomisp.h + create mode 100644 drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h + create mode 100644 drivers/staging/media/atomisp/include/linux/atomisp_platform.h + create mode 100644 drivers/staging/media/atomisp/include/linux/libmsrlisthelper.h + create mode 100644 drivers/staging/media/atomisp/include/linux/vlv2_plat_clock.h + create mode 100644 drivers/staging/media/atomisp/include/media/lm3554.h + create mode 100644 drivers/staging/media/atomisp/include/media/lm3642.h + create mode 100644 drivers/staging/media/atomisp/pci/Kconfig + create mode 100644 drivers/staging/media/atomisp/pci/Makefile + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/Makefile + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_helper.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_tables.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_trace_event.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/Makefile + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_desc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/src/circbuf.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/interface/ia_css_refcount.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/src/refcount.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_binarydesc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_stagedesc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_util.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_binarydesc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_stagedesc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_util.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/bits.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/cell_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/css_receiver_2400_common_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/css_receiver_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/dma_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gdc_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gp_regs_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gp_timer_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gpio_block_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_host_ids_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/if_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_formatter_subsystem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_selector_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_switch_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_system_ctrl_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_system_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/irq_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_mamoiada_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp_acquisition_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp_capture_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/mmu_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/scalar_processor_2400_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/sp_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/str2mem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/streaming_to_mipi_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/timed_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/var.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/spmem_dump.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/csi_rx_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/system_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/bits.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/cell_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/css_receiver_2400_common_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/css_receiver_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/dma_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gdc_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gp_regs_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gp_timer_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gpio_block_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_2401_irq_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_host_ids_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/if_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_formatter_subsystem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_selector_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_switch_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_system_ctrl_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_system_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/irq_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp2400_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp2401_mamoiada_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp_acquisition_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp_capture_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mmu_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/rx_csi_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/scalar_processor_2400_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/sp_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/str2mem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/stream2mmio_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/streaming_to_mipi_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/timed_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/var.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/ibuf_ctrl_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/input_system_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_dma_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_irq_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_stream2mmio_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/pixelgen_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/spmem_dump.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/system_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/bits.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/cell_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/css_receiver_2400_common_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/css_receiver_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/dma_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gdc_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gp_regs_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gp_timer_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gpio_block_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_2401_irq_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_host_ids_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/if_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_formatter_subsystem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_selector_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_switch_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_system_ctrl_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_system_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/irq_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp2400_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp2401_mamoiada_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp_acquisition_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp_capture_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/mmu_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/scalar_processor_2400_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/sp_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/str2mem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/streaming_to_mipi_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/timed_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/var.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/spmem_dump.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_api_version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_trace.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/debug_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/dma_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/event_fifo_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/fifo_monitor_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_device_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_timer_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gpio_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/hmem_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_ddr_hrt_modified.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/system_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_system_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/irq_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/isp_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/mmu_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/resource_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/sp_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/system_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/timed_ctrl_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vamem_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vmem_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/xmem_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/assert_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bamem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bbb_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bitop_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/cpu_mem_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/csi_rx.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/debug.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/device_access/device_access.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/dma.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/error_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/event_fifo.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/fifo_monitor.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gdc_device.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_device.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_timer.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gpio.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/hmem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/csi_rx_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/debug_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/dma_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/event_fifo_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/fifo_monitor_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gdc_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_device_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_timer_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gpio_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/hmem_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ibuf_ctrl_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_formatter_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_system_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/irq_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2400_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2500_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2600_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2601_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op1w.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op1w_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op2w.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op2w_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op_count.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_dma_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_irq_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_stream2mmio_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/osys_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pipeline_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pixelgen_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ref_vector_func.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ref_vector_func_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/sp_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/tag_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/timed_ctrl_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vamem_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vmem_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/ibuf_ctrl.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_formatter.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_system.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/irq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isp.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_dma.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_irq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_stream2mmio.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_access/memory_access.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_realloc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/misc_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mpmath.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/osys.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/pixelgen.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/platform_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/print_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/queue.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/resource.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/socket.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/sp.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/storage_class.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/stream_buffer.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/system_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/tag.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/timed_ctrl.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/type_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vamem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vector_func.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vector_ops.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vmem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/xmem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/queue_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/socket_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/stream_buffer_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/sw_event_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/tag_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_3a.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_acc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_control.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_dvs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_env.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_err.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_event_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_firmware.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frac.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_format.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_host_data.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_irq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_prbs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_shading.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_timer.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_tpg.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_load_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_store_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_store_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/scale/scale_1.0/ia_css_scale_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/input_buf.isp.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_exprs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/memory_realloc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_internal.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_pipe.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/interface/ia_css_event.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/src/event.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/interface/ia_css_eventq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/src/eventq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/src/frame.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/interface/ia_css_ifmtr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/src/isp_param.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline_common.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/src/pipeline.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr_vbuf.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/tagger/interface/ia_css_tagger_common.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/timer/src/timer.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_dvs_info.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_frac.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_host_data.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_irq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metadata.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mmu.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_morph.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params_internal.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_pipe.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_properties.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_shading.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_uds.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo_dev.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/device_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_custom_host_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo_dev.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_common.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_pool.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_vm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu_mrfld.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c + create mode 100644 drivers/staging/media/atomisp/platform/Makefile + create mode 100644 drivers/staging/media/atomisp/platform/clock/Makefile + create mode 100644 drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.c + create mode 100644 drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.h + create mode 100644 drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c + create mode 100644 drivers/staging/media/atomisp/platform/intel-mid/Makefile + create mode 100644 drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c + create mode 100644 drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c + create mode 100644 drivers/staging/rtl8723bs/Kconfig + create mode 100644 drivers/staging/rtl8723bs/Makefile + create mode 100644 drivers/staging/rtl8723bs/TODO + create mode 100644 drivers/staging/rtl8723bs/core/rtw_ap.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_btcoex.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_cmd.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_debug.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_eeprom.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_efuse.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_ieee80211.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_io.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_ioctl_set.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_mlme.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_odm.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_recv.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_rf.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_security.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_sta_mgt.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_wlan_util.c + create mode 100644 drivers/staging/rtl8723bs/core/rtw_xmit.c + create mode 100644 drivers/staging/rtl8723bs/hal/Hal8723BPwrSeq.c + create mode 100644 drivers/staging/rtl8723bs/hal/Hal8723BReg.h + create mode 100644 drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c + create mode 100644 drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h + create mode 100644 drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c + create mode 100644 drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h + create mode 100644 drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h + create mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c + create mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h + create mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c + create mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h + create mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c + create mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h + create mode 100644 drivers/staging/rtl8723bs/hal/HalPhyRf.c + create mode 100644 drivers/staging/rtl8723bs/hal/HalPhyRf.h + create mode 100644 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c + create mode 100644 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h + create mode 100644 drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c + create mode 100644 drivers/staging/rtl8723bs/hal/Mp_Precomp.h + create mode 100644 drivers/staging/rtl8723bs/hal/hal_btcoex.c + create mode 100644 drivers/staging/rtl8723bs/hal/hal_com.c + create mode 100644 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c + create mode 100644 drivers/staging/rtl8723bs/hal/hal_intf.c + create mode 100644 drivers/staging/rtl8723bs/hal/hal_phy.c + create mode 100644 drivers/staging/rtl8723bs/hal/hal_sdio.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_AntDiv.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_AntDiv.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_CfoTracking.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_CfoTracking.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_DIG.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_DIG.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_HWConfig.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_HWConfig.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_RTL8723B.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_RTL8723B.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.c + create mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_interface.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_precomp.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_reg.h + create mode 100644 drivers/staging/rtl8723bs/hal/odm_types.h + create mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c + create mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_dm.c + create mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c + create mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c + create mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c + create mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c + create mode 100644 drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c + create mode 100644 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c + create mode 100644 drivers/staging/rtl8723bs/hal/sdio_halinit.c + create mode 100644 drivers/staging/rtl8723bs/hal/sdio_ops.c + create mode 100644 drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h + create mode 100644 drivers/staging/rtl8723bs/include/Hal8723BPhyCfg.h + create mode 100644 drivers/staging/rtl8723bs/include/Hal8723BPhyReg.h + create mode 100644 drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h + create mode 100644 drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h + create mode 100644 drivers/staging/rtl8723bs/include/HalVerDef.h + create mode 100644 drivers/staging/rtl8723bs/include/autoconf.h + create mode 100644 drivers/staging/rtl8723bs/include/basic_types.h + create mode 100644 drivers/staging/rtl8723bs/include/cmd_osdep.h + create mode 100644 drivers/staging/rtl8723bs/include/drv_conf.h + create mode 100644 drivers/staging/rtl8723bs/include/drv_types.h + create mode 100644 drivers/staging/rtl8723bs/include/drv_types_sdio.h + create mode 100644 drivers/staging/rtl8723bs/include/ethernet.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_btcoex.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_com.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_com_h2c.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_com_phycfg.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_com_reg.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_data.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_intf.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_pg.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_phy.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_phy_reg.h + create mode 100644 drivers/staging/rtl8723bs/include/hal_sdio.h + create mode 100644 drivers/staging/rtl8723bs/include/ieee80211.h + create mode 100644 drivers/staging/rtl8723bs/include/ioctl_cfg80211.h + create mode 100644 drivers/staging/rtl8723bs/include/mlme_osdep.h + create mode 100644 drivers/staging/rtl8723bs/include/osdep_intf.h + create mode 100644 drivers/staging/rtl8723bs/include/osdep_service.h + create mode 100644 drivers/staging/rtl8723bs/include/osdep_service_linux.h + create mode 100644 drivers/staging/rtl8723bs/include/recv_osdep.h + create mode 100644 drivers/staging/rtl8723bs/include/rtl8192c_recv.h + create mode 100644 drivers/staging/rtl8723bs/include/rtl8192c_rf.h + create mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_cmd.h + create mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_dm.h + create mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_hal.h + create mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_recv.h + create mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_rf.h + create mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_spec.h + create mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_xmit.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_ap.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_beamforming.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_br_ext.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_btcoex.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_byteorder.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_cmd.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_debug.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_eeprom.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_efuse.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_event.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_ht.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_io.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_ioctl.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_ioctl_set.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_mlme.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_mp.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_odm.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_pwrctrl.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_qos.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_recv.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_rf.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_security.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_version.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_wifi_regd.h + create mode 100644 drivers/staging/rtl8723bs/include/rtw_xmit.h + create mode 100644 drivers/staging/rtl8723bs/include/sdio_hal.h + create mode 100644 drivers/staging/rtl8723bs/include/sdio_ops.h + create mode 100644 drivers/staging/rtl8723bs/include/sdio_ops_linux.h + create mode 100644 drivers/staging/rtl8723bs/include/sdio_osintf.h + create mode 100644 drivers/staging/rtl8723bs/include/sta_info.h + create mode 100644 drivers/staging/rtl8723bs/include/wifi.h + create mode 100644 drivers/staging/rtl8723bs/include/wlan_bssdef.h + create mode 100644 drivers/staging/rtl8723bs/include/xmit_osdep.h + create mode 100644 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/mlme_linux.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/os_intfs.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/osdep_service.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/recv_linux.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/rtw_proc.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/rtw_proc.h + create mode 100644 drivers/staging/rtl8723bs/os_dep/sdio_intf.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/wifi_regd.c + create mode 100644 drivers/staging/rtl8723bs/os_dep/xmit_linux.c + create mode 100644 drivers/staging/vc04_services/bcm2835-audio/Kconfig + rename drivers/staging/{ => vc04_services}/bcm2835-audio/Makefile (100%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/TODO (100%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-ctl.c (78%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-pcm.c (93%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-vchiq.c (87%) + create mode 100644 drivers/staging/vc04_services/bcm2835-audio/bcm2835.c + rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835.h (81%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/vc_vchi_audioserv_defs.h (100%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/Kconfig (75%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/Makefile (100%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/TODO (89%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/bcm2835-camera.c (93%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/bcm2835-camera.h (98%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/controls.c (98%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-common.h (100%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-encodings.h (99%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-common.h (100%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-format.h (74%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-port.h (88%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg.h (93%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-parameters.h (99%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-vchiq.c (89%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-vchiq.h (98%) +$ git am -3 ../patches/0001-staging-merge-fix-for-add-change_virtual-intf-API-ch.patch +Applying: staging: merge fix for add/change_virtual-intf API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +$ git add -A . +$ git commit -v -a --amend +[master cb2988760f45] Merge remote-tracking branch 'staging/staging-next' + Date: Wed Apr 26 15:19:30 2017 +1000 +Merging mux/for-next (7816ffe4dcb6 mux: adg792a: add mux controller driver for ADG792A/G) +$ git merge mux/for-next +Resolved 'drivers/Kconfig' using previous resolution. +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'drivers/i2c/muxes/Kconfig' using previous resolution. +Resolved 'drivers/i2c/muxes/Makefile' using previous resolution. +Auto-merging drivers/i2c/muxes/Makefile +CONFLICT (content): Merge conflict in drivers/i2c/muxes/Makefile +Auto-merging drivers/i2c/muxes/Kconfig +CONFLICT (content): Merge conflict in drivers/i2c/muxes/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/Kconfig +CONFLICT (content): Merge conflict in drivers/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-model/devres.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3c1f1bade809] Merge remote-tracking branch 'mux/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-mux | 16 + + .../devicetree/bindings/i2c/i2c-mux-gpmux.txt | 99 ++++ + .../bindings/iio/multiplexer/io-channel-mux.txt | 39 ++ + .../devicetree/bindings/mux/adi,adg792a.txt | 75 +++ + Documentation/devicetree/bindings/mux/gpio-mux.txt | 69 +++ + .../devicetree/bindings/mux/mux-controller.txt | 157 ++++++ + Documentation/driver-model/devres.txt | 10 +- + MAINTAINERS | 16 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/i2c/muxes/Kconfig | 13 + + drivers/i2c/muxes/Makefile | 1 + + drivers/i2c/muxes/i2c-mux-gpmux.c | 173 ++++++ + drivers/iio/Kconfig | 1 + + drivers/iio/Makefile | 1 + + drivers/iio/inkern.c | 60 +++ + drivers/iio/multiplexer/Kconfig | 18 + + drivers/iio/multiplexer/Makefile | 6 + + drivers/iio/multiplexer/iio-mux.c | 459 ++++++++++++++++ + drivers/mux/Kconfig | 46 ++ + drivers/mux/Makefile | 7 + + drivers/mux/mux-adg792a.c | 157 ++++++ + drivers/mux/mux-core.c | 593 +++++++++++++++++++++ + drivers/mux/mux-gpio.c | 114 ++++ + include/dt-bindings/mux/mux.h | 16 + + include/linux/iio/consumer.h | 37 ++ + include/linux/mux/consumer.h | 33 ++ + include/linux/mux/driver.h | 111 ++++ + 28 files changed, 2329 insertions(+), 1 deletion(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-mux + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt + create mode 100644 Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/adi,adg792a.txt + create mode 100644 Documentation/devicetree/bindings/mux/gpio-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/mux-controller.txt + create mode 100644 drivers/i2c/muxes/i2c-mux-gpmux.c + create mode 100644 drivers/iio/multiplexer/Kconfig + create mode 100644 drivers/iio/multiplexer/Makefile + create mode 100644 drivers/iio/multiplexer/iio-mux.c + create mode 100644 drivers/mux/Kconfig + create mode 100644 drivers/mux/Makefile + create mode 100644 drivers/mux/mux-adg792a.c + create mode 100644 drivers/mux/mux-core.c + create mode 100644 drivers/mux/mux-gpio.c + create mode 100644 include/dt-bindings/mux/mux.h + create mode 100644 include/linux/mux/consumer.h + create mode 100644 include/linux/mux/driver.h +Merging slave-dma/next (068c69a2b43f Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Removing include/linux/amba/pl330.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/da8xx-usb.txt | 41 ++++- + arch/arm/plat-samsung/devs.c | 1 - + drivers/dma/Kconfig | 6 +- + drivers/dma/amba-pl08x.c | 20 +-- + drivers/dma/cppi41.c | 168 ++++++++++++--------- + drivers/dma/dmatest.c | 4 +- + drivers/dma/imx-sdma.c | 19 ++- + drivers/dma/ioat/init.c | 4 +- + drivers/dma/mv_xor.c | 9 +- + drivers/dma/pl330.c | 42 +----- + drivers/dma/qcom/hidma.c | 15 ++ + drivers/dma/qcom/hidma_ll.c | 6 + + drivers/dma/sh/rcar-dmac.c | 52 ++++--- + drivers/dma/stm32-dma.c | 2 +- + drivers/dma/sun4i-dma.c | 2 +- + drivers/dma/virt-dma.c | 11 +- + drivers/dma/xilinx/xilinx_dma.c | 63 ++++---- + include/linux/amba/pl080.h | 50 +++--- + include/linux/amba/pl330.h | 35 ----- + lib/dma-debug.c | 4 +- + 20 files changed, 296 insertions(+), 258 deletions(-) + delete mode 100644 include/linux/amba/pl330.h +Merging cgroup/for-next (8673d8769243 Merge branch 'for-4.11-fixes' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/sched/core.c +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 12 ++++++++---- + include/linux/cgroup.h | 8 ++++---- + include/linux/cpuset.h | 4 ++-- + kernel/cgroup/cgroup-internal.h | 5 +++-- + kernel/cgroup/cgroup-v1.c | 4 ++-- + kernel/cgroup/cgroup.c | 8 ++++---- + kernel/cgroup/cpuset.c | 11 ++++------- + kernel/cgroup/namespace.c | 2 +- + kernel/sched/core.c | 4 ++-- + 9 files changed, 30 insertions(+), 28 deletions(-) +Merging scsi/for-next (f506b0386683 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Resolved 'drivers/scsi/osd/osd_uld.c' using previous resolution. +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/scsi/sd.h +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_transport_sas.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qla2xxx/qla_bsg.c +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/qedi/qedi_iscsi.c +Auto-merging drivers/scsi/osd/osd_uld.c +CONFLICT (content): Merge conflict in drivers/scsi/osd/osd_uld.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8463366e57ef] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/powerpc/cxlflash.txt | 5 + + Documentation/scsi/scsi_eh.txt | 30 +- + MAINTAINERS | 1 - + drivers/misc/enclosure.c | 7 +- + drivers/scsi/BusLogic.c | 14 +- + drivers/scsi/BusLogic.h | 2 +- + drivers/scsi/advansys.c | 21 +- + drivers/scsi/aic7xxx/aic7xxx_pci.c | 4 +- + drivers/scsi/aic94xx/aic94xx_init.c | 1 - + drivers/scsi/be2iscsi/be.h | 12 +- + drivers/scsi/be2iscsi/be_cmds.c | 17 +- + drivers/scsi/be2iscsi/be_cmds.h | 74 +- + drivers/scsi/be2iscsi/be_iscsi.c | 111 +-- + drivers/scsi/be2iscsi/be_iscsi.h | 13 +- + drivers/scsi/be2iscsi/be_main.c | 397 +++++------ + drivers/scsi/be2iscsi/be_main.h | 30 +- + drivers/scsi/be2iscsi/be_mgmt.c | 140 ++-- + drivers/scsi/be2iscsi/be_mgmt.h | 43 +- + drivers/scsi/bfa/bfa_core.c | 66 +- + drivers/scsi/bfa/bfa_fcpim.c | 37 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 31 +- + drivers/scsi/bfa/bfa_ioc.c | 30 +- + drivers/scsi/bfa/bfa_modules.h | 101 ++- + drivers/scsi/bfa/bfa_svc.c | 172 +---- + drivers/scsi/csiostor/csio_hw.h | 1 - + drivers/scsi/csiostor/csio_isr.c | 128 ++-- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 +- + drivers/scsi/cxlflash/common.h | 137 +++- + drivers/scsi/cxlflash/lunmgt.c | 4 +- + drivers/scsi/cxlflash/main.c | 1162 ++++++++++++++++++++++-------- + drivers/scsi/cxlflash/main.h | 2 - + drivers/scsi/cxlflash/sislite.h | 124 ++-- + drivers/scsi/cxlflash/superpipe.c | 16 +- + drivers/scsi/cxlflash/superpipe.h | 56 +- + drivers/scsi/cxlflash/vlun.c | 99 ++- + drivers/scsi/cxlflash/vlun.h | 2 +- + drivers/scsi/esas2r/esas2r_log.c | 5 - + drivers/scsi/fnic/fnic.h | 3 +- + drivers/scsi/fnic/fnic_fcs.c | 23 +- + drivers/scsi/fnic/fnic_isr.c | 41 +- + drivers/scsi/fnic/fnic_scsi.c | 105 ++- + drivers/scsi/fnic/fnic_stats.h | 16 + + drivers/scsi/fnic/fnic_trace.c | 49 +- + drivers/scsi/hisi_sas/Kconfig | 1 + + drivers/scsi/hisi_sas/hisi_sas.h | 19 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 471 +++++++++---- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 19 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1201 +++++++++++++++++++++++++------- + drivers/scsi/hpsa.c | 6 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 6 - + drivers/scsi/ipr.c | 259 +++++-- + drivers/scsi/ipr.h | 4 +- + drivers/scsi/isci/init.c | 1 - + drivers/scsi/libfc/fc_fcp.c | 6 +- + drivers/scsi/libfc/fc_lport.c | 20 +- + drivers/scsi/libiscsi.c | 8 +- + drivers/scsi/libsas/sas_init.c | 7 - + drivers/scsi/libsas/sas_scsi_host.c | 5 - + drivers/scsi/lpfc/lpfc_attr.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 - + drivers/scsi/mvsas/mv_init.c | 1 - + drivers/scsi/osd/osd_uld.c | 7 +- + drivers/scsi/pm8001/pm8001_init.c | 1 - + drivers/scsi/qedf/qedf_debugfs.c | 2 +- + drivers/scsi/qedi/qedi_debugfs.c | 2 +- + drivers/scsi/qedi/qedi_iscsi.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 2 +- + drivers/scsi/qla2xxx/qla_bsg.c | 2 +- + drivers/scsi/qla2xxx/qla_gs.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 6 +- + drivers/scsi/qla2xxx/qla_os.c | 6 - + drivers/scsi/qla4xxx/ql4_os.c | 1 - + drivers/scsi/scsi_error.c | 146 +--- + drivers/scsi/scsi_lib.c | 4 +- + drivers/scsi/scsi_priv.h | 3 +- + drivers/scsi/scsi_transport_fc.c | 12 +- + drivers/scsi/scsi_transport_iscsi.c | 3 +- + drivers/scsi/scsi_transport_sas.c | 8 +- + drivers/scsi/sd.c | 29 +- + drivers/scsi/sd.h | 1 + + drivers/scsi/ses.c | 1 - + drivers/scsi/sg.c | 282 ++++---- + drivers/scsi/sgiwd93.c | 2 +- + drivers/scsi/sni_53c710.c | 2 +- + drivers/scsi/snic/snic_debugfs.c | 2 +- + drivers/scsi/stex.c | 287 ++++++-- + drivers/scsi/storvsc_drv.c | 27 +- + drivers/scsi/ufs/ufshcd.c | 87 +-- + drivers/scsi/ufs/ufshci.h | 2 + + drivers/scsi/virtio_scsi.c | 24 + + drivers/scsi/zalon.c | 2 +- + include/scsi/libfc.h | 3 +- + include/scsi/libiscsi.h | 3 +- + include/scsi/libsas.h | 1 - + include/scsi/scsi_device.h | 2 +- + include/scsi/scsi_driver.h | 1 + + include/scsi/scsi_eh.h | 1 + + include/scsi/scsi_host.h | 5 - + include/scsi/scsi_transport_fc.h | 1 + + include/scsi/sg.h | 1 - + 101 files changed, 3984 insertions(+), 2366 deletions(-) +$ git am -3 ../patches/scsi_osd_uld_fix_mismerge.patch +Applying: scsi: osd_uld: fix mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/scsi/osd/osd_uld.c +$ git add -A . +$ git commit -v -a --amend +[master 6b3656370bf4] Merge remote-tracking branch 'scsi/for-next' + Date: Wed Apr 26 15:38:21 2017 +1000 +Merging scsi-mkp/for-next (4da2b1eb230b scsi: mac_esp: Replace bogus memory barrier with spinlock) +$ git merge scsi-mkp/for-next +Recorded preimage for 'drivers/scsi/sd.c' +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/sd.h +Auto-merging drivers/scsi/sd.c +CONFLICT (content): Merge conflict in drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/mac_esp.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/scsi/sd.c'. +[master da02d2a22c0a] Merge remote-tracking branch 'scsi-mkp/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptfc.c | 7 +- + drivers/message/fusion/mptscsih.c | 2 - + drivers/message/fusion/mptspi.c | 10 +- + drivers/scsi/fcoe/fcoe.c | 4 +- + drivers/scsi/mac_esp.c | 33 +++-- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 - + drivers/scsi/mvumi.c | 85 ++++--------- + drivers/scsi/pmcraid.c | 234 +++++++++++++++--------------------- + drivers/scsi/pmcraid.h | 8 +- + drivers/scsi/scsi_error.c | 38 +++--- + drivers/scsi/sd.c | 98 +++++++-------- + drivers/scsi/sd.h | 13 +- + drivers/scsi/sd_zbc.c | 58 ++++----- + drivers/scsi/sg.c | 2 + + include/scsi/scsi_eh.h | 4 +- + 16 files changed, 266 insertions(+), 334 deletions(-) +Merging target-updates/for-next (9f7ebfc64d2c tcm: make pi data verification configurable) +$ git merge target-updates/for-next +Auto-merging include/target/target_core_base.h +Auto-merging drivers/target/target_core_configfs.c +Auto-merging drivers/target/iscsi/iscsi_target_util.c +Merge made by the 'recursive' strategy. + drivers/target/iscsi/iscsi_target_util.c | 13 +++--- + drivers/target/target_core_configfs.c | 34 +++++++++++++++ + drivers/target/target_core_file.c | 29 +++++++++---- + drivers/target/target_core_iblock.c | 12 +++--- + drivers/target/target_core_iblock.h | 3 +- + drivers/target/target_core_pr.h | 9 ++-- + drivers/target/target_core_rd.c | 17 ++++---- + drivers/target/target_core_sbc.c | 71 ++++++++++++++++++++++++++++---- + include/target/target_core_base.h | 1 + + 9 files changed, 147 insertions(+), 42 deletions(-) +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging target-bva/for-next (762b6f00a995 uapi: fix linux/target_core_user.h userspace compilation errors) +$ git merge target-bva/for-next +Already up-to-date. +Merging libata/for-next (b09754f570fa Merge branch 'for-4.11-fixes' into for-next) +$ git merge libata/for-next +Removing drivers/ata/pata_at91.c +Auto-merging drivers/ata/Makefile +Auto-merging drivers/ata/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-dm816.txt | 21 + + drivers/ata/Kconfig | 18 +- + drivers/ata/Makefile | 2 +- + drivers/ata/ahci_dm816.c | 200 ++++++++ + drivers/ata/ahci_octeon.c | 5 - + drivers/ata/libata-core.c | 8 +- + drivers/ata/pata_at91.c | 503 --------------------- + drivers/ata/pata_macio.c | 2 +- + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/ata/pata_of_platform.c | 2 +- + drivers/ata/sata_fsl.c | 2 +- + drivers/ata/sata_mv.c | 2 +- + 12 files changed, 240 insertions(+), 527 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/ahci-dm816.txt + create mode 100644 drivers/ata/ahci_dm816.c + delete mode 100644 drivers/ata/pata_at91.c +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (d635daaa99c6 ptr_ring: batched ring producer) +$ git merge vhost/linux-next +Auto-merging net/vmw_vsock/virtio_transport.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/char/virtio_console.c +Auto-merging drivers/block/virtio_blk.c +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 3 +- + drivers/char/virtio_console.c | 6 +- + drivers/crypto/virtio/virtio_crypto_core.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 3 +- + drivers/misc/mic/vop/vop_main.c | 9 +- + drivers/net/caif/caif_virtio.c | 3 +- + drivers/net/virtio_net.c | 236 +++++++++++++++++++---------- + drivers/remoteproc/remoteproc_virtio.c | 10 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + drivers/s390/virtio/kvm_virtio.c | 8 +- + drivers/s390/virtio/virtio_ccw.c | 7 +- + drivers/scsi/virtio_scsi.c | 3 +- + drivers/virtio/virtio_balloon.c | 3 +- + drivers/virtio/virtio_input.c | 3 +- + drivers/virtio/virtio_mmio.c | 8 +- + drivers/virtio/virtio_pci_common.c | 17 ++- + drivers/virtio/virtio_pci_common.h | 4 +- + drivers/virtio/virtio_pci_legacy.c | 4 +- + drivers/virtio/virtio_pci_modern.c | 12 +- + drivers/virtio/virtio_ring.c | 77 ++++++++-- + include/linux/ptr_ring.h | 117 ++++++++++++-- + include/linux/virtio.h | 13 ++ + include/linux/virtio_config.h | 25 ++- + include/linux/virtio_ring.h | 3 + + net/vmw_vsock/virtio_transport.c | 6 +- + tools/virtio/linux/virtio.h | 1 + + tools/virtio/ringtest/main.c | 15 +- + tools/virtio/ringtest/main.h | 2 + + tools/virtio/ringtest/ptr_ring.c | 3 + + tools/virtio/virtio_test.c | 2 +- + tools/virtio/vringh_test.c | 7 +- + 31 files changed, 458 insertions(+), 157 deletions(-) +Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c +Merge made by the 'recursive' strategy. + drivers/rpmsg/qcom_smd.c | 11 +++++++++++ + drivers/rpmsg/virtio_rpmsg_bus.c | 9 +++++++++ + 2 files changed, 20 insertions(+) +Merging gpio/for-next (fa2f60ffa0e0 gpio: DT bindings, move tca9554 from pcf857x to pca953x) +$ git merge gpio/for-next +Resolved 'drivers/input/misc/soc_button_array.c' using previous resolution. +Auto-merging include/linux/gpio/consumer.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/input/misc/soc_button_array.c +CONFLICT (content): Merge conflict in drivers/input/misc/soc_button_array.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib-acpi.c +Removing drivers/gpio/gpio-moxart.c +Auto-merging drivers/gpio/gpio-mockup.c +Auto-merging drivers/gpio/gpio-ftgpio010.c +Auto-merging drivers/gpio/gpio-altera.c +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Removing Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt +Auto-merging Documentation/devicetree/bindings/gpio/faraday,ftgpio010.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8e60abeb7ee2] Merge remote-tracking branch 'gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + ...rtina,gemini-gpio.txt => faraday,ftgpio010.txt} | 9 +- + .../devicetree/bindings/gpio/gpio-aspeed.txt | 3 +- + .../devicetree/bindings/gpio/gpio-mvebu.txt | 32 ++ + .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + .../devicetree/bindings/gpio/gpio-pcf857x.txt | 1 - + .../devicetree/bindings/gpio/gpio-thunderx.txt | 27 ++ + .../devicetree/bindings/gpio/gpio-xra1403.txt | 46 +++ + .../devicetree/bindings/gpio/moxa,moxart-gpio.txt | 19 - + .../bindings/gpio/ni,169445-nand-gpio.txt | 38 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpio/consumer.txt | 6 + + MAINTAINERS | 2 + + drivers/gpio/Kconfig | 35 +- + drivers/gpio/Makefile | 4 +- + drivers/gpio/devres.c | 2 +- + drivers/gpio/gpio-104-dio-48e.c | 38 +- + drivers/gpio/gpio-104-idi-48.c | 18 +- + drivers/gpio/gpio-104-idio-16.c | 24 +- + drivers/gpio/gpio-altera.c | 24 +- + drivers/gpio/gpio-arizona.c | 30 +- + drivers/gpio/gpio-aspeed.c | 285 +++++++++++++- + drivers/gpio/gpio-ath79.c | 28 +- + drivers/gpio/gpio-bcm-kona.c | 48 +-- + drivers/gpio/gpio-davinci.c | 2 +- + drivers/gpio/gpio-dwapb.c | 93 ++++- + drivers/gpio/gpio-etraxfs.c | 24 +- + drivers/gpio/gpio-exar.c | 23 +- + drivers/gpio/gpio-f7188x.c | 23 +- + drivers/gpio/{gpio-gemini.c => gpio-ftgpio010.c} | 72 ++-- + drivers/gpio/gpio-merrifield.c | 2 +- + drivers/gpio/gpio-ml-ioh.c | 28 +- + drivers/gpio/gpio-mmio.c | 1 + + drivers/gpio/gpio-mockup.c | 16 +- + drivers/gpio/gpio-moxart.c | 84 ---- + drivers/gpio/gpio-mvebu.c | 435 ++++++++++++++++++--- + drivers/gpio/gpio-mxc.c | 6 +- + drivers/gpio/gpio-mxs.c | 6 +- + drivers/gpio/gpio-omap.c | 3 +- + drivers/gpio/gpio-pca953x.c | 38 +- + drivers/gpio/gpio-pcf857x.c | 2 - + drivers/gpio/gpio-pch.c | 14 +- + drivers/gpio/gpio-pci-idio-16.c | 28 +- + drivers/gpio/gpio-pl061.c | 28 +- + drivers/gpio/gpio-pxa.c | 2 +- + drivers/gpio/gpio-reg.c | 185 +++++++++ + drivers/gpio/gpio-sa1100.c | 216 ++++++---- + drivers/gpio/gpio-sodaville.c | 28 +- + drivers/gpio/gpio-sta2x11.c | 17 +- + drivers/gpio/gpio-twl4030.c | 3 +- + drivers/gpio/gpio-wcove.c | 2 +- + drivers/gpio/gpio-ws16c48.c | 46 +-- + drivers/gpio/gpio-xlp.c | 9 +- + drivers/gpio/gpio-zx.c | 24 +- + drivers/gpio/gpiolib-acpi.c | 53 ++- + drivers/gpio/gpiolib-of.c | 2 +- + drivers/gpio/gpiolib.c | 16 +- + drivers/input/misc/soc_button_array.c | 5 +- + drivers/platform/x86/surface3_button.c | 5 +- + drivers/usb/dwc3/dwc3-pci.c | 5 +- + include/dt-bindings/gpio/gpio.h | 12 +- + include/linux/acpi.h | 11 + + include/linux/gpio/consumer.h | 12 +- + include/linux/gpio/driver.h | 6 +- + include/linux/gpio/gpio-reg.h | 13 + + include/linux/of_gpio.h | 1 + + 65 files changed, 1682 insertions(+), 640 deletions(-) + rename Documentation/devicetree/bindings/gpio/{cortina,gemini-gpio.txt => faraday,ftgpio010.txt} (70%) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-thunderx.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xra1403.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/ni,169445-nand-gpio.txt + rename drivers/gpio/{gpio-gemini.c => gpio-ftgpio010.c} (73%) + delete mode 100644 drivers/gpio/gpio-moxart.c + create mode 100644 drivers/gpio/gpio-reg.c + create mode 100644 include/linux/gpio/gpio-reg.h +Merging pinctrl/for-next (02101cb3f5a2 pinctrl: tegra: xusb: Silence sparse warnings) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c +Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson-gxbb.c +Auto-merging drivers/pinctrl/intel/pinctrl-cherryview.c +Auto-merging drivers/pinctrl/core.c +Auto-merging arch/arm/boot/dts/rk1108.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/clock/armada3700-xtal-clock.txt | 7 +- + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 3 +- + .../bindings/pinctrl/atmel,at91-pinctrl.txt | 2 +- + .../bindings/pinctrl/axis,artpec6-pinctrl.txt | 85 + + .../pinctrl/marvell,armada-37xx-pinctrl.txt | 183 + + .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 40 +- + .../bindings/pinctrl/pinctrl-bindings.txt | 48 +- + .../bindings/pinctrl/rockchip,pinctrl.txt | 17 +- + .../bindings/pinctrl/st,stm32-pinctrl.txt | 3 +- + MAINTAINERS | 4 + + arch/arm/boot/dts/rk1108.dtsi | 2 +- + drivers/pinctrl/Kconfig | 11 + + drivers/pinctrl/Makefile | 3 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 129 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 153 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 225 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.h | 28 + + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 44 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 46 +- + drivers/pinctrl/core.c | 10 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 47 + + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 49 + + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 186 +- + drivers/pinctrl/meson/pinctrl-meson.c | 14 +- + drivers/pinctrl/meson/pinctrl-meson8b.c | 12 +- + drivers/pinctrl/mvebu/Kconfig | 7 + + drivers/pinctrl/mvebu/Makefile | 3 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 748 +++ + drivers/pinctrl/pinconf-generic.c | 5 +- + drivers/pinctrl/pinconf.c | 4 +- + drivers/pinctrl/pinctrl-amd.c | 66 +- + drivers/pinctrl/pinctrl-amd.h | 2 +- + drivers/pinctrl/pinctrl-artpec6.c | 980 ++++ + drivers/pinctrl/pinctrl-at91-pio4.c | 34 +- + drivers/pinctrl/pinctrl-rockchip.c | 443 +- + drivers/pinctrl/pinmux.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 14 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 47 +- + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 3 + + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 18 +- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 16 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 5705 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 4200 +++----------- + drivers/pinctrl/sh-pfc/sh_pfc.h | 1 + + drivers/pinctrl/sirf/pinctrl-atlas7.c | 44 +- + drivers/pinctrl/stm32/Kconfig | 6 + + drivers/pinctrl/stm32/Makefile | 1 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 115 +- + drivers/pinctrl/stm32/pinctrl-stm32f429.c | 6 +- + drivers/pinctrl/stm32/pinctrl-stm32f469.c | 1578 ++++++ + drivers/pinctrl/stm32/pinctrl-stm32f746.c | 7 +- + drivers/pinctrl/stm32/pinctrl-stm32h743.c | 6 +- + drivers/pinctrl/sunxi/Kconfig | 13 +- + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 125 + + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 26 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 2 +- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 4 + + drivers/pinctrl/uniphier/Kconfig | 16 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 48 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 11 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 11 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 11 +- + include/linux/pinctrl/pinconf-generic.h | 3 + + 71 files changed, 11794 insertions(+), 3968 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-37xx-pinctrl.txt + create mode 100644 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c + create mode 100644 drivers/pinctrl/pinctrl-artpec6.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c + create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32f469.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c +Merging pinctrl-samsung/for-next (c8dd100397f3 Merge branch 'pinctrl-next' into for-next) +$ git merge pinctrl-samsung/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/drivers' into for-next) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/atmel-pwm.txt | 1 + + .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 45 ++++ + .../devicetree/bindings/pwm/pwm-mediatek.txt | 34 +++ + drivers/pwm/Kconfig | 9 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-atmel-hlcdc.c | 260 +++++++++---------- + drivers/pwm/pwm-atmel.c | 276 ++++++++++----------- + drivers/pwm/pwm-mediatek.c | 219 ++++++++++++++++ + drivers/pwm/pwm-pca9685.c | 112 ++++++--- + drivers/pwm/pwm-tegra.c | 37 ++- + 10 files changed, 685 insertions(+), 309 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-mediatek.txt + create mode 100644 drivers/pwm/pwm-mediatek.c +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 83010d7e2476] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 +++++++++++ + 1 file changed, 11 insertions(+) +Merging userns/for-next (6c478ae9204b signal: Make kill_proc_info static) +$ git merge userns/for-next +Auto-merging kernel/time/posix-cpu-timers.c +Auto-merging kernel/sys.c +Auto-merging kernel/signal.c +Auto-merging fs/proc/proc_sysctl.c +Merge made by the 'recursive' strategy. + arch/ia64/kernel/asm-offsets.c | 4 ---- + fs/proc/proc_sysctl.c | 4 ---- + include/linux/sched/signal.h | 1 - + include/linux/signal.h | 4 ---- + include/linux/sysctl.h | 1 - + ipc/util.h | 2 -- + kernel/signal.c | 2 +- + kernel/sys.c | 3 +-- + kernel/time/posix-cpu-timers.c | 2 +- + net/sysctl_net.c | 1 - + 10 files changed, 3 insertions(+), 21 deletions(-) +Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) +$ git merge ktest/for-next +Already up-to-date. +Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block) +$ git merge random/dev +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (51c6bd7cbe03 selftests: gpio: fix clean target to remove all generated files and dirs) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/powerpc/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/.gitignore | 4 ++++ + tools/testing/selftests/Makefile | 4 ++-- + tools/testing/selftests/breakpoints/Makefile | 2 +- + tools/testing/selftests/ftrace/config | 1 + + .../ftrace/test.d/kprobe/kprobe_args_type.tc | 2 +- + tools/testing/selftests/futex/Makefile | 9 ++++---- + tools/testing/selftests/gpio/Makefile | 11 +++++++-- + tools/testing/selftests/gpio/config | 2 ++ + tools/testing/selftests/lib.mk | 6 ++++- + tools/testing/selftests/lib/config | 3 +++ + tools/testing/selftests/powerpc/Makefile | 3 ++- + tools/testing/selftests/splice/Makefile | 2 +- + .../testing/selftests/timers/clocksource-switch.c | 2 +- + tools/testing/selftests/vm/config | 1 + + tools/testing/selftests/vm/map_hugetlb.c | 2 +- + tools/testing/selftests/vm/mlock2-tests.c | 12 +++++----- + tools/testing/selftests/vm/on-fault-limit.c | 2 +- + tools/testing/selftests/vm/run_vmtests | 26 +++++++++++----------- + tools/testing/selftests/vm/thuge-gen.c | 2 +- + 19 files changed, 60 insertions(+), 36 deletions(-) + create mode 100644 tools/testing/selftests/gpio/config + create mode 100644 tools/testing/selftests/lib/config +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up-to-date. +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (608822c0f7af Merge branch 'for-4.12/upstream' into for-next) +$ git merge livepatching/for-next +Resolved 'arch/s390/include/asm/thread_info.h' using previous resolution. +Resolved 'arch/s390/kernel/entry.S' using previous resolution. +Resolved 'arch/x86/include/asm/thread_info.h' using previous resolution. +Resolved 'include/linux/init_task.h' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/init_task.h +CONFLICT (content): Merge conflict in include/linux/init_task.h +Auto-merging arch/x86/kernel/unwind_frame.c +Auto-merging arch/x86/include/asm/unwind.h +Auto-merging arch/x86/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kernel/entry.S +CONFLICT (content): Merge conflict in arch/s390/kernel/entry.S +Auto-merging arch/s390/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h +Auto-merging arch/powerpc/include/asm/thread_info.h +Auto-merging arch/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4db24c4ecaa4] Merge remote-tracking branch 'livepatching/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-livepatch | 8 + + Documentation/filesystems/proc.txt | 18 + + Documentation/livepatch/livepatch.txt | 214 +++++++-- + arch/Kconfig | 6 + + arch/powerpc/include/asm/thread_info.h | 4 +- + arch/powerpc/kernel/signal.c | 4 + + arch/s390/include/asm/thread_info.h | 24 +- + arch/s390/kernel/entry.S | 30 +- + arch/x86/Kconfig | 1 + + arch/x86/entry/common.c | 9 +- + arch/x86/include/asm/thread_info.h | 13 +- + arch/x86/include/asm/unwind.h | 6 + + arch/x86/kernel/stacktrace.c | 96 +++- + arch/x86/kernel/unwind_frame.c | 2 + + fs/proc/base.c | 15 + + include/linux/init_task.h | 9 + + include/linux/livepatch.h | 68 ++- + include/linux/sched.h | 3 + + include/linux/stacktrace.h | 9 +- + kernel/fork.c | 3 + + kernel/livepatch/Makefile | 2 +- + kernel/livepatch/core.c | 450 +++++++----------- + kernel/livepatch/core.h | 6 + + kernel/livepatch/patch.c | 272 +++++++++++ + kernel/livepatch/patch.h | 33 ++ + kernel/livepatch/transition.c | 553 +++++++++++++++++++++++ + kernel/livepatch/transition.h | 14 + + kernel/sched/idle.c | 4 + + kernel/stacktrace.c | 12 +- + samples/livepatch/livepatch-sample.c | 18 +- + 30 files changed, 1547 insertions(+), 359 deletions(-) + create mode 100644 kernel/livepatch/core.h + create mode 100644 kernel/livepatch/patch.c + create mode 100644 kernel/livepatch/patch.h + create mode 100644 kernel/livepatch/transition.c + create mode 100644 kernel/livepatch/transition.h +Merging coresight/next (5a99899065da coresight: tmc: minor fix for output log) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-tmc-etf.c +Auto-merging drivers/hwtracing/coresight/coresight-etm-perf.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm-perf.c | 3 +-- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 25 +++++++++++------ + drivers/hwtracing/coresight/coresight.c | 34 ++++++++++++++++++------ + 3 files changed, 44 insertions(+), 18 deletions(-) +Merging rtc/rtc-next (5d05e81516cf rtc: sh: mark PM functions as unused) +$ git merge rtc/rtc-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/trivial-devices.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/cpcap-rtc.txt | 18 ++ + Documentation/devicetree/bindings/rtc/rtc-sh.txt | 28 ++ + .../devicetree/bindings/trivial-devices.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/x86/kernel/i8259.c | 1 + + drivers/rtc/Kconfig | 11 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-bq32k.c | 7 + + drivers/rtc/rtc-cmos.c | 17 +- + drivers/rtc/rtc-cpcap.c | 330 +++++++++++++++++++++ + drivers/rtc/rtc-ds1307.c | 85 +++++- + drivers/rtc/rtc-ds1374.c | 1 + + drivers/rtc/rtc-ds1672.c | 9 +- + drivers/rtc/rtc-ds3232.c | 7 + + drivers/rtc/rtc-hid-sensor-time.c | 4 +- + drivers/rtc/rtc-isl1208.c | 12 +- + drivers/rtc/rtc-m41t80.c | 68 ++++- + drivers/rtc/rtc-omap.c | 22 +- + drivers/rtc/rtc-rs5c372.c | 37 ++- + drivers/rtc/rtc-rv3029c2.c | 9 + + drivers/rtc/rtc-rv8803.c | 21 +- + drivers/rtc/rtc-rx8010.c | 7 + + drivers/rtc/rtc-rx8581.c | 7 + + drivers/rtc/rtc-s35390a.c | 8 + + drivers/rtc/rtc-sh.c | 39 ++- + drivers/rtc/rtc-wm8350.c | 2 - + 26 files changed, 710 insertions(+), 43 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/cpcap-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-sh.txt + create mode 100644 drivers/rtc/rtc-cpcap.c +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 (51891c7db266 Merge branch 'for-4.12/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Resolved 'drivers/block/brd.c' using previous resolution. +Resolved 'fs/dax.c' using previous resolution. +Auto-merging include/linux/string.h +Auto-merging include/linux/device-mapper.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/xfs/xfs_iomap.c +Auto-merging fs/iomap.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/dax.c +CONFLICT (content): Merge conflict in fs/dax.c +Auto-merging fs/block_dev.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-stripe.c +Auto-merging drivers/md/dm-linear.c +Auto-merging drivers/md/dm-core.h +Auto-merging drivers/md/Kconfig +Auto-merging drivers/dax/device.c +Auto-merging drivers/block/brd.c +CONFLICT (content): Merge conflict in drivers/block/brd.c +Auto-merging drivers/block/Kconfig +Auto-merging drivers/Makefile +Auto-merging block/partition-generic.c +Auto-merging block/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b7841c431755] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/platforms/Kconfig | 1 + + arch/powerpc/sysdev/axonram.c | 45 +++- + arch/x86/include/asm/pmem.h | 5 - + arch/x86/include/asm/string_64.h | 1 + + block/Kconfig | 1 + + block/partition-generic.c | 17 +- + drivers/Makefile | 2 +- + drivers/acpi/nfit/core.c | 187 +++++++++++----- + drivers/acpi/nfit/nfit.h | 4 +- + drivers/block/Kconfig | 1 + + drivers/block/brd.c | 52 ++++- + drivers/dax/Kconfig | 10 +- + drivers/dax/Makefile | 5 +- + drivers/dax/dax-private.h | 57 +++++ + drivers/dax/dax.h | 15 +- + drivers/dax/device-dax.h | 25 +++ + drivers/dax/{dax.c => device.c} | 463 ++++++++++++--------------------------- + drivers/dax/pmem.c | 10 +- + drivers/dax/super.c | 425 +++++++++++++++++++++++++++++++++++ + drivers/md/Kconfig | 1 + + drivers/md/dm-core.h | 1 + + drivers/md/dm-linear.c | 27 ++- + drivers/md/dm-snap.c | 6 +- + drivers/md/dm-stripe.c | 29 ++- + drivers/md/dm-target.c | 6 +- + drivers/md/dm.c | 67 ++++-- + drivers/nvdimm/Kconfig | 1 + + drivers/nvdimm/bus.c | 88 +++++++- + drivers/nvdimm/claim.c | 15 +- + drivers/nvdimm/core.c | 51 +++-- + drivers/nvdimm/nd-core.h | 1 + + drivers/nvdimm/nd.h | 1 + + drivers/nvdimm/pmem.c | 53 +++-- + drivers/nvdimm/pmem.h | 7 +- + drivers/nvdimm/region.c | 49 +++++ + drivers/nvdimm/region_devs.c | 84 ++++++- + drivers/s390/block/Kconfig | 1 + + drivers/s390/block/dcssblk.c | 45 +++- + fs/block_dev.c | 117 +++------- + fs/dax.c | 297 +++++++++++++------------ + fs/ext2/inode.c | 9 +- + fs/ext4/inode.c | 9 +- + fs/iomap.c | 3 +- + fs/xfs/xfs_iomap.c | 10 + + include/linux/blkdev.h | 19 +- + include/linux/dax.h | 34 ++- + include/linux/device-mapper.h | 8 +- + include/linux/iomap.h | 1 + + include/linux/libnvdimm.h | 5 +- + include/linux/pmem.h | 23 -- + include/linux/string.h | 8 + + tools/testing/nvdimm/Kbuild | 11 +- + tools/testing/nvdimm/dax-dev.c | 49 +++++ + tools/testing/nvdimm/pmem-dax.c | 21 +- + tools/testing/nvdimm/test/nfit.c | 54 ++++- + 55 files changed, 1682 insertions(+), 855 deletions(-) + create mode 100644 drivers/dax/dax-private.h + create mode 100644 drivers/dax/device-dax.h + rename drivers/dax/{dax.c => device.c} (54%) + create mode 100644 drivers/dax/super.c + create mode 100644 tools/testing/nvdimm/dax-dev.c +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up-to-date. +Merging akpm-current/current (02dff0ef2e7f sysv,ipc: cacheline align kern_ipc_perm) +$ git merge --no-ff akpm-current/current +Resolved 'drivers/block/zram/zram_drv.c' using previous resolution. +Resolved 'fs/dax.c' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Resolved 'tools/testing/selftests/vm/run_vmtests' using previous resolution. +Auto-merging tools/testing/selftests/vm/run_vmtests +CONFLICT (content): Merge conflict in tools/testing/selftests/vm/run_vmtests +Auto-merging scripts/checkpatch.pl +Auto-merging mm/vmstat.c +Auto-merging mm/slab.h +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/migrate.c +Auto-merging mm/kasan/kasan.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging lib/vsprintf.c +Auto-merging lib/dma-debug.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/fork.c +Auto-merging include/uapi/linux/sysctl.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/cpumask.h +Auto-merging fs/xfs/xfs_trans.c +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/xfs/libxfs/xfs_btree.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/cluster/tcp.c +Auto-merging fs/nsfs.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/dax.c +CONFLICT (content): Merge conflict in fs/dax.c +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/block/zram/zram_drv.c +CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c +Auto-merging block/genhd.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/s390/kernel/perf_cpum_sf.c +Auto-merging arch/powerpc/kernel/setup-common.c +Auto-merging arch/powerpc/kernel/fadump.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/kernel/perf_event_mipsxx.c +Auto-merging arch/Kconfig +Auto-merging Documentation/powerpc/firmware-assisted-dump.txt +Auto-merging Documentation/filesystems/proc.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ccaea741b0bd] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/cgroup-v2.txt | 5 + + Documentation/fault-injection/fault-injection.txt | 79 +++ + Documentation/filesystems/proc.txt | 6 + + Documentation/powerpc/firmware-assisted-dump.txt | 23 +- + Documentation/vm/00-INDEX | 2 + + Documentation/vm/hugetlbfs_reserv.txt | 529 ++++++++++++++++++++ + arch/Kconfig | 4 + + arch/arm/include/asm/page.h | 2 + + arch/blackfin/mach-bf609/clock.c | 3 + + arch/ia64/kernel/crash.c | 22 - + arch/mips/kernel/perf_event_mipsxx.c | 2 +- + arch/powerpc/Kconfig | 10 +- + arch/powerpc/include/asm/fadump.h | 2 + + arch/powerpc/kernel/crash.c | 2 - + arch/powerpc/kernel/fadump.c | 57 +-- + arch/powerpc/kernel/setup-common.c | 5 + + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + block/genhd.c | 2 +- + drivers/block/zram/zram_drv.c | 577 +++++++++++----------- + drivers/block/zram/zram_drv.h | 6 +- + drivers/misc/c2port/c2port-duramar2150.c | 4 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 10 +- + drivers/tty/sysrq.c | 2 +- + drivers/virt/fsl_hypervisor.c | 7 +- + firmware/Makefile | 3 +- + fs/dax.c | 48 +- + fs/jbd2/journal.c | 9 + + fs/jbd2/transaction.c | 12 + + fs/nsfs.c | 4 +- + fs/ocfs2/cluster/heartbeat.c | 8 +- + fs/ocfs2/cluster/tcp.c | 5 +- + fs/ocfs2/dlm/dlmmaster.c | 66 ++- + fs/ocfs2/dlm/dlmrecovery.c | 40 +- + fs/proc/base.c | 44 ++ + fs/proc/inode.c | 2 +- + fs/proc/namespaces.c | 1 + + fs/proc/task_mmu.c | 8 +- + fs/reiserfs/item_ops.c | 24 +- + fs/xfs/kmem.c | 12 +- + fs/xfs/kmem.h | 2 +- + fs/xfs/libxfs/xfs_btree.c | 2 +- + fs/xfs/xfs_aops.c | 6 +- + fs/xfs/xfs_buf.c | 8 +- + fs/xfs/xfs_trans.c | 12 +- + include/linux/cpumask.h | 4 +- + include/linux/crash_core.h | 71 +++ + include/linux/elf.h | 2 + + include/linux/gfp.h | 22 +- + include/linux/ipc.h | 7 +- + include/linux/jbd2.h | 2 + + include/linux/jiffies.h | 11 +- + include/linux/kexec.h | 57 +-- + include/linux/ksm.h | 5 +- + include/linux/memcontrol.h | 201 ++++---- + include/linux/migrate.h | 5 +- + include/linux/mm.h | 1 - + include/linux/mmzone.h | 12 +- + include/linux/page-isolation.h | 5 +- + include/linux/printk.h | 4 +- + include/linux/proc_ns.h | 2 + + include/linux/reboot.h | 4 + + include/linux/rmap.h | 47 +- + include/linux/rodata_test.h | 1 - + include/linux/sched.h | 7 +- + include/linux/sched/mm.h | 26 +- + include/linux/sem.h | 3 +- + include/linux/swap.h | 5 +- + include/linux/vm_event_item.h | 2 +- + include/trace/events/fs_dax.h | 130 +++++ + include/uapi/linux/sysctl.h | 4 + + init/do_mounts.h | 22 +- + init/initramfs.c | 14 +- + ipc/shm.c | 16 +- + kernel/Makefile | 1 + + kernel/crash_core.c | 439 ++++++++++++++++ + kernel/fork.c | 27 + + kernel/hung_task.c | 8 +- + kernel/kcov.c | 9 +- + kernel/kexec_core.c | 431 ---------------- + kernel/ksysfs.c | 8 +- + kernel/locking/lockdep.c | 11 +- + kernel/pid.c | 4 +- + kernel/pid_namespace.c | 34 ++ + kernel/printk/printk.c | 6 +- + kernel/reboot.c | 27 + + kernel/sysctl.c | 2 +- + kernel/taskstats.c | 14 + + lib/Kconfig.debug | 14 +- + lib/Makefile | 1 + + lib/dma-debug.c | 8 +- + lib/fault-inject.c | 9 +- + lib/list_sort.c | 149 ------ + lib/radix-tree.c | 2 + + lib/test_list_sort.c | 150 ++++++ + lib/test_sort.c | 11 +- + lib/vsprintf.c | 3 + + lib/zlib_inflate/inftrees.c | 2 +- + mm/Kconfig.debug | 1 - + mm/compaction.c | 89 ++-- + mm/filemap.c | 16 +- + mm/huge_memory.c | 12 +- + mm/internal.h | 29 +- + mm/kasan/kasan.c | 3 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/report.c | 187 ++++--- + mm/khugepaged.c | 12 +- + mm/ksm.c | 16 +- + mm/madvise.c | 45 +- + mm/memcontrol.c | 248 +++++----- + mm/memory-failure.c | 44 +- + mm/memory_hotplug.c | 6 +- + mm/migrate.c | 10 +- + mm/mlock.c | 6 +- + mm/mmap.c | 2 +- + mm/oom_kill.c | 2 + + mm/page-writeback.c | 15 +- + mm/page_alloc.c | 234 +++++---- + mm/page_ext.c | 13 +- + mm/page_idle.c | 4 +- + mm/page_isolation.c | 11 +- + mm/page_owner.c | 4 +- + mm/page_poison.c | 77 +-- + mm/rmap.c | 148 +++--- + mm/rodata_test.c | 17 +- + mm/slab.h | 1 + + mm/sparse.c | 5 +- + mm/swap.c | 49 +- + mm/swap_slots.c | 4 +- + mm/swap_state.c | 12 +- + mm/swapfile.c | 45 +- + mm/vmscan.c | 525 +++++++++++--------- + mm/vmstat.c | 72 ++- + mm/workingset.c | 6 +- + scripts/checkpatch.pl | 79 ++- + scripts/gdb/linux/constants.py.in | 7 + + scripts/gdb/linux/proc.py | 73 +++ + tools/testing/selftests/vm/Makefile | 11 +- + tools/testing/selftests/vm/run_vmtests | 6 +- + tools/testing/selftests/vm/userfaultfd.c | 207 ++++---- + usr/Kconfig | 10 + + 141 files changed, 3693 insertions(+), 2414 deletions(-) + create mode 100644 Documentation/vm/hugetlbfs_reserv.txt + create mode 100644 include/linux/crash_core.h + create mode 100644 kernel/crash_core.c + create mode 100644 lib/test_list_sort.c +$ git am -3 ../patches/linux-next-rejects.patch +Applying: linux-next-rejects +$ git reset HEAD^ +Unstaged changes after reset: +M fs/buffer.c +M fs/dax.c +M fs/internal.h +M fs/iomap.c +$ git add -A . +$ git commit -v -a --amend +[master 3f6ac2b885a1] Merge branch 'akpm-current/current' + Date: Wed Apr 26 16:49:14 2017 +1000 +$ 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: imx7: fix Kconfig warning and build errors +Applying: sparc64: NG4 memset 32 bits overflow +Applying: mm: zero hash tables in allocator +Applying: mm: update callers to use HASH_ZERO flag +Applying: mm: adaptive hash table scaling +Applying: mm: introduce kv[mz]alloc helpers +Applying: mm: introduce kv[mz]alloc helpers - f2fs fix up +Applying: mm: support __GFP_REPEAT in kvmalloc_node for >32kB +Applying: lib/rhashtable.c: simplify a strange allocation pattern +Applying: net/ipv6/ila/ila_xlat.c: simplify a strange allocation pattern +Applying: fs/xattr.c: zero out memory copied to userspace in getxattr +Applying: treewide: use kv[mz]alloc* rather than opencoded variants +Applying: net: use kvmalloc with __GFP_REPEAT rather than open coded variant +Applying: drivers/md/dm-ioctl.c: use kvmalloc rather than opencoded variant +Applying: drivers/md/bcache/super.c: use kvmalloc +Applying: mm, swap: use kvzalloc to allocate some swap data structures +Applying: mm, vmalloc: use __GFP_HIGHMEM implicitly +Applying: scripts/spelling.txt: add "memory" pattern and fix typos +Applying: scripts/spelling.txt: Add regsiter -> register spelling mistake +Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances +Applying: treewide: spelling: correct diffrent[iate] and banlance typos +Applying: treewide: move set_memory_* functions away from cacheflush.h +Applying: arm: use set_memory.h header +Applying: arm64: use set_memory.h header +Applying: s390: use set_memory.h header +Applying: x86: use set_memory.h header +Applying: agp: use set_memory.h header +Applying: drm: use set_memory.h header +Applying: drm-use-set_memoryh-header-fix +Applying: drivers/hwtracing/intel_th/msu.c: use set_memory.h header +Applying: drivers/watchdog/hpwdt.c: use set_memory.h header +Applying: include/linux/filter.h: use set_memory.h header +Applying: kernel/module.c: use set_memory.h header +Applying: kernel/power/snapshot.c: use set_memory.h header +Applying: alsa: use set_memory.h header +Applying: drivers/misc/sram-exec.c: use set_memory.h header +Applying: drivers/video/fbdev/vermilion/vermilion.c: use set_memory.h header +Applying: drivers/staging/media/atomisp/pci/atomisp2: use set_memory.h +Applying: treewide: decouple cacheflush.h and set_memory.h +Applying: kprobes/x86: merge fix for set_memory.h decoupling +Applying: kref: remove WARN_ON for NULL release functions +Applying: drivers/scsi/megaraid: remove expensive inline from megasas_return_cmd +Applying: include/linux/uaccess.h: remove expensive WARN_ON in pagefault_disabled_dec +Applying: fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag +Applying: Documentation/vm/transhuge.txt: fix trivial typos +Applying: docs-vm-transhuge-fix-few-trivial-typos-fix +Applying: format-security: move static strings to const +Applying: fs: f2fs: use ktime_get_real_seconds for sit_info times +Applying: trace: make trace_hwlat timestamp y2038 safe +Applying: fs: cifs: replace CURRENT_TIME by other appropriate apis +Applying: fs: ceph: CURRENT_TIME with ktime_get_real_ts() +Applying: fs: ufs: use ktime_get_real_ts64() for birthtime +Applying: fs: ubifs: replace CURRENT_TIME_SEC with current_time +Applying: lustre: replace CURRENT_TIME macro +Applying: apparmorfs: replace CURRENT_TIME with current_time() +Applying: gfs2: replace CURRENT_TIME with current_time +Applying: time: delete CURRENT_TIME_SEC and CURRENT_TIME +Applying: time: delete current_fs_time() +Applying: mm/huge_memory.c.c: use zap_deposited_table() more +Applying: mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required +Applying: mm: prevent potential recursive reclaim due to clearing PF_MEMALLOC +Applying: mm: introduce memalloc_noreclaim_{save,restore} +Applying: treewide: convert PF_MEMALLOC manipulations to new helpers +Applying: treewide-convert-pf_memalloc-manipulations-to-new-helpers-fix +Applying: mtd: nand: nandsim: convert to memalloc_noreclaim_*() +Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 501f6bae69f8...b7796f38de8a akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (b7796f38de8a lib/crc-ccitt: add CCITT-FALSE CRC16 variant) +$ git merge --no-ff akpm/master +Auto-merging arch/s390/include/asm/set_memory.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/vfs.txt | 3 +- + Documentation/vm/transhuge.txt | 10 +-- + arch/arc/kernel/unwind.c | 2 +- + arch/arm/include/asm/cacheflush.h | 20 ----- + arch/arm/include/asm/set_memory.h | 32 ++++++++ + arch/arm/kernel/ftrace.c | 1 + + arch/arm/kernel/kgdb.c | 2 +- + arch/arm/kernel/machine_kexec.c | 1 + + arch/arm/mach-ixp4xx/common-pci.c | 4 +- + arch/arm/mach-omap2/board-n8x0.c | 2 +- + arch/arm/mm/pageattr.c | 1 + + arch/arm/net/bpf_jit_32.c | 1 + + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/cacheflush.h | 4 - + arch/arm64/mm/pageattr.c | 1 + + arch/arm64/net/bpf_jit_comp.c | 1 + + arch/m68k/ifpsp060/src/ilsp.S | 2 +- + arch/m68k/ifpsp060/src/isp.S | 2 +- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 2 +- + arch/mips/dec/prom/init.c | 6 +- + arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 2 +- + arch/mips/kernel/traps.c | 4 +- + arch/parisc/kernel/entry.S | 2 +- + arch/parisc/kernel/module.c | 2 +- + arch/powerpc/mm/icswx.c | 2 +- + arch/s390/include/asm/Kbuild | 1 + + .../include/asm/{cacheflush.h => set_memory.h} | 9 +-- + arch/s390/kernel/ftrace.c | 1 + + arch/s390/kernel/kprobes.c | 2 +- + arch/s390/kernel/machine_kexec.c | 1 + + arch/s390/kvm/kvm-s390.c | 10 +-- + arch/s390/mm/init.c | 1 + + arch/s390/mm/pageattr.c | 1 + + arch/s390/mm/vmem.c | 1 + + arch/s390/net/bpf_jit_comp.c | 1 + + arch/sparc/lib/NG4memset.S | 26 +++---- + arch/x86/include/asm/cacheflush.h | 85 --------------------- + arch/x86/include/asm/set_memory.h | 87 ++++++++++++++++++++++ + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/bugs.c | 2 +- + arch/x86/kernel/ftrace.c | 2 +- + arch/x86/kernel/kprobes/core.c | 1 + + arch/x86/kernel/kprobes/opt.c | 1 + + arch/x86/kernel/machine_kexec_32.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/module.c | 2 +- + arch/x86/kvm/lapic.c | 4 +- + arch/x86/kvm/page_track.c | 4 +- + arch/x86/kvm/x86.c | 4 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/ioremap.c | 2 +- + arch/x86/mm/pageattr.c | 1 + + arch/x86/net/bpf_jit_comp.c | 1 + + arch/x86/pci/pcbios.c | 2 +- + arch/x86/platform/efi/efi.c | 2 +- + arch/x86/realmode/init.c | 2 +- + certs/blacklist.c | 2 +- + crypto/lzo.c | 4 +- + drivers/acpi/apei/erst.c | 8 +- + drivers/acpi/cppc_acpi.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/block/nbd.c | 7 +- + drivers/block/rbd.c | 2 +- + drivers/char/agp/amd-k7-agp.c | 1 + + drivers/char/agp/ati-agp.c | 1 + + drivers/char/agp/generic.c | 12 +-- + drivers/char/agp/intel-gtt.c | 1 + + drivers/char/agp/sworks-agp.c | 1 + + drivers/char/dsp56k.c | 2 +- + drivers/clk/qcom/common.c | 2 +- + drivers/cpufreq/powernow-k8.c | 3 +- + drivers/cpufreq/sti-cpufreq.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 + + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 4 +- + drivers/gpu/drm/gma500/gtt.c | 1 + + drivers/gpu/drm/gma500/psb_drv.c | 1 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 + + drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- + drivers/gpu/drm/radeon/radeon_gart.c | 3 + + drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 + + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 + + drivers/gpu/drm/ttm/ttm_tt.c | 3 + + drivers/hwtracing/intel_th/msu.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 2 +- + drivers/leds/leds-lp5521.c | 2 +- + drivers/leds/leds-lp5523.c | 2 +- + drivers/leds/leds-lp5562.c | 2 +- + drivers/md/bcache/super.c | 8 +- + drivers/md/bcache/util.h | 12 +-- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-ioctl.c | 13 +--- + drivers/md/dm-stats.c | 7 +- + .../media/dvb-frontends/drx39xyj/drx_dap_fasi.h | 2 +- + drivers/misc/sram-exec.c | 3 +- + drivers/mtd/nand/nandsim.c | 29 +++----- + drivers/net/can/rcar/rcar_canfd.c | 2 +- + drivers/net/ethernet/amd/amd8111e.h | 4 +- + drivers/net/ethernet/amd/atarilance.c | 4 +- + drivers/net/ethernet/amd/declance.c | 2 +- + drivers/net/ethernet/amd/sun3lance.c | 3 +- + drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h | 3 - + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 29 +------- + drivers/net/ethernet/chelsio/cxgb3/l2t.c | 8 +- + drivers/net/ethernet/chelsio/cxgb3/l2t.h | 1 - + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 12 +-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 10 +-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 31 ++------ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 14 ++-- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sched.c | 12 +-- + drivers/net/ethernet/cirrus/mac89x0.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 2 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 9 +-- + drivers/net/ethernet/mellanox/mlx4/mr.c | 9 +-- + drivers/net/ethernet/natsemi/sonic.h | 2 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 8 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/fddi/defxx.c | 2 +- + drivers/net/hippi/rrunner.c | 3 +- + drivers/nvdimm/dimm_devs.c | 5 +- + drivers/scsi/isci/registers.h | 4 +- + drivers/scsi/iscsi_tcp.c | 7 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- + drivers/soc/imx/Kconfig | 1 + + .../staging/lustre/lnet/libcfs/linux/linux-mem.c | 11 +-- + drivers/staging/lustre/lustre/llite/llite_lib.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 4 +- + .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 3 +- + .../atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c | 2 +- + .../atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c | 3 +- + .../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 5 +- + drivers/staging/most/mostcore/core.c | 2 +- + drivers/tty/n_hdlc.c | 10 +-- + drivers/tty/serial/st-asc.c | 2 +- + drivers/vhost/net.c | 9 +-- + drivers/vhost/vhost.c | 15 +--- + drivers/vhost/vsock.c | 9 +-- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/watchdog/hpwdt.c | 2 +- + drivers/xen/evtchn.c | 14 +--- + fs/btrfs/ctree.c | 9 +-- + fs/btrfs/free-space-tree.c | 3 +- + fs/btrfs/ioctl.c | 9 +-- + fs/btrfs/send.c | 27 +++---- + fs/buffer.c | 13 ++-- + fs/ceph/file.c | 9 +-- + fs/ceph/mds_client.c | 4 +- + fs/cifs/cifsencrypt.c | 4 +- + fs/cifs/cifssmb.c | 10 +-- + fs/cifs/inode.c | 28 +++---- + fs/dcache.c | 18 +---- + fs/exofs/dir.c | 3 +- + fs/ext4/mballoc.c | 2 +- + fs/ext4/super.c | 4 +- + fs/f2fs/f2fs.h | 20 ----- + fs/f2fs/file.c | 4 +- + fs/f2fs/node.c | 6 +- + fs/f2fs/segment.c | 16 ++-- + fs/f2fs/segment.h | 5 +- + fs/file.c | 2 +- + fs/gfs2/bmap.c | 4 +- + fs/hfs/extent.c | 4 +- + fs/hfsplus/extents.c | 5 +- + fs/inode.c | 16 +--- + fs/iomap.c | 13 +--- + fs/namei.c | 2 +- + fs/namespace.c | 10 +-- + fs/select.c | 5 +- + fs/seq_file.c | 16 +--- + fs/ubifs/dir.c | 12 +-- + fs/ubifs/file.c | 12 +-- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/misc.h | 10 --- + fs/ubifs/sb.c | 14 +++- + fs/ubifs/xattr.c | 6 +- + fs/ufs/ialloc.c | 6 +- + fs/xattr.c | 27 +++---- + fs/xfs/kmem.c | 2 +- + fs/xfs/xfs_log_recover.c | 2 +- + include/asm-generic/set_memory.h | 12 +++ + include/drm/drm_mem_util.h | 9 +-- + include/linux/bcma/bcma_driver_pci.h | 2 +- + include/linux/bootmem.h | 2 + + include/linux/crc-ccitt.h | 7 ++ + include/linux/filter.h | 4 +- + include/linux/fs.h | 6 +- + include/linux/ftrace.h | 2 +- + include/linux/kref.h | 6 -- + include/linux/kvm_host.h | 2 - + include/linux/mlx4/device.h | 2 +- + include/linux/mlx5/driver.h | 7 +- + include/linux/mm.h | 22 ++++++ + include/linux/sched/mm.h | 12 +++ + include/linux/time.h | 3 - + include/linux/uaccess.h | 1 - + include/linux/vmalloc.h | 1 + + include/uapi/linux/ipmi.h | 2 +- + ipc/util.c | 7 +- + kernel/bpf/core.c | 9 +-- + kernel/bpf/syscall.c | 3 +- + kernel/fork.c | 2 +- + kernel/groups.c | 2 +- + kernel/locking/qspinlock_paravirt.h | 3 +- + kernel/module.c | 5 +- + kernel/pid.c | 7 +- + kernel/power/snapshot.c | 3 + + kernel/time/time.c | 14 ---- + kernel/trace/trace_entries.h | 6 +- + kernel/trace/trace_hwlat.c | 14 ++-- + kernel/trace/trace_output.c | 9 +-- + lib/crc-ccitt.c | 58 ++++++++++++++- + lib/iov_iter.c | 5 +- + lib/rhashtable.c | 13 +--- + mm/filemap.c | 6 -- + mm/frame_vector.c | 5 +- + mm/huge_memory.c | 28 +++++-- + mm/kasan/kasan.c | 2 +- + mm/nommu.c | 8 +- + mm/page_alloc.c | 41 ++++++++-- + mm/swap_slots.c | 19 +++-- + mm/swap_state.c | 2 +- + mm/swapfile.c | 10 ++- + mm/util.c | 57 ++++++++++++++ + mm/vmalloc.c | 23 ++++-- + mm/vmscan.c | 17 +++-- + net/ceph/ceph_common.c | 2 +- + net/ceph/messenger.c | 6 +- + net/ceph/osd_client.c | 4 +- + net/core/dev.c | 31 ++++---- + net/core/sock.c | 7 +- + net/decnet/af_decnet.c | 3 +- + net/ipv4/inet_hashtables.c | 6 +- + net/ipv4/tcp_metrics.c | 5 +- + net/ipv6/ila/ila_xlat.c | 8 +- + net/mpls/af_mpls.c | 5 +- + net/netfilter/x_tables.c | 24 ++---- + net/netfilter/xt_recent.c | 5 +- + net/sched/sch_choke.c | 5 +- + net/sched/sch_fq.c | 12 +-- + net/sched/sch_fq_codel.c | 26 ++----- + net/sched/sch_hhf.c | 33 +++----- + net/sched/sch_netem.c | 6 +- + net/sched/sch_sfq.c | 6 +- + scripts/spelling.txt | 8 ++ + security/apparmor/apparmorfs.c | 4 +- + security/apparmor/include/lib.h | 11 --- + security/apparmor/lib.c | 30 -------- + security/apparmor/match.c | 2 +- + security/apparmor/policy_unpack.c | 2 +- + security/keys/keyctl.c | 22 ++---- + sound/pci/hda/hda_intel.c | 2 +- + sound/pci/intel8x0.c | 4 +- + sound/soc/soc-core.c | 2 +- + sound/x86/intel_hdmi_audio.c | 2 +- + virt/kvm/kvm_main.c | 18 +---- + 270 files changed, 932 insertions(+), 1086 deletions(-) + create mode 100644 arch/arm/include/asm/set_memory.h + rename arch/s390/include/asm/{cacheflush.h => set_memory.h} (80%) + create mode 100644 arch/x86/include/asm/set_memory.h + create mode 100644 include/asm-generic/set_memory.h diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..65b58e875914 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.11-rc5 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..36dc05f38e82 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20170426 |