Add linux-next specific files for 20171116
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..09761db
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,273 @@
+Name SHA1
+---- ----
+origin 5bbcc0f595fadb4cac0eddc4401035ec0bd95b09
+fixes 820bf5c419e4b85298e5c3001bd1b5be46d60765
+kbuild-current bb3f38c3c5b759163e09b9152629cc789731de47
+arc-current f3156851616b4f3cb1d6c567fe46adcfd43ad8f8
+arm-current b9dd05c7002ee0ca8b676428b2268c26399b5e31
+m68k-current 5e387199c17c4d2fb8b72ada82fbf81f4ba6f317
+metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861
+powerpc-fixes 7ecb37f62fe58e3e4d9b03443b92d213b2c108ce
+sparc 23198ddffb6cddb5d5824230af4dd4b46e4046a4
+fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51
+net b39545684a90ef3374abc0969d64c7bc540d128d
+ipsec 94802151894d482e82c324edf2c658f8e6b96508
+netfilter 7400bb4b5800831581a82f71700af6a5e815c3c8
+ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d
+wireless-drivers a6127b4440d1f74f26b64006b2f50c9dc6d66efc
+mac80211 b39545684a90ef3374abc0969d64c7bc540d128d
+sound-current 3aabf94c2d95fe465d5fa8590113d1c1f7d8333d
+pci-current 6b7be529634bbfbf6395f23217a66d731fbed0a0
+driver-core.current 39dae59d66acd86d1de24294bd2f343fd5e7a625
+tty.current 894025f24bd028942da3e602b87d9f7223109b14
+usb.current 894025f24bd028942da3e602b87d9f7223109b14
+usb-gadget-fixes 7c80f9e4a588f1925b07134bb2e3689335f6c6d8
+usb-serial-fixes 0b07194bb55ed836c2cc7c22e866b87a14681984
+usb-chipidea-fixes cbb22ebcfb9920380ed69854a7095d497798063d
+phy 2fb850092fd95198a0a4746f07b80077d5a3aa37
+staging.current 894025f24bd028942da3e602b87d9f7223109b14
+char-misc.current bb176f67090ca54869fc1262c913aa69d2ede070
+input-current c25141062a82ae8bddced1b3ce2b57a1c0efabe0
+crypto-current 1d9ddde12e3c9bab7f3d3484eb9446315e3571ca
+ide b671e1703394d77163130c91f53b075db1c446bf
+vfio-fixes 796b755066dd6254bfb6388fec901631e868d1c7
+kselftest-fixes a323335e62cc161abb818f259eea0e1e72eb5c27
+backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f
+ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600
+nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe
+spi-nor-fixes 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f
+mfd-fixes 0f0fc5c090055983163ed8e7b3a73980e128048c
+v4l-dvb-fixes 30b4e122d71cbec2944a5f8b558b88936ee42f10
+reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa
+mips-fixes b084116f8587b222a2c5ef6dcd846f40f24b9420
+drm-intel-fixes 423a8a942e95493b73228ba6a3f176dcc7f35fa9
+drm-misc-fixes 9271c0ca573e02a360b636ecd8cb408852f4e9f6
+kbuild bcd572cbae02afd06ae32fd904a7a9bfa2920c4c
+uuid c0020756315eebec58310aca42cf9fb73e1322eb
+dma-mapping c9eb6172c328dde7e14812f94f8da87b691e41b5
+asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12
+arc 64dd3a7c8202f09f5d08e48577bc72ca1d85004d
+arm 02196144a0a0ad71fb75bd4a5a4785ab36c3b78e
+arm-perf 07141342149a62db780c02f6352a0610a535eee1
+arm-soc ec9acd01224fc9dfdb7d7102940f03cfb50c18cc
+actions e707b3fe4814cfed9caef799fac53e87f4519825
+alpine a1144b2b1ec47f50951a83eb2bd847c74415b567
+amlogic 5751276f6bbfcb868a6e5ef4307bf394fee66ca4
+aspeed 9c9ae757dc8b8c5f7ca676587e58af3e63d4c766
+at91 bee152d6af7d735f177ad1398ed9bbe84dfb6d63
+bcm2835 e83e7335d05989773de0f70c0bea6a912343c21a
+berlin 5153351425c92f3e89358c8eb62ca8d901437581
+cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4
+imx-mxs ac5a1ba06d5cfa9722bb217f6fff5378b9fd8a84
+keystone 8270bfa5860d590a37063ee1fb586b13fb5f2caf
+mvebu c6c5ff72be36b321c9da7de1ecd4d1daf938ff31
+omap a95e738b4c728f6d233b9e5312de879c5c7ac473
+omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2
+reset b9cbcd5f933ca5007edff54f8f8acfaaaa92626d
+qcom e7048ed58ed960c5355138ee7db740ab28ec4d4e
+realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9
+renesas 7cec0c56730a6306acc3208f83b88802ee6ee537
+rockchip 308c3c77ccb3fe8b342aa07d8aed08fd219f1ff5
+rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590
+samsung 2ea659a9ef488125eb46da6eb571de5eae5c43f6
+samsung-krzk 767d6ca130af0a3b45bdeb97014c3bcb768b26e8
+sunxi b5996699462f8e34847b8f18f2bf6fb421dd1311
+tegra ec0c973f47c74920bc8731f7355b5bf9a3f38de4
+arm64 6cfa7cc46b1a7a15d81d5389c99cfca633c12b8e
+clk 36331641eb4296f0c62f4bf1e320d8c30bc6a863
+clk-samsung a4f21e9ceb5c81f5b297cabb98dac0b5c03bd4dc
+c6x 62016565bb04cb9f138510e87c9e4da95e00fdfb
+cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76
+h8300 58c57526711f7c87046b7c5a650535acbab2d3fb
+hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a
+ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6
+m68k 5e387199c17c4d2fb8b72ada82fbf81f4ba6f317
+m68knommu c8b61d508986b7e77bab11f8252b67e6e2b9a7cc
+metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5
+microblaze dfe390a6d844f81bd32c63e29c9f257a021d3d23
+mips e0c5f36b2a638fc3298200c385af7f196d3b5cd4
+nios2 65d1e3ddeae117f6a224535e10a09145f0f96508
+openrisc 610f01b9a88a9ef8b506709a825c17395c56a62a
+parisc-hd 2ebe916e60b08c5052626bd7c95de41f892e7d48
+powerpc 3ffa9d9e2a7c10127d8cbf91ea2be15390b450ed
+fsl a4e89ffb59235fd11d27107dea3efa4562ac0a12
+mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0
+risc-v f0b0655e99364856082c243446de1fbaeafb9bc0
+s390 049a2c2d486e8cc82c5cd79fa479c5b105b109e9
+sparc-next 9cd6681cb1169e815c41af0265165dd1b872f228
+sh 6e2fbfdd585f46128ce8879738bca09719a65138
+tile 777a45b458660b18d7d7c3e0d874d08650c99cd2
+uml 6d20e6b235aad0be463b23588093b079362bb2e4
+unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5
+xtensa 271335b9726e230eda124c83af2b4773502288f5
+fscrypt a0b3bc855374c50b5ea85273553485af48caf2f7
+befs 5771a8c08880cdca3bfb4a3fc6d309d6bba20877
+btrfs 5226fcac7841f66e5c141d27f0d099b5fd0d626f
+btrfs-kdave 32a7ff6bee2486d93e0c86e40ee751b67843e423
+ceph 3cfa3b16dd2f1787f9d19d6da2fe9652d806b387
+cifs 87df26175e67c26ccdd3a002fbbb8cde78e28a19
+configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6
+ecryptfs 4670269faba728683f7250319a65390946c028e3
+ext3 b8b09923822342f4297130a3158e8d508cab3668
+ext4 232530680290ba94ca37852ab10d9556ea28badf
+f2fs ead710b7d82dc9e8184e10871c155a3ed8b3f673
+freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad
+fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea
+fuse c6cdd51404b7ac12dd95173ddfc548c59ecf037f
+jfs 88a96fa84186deadb8b1ecc8cb066cd7afeb5bf2
+nfs bebc6082da0a9f5d47a1ea2edc099bf671058bd4
+nfsd ade7340656f315a970464eaad2a52ea886b26bc6
+orangefs 0b08273c8ab7e688832120c4817b1adfdc56e231
+overlayfs d9768076068f81687b3dbddbd76b5e108f5d53d0
+v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc
+ubifs 89b68cd926633ff0df1e1a0ae29fcd80f68bdd96
+xfs 2d1d1da3d9cc387262193e83f0a96d753b040720
+file-locks 3b9f8ed25dbe5f858b1331588929f2a766aef55f
+vfs 7d8c430e7e2257c5c644a87fd188e18d079f5367
+vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58
+printk 9afe77ed849de6af8532b4c1b9310102eed9edf7
+pci 91f3140fdef61074515470243370d92a45f0b516
+pstore e19b205be43d11bff638cad4487008c48d21c103
+hid 55c25de3018800ff9f5b6fc8f4725637ea2c399c
+i2c a7d4b13f2a0df5f20de563109a7486cd9b7117f6
+jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225
+dmi 0bcea5c474d1a86736b0fb3c7dbff9d8d2fbeace
+hwmon-staging ded0eb83449e8fcba22fd2736826336e101ffbcb
+jc_docs 47427379ea80f1368ccec6ba20874fc19a9f0cc4
+v4l-dvb 30b4e122d71cbec2944a5f8b558b88936ee42f10
+v4l-dvb-next db6321a1af8432df983048d2dd8529525589f71d
+fbdev d447ebf9c77b16effd8aca114d7d281639e3f77f
+pm e23d3f3f9c7638a876657c074a5880931586187b
+cpupower dbdc468f35ee827cab2753caa1c660bdb832243a
+idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f
+opp 9e66317d3c92ddaab330c125dfe9d06eee268aff
+thermal 1e032393d9680c1f3b5238ec0f3f4eb006ee83d2
+thermal-soc b2fd708ffa7f43ce8680271924e1771e26a3ec91
+ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de
+dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb
+swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a
+net-next 50895b9de1d3e0258e015e8e55128d835d9a9f19
+ipsec-next 2a171788ba7bb61995e98e8163204fc7880f63b2
+netfilter-next 347fdfb20f3f79ab7754aa9eea1d0420f5f1d9d1
+nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2
+ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f
+wireless-drivers-next fdd0bd88ceaecf729db103ac8836af5805dd2dc1
+bluetooth 869efc02aba63fc1d39b062d6ffb568ef8af5d98
+mac80211-next 5048a9c329afa9b3a1c282fa28726540f2a1ca78
+rdma 4190b4e96954e2c3597021d29435c3f8db8d3129
+gfs2 37cb8e1f8e10c6e9bd2a1b95cdda0620a21b0551
+mtd 36de80740008e6a4a55115b4a92e2059e47c1cba
+l2-mtd 1530578abdac4edce9244c7a1962ded3ffdb58ce
+nand 30863e38ebeb500a31cecee8096fb5002677dd9b
+spi-nor ec0a9f62b393ed0c5bb9185a8efebb0ad00b7d0d
+crypto 1d9ddde12e3c9bab7f3d3484eb9446315e3571ca
+drm f150891fd9878ef0d9197c4e8451ce67c3bdd014
+drm-amd-dc 26c860d5579684528114c3875ef88f7796330eb5
+drm-panel e4bac408b08437d190785ab1250cc676304ed171
+drm-intel e8c49fa96838101435b9e4884d49b30da7a4e0c6
+drm-tegra fb83be8873909ba7c089d1c5cb72873cc2cce7d1
+drm-misc a9386bb051931778436db3dd6e3a163f7db92b56
+drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13
+drm-msm ad9d50c790434a27920044d6d493c2df05e450ef
+hdlcd fee4964f0a6cd2ce6368d2c69e9ec8e6f44fb0ec
+mali-dp a593a185218e27d6268afae0578f9eae655076e9
+sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f
+imx-drm e64b9189bfd58e215ee44159767b39b8cf6fa302
+etnaviv 330b52bd9bba1d66028772dfe08c053a34c5069a
+kconfig 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c
+regmap a15fdc340db10ac6f8d73e11f966f012a5e938a7
+sound 3aabf94c2d95fe465d5fa8590113d1c1f7d8333d
+sound-asoc c05c9c1c0ca7e35075ad7abf58621428bc7d2750
+modules ece1996a21eeb344b49200e627c6660111009c10
+input c1b433e04ef9c0a1c4d65bfe918472ffa334dff4
+block 50da70ed9c48b7a758a3f57fe1d31fd2748db1e8
+lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba
+device-mapper 914d7a7f29d5b6ff3fe88ed905ff8a228a241a11
+pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8
+mmc 37cb8e1f8e10c6e9bd2a1b95cdda0620a21b0551
+kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb
+md 0868b99c214a3d55486c700de7c3f770b7243e7c
+mfd b2596d70351370530d3fce16f3b6e6f1cd4dbdf0
+backlight 29fae2c1db242a39c5c7c49434fb183f990df2f8
+battery 838c8afa67f98014970c9f56107805e767ed87ad
+omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b
+regulator f77447db122a28c609ca8753f13108d0a770df3f
+security e5729f86a2987c9404f9b2fb494b9a6fc4412baf
+integrity e87dafe70acc3872395a208e7e33758a00984446
+keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88
+selinux 5794ed762ac2125299644494766704da94168ec0
+tpmdd f8b73d394f91d3927455e5bc44571bb26ecd0b7f
+watchdog 4cb30b044a8f06e6e6418ae12c3c00bb02679dac
+iommu a593472591a5cf2d91244bc3f319c9dd91119343
+dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98
+vfio d0422298337986e63714df6637093e4153d7dab9
+trivial 1972d6c0c86dd8620ff9f2811ce875135ffb5405
+audit 42d5e37654e4cdb9fb2e2f3ab30045fee35c42d8
+devicetree aa25e446ce76c37bfd75ac06598c316af94e9a26
+mailbox 1f90a2162fb3cdfd9c44380bf16209af00f7acbe
+spi abbdb5ce31c21a4b3c3922c56030f3d487497933
+tip a2c95b3e7d98449f2a75d86ba264a2196666bafc
+clockevents 8a7507eea818d829e2ac9fce3ba769458681ef02
+edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755
+edac-amd a8e9b186f153a44690ad0363a56716e7077ad28c
+irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201
+ftrace a96a5037ed0f52e2d86739f4a1ef985bd036e575
+rcu ad4e25a3a1a5a95b334242d908e26f1249db83e0
+kvm 61d750773df388632b11a6170098e2865977e1f6
+kvm-arm 95b110ab9a093b5baf3a72e51f71279368d618e2
+kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03
+kvm-ppc 432953b4455d8a48af0500a77826c71871671161
+kvms390 da9a1446d248f673a8560ce46251ff620214ab7b
+xen-tip 646d944c2ef5a3b298c4e150494c71b9272d8b47
+percpu 438a50618095061920d3a30d4c5ca1ef2e0ff860
+workqueues 56e87829c90f8790ba6db4cc97069002f7008a67
+drivers-x86 73ed298b0605a81d8cbf212df887f7b2fe65a61b
+chrome-platform 859eb05676f67d4960130dff36d3368006716110
+hsi 8635d6b3afe68cdde2f646c2a3bbd8149c031e8c
+leds 3faee9423ce07186fc9dcec2981d4eb8af8872bb
+ipmi 71c07ce42ccc61dc06b29dfe68182dd211cf22e5
+driver-core 0ff26c662d5f3b26674d5205c8899d901f766acb
+usb 894025f24bd028942da3e602b87d9f7223109b14
+usb-gadget ce2b21a4e5ce042c0a42c9db8fa9e0f849427d5e
+usb-serial 7c36e6e14da53a0a9c0893c363163afe629b2ee5
+usb-chipidea-next 2a53e060a053d5d7627dcde5b06b5950902d9ce6
+phy-next 36914111e6829be36b23d1109214250b5ee1ee9c
+tty 894025f24bd028942da3e602b87d9f7223109b14
+char-misc f13d1a8a801dae552ef495c84a223280586a9f67
+extcon d1ee96706144c24b1f9582b21aa9b5ba7fd18419
+staging 894025f24bd028942da3e602b87d9f7223109b14
+mux aae4e7a8bc44722fe70d58920a36916b1043195e
+slave-dma 97d7fc7575b7bf038df8a1f95a553bd715d1e494
+cgroup cefe6851e8909f397cf4c85fe61f12024abb4f88
+scsi 341b2aa83368e6f23bf0cc3d04604896337ad7cb
+scsi-mkp 341b2aa83368e6f23bf0cc3d04604896337ad7cb
+target-updates 97488c73190bb785cba818bf31e7361a27aded41
+target-merge 2994a75183173defc21f0d26ce23b63232211b88
+target-bva 2ea659a9ef488125eb46da6eb571de5eae5c43f6
+libata d9d72867f89b703547ed5c838acf3c58586c0002
+binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed
+vhost b4ebef9a9020791e4916f063779754bf6f13fbfc
+rpmsg fd21c7c7519b7e6b4c0c7c1c8a94de240bf837bd
+gpio 24f0966c3e3f52a96e888504d60810d9df5b2d42
+pinctrl eeb690bceb1eb95f6c1c526079e1315dd459855e
+pinctrl-samsung 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e
+pwm f83e2ae2606b3754a5b9dfe9dd792c453698df6c
+dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a
+userns 3fda0e737e906ce73220b20c27e7f792d0aac6a8
+ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e
+random 9e66317d3c92ddaab330c125dfe9d06eee268aff
+aio 2a8a98673c13cb2a61a6476153acf8344adfa992
+kselftest c3e0d179bff503cd56758579a2c33216b40b9b7b
+y2038 69973b830859bc6529a7a0468ba0d80ee5117826
+luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d
+livepatching 3602b15a20a67dff74e43116bedaf893686cb3df
+coresight 1b551764f9718bc20eca5bdb0b06b32b6f2e6c60
+rtc b64bfde0ef6021b5a19e8a31ea613395873aca41
+hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828
+nvdimm 4247f24c23589bcc3bc3490515ef8c9497e9ae55
+dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad
+idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371
+kspp 3889a28c449c01cebe166e413a58742002c2352b
+akpm-current e5410482eb3e160f40c6ca6dd4f53b551ce716df
+akpm 7e8a1fd62911a59f1f95d4620e89603230fdd6f9
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..c460d5c
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,275 @@
+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
+nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes
+spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/fixes
+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
+reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes
+mips-fixes git it://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-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
+uuid git git://git.infradead.org/users/hch/uuid.git#for-next
+dma-mapping git git://git.infradead.org/users/hch/dma-mapping.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
+actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.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
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next
+realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.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
+clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-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.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-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
+risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git#for-linux-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://git.kernel.org/pub/scm/linux/kernel/git/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.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
+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
+cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower
+idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-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
+nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-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://git.infradead.org/l2-mtd.git#nand/next
+spi-nor git git://git.infradead.org/l2-mtd.git#spi-nor/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-amd-dc git git://people.freedesktop.org/~airlied/linux.git#drm-next-amd-dc-staging
+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
+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-testing
+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.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#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.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#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/bleung/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
+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
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+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 0000000..8966057
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,12464 @@
+$ date -R
+Thu, 16 Nov 2017 07:59:24 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
+Merging origin/master (5bbcc0f595fa Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
+$ git merge origin/master
+Updating 894025f24bd0..5bbcc0f595fa
+Fast-forward
+ .gitignore | 44 +-
+ .../ABI/obsolete/proc-sys-vm-nr_pdflush_threads | 5 -
+ Documentation/ABI/obsolete/sysfs-gpio | 2 +-
+ Documentation/ABI/testing/sysfs-bus-thunderbolt | 48 +
+ Documentation/admin-guide/thunderbolt.rst | 24 +
+ Documentation/arm64/cpu-feature-registers.txt | 18 +-
+ Documentation/arm64/elf_hwcaps.txt | 160 +
+ Documentation/arm64/memory.txt | 10 +-
+ Documentation/arm64/sve.txt | 508 +++
+ Documentation/block/biodoc.txt | 11 +-
+ Documentation/block/null_blk.txt | 19 +-
+ Documentation/bpf/bpf_design_QA.txt | 156 +
+ Documentation/crypto/api-samples.rst | 52 +-
+ .../devicetree/bindings/arm/samsung/pmu.txt | 2 +-
+ .../bindings/arm/samsung/samsung-boards.txt | 2 +-
+ Documentation/devicetree/bindings/arm/sp810.txt | 2 +-
+ Documentation/devicetree/bindings/arm/spe-pmu.txt | 20 +
+ .../devicetree/bindings/arm/vexpress-sysreg.txt | 2 +-
+ .../devicetree/bindings/ata/ahci-platform.txt | 2 +-
+ Documentation/devicetree/bindings/ata/imx-sata.txt | 2 +-
+ Documentation/devicetree/bindings/bus/imx-weim.txt | 2 +-
+ .../devicetree/bindings/bus/sunxi-rsb.txt | 2 +-
+ .../devicetree/bindings/clock/arm-syscon-icst.txt | 2 +-
+ .../devicetree/bindings/clock/clk-exynos-audss.txt | 2 +-
+ .../bindings/clock/clk-s5pv210-audss.txt | 2 +-
+ .../bindings/clock/dove-divider-clock.txt | 2 +-
+ .../devicetree/bindings/clock/imx1-clock.txt | 4 +-
+ .../devicetree/bindings/clock/imx6q-clock.txt | 4 +-
+ .../devicetree/bindings/clock/maxim,max77686.txt | 4 +-
+ .../devicetree/bindings/clock/st/st,clkgen.txt | 2 +-
+ .../devicetree/bindings/clock/sunxi-ccu.txt | 4 +-
+ Documentation/devicetree/bindings/clock/sunxi.txt | 16 +-
+ .../devicetree/bindings/clock/ti,cdce706.txt | 2 +-
+ .../devicetree/bindings/common-properties.txt | 26 +
+ .../{rng => crypto}/samsung,exynos-rng4.txt | 0
+ .../devicetree/bindings/crypto/sun4i-ss.txt | 2 +-
+ .../bindings/display/etnaviv/etnaviv-drm.txt | 2 +-
+ .../devicetree/bindings/display/imx/hdmi.txt | 4 +-
+ .../bindings/display/simple-framebuffer.txt | 2 +-
+ .../bindings/display/sunxi/sun4i-drm.txt | 4 +-
+ .../devicetree/bindings/dma/renesas,usb-dmac.txt | 2 +
+ Documentation/devicetree/bindings/dma/sprd-dma.txt | 41 +
+ .../devicetree/bindings/dma/stm32-dma.txt | 4 +-
+ .../devicetree/bindings/dma/stm32-dmamux.txt | 84 +
+ .../devicetree/bindings/dma/stm32-mdma.txt | 94 +
+ .../devicetree/bindings/dma/sun4i-dma.txt | 4 +-
+ .../devicetree/bindings/dma/sun6i-dma.txt | 28 +-
+ Documentation/devicetree/bindings/dma/ti-edma.txt | 6 +-
+ Documentation/devicetree/bindings/dma/zxdma.txt | 2 +-
+ .../devicetree/bindings/eeprom/eeprom.txt | 2 +
+ .../bindings/firmware/nvidia,tegra186-bpmp.txt | 2 +-
+ .../devicetree/bindings/gpio/gpio-dsp-keystone.txt | 2 +-
+ .../devicetree/bindings/gpio/gpio-max3191x.txt | 59 +
+ .../devicetree/bindings/gpio/gpio-tz1090-pdc.txt | 2 +-
+ .../devicetree/bindings/gpio/gpio-tz1090.txt | 2 +-
+ .../devicetree/bindings/gpio/gpio-uniphier.txt | 52 +
+ .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 2 +
+ .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 1 +
+ .../devicetree/bindings/i2c/i2c-aspeed.txt | 7 +-
+ .../devicetree/bindings/i2c/i2c-axxia.txt | 2 +-
+ .../devicetree/bindings/i2c/i2c-davinci.txt | 12 +
+ Documentation/devicetree/bindings/i2c/i2c-gpio.txt | 32 +-
+ Documentation/devicetree/bindings/i2c/i2c-mux.txt | 4 +-
+ Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 1 +
+ .../devicetree/bindings/i2c/i2c-sunxi-p2wi.txt | 2 +-
+ Documentation/devicetree/bindings/i2c/i2c.txt | 4 +-
+ .../bindings/iio/magnetometer/ak8974.txt | 2 +-
+ .../bindings/iio/magnetometer/ak8975.txt | 2 +-
+ .../devicetree/bindings/input/gpio-mouse.txt | 32 +
+ .../devicetree/bindings/input/sun4i-lradc-keys.txt | 2 +-
+ .../bindings/input/touchscreen/egalax-ts.txt | 2 +-
+ .../bindings/input/touchscreen/exc3000.txt | 27 +
+ .../bindings/input/touchscreen/goodix.txt | 3 +-
+ .../bindings/input/touchscreen/hideep.txt | 42 +
+ .../bindings/input/touchscreen/imx6ul_tsc.txt | 2 +-
+ .../bindings/input/touchscreen/samsung,s6sy761.txt | 34 +
+ .../interrupt-controller/allwinner,sunxi-nmi.txt | 2 +-
+ .../interrupt-controller/ti,keystone-irq.txt | 2 +-
+ .../devicetree/bindings/iommu/qcom,iommu.txt | 2 +-
+ .../bindings/iommu/renesas,ipmmu-vmsa.txt | 2 +-
+ .../devicetree/bindings/leds/register-bit-led.txt | 16 +-
+ .../bindings/mailbox/ti,message-manager.txt | 2 +-
+ Documentation/devicetree/bindings/marvell.txt | 4 +-
+ .../devicetree/bindings/media/i2c/tc358743.txt | 2 +-
+ .../devicetree/bindings/media/img-ir-rev1.txt | 2 +-
+ .../devicetree/bindings/media/renesas,vsp1.txt | 2 +-
+ .../devicetree/bindings/media/stih-cec.txt | 2 +-
+ .../bindings/media/stih407-c8sectpfe.txt | 2 +-
+ .../devicetree/bindings/media/sunxi-ir.txt | 2 +-
+ Documentation/devicetree/bindings/mfd/arizona.txt | 40 +-
+ Documentation/devicetree/bindings/mfd/max77686.txt | 2 +-
+ Documentation/devicetree/bindings/mfd/max77802.txt | 2 +-
+ Documentation/devicetree/bindings/mfd/mfd.txt | 2 +-
+ .../devicetree/bindings/mfd/sun4i-gpadc.txt | 4 +-
+ .../devicetree/bindings/mfd/sun6i-prcm.txt | 2 +-
+ Documentation/devicetree/bindings/mfd/syscon.txt | 2 +-
+ Documentation/devicetree/bindings/mmc/mmc.txt | 2 +-
+ Documentation/devicetree/bindings/mmc/sdhci-st.txt | 4 +-
+ .../devicetree/bindings/mmc/sunxi-mmc.txt | 4 +-
+ .../devicetree/bindings/mtd/sunxi-nand.txt | 2 +-
+ .../bindings/net/allwinner,sun4i-emac.txt | 2 +-
+ .../bindings/net/allwinner,sun4i-mdio.txt | 4 +-
+ .../bindings/net/allwinner,sun7i-a20-gmac.txt | 2 +-
+ .../devicetree/bindings/net/bluetooth.txt | 5 +
+ .../devicetree/bindings/net/brcm,bcmgenet.txt | 2 +-
+ .../devicetree/bindings/net/can/m_can.txt | 2 +-
+ .../devicetree/bindings/net/can/sun4i_can.txt | 4 +-
+ .../devicetree/bindings/net/dsa/lan9303.txt | 4 +-
+ Documentation/devicetree/bindings/net/fsl-fec.txt | 13 +
+ .../devicetree/bindings/net/renesas,ravb.txt | 4 +-
+ Documentation/devicetree/bindings/net/sh_eth.txt | 14 +-
+ Documentation/devicetree/bindings/net/stmmac.txt | 2 +-
+ .../bindings/net/wireless/brcm,bcm43xx-fmac.txt | 2 +-
+ .../bindings/nvmem/allwinner,sunxi-sid.txt | 4 +-
+ .../devicetree/bindings/nvmem/brcm,ocotp.txt | 2 +-
+ .../devicetree/bindings/nvmem/imx-ocotp.txt | 2 +-
+ Documentation/devicetree/bindings/nvmem/nvmem.txt | 2 +-
+ Documentation/devicetree/bindings/nvmem/qfprom.txt | 2 +-
+ .../bindings/pci/nvidia,tegra20-pcie.txt | 12 +-
+ .../bindings/phy/brcm,cygnus-pcie-phy.txt | 2 +-
+ .../devicetree/bindings/phy/mxs-usb-phy.txt | 2 +-
+ .../devicetree/bindings/phy/sun9i-usb-phy.txt | 2 +-
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 +-
+ .../bindings/pinctrl/fsl,imx-pinctrl.txt | 4 +-
+ .../bindings/pinctrl/img,tz1090-pdc-pinctrl.txt | 4 +-
+ .../bindings/pinctrl/img,tz1090-pinctrl.txt | 4 +-
+ .../pinctrl/nvidia,tegra124-xusb-padctl.txt | 2 +-
+ .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 2 +-
+ .../devicetree/bindings/pinctrl/pinctrl-st.txt | 2 +-
+ .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 2 +-
+ .../devicetree/bindings/power/fsl,imx-gpc.txt | 4 +-
+ .../bindings/power/reset/imx-snvs-poweroff.txt | 2 +-
+ .../bindings/power/reset/keystone-reset.txt | 4 +-
+ .../bindings/power/supply/sbs,sbs-manager.txt | 66 +
+ .../bindings/powerpc/fsl/mcu-mpc8349emitx.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-sun4i.txt | 2 +-
+ .../devicetree/bindings/regulator/max77686.txt | 2 +-
+ .../devicetree/bindings/regulator/max77802.txt | 2 +-
+ .../bindings/reset/allwinner,sunxi-clock-reset.txt | 2 +-
+ .../devicetree/bindings/reset/fsl,imx-src.txt | 6 +-
+ .../devicetree/bindings/reset/ti-syscon-reset.txt | 2 +-
+ Documentation/devicetree/bindings/riscv/cpus.txt | 162 +
+ .../devicetree/bindings/rng/brcm,iproc-rng200.txt | 4 +-
+ .../devicetree/bindings/rtc/dallas,ds1339.txt | 18 -
+ .../devicetree/bindings/rtc/rtc-ds1307.txt | 44 +
+ .../devicetree/bindings/rtc/rtc-m41t80.txt | 31 +
+ .../devicetree/bindings/rtc/sirf,prima2-sysrtc.txt | 13 +
+ .../bindings/rtc/stericsson,coh901331.txt | 17 +
+ .../devicetree/bindings/rtc/sun6i-rtc.txt | 2 +-
+ .../devicetree/bindings/rtc/sunxi-rtc.txt | 2 +-
+ .../bindings/serial/brcm,bcm6345-uart.txt | 6 +
+ .../bindings/soc/fsl/cpm_qe/qe/par_io.txt | 2 +-
+ .../bindings/soc/fsl/cpm_qe/qe/pincfg.txt | 2 +-
+ .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 8 +
+ .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 2 +-
+ .../devicetree/bindings/sound/audio-graph-card.txt | 1 +
+ .../bindings/sound/audio-graph-scu-card.txt | 5 +-
+ .../devicetree/bindings/sound/cdns,xtfpga-i2s.txt | 2 +-
+ .../devicetree/bindings/sound/cs42l56.txt | 2 +-
+ .../devicetree/bindings/sound/fsl,asrc.txt | 2 +-
+ .../devicetree/bindings/sound/fsl,esai.txt | 2 +-
+ .../devicetree/bindings/sound/fsl,spdif.txt | 2 +-
+ .../devicetree/bindings/sound/imx-audmux.txt | 2 +-
+ Documentation/devicetree/bindings/sound/rt5514.txt | 13 +-
+ Documentation/devicetree/bindings/sound/rt5663.txt | 16 +
+ .../devicetree/bindings/sound/samsung-i2s.txt | 2 +-
+ .../devicetree/bindings/sound/sgtl5000.txt | 2 +-
+ .../devicetree/bindings/sound/st,stm32-sai.txt | 14 +-
+ .../devicetree/bindings/sound/sun4i-codec.txt | 4 +-
+ .../devicetree/bindings/sound/sun4i-i2s.txt | 2 +-
+ .../devicetree/bindings/sound/sun8i-a33-codec.txt | 2 +-
+ .../bindings/sound/sun8i-codec-analog.txt | 2 +-
+ .../bindings/sound/sunxi,sun4i-spdif.txt | 2 +-
+ .../devicetree/bindings/sound/tfa9879.txt | 23 +
+ .../devicetree/bindings/sound/wlf,arizona.txt | 53 +
+ .../devicetree/bindings/sound/zte,zx-spdif.txt | 2 +-
+ .../devicetree/bindings/spi/spi-sun4i.txt | 2 +-
+ .../devicetree/bindings/spi/spi-sun6i.txt | 4 +-
+ .../devicetree/bindings/sram/samsung-sram.txt | 2 +-
+ .../devicetree/bindings/sram/sunxi-sram.txt | 4 +-
+ .../bindings/timer/allwinner,sun5i-a13-hstimer.txt | 2 +-
+ .../devicetree/bindings/trivial-devices.txt | 13 +-
+ .../bindings/usb/allwinner,sun4i-a10-musb.txt | 2 +-
+ .../devicetree/bindings/usb/am33xx-usb.txt | 2 +-
+ .../devicetree/bindings/usb/atmel-usb.txt | 4 +-
+ .../devicetree/bindings/usb/ohci-da8xx.txt | 2 +-
+ Documentation/devicetree/bindings/usb/usb-ehci.txt | 2 +-
+ .../devicetree/bindings/usb/usb-nop-xceiv.txt | 2 +
+ Documentation/devicetree/bindings/usb/usb-ohci.txt | 2 +-
+ Documentation/devicetree/bindings/usb/usb3503.txt | 2 +-
+ .../devicetree/bindings/usb/usbmisc-imx.txt | 2 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 8 +
+ .../devicetree/bindings/watchdog/mtk-wdt.txt | 2 +-
+ .../devicetree/bindings/watchdog/sunxi-wdt.txt | 2 +-
+ Documentation/devicetree/overlay-notes.txt | 12 +-
+ Documentation/driver-api/80211/cfg80211.rst | 3 -
+ Documentation/driver-api/scsi.rst | 2 +-
+ Documentation/filesystems/fscrypt.rst | 610 ++++
+ Documentation/filesystems/index.rst | 11 +
+ Documentation/filesystems/udf.txt | 8 +-
+ Documentation/gpio/consumer.txt | 63 +-
+ Documentation/gpio/driver.txt | 6 +-
+ Documentation/kbuild/makefiles.txt | 1 -
+ Documentation/leds/00-INDEX | 10 +
+ Documentation/livepatch/callbacks.txt | 605 ++++
+ Documentation/livepatch/shadow-vars.txt | 192 ++
+ Documentation/md/md-cluster.txt | 3 +-
+ Documentation/networking/dsa/lan9303.txt | 37 +
+ Documentation/networking/gtp.txt | 103 +-
+ Documentation/networking/ila.txt | 285 ++
+ Documentation/networking/ip-sysctl.txt | 37 +-
+ Documentation/networking/ipvlan.txt | 42 +-
+ Documentation/networking/netdev-FAQ.txt | 5 +-
+ Documentation/networking/netvsc.txt | 8 +-
+ Documentation/networking/regulatory.txt | 30 +-
+ Documentation/networking/rxrpc.txt | 53 +-
+ Documentation/networking/vrf.txt | 13 +-
+ Documentation/perf/hisi-pmu.txt | 53 +
+ Documentation/scsi/scsi-parameters.txt | 13 +-
+ Documentation/scsi/smartpqi.txt | 2 +-
+ Documentation/sound/hd-audio/models.rst | 2 +
+ Documentation/sound/oss/ALS | 66 -
+ Documentation/sound/oss/AudioExcelDSP16 | 101 -
+ Documentation/sound/oss/CMI8330 | 152 -
+ Documentation/sound/oss/ESS | 34 -
+ Documentation/sound/oss/ESS1868 | 55 -
+ Documentation/sound/oss/Introduction | 459 ---
+ Documentation/sound/oss/MultiSound | 1137 -------
+ Documentation/sound/oss/OPL3 | 6 -
+ Documentation/sound/oss/Opti | 218 --
+ Documentation/sound/oss/PAS16 | 162 -
+ Documentation/sound/oss/PSS | 41 -
+ Documentation/sound/oss/PSS-updates | 88 -
+ Documentation/sound/oss/README.OSS | 1455 ---------
+ Documentation/sound/oss/README.modules | 106 -
+ Documentation/sound/oss/README.ymfsb | 107 -
+ Documentation/sound/oss/SoundPro | 105 -
+ Documentation/sound/oss/Soundblaster | 53 -
+ Documentation/sound/oss/Tropez+ | 26 -
+ Documentation/sound/oss/VIBRA16 | 80 -
+ Documentation/sound/oss/WaveArtist | 170 -
+ Documentation/sound/oss/btaudio | 92 -
+ Documentation/sound/oss/mwave | 185 --
+ Documentation/sound/oss/oss-parameters.txt | 51 -
+ Documentation/sound/oss/ultrasound | 30 -
+ MAINTAINERS | 112 +-
+ Makefile | 5 +-
+ arch/alpha/Kconfig | 2 +-
+ arch/alpha/include/asm/dma-mapping.h | 2 -
+ arch/alpha/include/asm/floppy.h | 2 -
+ arch/arc/Kconfig | 6 +-
+ arch/arc/boot/.gitignore | 1 -
+ arch/arc/boot/dts/Makefile | 8 +-
+ arch/arm/boot/.gitignore | 1 -
+ arch/arm/boot/dts/Makefile | 6 -
+ arch/arm/configs/dove_defconfig | 2 +-
+ arch/arm/configs/multi_v5_defconfig | 2 +-
+ arch/arm/configs/orion5x_defconfig | 2 +-
+ arch/arm/include/asm/arch_timer.h | 1 +
+ arch/arm/include/asm/kvm_host.h | 3 +
+ arch/arm/mach-bcm/Kconfig | 6 +-
+ arch/arm/mach-ep93xx/core.c | 41 +-
+ arch/arm/mach-ep93xx/edb93xx.c | 15 +-
+ arch/arm/mach-ep93xx/include/mach/platform.h | 4 +-
+ arch/arm/mach-ep93xx/simone.c | 12 +-
+ arch/arm/mach-ep93xx/snappercl15.c | 12 +-
+ arch/arm/mach-ep93xx/vision_ep9307.c | 7 +-
+ arch/arm/mach-ixp4xx/avila-setup.c | 17 +-
+ arch/arm/mach-ixp4xx/dsmg600-setup.c | 16 +-
+ arch/arm/mach-ixp4xx/fsg-setup.c | 16 +-
+ arch/arm/mach-ixp4xx/goramo_mlr.c | 24 +-
+ arch/arm/mach-ixp4xx/ixdp425-setup.c | 16 +-
+ arch/arm/mach-ixp4xx/nas100d-setup.c | 16 +-
+ arch/arm/mach-ixp4xx/nslu2-setup.c | 16 +-
+ arch/arm/mach-ks8695/board-acs5k.c | 15 +-
+ arch/arm/mach-pxa/palmz72.c | 14 +-
+ arch/arm/mach-pxa/viper.c | 27 +-
+ arch/arm/mach-sa1100/simpad.c | 14 +-
+ arch/arm/plat-samsung/Kconfig | 2 +-
+ arch/arm64/Kconfig | 20 +-
+ arch/arm64/Makefile | 10 +-
+ arch/arm64/boot/dts/.gitignore | 1 -
+ arch/arm64/boot/dts/Makefile | 58 +-
+ arch/arm64/boot/dts/actions/Makefile | 4 -
+ arch/arm64/boot/dts/al/Makefile | 4 -
+ arch/arm64/boot/dts/allwinner/Makefile | 4 -
+ arch/arm64/boot/dts/altera/Makefile | 4 -
+ arch/arm64/boot/dts/amd/Makefile | 4 -
+ arch/arm64/boot/dts/amlogic/Makefile | 4 -
+ arch/arm64/boot/dts/apm/Makefile | 4 -
+ arch/arm64/boot/dts/arm/Makefile | 4 -
+ arch/arm64/boot/dts/broadcom/Makefile | 7 +-
+ arch/arm64/boot/dts/broadcom/northstar2/Makefile | 4 -
+ arch/arm64/boot/dts/broadcom/stingray/Makefile | 4 -
+ arch/arm64/boot/dts/cavium/Makefile | 4 -
+ arch/arm64/boot/dts/exynos/Makefile | 4 -
+ arch/arm64/boot/dts/freescale/Makefile | 4 -
+ arch/arm64/boot/dts/hisilicon/Makefile | 4 -
+ arch/arm64/boot/dts/lg/Makefile | 4 -
+ arch/arm64/boot/dts/marvell/Makefile | 4 -
+ arch/arm64/boot/dts/mediatek/Makefile | 4 -
+ arch/arm64/boot/dts/nvidia/Makefile | 3 -
+ arch/arm64/boot/dts/qcom/Makefile | 4 -
+ arch/arm64/boot/dts/realtek/Makefile | 4 -
+ arch/arm64/boot/dts/renesas/Makefile | 3 -
+ arch/arm64/boot/dts/rockchip/Makefile | 4 -
+ arch/arm64/boot/dts/socionext/Makefile | 3 -
+ arch/arm64/boot/dts/sprd/Makefile | 4 -
+ arch/arm64/boot/dts/xilinx/Makefile | 4 -
+ arch/arm64/boot/dts/zte/Makefile | 4 -
+ arch/arm64/include/asm/arch_timer.h | 1 +
+ arch/arm64/include/asm/asm-bug.h | 8 +-
+ arch/arm64/include/asm/assembler.h | 51 +-
+ arch/arm64/include/asm/barrier.h | 2 +
+ arch/arm64/include/asm/cpu.h | 4 +
+ arch/arm64/include/asm/cpucaps.h | 3 +-
+ arch/arm64/include/asm/cpufeature.h | 42 +
+ arch/arm64/include/asm/daifflags.h | 72 +
+ arch/arm64/include/asm/elf.h | 4 +-
+ arch/arm64/include/asm/esr.h | 3 +-
+ arch/arm64/include/asm/fpsimd.h | 71 +-
+ arch/arm64/include/asm/fpsimdmacros.h | 148 +
+ arch/arm64/include/asm/irqflags.h | 40 +-
+ arch/arm64/include/asm/kvm_arm.h | 5 +-
+ arch/arm64/include/asm/kvm_host.h | 11 +
+ arch/arm64/include/asm/memory.h | 15 -
+ arch/arm64/include/asm/pgtable.h | 14 +
+ arch/arm64/include/asm/processor.h | 28 +
+ arch/arm64/include/asm/sysreg.h | 121 +
+ arch/arm64/include/asm/thread_info.h | 5 +
+ arch/arm64/include/asm/traps.h | 8 +
+ arch/arm64/include/uapi/asm/hwcap.h | 6 +
+ arch/arm64/include/uapi/asm/ptrace.h | 139 +-
+ arch/arm64/include/uapi/asm/sigcontext.h | 120 +-
+ arch/arm64/kernel/Makefile | 2 -
+ arch/arm64/kernel/armv8_deprecated.c | 23 +-
+ arch/arm64/kernel/cpufeature.c | 204 +-
+ arch/arm64/kernel/cpuinfo.c | 12 +
+ arch/arm64/kernel/debug-monitors.c | 5 +-
+ arch/arm64/kernel/entry-fpsimd.S | 17 +
+ arch/arm64/kernel/entry-ftrace.S | 12 +-
+ arch/arm64/kernel/entry.S | 128 +-
+ arch/arm64/kernel/fpsimd.c | 908 +++++-
+ arch/arm64/kernel/head.S | 30 +-
+ arch/arm64/kernel/hibernate.c | 5 +-
+ arch/arm64/kernel/io.c | 12 +-
+ arch/arm64/kernel/machine_kexec.c | 4 +-
+ arch/arm64/kernel/process.c | 64 +-
+ arch/arm64/kernel/ptrace.c | 280 +-
+ arch/arm64/kernel/setup.c | 15 +-
+ arch/arm64/kernel/signal.c | 179 +-
+ arch/arm64/kernel/signal32.c | 2 +-
+ arch/arm64/kernel/smp.c | 18 +-
+ arch/arm64/kernel/suspend.c | 8 +-
+ arch/arm64/kernel/traps.c | 109 +-
+ arch/arm64/kernel/vdso/gettimeofday.S | 2 +-
+ arch/arm64/kvm/handle_exit.c | 8 +
+ arch/arm64/kvm/hyp/debug-sr.c | 24 +-
+ arch/arm64/kvm/hyp/switch.c | 12 +-
+ arch/arm64/kvm/sys_regs.c | 292 +-
+ arch/arm64/lib/Makefile | 2 +-
+ arch/arm64/lib/delay.c | 23 +-
+ arch/arm64/lib/tishift.S | 80 +
+ arch/arm64/mm/dma-mapping.c | 5 +-
+ arch/arm64/mm/fault.c | 72 +-
+ arch/arm64/mm/proc.S | 9 +-
+ arch/blackfin/mach-bf518/boards/ezbrd.c | 47 -
+ arch/blackfin/mach-bf518/boards/tcm-bf518.c | 1 -
+ arch/blackfin/mach-bf533/boards/blackstamp.c | 19 +-
+ arch/blackfin/mach-bf533/boards/ezkit.c | 18 +-
+ arch/blackfin/mach-bf533/boards/stamp.c | 18 +-
+ arch/blackfin/mach-bf561/boards/ezkit.c | 18 +-
+ arch/c6x/boot/dts/Makefile | 2 -
+ arch/cris/boot/dts/Makefile | 2 -
+ arch/cris/include/asm/dma-mapping.h | 6 -
+ arch/frv/include/asm/dma-mapping.h | 7 -
+ arch/h8300/boot/dts/Makefile | 6 -
+ arch/hexagon/include/asm/dma-mapping.h | 3 -
+ arch/ia64/include/asm/dma-mapping.h | 11 -
+ arch/m32r/include/asm/dma-mapping.h | 5 -
+ arch/m68k/include/asm/dma-mapping.h | 6 -
+ arch/metag/boot/.gitignore | 1 -
+ arch/metag/boot/dts/Makefile | 6 -
+ arch/metag/include/asm/dma-mapping.h | 10 -
+ arch/microblaze/boot/.gitignore | 1 -
+ arch/microblaze/boot/Makefile | 2 +-
+ arch/microblaze/include/asm/dma-mapping.h | 39 -
+ arch/microblaze/kernel/dma.c | 17 +
+ arch/mips/Kbuild.platforms | 1 -
+ arch/mips/Kconfig | 42 +-
+ arch/mips/Makefile | 6 +-
+ arch/mips/alchemy/board-gpr.c | 23 +-
+ arch/mips/alchemy/common/clock.c | 10 +-
+ arch/mips/ath79/mach-pb44.c | 16 +-
+ arch/mips/bcm47xx/leds.c | 2 +-
+ arch/mips/bcm63xx/clk.c | 242 +-
+ arch/mips/boot/.gitignore | 1 -
+ arch/mips/boot/dts/Makefile | 33 +-
+ arch/mips/boot/dts/brcm/Makefile | 4 -
+ arch/mips/boot/dts/brcm/bcm3368.dtsi | 2 +
+ .../boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts | 2 +-
+ arch/mips/boot/dts/brcm/bcm63268.dtsi | 2 +
+ arch/mips/boot/dts/brcm/bcm6328.dtsi | 2 +
+ .../boot/dts/brcm/bcm6358-neufbox4-sercomm.dts | 2 +-
+ arch/mips/boot/dts/brcm/bcm6358.dtsi | 2 +
+ arch/mips/boot/dts/brcm/bcm6362.dtsi | 2 +
+ arch/mips/boot/dts/brcm/bcm6368.dtsi | 2 +
+ arch/mips/boot/dts/cavium-octeon/Makefile | 3 -
+ arch/mips/boot/dts/img/Makefile | 3 -
+ arch/mips/boot/dts/img/pistachio.dtsi | 1 -
+ arch/mips/boot/dts/ingenic/Makefile | 3 -
+ arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +
+ arch/mips/boot/dts/lantiq/Makefile | 3 -
+ arch/mips/boot/dts/mti/Makefile | 3 -
+ arch/mips/boot/dts/netlogic/Makefile | 3 -
+ arch/mips/boot/dts/ni/Makefile | 3 -
+ arch/mips/boot/dts/pic32/Makefile | 3 -
+ arch/mips/boot/dts/qca/Makefile | 3 -
+ arch/mips/boot/dts/ralink/Makefile | 3 -
+ arch/mips/boot/dts/ralink/rt3052_eval.dts | 2 +-
+ arch/mips/boot/dts/xilfpga/Makefile | 5 +-
+ arch/mips/boot/dts/xilfpga/nexys4ddr.dts | 8 +
+ arch/mips/cavium-octeon/executive/cvmx-helper.c | 2 +-
+ arch/mips/cavium-octeon/executive/cvmx-spi.c | 10 +-
+ arch/mips/configs/ci20_defconfig | 7 +-
+ arch/mips/configs/db1xxx_defconfig | 1 -
+ arch/mips/configs/generic/board-xilfpga.config | 22 +
+ arch/mips/configs/ip22_defconfig | 1 +
+ arch/mips/configs/xilfpga_defconfig | 75 -
+ arch/mips/generic/Kconfig | 6 +
+ arch/mips/generic/board-xilfpga.its.S | 22 +
+ arch/mips/include/asm/asmmacro.h | 16 +-
+ arch/mips/include/asm/bitops.h | 1 +
+ arch/mips/include/asm/cmpxchg.h | 2 +
+ arch/mips/include/asm/dma-mapping.h | 3 -
+ arch/mips/include/asm/mipsregs.h | 14 +-
+ arch/mips/include/asm/octeon/cvmx-fpa.h | 4 +-
+ arch/mips/include/asm/octeon/cvmx.h | 15 +-
+ arch/mips/include/asm/page.h | 4 +-
+ arch/mips/include/asm/processor.h | 2 -
+ arch/mips/include/asm/smp.h | 2 +-
+ arch/mips/include/asm/syscall.h | 29 +-
+ arch/mips/kernel/process.c | 2 +-
+ arch/mips/kernel/ptrace.c | 41 +-
+ arch/mips/kernel/ptrace32.c | 7 +
+ arch/mips/kernel/r4k_fpu.S | 20 +-
+ arch/mips/kernel/setup.c | 4 +
+ arch/mips/kernel/smp.c | 2 +-
+ arch/mips/lantiq/xway/sysctrl.c | 6 +-
+ arch/mips/lasat/picvue_proc.c | 3 +-
+ arch/mips/math-emu/cp1emu.c | 46 +-
+ arch/mips/math-emu/dp_maddf.c | 8 +-
+ arch/mips/math-emu/dp_mul.c | 8 +-
+ arch/mips/math-emu/dp_sqrt.c | 4 +-
+ arch/mips/math-emu/ieee754.h | 15 +-
+ arch/mips/math-emu/ieee754int.h | 6 +-
+ arch/mips/math-emu/ieee754sp.c | 4 +-
+ arch/mips/math-emu/ieee754sp.h | 2 +-
+ arch/mips/math-emu/sp_div.c | 4 +-
+ arch/mips/math-emu/sp_fint.c | 2 +-
+ arch/mips/math-emu/sp_maddf.c | 6 +-
+ arch/mips/math-emu/sp_mul.c | 10 +-
+ arch/mips/mm/dma-default.c | 9 +-
+ arch/mips/mm/init.c | 4 -
+ arch/mips/pci/pci-mt7620.c | 15 +-
+ arch/mips/pci/pcie-octeon.c | 12 +-
+ arch/mips/ralink/Kconfig | 1 -
+ arch/mips/ralink/mt7620.c | 4 +-
+ arch/mips/xilfpga/Kconfig | 10 -
+ arch/mips/xilfpga/Makefile | 7 -
+ arch/mips/xilfpga/Platform | 3 -
+ arch/mips/xilfpga/init.c | 44 -
+ arch/mips/xilfpga/intc.c | 22 -
+ arch/mips/xilfpga/time.c | 41 -
+ arch/mn10300/include/asm/dma-mapping.h | 10 -
+ arch/nios2/boot/.gitignore | 1 -
+ arch/nios2/boot/Makefile | 2 -
+ arch/nios2/include/asm/dma-mapping.h | 9 -
+ arch/openrisc/boot/dts/Makefile | 2 -
+ arch/parisc/include/asm/dma-mapping.h | 8 -
+ arch/parisc/kernel/pci-dma.c | 8 +
+ arch/powerpc/boot/.gitignore | 1 -
+ arch/powerpc/boot/Makefile | 2 +-
+ arch/powerpc/include/asm/dma-mapping.h | 7 -
+ arch/powerpc/include/asm/floppy.h | 2 -
+ arch/powerpc/platforms/Kconfig | 2 +-
+ arch/powerpc/platforms/pseries/dlpar.c | 24 +-
+ arch/powerpc/platforms/pseries/reconfig.c | 2 +-
+ arch/riscv/Kconfig | 310 ++
+ arch/riscv/Makefile | 72 +
+ arch/riscv/configs/defconfig | 0
+ arch/riscv/include/asm/Kbuild | 61 +
+ arch/riscv/include/asm/asm-offsets.h | 1 +
+ arch/riscv/include/asm/asm.h | 76 +
+ arch/riscv/include/asm/atomic.h | 375 +++
+ arch/riscv/include/asm/barrier.h | 68 +
+ arch/riscv/include/asm/bitops.h | 218 ++
+ arch/riscv/include/asm/bug.h | 88 +
+ arch/riscv/include/asm/cache.h | 22 +
+ arch/riscv/include/asm/cacheflush.h | 39 +
+ arch/riscv/include/asm/cmpxchg.h | 134 +
+ arch/riscv/include/asm/compat.h | 29 +
+ arch/riscv/include/asm/csr.h | 132 +
+ arch/riscv/include/asm/current.h | 45 +
+ arch/riscv/include/asm/delay.h | 28 +
+ arch/riscv/include/asm/dma-mapping.h | 38 +
+ arch/riscv/include/asm/elf.h | 84 +
+ arch/riscv/include/asm/hwcap.h | 37 +
+ arch/riscv/include/asm/io.h | 303 ++
+ arch/riscv/include/asm/irq.h | 28 +
+ arch/riscv/include/asm/irqflags.h | 63 +
+ arch/riscv/include/asm/kprobes.h | 22 +
+ arch/riscv/include/asm/linkage.h | 20 +
+ arch/riscv/include/asm/mmu.h | 26 +
+ arch/riscv/include/asm/mmu_context.h | 69 +
+ arch/riscv/include/asm/page.h | 130 +
+ arch/riscv/include/asm/pci.h | 48 +
+ arch/riscv/include/asm/pgalloc.h | 124 +
+ arch/riscv/include/asm/pgtable-32.h | 25 +
+ arch/riscv/include/asm/pgtable-64.h | 84 +
+ arch/riscv/include/asm/pgtable-bits.h | 48 +
+ arch/riscv/include/asm/pgtable.h | 430 +++
+ arch/riscv/include/asm/processor.h | 97 +
+ arch/riscv/include/asm/ptrace.h | 118 +
+ arch/riscv/include/asm/sbi.h | 100 +
+ arch/riscv/include/asm/smp.h | 52 +
+ arch/riscv/include/asm/spinlock.h | 151 +
+ arch/riscv/include/asm/spinlock_types.h | 33 +
+ arch/riscv/include/asm/string.h | 26 +
+ arch/riscv/include/asm/switch_to.h | 69 +
+ arch/riscv/include/asm/syscall.h | 102 +
+ arch/riscv/include/asm/thread_info.h | 94 +
+ arch/riscv/include/asm/timex.h | 59 +
+ arch/riscv/include/asm/tlb.h | 24 +
+ arch/riscv/include/asm/tlbflush.h | 64 +
+ arch/riscv/include/asm/uaccess.h | 513 +++
+ arch/riscv/include/asm/unistd.h | 16 +
+ arch/riscv/include/asm/vdso.h | 41 +
+ arch/riscv/include/asm/word-at-a-time.h | 55 +
+ arch/riscv/include/uapi/asm/Kbuild | 27 +
+ arch/riscv/include/uapi/asm/auxvec.h | 24 +
+ arch/riscv/include/uapi/asm/bitsperlong.h | 25 +
+ arch/riscv/include/uapi/asm/byteorder.h | 23 +
+ arch/riscv/include/uapi/asm/elf.h | 83 +
+ arch/riscv/include/uapi/asm/hwcap.h | 36 +
+ arch/riscv/include/uapi/asm/ptrace.h | 90 +
+ arch/riscv/include/uapi/asm/sigcontext.h | 30 +
+ arch/riscv/include/uapi/asm/siginfo.h | 24 +
+ arch/riscv/include/uapi/asm/ucontext.h | 45 +
+ arch/riscv/kernel/.gitignore | 1 +
+ arch/riscv/kernel/Makefile | 33 +
+ arch/riscv/kernel/asm-offsets.c | 322 ++
+ arch/riscv/kernel/cacheinfo.c | 105 +
+ arch/riscv/kernel/cpu.c | 108 +
+ arch/riscv/kernel/cpufeature.c | 61 +
+ arch/riscv/kernel/entry.S | 464 +++
+ arch/riscv/kernel/head.S | 157 +
+ arch/riscv/kernel/irq.c | 39 +
+ arch/riscv/kernel/module.c | 217 ++
+ arch/riscv/kernel/process.c | 129 +
+ arch/riscv/kernel/ptrace.c | 125 +
+ arch/riscv/kernel/reset.c | 36 +
+ arch/riscv/kernel/riscv_ksyms.c | 15 +
+ arch/riscv/kernel/setup.c | 257 ++
+ arch/riscv/kernel/signal.c | 292 ++
+ arch/riscv/kernel/smp.c | 110 +
+ arch/riscv/kernel/smpboot.c | 114 +
+ arch/riscv/kernel/stacktrace.c | 177 +
+ arch/riscv/kernel/sys_riscv.c | 49 +
+ arch/riscv/kernel/syscall_table.c | 25 +
+ arch/riscv/kernel/time.c | 61 +
+ arch/riscv/kernel/traps.c | 180 +
+ arch/riscv/kernel/vdso.c | 125 +
+ arch/riscv/kernel/vdso/.gitignore | 2 +
+ arch/riscv/kernel/vdso/Makefile | 63 +
+ arch/riscv/kernel/vdso/rt_sigreturn.S | 24 +
+ arch/riscv/kernel/vdso/vdso.S | 27 +
+ arch/riscv/kernel/vdso/vdso.lds.S | 77 +
+ arch/riscv/kernel/vmlinux.lds.S | 92 +
+ arch/riscv/lib/Makefile | 6 +
+ arch/riscv/lib/delay.c | 110 +
+ arch/riscv/lib/memcpy.S | 115 +
+ arch/riscv/lib/memset.S | 120 +
+ arch/riscv/lib/uaccess.S | 117 +
+ arch/riscv/lib/udivdi3.S | 38 +
+ arch/riscv/mm/Makefile | 4 +
+ arch/riscv/mm/extable.c | 37 +
+ arch/riscv/mm/fault.c | 282 ++
+ arch/riscv/mm/init.c | 70 +
+ arch/riscv/mm/ioremap.c | 92 +
+ arch/s390/include/asm/dma-mapping.h | 5 -
+ arch/sh/boot/dts/Makefile | 2 -
+ arch/sh/include/asm/dma-mapping.h | 7 +-
+ arch/sh/kernel/dma-nommu.c | 17 +-
+ arch/sh/mm/consistent.c | 6 +-
+ arch/sparc/include/asm/dma-mapping.h | 8 -
+ arch/sparc/include/asm/floppy_32.h | 1 -
+ arch/sparc/include/asm/floppy_64.h | 1 -
+ arch/tile/include/asm/dma-mapping.h | 9 -
+ arch/um/drivers/net_kern.c | 9 +-
+ arch/unicore32/Kconfig | 2 +-
+ arch/unicore32/include/asm/cacheflush.h | 9 -
+ arch/unicore32/include/asm/dma-mapping.h | 22 -
+ arch/unicore32/mm/proc-syms.c | 3 -
+ arch/x86/crypto/aesni-intel_glue.c | 10 +-
+ arch/x86/crypto/crc32-pclmul_asm.S | 17 +-
+ arch/x86/include/asm/dma-mapping.h | 7 -
+ arch/xtensa/Kconfig | 2 +-
+ arch/xtensa/boot/.gitignore | 1 -
+ arch/xtensa/boot/dts/Makefile | 9 +-
+ arch/xtensa/include/asm/dma-mapping.h | 3 -
+ arch/xtensa/kernel/pci-dma.c | 23 -
+ arch/xtensa/platforms/iss/simdisk.c | 4 +-
+ block/badblocks.c | 2 +-
+ block/bfq-iosched.c | 225 +-
+ block/bio-integrity.c | 7 +-
+ block/bio.c | 40 +-
+ block/blk-cgroup.c | 9 +-
+ block/blk-core.c | 274 +-
+ block/blk-flush.c | 37 +-
+ block/blk-lib.c | 108 +-
+ block/blk-mq-debugfs.c | 3 +-
+ block/blk-mq-sched.c | 203 +-
+ block/blk-mq-tag.c | 11 +-
+ block/blk-mq-tag.h | 7 +-
+ block/blk-mq.c | 422 ++-
+ block/blk-mq.h | 60 +-
+ block/blk-settings.c | 2 +-
+ block/blk-stat.c | 45 +-
+ block/blk-throttle.c | 12 +-
+ block/blk-timeout.c | 5 +-
+ block/blk-wbt.c | 2 +-
+ block/blk.h | 46 +-
+ block/bsg.c | 18 +-
+ block/elevator.c | 67 +-
+ block/genhd.c | 70 +-
+ block/ioctl.c | 19 +-
+ block/kyber-iosched.c | 12 +-
+ block/mq-deadline.c | 1 +
+ block/scsi_ioctl.c | 8 +-
+ crypto/Kconfig | 11 +
+ crypto/Makefile | 1 +
+ crypto/af_alg.c | 27 -
+ crypto/ahash.c | 12 +-
+ crypto/algapi.c | 6 +-
+ crypto/algboss.c | 1 -
+ crypto/algif_aead.c | 8 +-
+ crypto/algif_hash.c | 30 +-
+ crypto/algif_skcipher.c | 9 +-
+ crypto/api.c | 13 +
+ crypto/asymmetric_keys/public_key.c | 28 +-
+ crypto/cryptd.c | 4 +-
+ crypto/cts.c | 6 +-
+ crypto/dh.c | 36 +-
+ crypto/dh_helper.c | 20 +-
+ crypto/drbg.c | 36 +-
+ crypto/ecdh.c | 6 -
+ crypto/ecdh_helper.c | 2 +-
+ crypto/gcm.c | 55 +-
+ crypto/gf128mul.c | 13 +
+ crypto/keywrap.c | 84 +-
+ crypto/lrw.c | 17 +-
+ crypto/rmd128.c | 2 -
+ crypto/rmd160.c | 2 -
+ crypto/rmd256.c | 2 -
+ crypto/rmd320.c | 2 -
+ crypto/rsa-pkcs1pad.c | 16 +-
+ crypto/sm3_generic.c | 210 ++
+ crypto/tcrypt.c | 209 +-
+ crypto/testmgr.c | 210 +-
+ crypto/testmgr.h | 67 +
+ crypto/xts.c | 8 +-
+ drivers/acpi/acpi_apd.c | 5 +
+ drivers/acpi/acpi_configfs.c | 6 +-
+ drivers/acpi/arm64/gtdt.c | 2 +-
+ drivers/acpi/arm64/iort.c | 258 +-
+ drivers/amba/bus.c | 1 +
+ drivers/atm/fore200e.c | 8 +
+ drivers/atm/horizon.c | 2 +-
+ drivers/atm/idt77105.c | 2 -
+ drivers/atm/idt77252.c | 21 +-
+ drivers/atm/idt77252.h | 3 +
+ drivers/atm/iphase.c | 6 +-
+ drivers/atm/suni.c | 10 +-
+ drivers/base/core.c | 2 +-
+ drivers/base/platform.c | 1 +
+ drivers/bcma/Kconfig | 18 +-
+ drivers/bcma/driver_gpio.c | 2 +-
+ drivers/bcma/driver_mips.c | 12 +-
+ drivers/block/Kconfig | 5 +
+ drivers/block/brd.c | 1 -
+ drivers/block/cryptoloop.c | 2 -
+ drivers/block/floppy.c | 4 +
+ drivers/block/loop.c | 13 +
+ drivers/block/loop.h | 1 +
+ drivers/block/mtip32xx/mtip32xx.c | 7 -
+ drivers/block/nbd.c | 26 +-
+ drivers/block/null_blk.c | 14 +-
+ drivers/block/paride/Kconfig | 1 +
+ drivers/block/skd_main.c | 3 +-
+ drivers/bluetooth/Kconfig | 3 +-
+ drivers/bluetooth/bcm203x.c | 2 +-
+ drivers/bluetooth/bluecard_cs.c | 7 +-
+ drivers/bluetooth/bpa10x.c | 15 +-
+ drivers/bluetooth/bt3c_cs.c | 2 +-
+ drivers/bluetooth/btbcm.c | 106 +-
+ drivers/bluetooth/btintel.c | 42 +-
+ drivers/bluetooth/btmrvl_sdio.c | 6 +-
+ drivers/bluetooth/btqca.c | 6 +-
+ drivers/bluetooth/btqcomsmd.c | 45 +
+ drivers/bluetooth/btrtl.c | 21 +-
+ drivers/bluetooth/btusb.c | 232 +-
+ drivers/bluetooth/hci_ath.c | 51 +-
+ drivers/bluetooth/hci_bcm.c | 263 +-
+ drivers/bluetooth/hci_bcsp.c | 10 +-
+ drivers/bluetooth/hci_h4.c | 2 +-
+ drivers/bluetooth/hci_h5.c | 10 +-
+ drivers/bluetooth/hci_ldisc.c | 49 +-
+ drivers/bluetooth/hci_ll.c | 2 +-
+ drivers/bluetooth/hci_qca.c | 29 +-
+ drivers/bluetooth/hci_serdev.c | 9 +-
+ drivers/bluetooth/hci_uart.h | 2 +-
+ drivers/bus/arm-ccn.c | 1 +
+ drivers/cdrom/Makefile | 15 +-
+ drivers/char/hw_random/Kconfig | 6 +-
+ drivers/char/hw_random/core.c | 53 +-
+ drivers/char/hw_random/iproc-rng200.c | 1 +
+ drivers/char/hw_random/pseries-rng.c | 2 +-
+ drivers/char/hw_random/timeriomem-rng.c | 7 -
+ drivers/char/hw_random/virtio-rng.c | 21 +-
+ drivers/clocksource/arm_arch_timer.c | 25 +-
+ drivers/connector/cn_queue.c | 4 +-
+ drivers/connector/connector.c | 2 +-
+ drivers/crypto/Kconfig | 40 +-
+ drivers/crypto/Makefile | 1 -
+ drivers/crypto/amcc/Makefile | 2 +-
+ drivers/crypto/amcc/crypto4xx_alg.c | 512 ++-
+ drivers/crypto/amcc/crypto4xx_core.c | 831 +++--
+ drivers/crypto/amcc/crypto4xx_core.h | 199 +-
+ drivers/crypto/amcc/crypto4xx_reg_def.h | 3 +
+ drivers/crypto/amcc/crypto4xx_sa.c | 85 -
+ drivers/crypto/amcc/crypto4xx_sa.h | 99 +-
+ drivers/crypto/atmel-aes.c | 80 +-
+ drivers/crypto/atmel-sha.c | 5 +-
+ drivers/crypto/atmel-tdes.c | 23 +-
+ drivers/crypto/bcm/cipher.c | 116 +-
+ drivers/crypto/bcm/cipher.h | 3 +-
+ drivers/crypto/bcm/util.c | 14 +-
+ drivers/crypto/caam/caamalg.c | 10 +-
+ drivers/crypto/caam/caamalg_qi.c | 7 +-
+ drivers/crypto/caam/caamhash.c | 12 +-
+ drivers/crypto/caam/compat.h | 1 +
+ drivers/crypto/caam/desc.h | 2 +-
+ drivers/crypto/cavium/nitrox/nitrox_hal.c | 2 +-
+ drivers/crypto/ccp/ccp-crypto-aes-galois.c | 9 +-
+ drivers/crypto/ccp/ccp-crypto-main.c | 8 +-
+ drivers/crypto/ccp/ccp-dev-v5.c | 3 +-
+ drivers/crypto/ccp/ccp-dev.c | 7 +-
+ drivers/crypto/ccp/ccp-dmaengine.c | 5 +-
+ drivers/crypto/chelsio/chcr_algo.c | 1798 +++++-----
+ drivers/crypto/chelsio/chcr_algo.h | 57 +-
+ drivers/crypto/chelsio/chcr_core.c | 10 +-
+ drivers/crypto/chelsio/chcr_core.h | 2 +-
+ drivers/crypto/chelsio/chcr_crypto.h | 121 +-
+ drivers/crypto/inside-secure/safexcel_hash.c | 6 +-
+ drivers/crypto/ixp4xx_crypto.c | 1 -
+ drivers/crypto/marvell/cesa.c | 29 +-
+ drivers/crypto/marvell/cesa.h | 27 +-
+ drivers/crypto/marvell/cipher.c | 476 ++-
+ drivers/crypto/marvell/tdma.c | 5 +-
+ drivers/crypto/mediatek/mtk-aes.c | 39 +-
+ drivers/crypto/mv_cesa.c | 1216 -------
+ drivers/crypto/mv_cesa.h | 151 -
+ drivers/crypto/n2_core.c | 12 +-
+ drivers/crypto/nx/nx-842-pseries.c | 2 +-
+ drivers/crypto/nx/nx-aes-gcm.c | 9 +-
+ drivers/crypto/nx/nx.c | 2 +-
+ drivers/crypto/omap-aes-gcm.c | 11 +-
+ drivers/crypto/omap-aes.c | 12 +-
+ drivers/crypto/omap-des.c | 7 +-
+ drivers/crypto/omap-sham.c | 7 +-
+ drivers/crypto/padlock-aes.c | 2 +-
+ drivers/crypto/padlock-sha.c | 2 +-
+ drivers/crypto/qat/qat_common/adf_dev_mgr.c | 3 -
+ drivers/crypto/qat/qat_common/qat_asym_algs.c | 18 +-
+ drivers/crypto/qat/qat_common/qat_uclo.c | 15 +-
+ drivers/crypto/qce/ablkcipher.c | 5 +-
+ drivers/crypto/qce/sha.c | 30 +-
+ drivers/crypto/s5p-sss.c | 1596 ++++++++-
+ drivers/crypto/stm32/stm32-hash.c | 20 +-
+ drivers/crypto/talitos.c | 582 ++--
+ drivers/crypto/talitos.h | 7 +-
+ drivers/crypto/ux500/cryp/cryp_core.c | 1 -
+ drivers/crypto/virtio/virtio_crypto_algs.c | 2 +-
+ drivers/crypto/vmx/aes_ctr.c | 33 +-
+ drivers/dma/Kconfig | 31 +-
+ drivers/dma/Makefile | 3 +
+ drivers/dma/at_hdmac_regs.h | 2 +-
+ drivers/dma/bcm-sba-raid.c | 117 +-
+ drivers/dma/coh901318.c | 6 +-
+ drivers/dma/dma-axi-dmac.c | 75 +-
+ drivers/dma/dmatest.c | 1 +
+ drivers/dma/edma.c | 5 +
+ drivers/dma/img-mdc-dma.c | 98 +-
+ drivers/dma/imx-dma.c | 8 +-
+ drivers/dma/imx-sdma.c | 14 +-
+ drivers/dma/ioat/dma.c | 6 +-
+ drivers/dma/ioat/dma.h | 3 +-
+ drivers/dma/ioat/init.c | 2 +-
+ drivers/dma/nbpfaxi.c | 5 +-
+ drivers/dma/omap-dma.c | 5 +
+ drivers/dma/pch_dma.c | 12 +-
+ drivers/dma/pl330.c | 39 +-
+ drivers/dma/qcom/bam_dma.c | 169 +-
+ drivers/dma/sa11x0-dma.c | 11 +
+ drivers/dma/sprd-dma.c | 988 ++++++
+ drivers/dma/stm32-dmamux.c | 327 ++
+ drivers/dma/stm32-mdma.c | 1682 ++++++++++
+ drivers/dma/sun6i-dma.c | 257 +-
+ drivers/dma/ti-dma-crossbar.c | 8 +-
+ drivers/dma/xilinx/xilinx_dma.c | 14 +
+ drivers/gpio/Kconfig | 32 +-
+ drivers/gpio/Makefile | 3 +
+ drivers/gpio/gpio-104-dio-48e.c | 2 +-
+ drivers/gpio/gpio-104-idi-48.c | 2 +-
+ drivers/gpio/gpio-104-idio-16.c | 2 +-
+ drivers/gpio/gpio-adnp.c | 31 +-
+ drivers/gpio/gpio-altera.c | 4 +-
+ drivers/gpio/gpio-aspeed.c | 9 +-
+ drivers/gpio/gpio-ath79.c | 3 +-
+ drivers/gpio/gpio-brcmstb.c | 422 ++-
+ drivers/gpio/gpio-crystalcove.c | 2 +-
+ drivers/gpio/gpio-dln2.c | 2 +-
+ drivers/gpio/gpio-dwapb.c | 36 +-
+ drivers/gpio/gpio-ftgpio010.c | 2 +-
+ drivers/gpio/gpio-grgpio.c | 6 +-
+ drivers/gpio/gpio-ingenic.c | 2 +-
+ drivers/gpio/gpio-intel-mid.c | 2 +-
+ drivers/gpio/gpio-loongson1.c | 7 +-
+ drivers/gpio/gpio-lynxpoint.c | 2 +-
+ drivers/gpio/gpio-max3191x.c | 492 +++
+ drivers/gpio/gpio-max732x.c | 2 +-
+ drivers/gpio/gpio-mb86s7x.c | 12 +-
+ drivers/gpio/gpio-merrifield.c | 2 +-
+ drivers/gpio/gpio-mmio.c | 130 +-
+ drivers/gpio/gpio-mpc8xxx.c | 23 +-
+ drivers/gpio/gpio-omap.c | 2 +-
+ drivers/gpio/gpio-pca953x.c | 2 +-
+ drivers/gpio/gpio-pcf857x.c | 2 +-
+ drivers/gpio/gpio-pci-idio-16.c | 2 +-
+ drivers/gpio/gpio-pl061.c | 2 +-
+ drivers/gpio/gpio-rcar.c | 24 +-
+ drivers/gpio/gpio-reg.c | 4 +-
+ drivers/gpio/gpio-stmpe.c | 10 +-
+ drivers/gpio/gpio-tb10x.c | 3 +
+ drivers/gpio/gpio-tc3589x.c | 2 +-
+ drivers/gpio/gpio-tegra186.c | 620 ++++
+ drivers/gpio/gpio-thunderx.c | 13 -
+ drivers/gpio/gpio-uniphier.c | 508 +++
+ drivers/gpio/gpio-vf610.c | 2 +-
+ drivers/gpio/gpio-wcove.c | 2 +-
+ drivers/gpio/gpio-ws16c48.c | 2 +-
+ drivers/gpio/gpio-xgene-sb.c | 15 +-
+ drivers/gpio/gpio-xlp.c | 2 +-
+ drivers/gpio/gpio-zx.c | 2 +-
+ drivers/gpio/gpio-zynq.c | 2 +-
+ drivers/gpio/gpiolib-of.c | 4 +-
+ drivers/gpio/gpiolib.c | 595 +++-
+ drivers/gpio/gpiolib.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 29 +-
+ drivers/gpu/drm/tegra/drm.c | 3 +-
+ drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c | 14 +-
+ drivers/gpu/host1x/bus.c | 1 +
+ drivers/gpu/host1x/dev.c | 3 +-
+ drivers/hid/Kconfig | 5 +-
+ drivers/hid/hid-alps.c | 520 ++-
+ drivers/hid/hid-asus.c | 31 +-
+ drivers/hid/hid-core.c | 8 +-
+ drivers/hid/hid-cp2112.c | 10 +-
+ drivers/hid/hid-hyperv.c | 2 +-
+ drivers/hid/hid-ids.h | 10 +
+ drivers/hid/hid-input.c | 9 +
+ drivers/hid/hid-lg.c | 4 +-
+ drivers/hid/hid-lg4ff.c | 4 +-
+ drivers/hid/hid-logitech-hidpp.c | 3 +-
+ drivers/hid/hid-multitouch.c | 52 +-
+ drivers/hid/hid-rmi.c | 13 +-
+ drivers/hid/hid-sony.c | 14 +-
+ drivers/hid/hid-tmff.c | 2 +
+ drivers/hid/i2c-hid/i2c-hid.c | 7 +-
+ drivers/hid/usbhid/hid-core.c | 8 +-
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ drivers/hid/wacom_sys.c | 7 +
+ drivers/hid/wacom_wac.c | 44 +-
+ drivers/hid/wacom_wac.h | 3 +
+ drivers/hwtracing/stm/policy.c | 10 +-
+ drivers/i2c/busses/Kconfig | 5 +
+ drivers/i2c/busses/i2c-aspeed.c | 12 +
+ drivers/i2c/busses/i2c-cht-wc.c | 51 +-
+ drivers/i2c/busses/i2c-davinci.c | 69 +-
+ drivers/i2c/busses/i2c-designware-core.h | 2 +
+ drivers/i2c/busses/i2c-designware-platdrv.c | 71 +-
+ drivers/i2c/busses/i2c-gpio.c | 212 +-
+ drivers/i2c/busses/i2c-img-scb.c | 104 +-
+ drivers/i2c/busses/i2c-mpc.c | 4 +-
+ drivers/i2c/busses/i2c-omap.c | 25 +-
+ drivers/i2c/busses/i2c-parport-light.c | 1 -
+ drivers/i2c/busses/i2c-parport.c | 1 -
+ drivers/i2c/busses/i2c-pnx.c | 8 +-
+ drivers/i2c/busses/i2c-riic.c | 115 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 8 +-
+ drivers/i2c/busses/i2c-taos-evm.c | 3 +-
+ drivers/i2c/busses/i2c-thunderx-pcidrv.c | 9 +-
+ drivers/i2c/busses/i2c-xgene-slimpro.c | 30 +-
+ drivers/i2c/busses/i2c-xlp9xx.c | 44 +-
+ drivers/i2c/i2c-core-base.c | 34 +-
+ drivers/i2c/i2c-core-smbus.c | 55 +
+ drivers/i2c/i2c-smbus.c | 81 +-
+ drivers/i2c/muxes/i2c-mux-pca954x.c | 95 +-
+ drivers/i2c/muxes/i2c-mux-reg.c | 9 +-
+ drivers/ide/Kconfig | 2 +
+ drivers/ide/ide-atapi.c | 6 +-
+ drivers/ide/ide-pm.c | 4 +-
+ drivers/iio/dummy/iio_simple_dummy.c | 2 +-
+ drivers/iio/industrialio-configfs.c | 2 +-
+ drivers/iio/industrialio-sw-device.c | 6 +-
+ drivers/iio/industrialio-sw-trigger.c | 6 +-
+ drivers/iio/trigger/iio-trig-hrtimer.c | 2 +-
+ drivers/iio/trigger/iio-trig-loop.c | 2 +-
+ drivers/infiniband/core/cma_configfs.c | 8 +-
+ drivers/infiniband/hw/qedr/Kconfig | 1 +
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 15 +-
+ drivers/input/ff-memless.c | 8 +-
+ drivers/input/input.c | 11 +-
+ drivers/input/joystick/gamecon.c | 3 +
+ drivers/input/joystick/sidewinder.c | 10 +-
+ drivers/input/joystick/spaceball.c | 4 +
+ drivers/input/keyboard/bf54x-keys.c | 7 +-
+ drivers/input/keyboard/gpio_keys.c | 7 +-
+ drivers/input/keyboard/imx_keypad.c | 8 +-
+ drivers/input/keyboard/locomokbd.c | 7 +-
+ drivers/input/keyboard/omap-keypad.c | 6 +-
+ drivers/input/keyboard/snvs_pwrkey.c | 7 +-
+ drivers/input/keyboard/tegra-kbc.c | 6 +-
+ drivers/input/misc/adxl34x.c | 2 +-
+ drivers/input/misc/uinput.c | 305 +-
+ drivers/input/mouse/alps.c | 8 +-
+ drivers/input/mouse/byd.c | 10 +-
+ drivers/input/mouse/elan_i2c_core.c | 11 +-
+ drivers/input/mouse/gpio_mouse.c | 206 +-
+ drivers/input/rmi4/rmi_f54.c | 2 +-
+ drivers/input/serio/hil_mlc.c | 4 +-
+ drivers/input/serio/hp_sdc.c | 5 +-
+ drivers/input/serio/ps2-gpio.c | 1 +
+ drivers/input/serio/sa1111ps2.c | 69 +-
+ drivers/input/touchscreen/Kconfig | 36 +-
+ drivers/input/touchscreen/Makefile | 3 +
+ drivers/input/touchscreen/ad7877.c | 6 +-
+ drivers/input/touchscreen/ad7879.c | 19 +-
+ drivers/input/touchscreen/atmel-wm97xx.c | 10 +-
+ drivers/input/touchscreen/cyttsp4_core.c | 59 +-
+ drivers/input/touchscreen/edt-ft5x06.c | 173 +-
+ drivers/input/touchscreen/elants_i2c.c | 19 +-
+ drivers/input/touchscreen/exc3000.c | 223 ++
+ drivers/input/touchscreen/goodix.c | 125 +-
+ drivers/input/touchscreen/hideep.c | 1120 +++++++
+ drivers/input/touchscreen/melfas_mip4.c | 17 +-
+ drivers/input/touchscreen/mxs-lradc-ts.c | 2 +-
+ drivers/input/touchscreen/raydium_i2c_ts.c | 18 +-
+ drivers/input/touchscreen/rohm_bu21023.c | 17 +-
+ drivers/input/touchscreen/s6sy761.c | 559 ++++
+ drivers/input/touchscreen/st1232.c | 16 +-
+ drivers/input/touchscreen/stmfts.c | 4 +-
+ drivers/input/touchscreen/tsc200x-core.c | 6 +-
+ drivers/input/touchscreen/w90p910_ts.c | 7 +-
+ drivers/input/touchscreen/wdt87xx_i2c.c | 10 +-
+ drivers/input/touchscreen/wm97xx-core.c | 252 +-
+ drivers/iommu/amd_iommu.c | 43 +-
+ drivers/iommu/arm-smmu-v3.c | 214 +-
+ drivers/iommu/arm-smmu.c | 31 +-
+ drivers/iommu/dma-iommu.c | 24 +-
+ drivers/iommu/dmar.c | 10 +-
+ drivers/iommu/exynos-iommu.c | 23 +-
+ drivers/iommu/intel-iommu.c | 28 +-
+ drivers/iommu/intel-svm.c | 4 +-
+ drivers/iommu/io-pgtable-arm-v7s.c | 7 +-
+ drivers/iommu/io-pgtable-arm.c | 7 +-
+ drivers/iommu/iova.c | 220 +-
+ drivers/iommu/ipmmu-vmsa.c | 527 +--
+ drivers/iommu/mtk_iommu.c | 7 +
+ drivers/iommu/mtk_iommu_v1.c | 2 +-
+ drivers/iommu/omap-iommu.c | 375 ++-
+ drivers/iommu/omap-iommu.h | 30 +-
+ drivers/iommu/qcom_iommu.c | 33 +-
+ drivers/isdn/gigaset/bas-gigaset.c | 44 +-
+ drivers/isdn/gigaset/common.c | 7 +-
+ drivers/isdn/hardware/eicon/message.c | 70 +-
+ drivers/isdn/hardware/mISDN/hfcpci.c | 10 +-
+ drivers/isdn/hardware/mISDN/mISDNipac.c | 7 +-
+ drivers/isdn/hardware/mISDN/w6692.c | 7 +-
+ drivers/isdn/hisax/amd7930_fn.c | 6 +-
+ drivers/isdn/hisax/arcofi.c | 6 +-
+ drivers/isdn/hisax/diva.c | 9 +-
+ drivers/isdn/hisax/elsa.c | 10 +-
+ drivers/isdn/hisax/fsm.c | 7 +-
+ drivers/isdn/hisax/hfc4s8s_l1.c | 6 +-
+ drivers/isdn/hisax/hfc_2bds0.c | 4 +-
+ drivers/isdn/hisax/hfc_pci.c | 9 +-
+ drivers/isdn/hisax/hfc_sx.c | 9 +-
+ drivers/isdn/hisax/hfc_usb.c | 10 +-
+ drivers/isdn/hisax/hfcscard.c | 5 +-
+ drivers/isdn/hisax/icc.c | 6 +-
+ drivers/isdn/hisax/ipacx.c | 8 +-
+ drivers/isdn/hisax/isac.c | 6 +-
+ drivers/isdn/hisax/isar.c | 9 +-
+ drivers/isdn/hisax/isdnl3.c | 6 +-
+ drivers/isdn/hisax/saphir.c | 7 +-
+ drivers/isdn/hisax/teleint.c | 5 +-
+ drivers/isdn/hisax/w6692.c | 7 +-
+ drivers/isdn/isdnloop/isdnloop.c | 33 +-
+ drivers/isdn/mISDN/dsp.h | 2 +-
+ drivers/isdn/mISDN/dsp_core.c | 6 +-
+ drivers/isdn/mISDN/dsp_tones.c | 6 +-
+ drivers/isdn/mISDN/fsm.c | 7 +-
+ drivers/isdn/mISDN/l1oip_core.c | 25 +-
+ drivers/isdn/mISDN/timerdev.c | 6 +-
+ drivers/leds/Kconfig | 10 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/led-core.c | 7 +-
+ drivers/leds/leds-apu.c | 278 ++
+ drivers/leds/leds-lp5523.c | 2 +-
+ drivers/leds/leds-pca955x.c | 17 +-
+ drivers/leds/leds-tca6507.c | 2 +-
+ drivers/leds/trigger/Kconfig | 9 +
+ drivers/leds/trigger/Makefile | 1 +
+ drivers/leds/trigger/ledtrig-activity.c | 275 ++
+ drivers/leds/trigger/ledtrig-heartbeat.c | 16 +-
+ drivers/leds/trigger/ledtrig-transient.c | 12 +-
+ drivers/lightnvm/Kconfig | 3 +-
+ drivers/lightnvm/core.c | 176 +-
+ drivers/lightnvm/pblk-cache.c | 24 +-
+ drivers/lightnvm/pblk-core.c | 512 +--
+ drivers/lightnvm/pblk-gc.c | 289 +-
+ drivers/lightnvm/pblk-init.c | 197 +-
+ drivers/lightnvm/pblk-map.c | 28 +-
+ drivers/lightnvm/pblk-rb.c | 30 +-
+ drivers/lightnvm/pblk-read.c | 274 +-
+ drivers/lightnvm/pblk-recovery.c | 129 +-
+ drivers/lightnvm/pblk-rl.c | 43 +-
+ drivers/lightnvm/pblk-sysfs.c | 2 +-
+ drivers/lightnvm/pblk-write.c | 229 +-
+ drivers/lightnvm/pblk.h | 132 +-
+ drivers/md/Kconfig | 5 +-
+ drivers/md/Makefile | 5 +-
+ drivers/md/bcache/alloc.c | 15 +-
+ drivers/md/bcache/bcache.h | 19 +-
+ drivers/md/bcache/btree.c | 17 +-
+ drivers/md/bcache/btree.h | 2 +-
+ drivers/md/bcache/closure.h | 6 +
+ drivers/md/bcache/request.c | 36 +-
+ drivers/md/bcache/super.c | 52 +-
+ drivers/md/bcache/sysfs.c | 28 +-
+ drivers/md/bcache/util.c | 10 +-
+ drivers/md/bcache/util.h | 4 +-
+ drivers/md/bcache/writeback.c | 117 +-
+ drivers/md/bcache/writeback.h | 6 +-
+ drivers/md/dm-cache-background-tracker.c | 18 +-
+ drivers/md/dm-cache-metadata.c | 9 +-
+ drivers/md/dm-cache-policy-smq.c | 42 +-
+ drivers/md/dm-cache-target.c | 326 +-
+ drivers/md/dm-core.h | 3 +-
+ drivers/md/dm-crypt.c | 4 +-
+ drivers/md/dm-integrity.c | 2 +-
+ drivers/md/dm-log-writes.c | 175 +-
+ drivers/md/dm-mpath.c | 22 +-
+ drivers/md/dm-raid.c | 33 +-
+ drivers/md/dm-rq.c | 2 +-
+ drivers/md/dm-table.c | 21 +-
+ drivers/md/dm-verity-target.c | 81 +-
+ drivers/md/dm-verity.h | 5 -
+ drivers/md/dm-zoned-target.c | 13 +-
+ drivers/md/dm.c | 56 +-
+ drivers/md/dm.h | 3 +-
+ drivers/md/{bitmap.c => md-bitmap.c} | 29 +-
+ drivers/md/{bitmap.h => md-bitmap.h} | 0
+ drivers/md/md-cluster.c | 12 +-
+ drivers/md/{faulty.c => md-faulty.c} | 0
+ drivers/md/{linear.c => md-linear.c} | 2 +-
+ drivers/md/{linear.h => md-linear.h} | 0
+ drivers/md/{multipath.c => md-multipath.c} | 4 +-
+ drivers/md/{multipath.h => md-multipath.h} | 0
+ drivers/md/md.c | 147 +-
+ drivers/md/md.h | 20 +-
+ drivers/md/persistent-data/dm-space-map-metadata.c | 3 +-
+ drivers/md/raid0.c | 2 +-
+ drivers/md/raid1.c | 78 +-
+ drivers/md/raid10.c | 169 +-
+ drivers/md/raid10.h | 6 +
+ drivers/md/raid5-cache.c | 44 +-
+ drivers/md/raid5-log.h | 2 +-
+ drivers/md/raid5-ppl.c | 6 +-
+ drivers/md/raid5.c | 79 +-
+ drivers/media/pci/ttpci/av7110.h | 2 +-
+ drivers/media/pci/ttpci/av7110_ir.c | 56 +-
+ drivers/mfd/Kconfig | 14 +
+ drivers/mfd/Makefile | 1 +
+ drivers/mfd/arizona-core.c | 132 +-
+ drivers/mfd/intel-lpss.h | 7 +-
+ drivers/mfd/sm501.c | 49 +-
+ drivers/mfd/wm97xx-core.c | 366 +++
+ drivers/misc/eeprom/at24.c | 112 +-
+ drivers/misc/ibmasm/event.c | 2 +-
+ drivers/misc/ibmasm/module.c | 6 +-
+ drivers/misc/mic/scif/scif_rma.c | 3 +-
+ drivers/net/Kconfig | 12 +
+ drivers/net/Makefile | 3 +
+ drivers/net/appletalk/cops.c | 13 +-
+ drivers/net/appletalk/ltpc.c | 18 +-
+ drivers/net/arcnet/arcnet.c | 9 +-
+ drivers/net/bonding/bond_main.c | 42 +-
+ drivers/net/bonding/bond_options.c | 2 +-
+ drivers/net/caif/caif_hsi.c | 15 +-
+ drivers/net/can/grcan.c | 21 +-
+ drivers/net/can/sja1000/peak_pcmcia.c | 8 +-
+ drivers/net/can/usb/peak_usb/pcan_usb.c | 11 +-
+ drivers/net/dsa/b53/Kconfig | 2 +
+ drivers/net/dsa/b53/b53_common.c | 235 +-
+ drivers/net/dsa/b53/b53_priv.h | 146 +-
+ drivers/net/dsa/b53/b53_regs.h | 48 +
+ drivers/net/dsa/bcm_sf2.c | 240 +-
+ drivers/net/dsa/bcm_sf2.h | 3 +-
+ drivers/net/dsa/bcm_sf2_cfp.c | 1196 +++++--
+ drivers/net/dsa/bcm_sf2_regs.h | 49 +-
+ drivers/net/dsa/dsa_loop.c | 11 +-
+ drivers/net/dsa/lan9303-core.c | 557 +++-
+ drivers/net/dsa/lan9303.h | 21 +-
+ drivers/net/dsa/lan9303_i2c.c | 2 +-
+ drivers/net/dsa/lan9303_mdio.c | 7 +-
+ drivers/net/dsa/microchip/ksz_common.c | 3 +-
+ drivers/net/dsa/mt7530.c | 21 +-
+ drivers/net/dsa/mv88e6060.c | 51 +-
+ drivers/net/dsa/mv88e6xxx/chip.c | 210 +-
+ drivers/net/dsa/mv88e6xxx/global1.c | 35 +
+ drivers/net/dsa/mv88e6xxx/global1.h | 2 +
+ drivers/net/dsa/qca8k.c | 15 +-
+ drivers/net/dummy.c | 4 +-
+ drivers/net/eql.c | 4 +-
+ drivers/net/ethernet/3com/3c515.c | 10 +-
+ drivers/net/ethernet/3com/3c574_cs.c | 13 +-
+ drivers/net/ethernet/3com/3c589_cs.c | 10 +-
+ drivers/net/ethernet/3com/3c59x.c | 20 +-
+ drivers/net/ethernet/8390/axnet_cs.c | 10 +-
+ drivers/net/ethernet/8390/pcnet_cs.c | 11 +-
+ drivers/net/ethernet/adi/bfin_mac.c | 5 +-
+ drivers/net/ethernet/agere/et131x.c | 5 +-
+ drivers/net/ethernet/alacritech/slicoss.c | 2 +-
+ drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 6 +
+ drivers/net/ethernet/amazon/ena/ena_com.c | 16 +-
+ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 5 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 197 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.h | 12 +-
+ drivers/net/ethernet/amd/a2065.c | 14 +-
+ drivers/net/ethernet/amd/am79c961a.c | 11 +-
+ drivers/net/ethernet/amd/am79c961a.h | 1 +
+ drivers/net/ethernet/amd/amd8111e.c | 8 +-
+ drivers/net/ethernet/amd/declance.c | 12 +-
+ drivers/net/ethernet/amd/pcnet32.c | 11 +-
+ drivers/net/ethernet/amd/sunlance.c | 9 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 16 +-
+ drivers/net/ethernet/apple/bmac.c | 12 +-
+ drivers/net/ethernet/apple/mace.c | 12 +-
+ drivers/net/ethernet/aquantia/Kconfig | 2 +-
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 8 +-
+ drivers/net/ethernet/broadcom/Kconfig | 1 +
+ drivers/net/ethernet/broadcom/b44.c | 4 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 108 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h | 1 -
+ drivers/net/ethernet/broadcom/bcmsysport.c | 130 +-
+ drivers/net/ethernet/broadcom/bcmsysport.h | 12 +-
+ drivers/net/ethernet/broadcom/bgmac-bcma.c | 8 +-
+ drivers/net/ethernet/broadcom/bgmac-platform.c | 1 +
+ drivers/net/ethernet/broadcom/bgmac.c | 16 +
+ drivers/net/ethernet/broadcom/bnx2.c | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 17 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 7 +-
+ drivers/net/ethernet/broadcom/bnxt/Makefile | 3 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 231 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 49 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 65 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 39 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 120 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 2 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 420 ++-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 946 +++++-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h | 88 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 96 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h | 37 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 3 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 2 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 272 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 -
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 34 +-
+ drivers/net/ethernet/broadcom/tg3.c | 4 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 43 +-
+ drivers/net/ethernet/cadence/macb_main.c | 11 +-
+ drivers/net/ethernet/cavium/Kconfig | 1 +
+ drivers/net/ethernet/cavium/liquidio/Makefile | 2 +-
+ drivers/net/ethernet/cavium/liquidio/lio_core.c | 22 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c | 382 ++-
+ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 28 +-
+ drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 695 ++++
+ drivers/net/ethernet/cavium/liquidio/lio_vf_rep.h | 49 +
+ .../net/ethernet/cavium/liquidio/liquidio_common.h | 68 +-
+ .../net/ethernet/cavium/liquidio/liquidio_image.h | 1 +
+ .../net/ethernet/cavium/liquidio/octeon_config.h | 2 +
+ .../net/ethernet/cavium/liquidio/octeon_console.c | 32 +-
+ .../net/ethernet/cavium/liquidio/octeon_device.c | 15 +-
+ .../net/ethernet/cavium/liquidio/octeon_device.h | 24 +
+ drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 4 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 3 +
+ drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 3 +
+ drivers/net/ethernet/cavium/liquidio/octeon_main.h | 2 +-
+ .../net/ethernet/cavium/liquidio/octeon_network.h | 3 +
+ drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 5 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_nic.h | 3 +-
+ .../net/ethernet/cavium/liquidio/request_manager.c | 20 +-
+ drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 24 +-
+ drivers/net/ethernet/cavium/thunder/nic_main.c | 86 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 5 +-
+ drivers/net/ethernet/chelsio/cxgb/sge.c | 30 +-
+ drivers/net/ethernet/chelsio/cxgb3/sge.c | 130 +-
+ drivers/net/ethernet/chelsio/cxgb4/Makefile | 5 +-
+ drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 13 +-
+ drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/cudbg_common.c | 54 +
+ drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 384 +++
+ drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h | 90 +
+ drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 1929 +++++++++++
+ drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h | 169 +
+ .../net/ethernet/chelsio/cxgb4/cudbg_lib_common.h | 87 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 105 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 403 +++
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h | 44 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 15 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 13 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 103 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 1055 +++++-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h | 8 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 135 +-
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 876 +++++
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h | 120 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 7 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 20 +-
+ drivers/net/ethernet/chelsio/cxgb4/smt.c | 247 ++
+ drivers/net/ethernet/chelsio/cxgb4/smt.h | 76 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 637 +++-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 8 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 49 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 9 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 118 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h | 69 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 81 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 58 +
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 12 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 6 +-
+ drivers/net/ethernet/cisco/enic/enic.h | 2 +-
+ drivers/net/ethernet/cisco/enic/enic_clsf.h | 5 +-
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 77 +
+ drivers/net/ethernet/cisco/enic/enic_main.c | 5 +-
+ drivers/net/ethernet/cisco/enic/vnic_rq.c | 16 +-
+ drivers/net/ethernet/dec/tulip/de2104x.c | 21 +-
+ drivers/net/ethernet/dec/tulip/de4x5.c | 13 +-
+ drivers/net/ethernet/dec/tulip/dmfe.c | 12 +-
+ drivers/net/ethernet/dec/tulip/interrupt.c | 6 +-
+ drivers/net/ethernet/dec/tulip/pnic.c | 6 +-
+ drivers/net/ethernet/dec/tulip/pnic2.c | 6 +-
+ drivers/net/ethernet/dec/tulip/timer.c | 12 +-
+ drivers/net/ethernet/dec/tulip/tulip.h | 12 +-
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 14 +-
+ drivers/net/ethernet/dec/tulip/uli526x.c | 12 +-
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 12 +-
+ drivers/net/ethernet/dlink/dl2k.c | 12 +-
+ drivers/net/ethernet/dlink/sundance.c | 12 +-
+ drivers/net/ethernet/faraday/ftgmac100.c | 26 +
+ drivers/net/ethernet/faraday/ftmac100.c | 5 +-
+ drivers/net/ethernet/fealnx.c | 24 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 156 +-
+ drivers/net/ethernet/freescale/fec.h | 3 +-
+ drivers/net/ethernet/freescale/fec_main.c | 31 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 82 +-
+ drivers/net/ethernet/freescale/fman/Makefile | 12 +-
+ drivers/net/ethernet/freescale/fman/fman_port.c | 2 +
+ drivers/net/ethernet/freescale/fman/mac.c | 145 +-
+ drivers/net/ethernet/freescale/fman/mac.h | 6 +-
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 -
+ drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 1 -
+ drivers/net/ethernet/freescale/ucc_geth.c | 5 +-
+ drivers/net/ethernet/hisilicon/Kconfig | 15 +-
+ drivers/net/ethernet/hisilicon/hns/hns_enet.c | 7 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 41 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 4 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 64 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 150 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 347 ++
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.h | 21 +
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1412 +++++---
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 53 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 10 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 260 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 15 +
+ .../ethernet/hisilicon/hns3/hns3pf/hns3_dcbnl.c | 100 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 504 ++-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h | 22 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c | 485 ++-
+ drivers/net/ethernet/huawei/hinic/hinic_rx.c | 18 +-
+ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 14 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 521 ++-
+ drivers/net/ethernet/ibm/ibmvnic.h | 60 +-
+ drivers/net/ethernet/intel/e100.c | 11 +-
+ drivers/net/ethernet/intel/e1000e/defines.h | 1 +
+ drivers/net/ethernet/intel/e1000e/e1000.h | 4 -
+ drivers/net/ethernet/intel/e1000e/mac.c | 11 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 92 +-
+ drivers/net/ethernet/intel/e1000e/param.c | 16 +-
+ drivers/net/ethernet/intel/e1000e/phy.c | 7 +-
+ drivers/net/ethernet/intel/fm10k/fm10k.h | 60 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_common.c | 6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 4 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 176 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 4 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 209 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 482 ++-
+ drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 12 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pf.h | 3 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 216 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 12 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 210 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 449 ++-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 11 +-
+ drivers/net/ethernet/intel/i40e/i40e_diag.c | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 905 ++++--
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 3430 ++++++++++++++++----
+ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 20 +-
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 27 +-
+ drivers/net/ethernet/intel/i40e/i40e_register.h | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 53 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 13 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 36 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 259 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 6 +-
+ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 182 +-
+ drivers/net/ethernet/intel/i40evf/i40e_common.c | 69 +
+ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 9 +
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 16 +-
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 11 +-
+ drivers/net/ethernet/intel/i40evf/i40e_type.h | 23 +
+ drivers/net/ethernet/intel/i40evf/i40evf.h | 34 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 38 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 193 +-
+ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 45 +-
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 23 +
+ drivers/net/ethernet/intel/igb/e1000_regs.h | 8 +
+ drivers/net/ethernet/intel/igb/igb.h | 6 +
+ drivers/net/ethernet/intel/igb/igb_main.c | 367 ++-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 7 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_main.c | 10 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 9 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 54 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 11 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 323 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 19 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 14 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 8 +-
+ drivers/net/ethernet/korina.c | 238 +-
+ drivers/net/ethernet/marvell/mvneta.c | 13 +-
+ drivers/net/ethernet/marvell/mvpp2.c | 415 ++-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 5 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 8 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/Kconfig | 8 +
+ drivers/net/ethernet/mellanox/mlx4/catas.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/cq.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx4/en_main.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx4/en_resources.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 48 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 2 +
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/qp.c | 10 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/srq.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cq.c | 16 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 91 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 10 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 619 ----
+ .../net/ethernet/mellanox/mlx5/core/en_common.c | 13 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 265 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 315 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 171 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 244 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 74 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 59 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 899 +++++
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 291 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 34 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 13 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 998 ++++--
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 21 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 10 +
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 8 +-
+ .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 5 +
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 272 +-
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 36 +
+ .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 350 ++
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 525 +++
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 51 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 111 +
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 4 +-
+ .../mellanox/mlxsw/core_acl_flex_actions.c | 106 +-
+ .../mellanox/mlxsw/core_acl_flex_actions.h | 11 +-
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 817 ++++-
+ drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 335 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 89 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 106 +-
+ .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 129 +
+ .../mellanox/mlxsw/spectrum_acl_flex_actions.h | 44 +
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 6 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 434 ++-
+ .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.h | 1 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 10 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 183 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 13 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 291 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 1012 ++++++
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.h | 134 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c | 839 +++++
+ .../net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.h | 43 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 276 ++
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 1548 +++++++--
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 51 +-
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 514 ++-
+ drivers/net/ethernet/mellanox/mlxsw/trap.h | 6 +
+ drivers/net/ethernet/micrel/ksz884x.c | 18 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 12 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 10 +-
+ drivers/net/ethernet/neterion/s2io.c | 13 +-
+ drivers/net/ethernet/neterion/s2io.h | 2 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 21 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.h | 8 +-
+ drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 19 -
+ drivers/net/ethernet/netronome/nfp/Makefile | 8 +-
+ drivers/net/ethernet/netronome/nfp/bpf/jit.c | 1299 +++++---
+ drivers/net/ethernet/netronome/nfp/bpf/main.c | 128 +-
+ drivers/net/ethernet/netronome/nfp/bpf/main.h | 114 +-
+ drivers/net/ethernet/netronome/nfp/bpf/offload.c | 278 +-
+ drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 123 +-
+ drivers/net/ethernet/netronome/nfp/flower/action.c | 420 ++-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 25 +-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 146 +-
+ drivers/net/ethernet/netronome/nfp/flower/main.c | 29 +-
+ drivers/net/ethernet/netronome/nfp/flower/main.h | 35 +
+ drivers/net/ethernet/netronome/nfp/flower/match.c | 114 +-
+ .../net/ethernet/netronome/nfp/flower/metadata.c | 2 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 153 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c | 804 +++++
+ drivers/net/ethernet/netronome/nfp/nfp_app.c | 27 +-
+ drivers/net/ethernet/netronome/nfp/nfp_app.h | 45 +
+ drivers/net/ethernet/netronome/nfp/nfp_asm.c | 257 ++
+ drivers/net/ethernet/netronome/nfp/nfp_asm.h | 307 +-
+ drivers/net/ethernet/netronome/nfp/nfp_main.c | 28 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net.h | 5 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 75 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 2 +-
+ .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 146 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 8 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 47 +
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.h | 1 +
+ drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c | 8 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 5 +
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 36 +
+ .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 87 +-
+ drivers/net/ethernet/nuvoton/w90p910_ether.c | 9 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 193 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 42 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 16 +-
+ drivers/net/ethernet/packetengines/yellowfin.c | 12 +-
+ drivers/net/ethernet/qlogic/Kconfig | 3 +
+ drivers/net/ethernet/qlogic/qed/Makefile | 3 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 6 +
+ drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 749 ++++-
+ drivers/net/ethernet/qlogic/qed/qed_iwarp.h | 44 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c | 103 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.h | 10 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 8 +-
+ drivers/net/ethernet/qlogic/qed/qed_ooo.c | 16 +-
+ drivers/net/ethernet/qlogic/qed/qed_ooo.h | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 24 +-
+ drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 1 +
+ drivers/net/ethernet/qlogic/qede/qede.h | 2 +-
+ drivers/net/ethernet/qlogic/qede/qede_filter.c | 2 +-
+ drivers/net/ethernet/qlogic/qede/qede_fp.c | 1 +
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 4 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 4 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_mpi.c | 1 -
+ drivers/net/ethernet/qualcomm/emac/emac-mac.c | 16 +-
+ drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 15 +-
+ drivers/net/ethernet/qualcomm/emac/emac.c | 27 +-
+ drivers/net/ethernet/qualcomm/rmnet/Kconfig | 1 +
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 168 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 35 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 155 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_handlers.h | 3 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 3 +-
+ .../ethernet/qualcomm/rmnet/rmnet_map_command.c | 8 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_private.h | 8 -
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 120 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 7 +-
+ drivers/net/ethernet/realtek/atp.c | 14 +-
+ drivers/net/ethernet/realtek/r8169.c | 240 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 90 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 32 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 16 +-
+ drivers/net/ethernet/seeq/ether3.c | 11 +-
+ drivers/net/ethernet/seeq/ether3.h | 1 +
+ drivers/net/ethernet/sfc/ef10.c | 18 +-
+ drivers/net/ethernet/sfc/efx.c | 20 +-
+ drivers/net/ethernet/sfc/efx.h | 2 +-
+ drivers/net/ethernet/sfc/falcon/efx.c | 6 +-
+ drivers/net/ethernet/sfc/falcon/efx.h | 2 +-
+ drivers/net/ethernet/sfc/falcon/falcon.c | 11 +-
+ drivers/net/ethernet/sfc/falcon/nic.h | 2 +
+ drivers/net/ethernet/sfc/falcon/rx.c | 4 +-
+ drivers/net/ethernet/sfc/falcon/tx.c | 2 +-
+ drivers/net/ethernet/sfc/farch.c | 4 +
+ drivers/net/ethernet/sfc/mcdi.c | 9 +-
+ drivers/net/ethernet/sfc/mcdi_port.c | 4 +
+ drivers/net/ethernet/sfc/ptp.c | 2 -
+ drivers/net/ethernet/sfc/rx.c | 4 +-
+ drivers/net/ethernet/sfc/tx.c | 2 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c | 8 +-
+ drivers/net/ethernet/sis/sis190.c | 10 +-
+ drivers/net/ethernet/sis/sis900.c | 12 +-
+ drivers/net/ethernet/smsc/epic100.c | 12 +-
+ drivers/net/ethernet/smsc/smc91c92_cs.c | 10 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 +
+ drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c | 22 +-
+ drivers/net/ethernet/stmicro/stmmac/common.h | 5 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 14 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 361 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 9 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 19 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 27 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 59 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 -
+ drivers/net/ethernet/sun/cassini.c | 8 +-
+ drivers/net/ethernet/sun/ldmvsw.c | 5 +-
+ drivers/net/ethernet/sun/niu.c | 12 +-
+ drivers/net/ethernet/sun/sunbmac.c | 10 +-
+ drivers/net/ethernet/sun/sungem.c | 8 +-
+ drivers/net/ethernet/sun/sunhme.c | 10 +-
+ drivers/net/ethernet/sun/sunvnet.c | 3 +-
+ drivers/net/ethernet/sun/sunvnet_common.c | 4 +-
+ drivers/net/ethernet/sun/sunvnet_common.h | 2 +-
+ drivers/net/ethernet/ti/cpsw_ale.c | 4 +-
+ drivers/net/ethernet/ti/netcp_core.c | 2 +-
+ drivers/net/ethernet/ti/netcp_ethss.c | 5 +-
+ drivers/net/ethernet/ti/tlan.c | 32 +-
+ drivers/net/ethernet/toshiba/spider_net.c | 12 +-
+ drivers/net/ethernet/tundra/tsi108_eth.c | 10 +-
+ drivers/net/geneve.c | 44 +-
+ drivers/net/hamradio/6pack.c | 34 +-
+ drivers/net/hamradio/baycom_epp.c | 50 +-
+ drivers/net/hamradio/baycom_par.c | 48 +-
+ drivers/net/hamradio/mkiss.c | 4 +-
+ drivers/net/hamradio/scc.c | 69 +-
+ drivers/net/hamradio/yam.c | 4 +-
+ drivers/net/hippi/rrunner.c | 10 +-
+ drivers/net/hyperv/hyperv_net.h | 17 +-
+ drivers/net/hyperv/netvsc.c | 88 +-
+ drivers/net/hyperv/netvsc_drv.c | 114 +-
+ drivers/net/hyperv/rndis_filter.c | 13 +-
+ drivers/net/ieee802154/adf7242.c | 8 +-
+ drivers/net/ieee802154/atusb.c | 392 ++-
+ drivers/net/ieee802154/atusb.h | 8 +
+ drivers/net/ieee802154/ca8210.c | 22 +-
+ drivers/net/ieee802154/cc2520.c | 21 +-
+ drivers/net/ieee802154/mrf24j40.c | 2 +-
+ drivers/net/ifb.c | 3 +
+ drivers/net/ipvlan/ipvlan.h | 31 +
+ drivers/net/ipvlan/ipvlan_core.c | 26 +-
+ drivers/net/ipvlan/ipvlan_main.c | 70 +-
+ drivers/net/macsec.c | 27 +-
+ drivers/net/macvlan.c | 31 +-
+ drivers/net/macvtap.c | 2 +-
+ drivers/net/netconsole.c | 4 +-
+ drivers/net/ntb_netdev.c | 8 +-
+ drivers/net/phy/Kconfig | 17 +-
+ drivers/net/phy/Makefile | 2 +
+ drivers/net/phy/at803x.c | 2 +-
+ drivers/net/phy/broadcom.c | 6 +
+ drivers/net/phy/dp83822.c | 344 ++
+ drivers/net/phy/dp83848.c | 3 -
+ drivers/net/phy/phy_led_triggers.c | 63 +-
+ drivers/net/phy/phylink.c | 16 +-
+ drivers/net/phy/realtek.c | 56 +-
+ drivers/net/phy/sfp-bus.c | 11 +-
+ drivers/net/phy/sfp.c | 29 +-
+ drivers/net/phy/uPD60620.c | 109 +
+ drivers/net/plip/plip.c | 13 +
+ drivers/net/ppp/ppp_async.c | 10 +-
+ drivers/net/ppp/ppp_generic.c | 26 +-
+ drivers/net/ppp/ppp_synctty.c | 11 +-
+ drivers/net/slip/slip.c | 8 +-
+ drivers/net/team/team.c | 5 +-
+ drivers/net/team/team_mode_loadbalance.c | 8 +-
+ drivers/net/thunderbolt.c | 1363 ++++++++
+ drivers/net/tun.c | 310 +-
+ drivers/net/usb/asix_common.c | 2 +-
+ drivers/net/usb/catc.c | 8 +-
+ drivers/net/usb/cdc_ncm.c | 4 +-
+ drivers/net/usb/hso.c | 2 -
+ drivers/net/usb/ipheth.c | 30 +-
+ drivers/net/usb/lan78xx.c | 10 +-
+ drivers/net/usb/qmi_wwan.c | 2 +-
+ drivers/net/usb/sierra_net.c | 12 +-
+ drivers/net/usb/usbnet.c | 12 +-
+ drivers/net/virtio_net. | 0
+ drivers/net/virtio_net.c | 90 +-
+ drivers/net/vrf.c | 24 +-
+ drivers/net/vxlan.c | 35 +-
+ drivers/net/wan/dscc4.c | 22 -
+ drivers/net/wan/hdlc_cisco.c | 13 +-
+ drivers/net/wan/hdlc_fr.c | 11 +-
+ drivers/net/wan/hdlc_ppp.c | 4 +-
+ drivers/net/wan/lmc/lmc_main.c | 12 +-
+ drivers/net/wan/sbni.c | 21 +-
+ drivers/net/wan/sdla.c | 14 +-
+ drivers/net/wan/wanxl.c | 1 -
+ drivers/net/wan/x25_asy.c | 1 +
+ drivers/net/wireless/ath/ar5523/ar5523.c | 7 +-
+ drivers/net/wireless/ath/ath10k/core.c | 13 +
+ drivers/net/wireless/ath/ath10k/core.h | 3 +
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 6 +-
+ drivers/net/wireless/ath/ath10k/hw.c | 13 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 7 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 168 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 46 +-
+ drivers/net/wireless/ath/ath10k/pci.h | 2 +-
+ drivers/net/wireless/ath/ath10k/spectral.c | 2 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 3 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 1 +
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 6 +-
+ drivers/net/wireless/ath/ath6kl/core.h | 2 +-
+ drivers/net/wireless/ath/ath6kl/main.c | 5 +-
+ drivers/net/wireless/ath/ath6kl/txrx.c | 8 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c | 4 +-
+ drivers/net/wireless/ath/ath6kl/wmi.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 5 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 4 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 4 +-
+ drivers/net/wireless/ath/ath9k/channel.c | 19 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 4 +-
+ drivers/net/wireless/ath/ath9k/dfs.c | 2 +-
+ drivers/net/wireless/ath/ath9k/gpio.c | 14 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 8 +-
+ drivers/net/wireless/ath/ath9k/htc.h | 2 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 2 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 27 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 10 +-
+ drivers/net/wireless/ath/ath9k/init.c | 12 +-
+ drivers/net/wireless/ath/ath9k/link.c | 10 +-
+ drivers/net/wireless/ath/ath9k/main.c | 22 +-
+ drivers/net/wireless/ath/ath9k/mci.c | 2 +-
+ drivers/net/wireless/ath/ath9k/tx99.c | 5 +
+ drivers/net/wireless/ath/ath9k/wmi.c | 4 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 12 +-
+ drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 6 +
+ drivers/net/wireless/ath/wil6210/debugfs.c | 45 -
+ drivers/net/wireless/ath/wil6210/main.c | 15 +-
+ drivers/net/wireless/ath/wil6210/p2p.c | 4 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h | 2 +-
+ drivers/net/wireless/atmel/atmel.c | 11 +-
+ drivers/net/wireless/broadcom/b43/phy_g.c | 2 +-
+ drivers/net/wireless/broadcom/b43/phy_ht.c | 6 +-
+ drivers/net/wireless/broadcom/b43legacy/radio.c | 2 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 10 +
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 167 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 -
+ .../wireless/broadcom/brcm80211/brcmfmac/common.c | 157 +
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 40 +
+ .../wireless/broadcom/brcm80211/brcmfmac/core.h | 3 +
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 5 -
+ .../broadcom/brcm80211/brcmfmac/fwil_types.h | 31 +
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 14 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 19 +
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 39 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 18 +
+ .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +-
+ .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 1675 +++++-----
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 +-
+ drivers/net/wireless/intel/iwlegacy/3945-rs.c | 10 +-
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 11 +-
+ drivers/net/wireless/intel/iwlegacy/4965-rs.c | 2 -
+ drivers/net/wireless/intel/iwlegacy/common.c | 4 +-
+ drivers/net/wireless/intel/iwlegacy/common.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/Makefile | 1 +
+ drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 54 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 104 +-
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 210 ++
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 138 +
+ .../net/wireless/intel/iwlwifi/fw/api/binding.h | 41 +-
+ .../net/wireless/intel/iwlwifi/fw/api/commands.h | 1 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 9 +
+ .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 67 -
+ drivers/net/wireless/intel/iwlwifi/fw/api/paging.h | 24 -
+ drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 3 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 4 -
+ drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 15 +
+ drivers/net/wireless/intel/iwlwifi/fw/file.h | 5 +-
+ drivers/net/wireless/intel/iwlwifi/fw/img.h | 8 -
+ drivers/net/wireless/intel/iwlwifi/fw/paging.c | 103 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 7 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 2 -
+ drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 1 +
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 13 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 91 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 17 -
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 16 +
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 58 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 16 +-
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 76 -
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 32 +
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 242 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 114 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 105 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 23 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 59 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 7 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 78 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 93 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 13 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 113 +-
+ .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 194 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 4 +
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 90 +
+ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 13 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 24 +-
+ .../net/wireless/intersil/orinoco/orinoco_usb.c | 2 -
+ drivers/net/wireless/intersil/p54/main.c | 7 +-
+ drivers/net/wireless/mac80211_hwsim.c | 192 +-
+ drivers/net/wireless/marvell/libertas/cfg.c | 3 -
+ drivers/net/wireless/marvell/libertas/if_usb.c | 6 +-
+ drivers/net/wireless/marvell/libertas/main.c | 21 +-
+ drivers/net/wireless/marvell/libertas_tf/if_usb.c | 6 +-
+ drivers/net/wireless/marvell/libertas_tf/main.c | 7 +-
+ drivers/net/wireless/marvell/mwifiex/11n.c | 9 -
+ .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 13 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 76 +-
+ drivers/net/wireless/marvell/mwifiex/cmdevt.c | 15 +-
+ drivers/net/wireless/marvell/mwifiex/fw.h | 4 +-
+ drivers/net/wireless/marvell/mwifiex/init.c | 11 +-
+ drivers/net/wireless/marvell/mwifiex/main.c | 3 +-
+ drivers/net/wireless/marvell/mwifiex/main.h | 5 +-
+ drivers/net/wireless/marvell/mwifiex/scan.c | 5 +-
+ drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 6 +-
+ drivers/net/wireless/marvell/mwifiex/sta_event.c | 6 +-
+ drivers/net/wireless/marvell/mwifiex/tdls.c | 14 +-
+ drivers/net/wireless/marvell/mwifiex/usb.c | 9 +-
+ drivers/net/wireless/marvell/mwifiex/wmm.c | 3 +-
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 259 +-
+ drivers/net/wireless/quantenna/qtnfmac/commands.c | 476 ++-
+ drivers/net/wireless/quantenna/qtnfmac/commands.h | 11 +-
+ drivers/net/wireless/quantenna/qtnfmac/core.c | 32 +-
+ drivers/net/wireless/quantenna/qtnfmac/core.h | 39 +-
+ drivers/net/wireless/quantenna/qtnfmac/event.c | 131 +-
+ .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 15 +-
+ .../quantenna/qtnfmac/pearl/pcie_bus_priv.h | 1 +
+ drivers/net/wireless/quantenna/qtnfmac/qlink.h | 276 +-
+ .../net/wireless/quantenna/qtnfmac/qlink_util.c | 113 +-
+ .../net/wireless/quantenna/qtnfmac/qlink_util.h | 7 +
+ drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 7 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00dump.h | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 6 +-
+ drivers/net/wireless/ray_cs.c | 53 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 5 +-
+ drivers/net/wireless/realtek/rtlwifi/base.c | 132 +-
+ drivers/net/wireless/realtek/rtlwifi/base.h | 8 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 13 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c | 22 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.c | 339 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.h | 41 +-
+ drivers/net/wireless/realtek/rtlwifi/ps.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 9 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.h | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 21 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.h | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 18 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 9 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.h | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.h | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.h | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 9 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.h | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/dm.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 43 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.h | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 9 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 49 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.h | 140 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/dm.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/hw.h | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/trx.h | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 14 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.h | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.h | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 16 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/hw.h | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.h | 3 +-
+ .../realtek/rtlwifi/rtl8723com/fw_common.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 33 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.h | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 3 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c | 17 -
+ drivers/net/wireless/realtek/rtlwifi/wifi.h | 72 +-
+ drivers/net/wireless/rsi/rsi_91x_core.c | 41 +-
+ drivers/net/wireless/rsi/rsi_91x_debugfs.c | 19 +-
+ drivers/net/wireless/rsi/rsi_91x_hal.c | 94 +-
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 577 +++-
+ drivers/net/wireless/rsi/rsi_91x_main.c | 33 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c | 111 +-
+ drivers/net/wireless/rsi/rsi_91x_ps.c | 16 +-
+ drivers/net/wireless/rsi/rsi_91x_sdio.c | 269 +-
+ drivers/net/wireless/rsi/rsi_91x_usb.c | 4 +-
+ drivers/net/wireless/rsi/rsi_common.h | 7 +-
+ drivers/net/wireless/rsi/rsi_hal.h | 6 +-
+ drivers/net/wireless/rsi/rsi_main.h | 36 +-
+ drivers/net/wireless/rsi/rsi_mgmt.h | 54 +-
+ drivers/net/wireless/rsi/rsi_ps.h | 7 +-
+ drivers/net/wireless/rsi/rsi_sdio.h | 2 +
+ drivers/net/wireless/st/cw1200/main.c | 3 +-
+ drivers/net/wireless/st/cw1200/pm.c | 5 +-
+ drivers/net/wireless/st/cw1200/queue.c | 6 +-
+ drivers/net/wireless/st/cw1200/sta.c | 5 +-
+ drivers/net/wireless/st/cw1200/sta.h | 2 +-
+ drivers/net/wireless/zydas/zd1201.c | 3 +-
+ drivers/net/xen-netback/common.h | 2 +-
+ drivers/net/xen-netback/interface.c | 3 +-
+ drivers/net/xen-netback/netback.c | 6 +-
+ drivers/nfc/fdp/fdp.c | 2 +-
+ drivers/nfc/microread/i2c.c | 2 +-
+ drivers/nfc/nfcmrvl/i2c.c | 2 +-
+ drivers/nfc/nxp-nci/i2c.c | 2 +-
+ drivers/nfc/pn533/i2c.c | 2 +-
+ drivers/nfc/pn544/i2c.c | 2 +-
+ drivers/nfc/s3fwrn5/firmware.c | 2 +-
+ drivers/nfc/s3fwrn5/i2c.c | 2 +-
+ drivers/nfc/st-nci/Kconfig | 4 +-
+ drivers/nfc/st-nci/i2c.c | 2 +-
+ drivers/nfc/st21nfca/i2c.c | 2 +-
+ drivers/nvdimm/Kconfig | 2 +-
+ drivers/nvme/Kconfig | 4 +
+ drivers/nvme/host/Kconfig | 9 +
+ drivers/nvme/host/Makefile | 1 +
+ drivers/nvme/host/core.c | 1301 +++++---
+ drivers/nvme/host/fabrics.c | 16 +-
+ drivers/nvme/host/fabrics.h | 14 +
+ drivers/nvme/host/fc.c | 793 +++--
+ drivers/nvme/host/lightnvm.c | 86 +-
+ drivers/nvme/host/multipath.c | 291 ++
+ drivers/nvme/host/nvme.h | 169 +-
+ drivers/nvme/host/pci.c | 243 +-
+ drivers/nvme/host/rdma.c | 246 +-
+ drivers/nvme/target/admin-cmd.c | 21 +-
+ drivers/nvme/target/configfs.c | 30 +-
+ drivers/nvme/target/core.c | 23 +
+ drivers/nvme/target/fc.c | 48 +-
+ drivers/nvme/target/io-cmd.c | 20 +-
+ drivers/nvme/target/loop.c | 66 +-
+ drivers/nvme/target/nvmet.h | 6 +-
+ drivers/nvme/target/rdma.c | 16 +-
+ drivers/of/Kconfig | 4 +
+ drivers/of/Makefile | 1 +
+ drivers/of/base.c | 135 +-
+ drivers/of/device.c | 8 +-
+ drivers/of/dynamic.c | 190 +-
+ drivers/of/fdt.c | 91 +-
+ drivers/of/kobj.c | 164 +
+ drivers/of/of_private.h | 51 +-
+ drivers/of/overlay.c | 1049 +++---
+ drivers/of/resolver.c | 15 +-
+ drivers/of/unittest-data/.gitignore | 2 -
+ drivers/of/unittest.c | 83 +-
+ drivers/pci/endpoint/pci-ep-cfs.c | 12 +-
+ drivers/pci/pci-driver.c | 1 +
+ drivers/pcmcia/electra_cf.c | 12 +-
+ drivers/perf/Kconfig | 15 +
+ drivers/perf/Makefile | 2 +
+ drivers/perf/arm_pmu.c | 10 +-
+ drivers/perf/arm_pmu_acpi.c | 3 -
+ drivers/perf/arm_pmu_platform.c | 4 +-
+ drivers/perf/arm_spe_pmu.c | 1249 +++++++
+ drivers/perf/hisilicon/Makefile | 1 +
+ drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 463 +++
+ drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 473 +++
+ drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 463 +++
+ drivers/perf/hisilicon/hisi_uncore_pmu.c | 447 +++
+ drivers/perf/hisilicon/hisi_uncore_pmu.h | 102 +
+ drivers/perf/qcom_l2_pmu.c | 54 +
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +-
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 6 +-
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 6 +-
+ drivers/pinctrl/intel/pinctrl-intel.c | 2 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 6 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +-
+ drivers/pinctrl/pinctrl-amd.c | 2 +-
+ drivers/pinctrl/pinctrl-at91.c | 2 +-
+ drivers/pinctrl/pinctrl-coh901.c | 2 +-
+ drivers/pinctrl/pinctrl-mcp23s08.c | 2 +-
+ drivers/pinctrl/pinctrl-oxnas.c | 2 +-
+ drivers/pinctrl/pinctrl-pic32.c | 2 +-
+ drivers/pinctrl/pinctrl-pistachio.c | 2 +-
+ drivers/pinctrl/pinctrl-st.c | 2 +-
+ drivers/pinctrl/pinctrl-sx150x.c | 2 +-
+ drivers/pinctrl/qcom/pinctrl-msm.c | 2 +-
+ drivers/pinctrl/sirf/pinctrl-atlas7.c | 2 +-
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +-
+ drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +-
+ drivers/platform/x86/Kconfig | 2 +-
+ drivers/platform/x86/intel_int0002_vgpio.c | 6 +-
+ drivers/power/supply/Kconfig | 16 +-
+ drivers/power/supply/Makefile | 1 +
+ drivers/power/supply/sbs-battery.c | 35 +-
+ drivers/power/supply/sbs-manager.c | 445 +++
+ drivers/s390/net/fsm.c | 8 +-
+ drivers/s390/net/qeth_core.h | 38 +-
+ drivers/s390/net/qeth_core_main.c | 210 +-
+ drivers/s390/net/qeth_core_mpc.c | 4 +-
+ drivers/s390/net/qeth_core_mpc.h | 73 +-
+ drivers/s390/net/qeth_core_sys.c | 4 +-
+ drivers/s390/net/qeth_l2.h | 6 +
+ drivers/s390/net/qeth_l2_main.c | 557 +++-
+ drivers/s390/net/qeth_l2_sys.c | 215 +-
+ drivers/s390/net/qeth_l3_main.c | 37 +-
+ drivers/s390/net/qeth_l3_sys.c | 45 +-
+ drivers/scsi/.gitignore | 1 +
+ drivers/scsi/Kconfig | 5 +-
+ drivers/scsi/Makefile | 8 +
+ drivers/scsi/NCR5380.c | 18 +-
+ drivers/scsi/aacraid/commsup.c | 26 +-
+ drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +-
+ drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 +-
+ drivers/scsi/aic94xx/aic94xx_hwi.c | 3 -
+ drivers/scsi/be2iscsi/be.h | 19 +-
+ drivers/scsi/be2iscsi/be_cmds.c | 55 +-
+ drivers/scsi/be2iscsi/be_cmds.h | 48 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 54 +-
+ drivers/scsi/be2iscsi/be_iscsi.h | 2 +-
+ drivers/scsi/be2iscsi/be_main.c | 114 +-
+ drivers/scsi/be2iscsi/be_main.h | 51 +-
+ drivers/scsi/be2iscsi/be_mgmt.c | 278 +-
+ drivers/scsi/be2iscsi/be_mgmt.h | 10 +-
+ drivers/scsi/bfa/bfad_bsg.c | 7 -
+ drivers/scsi/bfa/bfad_debugfs.c | 5 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 10 -
+ drivers/scsi/csiostor/csio_hw.h | 3 +
+ drivers/scsi/csiostor/csio_init.c | 3 +
+ drivers/scsi/csiostor/csio_mb.c | 3 +
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 +
+ drivers/scsi/cxgbi/libcxgbi.c | 50 +-
+ drivers/scsi/cxgbi/libcxgbi.h | 1 -
+ drivers/scsi/cxlflash/main.c | 24 +-
+ drivers/scsi/cxlflash/main.h | 3 +-
+ drivers/scsi/cxlflash/sislite.h | 3 -
+ drivers/scsi/cxlflash/superpipe.c | 6 +-
+ drivers/scsi/cxlflash/vlun.c | 6 +-
+ drivers/scsi/device_handler/scsi_dh_alua.c | 10 +-
+ drivers/scsi/device_handler/scsi_dh_emc.c | 6 +-
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c | 12 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 6 +-
+ drivers/scsi/fcoe/fcoe.c | 81 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 13 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 46 +-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 253 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 257 +-
+ drivers/scsi/hpsa.c | 356 +-
+ drivers/scsi/hpsa_cmd.h | 3 +
+ drivers/scsi/libfc/fc_lport.c | 3 -
+ drivers/scsi/libsas/sas_dump.c | 10 -
+ drivers/scsi/libsas/sas_dump.h | 1 -
+ drivers/scsi/libsas/sas_event.c | 26 +-
+ drivers/scsi/libsas/sas_init.c | 12 -
+ drivers/scsi/lpfc/lpfc.h | 3 +
+ drivers/scsi/lpfc/lpfc_attr.c | 15 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 4 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 9 +-
+ drivers/scsi/lpfc/lpfc_els.c | 19 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 2 +-
+ drivers/scsi/lpfc/lpfc_init.c | 30 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 174 +-
+ drivers/scsi/lpfc/lpfc_nvmet.c | 148 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 232 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 4 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 9 +
+ drivers/scsi/megaraid/megaraid_sas.h | 64 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 1025 +++---
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 20 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 676 +++-
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 29 +-
+ drivers/scsi/mpt3sas/mpi/mpi2.h | 43 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 564 +++-
+ drivers/scsi/mpt3sas/mpi/mpi2_init.h | 11 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 282 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_pci.h | 111 +
+ drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 14 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 658 +++-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 177 +-
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 100 +
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 164 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2355 ++++++++++++--
+ drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 2 +-
+ drivers/scsi/nsp32.c | 2 +-
+ drivers/scsi/pm8001/pm8001_ctl.c | 54 +
+ drivers/scsi/pm8001/pm8001_hwi.c | 11 +-
+ drivers/scsi/pm8001/pm8001_init.c | 13 +-
+ drivers/scsi/pm8001/pm8001_sas.c | 124 +-
+ drivers/scsi/pm8001/pm8001_sas.h | 10 +
+ drivers/scsi/pm8001/pm80xx_hwi.c | 62 +-
+ drivers/scsi/pm8001/pm80xx_hwi.h | 102 +-
+ drivers/scsi/qedi/Kconfig | 1 +
+ drivers/scsi/qedi/qedi_fw.c | 17 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 13 +-
+ drivers/scsi/qla2xxx/qla_def.h | 29 +
+ drivers/scsi/qla2xxx/qla_fw.h | 4 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 5 +
+ drivers/scsi/qla2xxx/qla_init.c | 140 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 195 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 73 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 132 +-
+ drivers/scsi/qla2xxx/qla_mid.c | 2 +-
+ drivers/scsi/qla2xxx/qla_mr.c | 3 +-
+ drivers/scsi/qla2xxx/qla_os.c | 40 +-
+ drivers/scsi/qla2xxx/qla_target.c | 12 +-
+ drivers/scsi/qla2xxx/qla_version.h | 2 +-
+ drivers/scsi/scsi_debug.c | 31 +-
+ drivers/scsi/scsi_devinfo.c | 72 +-
+ drivers/scsi/scsi_dh.c | 36 +-
+ drivers/scsi/scsi_error.c | 13 +-
+ drivers/scsi/scsi_lib.c | 108 +-
+ drivers/scsi/scsi_logging.h | 8 +-
+ drivers/scsi/scsi_priv.h | 4 +-
+ drivers/scsi/scsi_scan.c | 1 +
+ drivers/scsi/scsi_sysfs.c | 45 +-
+ drivers/scsi/scsi_transport_fc.c | 2 +
+ drivers/scsi/scsi_transport_iscsi.c | 2 +-
+ drivers/scsi/scsi_transport_sas.c | 2 +-
+ drivers/scsi/sd.c | 32 +-
+ drivers/scsi/sd_zbc.c | 169 +-
+ drivers/scsi/sg.c | 2 +-
+ drivers/scsi/smartpqi/smartpqi_init.c | 18 +-
+ drivers/scsi/storvsc_drv.c | 52 +-
+ drivers/scsi/ufs/tc-dwc-g210.c | 10 +-
+ drivers/scsi/ufs/ufs-qcom.c | 4 +-
+ drivers/scsi/ufs/ufs-qcom.h | 7 +-
+ drivers/scsi/ufs/ufshcd.c | 40 +-
+ drivers/scsi/ufs/ufshcd.h | 16 +-
+ drivers/scsi/ufs/ufshci.h | 70 +-
+ drivers/sh/maple/maple.c | 5 +-
+ drivers/target/iscsi/iscsi_target_stat.c | 12 +-
+ drivers/target/target_core_configfs.c | 14 +-
+ drivers/target/target_core_stat.c | 16 +-
+ drivers/thunderbolt/Makefile | 2 +-
+ drivers/thunderbolt/ctl.c | 46 +-
+ drivers/thunderbolt/ctl.h | 3 +-
+ drivers/thunderbolt/domain.c | 197 +-
+ drivers/thunderbolt/icm.c | 218 +-
+ drivers/thunderbolt/nhi.c | 412 ++-
+ drivers/thunderbolt/nhi.h | 141 +-
+ drivers/thunderbolt/nhi_regs.h | 11 +-
+ drivers/thunderbolt/property.c | 670 ++++
+ drivers/thunderbolt/switch.c | 7 +-
+ drivers/thunderbolt/tb.h | 88 +-
+ drivers/thunderbolt/tb_msgs.h | 168 +-
+ drivers/thunderbolt/xdomain.c | 1570 +++++++++
+ drivers/tty/serial/bcm63xx_uart.c | 6 +-
+ drivers/usb/core/urb.c | 30 +-
+ drivers/usb/gadget/configfs.c | 10 +-
+ drivers/usb/gadget/function/f_acm.c | 2 +-
+ drivers/usb/gadget/function/f_ecm.c | 2 +-
+ drivers/usb/gadget/function/f_eem.c | 2 +-
+ drivers/usb/gadget/function/f_fs.c | 2 +-
+ drivers/usb/gadget/function/f_hid.c | 2 +-
+ drivers/usb/gadget/function/f_loopback.c | 2 +-
+ drivers/usb/gadget/function/f_mass_storage.c | 4 +-
+ drivers/usb/gadget/function/f_midi.c | 2 +-
+ drivers/usb/gadget/function/f_ncm.c | 2 +-
+ drivers/usb/gadget/function/f_obex.c | 2 +-
+ drivers/usb/gadget/function/f_phonet.c | 2 +-
+ drivers/usb/gadget/function/f_printer.c | 2 +-
+ drivers/usb/gadget/function/f_rndis.c | 2 +-
+ drivers/usb/gadget/function/f_serial.c | 2 +-
+ drivers/usb/gadget/function/f_sourcesink.c | 2 +-
+ drivers/usb/gadget/function/f_subset.c | 2 +-
+ drivers/usb/gadget/function/f_tcm.c | 2 +-
+ drivers/usb/gadget/function/f_uac1.c | 2 +-
+ drivers/usb/gadget/function/f_uac1_legacy.c | 2 +-
+ drivers/usb/gadget/function/f_uac2.c | 2 +-
+ drivers/usb/gadget/function/uvc_configfs.c | 50 +-
+ drivers/vfio/pci/vfio_pci_config.c | 31 +-
+ drivers/vfio/platform/reset/Kconfig | 9 +
+ drivers/vfio/platform/reset/Makefile | 1 +
+ .../vfio/platform/reset/vfio_platform_bcmflexrm.c | 113 +
+ drivers/vfio/vfio_iommu_spapr_tce.c | 2 +
+ drivers/vfio/vfio_iommu_type1.c | 3 +
+ drivers/vhost/net.c | 14 +-
+ drivers/watchdog/Kconfig | 2 +-
+ fs/afs/internal.h | 1 +
+ fs/afs/rxrpc.c | 42 +-
+ fs/binfmt_elf.c | 10 +-
+ fs/block_dev.c | 20 +-
+ fs/btrfs/Kconfig | 11 +
+ fs/btrfs/Makefile | 3 +-
+ fs/btrfs/async-thread.c | 2 +-
+ fs/btrfs/backref.c | 72 +-
+ fs/btrfs/backref.h | 8 +-
+ fs/btrfs/btrfs_inode.h | 29 +-
+ fs/btrfs/check-integrity.c | 8 +-
+ fs/btrfs/compression.c | 493 ++-
+ fs/btrfs/compression.h | 6 +-
+ fs/btrfs/ctree.c | 17 +-
+ fs/btrfs/ctree.h | 30 +-
+ fs/btrfs/delayed-inode.c | 46 +-
+ fs/btrfs/delayed-ref.c | 296 +-
+ fs/btrfs/delayed-ref.h | 54 +-
+ fs/btrfs/disk-io.c | 227 +-
+ fs/btrfs/extent-tree.c | 829 +++--
+ fs/btrfs/extent_io.c | 44 +-
+ fs/btrfs/extent_io.h | 1 -
+ fs/btrfs/file.c | 50 +-
+ fs/btrfs/free-space-tree.c | 4 -
+ fs/btrfs/inode-map.c | 3 +-
+ fs/btrfs/inode.c | 327 +-
+ fs/btrfs/ioctl.c | 156 +-
+ fs/btrfs/lzo.c | 5 +
+ fs/btrfs/ordered-data.c | 21 +-
+ fs/btrfs/qgroup.c | 8 +-
+ fs/btrfs/raid56.c | 30 +-
+ fs/btrfs/ref-verify.c | 1031 ++++++
+ fs/btrfs/ref-verify.h | 62 +
+ fs/btrfs/relocation.c | 17 +-
+ fs/btrfs/root-tree.c | 4 -
+ fs/btrfs/scrub.c | 22 +-
+ fs/btrfs/send.c | 74 +-
+ fs/btrfs/send.h | 2 +-
+ fs/btrfs/super.c | 37 +-
+ fs/btrfs/sysfs.c | 63 +-
+ fs/btrfs/sysfs.h | 26 +-
+ fs/btrfs/tests/free-space-tree-tests.c | 3 +-
+ fs/btrfs/tests/inode-tests.c | 20 +-
+ fs/btrfs/tests/qgroup-tests.c | 30 +-
+ fs/btrfs/transaction.c | 16 +-
+ fs/btrfs/tree-checker.c | 425 +++
+ fs/btrfs/tree-checker.h | 26 +
+ fs/btrfs/tree-log.c | 34 +-
+ fs/btrfs/volumes.c | 168 +-
+ fs/btrfs/volumes.h | 2 -
+ fs/btrfs/zlib.c | 15 +-
+ fs/btrfs/zstd.c | 5 +
+ fs/buffer.c | 74 +-
+ fs/cifs/smb2ops.c | 30 +-
+ fs/configfs/dir.c | 10 +-
+ fs/configfs/file.c | 12 +-
+ fs/configfs/item.c | 6 +-
+ fs/configfs/symlink.c | 4 +-
+ fs/crypto/Makefile | 2 +-
+ fs/crypto/crypto.c | 37 +-
+ fs/crypto/fname.c | 39 +-
+ fs/crypto/fscrypt_private.h | 13 +-
+ fs/crypto/hooks.c | 112 +
+ fs/crypto/keyinfo.c | 23 +-
+ fs/crypto/policy.c | 6 +-
+ fs/dax.c | 2 +-
+ fs/direct-io.c | 2 +-
+ fs/dlm/ast.c | 2 +
+ fs/dlm/config.c | 16 +-
+ fs/dlm/lock.c | 43 +-
+ fs/dlm/lowcomms.c | 218 +-
+ fs/dlm/rcom.c | 26 +-
+ fs/dlm/rcom.h | 1 -
+ fs/dlm/recover.c | 4 +
+ fs/dlm/recoverd.c | 16 +-
+ fs/ext2/inode.c | 4 +-
+ fs/ext2/super.c | 161 +-
+ fs/ext4/Kconfig | 1 +
+ fs/ext4/balloc.c | 15 +-
+ fs/ext4/ext4.h | 58 +-
+ fs/ext4/extents.c | 6 +-
+ fs/ext4/file.c | 286 +-
+ fs/ext4/ialloc.c | 4 +-
+ fs/ext4/inline.c | 43 +-
+ fs/ext4/inode.c | 170 +-
+ fs/ext4/ioctl.c | 30 +-
+ fs/ext4/mballoc.c | 28 +-
+ fs/ext4/namei.c | 62 +-
+ fs/ext4/resize.c | 104 +-
+ fs/ext4/super.c | 42 +-
+ fs/f2fs/f2fs.h | 9 +-
+ fs/f2fs/inode.c | 5 +-
+ fs/f2fs/super.c | 7 +-
+ fs/fs-writeback.c | 153 +-
+ fs/gfs2/Kconfig | 1 +
+ fs/gfs2/acl.c | 1 +
+ fs/gfs2/bmap.c | 322 +-
+ fs/gfs2/bmap.h | 4 +
+ fs/gfs2/file.c | 124 +-
+ fs/gfs2/inode.c | 89 +-
+ fs/gfs2/inode.h | 2 +
+ fs/gfs2/super.c | 5 +-
+ fs/gfs2/trace_gfs2.h | 65 +
+ fs/gfs2/trans.c | 2 +-
+ fs/gfs2/xattr.c | 63 +-
+ fs/iomap.c | 15 +-
+ fs/isofs/isofs.h | 22 +-
+ fs/isofs/rock.h | 64 +-
+ fs/isofs/util.c | 2 +-
+ fs/jbd2/journal.c | 9 +-
+ fs/jfs/jfs_metapage.c | 2 +
+ fs/jfs/super.c | 1 -
+ fs/nfsd/blocklayout.c | 4 +-
+ fs/notify/dnotify/dnotify.c | 7 +-
+ fs/notify/fanotify/Kconfig | 2 +-
+ fs/notify/fanotify/fanotify.c | 57 +-
+ fs/notify/fanotify/fanotify.h | 8 +-
+ fs/notify/fanotify/fanotify_user.c | 59 +-
+ fs/notify/fdinfo.c | 3 +
+ fs/notify/fsnotify.c | 101 +-
+ fs/notify/group.c | 6 +-
+ fs/notify/inotify/inotify_user.c | 4 +-
+ fs/notify/mark.c | 121 +-
+ fs/ntfs/aops.c | 2 +-
+ fs/ntfs/mft.c | 2 +-
+ fs/ocfs2/cluster/heartbeat.c | 4 +-
+ fs/ocfs2/cluster/nodemanager.c | 8 +-
+ fs/quota/dquot.c | 13 +-
+ fs/sync.c | 2 +-
+ fs/ubifs/crypto.c | 1 -
+ fs/ubifs/ioctl.c | 5 +-
+ fs/ubifs/super.c | 8 +-
+ fs/ubifs/ubifs.h | 18 +-
+ fs/ubifs/xattr.c | 1 +
+ fs/udf/balloc.c | 29 +-
+ fs/udf/dir.c | 2 +-
+ fs/udf/directory.c | 9 +-
+ fs/udf/ialloc.c | 2 +-
+ fs/udf/inode.c | 50 +-
+ fs/udf/misc.c | 8 +-
+ fs/udf/namei.c | 13 +-
+ fs/udf/partition.c | 6 +-
+ fs/udf/super.c | 56 +-
+ fs/udf/truncate.c | 2 +-
+ fs/udf/udfdecl.h | 21 +-
+ fs/udf/unicode.c | 2 +-
+ fs/xfs/Kconfig | 17 +
+ fs/xfs/Makefile | 29 +
+ fs/xfs/kmem.h | 3 +-
+ fs/xfs/libxfs/xfs_ag_resv.c | 1 +
+ fs/xfs/libxfs/xfs_alloc.c | 50 +
+ fs/xfs/libxfs/xfs_alloc.h | 4 +
+ fs/xfs/libxfs/xfs_attr_leaf.c | 6 +-
+ fs/xfs/libxfs/xfs_bmap.c | 2061 +++++-------
+ fs/xfs/libxfs/xfs_bmap.h | 66 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c | 250 +-
+ fs/xfs/libxfs/xfs_bmap_btree.h | 22 +-
+ fs/xfs/libxfs/xfs_btree.c | 259 +-
+ fs/xfs/libxfs/xfs_btree.h | 32 +-
+ fs/xfs/libxfs/xfs_da_btree.c | 22 +-
+ fs/xfs/libxfs/xfs_dir2.c | 24 +-
+ fs/xfs/libxfs/xfs_dir2.h | 17 +
+ fs/xfs/libxfs/xfs_errortag.h | 106 +
+ fs/xfs/libxfs/xfs_format.h | 37 +-
+ fs/xfs/libxfs/xfs_fs.h | 77 +
+ fs/xfs/libxfs/xfs_ialloc.c | 91 +
+ fs/xfs/libxfs/xfs_ialloc.h | 7 +
+ fs/xfs/libxfs/xfs_iext_tree.c | 1043 ++++++
+ fs/xfs/libxfs/xfs_inode_buf.c | 1 +
+ fs/xfs/libxfs/xfs_inode_fork.c | 1333 +-------
+ fs/xfs/libxfs/xfs_inode_fork.h | 138 +-
+ fs/xfs/libxfs/xfs_log_format.h | 24 +-
+ fs/xfs/libxfs/xfs_refcount.c | 1 +
+ fs/xfs/libxfs/xfs_rmap.c | 1 +
+ fs/xfs/libxfs/xfs_rtbitmap.c | 13 +-
+ fs/xfs/libxfs/xfs_types.h | 22 +
+ fs/xfs/scrub/agheader.c | 658 ++++
+ fs/xfs/scrub/alloc.c | 102 +
+ fs/xfs/scrub/attr.c | 471 +++
+ fs/xfs/scrub/bmap.c | 363 +++
+ fs/xfs/scrub/btree.c | 516 +++
+ fs/xfs/scrub/btree.h | 57 +
+ fs/xfs/scrub/common.c | 574 ++++
+ fs/xfs/scrub/common.h | 144 +
+ fs/xfs/scrub/dabtree.c | 591 ++++
+ fs/xfs/scrub/dabtree.h | 59 +
+ fs/xfs/scrub/dir.c | 816 +++++
+ fs/xfs/scrub/ialloc.c | 337 ++
+ fs/xfs/scrub/inode.c | 611 ++++
+ fs/xfs/scrub/parent.c | 317 ++
+ fs/xfs/scrub/quota.c | 304 ++
+ fs/xfs/scrub/refcount.c | 99 +
+ fs/xfs/scrub/rmap.c | 138 +
+ fs/xfs/scrub/rtbitmap.c | 108 +
+ fs/xfs/scrub/scrub.c | 392 +++
+ fs/xfs/scrub/scrub.h | 115 +
+ fs/xfs/scrub/symlink.c | 92 +
+ fs/xfs/scrub/trace.c | 59 +
+ fs/xfs/scrub/trace.h | 499 +++
+ fs/xfs/scrub/xfs_scrub.h | 29 +
+ fs/xfs/xfs.h | 1 -
+ fs/xfs/xfs_attr.h | 5 +-
+ fs/xfs/xfs_attr_inactive.c | 69 +-
+ fs/xfs/xfs_attr_list.c | 161 +-
+ fs/xfs/xfs_bmap_util.c | 746 ++---
+ fs/xfs/xfs_bmap_util.h | 10 +-
+ fs/xfs/xfs_buf.c | 16 +
+ fs/xfs/xfs_buf.h | 5 +-
+ fs/xfs/xfs_dir2_readdir.c | 10 +-
+ fs/xfs/xfs_dquot.c | 21 +-
+ fs/xfs/xfs_error.c | 6 +-
+ fs/xfs/xfs_error.h | 81 -
+ fs/xfs/xfs_file.c | 2 +-
+ fs/xfs/xfs_icache.c | 2 +-
+ fs/xfs/xfs_inode.c | 33 +-
+ fs/xfs/xfs_inode.h | 4 +-
+ fs/xfs/xfs_inode_item.c | 29 +-
+ fs/xfs/xfs_inode_item.h | 2 +-
+ fs/xfs/xfs_ioctl.c | 158 +-
+ fs/xfs/xfs_ioctl.h | 4 +-
+ fs/xfs/xfs_ioctl32.c | 1 +
+ fs/xfs/xfs_iomap.c | 21 +-
+ fs/xfs/xfs_iops.c | 52 +-
+ fs/xfs/xfs_itable.c | 13 +-
+ fs/xfs/xfs_itable.h | 2 -
+ fs/xfs/xfs_linux.h | 21 +-
+ fs/xfs/xfs_log.c | 33 +-
+ fs/xfs/xfs_log_recover.c | 62 +-
+ fs/xfs/xfs_mount.c | 15 +-
+ fs/xfs/xfs_reflink.c | 108 +-
+ fs/xfs/xfs_rtalloc.h | 2 +
+ fs/xfs/xfs_trace.h | 64 +-
+ fs/xfs/xfs_trans_ail.c | 22 +-
+ include/clocksource/arm_arch_timer.h | 10 +-
+ include/crypto/dh.h | 2 +-
+ include/crypto/drbg.h | 3 +-
+ include/crypto/ecdh.h | 2 +-
+ include/crypto/gcm.h | 8 +
+ include/crypto/gf128mul.h | 2 +-
+ include/crypto/hash.h | 28 +-
+ include/crypto/if_alg.h | 15 +-
+ include/crypto/sm3.h | 40 +
+ include/crypto/sm3_base.h | 117 +
+ include/drm/amd_asic_type.h | 52 +
+ include/dt-bindings/gpio/gpio.h | 2 +-
+ include/dt-bindings/gpio/uniphier-gpio.h | 18 +
+ include/lib/libgcc.h | 43 +
+ include/linux/acpi_iort.h | 4 +-
+ include/linux/audit.h | 10 +
+ include/linux/avf/virtchnl.h | 20 +
+ include/linux/backing-dev-defs.h | 24 +
+ include/linux/backing-dev.h | 4 -
+ include/linux/bio.h | 25 -
+ include/linux/bitops.h | 24 +
+ include/linux/blk-cgroup.h | 25 +-
+ include/linux/blk-mq.h | 40 +-
+ include/linux/blk_types.h | 16 +-
+ include/linux/blkdev.h | 36 +-
+ include/linux/bpf-cgroup.h | 69 +-
+ include/linux/bpf.h | 174 +-
+ include/linux/bpf_types.h | 32 +-
+ include/linux/bpf_verifier.h | 47 +-
+ include/linux/brcmphy.h | 1 +
+ include/linux/buffer_head.h | 2 +-
+ include/linux/byteorder/generic.h | 16 +
+ include/linux/configfs.h | 8 +-
+ include/linux/connector.h | 4 +-
+ include/linux/cpuhotplug.h | 3 +
+ include/linux/crypto.h | 40 +
+ include/linux/device.h | 4 +
+ include/linux/device_cgroup.h | 67 +-
+ include/linux/dma-mapping.h | 13 +
+ include/linux/dma/xilinx_dma.h | 14 -
+ include/linux/dmaengine.h | 30 +-
+ include/linux/dmar.h | 1 +
+ include/linux/dsa/lan9303.h | 38 +
+ include/linux/dynamic_queue_limits.h | 2 +-
+ include/linux/elevator.h | 1 +
+ include/linux/etherdevice.h | 1 +
+ include/linux/ethtool.h | 10 +
+ include/linux/filter.h | 32 +-
+ include/linux/fs.h | 2 +
+ include/linux/fscrypt.h | 294 ++
+ include/linux/fscrypt_common.h | 142 -
+ include/linux/fscrypt_notsupp.h | 39 +-
+ include/linux/fscrypt_supp.h | 17 +-
+ include/linux/fsnotify_backend.h | 8 +-
+ include/linux/genhd.h | 4 +-
+ include/linux/gpio/consumer.h | 49 +
+ include/linux/gpio/driver.h | 215 +-
+ include/linux/gpio/machine.h | 2 +-
+ include/linux/gpio_mouse.h | 61 -
+ include/linux/hid.h | 2 +
+ include/linux/i2c-gpio.h | 4 -
+ include/linux/i2c-smbus.h | 10 +-
+ include/linux/i2c.h | 2 +
+ include/linux/ieee80211.h | 1 +
+ include/linux/if_arp.h | 2 +-
+ include/linux/if_bridge.h | 6 +
+ include/linux/if_frad.h | 1 +
+ include/linux/if_macvlan.h | 18 +-
+ include/linux/if_phonet.h | 2 +-
+ include/linux/if_tap.h | 4 +
+ include/linux/iio/sw_device.h | 2 +-
+ include/linux/iio/sw_trigger.h | 2 +-
+ include/linux/inetdevice.h | 2 +
+ include/linux/intel-iommu.h | 1 +
+ include/linux/iomap.h | 18 +-
+ include/linux/iova.h | 14 +-
+ include/linux/ipv6.h | 1 +
+ include/linux/irqdesc.h | 8 +
+ include/linux/kfifo.h | 6 +-
+ include/linux/kthread.h | 11 +
+ include/linux/leds.h | 18 +-
+ include/linux/lightnvm.h | 11 +-
+ include/linux/livepatch.h | 34 +
+ include/linux/lsm_hooks.h | 54 +
+ include/linux/mfd/arizona/pdata.h | 3 +
+ include/linux/mfd/wm97xx.h | 25 +
+ include/linux/mlx4/device.h | 8 +-
+ include/linux/mlx5/cq.h | 4 +-
+ include/linux/mlx5/device.h | 31 +
+ include/linux/mlx5/driver.h | 33 +
+ include/linux/mlx5/mlx5_ifc.h | 60 +-
+ include/linux/mlx5/port.h | 5 +
+ include/linux/mlx5/qp.h | 1 +
+ include/linux/mod_devicetable.h | 26 +
+ include/linux/mroute.h | 46 +
+ include/linux/netdevice.h | 120 +-
+ include/linux/netlink.h | 3 -
+ include/linux/nvme-fc-driver.h | 15 +-
+ include/linux/nvme.h | 30 +
+ include/linux/of.h | 107 +-
+ include/linux/of_gpio.h | 2 +-
+ include/linux/once.h | 6 +-
+ include/linux/padata.h | 4 +
+ include/linux/phy.h | 2 +
+ include/linux/platform_data/i2c-nuc900.h | 10 -
+ include/linux/platform_data/st1232_pdata.h | 14 -
+ include/linux/qed/qed_ll2_if.h | 8 +
+ include/linux/regset.h | 67 +-
+ include/linux/rtnetlink.h | 4 +-
+ include/linux/sbitmap.h | 64 +-
+ include/linux/security.h | 48 +
+ include/linux/skbuff.h | 134 +-
+ include/linux/tcp.h | 24 +-
+ include/linux/thunderbolt.h | 598 ++++
+ include/linux/trace_events.h | 43 +-
+ include/linux/uinput.h | 81 -
+ include/linux/usb.h | 2 +
+ include/linux/writeback.h | 30 +-
+ include/net/act_api.h | 37 +-
+ include/net/addrconf.h | 10 +-
+ include/net/af_rxrpc.h | 7 +-
+ include/net/af_vsock.h | 20 +-
+ include/net/bluetooth/bluetooth.h | 3 +
+ include/net/bluetooth/hci.h | 2 +-
+ include/net/bonding.h | 7 +-
+ include/net/cfg80211.h | 40 +-
+ include/net/dn.h | 7 -
+ include/net/dn_nsp.h | 1 -
+ include/net/dsa.h | 132 +-
+ include/net/dst.h | 17 +-
+ include/net/dst_metadata.h | 6 +-
+ include/net/fib_notifier.h | 3 +
+ include/net/flow_dissector.h | 12 +-
+ include/net/fq.h | 7 +
+ include/net/fq_impl.h | 72 +-
+ include/net/inet_connection_sock.h | 6 +-
+ include/net/inet_ecn.h | 5 -
+ include/net/inet_frag.h | 2 +-
+ include/net/inet_sock.h | 3 +-
+ include/net/ip6_fib.h | 79 +-
+ include/net/ip6_route.h | 5 +
+ include/net/ip_fib.h | 3 -
+ include/net/ip_tunnels.h | 3 +-
+ include/net/ipv6.h | 45 +-
+ include/net/llc_c_ac.h | 8 +-
+ include/net/mac80211.h | 8 +-
+ include/net/neighbour.h | 4 +-
+ include/net/netevent.h | 1 +
+ include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 2 +-
+ include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 2 +-
+ include/net/netfilter/nf_conntrack_l4proto.h | 25 +-
+ include/net/netfilter/nf_tables.h | 5 +
+ include/net/netns/ipv4.h | 41 +
+ include/net/netns/ipv6.h | 9 +
+ include/net/nsh.h | 3 +
+ include/net/phonet/phonet.h | 6 +-
+ include/net/pkt_cls.h | 233 +-
+ include/net/pkt_sched.h | 21 +-
+ include/net/request_sock.h | 2 +
+ include/net/rtnetlink.h | 5 -
+ include/net/sch_generic.h | 51 +-
+ include/net/sctp/sm.h | 10 +-
+ include/net/sctp/stream_sched.h | 72 +
+ include/net/sctp/structs.h | 63 +-
+ include/net/sock.h | 35 +-
+ include/net/switchdev.h | 2 +
+ include/net/tc_act/tc_gact.h | 5 +
+ include/net/tc_act/tc_ife.h | 12 +-
+ include/net/tc_act/tc_mirred.h | 1 +
+ include/net/tc_act/tc_vlan.h | 46 +-
+ include/net/tcp.h | 224 +-
+ include/net/tipc.h | 62 +
+ include/net/tls.h | 23 +-
+ include/net/xfrm.h | 8 +-
+ include/scsi/libsas.h | 56 +-
+ include/scsi/scsi_device.h | 4 +-
+ include/scsi/scsi_devinfo.h | 79 +-
+ include/scsi/scsi_proto.h | 45 +-
+ include/scsi/scsi_transport_fc.h | 2 +
+ include/sound/ac97/codec.h | 118 +
+ include/sound/ac97/compat.h | 20 +
+ include/sound/ac97/controller.h | 85 +
+ include/sound/ac97/regs.h | 262 ++
+ include/sound/ac97_codec.h | 239 +-
+ include/sound/core.h | 2 +
+ include/sound/hdaudio.h | 3 +-
+ include/sound/pxa2xx-lib.h | 15 +-
+ include/sound/rt5651.h | 8 +
+ include/sound/rt5663.h | 3 +
+ include/sound/snd_wavefront.h | 1 +
+ include/sound/soc-acpi-intel-match.h | 32 +
+ include/sound/soc-acpi.h | 111 +
+ include/sound/soc.h | 115 +
+ include/target/iscsi/iscsi_target_stat.h | 12 +-
+ include/trace/events/bpf.h | 5 +-
+ include/trace/events/btrfs.h | 41 +-
+ include/trace/events/fib6.h | 6 +-
+ include/trace/events/sock.h | 2 +-
+ include/trace/events/tcp.h | 299 ++
+ include/trace/events/writeback.h | 1 -
+ include/trace/events/xdp.h | 80 +-
+ include/trace/perf.h | 6 +-
+ include/uapi/linux/audit.h | 1 +
+ include/uapi/linux/batman_adv.h | 369 ++-
+ include/uapi/linux/bpf.h | 158 +-
+ include/uapi/linux/btrfs.h | 8 +-
+ include/uapi/linux/btrfs_tree.h | 1 +
+ include/uapi/linux/dcbnl.h | 1 +
+ include/uapi/linux/elf.h | 1 +
+ include/uapi/linux/fanotify.h | 3 +
+ include/uapi/linux/if_link.h | 8 +
+ include/uapi/linux/if_tun.h | 2 +
+ include/uapi/linux/if_tunnel.h | 1 +
+ include/uapi/linux/ila.h | 21 +
+ include/uapi/linux/in6.h | 1 +
+ include/uapi/linux/input-event-codes.h | 1 +
+ include/uapi/linux/ip6_tunnel.h | 2 +
+ include/uapi/linux/ipv6.h | 1 +
+ include/uapi/linux/ipv6_route.h | 2 +-
+ include/uapi/linux/iso_fs.h | 162 +-
+ include/uapi/linux/nfc.h | 2 +
+ include/uapi/linux/nl80211.h | 82 +-
+ include/uapi/linux/openvswitch.h | 88 +
+ include/uapi/linux/perf_event.h | 1 +
+ include/uapi/linux/pkt_sched.h | 63 +
+ include/uapi/linux/prctl.h | 9 +
+ include/uapi/linux/qrtr.h | 35 +
+ include/uapi/linux/rtnetlink.h | 2 +
+ include/uapi/linux/rxrpc.h | 10 +-
+ include/uapi/linux/sctp.h | 16 +
+ include/uapi/linux/snmp.h | 1 -
+ include/uapi/linux/tc_act/tc_mirred.h | 6 +-
+ include/uapi/linux/tcp.h | 2 +
+ include/uapi/linux/tipc.h | 15 +
+ include/uapi/linux/tls.h | 4 -
+ include/uapi/linux/vm_sockets_diag.h | 33 +
+ init/Kconfig | 2 +-
+ kernel/audit_tree.c | 2 +-
+ kernel/auditsc.c | 6 +
+ kernel/bpf/Makefile | 3 +
+ kernel/bpf/arraymap.c | 6 +-
+ kernel/bpf/cgroup.c | 570 +++-
+ kernel/bpf/core.c | 180 +-
+ kernel/bpf/cpumap.c | 706 ++++
+ kernel/bpf/devmap.c | 5 +-
+ kernel/bpf/disasm.c | 214 ++
+ kernel/bpf/disasm.h | 32 +
+ kernel/bpf/hashtab.c | 5 +-
+ kernel/bpf/inode.c | 15 +-
+ kernel/bpf/lpm_trie.c | 98 +-
+ kernel/bpf/offload.c | 194 ++
+ kernel/bpf/percpu_freelist.c | 8 +-
+ kernel/bpf/sockmap.c | 9 +-
+ kernel/bpf/stackmap.c | 5 +-
+ kernel/bpf/syscall.c | 325 +-
+ kernel/bpf/verifier.c | 1480 +++++----
+ kernel/cgroup/cgroup.c | 38 +-
+ kernel/events/core.c | 31 +-
+ kernel/events/ring_buffer.c | 4 +
+ kernel/irq/irqdesc.c | 1 +
+ kernel/kthread.c | 66 +-
+ kernel/livepatch/Makefile | 2 +-
+ kernel/livepatch/core.c | 52 +-
+ kernel/livepatch/core.h | 40 +
+ kernel/livepatch/patch.c | 1 +
+ kernel/livepatch/shadow.c | 277 ++
+ kernel/livepatch/transition.c | 45 +-
+ kernel/padata.c | 71 +-
+ kernel/sys.c | 12 +
+ kernel/sysctl.c | 5 -
+ kernel/trace/Kconfig | 4 +-
+ kernel/trace/blktrace.c | 90 +-
+ kernel/trace/bpf_trace.c | 177 +-
+ kernel/trace/trace_kprobe.c | 6 +-
+ kernel/trace/trace_syscalls.c | 34 +-
+ kernel/trace/trace_uprobe.c | 3 +-
+ lib/Kconfig | 18 +
+ lib/Makefile | 8 +
+ lib/ashldi3.c | 44 +
+ lib/ashrdi3.c | 46 +
+ lib/cmpdi2.c | 42 +
+ lib/dynamic_queue_limits.c | 3 +-
+ lib/kobject_uevent.c | 94 +-
+ lib/lshrdi3.c | 45 +
+ lib/mpi/mpi-pow.c | 2 +
+ lib/muldi3.c | 72 +
+ lib/nlattr.c | 19 +-
+ lib/once.c | 8 +-
+ lib/test_rhashtable.c | 293 +-
+ lib/ucmpdi2.c | 35 +
+ lib/xz/xz_dec_stream.c | 16 +
+ mm/backing-dev.c | 20 -
+ mm/huge_memory.c | 8 +-
+ mm/page-writeback.c | 36 +-
+ mm/page_io.c | 2 +-
+ mm/vmscan.c | 2 +-
+ net/8021q/vlan.c | 9 +-
+ net/8021q/vlan.h | 2 +-
+ net/8021q/vlan_netlink.c | 3 +-
+ net/atm/clip.c | 4 +-
+ net/atm/lec.c | 19 +-
+ net/atm/mpc.c | 11 +-
+ net/ax25/af_ax25.c | 7 +-
+ net/ax25/ax25_ds_timer.c | 9 +-
+ net/ax25/ax25_timer.c | 41 +-
+ net/batman-adv/bat_iv_ogm.c | 24 +-
+ net/batman-adv/bat_v.c | 11 +-
+ net/batman-adv/bat_v_elp.c | 6 +-
+ net/batman-adv/bat_v_ogm.c | 12 +-
+ net/batman-adv/distributed-arp-table.c | 4 +-
+ net/batman-adv/gateway_client.c | 8 +-
+ net/batman-adv/gateway_common.c | 18 +-
+ net/batman-adv/hard-interface.c | 14 +-
+ net/batman-adv/icmp_socket.c | 4 +-
+ net/batman-adv/main.c | 12 +-
+ net/batman-adv/main.h | 2 +-
+ net/batman-adv/multicast.c | 2 +-
+ net/batman-adv/originator.c | 26 +-
+ net/batman-adv/routing.c | 6 +-
+ net/batman-adv/send.c | 6 +-
+ net/batman-adv/soft-interface.c | 10 +-
+ net/batman-adv/sysfs.c | 4 +-
+ net/batman-adv/tp_meter.c | 2 +-
+ net/bluetooth/a2mp.c | 2 +-
+ net/bluetooth/amp.c | 4 +-
+ net/bluetooth/ecdh_helper.c | 228 +-
+ net/bluetooth/ecdh_helper.h | 9 +-
+ net/bluetooth/hci_conn.c | 6 +-
+ net/bluetooth/hci_core.c | 35 +-
+ net/bluetooth/hci_event.c | 46 +-
+ net/bluetooth/hci_request.c | 21 +-
+ net/bluetooth/hci_request.h | 1 +
+ net/bluetooth/hci_sock.c | 17 +-
+ net/bluetooth/hci_sysfs.c | 2 +-
+ net/bluetooth/mgmt.c | 57 +-
+ net/bluetooth/selftest.c | 48 +-
+ net/bluetooth/smp.c | 149 +-
+ net/bpf/test_run.c | 3 +-
+ net/bridge/Makefile | 2 +-
+ net/bridge/br.c | 2 +-
+ net/bridge/br_arp_nd_proxy.c | 469 +++
+ net/bridge/br_device.c | 27 +-
+ net/bridge/br_forward.c | 2 +-
+ net/bridge/br_if.c | 24 +-
+ net/bridge/br_input.c | 77 +-
+ net/bridge/br_ioctl.c | 4 +-
+ net/bridge/br_mdb.c | 54 +-
+ net/bridge/br_multicast.c | 141 +-
+ net/bridge/br_netlink.c | 129 +-
+ net/bridge/br_netlink_tunnel.c | 14 +-
+ net/bridge/br_private.h | 40 +-
+ net/bridge/br_private_tunnel.h | 3 +-
+ net/bridge/br_stp.c | 6 +-
+ net/bridge/br_stp_if.c | 4 +-
+ net/bridge/br_stp_timer.c | 50 +-
+ net/bridge/br_sysfs_if.c | 22 +-
+ net/bridge/br_vlan.c | 78 +-
+ net/bridge/netfilter/ebtables.c | 3 +-
+ net/can/af_can.c | 4 +-
+ net/can/af_can.h | 2 +-
+ net/can/proc.c | 8 +-
+ net/core/datagram.c | 2 +-
+ net/core/dev.c | 343 +-
+ net/core/dst.c | 16 +
+ net/core/ethtool.c | 16 +
+ net/core/fib_notifier.c | 10 +-
+ net/core/fib_rules.c | 15 +-
+ net/core/filter.c | 336 +-
+ net/core/flow_dissector.c | 130 +-
+ net/core/lwt_bpf.c | 2 +-
+ net/core/neighbour.c | 18 +-
+ net/core/net-sysfs.c | 28 +-
+ net/core/net-traces.c | 3 +
+ net/core/net_namespace.c | 1 +
+ net/core/pktgen.c | 16 +-
+ net/core/rtnetlink.c | 448 ++-
+ net/core/skbuff.c | 57 +-
+ net/core/sock.c | 35 +-
+ net/dccp/ccids/ccid2.c | 10 +-
+ net/dccp/ccids/ccid2.h | 1 +
+ net/dccp/ccids/ccid3.c | 11 +-
+ net/dccp/ccids/ccid3.h | 1 +
+ net/dccp/ccids/lib/packet_history.c | 4 +-
+ net/dccp/input.c | 1 +
+ net/dccp/options.c | 2 +-
+ net/dccp/timer.c | 30 +-
+ net/decnet/af_decnet.c | 7 +-
+ net/decnet/dn_dev.c | 12 +-
+ net/decnet/dn_nsp_in.c | 8 +-
+ net/decnet/dn_nsp_out.c | 18 +-
+ net/decnet/dn_route.c | 8 +-
+ net/decnet/dn_table.c | 1 +
+ net/dsa/Kconfig | 4 +
+ net/dsa/Makefile | 3 +-
+ net/dsa/dsa.c | 105 +-
+ net/dsa/dsa2.c | 909 +++---
+ net/dsa/dsa_priv.h | 71 +-
+ net/dsa/legacy.c | 85 +-
+ net/dsa/master.c | 143 +
+ net/dsa/port.c | 105 +-
+ net/dsa/slave.c | 601 ++--
+ net/dsa/switch.c | 2 +-
+ net/dsa/tag_brcm.c | 90 +-
+ net/dsa/tag_dsa.c | 28 +-
+ net/dsa/tag_edsa.c | 28 +-
+ net/dsa/tag_ksz.c | 13 +-
+ net/dsa/tag_lan9303.c | 55 +-
+ net/dsa/tag_mtk.c | 20 +-
+ net/dsa/tag_qca.c | 22 +-
+ net/dsa/tag_trailer.c | 13 +-
+ net/hsr/hsr_device.c | 9 +-
+ net/hsr/hsr_framereg.c | 6 +-
+ net/hsr/hsr_framereg.h | 2 +-
+ net/ieee802154/6lowpan/reassembly.c | 5 +-
+ net/ieee802154/netlink.c | 6 +-
+ net/ipv4/af_inet.c | 12 +-
+ net/ipv4/ah4.c | 2 +-
+ net/ipv4/arp.c | 1 +
+ net/ipv4/devinet.c | 43 +-
+ net/ipv4/esp4.c | 2 +-
+ net/ipv4/fib_frontend.c | 34 +-
+ net/ipv4/fib_semantics.c | 19 +-
+ net/ipv4/fib_trie.c | 42 +-
+ net/ipv4/icmp.c | 20 +-
+ net/ipv4/inet_connection_sock.c | 57 +-
+ net/ipv4/inet_fragment.c | 4 +-
+ net/ipv4/inet_timewait_sock.c | 7 +-
+ net/ipv4/inetpeer.c | 11 +-
+ net/ipv4/ip_fragment.c | 5 +-
+ net/ipv4/ip_gre.c | 88 +-
+ net/ipv4/ip_tunnel.c | 12 +-
+ net/ipv4/ip_vti.c | 16 +-
+ net/ipv4/ipip.c | 7 +-
+ net/ipv4/ipmr.c | 262 +-
+ net/ipv4/netfilter/arp_tables.c | 22 +-
+ net/ipv4/netfilter/ip_tables.c | 23 +-
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +-
+ net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 28 +-
+ net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 3 +-
+ net/ipv4/proc.c | 1 -
+ net/ipv4/route.c | 5 +-
+ net/ipv4/syncookies.c | 2 +-
+ net/ipv4/sysctl_net_ipv4.c | 520 +--
+ net/ipv4/tcp.c | 167 +-
+ net/ipv4/tcp_cdg.c | 2 +-
+ net/ipv4/tcp_cong.c | 76 +-
+ net/ipv4/tcp_fastopen.c | 160 +-
+ net/ipv4/tcp_input.c | 597 ++--
+ net/ipv4/tcp_ipv4.c | 69 +-
+ net/ipv4/tcp_metrics.c | 22 +-
+ net/ipv4/tcp_minisocks.c | 41 +-
+ net/ipv4/tcp_nv.c | 47 +-
+ net/ipv4/tcp_output.c | 324 +-
+ net/ipv4/tcp_recovery.c | 102 +-
+ net/ipv4/tcp_timer.c | 77 +-
+ net/ipv4/tcp_vegas.c | 2 +-
+ net/ipv4/udp.c | 3 +-
+ net/ipv6/addrconf.c | 381 +--
+ net/ipv6/addrconf_core.c | 9 +-
+ net/ipv6/addrlabel.c | 146 +-
+ net/ipv6/af_inet6.c | 4 +
+ net/ipv6/ah6.c | 3 +-
+ net/ipv6/esp6.c | 10 +-
+ net/ipv6/exthdrs.c | 73 +-
+ net/ipv6/exthdrs_core.c | 5 +-
+ net/ipv6/icmp.c | 50 +-
+ net/ipv6/ila/ila.h | 12 +-
+ net/ipv6/ila/ila_common.c | 104 +-
+ net/ipv6/ila/ila_lwt.c | 111 +-
+ net/ipv6/ila/ila_xlat.c | 26 +-
+ net/ipv6/ip6_fib.c | 667 ++--
+ net/ipv6/ip6_gre.c | 28 +-
+ net/ipv6/ip6_tunnel.c | 89 +-
+ net/ipv6/ip6_vti.c | 23 +-
+ net/ipv6/ip6mr.c | 5 +
+ net/ipv6/ipv6_sockglue.c | 12 +
+ net/ipv6/ndisc.c | 18 +-
+ net/ipv6/netfilter/ip6_tables.c | 22 +-
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 2 +-
+ net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 24 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 5 +-
+ net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 3 +-
+ net/ipv6/output_core.c | 31 -
+ net/ipv6/ping.c | 5 +-
+ net/ipv6/raw.c | 4 +
+ net/ipv6/reassembly.c | 5 +-
+ net/ipv6/route.c | 940 +++++-
+ net/ipv6/sit.c | 40 +-
+ net/ipv6/syncookies.c | 2 +-
+ net/ipv6/sysctl_net_ipv6.c | 32 +
+ net/ipv6/tcp_ipv6.c | 17 +-
+ net/ipv6/xfrm6_policy.c | 1 +
+ net/ipv6/xfrm6_tunnel.c | 8 +
+ net/ipx/af_ipx.c | 1 +
+ net/kcm/kcmsock.c | 2 +-
+ net/key/af_key.c | 2 +-
+ net/l2tp/l2tp_core.c | 83 +-
+ net/l2tp/l2tp_core.h | 37 +-
+ net/l2tp/l2tp_debugfs.c | 4 +-
+ net/l2tp/l2tp_eth.c | 106 +-
+ net/l2tp/l2tp_ip.c | 4 +-
+ net/l2tp/l2tp_ip6.c | 4 +-
+ net/l2tp/l2tp_netlink.c | 24 +-
+ net/l2tp/l2tp_ppp.c | 320 +-
+ net/lapb/lapb_iface.c | 4 +-
+ net/lapb/lapb_timer.c | 18 +-
+ net/llc/llc_c_ac.c | 27 +-
+ net/llc/llc_conn.c | 12 +-
+ net/mac80211/Makefile | 3 +-
+ net/mac80211/{aes_ccm.c => aead_api.c} | 40 +-
+ net/mac80211/aead_api.h | 27 +
+ net/mac80211/aes_ccm.h | 42 +-
+ net/mac80211/aes_gcm.c | 109 -
+ net/mac80211/aes_gcm.h | 38 +-
+ net/mac80211/agg-rx.c | 4 +-
+ net/mac80211/ht.c | 12 +-
+ net/mac80211/ieee80211_i.h | 2 +
+ net/mac80211/iface.c | 29 +-
+ net/mac80211/mesh.c | 3 +-
+ net/mac80211/mesh.h | 1 +
+ net/mac80211/mesh_hwmp.c | 8 +-
+ net/mac80211/mesh_plink.c | 13 +-
+ net/mac80211/mlme.c | 33 +-
+ net/mac80211/scan.c | 37 +-
+ net/mac80211/sta_info.c | 61 +-
+ net/mac80211/sta_info.h | 4 +-
+ net/mac80211/tx.c | 34 +
+ net/mac80211/util.c | 25 +-
+ net/mac80211/vht.c | 10 +
+ net/mac80211/wpa.c | 4 +-
+ net/mac802154/llsec.c | 14 +-
+ net/mpls/Kconfig | 1 +
+ net/mpls/af_mpls.c | 36 +
+ net/ncsi/ncsi-aen.c | 15 +-
+ net/ncsi/ncsi-manage.c | 78 +-
+ net/ncsi/ncsi-rsp.c | 41 +-
+ net/netfilter/ipset/ip_set_bitmap_gen.h | 10 +-
+ net/netfilter/ipset/ip_set_bitmap_ip.c | 2 +
+ net/netfilter/ipset/ip_set_bitmap_ipmac.c | 2 +
+ net/netfilter/ipset/ip_set_bitmap_port.c | 2 +
+ net/netfilter/ipset/ip_set_hash_gen.h | 12 +-
+ net/netfilter/ipset/ip_set_hash_ipportnet.c | 2 +-
+ net/netfilter/ipset/ip_set_list_set.c | 17 +-
+ net/netfilter/ipset/pfxlen.c | 395 +--
+ net/netfilter/ipvs/ip_vs_conn.c | 2 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 8 +-
+ net/netfilter/nf_conntrack_core.c | 15 +-
+ net/netfilter/nf_conntrack_h323_asn1.c | 81 +-
+ net/netfilter/nf_conntrack_netlink.c | 10 +-
+ net/netfilter/nf_conntrack_proto.c | 86 +-
+ net/netfilter/nf_conntrack_proto_dccp.c | 21 +-
+ net/netfilter/nf_conntrack_proto_generic.c | 1 -
+ net/netfilter/nf_conntrack_proto_gre.c | 1 -
+ net/netfilter/nf_conntrack_proto_sctp.c | 4 +-
+ net/netfilter/nf_conntrack_proto_tcp.c | 62 +-
+ net/netfilter/nf_conntrack_proto_udp.c | 41 +-
+ net/netfilter/nf_nat_core.c | 9 +-
+ net/netfilter/nf_tables_api.c | 195 +-
+ net/netfilter/nft_ct.c | 39 +-
+ net/netfilter/nft_set_bitmap.c | 18 +
+ net/netfilter/nft_set_hash.c | 41 +-
+ net/netfilter/nft_set_rbtree.c | 73 +
+ net/netfilter/x_tables.c | 21 +-
+ net/netfilter/xt_bpf.c | 2 +-
+ net/netfilter/xt_connlimit.c | 55 +-
+ net/netlink/af_netlink.c | 48 +-
+ net/netlink/af_netlink.h | 1 +
+ net/netrom/af_netrom.c | 6 +-
+ net/netrom/nr_in.c | 2 +-
+ net/netrom/nr_route.c | 62 +-
+ net/netrom/nr_timer.c | 48 +-
+ net/nfc/core.c | 11 +-
+ net/nfc/digital_core.c | 1 +
+ net/nfc/hci/core.c | 8 +-
+ net/nfc/hci/llc_shdlc.c | 26 +-
+ net/nfc/llcp_core.c | 16 +-
+ net/nfc/netlink.c | 29 +
+ net/nsh/nsh.c | 60 +
+ net/openvswitch/Kconfig | 1 +
+ net/openvswitch/Makefile | 1 +
+ net/openvswitch/actions.c | 126 +
+ net/openvswitch/conntrack.c | 12 +
+ net/openvswitch/conntrack.h | 7 +
+ net/openvswitch/datapath.c | 90 +-
+ net/openvswitch/datapath.h | 39 +-
+ net/openvswitch/dp_notify.c | 4 +-
+ net/openvswitch/flow.c | 51 +
+ net/openvswitch/flow.h | 7 +
+ net/openvswitch/flow_netlink.c | 405 ++-
+ net/openvswitch/flow_netlink.h | 5 +
+ net/openvswitch/meter.c | 597 ++++
+ net/openvswitch/meter.h | 54 +
+ net/openvswitch/vport-netdev.c | 3 +-
+ net/packet/af_packet.c | 25 +-
+ net/phonet/af_phonet.c | 17 +-
+ net/phonet/datagram.c | 2 +-
+ net/phonet/pep.c | 2 +-
+ net/phonet/pn_dev.c | 3 +
+ net/qrtr/qrtr.c | 377 ++-
+ net/rds/ib.c | 11 +-
+ net/rds/ib.h | 2 -
+ net/rds/ib_rdma.c | 4 +-
+ net/rose/af_rose.c | 17 +-
+ net/rose/rose_in.c | 1 +
+ net/rose/rose_link.c | 16 +-
+ net/rose/rose_loopback.c | 9 +-
+ net/rose/rose_route.c | 10 +-
+ net/rose/rose_timer.c | 39 +-
+ net/rxrpc/af_rxrpc.c | 42 +-
+ net/rxrpc/ar-internal.h | 1 +
+ net/rxrpc/call_event.c | 2 +-
+ net/rxrpc/call_object.c | 1 +
+ net/rxrpc/input.c | 3 +-
+ net/rxrpc/output.c | 19 +-
+ net/rxrpc/peer_object.c | 13 +
+ net/rxrpc/recvmsg.c | 7 +-
+ net/rxrpc/sendmsg.c | 108 +-
+ net/sched/Kconfig | 11 +
+ net/sched/Makefile | 1 +
+ net/sched/act_api.c | 221 ++
+ net/sched/act_bpf.c | 4 +-
+ net/sched/act_ife.c | 153 +-
+ net/sched/act_meta_mark.c | 2 +-
+ net/sched/act_meta_skbprio.c | 2 +-
+ net/sched/act_meta_skbtcindex.c | 2 +-
+ net/sched/act_mirred.c | 13 +-
+ net/sched/act_vlan.c | 81 +-
+ net/sched/cls_api.c | 318 +-
+ net/sched/cls_basic.c | 38 +-
+ net/sched/cls_bpf.c | 99 +-
+ net/sched/cls_flow.c | 14 +-
+ net/sched/cls_flower.c | 76 +-
+ net/sched/cls_fw.c | 5 +-
+ net/sched/cls_matchall.c | 58 +-
+ net/sched/cls_tcindex.c | 5 +-
+ net/sched/cls_u32.c | 187 +-
+ net/sched/ematch.c | 2 +-
+ net/sched/sch_api.c | 9 +-
+ net/sched/sch_atm.c | 4 +-
+ net/sched/sch_cbq.c | 3 +-
+ net/sched/sch_cbs.c | 373 +++
+ net/sched/sch_drr.c | 3 +-
+ net/sched/sch_dsmark.c | 2 +-
+ net/sched/sch_fq_codel.c | 3 +-
+ net/sched/sch_generic.c | 70 +-
+ net/sched/sch_hfsc.c | 5 +-
+ net/sched/sch_htb.c | 10 +-
+ net/sched/sch_ingress.c | 49 +-
+ net/sched/sch_mq.c | 10 +-
+ net/sched/sch_mqprio.c | 273 +-
+ net/sched/sch_multiq.c | 3 +-
+ net/sched/sch_netem.c | 167 +-
+ net/sched/sch_pie.c | 10 +-
+ net/sched/sch_prio.c | 3 +-
+ net/sched/sch_qfq.c | 3 +-
+ net/sched/sch_red.c | 93 +-
+ net/sched/sch_sfb.c | 3 +-
+ net/sched/sch_sfq.c | 13 +-
+ net/sctp/Makefile | 3 +-
+ net/sctp/associola.c | 3 +-
+ net/sctp/chunk.c | 6 +-
+ net/sctp/outqueue.c | 63 +-
+ net/sctp/protocol.c | 7 +-
+ net/sctp/sm_sideeffect.c | 88 +-
+ net/sctp/socket.c | 179 +-
+ net/sctp/stream.c | 202 +-
+ net/sctp/stream_sched.c | 275 ++
+ net/sctp/stream_sched_prio.c | 347 ++
+ net/sctp/stream_sched_rr.c | 201 ++
+ net/sctp/transport.c | 13 +-
+ net/smc/af_smc.c | 42 +-
+ net/smc/smc_cdc.c | 7 +-
+ net/smc/smc_cdc.h | 3 +-
+ net/smc/smc_close.c | 3 +-
+ net/smc/smc_core.c | 12 +-
+ net/smc/smc_ib.c | 26 +-
+ net/smc/smc_tx.c | 6 +-
+ net/sunrpc/sched.c | 8 +-
+ net/sunrpc/svc.c | 2 +-
+ net/sunrpc/svc_xprt.c | 9 +-
+ net/sunrpc/xprt.c | 9 +-
+ net/switchdev/switchdev.c | 2 +
+ net/tipc/Makefile | 2 +-
+ net/tipc/bcast.c | 18 +-
+ net/tipc/core.h | 5 +
+ net/tipc/discover.c | 6 +-
+ net/tipc/group.c | 871 +++++
+ net/tipc/group.h | 73 +
+ net/tipc/link.c | 34 +-
+ net/tipc/monitor.c | 17 +-
+ net/tipc/msg.c | 7 +
+ net/tipc/msg.h | 128 +-
+ net/tipc/name_table.c | 176 +-
+ net/tipc/name_table.h | 28 +-
+ net/tipc/node.c | 50 +-
+ net/tipc/node.h | 5 +-
+ net/tipc/server.c | 121 +-
+ net/tipc/server.h | 5 +-
+ net/tipc/socket.c | 845 +++--
+ net/tipc/subscr.c | 6 +-
+ net/tls/tls_main.c | 96 +-
+ net/tls/tls_sw.c | 24 +-
+ net/unix/af_unix.c | 1 +
+ net/vmw_vsock/Kconfig | 10 +
+ net/vmw_vsock/Makefile | 3 +
+ net/vmw_vsock/af_vsock.c | 73 +-
+ net/vmw_vsock/diag.c | 186 ++
+ net/vmw_vsock/hyperv_transport.c | 13 +-
+ net/vmw_vsock/virtio_transport.c | 2 +-
+ net/vmw_vsock/virtio_transport_common.c | 22 +-
+ net/vmw_vsock/vmci_transport.c | 35 +-
+ net/vmw_vsock/vmci_transport_notify.c | 2 +-
+ net/vmw_vsock/vmci_transport_notify_qstate.c | 2 +-
+ net/wireless/.gitignore | 3 +-
+ net/wireless/Kconfig | 58 +-
+ net/wireless/Makefile | 24 +-
+ net/wireless/certs/sforshee.x509 | Bin 0 -> 680 bytes
+ net/wireless/chan.c | 4 +-
+ net/wireless/core.c | 2 +-
+ net/wireless/core.h | 5 +
+ net/wireless/db.txt | 17 -
+ net/wireless/genregdb.awk | 158 -
+ net/wireless/nl80211.c | 199 +-
+ net/wireless/nl80211.h | 2 +
+ net/wireless/reg.c | 452 ++-
+ net/wireless/reg.h | 14 +
+ net/wireless/regdb.h | 23 -
+ net/wireless/sme.c | 45 +-
+ net/wireless/util.c | 202 +-
+ net/x25/af_x25.c | 9 +-
+ net/x25/x25_facilities.c | 2 +-
+ net/x25/x25_in.c | 1 +
+ net/x25/x25_timer.c | 18 +-
+ net/xfrm/xfrm_policy.c | 17 +-
+ net/xfrm/xfrm_user.c | 105 +-
+ samples/Kconfig | 5 +-
+ samples/bpf/Makefile | 26 +-
+ samples/bpf/README.rst | 10 +
+ samples/bpf/bpf_load.c | 2 +
+ samples/bpf/map_perf_test_kern.c | 2 +-
+ samples/bpf/map_perf_test_user.c | 3 +-
+ samples/bpf/syscall_tp_user.c | 66 +-
+ samples/bpf/tcp_basertt_kern.c | 78 +
+ samples/bpf/tcp_bpf.readme | 26 +
+ samples/bpf/tcp_bufs_kern.c | 14 +-
+ samples/bpf/tcp_clamp_kern.c | 24 +-
+ samples/bpf/tcp_cong_kern.c | 6 +-
+ samples/bpf/tcp_iw_kern.c | 14 +-
+ samples/bpf/tcp_rwnd_kern.c | 6 +-
+ samples/bpf/tcp_synrto_kern.c | 6 +-
+ samples/bpf/test_cgrp2_attach2.c | 224 +-
+ samples/bpf/trace_event_kern.c | 10 +
+ samples/bpf/trace_event_user.c | 13 +-
+ samples/bpf/tracex6_kern.c | 26 +
+ samples/bpf/tracex6_user.c | 13 +-
+ samples/bpf/xdp1_user.c | 8 +
+ samples/bpf/xdp_monitor_kern.c | 60 +-
+ samples/bpf/xdp_monitor_user.c | 123 +-
+ samples/bpf/xdp_redirect_cpu_kern.c | 609 ++++
+ samples/bpf/xdp_redirect_cpu_user.c | 697 ++++
+ samples/bpf/xdp_redirect_map_user.c | 7 +
+ samples/bpf/xdp_router_ipv4_kern.c | 186 ++
+ samples/bpf/xdp_router_ipv4_user.c | 660 ++++
+ samples/configfs/configfs_sample.c | 8 +-
+ samples/livepatch/Makefile | 6 +
+ samples/livepatch/livepatch-callbacks-busymod.c | 72 +
+ samples/livepatch/livepatch-callbacks-demo.c | 234 ++
+ samples/livepatch/livepatch-callbacks-mod.c | 53 +
+ samples/livepatch/livepatch-shadow-fix1.c | 173 +
+ samples/livepatch/livepatch-shadow-fix2.c | 168 +
+ samples/livepatch/livepatch-shadow-mod.c | 224 ++
+ samples/pktgen/functions.sh | 43 +
+ samples/pktgen/pktgen.conf-1-1-ip6 | 61 -
+ samples/pktgen/pktgen.conf-1-1-ip6-rdos | 64 -
+ samples/pktgen/pktgen.conf-1-2 | 70 -
+ .../pktgen/pktgen_sample03_burst_single_flow.sh | 2 +-
+ ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 97 +
+ samples/trace_events/trace-events-sample.h | 10 +-
+ samples/vfio-mdev/mtty.c | 2 +-
+ scripts/Makefile.dtbinst | 6 +-
+ scripts/Makefile.lib | 5 +
+ scripts/dtc/checks.c | 291 +-
+ scripts/dtc/dtc-lexer.lex.c_shipped | 10 +-
+ scripts/dtc/dtc-parser.tab.c_shipped | 430 +--
+ scripts/dtc/dtc-parser.y | 20 +-
+ scripts/dtc/dtc.c | 2 +-
+ scripts/dtc/dtc.h | 3 +
+ scripts/dtc/libfdt/fdt_addresses.c | 96 +
+ scripts/dtc/libfdt/fdt_empty_tree.c | 1 -
+ scripts/dtc/libfdt/fdt_overlay.c | 861 +++++
+ scripts/dtc/libfdt/fdt_ro.c | 4 +-
+ scripts/dtc/libfdt/fdt_rw.c | 24 +-
+ scripts/dtc/libfdt/fdt_sw.c | 16 +-
+ scripts/dtc/libfdt/fdt_wip.c | 4 +-
+ scripts/dtc/libfdt/libfdt.h | 47 +
+ scripts/dtc/livetree.c | 31 +-
+ scripts/dtc/update-dtc-source.sh | 4 +-
+ scripts/dtc/version_gen.h | 2 +-
+ scripts/mod/devicetable-offsets.c | 7 +
+ scripts/mod/file2alias.c | 25 +
+ security/device_cgroup.c | 91 +-
+ security/integrity/ima/ima_crypto.c | 56 +-
+ security/security.c | 32 +
+ security/selinux/hooks.c | 160 +
+ security/selinux/include/classmap.h | 2 +
+ security/selinux/include/objsec.h | 4 +
+ sound/Kconfig | 35 +-
+ sound/Makefile | 4 +-
+ sound/ac97/Kconfig | 19 +
+ sound/ac97/Makefile | 8 +
+ sound/ac97/ac97_core.h | 16 +
+ sound/ac97/bus.c | 539 +++
+ sound/ac97/codec.c | 15 +
+ sound/ac97/snd_ac97_compat.c | 108 +
+ sound/arm/pxa2xx-ac97-lib.c | 37 +-
+ sound/arm/pxa2xx-ac97.c | 35 +-
+ sound/core/hrtimer.c | 2 +-
+ sound/core/hwdep.c | 2 +
+ sound/core/init.c | 32 +
+ sound/core/jack.c | 2 +-
+ sound/core/pcm.c | 20 +-
+ sound/core/pcm_native.c | 2 -
+ sound/core/seq/seq_clientmgr.c | 4 +
+ sound/core/timer.c | 11 +-
+ sound/drivers/aloop.c | 7 +-
+ sound/drivers/dummy.c | 7 +-
+ sound/drivers/mpu401/mpu401_uart.c | 7 +-
+ sound/drivers/mtpav.c | 7 +-
+ sound/drivers/opl3/opl3_midi.c | 4 +-
+ sound/drivers/opl3/opl3_seq.c | 2 +-
+ sound/drivers/opl3/opl3_voice.h | 2 +-
+ sound/drivers/serial-u16550.c | 7 +-
+ sound/hda/hdac_controller.c | 3 +-
+ sound/hda/hdac_device.c | 43 +-
+ sound/hda/hdac_sysfs.c | 47 +
+ sound/hda/local.h | 2 +
+ sound/i2c/other/ak4117.c | 8 +-
+ sound/isa/sb/emu8000_pcm.c | 6 +-
+ sound/isa/sb/sb8_midi.c | 11 +-
+ sound/isa/wavefront/wavefront_midi.c | 10 +-
+ sound/oss/CHANGELOG | 369 ---
+ sound/oss/Kconfig | 533 ---
+ sound/oss/Makefile | 108 -
+ sound/oss/README.FIRST | 6 -
+ sound/oss/ad1848.c | 3062 -----------------
+ sound/oss/ad1848.h | 25 -
+ sound/oss/ad1848_mixer.h | 253 --
+ sound/oss/aedsp16.c | 1373 --------
+ sound/oss/audio.c | 985 ------
+ sound/oss/bin2hex.c | 40 -
+ sound/oss/coproc.h | 12 -
+ sound/oss/dev_table.c | 256 --
+ sound/oss/dev_table.h | 390 ---
+ sound/oss/dmabuf.c | 1268 --------
+ sound/oss/hex2hex.c | 102 -
+ sound/oss/kahlua.c | 229 --
+ sound/oss/midi_ctrl.h | 23 -
+ sound/oss/midi_synth.c | 712 ----
+ sound/oss/midi_synth.h | 48 -
+ sound/oss/midibuf.c | 427 ---
+ sound/oss/mpu401.c | 1804 ----------
+ sound/oss/mpu401.h | 12 -
+ sound/oss/msnd.c | 413 ---
+ sound/oss/msnd.h | 278 --
+ sound/oss/msnd_classic.c | 3 -
+ sound/oss/msnd_classic.h | 185 --
+ sound/oss/msnd_pinnacle.c | 1941 -----------
+ sound/oss/msnd_pinnacle.h | 246 --
+ sound/oss/opl3.c | 1255 -------
+ sound/oss/opl3_hw.h | 246 --
+ sound/oss/os.h | 46 -
+ sound/oss/pas2.h | 21 -
+ sound/oss/pas2_card.c | 458 ---
+ sound/oss/pas2_midi.c | 262 --
+ sound/oss/pas2_mixer.c | 327 --
+ sound/oss/pas2_pcm.c | 419 ---
+ sound/oss/pss.c | 1270 --------
+ sound/oss/sb.h | 186 --
+ sound/oss/sb_audio.c | 1097 -------
+ sound/oss/sb_card.c | 354 --
+ sound/oss/sb_card.h | 149 -
+ sound/oss/sb_common.c | 1287 --------
+ sound/oss/sb_ess.c | 1823 -----------
+ sound/oss/sb_ess.h | 35 -
+ sound/oss/sb_midi.c | 206 --
+ sound/oss/sb_mixer.c | 770 -----
+ sound/oss/sb_mixer.h | 105 -
+ sound/oss/sequencer.c | 1661 ----------
+ sound/oss/sleep.h | 19 -
+ sound/oss/sound_calls.h | 88 -
+ sound/oss/sound_config.h | 144 -
+ sound/oss/sound_firmware.h | 30 -
+ sound/oss/sound_timer.c | 327 --
+ sound/oss/soundcard.c | 733 -----
+ sound/oss/soundvers.h | 2 -
+ sound/oss/swarm_cs4297a.c | 2781 ----------------
+ sound/oss/sys_timer.c | 280 --
+ sound/oss/trix.c | 525 ---
+ sound/oss/tuning.h | 24 -
+ sound/oss/uart401.c | 477 ---
+ sound/oss/uart6850.c | 361 --
+ sound/oss/ulaw.h | 70 -
+ sound/oss/v_midi.c | 290 --
+ sound/oss/v_midi.h | 15 -
+ sound/oss/vidc.c | 557 ----
+ sound/oss/vidc.h | 63 -
+ sound/oss/vidc_fill.S | 218 --
+ sound/oss/waveartist.c | 2043 ------------
+ sound/oss/waveartist.h | 93 -
+ sound/pci/asihpi/asihpi.c | 15 +-
+ sound/pci/au88x0/au88x0_core.c | 2 +-
+ sound/pci/ctxfi/cttimer.c | 7 +-
+ sound/pci/echoaudio/midi.c | 10 +-
+ sound/pci/emu10k1/emuproc.c | 1 -
+ sound/pci/ens1370.c | 3 +-
+ sound/pci/hda/hda_codec.c | 2 +-
+ sound/pci/hda/hda_generic.c | 2 +
+ sound/pci/hda/patch_ca0132.c | 8 +-
+ sound/pci/hda/patch_realtek.c | 24 +
+ sound/pci/ice1712/ice1712.c | 2 +-
+ sound/pci/ice1712/ice1712.h | 3 +-
+ sound/pci/korg1212/korg1212.c | 7 +-
+ sound/pci/oxygen/xonar_dg.h | 2 +-
+ sound/pci/oxygen/xonar_dg_mixer.c | 2 +-
+ sound/pci/rme9652/hdsp.c | 8 +-
+ sound/pci/rme9652/hdspm.c | 8 +-
+ sound/sh/aica.c | 20 +-
+ sound/soc/Kconfig | 3 +
+ sound/soc/Makefile | 6 +
+ sound/soc/amd/Kconfig | 7 +
+ sound/soc/amd/Makefile | 6 +-
+ sound/soc/amd/acp-pcm-dma.c | 356 +-
+ sound/soc/amd/acp-rt5645.c | 199 ++
+ sound/soc/amd/acp.h | 19 +
+ sound/soc/bcm/bcm2835-i2s.c | 391 ++-
+ sound/soc/bcm/cygnus-ssp.c | 34 +-
+ sound/soc/codecs/Kconfig | 13 +-
+ sound/soc/codecs/Makefile | 1 +
+ sound/soc/codecs/arizona.c | 166 +-
+ sound/soc/codecs/arizona.h | 6 +-
+ sound/soc/codecs/cs43130.c | 16 +-
+ sound/soc/codecs/cs47l24.c | 14 +-
+ sound/soc/codecs/da7213.c | 58 +-
+ sound/soc/codecs/da7213.h | 1 +
+ sound/soc/codecs/hdac_hdmi.c | 51 +-
+ sound/soc/codecs/hdmi-codec.c | 5 +-
+ sound/soc/codecs/max98090.c | 2 +-
+ sound/soc/codecs/max98925.c | 23 +-
+ sound/soc/codecs/max98927.c | 155 +-
+ sound/soc/codecs/max98927.h | 7 +-
+ sound/soc/codecs/msm8916-wcd-analog.c | 120 +-
+ sound/soc/codecs/msm8916-wcd-digital.c | 4 +-
+ sound/soc/codecs/pcm512x-i2c.c | 4 +-
+ sound/soc/codecs/pcm512x-spi.c | 2 +-
+ sound/soc/codecs/pcm512x.c | 4 +-
+ sound/soc/codecs/pcm512x.h | 2 +-
+ sound/soc/codecs/rl6231.c | 5 +-
+ sound/soc/codecs/rt5514-spi.c | 46 +
+ sound/soc/codecs/rt5514.c | 6 +-
+ sound/soc/codecs/rt5645.c | 39 +-
+ sound/soc/codecs/rt5651.c | 219 +-
+ sound/soc/codecs/rt5651.h | 4 +
+ sound/soc/codecs/rt5659.c | 26 +-
+ sound/soc/codecs/rt5663.c | 272 +-
+ sound/soc/codecs/rt5670.c | 143 +-
+ sound/soc/codecs/rt5670.h | 4 +
+ sound/soc/codecs/tas571x.c | 3 +-
+ sound/soc/codecs/tfa9879.c | 6 +
+ sound/soc/codecs/tlv320aic23.c | 1 +
+ sound/soc/codecs/tlv320aic31xx.c | 2 +-
+ sound/soc/codecs/tpa6130a2.c | 1 +
+ sound/soc/codecs/ts3a227e.c | 10 +
+ sound/soc/codecs/wm5102.c | 14 +-
+ sound/soc/codecs/wm5110.c | 14 +-
+ sound/soc/codecs/wm8741.c | 39 +-
+ sound/soc/codecs/wm8753.c | 4 +-
+ sound/soc/codecs/wm8993.c | 2 +
+ sound/soc/codecs/wm8994.c | 2 +
+ sound/soc/codecs/wm8997.c | 15 +-
+ sound/soc/codecs/wm8998.c | 95 +-
+ sound/soc/codecs/wm9705.c | 68 +-
+ sound/soc/codecs/wm9712.c | 48 +-
+ sound/soc/codecs/wm9713.c | 39 +-
+ sound/soc/davinci/davinci-mcasp.c | 21 +-
+ sound/soc/dwc/Kconfig | 4 +-
+ sound/soc/fsl/fsl-asoc-card.c | 14 +-
+ sound/soc/fsl/fsl_spdif.c | 4 +-
+ sound/soc/fsl/fsl_ssi.c | 46 +-
+ sound/soc/generic/audio-graph-card.c | 47 +-
+ sound/soc/img/img-i2s-in.c | 130 +-
+ sound/soc/img/img-i2s-out.c | 120 +-
+ sound/soc/img/img-parallel-out.c | 6 +
+ sound/soc/img/img-spdif-in.c | 110 +-
+ sound/soc/img/img-spdif-out.c | 87 +-
+ sound/soc/intel/Kconfig | 302 +-
+ sound/soc/intel/Makefile | 2 +-
+ sound/soc/intel/atom/sst-mfld-platform-compress.c | 2 +-
+ sound/soc/intel/atom/sst-mfld-platform.h | 2 +-
+ sound/soc/intel/atom/sst/sst_acpi.c | 312 +-
+ sound/soc/intel/atom/sst/sst_loader.c | 1 -
+ sound/soc/intel/atom/sst/sst_stream.c | 1 -
+ sound/soc/intel/boards/Kconfig | 265 ++
+ sound/soc/intel/boards/bxt_da7219_max98357a.c | 16 +-
+ sound/soc/intel/boards/bytcht_da7213.c | 23 +-
+ sound/soc/intel/boards/bytcht_es8316.c | 27 +-
+ sound/soc/intel/boards/bytcht_nocodec.c | 10 +-
+ sound/soc/intel/boards/bytcr_rt5640.c | 118 +-
+ sound/soc/intel/boards/bytcr_rt5651.c | 297 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 185 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 128 +-
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 68 +-
+ sound/soc/intel/boards/kbl_rt5663_max98927.c | 76 +-
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 +
+ sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +-
+ sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +-
+ sound/soc/intel/common/Makefile | 4 +-
+ sound/soc/intel/common/soc-acpi-intel-byt-match.c | 196 ++
+ sound/soc/intel/common/soc-acpi-intel-cht-match.c | 194 ++
+ .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 64 +
+ sound/soc/intel/common/sst-acpi.c | 36 +-
+ sound/soc/intel/common/sst-acpi.h | 82 -
+ sound/soc/intel/common/sst-firmware.c | 3 +-
+ sound/soc/intel/skylake/skl-messages.c | 32 +-
+ sound/soc/intel/skylake/skl-nhlt.c | 9 +
+ sound/soc/intel/skylake/skl-pcm.c | 49 +-
+ sound/soc/intel/skylake/skl-sst-utils.c | 15 +-
+ sound/soc/intel/skylake/skl-topology.c | 70 +-
+ sound/soc/intel/skylake/skl-topology.h | 10 +-
+ sound/soc/intel/skylake/skl.c | 50 +-
+ sound/soc/intel/skylake/skl.h | 4 +-
+ sound/soc/kirkwood/kirkwood-dma.c | 2 +-
+ sound/soc/kirkwood/kirkwood.h | 2 +-
+ sound/soc/omap/ams-delta.c | 4 +-
+ sound/soc/omap/omap-hdmi-audio.c | 3 +
+ sound/soc/pxa/pxa2xx-ac97.c | 32 +-
+ sound/soc/qcom/lpass-platform.c | 2 -
+ sound/soc/rockchip/rk3399_gru_sound.c | 159 +-
+ sound/soc/rockchip/rockchip_i2s.c | 1 -
+ sound/soc/samsung/i2s.c | 10 +-
+ sound/soc/samsung/i2s.h | 3 +
+ sound/soc/samsung/tm2_wm5110.c | 7 +-
+ sound/soc/sh/fsi.c | 11 +-
+ sound/soc/sh/rcar/adg.c | 72 +-
+ sound/soc/sh/rcar/core.c | 51 +-
+ sound/soc/sh/rcar/ctu.c | 88 +-
+ sound/soc/sh/rcar/dma.c | 84 +-
+ sound/soc/sh/rcar/dvc.c | 60 +-
+ sound/soc/sh/rcar/mix.c | 158 +-
+ sound/soc/sh/rcar/rsnd.h | 22 +-
+ sound/soc/sh/rcar/ssi.c | 58 +-
+ .../{intel/common/sst-match-acpi.c => soc-acpi.c} | 56 +-
+ sound/soc/soc-compress.c | 461 ++-
+ sound/soc/soc-core.c | 222 +-
+ sound/soc/soc-dapm.c | 158 +-
+ sound/soc/soc-io.c | 14 +
+ sound/soc/soc-pcm.c | 462 ++-
+ sound/soc/stm/stm32_sai.c | 162 +-
+ sound/soc/stm/stm32_sai.h | 22 +-
+ sound/soc/stm/stm32_sai_sub.c | 162 +-
+ sound/soc/stm/stm32_spdifrx.c | 23 +-
+ sound/soc/sunxi/sun4i-codec.c | 29 +-
+ sound/soc/sunxi/sun8i-codec.c | 72 +-
+ sound/soc/zte/zx-spdif.c | 4 +-
+ sound/synth/emux/emux.c | 2 +-
+ sound/synth/emux/emux_oss.c | 2 -
+ sound/synth/emux/emux_synth.c | 4 +-
+ sound/synth/emux/emux_voice.h | 2 +-
+ sound/usb/6fire/chip.c | 2 -
+ sound/usb/bcd2000/bcd2000.c | 7 +
+ sound/usb/caiaq/device.c | 7 +
+ sound/usb/caiaq/input.c | 9 +
+ sound/usb/hiface/pcm.c | 9 +-
+ sound/usb/line6/capture.c | 2 +-
+ sound/usb/line6/capture.h | 2 +-
+ sound/usb/line6/driver.c | 34 +-
+ sound/usb/line6/driver.h | 3 +-
+ sound/usb/line6/midi.c | 17 +-
+ sound/usb/line6/playback.c | 2 +-
+ sound/usb/line6/playback.h | 2 +-
+ sound/usb/line6/pod.c | 11 +-
+ sound/usb/line6/podhd.c | 26 +-
+ sound/usb/line6/toneport.c | 7 +-
+ sound/usb/line6/variax.c | 32 +-
+ sound/usb/midi.c | 45 +-
+ sound/usb/quirks.c | 24 +-
+ sound/usb/usx2y/usb_stream.c | 23 +-
+ sound/usb/usx2y/usbusx2y.c | 5 +
+ sound/usb/usx2y/usbusx2yaudio.c | 3 +
+ tools/Makefile | 14 +-
+ tools/{net => bpf}/Makefile | 18 +-
+ tools/{net => bpf}/bpf_asm.c | 0
+ tools/{net => bpf}/bpf_dbg.c | 0
+ tools/{net => bpf}/bpf_exp.l | 0
+ tools/{net => bpf}/bpf_exp.y | 0
+ tools/{net => bpf}/bpf_jit_disasm.c | 3 +-
+ tools/bpf/bpftool/Documentation/Makefile | 34 +
+ tools/bpf/bpftool/Documentation/bpftool-map.rst | 131 +
+ tools/bpf/bpftool/Documentation/bpftool-prog.rst | 150 +
+ tools/bpf/bpftool/Documentation/bpftool.rst | 56 +
+ tools/bpf/bpftool/Makefile | 92 +
+ tools/bpf/bpftool/bash-completion/bpftool | 354 ++
+ tools/bpf/bpftool/common.c | 405 +++
+ tools/bpf/bpftool/jit_disasm.c | 162 +
+ tools/bpf/bpftool/json_writer.c | 356 ++
+ tools/bpf/bpftool/json_writer.h | 72 +
+ tools/bpf/bpftool/main.c | 331 ++
+ tools/bpf/bpftool/main.h | 122 +
+ tools/bpf/bpftool/map.c | 899 +++++
+ tools/bpf/bpftool/prog.c | 703 ++++
+ tools/gpio/gpio-utils.c | 17 +-
+ tools/include/uapi/linux/bpf.h | 158 +-
+ tools/lib/bpf/bpf.c | 89 +-
+ tools/lib/bpf/bpf.h | 27 +-
+ tools/lib/bpf/libbpf.c | 179 +-
+ tools/lib/bpf/libbpf.h | 1 +
+ tools/testing/selftests/bpf/Makefile | 25 +-
+ tools/testing/selftests/bpf/bpf_helpers.h | 67 +-
+ .../testing/selftests}/bpf/cgroup_helpers.c | 4 +-
+ .../testing/selftests}/bpf/cgroup_helpers.h | 0
+ tools/testing/selftests/bpf/dev_cgroup.c | 60 +
+ tools/testing/selftests/bpf/sockmap_parse_prog.c | 3 -
+ tools/testing/selftests/bpf/sockmap_verdict_prog.c | 2 -
+ tools/testing/selftests/bpf/test_dev_cgroup.c | 93 +
+ tools/testing/selftests/bpf/test_lpm_map.c | 201 +-
+ tools/testing/selftests/bpf/test_maps.c | 48 +
+ tools/testing/selftests/bpf/test_progs.c | 195 +-
+ tools/testing/selftests/bpf/test_verifier.c | 1064 +++++-
+ tools/testing/selftests/bpf/test_verifier_log.c | 171 +
+ tools/testing/selftests/bpf/test_xdp_meta.c | 53 +
+ tools/testing/selftests/bpf/test_xdp_meta.sh | 51 +
+ tools/testing/selftests/net/rtnetlink.sh | 271 ++
+ tools/testing/selftests/tc-testing/.gitignore | 1 +
+ .../creating-testcases/AddingTestCases.txt | 12 +
+ .../tc-testing/creating-testcases/example.json | 55 +
+ .../tc-testing/creating-testcases/template.json | 15 +-
+ .../tc-testing/tc-tests/actions/gact.json | 469 +++
+ .../selftests/tc-testing/tc-tests/actions/ife.json | 52 +
+ .../tc-testing/tc-tests/actions/mirred.json | 223 ++
+ .../tc-testing/tc-tests/actions/police.json | 527 +++
+ .../tc-testing/tc-tests/actions/simple.json | 130 +
+ .../tc-testing/tc-tests/actions/skbedit.json | 320 ++
+ .../tc-testing/tc-tests/actions/skbmod.json | 372 +++
+ .../tc-testing/tc-tests/actions/tests.json | 1165 -------
+ tools/testing/selftests/tc-testing/tdc.py | 29 +-
+ tools/testing/selftests/tc-testing/tdc_config.py | 14 +
+ .../tc-testing/tdc_config_local_template.py | 23 +
+ tools/testing/selftests/tc-testing/tdc_helper.py | 4 +-
+ tools/testing/vsock/.gitignore | 2 +
+ tools/testing/vsock/Makefile | 9 +
+ tools/testing/vsock/README | 36 +
+ tools/testing/vsock/control.c | 219 ++
+ tools/testing/vsock/control.h | 13 +
+ tools/testing/vsock/timeout.c | 64 +
+ tools/testing/vsock/timeout.h | 14 +
+ tools/testing/vsock/vsock_diag_test.c | 681 ++++
+ virt/kvm/arm/arm.c | 3 +
+ 3561 files changed, 175564 insertions(+), 95463 deletions(-)
+ delete mode 100644 Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads
+ create mode 100644 Documentation/arm64/elf_hwcaps.txt
+ create mode 100644 Documentation/arm64/sve.txt
+ create mode 100644 Documentation/bpf/bpf_design_QA.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/spe-pmu.txt
+ rename Documentation/devicetree/bindings/{rng => crypto}/samsung,exynos-rng4.txt (100%)
+ create mode 100644 Documentation/devicetree/bindings/dma/sprd-dma.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/stm32-dmamux.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/stm32-mdma.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-max3191x.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
+ create mode 100644 Documentation/devicetree/bindings/input/gpio-mouse.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/exc3000.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/hideep.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/samsung,s6sy761.txt
+ create mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt
+ create mode 100644 Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.txt
+ create mode 100644 Documentation/devicetree/bindings/riscv/cpus.txt
+ delete mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1339.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-ds1307.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-m41t80.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/sirf,prima2-sysrtc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/stericsson,coh901331.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/tfa9879.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wlf,arizona.txt
+ create mode 100644 Documentation/filesystems/fscrypt.rst
+ create mode 100644 Documentation/livepatch/callbacks.txt
+ create mode 100644 Documentation/livepatch/shadow-vars.txt
+ create mode 100644 Documentation/networking/dsa/lan9303.txt
+ create mode 100644 Documentation/networking/ila.txt
+ create mode 100644 Documentation/perf/hisi-pmu.txt
+ delete mode 100644 Documentation/sound/oss/ALS
+ delete mode 100644 Documentation/sound/oss/AudioExcelDSP16
+ delete mode 100644 Documentation/sound/oss/CMI8330
+ delete mode 100644 Documentation/sound/oss/ESS
+ delete mode 100644 Documentation/sound/oss/ESS1868
+ delete mode 100644 Documentation/sound/oss/Introduction
+ delete mode 100644 Documentation/sound/oss/MultiSound
+ delete mode 100644 Documentation/sound/oss/OPL3
+ delete mode 100644 Documentation/sound/oss/Opti
+ delete mode 100644 Documentation/sound/oss/PAS16
+ delete mode 100644 Documentation/sound/oss/PSS
+ delete mode 100644 Documentation/sound/oss/PSS-updates
+ delete mode 100644 Documentation/sound/oss/README.OSS
+ delete mode 100644 Documentation/sound/oss/README.modules
+ delete mode 100644 Documentation/sound/oss/README.ymfsb
+ delete mode 100644 Documentation/sound/oss/SoundPro
+ delete mode 100644 Documentation/sound/oss/Soundblaster
+ delete mode 100644 Documentation/sound/oss/Tropez+
+ delete mode 100644 Documentation/sound/oss/VIBRA16
+ delete mode 100644 Documentation/sound/oss/WaveArtist
+ delete mode 100644 Documentation/sound/oss/btaudio
+ delete mode 100644 Documentation/sound/oss/mwave
+ delete mode 100644 Documentation/sound/oss/oss-parameters.txt
+ delete mode 100644 Documentation/sound/oss/ultrasound
+ delete mode 100644 arch/arm64/boot/dts/.gitignore
+ create mode 100644 arch/arm64/include/asm/daifflags.h
+ create mode 100644 arch/arm64/lib/tishift.S
+ create mode 100644 arch/mips/configs/generic/board-xilfpga.config
+ delete mode 100644 arch/mips/configs/xilfpga_defconfig
+ create mode 100644 arch/mips/generic/board-xilfpga.its.S
+ delete mode 100644 arch/mips/xilfpga/Kconfig
+ delete mode 100644 arch/mips/xilfpga/Makefile
+ delete mode 100644 arch/mips/xilfpga/Platform
+ delete mode 100644 arch/mips/xilfpga/init.c
+ delete mode 100644 arch/mips/xilfpga/intc.c
+ delete mode 100644 arch/mips/xilfpga/time.c
+ create mode 100644 arch/riscv/Kconfig
+ create mode 100644 arch/riscv/Makefile
+ create mode 100644 arch/riscv/configs/defconfig
+ create mode 100644 arch/riscv/include/asm/Kbuild
+ create mode 100644 arch/riscv/include/asm/asm-offsets.h
+ create mode 100644 arch/riscv/include/asm/asm.h
+ create mode 100644 arch/riscv/include/asm/atomic.h
+ create mode 100644 arch/riscv/include/asm/barrier.h
+ create mode 100644 arch/riscv/include/asm/bitops.h
+ create mode 100644 arch/riscv/include/asm/bug.h
+ create mode 100644 arch/riscv/include/asm/cache.h
+ create mode 100644 arch/riscv/include/asm/cacheflush.h
+ create mode 100644 arch/riscv/include/asm/cmpxchg.h
+ create mode 100644 arch/riscv/include/asm/compat.h
+ create mode 100644 arch/riscv/include/asm/csr.h
+ create mode 100644 arch/riscv/include/asm/current.h
+ create mode 100644 arch/riscv/include/asm/delay.h
+ create mode 100644 arch/riscv/include/asm/dma-mapping.h
+ create mode 100644 arch/riscv/include/asm/elf.h
+ create mode 100644 arch/riscv/include/asm/hwcap.h
+ create mode 100644 arch/riscv/include/asm/io.h
+ create mode 100644 arch/riscv/include/asm/irq.h
+ create mode 100644 arch/riscv/include/asm/irqflags.h
+ create mode 100644 arch/riscv/include/asm/kprobes.h
+ create mode 100644 arch/riscv/include/asm/linkage.h
+ create mode 100644 arch/riscv/include/asm/mmu.h
+ create mode 100644 arch/riscv/include/asm/mmu_context.h
+ create mode 100644 arch/riscv/include/asm/page.h
+ create mode 100644 arch/riscv/include/asm/pci.h
+ create mode 100644 arch/riscv/include/asm/pgalloc.h
+ create mode 100644 arch/riscv/include/asm/pgtable-32.h
+ create mode 100644 arch/riscv/include/asm/pgtable-64.h
+ create mode 100644 arch/riscv/include/asm/pgtable-bits.h
+ create mode 100644 arch/riscv/include/asm/pgtable.h
+ create mode 100644 arch/riscv/include/asm/processor.h
+ create mode 100644 arch/riscv/include/asm/ptrace.h
+ create mode 100644 arch/riscv/include/asm/sbi.h
+ create mode 100644 arch/riscv/include/asm/smp.h
+ create mode 100644 arch/riscv/include/asm/spinlock.h
+ create mode 100644 arch/riscv/include/asm/spinlock_types.h
+ create mode 100644 arch/riscv/include/asm/string.h
+ create mode 100644 arch/riscv/include/asm/switch_to.h
+ create mode 100644 arch/riscv/include/asm/syscall.h
+ create mode 100644 arch/riscv/include/asm/thread_info.h
+ create mode 100644 arch/riscv/include/asm/timex.h
+ create mode 100644 arch/riscv/include/asm/tlb.h
+ create mode 100644 arch/riscv/include/asm/tlbflush.h
+ create mode 100644 arch/riscv/include/asm/uaccess.h
+ create mode 100644 arch/riscv/include/asm/unistd.h
+ create mode 100644 arch/riscv/include/asm/vdso.h
+ create mode 100644 arch/riscv/include/asm/word-at-a-time.h
+ create mode 100644 arch/riscv/include/uapi/asm/Kbuild
+ create mode 100644 arch/riscv/include/uapi/asm/auxvec.h
+ create mode 100644 arch/riscv/include/uapi/asm/bitsperlong.h
+ create mode 100644 arch/riscv/include/uapi/asm/byteorder.h
+ create mode 100644 arch/riscv/include/uapi/asm/elf.h
+ create mode 100644 arch/riscv/include/uapi/asm/hwcap.h
+ create mode 100644 arch/riscv/include/uapi/asm/ptrace.h
+ create mode 100644 arch/riscv/include/uapi/asm/sigcontext.h
+ create mode 100644 arch/riscv/include/uapi/asm/siginfo.h
+ create mode 100644 arch/riscv/include/uapi/asm/ucontext.h
+ create mode 100644 arch/riscv/kernel/.gitignore
+ create mode 100644 arch/riscv/kernel/Makefile
+ create mode 100644 arch/riscv/kernel/asm-offsets.c
+ create mode 100644 arch/riscv/kernel/cacheinfo.c
+ create mode 100644 arch/riscv/kernel/cpu.c
+ create mode 100644 arch/riscv/kernel/cpufeature.c
+ create mode 100644 arch/riscv/kernel/entry.S
+ create mode 100644 arch/riscv/kernel/head.S
+ create mode 100644 arch/riscv/kernel/irq.c
+ create mode 100644 arch/riscv/kernel/module.c
+ create mode 100644 arch/riscv/kernel/process.c
+ create mode 100644 arch/riscv/kernel/ptrace.c
+ create mode 100644 arch/riscv/kernel/reset.c
+ create mode 100644 arch/riscv/kernel/riscv_ksyms.c
+ create mode 100644 arch/riscv/kernel/setup.c
+ create mode 100644 arch/riscv/kernel/signal.c
+ create mode 100644 arch/riscv/kernel/smp.c
+ create mode 100644 arch/riscv/kernel/smpboot.c
+ create mode 100644 arch/riscv/kernel/stacktrace.c
+ create mode 100644 arch/riscv/kernel/sys_riscv.c
+ create mode 100644 arch/riscv/kernel/syscall_table.c
+ create mode 100644 arch/riscv/kernel/time.c
+ create mode 100644 arch/riscv/kernel/traps.c
+ create mode 100644 arch/riscv/kernel/vdso.c
+ create mode 100644 arch/riscv/kernel/vdso/.gitignore
+ create mode 100644 arch/riscv/kernel/vdso/Makefile
+ create mode 100644 arch/riscv/kernel/vdso/rt_sigreturn.S
+ create mode 100644 arch/riscv/kernel/vdso/vdso.S
+ create mode 100644 arch/riscv/kernel/vdso/vdso.lds.S
+ create mode 100644 arch/riscv/kernel/vmlinux.lds.S
+ create mode 100644 arch/riscv/lib/Makefile
+ create mode 100644 arch/riscv/lib/delay.c
+ create mode 100644 arch/riscv/lib/memcpy.S
+ create mode 100644 arch/riscv/lib/memset.S
+ create mode 100644 arch/riscv/lib/uaccess.S
+ create mode 100644 arch/riscv/lib/udivdi3.S
+ create mode 100644 arch/riscv/mm/Makefile
+ create mode 100644 arch/riscv/mm/extable.c
+ create mode 100644 arch/riscv/mm/fault.c
+ create mode 100644 arch/riscv/mm/init.c
+ create mode 100644 arch/riscv/mm/ioremap.c
+ create mode 100644 crypto/sm3_generic.c
+ delete mode 100644 drivers/crypto/amcc/crypto4xx_sa.c
+ delete mode 100644 drivers/crypto/mv_cesa.c
+ delete mode 100644 drivers/crypto/mv_cesa.h
+ create mode 100644 drivers/dma/sprd-dma.c
+ create mode 100644 drivers/dma/stm32-dmamux.c
+ create mode 100644 drivers/dma/stm32-mdma.c
+ create mode 100644 drivers/gpio/gpio-max3191x.c
+ create mode 100644 drivers/gpio/gpio-tegra186.c
+ create mode 100644 drivers/gpio/gpio-uniphier.c
+ create mode 100644 drivers/input/touchscreen/exc3000.c
+ create mode 100644 drivers/input/touchscreen/hideep.c
+ create mode 100644 drivers/input/touchscreen/s6sy761.c
+ create mode 100644 drivers/leds/leds-apu.c
+ create mode 100644 drivers/leds/trigger/ledtrig-activity.c
+ rename drivers/md/{bitmap.c => md-bitmap.c} (98%)
+ rename drivers/md/{bitmap.h => md-bitmap.h} (100%)
+ rename drivers/md/{faulty.c => md-faulty.c} (100%)
+ rename drivers/md/{linear.c => md-linear.c} (99%)
+ rename drivers/md/{linear.h => md-linear.h} (100%)
+ rename drivers/md/{multipath.c => md-multipath.c} (99%)
+ rename drivers/md/{multipath.h => md-multipath.h} (100%)
+ create mode 100644 drivers/mfd/wm97xx-core.c
+ create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+ create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h
+ create mode 100644 drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
+ create mode 100644 drivers/net/ethernet/cavium/liquidio/lio_vf_rep.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cudbg_common.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cudbg_lib_common.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/smt.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/smt.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.h
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_dcbnl.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_clock.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_asm.c
+ create mode 100644 drivers/net/phy/dp83822.c
+ create mode 100644 drivers/net/phy/uPD60620.c
+ create mode 100644 drivers/net/thunderbolt.c
+ create mode 100644 drivers/net/virtio_net.
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/acpi.h
+ create mode 100644 drivers/nvme/host/multipath.c
+ create mode 100644 drivers/of/kobj.c
+ delete mode 100644 drivers/of/unittest-data/.gitignore
+ create mode 100644 drivers/perf/arm_spe_pmu.c
+ create mode 100644 drivers/perf/hisilicon/Makefile
+ create mode 100644 drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
+ create mode 100644 drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
+ create mode 100644 drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
+ create mode 100644 drivers/perf/hisilicon/hisi_uncore_pmu.c
+ create mode 100644 drivers/perf/hisilicon/hisi_uncore_pmu.h
+ create mode 100644 drivers/power/supply/sbs-manager.c
+ create mode 100644 drivers/scsi/mpt3sas/mpi/mpi2_pci.h
+ create mode 100644 drivers/thunderbolt/property.c
+ create mode 100644 drivers/thunderbolt/xdomain.c
+ create mode 100644 drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c
+ create mode 100644 fs/btrfs/ref-verify.c
+ create mode 100644 fs/btrfs/ref-verify.h
+ create mode 100644 fs/btrfs/tree-checker.c
+ create mode 100644 fs/btrfs/tree-checker.h
+ create mode 100644 fs/crypto/hooks.c
+ create mode 100644 fs/xfs/libxfs/xfs_errortag.h
+ create mode 100644 fs/xfs/libxfs/xfs_iext_tree.c
+ create mode 100644 fs/xfs/scrub/agheader.c
+ create mode 100644 fs/xfs/scrub/alloc.c
+ create mode 100644 fs/xfs/scrub/attr.c
+ create mode 100644 fs/xfs/scrub/bmap.c
+ create mode 100644 fs/xfs/scrub/btree.c
+ create mode 100644 fs/xfs/scrub/btree.h
+ create mode 100644 fs/xfs/scrub/common.c
+ create mode 100644 fs/xfs/scrub/common.h
+ create mode 100644 fs/xfs/scrub/dabtree.c
+ create mode 100644 fs/xfs/scrub/dabtree.h
+ create mode 100644 fs/xfs/scrub/dir.c
+ create mode 100644 fs/xfs/scrub/ialloc.c
+ create mode 100644 fs/xfs/scrub/inode.c
+ create mode 100644 fs/xfs/scrub/parent.c
+ create mode 100644 fs/xfs/scrub/quota.c
+ create mode 100644 fs/xfs/scrub/refcount.c
+ create mode 100644 fs/xfs/scrub/rmap.c
+ create mode 100644 fs/xfs/scrub/rtbitmap.c
+ create mode 100644 fs/xfs/scrub/scrub.c
+ create mode 100644 fs/xfs/scrub/scrub.h
+ create mode 100644 fs/xfs/scrub/symlink.c
+ create mode 100644 fs/xfs/scrub/trace.c
+ create mode 100644 fs/xfs/scrub/trace.h
+ create mode 100644 fs/xfs/scrub/xfs_scrub.h
+ create mode 100644 include/crypto/gcm.h
+ create mode 100644 include/crypto/sm3.h
+ create mode 100644 include/crypto/sm3_base.h
+ create mode 100644 include/drm/amd_asic_type.h
+ create mode 100644 include/dt-bindings/gpio/uniphier-gpio.h
+ create mode 100644 include/lib/libgcc.h
+ create mode 100644 include/linux/dsa/lan9303.h
+ create mode 100644 include/linux/fscrypt.h
+ delete mode 100644 include/linux/fscrypt_common.h
+ delete mode 100644 include/linux/gpio_mouse.h
+ create mode 100644 include/linux/mfd/wm97xx.h
+ delete mode 100644 include/linux/platform_data/i2c-nuc900.h
+ delete mode 100644 include/linux/platform_data/st1232_pdata.h
+ create mode 100644 include/linux/thunderbolt.h
+ delete mode 100644 include/linux/uinput.h
+ create mode 100644 include/net/sctp/stream_sched.h
+ create mode 100644 include/net/tipc.h
+ create mode 100644 include/sound/ac97/codec.h
+ create mode 100644 include/sound/ac97/compat.h
+ create mode 100644 include/sound/ac97/controller.h
+ create mode 100644 include/sound/ac97/regs.h
+ create mode 100644 include/sound/soc-acpi-intel-match.h
+ create mode 100644 include/sound/soc-acpi.h
+ create mode 100644 include/trace/events/tcp.h
+ create mode 100644 include/uapi/linux/vm_sockets_diag.h
+ create mode 100644 kernel/bpf/cpumap.c
+ create mode 100644 kernel/bpf/disasm.c
+ create mode 100644 kernel/bpf/disasm.h
+ create mode 100644 kernel/bpf/offload.c
+ create mode 100644 kernel/livepatch/shadow.c
+ create mode 100644 lib/ashldi3.c
+ create mode 100644 lib/ashrdi3.c
+ create mode 100644 lib/cmpdi2.c
+ create mode 100644 lib/lshrdi3.c
+ create mode 100644 lib/muldi3.c
+ create mode 100644 lib/ucmpdi2.c
+ create mode 100644 net/bridge/br_arp_nd_proxy.c
+ create mode 100644 net/dsa/master.c
+ rename net/mac80211/{aes_ccm.c => aead_api.c} (67%)
+ create mode 100644 net/mac80211/aead_api.h
+ delete mode 100644 net/mac80211/aes_gcm.c
+ create mode 100644 net/openvswitch/meter.c
+ create mode 100644 net/openvswitch/meter.h
+ create mode 100644 net/sched/sch_cbs.c
+ create mode 100644 net/sctp/stream_sched.c
+ create mode 100644 net/sctp/stream_sched_prio.c
+ create mode 100644 net/sctp/stream_sched_rr.c
+ create mode 100644 net/tipc/group.c
+ create mode 100644 net/tipc/group.h
+ create mode 100644 net/vmw_vsock/diag.c
+ create mode 100644 net/wireless/certs/sforshee.x509
+ delete mode 100644 net/wireless/db.txt
+ delete mode 100644 net/wireless/genregdb.awk
+ delete mode 100644 net/wireless/regdb.h
+ create mode 100644 samples/bpf/tcp_basertt_kern.c
+ create mode 100644 samples/bpf/tcp_bpf.readme
+ create mode 100644 samples/bpf/xdp_redirect_cpu_kern.c
+ create mode 100644 samples/bpf/xdp_redirect_cpu_user.c
+ create mode 100644 samples/bpf/xdp_router_ipv4_kern.c
+ create mode 100644 samples/bpf/xdp_router_ipv4_user.c
+ create mode 100644 samples/livepatch/livepatch-callbacks-busymod.c
+ create mode 100644 samples/livepatch/livepatch-callbacks-demo.c
+ create mode 100644 samples/livepatch/livepatch-callbacks-mod.c
+ create mode 100644 samples/livepatch/livepatch-shadow-fix1.c
+ create mode 100644 samples/livepatch/livepatch-shadow-fix2.c
+ create mode 100644 samples/livepatch/livepatch-shadow-mod.c
+ delete mode 100755 samples/pktgen/pktgen.conf-1-1-ip6
+ delete mode 100755 samples/pktgen/pktgen.conf-1-1-ip6-rdos
+ delete mode 100755 samples/pktgen/pktgen.conf-1-2
+ create mode 100755 samples/pktgen/pktgen_sample06_numa_awared_queue_irq_affinity.sh
+ create mode 100644 scripts/dtc/libfdt/fdt_addresses.c
+ create mode 100644 scripts/dtc/libfdt/fdt_overlay.c
+ create mode 100644 sound/ac97/Kconfig
+ create mode 100644 sound/ac97/Makefile
+ create mode 100644 sound/ac97/ac97_core.h
+ create mode 100644 sound/ac97/bus.c
+ create mode 100644 sound/ac97/codec.c
+ create mode 100644 sound/ac97/snd_ac97_compat.c
+ delete mode 100644 sound/oss/CHANGELOG
+ delete mode 100644 sound/oss/Kconfig
+ delete mode 100644 sound/oss/Makefile
+ delete mode 100644 sound/oss/README.FIRST
+ delete mode 100644 sound/oss/ad1848.c
+ delete mode 100644 sound/oss/ad1848.h
+ delete mode 100644 sound/oss/ad1848_mixer.h
+ delete mode 100644 sound/oss/aedsp16.c
+ delete mode 100644 sound/oss/audio.c
+ delete mode 100644 sound/oss/bin2hex.c
+ delete mode 100644 sound/oss/coproc.h
+ delete mode 100644 sound/oss/dev_table.c
+ delete mode 100644 sound/oss/dev_table.h
+ delete mode 100644 sound/oss/dmabuf.c
+ delete mode 100644 sound/oss/hex2hex.c
+ delete mode 100644 sound/oss/kahlua.c
+ delete mode 100644 sound/oss/midi_ctrl.h
+ delete mode 100644 sound/oss/midi_synth.c
+ delete mode 100644 sound/oss/midi_synth.h
+ delete mode 100644 sound/oss/midibuf.c
+ delete mode 100644 sound/oss/mpu401.c
+ delete mode 100644 sound/oss/mpu401.h
+ delete mode 100644 sound/oss/msnd.c
+ delete mode 100644 sound/oss/msnd.h
+ delete mode 100644 sound/oss/msnd_classic.c
+ delete mode 100644 sound/oss/msnd_classic.h
+ delete mode 100644 sound/oss/msnd_pinnacle.c
+ delete mode 100644 sound/oss/msnd_pinnacle.h
+ delete mode 100644 sound/oss/opl3.c
+ delete mode 100644 sound/oss/opl3_hw.h
+ delete mode 100644 sound/oss/os.h
+ delete mode 100644 sound/oss/pas2.h
+ delete mode 100644 sound/oss/pas2_card.c
+ delete mode 100644 sound/oss/pas2_midi.c
+ delete mode 100644 sound/oss/pas2_mixer.c
+ delete mode 100644 sound/oss/pas2_pcm.c
+ delete mode 100644 sound/oss/pss.c
+ delete mode 100644 sound/oss/sb.h
+ delete mode 100644 sound/oss/sb_audio.c
+ delete mode 100644 sound/oss/sb_card.c
+ delete mode 100644 sound/oss/sb_card.h
+ delete mode 100644 sound/oss/sb_common.c
+ delete mode 100644 sound/oss/sb_ess.c
+ delete mode 100644 sound/oss/sb_ess.h
+ delete mode 100644 sound/oss/sb_midi.c
+ delete mode 100644 sound/oss/sb_mixer.c
+ delete mode 100644 sound/oss/sb_mixer.h
+ delete mode 100644 sound/oss/sequencer.c
+ delete mode 100644 sound/oss/sleep.h
+ delete mode 100644 sound/oss/sound_calls.h
+ delete mode 100644 sound/oss/sound_config.h
+ delete mode 100644 sound/oss/sound_firmware.h
+ delete mode 100644 sound/oss/sound_timer.c
+ delete mode 100644 sound/oss/soundcard.c
+ delete mode 100644 sound/oss/soundvers.h
+ delete mode 100644 sound/oss/swarm_cs4297a.c
+ delete mode 100644 sound/oss/sys_timer.c
+ delete mode 100644 sound/oss/trix.c
+ delete mode 100644 sound/oss/tuning.h
+ delete mode 100644 sound/oss/uart401.c
+ delete mode 100644 sound/oss/uart6850.c
+ delete mode 100644 sound/oss/ulaw.h
+ delete mode 100644 sound/oss/v_midi.c
+ delete mode 100644 sound/oss/v_midi.h
+ delete mode 100644 sound/oss/vidc.c
+ delete mode 100644 sound/oss/vidc.h
+ delete mode 100644 sound/oss/vidc_fill.S
+ delete mode 100644 sound/oss/waveartist.c
+ delete mode 100644 sound/oss/waveartist.h
+ create mode 100644 sound/soc/amd/acp-rt5645.c
+ create mode 100644 sound/soc/intel/boards/Kconfig
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-byt-match.c
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-cht-match.c
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
+ delete mode 100644 sound/soc/intel/common/sst-acpi.h
+ rename sound/soc/{intel/common/sst-match-acpi.c => soc-acpi.c} (63%)
+ rename tools/{net => bpf}/Makefile (75%)
+ rename tools/{net => bpf}/bpf_asm.c (100%)
+ rename tools/{net => bpf}/bpf_dbg.c (100%)
+ rename tools/{net => bpf}/bpf_exp.l (100%)
+ rename tools/{net => bpf}/bpf_exp.y (100%)
+ rename tools/{net => bpf}/bpf_jit_disasm.c (99%)
+ create mode 100644 tools/bpf/bpftool/Documentation/Makefile
+ create mode 100644 tools/bpf/bpftool/Documentation/bpftool-map.rst
+ create mode 100644 tools/bpf/bpftool/Documentation/bpftool-prog.rst
+ create mode 100644 tools/bpf/bpftool/Documentation/bpftool.rst
+ create mode 100644 tools/bpf/bpftool/Makefile
+ create mode 100644 tools/bpf/bpftool/bash-completion/bpftool
+ create mode 100644 tools/bpf/bpftool/common.c
+ create mode 100644 tools/bpf/bpftool/jit_disasm.c
+ create mode 100644 tools/bpf/bpftool/json_writer.c
+ create mode 100644 tools/bpf/bpftool/json_writer.h
+ create mode 100644 tools/bpf/bpftool/main.c
+ create mode 100644 tools/bpf/bpftool/main.h
+ create mode 100644 tools/bpf/bpftool/map.c
+ create mode 100644 tools/bpf/bpftool/prog.c
+ rename {samples => tools/testing/selftests}/bpf/cgroup_helpers.c (97%)
+ rename {samples => tools/testing/selftests}/bpf/cgroup_helpers.h (100%)
+ create mode 100644 tools/testing/selftests/bpf/dev_cgroup.c
+ create mode 100644 tools/testing/selftests/bpf/test_dev_cgroup.c
+ create mode 100644 tools/testing/selftests/bpf/test_verifier_log.c
+ create mode 100644 tools/testing/selftests/bpf/test_xdp_meta.c
+ create mode 100755 tools/testing/selftests/bpf/test_xdp_meta.sh
+ create mode 100644 tools/testing/selftests/tc-testing/creating-testcases/example.json
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/gact.json
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/ife.json
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/police.json
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/simple.json
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/skbmod.json
+ delete mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/tests.json
+ create mode 100644 tools/testing/selftests/tc-testing/tdc_config_local_template.py
+ create mode 100644 tools/testing/vsock/.gitignore
+ create mode 100644 tools/testing/vsock/Makefile
+ create mode 100644 tools/testing/vsock/README
+ create mode 100644 tools/testing/vsock/control.c
+ create mode 100644 tools/testing/vsock/control.h
+ create mode 100644 tools/testing/vsock/timeout.c
+ create mode 100644 tools/testing/vsock/timeout.h
+ create mode 100644 tools/testing/vsock/vsock_diag_test.c
+Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/fixes (bb3f38c3c5b7 kbuild: clang: fix build failures with sparse check)
+$ git merge kbuild-current/fixes
+Already up-to-date.
+Merging arc-current/for-curr (f3156851616b ARCv2: boot log: updates for HS48: dual-issue, ECC, Loop Buffer)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ arch/arc/include/asm/arcregs.h | 33 +++++++++++++++++++++++-
+ arch/arc/kernel/setup.c | 43 ++++++++++++++++++++++++++++---
+ arch/arc/mm/tlb.c | 57 ++++++++++++++++++++++++------------------
+ arch/arc/plat-axs10x/Kconfig | 2 ++
+ 4 files changed, 106 insertions(+), 29 deletions(-)
+Merging arm-current/fixes (b9dd05c7002e ARM: 8720/1: ensure dump_instr() checks addr_limit)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7)
+$ 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 (7ecb37f62fe5 powerpc/perf: Fix core-imc hotplug callback failure during imc initialization)
+$ git merge powerpc-fixes/fixes
+Already up-to-date.
+Merging sparc/master (23198ddffb6c sparc32: Add cmpxchg64().)
+$ git merge sparc/master
+Auto-merging include/linux/miscdevice.h
+Auto-merging arch/sparc/lib/atomic32.c
+Auto-merging arch/sparc/kernel/time_64.c
+Auto-merging arch/sparc/include/asm/mmu_context_64.h
+Auto-merging arch/sparc/include/asm/cmpxchg_32.h
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/cmpxchg_32.h | 3 +++
+ arch/sparc/include/asm/mmu_context_64.h | 2 ++
+ arch/sparc/kernel/time_64.c | 1 -
+ arch/sparc/lib/atomic32.c | 14 ++++++++++++++
+ drivers/sbus/char/display7seg.c | 1 -
+ include/linux/miscdevice.h | 1 +
+ 6 files changed, 20 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 (b39545684a90 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge net/master
+Already up-to-date.
+Merging ipsec/master (94802151894d Revert "xfrm: Fix stack-out-of-bounds read in xfrm_state_find.")
+$ git merge ipsec/master
+Auto-merging net/xfrm/xfrm_policy.c
+Merge made by the 'recursive' strategy.
+ net/xfrm/xfrm_policy.c | 30 +++++++++++++++++++-----------
+ 1 file changed, 19 insertions(+), 11 deletions(-)
+Merging netfilter/master (7400bb4b5800 netfilter: nf_reject_ipv4: Fix use-after-free in send_reset)
+$ git merge netfilter/master
+Already up-to-date.
+Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
+$ git merge ipvs/master
+Already up-to-date.
+Merging wireless-drivers/master (a6127b4440d1 Merge tag 'iwlwifi-for-kalle-2017-10-06' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
+$ git merge wireless-drivers/master
+Already up-to-date.
+Merging mac80211/master (b39545684a90 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge mac80211/master
+Already up-to-date.
+Merging sound-current/for-linus (3aabf94c2d95 ALSA: hda/realtek - Fix ALC275 no sound issue)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/patch_realtek.c | 3 +++
+ sound/soc/intel/Kconfig | 5 +++++
+ 2 files changed, 8 insertions(+)
+Merging pci-current/for-linus (6b7be529634b MAINTAINERS: Add Lorenzo Pieralisi for PCI host bridge drivers)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (39dae59d66ac Linux 4.14-rc8)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging usb-gadget-fixes/fixes (7c80f9e4a588 usb: usbtest: fix NULL pointer dereference)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (0b07194bb55e Linux 4.14-rc7)
+$ git merge usb-serial-fixes/usb-linus
+Already up-to-date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Already up-to-date.
+Merging phy/fixes (2fb850092fd9 phy: rockchip-typec: Check for errors from tcphy_phy_init())
+$ git merge phy/fixes
+Already up-to-date.
+Merging staging.current/staging-linus (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (bb176f67090c Linux 4.14-rc6)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (c25141062a82 Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (1d9ddde12e3c lib/mpi: call cond_resched() from mpi_powm() loop)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (b671e1703394 PNP: ide: constify pnp_device_id)
+$ git merge ide/master
+Merge made by the 'recursive' strategy.
+ drivers/ide/ide-pnp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging vfio-fixes/for-linus (796b755066dd vfio/pci: Fix handling of RC integrated endpoint PCIe capability size)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (a323335e62cc selftests: lib.mk: print individual test results to console by default)
+$ 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 nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
+$ git merge nand-fixes/nand/fixes
+Already up-to-date.
+Merging spi-nor-fixes/spi-nor/fixes (8a5776a5f498 Linux 4.14-rc4)
+$ git merge spi-nor-fixes/spi-nor/fixes
+Already up-to-date.
+Merging mfd-fixes/for-mfd-fixes (0f0fc5c09005 Revert "mfd: da9061: Fix to remove BBAT_CONT register from chip model")
+$ git merge mfd-fixes/for-mfd-fixes
+Already up-to-date.
+Merging v4l-dvb-fixes/fixes (30b4e122d71c media: rc: sir_ir: detect presence of port)
+$ git merge v4l-dvb-fixes/fixes
+Resolved 'drivers/staging/media/atomisp/i2c/ov5693/Makefile' using previous resolution.
+Auto-merging include/uapi/linux/dvb/frontend.h
+Auto-merging include/uapi/linux/cec.h
+Auto-merging include/media/drv-intf/saa7146_vv.h
+Removing include/linux/platform_data/media/gpio-ir-recv.h
+CONFLICT (modify/delete): drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c left in tree.
+Removing drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
+Removing drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.h
+Removing drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.c
+Removing drivers/staging/media/atomisp/platform/clock/Makefile
+Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/storage_class.h
+Removing drivers/staging/media/atomisp/include/media/lm3642.h
+CONFLICT (modify/delete): drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h left in tree.
+Auto-merging drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+Auto-merging drivers/staging/media/atomisp/i2c/ov5693/Makefile
+CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/i2c/ov5693/Makefile
+Removing drivers/staging/media/atomisp/i2c/imx/vcm.c
+Removing drivers/staging/media/atomisp/i2c/imx/otp_imx.c
+Removing drivers/staging/media/atomisp/i2c/imx/otp_e2prom.c
+Removing drivers/staging/media/atomisp/i2c/imx/otp_brcc064_e2prom.c
+Removing drivers/staging/media/atomisp/i2c/imx/otp.c
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/imx227.h deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/imx227.h left in tree.
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/imx219.h deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/imx219.h left in tree.
+Removing drivers/staging/media/atomisp/i2c/imx/imx208.h
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/imx175.h deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/imx175.h left in tree.
+Removing drivers/staging/media/atomisp/i2c/imx/imx135.h
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/imx134.h deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/imx134.h left in tree.
+Removing drivers/staging/media/atomisp/i2c/imx/imx132.h
+Removing drivers/staging/media/atomisp/i2c/imx/imx.h
+Removing drivers/staging/media/atomisp/i2c/imx/imx.c
+Removing drivers/staging/media/atomisp/i2c/imx/dw9719.h
+Removing drivers/staging/media/atomisp/i2c/imx/dw9719.c
+Removing drivers/staging/media/atomisp/i2c/imx/dw9718.h
+Removing drivers/staging/media/atomisp/i2c/imx/dw9718.c
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/dw9714.h deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/dw9714.h left in tree.
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/dw9714.c deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/dw9714.c left in tree.
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/drv201.h deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/drv201.h left in tree.
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/drv201.c deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/drv201.c left in tree.
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/common.h deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/common.h left in tree.
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/ad5816g.h deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/ad5816g.h left in tree.
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/ad5816g.c deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/ad5816g.c left in tree.
+CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/Makefile deleted in v4l-dvb-fixes/fixes and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/Makefile left in tree.
+Removing drivers/staging/media/atomisp/i2c/imx/Kconfig
+Auto-merging drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+Auto-merging drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
+Auto-merging drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+Auto-merging drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
+Auto-merging drivers/staging/media/atomisp/i2c/atomisp-libmsrlisthelper.c
+Auto-merging drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+Auto-merging drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+Removing drivers/staging/media/atomisp/i2c/ap1302.h
+Removing drivers/staging/media/atomisp/i2c/ap1302.c
+Auto-merging drivers/staging/media/atomisp/i2c/Makefile
+Auto-merging drivers/media/usb/dvb-usb/dvb-usb.h
+Auto-merging drivers/media/usb/dvb-usb/dvb-usb-remote.c
+Auto-merging drivers/media/rc/keymaps/Makefile
+Auto-merging drivers/media/rc/Makefile
+Auto-merging drivers/media/platform/atmel/atmel-isc-regs.h
+Auto-merging drivers/media/platform/Makefile
+Auto-merging drivers/media/i2c/Makefile
+Auto-merging drivers/media/common/saa7146/saa7146_vbi.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/media/atomisp/i2c/imx/Makefile drivers/staging/media/atomisp/i2c/imx/ad5816g.c drivers/staging/media/atomisp/i2c/imx/ad5816g.h drivers/staging/media/atomisp/i2c/imx/common.h drivers/staging/media/atomisp/i2c/imx/drv201.c drivers/staging/media/atomisp/i2c/imx/drv201.h drivers/staging/media/atomisp/i2c/imx/dw9714.c drivers/staging/media/atomisp/i2c/imx/dw9714.h drivers/staging/media/atomisp/i2c/imx/imx134.h drivers/staging/media/atomisp/i2c/imx/imx175.h drivers/staging/media/atomisp/i2c/imx/imx219.h drivers/staging/media/atomisp/i2c/imx/imx227.h drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
+drivers/staging/media/atomisp/i2c/imx/Makefile: needs merge
+drivers/staging/media/atomisp/i2c/imx/ad5816g.c: needs merge
+drivers/staging/media/atomisp/i2c/imx/ad5816g.h: needs merge
+drivers/staging/media/atomisp/i2c/imx/common.h: needs merge
+drivers/staging/media/atomisp/i2c/imx/drv201.c: needs merge
+drivers/staging/media/atomisp/i2c/imx/drv201.h: needs merge
+drivers/staging/media/atomisp/i2c/imx/dw9714.c: needs merge
+drivers/staging/media/atomisp/i2c/imx/dw9714.h: needs merge
+drivers/staging/media/atomisp/i2c/imx/imx134.h: needs merge
+drivers/staging/media/atomisp/i2c/imx/imx175.h: needs merge
+drivers/staging/media/atomisp/i2c/imx/imx219.h: needs merge
+drivers/staging/media/atomisp/i2c/imx/imx227.h: needs merge
+drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h: needs merge
+drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c: needs merge
+rm 'drivers/staging/media/atomisp/i2c/imx/Makefile'
+rm 'drivers/staging/media/atomisp/i2c/imx/ad5816g.c'
+rm 'drivers/staging/media/atomisp/i2c/imx/ad5816g.h'
+rm 'drivers/staging/media/atomisp/i2c/imx/common.h'
+rm 'drivers/staging/media/atomisp/i2c/imx/drv201.c'
+rm 'drivers/staging/media/atomisp/i2c/imx/drv201.h'
+rm 'drivers/staging/media/atomisp/i2c/imx/dw9714.c'
+rm 'drivers/staging/media/atomisp/i2c/imx/dw9714.h'
+rm 'drivers/staging/media/atomisp/i2c/imx/imx134.h'
+rm 'drivers/staging/media/atomisp/i2c/imx/imx175.h'
+rm 'drivers/staging/media/atomisp/i2c/imx/imx219.h'
+rm 'drivers/staging/media/atomisp/i2c/imx/imx227.h'
+rm 'drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h'
+rm 'drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c'
+$ git commit -v -a
+[master 04904646151149bc509cd7b46c0b2eb2b3b42de2] Merge remote-tracking branch 'v4l-dvb-fixes/fixes'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/media/cec-gpio.txt | 32 +
+ .../devicetree/bindings/media/exynos5-gsc.txt | 9 +-
+ .../devicetree/bindings/media/i2c/imx274.txt | 33 +
+ .../devicetree/bindings/media/i2c/nokia,smia.txt | 2 +
+ .../devicetree/bindings/media/rockchip-rga.txt | 33 +
+ .../devicetree/bindings/media/tango-ir.txt | 21 +
+ .../devicetree/bindings/media/tegra-cec.txt | 27 +
+ .../devicetree/bindings/media/video-interfaces.txt | 24 +-
+ Documentation/media/cec.h.rst.exceptions | 2 -
+ Documentation/media/kapi/cec-core.rst | 7 +-
+ Documentation/media/kapi/dtv-ca.rst | 4 +
+ Documentation/media/kapi/dtv-common.rst | 55 +
+ Documentation/media/kapi/dtv-core.rst | 574 +---
+ Documentation/media/kapi/dtv-demux.rst | 82 +
+ Documentation/media/kapi/dtv-frontend.rst | 443 +++
+ Documentation/media/kapi/dtv-net.rst | 4 +
+ Documentation/media/kapi/v4l2-async.rst | 3 +
+ Documentation/media/kapi/v4l2-core.rst | 1 +
+ Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 22 +-
+ Documentation/media/uapi/cec/cec-ioc-receive.rst | 10 +-
+ Documentation/media/uapi/dvb/examples.rst | 378 +--
+ Documentation/media/uapi/dvb/fe-get-property.rst | 7 +-
+ Documentation/media/uapi/dvb/net-types.rst | 2 +-
+ MAINTAINERS | 31 +
+ arch/arm/boot/dts/omap3-n9.dts | 1 +
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 4 +-
+ arch/arm/boot/dts/omap3-n950.dts | 1 +
+ drivers/media/cec/cec-adap.c | 18 +-
+ drivers/media/cec/cec-api.c | 19 +-
+ drivers/media/cec/cec-core.c | 9 +-
+ drivers/media/cec/cec-pin-priv.h | 133 +
+ drivers/media/cec/cec-pin.c | 40 +-
+ drivers/media/common/cypress_firmware.c | 6 +-
+ drivers/media/common/saa7146/saa7146_fops.c | 6 +-
+ drivers/media/common/saa7146/saa7146_vbi.c | 14 +-
+ drivers/media/common/saa7146/saa7146_video.c | 5 +-
+ drivers/media/common/siano/smscoreapi.c | 39 +-
+ drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 12 +
+ drivers/media/dvb-core/dmxdev.c | 8 +-
+ drivers/media/dvb-core/dmxdev.h | 90 +-
+ drivers/media/dvb-core/dvb_demux.c | 17 +-
+ drivers/media/dvb-core/dvb_demux.h | 248 +-
+ drivers/media/dvb-core/dvb_frontend.c | 518 ++-
+ drivers/media/dvb-core/dvb_frontend.h | 117 +-
+ drivers/media/dvb-core/dvb_net.h | 34 +-
+ drivers/media/dvb-core/dvbdev.c | 32 +-
+ drivers/media/dvb-core/dvbdev.h | 137 +-
+ drivers/media/dvb-frontends/Kconfig | 6 +-
+ drivers/media/dvb-frontends/as102_fe.c | 7 +-
+ drivers/media/dvb-frontends/cx24113.c | 10 +-
+ drivers/media/dvb-frontends/cx24116.c | 22 +-
+ drivers/media/dvb-frontends/drxd_hard.c | 9 +-
+ drivers/media/dvb-frontends/ds3000.c | 22 +-
+ drivers/media/dvb-frontends/lg2160.c | 14 -
+ drivers/media/dvb-frontends/lgdt3306a.c | 3 +-
+ drivers/media/dvb-frontends/mb86a20s.c | 23 +-
+ drivers/media/dvb-frontends/mxl5xx.c | 2 +-
+ drivers/media/dvb-frontends/si2168.c | 1 -
+ drivers/media/dvb-frontends/sp2.c | 9 +-
+ drivers/media/dvb-frontends/stv0288.c | 7 -
+ drivers/media/dvb-frontends/stv6110.c | 9 -
+ drivers/media/i2c/Kconfig | 16 +
+ drivers/media/i2c/Makefile | 1 +
+ drivers/media/i2c/adv7180.c | 2 +-
+ drivers/media/i2c/adv748x/adv748x-afe.c | 7 +-
+ drivers/media/i2c/adv7604.c | 10 +-
+ drivers/media/i2c/adv7842.c | 6 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 2 +-
+ drivers/media/i2c/dw9714.c | 7 +-
+ drivers/media/i2c/et8ek8/et8ek8_driver.c | 2 +-
+ drivers/media/i2c/imx274.c | 1811 +++++++++++
+ drivers/media/i2c/ir-kbd-i2c.c | 1 -
+ drivers/media/i2c/max2175.c | 2 +-
+ drivers/media/i2c/mt9m111.c | 2 +-
+ drivers/media/i2c/ov13858.c | 61 +-
+ drivers/media/i2c/ov2640.c | 17 +-
+ drivers/media/i2c/ov5640.c | 2 +-
+ drivers/media/i2c/ov5647.c | 51 +-
+ drivers/media/i2c/ov5670.c | 37 +-
+ drivers/media/i2c/ov6650.c | 5 +-
+ drivers/media/i2c/ov7670.c | 129 +-
+ drivers/media/i2c/ov9650.c | 1 -
+ drivers/media/i2c/smiapp/smiapp-core.c | 149 +-
+ drivers/media/i2c/smiapp/smiapp-regs.c | 3 +
+ drivers/media/i2c/smiapp/smiapp.h | 1 +
+ drivers/media/i2c/soc_camera/ov9640.c | 11 +-
+ drivers/media/i2c/soc_camera/ov9740.c | 6 +-
+ drivers/media/i2c/tc358743.c | 220 +-
+ drivers/media/i2c/tc358743_regs.h | 94 +-
+ drivers/media/i2c/tvaudio.c | 8 +-
+ drivers/media/media-entity.c | 13 +-
+ drivers/media/pci/b2c2/Kconfig | 4 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 6 +-
+ drivers/media/pci/bt8xx/bttv-input.c | 19 +-
+ drivers/media/pci/bt8xx/bttv-vbi.c | 2 +-
+ drivers/media/pci/bt8xx/bttvp.h | 3 +-
+ drivers/media/pci/cobalt/cobalt-driver.c | 5 -
+ drivers/media/pci/cx18/cx18-driver.c | 28 +-
+ drivers/media/pci/cx18/cx18-fileops.c | 4 +-
+ drivers/media/pci/cx18/cx18-fileops.h | 2 +-
+ drivers/media/pci/cx18/cx18-streams.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-cards.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-i2c.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-vbi.c | 2 +-
+ drivers/media/pci/cx23885/cx23885.h | 2 +-
+ drivers/media/pci/cx25821/cx25821-i2c.c | 2 +-
+ drivers/media/pci/cx88/cx88-input.c | 4 +-
+ drivers/media/pci/ddbridge/ddbridge-io.h | 4 +-
+ drivers/media/pci/ivtv/ivtv-driver.c | 3 +-
+ drivers/media/pci/ivtv/ivtv-i2c.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-irq.c | 4 +-
+ drivers/media/pci/ivtv/ivtv-irq.h | 2 +-
+ drivers/media/pci/mantis/hopper_cards.c | 9 +-
+ drivers/media/pci/mantis/mantis_cards.c | 8 +-
+ drivers/media/pci/meye/meye.c | 20 +-
+ drivers/media/pci/netup_unidvb/Kconfig | 12 +-
+ drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 7 +-
+ drivers/media/pci/saa7134/saa7134-core.c | 6 +-
+ drivers/media/pci/saa7134/saa7134-i2c.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-input.c | 9 +-
+ drivers/media/pci/saa7134/saa7134-ts.c | 3 +-
+ drivers/media/pci/saa7134/saa7134-vbi.c | 5 +-
+ drivers/media/pci/saa7134/saa7134-video.c | 3 +-
+ drivers/media/pci/saa7134/saa7134.h | 4 +-
+ drivers/media/pci/saa7146/hexium_gemini.c | 7 +-
+ drivers/media/pci/saa7146/hexium_orion.c | 10 +-
+ drivers/media/pci/saa7164/saa7164-buffer.c | 8 +-
+ drivers/media/pci/saa7164/saa7164-i2c.c | 2 +-
+ drivers/media/pci/ttpci/av7110.c | 8 +-
+ drivers/media/pci/ttpci/budget-core.c | 2 +-
+ drivers/media/pci/tw686x/tw686x-core.c | 7 +-
+ drivers/media/pci/zoran/zoran_card.h | 2 +-
+ drivers/media/pci/zoran/zoran_driver.c | 2 +-
+ drivers/media/platform/Kconfig | 36 +
+ drivers/media/platform/Makefile | 6 +
+ drivers/media/platform/am437x/am437x-vpfe.c | 8 +-
+ drivers/media/platform/atmel/atmel-isc-regs.h | 1 +
+ drivers/media/platform/atmel/atmel-isc.c | 652 +++-
+ drivers/media/platform/atmel/atmel-isi.c | 24 +-
+ drivers/media/platform/blackfin/ppi.c | 1 -
+ drivers/media/platform/cec-gpio/Makefile | 1 +
+ drivers/media/platform/cec-gpio/cec-gpio.c | 239 ++
+ drivers/media/platform/coda/coda-bit.c | 4 +
+ drivers/media/platform/davinci/ccdc_hw_device.h | 4 +-
+ drivers/media/platform/davinci/dm355_ccdc.c | 2 +-
+ drivers/media/platform/davinci/dm644x_ccdc.c | 2 +-
+ drivers/media/platform/davinci/isif.c | 2 +-
+ drivers/media/platform/davinci/vpbe_display.c | 37 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 6 +-
+ drivers/media/platform/davinci/vpif_capture.c | 8 +-
+ drivers/media/platform/davinci/vpif_display.c | 8 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c | 127 +-
+ drivers/media/platform/exynos4-is/Kconfig | 2 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 8 +-
+ drivers/media/platform/omap/omap_vout.c | 3 +-
+ drivers/media/platform/omap3isp/isp.c | 133 +-
+ drivers/media/platform/omap3isp/isp.h | 5 +-
+ drivers/media/platform/pxa_camera.c | 8 +-
+ drivers/media/platform/qcom/camss-8x16/camss-vfe.c | 3 +
+ .../media/platform/qcom/camss-8x16/camss-video.c | 1 -
+ drivers/media/platform/qcom/camss-8x16/camss.c | 8 +-
+ drivers/media/platform/qcom/venus/core.h | 2 -
+ drivers/media/platform/qcom/venus/helpers.c | 7 -
+ drivers/media/platform/qcom/venus/hfi.c | 1 +
+ drivers/media/platform/qcom/venus/hfi_venus.c | 12 +-
+ drivers/media/platform/qcom/venus/vdec.c | 34 +-
+ drivers/media/platform/qcom/venus/venc.c | 7 +-
+ drivers/media/platform/rcar-vin/rcar-core.c | 117 +-
+ drivers/media/platform/rcar-vin/rcar-dma.c | 10 +-
+ drivers/media/platform/rcar-vin/rcar-v4l2.c | 14 +-
+ drivers/media/platform/rcar-vin/rcar-vin.h | 4 +-
+ drivers/media/platform/rcar_drif.c | 12 +-
+ drivers/media/platform/rockchip/rga/Makefile | 3 +
+ drivers/media/platform/rockchip/rga/rga-buf.c | 154 +
+ drivers/media/platform/rockchip/rga/rga-hw.c | 421 +++
+ drivers/media/platform/rockchip/rga/rga-hw.h | 437 +++
+ drivers/media/platform/rockchip/rga/rga.c | 1010 ++++++
+ drivers/media/platform/rockchip/rga/rga.h | 125 +
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 18 +-
+ drivers/media/platform/soc_camera/soc_camera.c | 14 +-
+ drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 2 +-
+ drivers/media/platform/sti/hva/hva-h264.c | 5 +-
+ drivers/media/platform/stm32/stm32-dcmi.c | 10 +-
+ drivers/media/platform/tegra-cec/Makefile | 1 +
+ drivers/media/platform/tegra-cec/tegra_cec.c | 495 +++
+ drivers/media/platform/tegra-cec/tegra_cec.h | 127 +
+ drivers/media/platform/ti-vpe/cal.c | 8 +-
+ drivers/media/platform/vimc/vimc-core.c | 5 +-
+ drivers/media/platform/vivid/vivid-vid-common.c | 16 +
+ drivers/media/platform/xilinx/xilinx-vipp.c | 8 +-
+ drivers/media/radio/radio-cadet.c | 7 +-
+ drivers/media/radio/radio-raremono.c | 2 +-
+ drivers/media/radio/si470x/radio-si470x-common.c | 2 +-
+ drivers/media/radio/si470x/radio-si470x.h | 2 +-
+ drivers/media/radio/wl128x/Kconfig | 10 +-
+ drivers/media/radio/wl128x/fmdrv_common.c | 7 +-
+ drivers/media/rc/Kconfig | 16 +-
+ drivers/media/rc/Makefile | 1 +
+ drivers/media/rc/ati_remote.c | 2 +-
+ drivers/media/rc/ene_ir.c | 7 +-
+ drivers/media/rc/gpio-ir-recv.c | 192 +-
+ drivers/media/rc/igorplugusb.c | 8 +-
+ drivers/media/rc/img-ir/img-ir-core.c | 5 +-
+ drivers/media/rc/img-ir/img-ir-hw.c | 13 +-
+ drivers/media/rc/img-ir/img-ir-raw.c | 6 +-
+ drivers/media/rc/imon.c | 30 +-
+ drivers/media/rc/ir-lirc-codec.c | 65 +-
+ drivers/media/rc/ir-mce_kbd-decoder.c | 7 +-
+ drivers/media/rc/ir-nec-decoder.c | 29 +-
+ drivers/media/rc/keymaps/Makefile | 4 +
+ drivers/media/rc/keymaps/rc-astrometa-t2hybrid.c | 70 +
+ drivers/media/rc/keymaps/rc-avermedia-m135a.c | 3 +-
+ drivers/media/rc/keymaps/rc-hisi-poplar.c | 69 +
+ drivers/media/rc/keymaps/rc-hisi-tv-demo.c | 81 +
+ drivers/media/rc/keymaps/rc-tango.c | 92 +
+ drivers/media/rc/keymaps/rc-twinhan1027.c | 2 +-
+ drivers/media/rc/lirc_dev.c | 515 ++-
+ drivers/media/rc/mceusb.c | 20 +-
+ drivers/media/rc/rc-core-priv.h | 2 +-
+ drivers/media/rc/rc-ir-raw.c | 8 +-
+ drivers/media/rc/rc-main.c | 79 +-
+ drivers/media/rc/redrat3.c | 2 +-
+ drivers/media/rc/serial_ir.c | 5 +-
+ drivers/media/rc/sir_ir.c | 44 +-
+ drivers/media/rc/streamzap.c | 2 +-
+ drivers/media/rc/tango-ir.c | 281 ++
+ drivers/media/usb/as102/as102_fw.c | 28 +-
+ drivers/media/usb/au0828/au0828-i2c.c | 2 +-
+ drivers/media/usb/au0828/au0828-input.c | 2 +-
+ drivers/media/usb/au0828/au0828-vbi.c | 2 +-
+ drivers/media/usb/au0828/au0828-video.c | 4 +-
+ drivers/media/usb/au0828/au0828.h | 2 +-
+ drivers/media/usb/b2c2/Kconfig | 6 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 5 +-
+ drivers/media/usb/cx231xx/cx231xx-dvb.c | 4 +-
+ drivers/media/usb/cx231xx/cx231xx-vbi.c | 6 +-
+ drivers/media/usb/cx231xx/cx231xx-vbi.h | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 3 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 1 -
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 +-
+ drivers/media/usb/dvb-usb/a800.c | 65 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 24 +-
+ drivers/media/usb/dvb-usb/dvb-usb-remote.c | 3 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 1 +
+ drivers/media/usb/dvb-usb/friio-fe.c | 24 -
+ drivers/media/usb/dvb-usb/vp7045.c | 88 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 4 +-
+ drivers/media/usb/em28xx/em28xx-i2c.c | 2 +-
+ drivers/media/usb/em28xx/em28xx-v4l.h | 2 +-
+ drivers/media/usb/em28xx/em28xx-vbi.c | 2 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 4 +-
+ drivers/media/usb/gspca/Kconfig | 16 +-
+ drivers/media/usb/gspca/gspca.c | 1 -
+ drivers/media/usb/gspca/ov519.c | 22 +-
+ drivers/media/usb/msi2500/msi2500.c | 2 +-
+ drivers/media/usb/pvrusb2/Kconfig | 1 -
+ drivers/media/usb/pwc/pwc-if.c | 3 +-
+ drivers/media/usb/s2255/s2255drv.c | 7 +-
+ drivers/media/usb/stk1160/stk1160-i2c.c | 2 +-
+ drivers/media/usb/stk1160/stk1160-video.c | 4 +-
+ drivers/media/usb/tm6000/tm6000-cards.c | 27 +-
+ drivers/media/usb/tm6000/tm6000-dvb.c | 15 +-
+ drivers/media/usb/tm6000/tm6000-input.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-video.c | 21 +-
+ drivers/media/usb/usbtv/usbtv-core.c | 2 +-
+ drivers/media/usb/usbtv/usbtv-video.c | 4 +-
+ drivers/media/usb/zr364xx/zr364xx.c | 32 +-
+ drivers/media/v4l2-core/v4l2-async.c | 516 ++-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 22 +-
+ drivers/media/v4l2-core/v4l2-fwnode.c | 702 +++-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 9 +-
+ drivers/staging/media/atomisp/Kconfig | 11 +-
+ drivers/staging/media/atomisp/TODO | 24 +-
+ drivers/staging/media/atomisp/i2c/Kconfig | 100 +-
+ drivers/staging/media/atomisp/i2c/Makefile | 19 +-
+ drivers/staging/media/atomisp/i2c/ap1302.c | 1255 --------
+ drivers/staging/media/atomisp/i2c/ap1302.h | 198 --
+ .../atomisp/i2c/{gc0310.c => atomisp-gc0310.c} | 53 +-
+ .../atomisp/i2c/{gc2235.c => atomisp-gc2235.c} | 54 +-
+ ...bmsrlisthelper.c => atomisp-libmsrlisthelper.c} | 4 -
+ .../atomisp/i2c/{lm3554.c => atomisp-lm3554.c} | 47 +-
+ .../atomisp/i2c/{mt9m114.c => atomisp-mt9m114.c} | 51 +-
+ .../atomisp/i2c/{ov2680.c => atomisp-ov2680.c} | 51 +-
+ .../atomisp/i2c/{ov2722.c => atomisp-ov2722.c} | 54 +-
+ drivers/staging/media/atomisp/i2c/gc0310.h | 11 -
+ drivers/staging/media/atomisp/i2c/gc2235.h | 7 -
+ drivers/staging/media/atomisp/i2c/imx/Kconfig | 9 -
+ drivers/staging/media/atomisp/i2c/imx/Makefile | 14 -
+ drivers/staging/media/atomisp/i2c/imx/ad5816g.c | 217 --
+ drivers/staging/media/atomisp/i2c/imx/ad5816g.h | 50 -
+ drivers/staging/media/atomisp/i2c/imx/common.h | 66 -
+ drivers/staging/media/atomisp/i2c/imx/drv201.c | 210 --
+ drivers/staging/media/atomisp/i2c/imx/drv201.h | 39 -
+ drivers/staging/media/atomisp/i2c/imx/dw9714.c | 224 --
+ drivers/staging/media/atomisp/i2c/imx/dw9714.h | 64 -
+ drivers/staging/media/atomisp/i2c/imx/dw9718.c | 233 --
+ drivers/staging/media/atomisp/i2c/imx/dw9718.h | 64 -
+ drivers/staging/media/atomisp/i2c/imx/dw9719.c | 198 --
+ drivers/staging/media/atomisp/i2c/imx/dw9719.h | 58 -
+ drivers/staging/media/atomisp/i2c/imx/imx.c | 2480 --------------
+ drivers/staging/media/atomisp/i2c/imx/imx.h | 737 -----
+ drivers/staging/media/atomisp/i2c/imx/imx132.h | 566 ----
+ drivers/staging/media/atomisp/i2c/imx/imx134.h | 2465 --------------
+ drivers/staging/media/atomisp/i2c/imx/imx135.h | 3374 --------------------
+ drivers/staging/media/atomisp/i2c/imx/imx175.h | 1960 ------------
+ drivers/staging/media/atomisp/i2c/imx/imx208.h | 550 ----
+ drivers/staging/media/atomisp/i2c/imx/imx219.h | 228 --
+ drivers/staging/media/atomisp/i2c/imx/imx227.h | 727 -----
+ 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 -
+ drivers/staging/media/atomisp/i2c/mt9m114.h | 9 -
+ drivers/staging/media/atomisp/i2c/ov2680.h | 14 -
+ drivers/staging/media/atomisp/i2c/ov2722.h | 11 -
+ drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 12 +-
+ drivers/staging/media/atomisp/i2c/ov5693/Makefile | 2 +-
+ drivers/staging/media/atomisp/i2c/ov5693/ad5823.h | 4 -
+ .../i2c/ov5693/{ov5693.c => atomisp-ov5693.c} | 59 +-
+ drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 11 -
+ drivers/staging/media/atomisp/i2c/ov8858.c | 65 +-
+ drivers/staging/media/atomisp/i2c/ov8858.h | 5 -
+ drivers/staging/media/atomisp/i2c/ov8858_btns.h | 5 -
+ .../atomisp/include/asm/intel_mid_pcihelpers.h | 38 -
+ .../staging/media/atomisp/include/linux/atomisp.h | 4 -
+ .../atomisp/include/linux/atomisp_gmin_platform.h | 3 -
+ .../media/atomisp/include/linux/atomisp_platform.h | 25 +-
+ .../media/atomisp/include/linux/libmsrlisthelper.h | 4 -
+ .../staging/media/atomisp/include/media/lm3554.h | 5 -
+ .../staging/media/atomisp/include/media/lm3642.h | 153 -
+ drivers/staging/media/atomisp/pci/Kconfig | 17 +-
+ .../media/atomisp/pci/atomisp2/atomisp-regs.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_acc.c | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_acc.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 38 +-
+ .../media/atomisp/pci/atomisp2/atomisp_cmd.h | 10 +-
+ .../media/atomisp/pci/atomisp2/atomisp_common.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_compat.h | 4 -
+ .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 6 +-
+ .../atomisp/pci/atomisp2/atomisp_compat_css20.h | 4 -
+ .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 4 -
+ .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_csi2.c | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_csi2.h | 4 -
+ .../atomisp/pci/atomisp2/atomisp_dfs_tables.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 6 +-
+ .../media/atomisp/pci/atomisp2/atomisp_drvfs.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_file.c | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_file.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_fops.c | 8 +-
+ .../media/atomisp/pci/atomisp2/atomisp_fops.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_helper.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_internal.h | 7 -
+ .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 20 +-
+ .../media/atomisp/pci/atomisp2/atomisp_ioctl.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 5 -
+ .../media/atomisp/pci/atomisp2/atomisp_subdev.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_tables.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_tpg.c | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_tpg.h | 4 -
+ .../atomisp/pci/atomisp2/atomisp_trace_event.h | 4 -
+ .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 67 +-
+ .../media/atomisp/pci/atomisp2/atomisp_v4l2.h | 4 -
+ .../base/circbuf/interface/ia_css_circbuf.h | 39 +-
+ .../base/circbuf/interface/ia_css_circbuf_desc.h | 15 +-
+ .../css2400/camera/pipe/src/pipe_binarydesc.c | 9 +-
+ .../pci/atomisp2/css2400/camera/util/src/util.c | 2 +-
+ .../hrt/input_formatter_subsystem_defs.h | 2 +-
+ .../css_2401_csi2p_system/host/csi_rx_private.h | 18 +-
+ .../hrt/input_formatter_subsystem_defs.h | 2 +-
+ .../hrt/input_formatter_subsystem_defs.h | 2 +-
+ .../css2400/hive_isp_css_common/host/dma.c | 2 +-
+ .../hive_isp_css_common/host/event_fifo_private.h | 2 +-
+ .../hive_isp_css_common/host/fifo_monitor.c | 8 +-
+ .../host/fifo_monitor_private.h | 28 +-
+ .../css2400/hive_isp_css_common/host/gdc.c | 16 +-
+ .../css2400/hive_isp_css_common/host/gp_device.c | 2 +-
+ .../hive_isp_css_common/host/gp_device_private.h | 16 +-
+ .../hive_isp_css_common/host/gpio_private.h | 4 +-
+ .../hive_isp_css_common/host/hmem_private.h | 4 +-
+ .../host/input_formatter_private.h | 16 +-
+ .../hive_isp_css_common/host/input_system.c | 80 +-
+ .../host/input_system_private.h | 64 +-
+ .../css2400/hive_isp_css_common/host/irq.c | 42 +-
+ .../css2400/hive_isp_css_common/host/irq_private.h | 12 +-
+ .../css2400/hive_isp_css_common/host/isp.c | 4 +-
+ .../css2400/hive_isp_css_common/host/mmu.c | 6 +-
+ .../css2400/hive_isp_css_common/host/mmu_private.h | 12 +-
+ .../css2400/hive_isp_css_common/host/sp_private.h | 60 +-
+ .../css2400/hive_isp_css_include/assert_support.h | 3 +-
+ .../atomisp2/css2400/hive_isp_css_include/bamem.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/csi_rx.h | 5 -
+ .../atomisp2/css2400/hive_isp_css_include/debug.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/dma.h | 7 +-
+ .../css2400/hive_isp_css_include/event_fifo.h | 7 +-
+ .../css2400/hive_isp_css_include/fifo_monitor.h | 7 +-
+ .../css2400/hive_isp_css_include/gdc_device.h | 7 +-
+ .../css2400/hive_isp_css_include/gp_device.h | 7 +-
+ .../css2400/hive_isp_css_include/gp_timer.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/gpio.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/hmem.h | 7 +-
+ .../hive_isp_css_include/host/csi_rx_public.h | 18 +-
+ .../css2400/hive_isp_css_include/host/gdc_public.h | 6 +-
+ .../hive_isp_css_include/host/hmem_public.h | 4 +-
+ .../css2400/hive_isp_css_include/host/isp_op1w.h | 9 +-
+ .../css2400/hive_isp_css_include/host/isp_op2w.h | 9 +-
+ .../css2400/hive_isp_css_include/host/mmu_public.h | 8 +-
+ .../hive_isp_css_include/host/ref_vector_func.h | 9 +-
+ .../css2400/hive_isp_css_include/ibuf_ctrl.h | 7 +-
+ .../css2400/hive_isp_css_include/input_formatter.h | 7 +-
+ .../css2400/hive_isp_css_include/input_system.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/irq.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/isp.h | 7 +-
+ .../css2400/hive_isp_css_include/isys_dma.h | 7 +-
+ .../css2400/hive_isp_css_include/isys_irq.h | 9 +-
+ .../hive_isp_css_include/isys_stream2mmio.h | 7 +-
+ .../css2400/hive_isp_css_include/math_support.h | 25 +-
+ .../css2400/hive_isp_css_include/mmu_device.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/mpmath.h | 9 +-
+ .../atomisp2/css2400/hive_isp_css_include/osys.h | 7 +-
+ .../css2400/hive_isp_css_include/pixelgen.h | 7 +-
+ .../hive_isp_css_include/platform_support.h | 1 -
+ .../css2400/hive_isp_css_include/print_support.h | 3 +-
+ .../atomisp2/css2400/hive_isp_css_include/queue.h | 7 +-
+ .../css2400/hive_isp_css_include/resource.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/socket.h | 7 +-
+ .../pci/atomisp2/css2400/hive_isp_css_include/sp.h | 7 +-
+ .../css2400/hive_isp_css_include/storage_class.h | 34 -
+ .../css2400/hive_isp_css_include/stream_buffer.h | 7 +-
+ .../css2400/hive_isp_css_include/string_support.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/tag.h | 7 +-
+ .../css2400/hive_isp_css_include/timed_ctrl.h | 7 +-
+ .../css2400/hive_isp_css_include/type_support.h | 42 -
+ .../atomisp2/css2400/hive_isp_css_include/vamem.h | 7 +-
+ .../css2400/hive_isp_css_include/vector_func.h | 7 +-
+ .../css2400/hive_isp_css_include/vector_ops.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/vmem.h | 7 +-
+ .../atomisp2/css2400/hive_isp_css_include/xmem.h | 7 +-
+ .../isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 2 +-
+ .../atomisp2/css2400/runtime/binary/src/binary.c | 12 +-
+ .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 2 +-
+ .../css2400/runtime/debug/interface/ia_css_debug.h | 2 +-
+ .../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 3 +-
+ .../css2400/runtime/inputfifo/src/inputfifo.c | 28 +-
+ .../css2400/runtime/pipeline/src/pipeline.c | 2 +-
+ .../css2400/runtime/rmgr/interface/ia_css_rmgr.h | 7 +-
+ .../atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 2 +-
+ .../atomisp2/css2400/runtime/spctrl/src/spctrl.c | 6 +-
+ .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 133 +-
+ .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 15 +-
+ .../atomisp/pci/atomisp2/css2400/sh_css_hrt.c | 2 +-
+ .../atomisp/pci/atomisp2/css2400/sh_css_internal.h | 4 +-
+ .../pci/atomisp2/css2400/sh_css_param_shading.c | 4 +-
+ .../atomisp/pci/atomisp2/css2400/sh_css_params.c | 54 +-
+ .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 4 -
+ .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 34 +-
+ .../atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c | 10 +-
+ .../atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c | 9 +-
+ .../media/atomisp/pci/atomisp2/hmm/hmm_vm.c | 8 +-
+ .../atomisp2/hrt/hive_isp_css_custom_host_hrt.h | 4 -
+ .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 4 -
+ .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h | 4 -
+ .../media/atomisp/pci/atomisp2/include/hmm/hmm.h | 4 -
+ .../atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 4 -
+ .../atomisp/pci/atomisp2/include/hmm/hmm_bo_dev.h | 4 -
+ .../atomisp/pci/atomisp2/include/hmm/hmm_common.h | 4 -
+ .../atomisp/pci/atomisp2/include/hmm/hmm_pool.h | 4 -
+ .../atomisp/pci/atomisp2/include/hmm/hmm_vm.h | 4 -
+ .../atomisp/pci/atomisp2/include/mmu/isp_mmu.h | 4 -
+ .../atomisp/pci/atomisp2/include/mmu/sh_mmu.h | 4 -
+ .../pci/atomisp2/include/mmu/sh_mmu_mrfld.h | 4 -
+ .../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 4 -
+ .../media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c | 4 -
+ drivers/staging/media/atomisp/platform/Makefile | 1 -
+ .../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 | 1 -
+ .../platform/intel-mid/atomisp_gmin_platform.c | 141 +-
+ .../platform/intel-mid/intel_mid_pcihelpers.c | 298 --
+ drivers/staging/media/imx/imx-ic-prp.c | 5 +-
+ drivers/staging/media/imx/imx-media-dev.c | 8 +-
+ drivers/staging/media/lirc/lirc_zilog.c | 231 +-
+ include/linux/platform_data/media/gpio-ir-recv.h | 23 -
+ include/media/cec-pin.h | 111 +-
+ include/media/cec.h | 16 +-
+ include/media/drv-intf/saa7146_vv.h | 7 +-
+ include/media/lirc_dev.h | 100 +-
+ include/media/rc-map.h | 4 +
+ include/media/v4l2-async.h | 91 +-
+ include/media/v4l2-fwnode.h | 228 +-
+ include/media/v4l2-subdev.h | 3 +
+ include/uapi/linux/cec.h | 2 +
+ include/uapi/linux/dvb/frontend.h | 2 +-
+ samples/v4l/v4l2-pci-skeleton.c | 6 +-
+ 498 files changed, 12082 insertions(+), 22613 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/cec-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/imx274.txt
+ create mode 100644 Documentation/devicetree/bindings/media/rockchip-rga.txt
+ create mode 100644 Documentation/devicetree/bindings/media/tango-ir.txt
+ create mode 100644 Documentation/devicetree/bindings/media/tegra-cec.txt
+ create mode 100644 Documentation/media/kapi/dtv-ca.rst
+ create mode 100644 Documentation/media/kapi/dtv-common.rst
+ create mode 100644 Documentation/media/kapi/dtv-demux.rst
+ create mode 100644 Documentation/media/kapi/dtv-frontend.rst
+ create mode 100644 Documentation/media/kapi/dtv-net.rst
+ create mode 100644 Documentation/media/kapi/v4l2-async.rst
+ create mode 100644 drivers/media/cec/cec-pin-priv.h
+ create mode 100644 drivers/media/i2c/imx274.c
+ create mode 100644 drivers/media/platform/cec-gpio/Makefile
+ create mode 100644 drivers/media/platform/cec-gpio/cec-gpio.c
+ create mode 100644 drivers/media/platform/rockchip/rga/Makefile
+ create mode 100644 drivers/media/platform/rockchip/rga/rga-buf.c
+ create mode 100644 drivers/media/platform/rockchip/rga/rga-hw.c
+ create mode 100644 drivers/media/platform/rockchip/rga/rga-hw.h
+ create mode 100644 drivers/media/platform/rockchip/rga/rga.c
+ create mode 100644 drivers/media/platform/rockchip/rga/rga.h
+ create mode 100644 drivers/media/platform/tegra-cec/Makefile
+ create mode 100644 drivers/media/platform/tegra-cec/tegra_cec.c
+ create mode 100644 drivers/media/platform/tegra-cec/tegra_cec.h
+ create mode 100644 drivers/media/rc/keymaps/rc-astrometa-t2hybrid.c
+ create mode 100644 drivers/media/rc/keymaps/rc-hisi-poplar.c
+ create mode 100644 drivers/media/rc/keymaps/rc-hisi-tv-demo.c
+ create mode 100644 drivers/media/rc/keymaps/rc-tango.c
+ create mode 100644 drivers/media/rc/tango-ir.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/ap1302.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/ap1302.h
+ rename drivers/staging/media/atomisp/i2c/{gc0310.c => atomisp-gc0310.c} (96%)
+ rename drivers/staging/media/atomisp/i2c/{gc2235.c => atomisp-gc2235.c} (95%)
+ rename drivers/staging/media/atomisp/i2c/{libmsrlisthelper.c => atomisp-libmsrlisthelper.c} (96%)
+ rename drivers/staging/media/atomisp/i2c/{lm3554.c => atomisp-lm3554.c} (95%)
+ rename drivers/staging/media/atomisp/i2c/{mt9m114.c => atomisp-mt9m114.c} (97%)
+ rename drivers/staging/media/atomisp/i2c/{ov2680.c => atomisp-ov2680.c} (97%)
+ rename drivers/staging/media/atomisp/i2c/{ov2722.c => atomisp-ov2722.c} (96%)
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/Kconfig
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/Makefile
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/ad5816g.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/ad5816g.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/common.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/drv201.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/drv201.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9714.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9714.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9718.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9718.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9719.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9719.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx132.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx134.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx135.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx175.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx208.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx219.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/imx227.h
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/otp.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_brcc064_e2prom.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_e2prom.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_imx.c
+ delete mode 100644 drivers/staging/media/atomisp/i2c/imx/vcm.c
+ rename drivers/staging/media/atomisp/i2c/ov5693/{ov5693.c => atomisp-ov5693.c} (97%)
+ delete mode 100644 drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h
+ delete mode 100644 drivers/staging/media/atomisp/include/media/lm3642.h
+ delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/storage_class.h
+ delete mode 100644 drivers/staging/media/atomisp/platform/clock/Makefile
+ delete mode 100644 drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.c
+ delete mode 100644 drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.h
+ delete mode 100644 drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
+ delete mode 100644 drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
+ delete mode 100644 include/linux/platform_data/media/gpio-ir-recv.h
+Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation)
+$ git merge reset-fixes/reset/fixes
+Already up-to-date.
+Merging mips-fixes/mips-fixes (b084116f8587 MIPS: AR7: Ensure that serial ports are properly set up)
+$ git merge mips-fixes/mips-fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (423a8a942e95 drm/i915: Deconstruct struct sgt_dma initialiser)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up-to-date.
+Merging drm-misc-fixes/for-linux-next-fixes (9271c0ca573e drm/edid: Don't send non-zero YQ in AVI infoframe for HDMI 1.x sinks)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_edid.c | 12 +++++-
+ drivers/gpu/drm/i915/intel_hdmi.c | 3 +-
+ drivers/gpu/drm/qxl/qxl_cmd.c | 22 ++++++-----
+ drivers/gpu/drm/qxl/qxl_display.c | 49 +++++++++++++++++++++++--
+ drivers/gpu/drm/qxl/qxl_drv.h | 28 ++------------
+ drivers/gpu/drm/qxl/qxl_dumb.c | 1 +
+ drivers/gpu/drm/qxl/qxl_fb.c | 13 +++----
+ drivers/gpu/drm/qxl/qxl_release.c | 5 +--
+ drivers/gpu/drm/qxl/qxl_ttm.c | 4 +-
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 14 +++----
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +-
+ drivers/gpu/drm/vc4/vc4_irq.c | 6 +++
+ include/drm/drm_edid.h | 3 +-
+ 13 files changed, 99 insertions(+), 64 deletions(-)
+Merging kbuild/for-next (bcd572cbae02 Merge branches 'testing' and 'misc' into for-next)
+$ git merge kbuild/for-next
+Auto-merging scripts/mkcompile_h
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging scripts/coccicheck
+Auto-merging scripts/Makefile.modpost
+Auto-merging scripts/Makefile.lib
+Auto-merging scripts/Makefile.host
+Auto-merging scripts/Makefile.headersinst
+Auto-merging scripts/Makefile.build
+Auto-merging scripts/Makefile.asm-generic
+Auto-merging arch/x86/entry/vdso/Makefile
+Auto-merging arch/hexagon/Makefile
+Auto-merging arch/arm/Makefile
+Auto-merging Makefile
+Auto-merging Kbuild
+Auto-merging Documentation/dev-tools/coccinelle.rst
+Auto-merging .gitignore
+Merge made by the 'recursive' strategy.
+ .gitignore | 5 +
+ Documentation/dev-tools/coccinelle.rst | 3 -
+ Kbuild | 2 -
+ Makefile | 298 ++++++++++-----------
+ arch/arm/Makefile | 6 +-
+ arch/c6x/Makefile | 2 +-
+ arch/hexagon/Makefile | 6 +-
+ arch/hexagon/kernel/ptrace.c | 4 +-
+ arch/sh/Makefile | 8 +-
+ arch/x86/entry/vdso/Makefile | 4 -
+ scripts/Kbuild.include | 106 ++++++--
+ scripts/Makefile.asm-generic | 3 +
+ scripts/Makefile.build | 25 +-
+ scripts/Makefile.headersinst | 5 +-
+ scripts/Makefile.host | 12 -
+ scripts/Makefile.lib | 34 +--
+ scripts/Makefile.modpost | 3 +-
+ scripts/coccicheck | 26 +-
+ scripts/coccinelle/api/check_bq27xxx_data.cocci | 161 +++++++++++
+ scripts/coccinelle/api/setup_timer.cocci | 144 +++++++---
+ .../coccinelle/iterators/list_entry_update.cocci | 2 +-
+ scripts/coccinelle/locks/flags.cocci | 37 +--
+ scripts/coccinelle/misc/ifcol.cocci | 8 +-
+ scripts/coccinelle/misc/orplus.cocci | 43 ++-
+ scripts/coccinelle/null/badzero.cocci | 2 +-
+ scripts/link-vmlinux.sh | 15 +-
+ scripts/mkcompile_h | 7 +-
+ scripts/package/Makefile | 9 +-
+ scripts/package/builddeb | 4 +-
+ scripts/package/mkspec | 269 +++++++++----------
+ 30 files changed, 756 insertions(+), 497 deletions(-)
+ create mode 100644 scripts/coccinelle/api/check_bq27xxx_data.cocci
+Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
+$ git merge uuid/for-next
+Already up-to-date.
+Merging dma-mapping/for-next (c9eb6172c328 dma-mapping: turn dma_cache_sync into a dma_map_ops method)
+$ git merge dma-mapping/for-next
+Already up-to-date.
+Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (64dd3a7c8202 Merge remote-tracking branch 'reset/reset/arc' into for-next)
+$ git merge arc/for-next
+Resolved 'MAINTAINERS' using previous resolution.
+Auto-merging drivers/reset/Makefile
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ae2d05b36dcc] Merge remote-tracking branch 'arc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/reset/snps,axs10x-reset.txt | 33 +++++++++
+ MAINTAINERS | 6 ++
+ drivers/reset/Kconfig | 6 ++
+ drivers/reset/Makefile | 1 +
+ drivers/reset/reset-axs10x.c | 83 ++++++++++++++++++++++
+ 5 files changed, 129 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
+ create mode 100644 drivers/reset/reset-axs10x.c
+Merging arm/for-next (02196144a0a0 Merge branch 'devel-stable' into for-next)
+$ git merge arm/for-next
+Auto-merging fs/binfmt_elf.c
+Auto-merging arch/arm/mm/Makefile
+Auto-merging arch/arm/kernel/vmlinux.lds.S
+Auto-merging arch/arm/kernel/vmlinux-xip.lds.S
+Auto-merging arch/arm/kernel/signal.c
+Auto-merging arch/arm/kernel/entry-common.S
+Auto-merging arch/arm/kernel/elf.c
+Auto-merging arch/arm/kernel/Makefile
+Auto-merging arch/arm/include/uapi/asm/unistd.h
+Auto-merging arch/arm/include/uapi/asm/ptrace.h
+Auto-merging arch/arm/include/asm/v7m.h
+Auto-merging arch/arm/include/asm/ucontext.h
+Auto-merging arch/arm/include/asm/mpu.h
+Auto-merging arch/arm/include/asm/mmu.h
+Auto-merging arch/arm/include/asm/highmem.h
+Auto-merging arch/arm/include/asm/elf.h
+Auto-merging arch/arm/include/asm/dma-mapping.h
+Auto-merging arch/arm/include/asm/cputype.h
+Auto-merging arch/arm/boot/compressed/Makefile
+Auto-merging arch/arm/Kconfig-nommu
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 21 +-
+ arch/arm/Kconfig-nommu | 4 +-
+ arch/arm/boot/Makefile | 13 +-
+ arch/arm/boot/compressed/Makefile | 7 +-
+ arch/arm/boot/compressed/head.S | 2 +
+ arch/arm/boot/compressed/vmlinux.lds.S | 11 +
+ arch/arm/boot/deflate_xip_data.sh | 64 +++++
+ arch/arm/include/asm/cputype.h | 10 +
+ arch/arm/include/asm/dma-mapping.h | 7 -
+ arch/arm/include/asm/elf.h | 16 +-
+ arch/arm/include/asm/highmem.h | 1 -
+ arch/arm/include/asm/mmu.h | 8 +
+ arch/arm/include/asm/mpu.h | 26 +-
+ arch/arm/include/asm/processor.h | 22 +-
+ arch/arm/include/asm/smp.h | 2 +-
+ arch/arm/include/asm/ucontext.h | 1 +
+ arch/arm/include/asm/v7m.h | 10 +
+ arch/arm/include/uapi/asm/ptrace.h | 4 +
+ arch/arm/include/uapi/asm/unistd.h | 1 +
+ arch/arm/kernel/Makefile | 5 +
+ arch/arm/kernel/asm-offsets.c | 15 +
+ arch/arm/kernel/atags_parse.c | 7 +-
+ arch/arm/kernel/debug.S | 39 ++-
+ arch/arm/kernel/early_printk.c | 16 +-
+ arch/arm/kernel/elf.c | 24 +-
+ arch/arm/kernel/entry-common.S | 9 -
+ arch/arm/kernel/head-common.S | 86 +++---
+ arch/arm/kernel/head-inflate-data.c | 62 +++++
+ arch/arm/kernel/head-nommu.S | 148 ++++++++--
+ arch/arm/kernel/setup.c | 10 +
+ arch/arm/kernel/signal.c | 53 +++-
+ arch/arm/kernel/signal.h | 11 +
+ arch/arm/kernel/sigreturn_codes.S | 56 +++-
+ arch/arm/kernel/smp.c | 2 +-
+ arch/arm/kernel/traps.c | 3 +
+ arch/arm/kernel/vmlinux-xip.lds.S | 115 ++++----
+ arch/arm/kernel/vmlinux.lds.S | 40 +--
+ arch/arm/mm/Makefile | 1 +
+ arch/arm/mm/dma-mapping.c | 21 +-
+ arch/arm/mm/init.c | 10 -
+ arch/arm/mm/nommu.c | 254 +----------------
+ arch/arm/mm/pmsa-v7.c | 484 +++++++++++++++++++++++++++++++++
+ drivers/pcmcia/sa1111_generic.c | 33 ++-
+ fs/Kconfig.binfmt | 4 +-
+ fs/binfmt_elf.c | 15 +-
+ fs/binfmt_elf_fdpic.c | 13 +-
+ 46 files changed, 1226 insertions(+), 540 deletions(-)
+ create mode 100755 arch/arm/boot/deflate_xip_data.sh
+ create mode 100644 arch/arm/kernel/head-inflate-data.c
+ create mode 100644 arch/arm/kernel/signal.h
+ create mode 100644 arch/arm/mm/pmsa-v7.c
+Merging arm-perf/for-next/perf (07141342149a arm64: MAINTAINERS: hisi: Add HiSilicon SoC PMU support)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (ec9acd01224f arm-soc: document merges)
+$ git merge arm-soc/for-next
+Resolved 'arch/arm64/boot/dts/allwinner/Makefile' using previous resolution.
+Recorded preimage for 'arch/arm64/boot/dts/amlogic/Makefile'
+Resolved 'arch/arm64/boot/dts/arm/Makefile' using previous resolution.
+Resolved 'drivers/thermal/tegra/Makefile' using previous resolution.
+Auto-merging include/linux/of_reserved_mem.h
+Removing include/linux/clk/bcm2835.h
+CONFLICT (modify/delete): include/dt-bindings/pinctrl/stm32h7-pinfunc.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of include/dt-bindings/pinctrl/stm32h7-pinfunc.h left in tree.
+CONFLICT (modify/delete): include/dt-bindings/pinctrl/stm32f746-pinfunc.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of include/dt-bindings/pinctrl/stm32f746-pinfunc.h left in tree.
+CONFLICT (modify/delete): include/dt-bindings/pinctrl/stm32f429-pinfunc.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of include/dt-bindings/pinctrl/stm32f429-pinfunc.h left in tree.
+Auto-merging include/dt-bindings/pinctrl/am43xx.h
+Auto-merging include/dt-bindings/clock/tegra210-car.h
+Auto-merging drivers/thermal/tegra/Makefile
+CONFLICT (content): Merge conflict in drivers/thermal/tegra/Makefile
+Auto-merging drivers/thermal/Makefile
+Auto-merging drivers/soc/renesas/Makefile
+Auto-merging drivers/soc/qcom/Makefile
+Auto-merging drivers/soc/fsl/qbman/Makefile
+Auto-merging drivers/soc/Makefile
+Removing drivers/reset/reset-zx2967.c
+Removing drivers/reset/reset-stm32.c
+Removing drivers/reset/reset-socfpga.c
+Auto-merging drivers/reset/Makefile
+Auto-merging drivers/memory/Makefile
+Auto-merging drivers/clk/bcm/Makefile
+Auto-merging drivers/bus/Makefile
+Auto-merging drivers/bus/Kconfig
+Auto-merging arch/arm64/boot/dts/renesas/Makefile
+Auto-merging arch/arm64/boot/dts/realtek/Makefile
+Auto-merging arch/arm64/boot/dts/nvidia/tegra186.dtsi
+Auto-merging arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+Auto-merging arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+Auto-merging arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+Auto-merging arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+Auto-merging arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
+Auto-merging arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+Auto-merging arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+Auto-merging arch/arm64/boot/dts/arm/foundation-v8.dtsi
+Auto-merging arch/arm64/boot/dts/arm/foundation-v8.dts
+Auto-merging arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts
+Auto-merging arch/arm64/boot/dts/arm/Makefile
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/Makefile
+Auto-merging arch/arm64/boot/dts/amlogic/Makefile
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/Makefile
+Auto-merging arch/arm64/boot/dts/allwinner/Makefile
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/allwinner/Makefile
+Auto-merging arch/arm64/Kconfig.platforms
+Auto-merging arch/arm/mach-shmobile/common.h
+Auto-merging arch/arm/mach-shmobile/Makefile
+Removing arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
+Auto-merging arch/arm/mach-omap2/Makefile
+CONFLICT (modify/delete): arch/arm/mach-integrator/pci_v3.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-integrator/pci_v3.h left in tree.
+Removing arch/arm/mach-integrator/pci_v3.c
+Auto-merging arch/arm/mach-integrator/Makefile
+Auto-merging arch/arm/mach-imx/mach-imx6q.c
+Auto-merging arch/arm/mach-ep93xx/ts72xx.h
+Auto-merging arch/arm/mach-ep93xx/simone.c
+Auto-merging arch/arm/mach-bcm/Kconfig
+Removing arch/arm/mach-actions/headsmp.S
+Auto-merging arch/arm/include/uapi/asm/ptrace.h
+Auto-merging arch/arm/include/asm/smp_scu.h
+Auto-merging arch/arm/boot/dts/zx296702.dtsi
+Auto-merging arch/arm/boot/dts/tegra124.dtsi
+Auto-merging arch/arm/boot/dts/tegra124-jetson-tk1.dts
+Auto-merging arch/arm/boot/dts/tango4-common.dtsi
+Auto-merging arch/arm/boot/dts/stm32h743.dtsi
+Auto-merging arch/arm/boot/dts/stm32f746.dtsi
+Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi
+Auto-merging arch/arm/boot/dts/qcom-msm8660.dtsi
+Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi
+Auto-merging arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
+Auto-merging arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+Auto-merging arch/arm/boot/dts/kirkwood.dtsi
+Auto-merging arch/arm/boot/dts/kirkwood-ts219.dtsi
+Auto-merging arch/arm/boot/dts/integratorap.dts
+Auto-merging arch/arm/boot/dts/integrator.dtsi
+Auto-merging arch/arm/boot/dts/imx28-apx4devkit.dts
+Auto-merging arch/arm/boot/dts/gemini.dtsi
+Auto-merging arch/arm/boot/dts/dove.dtsi
+Auto-merging arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+Auto-merging arch/arm/boot/dts/at91-ariettag25.dts
+Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi
+Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi
+Auto-merging arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+Auto-merging arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+Auto-merging arch/arm/boot/dts/aspeed-ast2500-evb.dts
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/devicetree/bindings/dma/sun6i-dma.txt
+Auto-merging Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
+Auto-merging Documentation/devicetree/bindings/arm/samsung/pmu.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-integrator/pci_v3.h include/dt-bindings/pinctrl/stm32f429-pinfunc.h include/dt-bindings/pinctrl/stm32f746-pinfunc.h include/dt-bindings/pinctrl/stm32h7-pinfunc.h
+arch/arm/mach-integrator/pci_v3.h: needs merge
+include/dt-bindings/pinctrl/stm32f429-pinfunc.h: needs merge
+include/dt-bindings/pinctrl/stm32f746-pinfunc.h: needs merge
+include/dt-bindings/pinctrl/stm32h7-pinfunc.h: needs merge
+rm 'arch/arm/mach-integrator/pci_v3.h'
+rm 'include/dt-bindings/pinctrl/stm32f429-pinfunc.h'
+rm 'include/dt-bindings/pinctrl/stm32f746-pinfunc.h'
+rm 'include/dt-bindings/pinctrl/stm32h7-pinfunc.h'
+$ git commit -v -a
+Recorded resolution for 'arch/arm64/boot/dts/amlogic/Makefile'.
+[master 3f638a13a6cb9653a80b9c62d3b7bb83f1392ffe] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/sunxi/README | 11 +-
+ Documentation/devicetree/bindings/arm/actions.txt | 1 +
+ Documentation/devicetree/bindings/arm/amlogic.txt | 8 +
+ .../devicetree/bindings/arm/amlogic/analog-top.txt | 20 +
+ .../devicetree/bindings/arm/amlogic/assist.txt | 17 +
+ .../devicetree/bindings/arm/amlogic/bootrom.txt | 17 +
+ .../devicetree/bindings/arm/amlogic/pmu.txt | 18 +
+ .../devicetree/bindings/arm/amlogic/smp-sram.txt | 32 +
+ .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 6 +-
+ .../devicetree/bindings/arm/bcm/brcm,hr2.txt | 14 +
+ Documentation/devicetree/bindings/arm/cpus.txt | 2 +
+ .../devicetree/bindings/arm/omap/ctrl.txt | 2 +
+ Documentation/devicetree/bindings/arm/realtek.txt | 2 +
+ Documentation/devicetree/bindings/arm/rockchip.txt | 4 +
+ .../devicetree/bindings/arm/samsung/pmu.txt | 1 -
+ .../bindings/arm/samsung/samsung-boards.txt | 1 +
+ Documentation/devicetree/bindings/arm/shmobile.txt | 16 +-
+ Documentation/devicetree/bindings/arm/sunxi.txt | 2 +
+ Documentation/devicetree/bindings/bus/ti-sysc.txt | 93 +
+ Documentation/devicetree/bindings/bus/ts-nbus.txt | 50 +
+ .../bindings/clock/brcm,iproc-clocks.txt | 14 +
+ .../bindings/display/bridge/renesas,dw-hdmi.txt | 2 +-
+ .../devicetree/bindings/dma/sun6i-dma.txt | 2 +-
+ .../devicetree/bindings/firmware/qcom,scm.txt | 2 +
+ .../devicetree/bindings/gpu/arm,mali-utgard.txt | 16 +
+ Documentation/devicetree/bindings/hsi/omap-ssi.txt | 13 +-
+ .../bindings/memory-controllers/brcm,dpfe-cpu.txt | 27 +
+ .../bindings/memory-controllers/ti/emif.txt | 6 +-
+ .../devicetree/bindings/mips/brcm/soc.txt | 153 ++
+ Documentation/devicetree/bindings/misc/ge-achc.txt | 26 +
+ .../devicetree/bindings/mtd/jedec,spi-nor.txt | 2 +
+ .../devicetree/bindings/net/dwmac-sun8i.txt | 207 +++
+ .../bindings/pinctrl/st,stm32-pinctrl.txt | 22 +-
+ .../bindings/power/amlogic,meson-gx-pwrc.txt | 61 +
+ .../devicetree/bindings/power/renesas,apmu.txt | 1 +
+ .../bindings/power/renesas,rcar-sysc.txt | 1 +
+ .../devicetree/bindings/power/ti-smartreflex.txt | 47 +
+ .../bindings/reserved-memory/qcom,rmtfs-mem.txt | 51 +
+ .../devicetree/bindings/reset/renesas,rst.txt | 1 +
+ .../devicetree/bindings/reset/uniphier-reset.txt | 3 +
+ .../devicetree/bindings/serial/mvebu-uart.txt | 2 +-
+ Documentation/devicetree/bindings/soc/fsl/bman.txt | 12 +-
+ Documentation/devicetree/bindings/soc/fsl/qman.txt | 26 +-
+ .../devicetree/bindings/soc/mediatek/pwrap.txt | 6 +-
+ .../devicetree/bindings/spi/spi-fsl-dspi.txt | 1 +
+ .../bindings/thermal/hisilicon-thermal.txt | 9 +
+ .../thermal/nvidia,tegra186-bpmp-thermal.txt | 32 +
+ .../devicetree/bindings/vendor-prefixes.txt | 6 +
+ MAINTAINERS | 18 +-
+ arch/arm/Kconfig | 2 +-
+ arch/arm/Kconfig.debug | 20 +-
+ arch/arm/Makefile | 1 +
+ arch/arm/arm-soc-for-next-contents.txt | 228 +++
+ arch/arm/boot/dts/Makefile | 41 +-
+ arch/arm/boot/dts/am33xx.dtsi | 10 +-
+ arch/arm/boot/dts/am43x-epos-evm.dts | 239 ++-
+ arch/arm/boot/dts/armada-370-synology-ds213j.dts | 12 +-
+ arch/arm/boot/dts/armada-385-synology-ds116.dts | 12 +-
+ arch/arm/boot/dts/armada-xp-synology-ds414.dts | 12 +-
+ arch/arm/boot/dts/artpec6.dtsi | 3 -
+ arch/arm/boot/dts/aspeed-ast2500-evb.dts | 19 +
+ arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 56 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 58 +
+ arch/arm/boot/dts/aspeed-g4.dtsi | 1818 +++++++++++---------
+ arch/arm/boot/dts/aspeed-g5.dtsi | 1808 ++++++++++---------
+ arch/arm/boot/dts/at91-ariag25.dts | 4 +-
+ arch/arm/boot/dts/at91-ariettag25.dts | 4 +-
+ arch/arm/boot/dts/at91-cosino_mega2560.dts | 4 +-
+ arch/arm/boot/dts/at91-kizbox2.dts | 4 +-
+ arch/arm/boot/dts/at91-kizboxmini.dts | 4 +-
+ arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 52 +-
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 47 +-
+ arch/arm/boot/dts/at91-sama5d3_xplained.dts | 6 +-
+ arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 6 +-
+ arch/arm/boot/dts/at91-sama5d4_xplained.dts | 6 +-
+ arch/arm/boot/dts/at91-sama5d4ek.dts | 6 +-
+ arch/arm/boot/dts/at91-vinco.dts | 6 +-
+ arch/arm/boot/dts/at91rm9200.dtsi | 4 +-
+ arch/arm/boot/dts/at91rm9200ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9260.dtsi | 2 +-
+ arch/arm/boot/dts/at91sam9261.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9261ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9263.dtsi | 6 +-
+ arch/arm/boot/dts/at91sam9263ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9g20.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9g45.dtsi | 6 +-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 +-
+ arch/arm/boot/dts/at91sam9n12.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9n12ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9rl.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9rlek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9x25ek.dts | 10 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 6 +-
+ arch/arm/boot/dts/at91sam9x5ek.dtsi | 6 +-
+ arch/arm/boot/dts/at91sam9xe.dtsi | 4 +-
+ arch/arm/boot/dts/axp209.dtsi | 2 +-
+ arch/arm/boot/dts/axp81x.dtsi | 139 ++
+ arch/arm/boot/dts/bcm-cygnus.dtsi | 28 +-
+ arch/arm/boot/dts/bcm-hr2.dtsi | 368 ++++
+ arch/arm/boot/dts/bcm-nsp.dtsi | 8 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 5 +
+ arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +-
+ arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 63 +
+ arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 63 +
+ arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 50 +
+ arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 87 +
+ arch/arm/boot/dts/bcm5301x.dtsi | 6 +-
+ arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dts | 85 +
+ arch/arm/boot/dts/bcm53573.dtsi | 2 +-
+ arch/arm/boot/dts/berlin2.dtsi | 6 +-
+ arch/arm/boot/dts/berlin2cd.dtsi | 6 +-
+ arch/arm/boot/dts/berlin2q.dtsi | 6 +-
+ arch/arm/boot/dts/da850-lcdk.dts | 18 +
+ arch/arm/boot/dts/da850.dtsi | 12 +
+ arch/arm/boot/dts/dove.dtsi | 14 +-
+ arch/arm/boot/dts/dra7-evm-common.dtsi | 4 +
+ arch/arm/boot/dts/dra7-evm.dts | 4 -
+ arch/arm/boot/dts/dra7.dtsi | 36 +-
+ arch/arm/boot/dts/ep7211-edb7211.dts | 2 +-
+ arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +-
+ arch/arm/boot/dts/exynos3250-monk.dts | 2 +-
+ arch/arm/boot/dts/exynos3250-rinato.dts | 24 +-
+ arch/arm/boot/dts/exynos3250.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4.dtsi | 4 +-
+ arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +-
+ arch/arm/boot/dts/exynos4210.dtsi | 4 +-
+ arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +-
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 2 -
+ arch/arm/boot/dts/exynos4412-origen.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4412-trats2.dts | 117 +-
+ arch/arm/boot/dts/exynos4412.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 22 +-
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 20 +-
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi | 20 +-
+ arch/arm/boot/dts/exynos5250-spring.dts | 18 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 24 +-
+ arch/arm/boot/dts/exynos5410-odroidxu.dts | 6 +-
+ arch/arm/boot/dts/exynos5410-smdk5410.dts | 2 +-
+ arch/arm/boot/dts/exynos5410.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +-
+ arch/arm/boot/dts/exynos5420-cpus.dtsi | 8 +
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 9 +-
+ arch/arm/boot/dts/exynos5420.dtsi | 11 +-
+ arch/arm/boot/dts/exynos5422-cpus.dtsi | 8 +
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 443 +++++
+ arch/arm/boot/dts/exynos5422-odroidhc1.dts | 213 +++
+ arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 13 +
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 711 +++-----
+ arch/arm/boot/dts/exynos5440-ssdk5440.dts | 2 +-
+ arch/arm/boot/dts/exynos5440.dtsi | 2 +-
+ arch/arm/boot/dts/exynos54xx.dtsi | 4 +-
+ arch/arm/boot/dts/ge863-pro3.dtsi | 2 +-
+ arch/arm/boot/dts/gemini.dtsi | 21 +
+ arch/arm/boot/dts/hip01.dtsi | 4 +-
+ arch/arm/boot/dts/hip04-d01.dts | 2 +-
+ arch/arm/boot/dts/hisi-x5hd2.dtsi | 30 +-
+ arch/arm/boot/dts/imx1.dtsi | 44 +-
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 +-
+ arch/arm/boot/dts/imx25-pdk.dts | 10 +-
+ arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +-
+ arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 2 +-
+ arch/arm/boot/dts/imx28-evk.dts | 2 +-
+ arch/arm/boot/dts/imx28-m28evk.dts | 2 +-
+ arch/arm/boot/dts/imx28-tx28.dts | 177 +-
+ .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 2 +-
+ arch/arm/boot/dts/imx50.dtsi | 3 +-
+ arch/arm/boot/dts/imx51-apf51dev.dts | 10 +-
+ arch/arm/boot/dts/imx51-babbage.dts | 14 +-
+ arch/arm/boot/dts/imx51-ts4800.dts | 8 +-
+ arch/arm/boot/dts/imx51-zii-rdu1.dts | 834 +++++++++
+ arch/arm/boot/dts/imx51.dtsi | 4 +-
+ arch/arm/boot/dts/imx53-m53evk.dts | 6 +-
+ arch/arm/boot/dts/imx53-mba53.dts | 2 +-
+ arch/arm/boot/dts/imx53-ppd.dts | 1042 +++++++++++
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 6 +-
+ arch/arm/boot/dts/imx53-smd.dts | 4 +-
+ arch/arm/boot/dts/imx53-tx53-x03x.dts | 86 +-
+ arch/arm/boot/dts/imx53-tx53-x13x.dts | 116 +-
+ arch/arm/boot/dts/imx53-tx53.dtsi | 166 +-
+ arch/arm/boot/dts/imx53-voipac-bsb.dts | 2 +-
+ arch/arm/boot/dts/imx53.dtsi | 6 +-
+ arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-icore.dts | 9 +
+ arch/arm/boot/dts/imx6dl-riotboard.dts | 4 +-
+ arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts | 74 +-
+ arch/arm/boot/dts/imx6dl-tx6s-8034-mb7.dts | 48 +
+ arch/arm/boot/dts/imx6dl-tx6s-8034.dts | 171 +-
+ arch/arm/boot/dts/imx6dl-tx6s-8035-mb7.dts | 48 +
+ arch/arm/boot/dts/imx6dl-tx6s-8035.dts | 171 +-
+ arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 161 +-
+ arch/arm/boot/dts/imx6dl-tx6u-8033-mb7.dts | 48 +
+ arch/arm/boot/dts/imx6dl-tx6u-8033.dts | 170 +-
+ arch/arm/boot/dts/imx6dl-tx6u-80xx-mb7.dts | 48 +
+ arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 132 +-
+ arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts | 215 +--
+ arch/arm/boot/dts/imx6dl-wandboard-revd1.dts | 22 +
+ arch/arm/boot/dts/imx6dl.dtsi | 16 +-
+ arch/arm/boot/dts/imx6q-apalis-eval.dts | 2 +-
+ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 2 +-
+ arch/arm/boot/dts/imx6q-apalis-ixora.dts | 2 +-
+ arch/arm/boot/dts/imx6q-bx50v3.dtsi | 2 +-
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 5 +-
+ .../dts/imx6q-display5-tianma-tm070-1280x768.dts | 51 +
+ arch/arm/boot/dts/imx6q-display5.dtsi | 596 +++++++
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +-
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 221 ++-
+ arch/arm/boot/dts/imx6q-h100.dts | 4 +-
+ arch/arm/boot/dts/imx6q-icore-rqs.dts | 24 -
+ arch/arm/boot/dts/imx6q-mccmon6.dts | 2 +-
+ arch/arm/boot/dts/imx6q-novena.dts | 6 +-
+ arch/arm/boot/dts/imx6q-pistachio.dts | 693 ++++++++
+ arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +-
+ arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 74 +-
+ arch/arm/boot/dts/imx6q-tx6q-1010.dts | 163 +-
+ arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 74 +-
+ arch/arm/boot/dts/imx6q-tx6q-1020.dts | 162 +-
+ arch/arm/boot/dts/imx6q-tx6q-1036-mb7.dts | 48 +
+ arch/arm/boot/dts/imx6q-tx6q-1036.dts | 170 +-
+ arch/arm/boot/dts/imx6q-tx6q-10x0-mb7.dts | 48 +
+ arch/arm/boot/dts/imx6q-tx6q-1110.dts | 134 +-
+ arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts | 222 +--
+ arch/arm/boot/dts/imx6q-utilite-pro.dts | 8 +
+ arch/arm/boot/dts/imx6q-wandboard-revd1.dts | 26 +
+ arch/arm/boot/dts/imx6q.dtsi | 16 +-
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 300 ++--
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 374 ++--
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 360 ++--
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 390 +++--
+ arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 182 +-
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 174 +-
+ arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 94 +-
+ arch/arm/boot/dts/imx6qdl-icore.dtsi | 97 ++
+ arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 6 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 6 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 6 +-
+ arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 14 +-
+ arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi | 252 +++
+ arch/arm/boot/dts/imx6qdl-tx6-lvds.dtsi | 286 +++
+ arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi | 99 ++
+ arch/arm/boot/dts/imx6qdl-tx6.dtsi | 106 +-
+ arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 196 +++
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 5 +-
+ arch/arm/boot/dts/imx6qdl.dtsi | 178 +-
+ arch/arm/boot/dts/imx6qp-tx6qp-8037-mb7.dts | 48 +
+ arch/arm/boot/dts/imx6qp-tx6qp-8037.dts | 86 +
+ arch/arm/boot/dts/imx6qp-tx6qp-8137-mb7.dts | 57 +
+ arch/arm/boot/dts/imx6qp-tx6qp-8137.dts | 90 +
+ arch/arm/boot/dts/imx6qp-wandboard-revd1.dts | 26 +
+ arch/arm/boot/dts/imx6qp.dtsi | 6 +-
+ arch/arm/boot/dts/imx6sl-evk.dts | 2 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 134 +-
+ arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +-
+ arch/arm/boot/dts/imx6sx-sdb-reva.dts | 2 +-
+ arch/arm/boot/dts/imx6sx-sdb.dts | 2 +-
+ arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 572 ++++++
+ arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 2 +-
+ arch/arm/boot/dts/imx6sx.dtsi | 199 ++-
+ arch/arm/boot/dts/imx6ul-14x14-evk.dts | 2 +
+ arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 6 +-
+ arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 2 +-
+ arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 4 +-
+ arch/arm/boot/dts/imx6ul.dtsi | 161 +-
+ arch/arm/boot/dts/imx7-colibri.dtsi | 2 +-
+ arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +-
+ arch/arm/boot/dts/imx7d-pico.dts | 43 +-
+ arch/arm/boot/dts/imx7d-sdb.dts | 2 +-
+ arch/arm/boot/dts/imx7s-warp.dts | 4 +-
+ arch/arm/boot/dts/integrator.dtsi | 10 +-
+ arch/arm/boot/dts/integratorap.dts | 25 +-
+ arch/arm/boot/dts/iwg20d-q7-common.dtsi | 152 ++
+ arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 43 +
+ arch/arm/boot/dts/keystone-k2e.dtsi | 6 +-
+ arch/arm/boot/dts/keystone-k2g-evm.dts | 93 +
+ arch/arm/boot/dts/keystone-k2g.dtsi | 242 ++-
+ arch/arm/boot/dts/keystone-k2hk.dtsi | 8 +-
+ arch/arm/boot/dts/keystone-k2l.dtsi | 12 +-
+ arch/arm/boot/dts/keystone.dtsi | 12 +-
+ arch/arm/boot/dts/kirkwood-synology.dtsi | 12 +-
+ arch/arm/boot/dts/kirkwood-ts219.dtsi | 12 +-
+ arch/arm/boot/dts/kirkwood.dtsi | 4 +-
+ arch/arm/boot/dts/lpc3250-ea3250.dts | 8 +-
+ arch/arm/boot/dts/lpc3250-phy3250.dts | 10 +-
+ arch/arm/boot/dts/lpc32xx.dtsi | 2 +-
+ arch/arm/boot/dts/meson.dtsi | 47 +-
+ arch/arm/boot/dts/meson6.dtsi | 3 +
+ arch/arm/boot/dts/meson8.dtsi | 40 +-
+ arch/arm/boot/dts/meson8b-odroidc1.dts | 23 +
+ arch/arm/boot/dts/meson8b.dtsi | 59 +-
+ arch/arm/boot/dts/mpa1600.dts | 2 +-
+ arch/arm/boot/dts/mt2701-evb.dts | 23 +
+ arch/arm/boot/dts/mt2701.dtsi | 13 +-
+ arch/arm/boot/dts/mt6589.dtsi | 2 +-
+ arch/arm/boot/dts/mt7623.dtsi | 30 +-
+ arch/arm/boot/dts/nspire.dtsi | 2 +-
+ arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 +
+ arch/arm/boot/dts/omap3-evm-37xx.dts | 209 +--
+ arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 216 +++
+ arch/arm/boot/dts/omap3-evm.dts | 76 +-
+ arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-n900.dts | 2 +-
+ .../boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 1 +
+ arch/arm/boot/dts/omap3.dtsi | 1 +
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 4 +
+ arch/arm/boot/dts/omap4.dtsi | 256 ++-
+ arch/arm/boot/dts/omap5-board-common.dtsi | 4 +
+ arch/arm/boot/dts/omap5.dtsi | 3 +-
+ arch/arm/boot/dts/owl-s500-cubieboard6.dts | 44 +
+ arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 7 +
+ arch/arm/boot/dts/owl-s500.dtsi | 3 +
+ arch/arm/boot/dts/ox810se.dtsi | 4 +-
+ arch/arm/boot/dts/ox820.dtsi | 2 +-
+ arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 2 +-
+ arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 2 +-
+ arch/arm/boot/dts/pm9g45.dts | 4 +-
+ arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 12 +-
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 5 +-
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 89 +-
+ arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 321 ++++
+ .../boot/dts/qcom-msm8974-sony-xperia-castor.dts | 641 +++++++
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 30 +-
+ arch/arm/boot/dts/qcom-msm8974pro.dtsi | 18 +
+ arch/arm/boot/dts/r7s72100-gr-peach.dts | 73 +-
+ arch/arm/boot/dts/r7s72100.dtsi | 1 +
+ arch/arm/boot/dts/r8a73a4.dtsi | 1 +
+ arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dts | 19 +
+ arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 42 +-
+ arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 43 +
+ arch/arm/boot/dts/r8a7743.dtsi | 339 +++-
+ arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 109 ++
+ arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 111 ++
+ arch/arm/boot/dts/r8a7745.dtsi | 429 +++++
+ arch/arm/boot/dts/r8a7778.dtsi | 11 +-
+ arch/arm/boot/dts/r8a7779.dtsi | 18 +-
+ arch/arm/boot/dts/r8a7790-lager.dts | 7 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 783 +++------
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +-
+ arch/arm/boot/dts/r8a7791-porter.dts | 4 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 777 +++------
+ arch/arm/boot/dts/r8a7792-blanche.dts | 3 +-
+ arch/arm/boot/dts/r8a7792-wheat.dts | 3 +-
+ arch/arm/boot/dts/r8a7792.dtsi | 409 ++---
+ arch/arm/boot/dts/r8a7793-gose.dts | 4 +-
+ arch/arm/boot/dts/r8a7793.dtsi | 643 +++----
+ arch/arm/boot/dts/r8a7794-alt.dts | 7 +-
+ arch/arm/boot/dts/r8a7794-silk.dts | 3 +-
+ arch/arm/boot/dts/r8a7794.dtsi | 715 +++-----
+ arch/arm/boot/dts/rk3036-kylin.dts | 5 +
+ arch/arm/boot/dts/rk3036.dtsi | 19 +
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +-
+ arch/arm/boot/dts/rk3066a.dtsi | 24 +
+ arch/arm/boot/dts/rk3188-radxarock.dts | 4 +
+ arch/arm/boot/dts/rk3188.dtsi | 24 +
+ arch/arm/boot/dts/rk322x.dtsi | 21 +
+ arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +
+ arch/arm/boot/dts/rk3288-firefly-reload.dts | 11 +
+ arch/arm/boot/dts/rk3288-popmetal.dts | 2 +-
+ arch/arm/boot/dts/rk3288-vyasa.dts | 498 ++++++
+ arch/arm/boot/dts/rk3288.dtsi | 75 +-
+ arch/arm/boot/dts/rk3xxx.dtsi | 11 +
+ arch/arm/boot/dts/rv1108-evb.dts | 4 +
+ arch/arm/boot/dts/rv1108.dtsi | 67 +
+ arch/arm/boot/dts/sama5d2.dtsi | 12 +-
+ arch/arm/boot/dts/sama5d3.dtsi | 8 +-
+ arch/arm/boot/dts/sama5d3xmb.dtsi | 6 +-
+ arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 2 +-
+ arch/arm/boot/dts/sama5d4.dtsi | 10 +-
+ arch/arm/boot/dts/sh73a0.dtsi | 2 +
+ arch/arm/boot/dts/ste-href-stuib.dtsi | 2 +-
+ arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 2 +-
+ arch/arm/boot/dts/stih407-clock.dtsi | 6 +-
+ arch/arm/boot/dts/stih407-family.dtsi | 18 +-
+ arch/arm/boot/dts/stih407-pinctrl.dtsi | 52 +-
+ arch/arm/boot/dts/stih410-b2120.dts | 2 +-
+ arch/arm/boot/dts/stih410-b2260.dts | 4 +-
+ arch/arm/boot/dts/stih410-clock.dtsi | 6 +-
+ arch/arm/boot/dts/stih410.dtsi | 2 +-
+ arch/arm/boot/dts/stih418-b2199.dts | 4 +-
+ arch/arm/boot/dts/stih418-clock.dtsi | 6 +-
+ arch/arm/boot/dts/stih418.dtsi | 2 +-
+ arch/arm/boot/dts/stihxxx-b2120.dtsi | 6 +-
+ arch/arm/boot/dts/stm32746g-eval.dts | 24 +
+ arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 176 +-
+ arch/arm/boot/dts/stm32f746-disco.dts | 30 +
+ arch/arm/boot/dts/stm32f746.dtsi | 363 +++-
+ arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 32 +-
+ arch/arm/boot/dts/stm32h743.dtsi | 177 +-
+ arch/arm/boot/dts/stm32h743i-eval.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-a1000.dts | 28 +-
+ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 16 +-
+ arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 20 +-
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 45 +-
+ arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 50 +-
+ arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 23 +-
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 24 +-
+ arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 10 +-
+ arch/arm/boot/dts/sun4i-a10-inet1.dts | 36 +-
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 24 +-
+ arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 68 +-
+ .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 21 +-
+ arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 26 +-
+ arch/arm/boot/dts/sun4i-a10-marsboard.dts | 25 +-
+ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 10 +-
+ arch/arm/boot/dts/sun4i-a10-mk802.dts | 24 +-
+ arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 6 +-
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 47 +-
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 32 +-
+ arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 9 -
+ arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 43 +-
+ arch/arm/boot/dts/sun4i-a10.dtsi | 1166 ++++++-------
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 6 +-
+ arch/arm/boot/dts/sun5i-a13.dtsi | 4 +-
+ arch/arm/boot/dts/sun5i-gr8.dtsi | 8 +-
+ .../boot/dts/sun5i-reference-design-tablet.dtsi | 8 +
+ arch/arm/boot/dts/sun5i.dtsi | 86 +-
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 21 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 209 ++-
+ arch/arm/boot/dts/sun6i-a31s-primo81.dts | 25 +
+ arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 25 +
+ arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 25 +
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 25 +
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 25 +
+ arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 33 +
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 25 +
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 25 +
+ .../boot/dts/sun7i-a20-olinuxino-micro-emmc.dts | 70 +
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 44 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi | 1147 +++++-------
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 62 +-
+ arch/arm/boot/dts/sun8i-a23.dtsi | 4 +-
+ arch/arm/boot/dts/sun8i-a33.dtsi | 18 +-
+ .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 147 +-
+ arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 169 +-
+ arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 187 +-
+ arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 349 ++++
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 41 +-
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 9 +
+ arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 39 +-
+ arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 71 +
+ arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 6 +
+ arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 +
+ arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 8 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 16 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 6 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 14 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 +
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 14 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 24 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 16 +
+ arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 209 +++
+ arch/arm/boot/dts/sun8i-r40.dtsi | 473 +++++
+ arch/arm/boot/dts/sun8i-v3s.dtsi | 32 +-
+ arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 173 ++
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 30 +-
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 50 +-
+ arch/arm/boot/dts/sun9i-a80.dtsi | 117 +-
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 164 +-
+ arch/arm/boot/dts/sunxi-itead-core-common.dtsi | 4 -
+ arch/arm/boot/dts/tango4-common.dtsi | 2 +-
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 +
+ arch/arm/boot/dts/tegra124.dtsi | 12 +-
+ arch/arm/boot/dts/uniphier-ld4-ref.dts | 10 +-
+ arch/arm/boot/dts/uniphier-ld4.dtsi | 25 +-
+ arch/arm/boot/dts/uniphier-ld6b-ref.dts | 10 +-
+ arch/arm/boot/dts/uniphier-pinctrl.dtsi | 46 +-
+ arch/arm/boot/dts/uniphier-pro4-ref.dts | 10 +-
+ arch/arm/boot/dts/uniphier-pro4.dtsi | 27 +-
+ arch/arm/boot/dts/uniphier-pro5.dtsi | 29 +-
+ arch/arm/boot/dts/uniphier-pxs2.dtsi | 80 +-
+ arch/arm/boot/dts/uniphier-sld8-ref.dts | 10 +-
+ arch/arm/boot/dts/uniphier-sld8.dtsi | 29 +-
+ arch/arm/boot/dts/uniphier-support-card.dtsi | 3 +-
+ arch/arm/boot/dts/usb_a9263.dts | 2 +-
+ arch/arm/boot/dts/usb_a9g20_common.dtsi | 4 +-
+ arch/arm/boot/dts/vf610-twr.dts | 2 +-
+ arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +-
+ arch/arm/boot/dts/zx296702.dtsi | 4 +-
+ arch/arm/boot/dts/zynq-zc702.dts | 2 +-
+ arch/arm/boot/dts/zynq-zc706.dts | 2 +-
+ arch/arm/configs/davinci_all_defconfig | 4 +-
+ arch/arm/configs/exynos_defconfig | 2 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 2 +
+ arch/arm/configs/keystone_defconfig | 2 +
+ arch/arm/configs/lpc32xx_defconfig | 2 +-
+ arch/arm/configs/multi_v7_defconfig | 7 +
+ arch/arm/configs/qcom_defconfig | 42 +-
+ arch/arm/configs/stm32_defconfig | 11 +-
+ arch/arm/include/asm/smp_scu.h | 12 +
+ arch/arm/include/debug/brcmstb.S | 3 +
+ arch/arm/include/uapi/asm/ptrace.h | 1 +
+ arch/arm/kernel/smp_scu.c | 43 +-
+ arch/arm/mach-actions/Makefile | 4 +-
+ arch/arm/mach-actions/headsmp.S | 52 -
+ arch/arm/mach-actions/platsmp.c | 2 +-
+ arch/arm/mach-bcm/Kconfig | 9 +
+ arch/arm/mach-bcm/Makefile | 8 +
+ arch/arm/mach-bcm/bcm_hr2.c | 25 +
+ arch/arm/mach-bcm/board_bcm2835.c | 11 +-
+ arch/arm/mach-bcm/platsmp.c | 38 +
+ arch/arm/mach-bcm/platsmp.h | 10 +
+ arch/arm/mach-davinci/da8xx-dt.c | 1 +
+ arch/arm/mach-ep93xx/simone.c | 54 +-
+ arch/arm/mach-ep93xx/ts72xx.c | 46 +-
+ arch/arm/mach-ep93xx/ts72xx.h | 3 -
+ arch/arm/mach-exynos/Kconfig | 5 -
+ arch/arm/mach-exynos/common.h | 11 +-
+ arch/arm/mach-exynos/exynos.c | 2 -
+ arch/arm/mach-exynos/firmware.c | 5 -
+ arch/arm/mach-exynos/pm.c | 3 +-
+ arch/arm/mach-exynos/suspend.c | 4 -
+ arch/arm/mach-imx/3ds_debugboard.c | 2 +-
+ arch/arm/mach-imx/cpuidle-imx5.c | 1 +
+ arch/arm/mach-imx/mach-imx6q.c | 9 +-
+ arch/arm/mach-imx/mach-mx31lite.c | 2 +-
+ arch/arm/mach-imx/mx31moboard-devboard.c | 1 +
+ arch/arm/mach-imx/mx31moboard-marxbot.c | 1 +
+ arch/arm/mach-integrator/Makefile | 2 -
+ arch/arm/mach-integrator/integrator_ap.c | 2 -
+ arch/arm/mach-integrator/pci_v3.c | 900 ----------
+ arch/arm/mach-integrator/pci_v3.h | 10 -
+ arch/arm/mach-mediatek/platsmp.c | 2 +
+ arch/arm/mach-meson/Kconfig | 2 +
+ arch/arm/mach-meson/Makefile | 1 +
+ arch/arm/mach-meson/platsmp.c | 440 +++++
+ arch/arm/mach-mxs/pm.c | 2 +-
+ arch/arm/mach-omap1/board-ams-delta.c | 2 +-
+ arch/arm/mach-omap1/board-fsample.c | 2 +-
+ arch/arm/mach-omap1/board-h2.c | 2 +-
+ arch/arm/mach-omap1/board-h3.c | 2 +-
+ arch/arm/mach-omap1/board-htcherald.c | 2 +-
+ arch/arm/mach-omap1/board-innovator.c | 4 +-
+ arch/arm/mach-omap1/board-nokia770.c | 2 +-
+ arch/arm/mach-omap1/board-osk.c | 2 +-
+ arch/arm/mach-omap1/board-palmte.c | 2 +-
+ arch/arm/mach-omap1/board-palmtt.c | 2 +-
+ arch/arm/mach-omap1/board-palmz71.c | 2 +-
+ arch/arm/mach-omap1/board-perseus2.c | 2 +-
+ arch/arm/mach-omap1/board-sx1.c | 2 +-
+ arch/arm/mach-omap2/Kconfig | 1 +
+ arch/arm/mach-omap2/Makefile | 3 -
+ arch/arm/mach-omap2/common.h | 1 -
+ arch/arm/mach-omap2/dma.c | 2 +-
+ arch/arm/mach-omap2/hdq1w.c | 22 -
+ arch/arm/mach-omap2/id.c | 5 +-
+ arch/arm/mach-omap2/omap4-common.c | 24 -
+ arch/arm/mach-omap2/omap_device.c | 294 ++--
+ arch/arm/mach-omap2/omap_device.h | 4 -
+ arch/arm/mach-omap2/omap_hwmod.c | 569 ++----
+ arch/arm/mach-omap2/omap_hwmod.h | 88 +-
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 -
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 -
+ .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 27 -
+ .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 15 -
+ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 6 -
+ .../omap_hwmod_33xx_43xx_interconnect_data.c | 130 --
+ .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 6 +-
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 39 -
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 61 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 548 ------
+ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 20 -
+ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 57 -
+ arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 44 -
+ arch/arm/mach-omap2/omap_hwmod_common_data.h | 41 -
+ arch/arm/mach-omap2/prcm-common.h | 1 -
+ arch/arm/mach-omap2/prm.h | 2 -
+ arch/arm/mach-omap2/prm3xxx.c | 14 +-
+ arch/arm/mach-omap2/prm44xx.c | 21 +-
+ arch/arm/mach-omap2/prm_common.c | 12 +-
+ arch/arm/mach-omap2/soc.h | 2 +-
+ arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 8 +-
+ arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 8 +-
+ arch/arm/mach-s3c64xx/dev-backlight.c | 10 +-
+ arch/arm/mach-shmobile/Makefile | 1 +
+ arch/arm/mach-shmobile/common.h | 2 +
+ arch/arm/mach-shmobile/headsmp-apmu.S | 39 +
+ arch/arm/mach-shmobile/platsmp-apmu.c | 2 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 20 +-
+ arch/arm/mach-sunxi/sunxi.c | 1 +
+ arch/arm/mach-vexpress/spc.c | 8 +-
+ arch/arm/plat-omap/dma.c | 12 +-
+ arch/arm/plat-omap/dmtimer.c | 10 +-
+ arch/arm/plat-samsung/adc.c | 12 +-
+ arch/arm/plat-samsung/devs.c | 33 +-
+ arch/arm/plat-samsung/platformdata.c | 4 +-
+ arch/arm64/Kconfig.platforms | 12 +-
+ arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 7 +
+ arch/arm64/boot/dts/allwinner/Makefile | 1 +
+ .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 16 +
+ .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 15 +
+ .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 17 +
+ .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 16 +
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 97 +-
+ .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 193 +++
+ .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 17 +
+ .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 17 +
+ .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 17 +
+ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 38 +-
+ .../boot/dts/altera/socfpga_stratix10_socdk.dts | 62 +-
+ arch/arm64/boot/dts/amlogic/Makefile | 3 +
+ arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 22 +
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 204 +++
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 22 +-
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 14 +-
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 31 +-
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 15 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 2 +
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +-
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 18 +-
+ .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 2 +
+ .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 2 +-
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 8 +-
+ .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 27 +-
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 +-
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 26 +-
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 400 +++++
+ .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 2 +
+ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts | 38 +
+ arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 6 +-
+ arch/arm64/boot/dts/apm/apm-storm.dtsi | 4 +-
+ arch/arm64/boot/dts/arm/Makefile | 4 +-
+ arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi | 19 +
+ .../boot/dts/arm/foundation-v8-gicv3-psci.dts | 9 +
+ arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts | 25 +-
+ arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi | 28 +
+ arch/arm64/boot/dts/arm/foundation-v8-psci.dts | 9 +
+ arch/arm64/boot/dts/arm/foundation-v8-psci.dtsi | 28 +
+ .../boot/dts/arm/foundation-v8-spin-table.dtsi | 25 +
+ arch/arm64/boot/dts/arm/foundation-v8.dts | 16 +-
+ arch/arm64/boot/dts/arm/foundation-v8.dtsi | 30 +-
+ arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 2 +-
+ arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 24 +-
+ .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 2 +-
+ .../arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 2 +-
+ arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 +-
+ .../boot/dts/broadcom/stingray/stingray-clock.dtsi | 12 +-
+ .../boot/dts/broadcom/stingray/stingray-fs4.dtsi | 4 +-
+ .../dts/broadcom/stingray/stingray-pinctrl.dtsi | 4 +-
+ .../boot/dts/broadcom/stingray/stingray-sata.dtsi | 32 +-
+ .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 66 +-
+ arch/arm64/boot/dts/cavium/thunder-88xx.dts | 2 +-
+ arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 32 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 33 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 20 +
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 11 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 11 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 88 +
+ arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 4 +
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 7 +
+ arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 319 ++++
+ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 7 +
+ .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 20 +-
+ .../arm64/boot/dts/hisilicon/hi6220-coresight.dtsi | 381 ++++
+ arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 +
+ arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 2 +-
+ arch/arm64/boot/dts/hisilicon/hip06-d03.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 20 +-
+ .../boot/dts/marvell/armada-3720-espressobin.dts | 12 +
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 22 +-
+ arch/arm64/boot/dts/marvell/armada-7040-db.dts | 57 +-
+ arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 14 +
+ arch/arm64/boot/dts/marvell/armada-8040-db.dts | 59 +-
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 13 +-
+ arch/arm64/boot/dts/marvell/armada-8080-db.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 4 +-
+ arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 4 +-
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 11 +
+ .../dts/marvell/armada-ap810-ap0-octa-core.dtsi | 4 +-
+ .../boot/dts/marvell/armada-cp110-master.dtsi | 59 +-
+ .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 58 +-
+ arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 6 +-
+ arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 25 +
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 24 +
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 214 +++
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 177 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 32 +-
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 13 +-
+ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 195 +++
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 191 +-
+ arch/arm64/boot/dts/realtek/Makefile | 2 +
+ arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts | 31 +
+ .../arm64/boot/dts/realtek/rtd1295-probox2-ava.dts | 31 +
+ arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 6 -
+ arch/arm64/boot/dts/realtek/rtd1295.dtsi | 62 +-
+ arch/arm64/boot/dts/realtek/rtd129x.dtsi | 72 +
+ arch/arm64/boot/dts/renesas/Makefile | 4 +
+ .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts | 19 +
+ arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts | 19 +
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 31 +-
+ arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts | 19 +
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 53 +-
+ arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 57 +
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 382 ++++
+ arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 78 +
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 267 ++-
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 16 +-
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 169 ++
+ arch/arm64/boot/dts/renesas/ulcb.dtsi | 9 +-
+ arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 72 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 16 +
+ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 27 +
+ arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 4 +
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 3 +-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 19 +-
+ .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 11 +-
+ arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 65 +-
+ .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 11 +-
+ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 105 +-
+ .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 4 +
+ arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 58 +-
+ arch/arm64/configs/defconfig | 17 +
+ drivers/bus/Kconfig | 15 +
+ drivers/bus/Makefile | 2 +
+ drivers/bus/ti-sysc.c | 583 +++++++
+ drivers/bus/ts-nbus.c | 375 ++++
+ drivers/clk/bcm/Kconfig | 9 +
+ drivers/clk/bcm/Makefile | 1 +
+ drivers/clk/bcm/clk-bcm2835-aux.c | 1 -
+ drivers/clk/bcm/clk-bcm2835.c | 30 -
+ drivers/clk/bcm/clk-hr2.c | 27 +
+ drivers/firmware/Kconfig | 11 +
+ drivers/firmware/arm_scpi.c | 216 +--
+ drivers/firmware/psci_checker.c | 1 +
+ drivers/firmware/qcom_scm-32.c | 24 +
+ drivers/firmware/qcom_scm-64.c | 44 +
+ drivers/firmware/qcom_scm.c | 87 +
+ drivers/firmware/qcom_scm.h | 8 +
+ drivers/firmware/tegra/Makefile | 4 +-
+ drivers/firmware/tegra/bpmp-debugfs.c | 444 +++++
+ drivers/firmware/tegra/bpmp.c | 31 +-
+ drivers/firmware/ti_sci.c | 2 +-
+ drivers/irqchip/irq-bcm2836.c | 79 +-
+ drivers/memory/Makefile | 1 +
+ drivers/memory/brcmstb_dpfe.c | 722 ++++++++
+ drivers/memory/omap-gpmc.c | 54 +-
+ drivers/of/of_reserved_mem.c | 26 +
+ drivers/of/platform.c | 19 +-
+ drivers/reset/Kconfig | 24 +-
+ drivers/reset/Makefile | 4 +-
+ drivers/reset/reset-meson.c | 65 +-
+ drivers/reset/reset-simple.c | 186 ++
+ drivers/reset/reset-simple.h | 45 +
+ drivers/reset/reset-socfpga.c | 157 --
+ drivers/reset/reset-stm32.c | 108 --
+ drivers/reset/reset-sunxi.c | 104 +-
+ drivers/reset/reset-uniphier.c | 30 +
+ drivers/reset/reset-zx2967.c | 99 --
+ drivers/soc/Makefile | 2 +-
+ drivers/soc/amlogic/Kconfig | 21 +
+ drivers/soc/amlogic/Makefile | 2 +
+ drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 234 +++
+ drivers/soc/amlogic/meson-mx-socinfo.c | 175 ++
+ drivers/soc/atmel/soc.c | 8 +
+ drivers/soc/atmel/soc.h | 4 +
+ drivers/soc/bcm/Kconfig | 2 +
+ drivers/soc/bcm/brcmstb/Kconfig | 10 +
+ drivers/soc/bcm/brcmstb/Makefile | 1 +
+ drivers/soc/bcm/brcmstb/pm/Makefile | 3 +
+ drivers/soc/bcm/brcmstb/pm/aon_defs.h | 113 ++
+ drivers/soc/bcm/brcmstb/pm/pm-arm.c | 822 +++++++++
+ drivers/soc/bcm/brcmstb/pm/pm-mips.c | 461 +++++
+ drivers/soc/bcm/brcmstb/pm/pm.h | 89 +
+ drivers/soc/bcm/brcmstb/pm/s2-arm.S | 76 +
+ drivers/soc/bcm/brcmstb/pm/s2-mips.S | 200 +++
+ drivers/soc/bcm/brcmstb/pm/s3-mips.S | 146 ++
+ drivers/soc/fsl/guts.c | 1 +
+ drivers/soc/fsl/qbman/Kconfig | 2 +-
+ drivers/soc/fsl/qbman/Makefile | 2 +-
+ drivers/soc/fsl/qbman/bman.c | 42 +-
+ drivers/soc/fsl/qbman/bman_ccsr.c | 15 +
+ drivers/soc/fsl/qbman/bman_portal.c | 23 +-
+ drivers/soc/fsl/qbman/bman_priv.h | 8 +-
+ drivers/soc/fsl/qbman/dpaa_sys.c | 78 +
+ drivers/soc/fsl/qbman/dpaa_sys.h | 25 +-
+ drivers/soc/fsl/qbman/qman.c | 83 +-
+ drivers/soc/fsl/qbman/qman_ccsr.c | 95 +-
+ drivers/soc/fsl/qbman/qman_portal.c | 23 +-
+ drivers/soc/fsl/qbman/qman_priv.h | 11 +-
+ drivers/soc/fsl/qbman/qman_test.h | 2 -
+ drivers/soc/mediatek/Kconfig | 8 +-
+ drivers/soc/mediatek/mtk-pmic-wrap.c | 511 +++++-
+ drivers/soc/qcom/Kconfig | 11 +
+ drivers/soc/qcom/Makefile | 1 +
+ drivers/soc/qcom/rmtfs_mem.c | 269 +++
+ drivers/soc/qcom/smem.c | 335 +++-
+ drivers/soc/renesas/Kconfig | 8 +-
+ drivers/soc/renesas/Makefile | 1 +
+ drivers/soc/renesas/r8a77970-sysc.c | 39 +
+ drivers/soc/renesas/rcar-rst.c | 1 +
+ drivers/soc/renesas/rcar-sysc.c | 3 +
+ drivers/soc/renesas/rcar-sysc.h | 1 +
+ drivers/soc/renesas/renesas-soc.c | 8 +
+ drivers/soc/samsung/exynos-pmu.c | 9 -
+ drivers/soc/samsung/exynos-pmu.h | 2 -
+ drivers/soc/samsung/exynos4-pmu.c | 13 +-
+ drivers/soc/tegra/powergate-bpmp.c | 15 +-
+ drivers/thermal/Makefile | 2 +-
+ drivers/thermal/tegra/Kconfig | 7 +
+ drivers/thermal/tegra/Makefile | 3 +-
+ drivers/thermal/tegra/tegra-bpmp-thermal.c | 263 +++
+ include/dt-bindings/clock/r7s72100-clock.h | 2 +
+ include/dt-bindings/clock/rk3188-cru-common.h | 9 +-
+ include/dt-bindings/clock/rk3368-cru.h | 1 +
+ include/dt-bindings/clock/tegra210-car.h | 1 +
+ include/dt-bindings/pinctrl/am43xx.h | 12 +
+ include/dt-bindings/pinctrl/stm32-pinfunc.h | 30 +
+ include/dt-bindings/pinctrl/stm32f429-pinfunc.h | 1240 -------------
+ include/dt-bindings/pinctrl/stm32f746-pinfunc.h | 1325 --------------
+ include/dt-bindings/pinctrl/stm32h7-pinfunc.h | 1613 -----------------
+ include/dt-bindings/power/r8a77970-sysc.h | 32 +
+ include/dt-bindings/reset/mt7622-reset.h | 94 +
+ .../dt-bindings/thermal/tegra186-bpmp-thermal.h | 14 +
+ include/linux/clk/bcm2835.h | 24 -
+ include/linux/irqchip/irq-bcm2836.h | 70 +
+ include/linux/of_reserved_mem.h | 5 +
+ include/linux/omap-gpmc.h | 12 -
+ include/linux/platform_data/mtd-nand-omap2.h | 2 -
+ include/linux/qcom_scm.h | 4 +
+ include/linux/ts-nbus.h | 18 +
+ include/soc/tegra/bpmp.h | 59 +-
+ 840 files changed, 37360 insertions(+), 20023 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/amlogic/analog-top.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/amlogic/assist.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/amlogic/bootrom.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/amlogic/pmu.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/amlogic/smp-sram.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt
+ create mode 100644 Documentation/devicetree/bindings/bus/ti-sysc.txt
+ create mode 100644 Documentation/devicetree/bindings/bus/ts-nbus.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
+ create mode 100644 Documentation/devicetree/bindings/misc/ge-achc.txt
+ create mode 100644 Documentation/devicetree/bindings/net/dwmac-sun8i.txt
+ create mode 100644 Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt
+ create mode 100644 Documentation/devicetree/bindings/power/ti-smartreflex.txt
+ create mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,rmtfs-mem.txt
+ create mode 100644 Documentation/devicetree/bindings/thermal/nvidia,tegra186-bpmp-thermal.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/axp81x.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm-hr2.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
+ create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
+ create mode 100644 arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+ create mode 100644 arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+ create mode 100644 arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dts
+ create mode 100644 arch/arm/boot/dts/exynos5422-odroid-core.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5422-odroidhc1.dts
+ create mode 100644 arch/arm/boot/dts/imx51-zii-rdu1.dts
+ create mode 100644 arch/arm/boot/dts/imx53-ppd.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-tx6s-8034-mb7.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-tx6s-8035-mb7.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-8033-mb7.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-80xx-mb7.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-wandboard-revd1.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-display5-tianma-tm070-1280x768.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-display5.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6q-pistachio.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1036-mb7.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-tx6q-10x0-mb7.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-wandboard-revd1.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-tx6-lvds.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qp-tx6qp-8037-mb7.dts
+ create mode 100644 arch/arm/boot/dts/imx6qp-tx6qp-8037.dts
+ create mode 100644 arch/arm/boot/dts/imx6qp-tx6qp-8137-mb7.dts
+ create mode 100644 arch/arm/boot/dts/imx6qp-tx6qp-8137.dts
+ create mode 100644 arch/arm/boot/dts/imx6qp-wandboard-revd1.dts
+ create mode 100644 arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
+ create mode 100644 arch/arm/boot/dts/iwg20d-q7-common.dtsi
+ create mode 100644 arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-evm-processor-common.dtsi
+ create mode 100644 arch/arm/boot/dts/owl-s500-cubieboard6.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974pro.dtsi
+ create mode 100644 arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dts
+ create mode 100644 arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
+ create mode 100644 arch/arm/boot/dts/r8a7745-iwg22m.dtsi
+ create mode 100644 arch/arm/boot/dts/rk3288-vyasa.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-r40.dtsi
+ create mode 100644 arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
+ delete mode 100644 arch/arm/mach-actions/headsmp.S
+ create mode 100644 arch/arm/mach-bcm/bcm_hr2.c
+ create mode 100644 arch/arm/mach-bcm/platsmp.h
+ delete mode 100644 arch/arm/mach-integrator/pci_v3.c
+ delete mode 100644 arch/arm/mach-integrator/pci_v3.h
+ create mode 100644 arch/arm/mach-meson/platsmp.c
+ delete mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
+ create mode 100644 arch/arm/mach-shmobile/headsmp-apmu.S
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts
+ create mode 100644 arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi
+ create mode 100644 arch/arm64/boot/dts/arm/foundation-v8-gicv3-psci.dts
+ create mode 100644 arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi
+ create mode 100644 arch/arm64/boot/dts/arm/foundation-v8-psci.dts
+ create mode 100644 arch/arm64/boot/dts/arm/foundation-v8-psci.dtsi
+ create mode 100644 arch/arm64/boot/dts/arm/foundation-v8-spin-table.dtsi
+ create mode 100644 arch/arm64/boot/dts/hisilicon/hi6220-coresight.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd129x.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a77970.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+ create mode 100644 drivers/bus/ti-sysc.c
+ create mode 100644 drivers/bus/ts-nbus.c
+ create mode 100644 drivers/clk/bcm/clk-hr2.c
+ create mode 100644 drivers/firmware/tegra/bpmp-debugfs.c
+ create mode 100644 drivers/memory/brcmstb_dpfe.c
+ create mode 100644 drivers/reset/reset-simple.c
+ create mode 100644 drivers/reset/reset-simple.h
+ delete mode 100644 drivers/reset/reset-socfpga.c
+ delete mode 100644 drivers/reset/reset-stm32.c
+ delete mode 100644 drivers/reset/reset-zx2967.c
+ create mode 100644 drivers/soc/amlogic/meson-gx-pwrc-vpu.c
+ create mode 100644 drivers/soc/amlogic/meson-mx-socinfo.c
+ create mode 100644 drivers/soc/bcm/brcmstb/Kconfig
+ create mode 100644 drivers/soc/bcm/brcmstb/pm/Makefile
+ create mode 100644 drivers/soc/bcm/brcmstb/pm/aon_defs.h
+ create mode 100644 drivers/soc/bcm/brcmstb/pm/pm-arm.c
+ create mode 100644 drivers/soc/bcm/brcmstb/pm/pm-mips.c
+ create mode 100644 drivers/soc/bcm/brcmstb/pm/pm.h
+ create mode 100644 drivers/soc/bcm/brcmstb/pm/s2-arm.S
+ create mode 100644 drivers/soc/bcm/brcmstb/pm/s2-mips.S
+ create mode 100644 drivers/soc/bcm/brcmstb/pm/s3-mips.S
+ create mode 100644 drivers/soc/fsl/qbman/dpaa_sys.c
+ create mode 100644 drivers/soc/qcom/rmtfs_mem.c
+ create mode 100644 drivers/soc/renesas/r8a77970-sysc.c
+ create mode 100644 drivers/thermal/tegra/tegra-bpmp-thermal.c
+ create mode 100644 include/dt-bindings/pinctrl/stm32-pinfunc.h
+ delete mode 100644 include/dt-bindings/pinctrl/stm32f429-pinfunc.h
+ delete mode 100644 include/dt-bindings/pinctrl/stm32f746-pinfunc.h
+ delete mode 100644 include/dt-bindings/pinctrl/stm32h7-pinfunc.h
+ create mode 100644 include/dt-bindings/power/r8a77970-sysc.h
+ create mode 100644 include/dt-bindings/reset/mt7622-reset.h
+ create mode 100644 include/dt-bindings/thermal/tegra186-bpmp-thermal.h
+ delete mode 100644 include/linux/clk/bcm2835.h
+ create mode 100644 include/linux/irqchip/irq-bcm2836.h
+ create mode 100644 include/linux/ts-nbus.h
+Merging actions/for-next (e707b3fe4814 Merge branch 'v4.15/dt64' into next)
+$ git merge actions/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+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 (5751276f6bbf Merge branch 'v4.15/drivers' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Merge made by the 'recursive' strategy.
+Merging aspeed/for-next (9c9ae757dc8b Merge branch 'dt-for-v4.15' into for-next)
+$ git merge aspeed/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging at91/at91-next (bee152d6af7d Merge branch 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
+$ git merge at91/at91-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging bcm2835/for-next (e83e7335d059 Merge branch anholt/bcm2835-defconfig-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 (ac5a1ba06d5c Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging keystone/next (8270bfa5860d Merge branch 'for_4.15/keystone-soc' into next)
+$ git merge keystone/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (c6c5ff72be36 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 (a95e738b4c72 Merge branch 'omap-for-v4.15/fixes' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/configs/omap2plus_defconfig | 11 +++++++++++
+ arch/arm/mach-omap2/cm_common.c | 6 +++++-
+ arch/arm/mach-omap2/omap_device.c | 6 ++----
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 1 +
+ arch/arm/mach-omap2/prcm-common.h | 1 +
+ 5 files changed, 20 insertions(+), 5 deletions(-)
+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 reset/reset/next (b9cbcd5f933c reset: remove reset_control_get(_optional))
+$ git merge reset/reset/next
+Auto-merging include/linux/reset.h
+Merge made by the 'recursive' strategy.
+ drivers/reset/core.c | 9 +++++----
+ include/linux/reset.h | 50 ++++++++++++++++----------------------------------
+ 2 files changed, 21 insertions(+), 38 deletions(-)
+Merging qcom/for-next (e7048ed58ed9 Merge tag 'qcom-drivers-for-4.15-2' into final-for-4.15)
+$ git merge qcom/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
+$ git merge realtek/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (7cec0c56730a Merge branch 'arm64-dt-for-v4.15' into next)
+$ git merge renesas/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging rockchip/for-next (308c3c77ccb3 Merge branch 'v4.15-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/rockchip/clk-cpu.c | 2 --
+ drivers/clk/rockchip/clk-rk3188.c | 12 ++++++------
+ drivers/clk/rockchip/clk-rk3368.c | 2 +-
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
+$ git merge rpi/for-rpi-next
+Already up-to-date.
+Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
+$ git merge samsung/for-next
+Already up-to-date.
+Merging samsung-krzk/for-next (767d6ca130af Merge branch 'next/dt' into for-next)
+$ git merge samsung-krzk/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging sunxi/sunxi/for-next (b5996699462f Merge branches 'sunxi/dt-for-4.15' and 'sunxi/dt64-for-4.15' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging drivers/clk/sunxi-ng/Makefile
+Merge made by the 'recursive' strategy.
+ drivers/clk/sunxi-ng/Makefile | 1 +
+ drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 28 ++++--
+ drivers/clk/sunxi-ng/ccu-sun4i-a10.h | 4 +-
+ drivers/clk/sunxi-ng/ccu-sun5i.c | 27 +++--
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 40 +++++---
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.h | 8 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 38 ++++---
+ drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 2 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 21 ++--
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 56 ++++++-----
+ drivers/clk/sunxi-ng/ccu_common.h | 1 +
+ drivers/clk/sunxi-ng/ccu_nm.c | 25 ++++-
+ drivers/clk/sunxi-ng/ccu_nm.h | 25 +++++
+ drivers/clk/sunxi-ng/ccu_reset.c | 14 +++
+ drivers/clk/sunxi-ng/ccu_sdm.c | 158 ++++++++++++++++++++++++++++++
+ drivers/clk/sunxi-ng/ccu_sdm.h | 80 +++++++++++++++
+ include/dt-bindings/clock/sun4i-a10-ccu.h | 2 +
+ include/dt-bindings/clock/sun6i-a31-ccu.h | 4 +
+ 18 files changed, 457 insertions(+), 77 deletions(-)
+ create mode 100644 drivers/clk/sunxi-ng/ccu_sdm.c
+ create mode 100644 drivers/clk/sunxi-ng/ccu_sdm.h
+Merging tegra/for-next (ec0c973f47c7 Merge branch for-4.15/reset into for-next)
+$ git merge tegra/for-next
+Auto-merging drivers/clk/tegra/clk-id.h
+Merge made by the 'recursive' strategy.
+ drivers/clk/tegra/clk-bpmp.c | 15 ++++++---
+ drivers/clk/tegra/clk-dfll.c | 10 +++---
+ drivers/clk/tegra/clk-dfll.h | 2 +-
+ drivers/clk/tegra/clk-id.h | 1 +
+ drivers/clk/tegra/clk-periph.c | 8 +++++
+ drivers/clk/tegra/clk-tegra-periph.c | 24 ++------------
+ drivers/clk/tegra/clk-tegra-super-gen4.c | 2 +-
+ drivers/clk/tegra/clk-tegra114.c | 4 +--
+ drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 12 +++----
+ drivers/clk/tegra/clk-tegra20.c | 13 +++-----
+ drivers/clk/tegra/clk-tegra210.c | 51 ++++++++++++++++++++++++++++--
+ drivers/clk/tegra/clk-tegra30.c | 23 +++++++-------
+ drivers/clk/tegra/clk.h | 3 ++
+ drivers/reset/tegra/reset-bpmp.c | 9 +++++-
+ 14 files changed, 110 insertions(+), 67 deletions(-)
+Merging arm64/for-next/core (6cfa7cc46b1a arm64: Make ARMV8_DEPRECATED depend on SYSCTL)
+$ git merge arm64/for-next/core
+Already up-to-date.
+Merging clk/clk-next (36331641eb42 Merge branch 'clk-cleanup' into clk-next)
+$ git merge clk/clk-next
+Auto-merging include/linux/soc/qcom/smd-rpm.h
+Auto-merging include/dt-bindings/clock/gxbb-clkc.h
+Auto-merging drivers/clk/uniphier/clk-uniphier-sys.c
+Auto-merging drivers/clk/samsung/Makefile
+Auto-merging drivers/clk/renesas/clk-div6.h
+Auto-merging drivers/clk/renesas/Makefile
+Auto-merging drivers/clk/mediatek/Makefile
+Auto-merging drivers/clk/imx/clk-pllv2.c
+Auto-merging drivers/clk/imx/clk-pllv1.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/clock/clk-exynos-audss.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 2 +
+ .../bindings/arm/mediatek/mediatek,audsys.txt | 22 +
+ .../bindings/arm/mediatek/mediatek,bdpsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,ethsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,hifsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,infracfg.txt | 2 +
+ .../bindings/arm/mediatek/mediatek,jpgdecsys.txt | 22 +
+ .../bindings/arm/mediatek/mediatek,mcucfg.txt | 22 +
+ .../bindings/arm/mediatek/mediatek,mfgcfg.txt | 22 +
+ .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,pciesys.txt | 22 +
+ .../bindings/arm/mediatek/mediatek,pericfg.txt | 2 +
+ .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 22 +
+ .../bindings/arm/mediatek/mediatek,ssusbsys.txt | 22 +
+ .../bindings/arm/mediatek/mediatek,topckgen.txt | 2 +
+ .../bindings/arm/mediatek/mediatek,vdecsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,vencsys.txt | 1 +
+ .../devicetree/bindings/clock/clk-exynos-audss.txt | 6 +
+ .../devicetree/bindings/clock/exynos4-clock.txt | 43 +
+ .../devicetree/bindings/clock/exynos5433-clock.txt | 16 +
+ .../devicetree/bindings/clock/qcom,rpmcc.txt | 11 +
+ .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 5 +-
+ .../bindings/clock/renesas,rz-cpg-clocks.txt | 4 +-
+ Documentation/driver-model/devres.txt | 1 +
+ MAINTAINERS | 1 +
+ drivers/clk/at91/clk-utmi.c | 95 +-
+ drivers/clk/bcm/clk-kona-setup.c | 7 +-
+ drivers/clk/clk-cdce925.c | 2 +-
+ drivers/clk/clk-gpio.c | 84 +-
+ drivers/clk/clk-hsdk-pll.c | 4 +-
+ drivers/clk/clk-mux.c | 6 +-
+ drivers/clk/clk-stm32h7.c | 4 +-
+ drivers/clk/clk-twl6040.c | 2 +-
+ drivers/clk/clk-u300.c | 84 +-
+ drivers/clk/clk-wm831x.c | 6 +-
+ drivers/clk/clk-xgene.c | 20 +-
+ drivers/clk/clk.c | 178 ++-
+ drivers/clk/hisilicon/clk-hi3620.c | 2 +-
+ drivers/clk/hisilicon/clk-hi3660.c | 2 +-
+ drivers/clk/hisilicon/clk-hi6220.c | 2 +-
+ drivers/clk/hisilicon/clk-hix5hd2.c | 4 +-
+ drivers/clk/hisilicon/clkgate-separated.c | 6 +-
+ drivers/clk/hisilicon/crg-hi3798cv200.c | 12 +-
+ drivers/clk/imx/clk-busy.c | 4 +-
+ drivers/clk/imx/clk-gate2.c | 2 +-
+ drivers/clk/imx/clk-imx6q.c | 2 +-
+ drivers/clk/imx/clk-imx6ul.c | 2 +-
+ drivers/clk/imx/clk-imx7d.c | 11 +-
+ drivers/clk/imx/clk-pllv1.c | 2 +-
+ drivers/clk/imx/clk-pllv2.c | 2 +-
+ drivers/clk/mediatek/Kconfig | 80 ++
+ drivers/clk/mediatek/Makefile | 12 +
+ drivers/clk/mediatek/clk-mt2701.c | 2 +-
+ drivers/clk/mediatek/clk-mt2712-bdp.c | 102 ++
+ drivers/clk/mediatek/clk-mt2712-img.c | 80 ++
+ drivers/clk/mediatek/clk-mt2712-jpgdec.c | 76 ++
+ drivers/clk/mediatek/clk-mt2712-mfg.c | 75 +
+ drivers/clk/mediatek/clk-mt2712-mm.c | 170 +++
+ drivers/clk/mediatek/clk-mt2712-vdec.c | 94 ++
+ drivers/clk/mediatek/clk-mt2712-venc.c | 77 ++
+ drivers/clk/mediatek/clk-mt2712.c | 1435 ++++++++++++++++++++
+ drivers/clk/mediatek/clk-mt7622-aud.c | 195 +++
+ drivers/clk/mediatek/clk-mt7622-eth.c | 156 +++
+ drivers/clk/mediatek/clk-mt7622-hif.c | 169 +++
+ drivers/clk/mediatek/clk-mt7622.c | 780 +++++++++++
+ drivers/clk/mediatek/clk-mtk.h | 3 +
+ drivers/clk/mediatek/clk-pll.c | 18 +-
+ drivers/clk/meson/gxbb.c | 292 ++++
+ drivers/clk/meson/gxbb.h | 6 +-
+ drivers/clk/mmp/clk-apbc.c | 2 +-
+ drivers/clk/mmp/clk-apmu.c | 2 +-
+ drivers/clk/mmp/clk-frac.c | 6 +-
+ drivers/clk/mmp/clk-gate.c | 4 +-
+ drivers/clk/mmp/clk-mix.c | 27 +-
+ drivers/clk/mmp/clk-mmp2.c | 6 +-
+ drivers/clk/mmp/clk-pxa168.c | 6 +-
+ drivers/clk/mmp/clk-pxa910.c | 8 +-
+ drivers/clk/mxs/clk-div.c | 2 +-
+ drivers/clk/mxs/clk-frac.c | 2 +-
+ drivers/clk/pxa/clk-pxa.c | 4 +-
+ drivers/clk/qcom/clk-rcg.h | 3 -
+ drivers/clk/qcom/clk-rcg2.c | 79 --
+ drivers/clk/qcom/clk-rpm.c | 93 ++
+ drivers/clk/qcom/clk-smd-rpm.c | 82 ++
+ drivers/clk/qcom/common.c | 32 +-
+ drivers/clk/renesas/Kconfig | 5 +
+ drivers/clk/renesas/Makefile | 1 +
+ drivers/clk/renesas/clk-div6.c | 38 +-
+ drivers/clk/renesas/clk-div6.h | 3 +-
+ drivers/clk/renesas/clk-mstp.c | 5 +-
+ drivers/clk/renesas/clk-rcar-gen2.c | 1 -
+ drivers/clk/renesas/clk-rz.c | 2 +-
+ drivers/clk/renesas/r8a7745-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a7795-cpg-mssr.c | 3 +-
+ drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 +-
+ drivers/clk/renesas/r8a77970-cpg-mssr.c | 199 +++
+ drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 +-
+ drivers/clk/renesas/rcar-gen2-cpg.c | 7 +-
+ drivers/clk/renesas/rcar-gen2-cpg.h | 6 +-
+ drivers/clk/renesas/rcar-gen3-cpg.c | 79 +-
+ drivers/clk/renesas/rcar-gen3-cpg.h | 3 +-
+ drivers/clk/renesas/renesas-cpg-mssr.c | 105 +-
+ drivers/clk/renesas/renesas-cpg-mssr.h | 4 +-
+ drivers/clk/samsung/Makefile | 1 +
+ drivers/clk/samsung/clk-cpu.c | 2 -
+ drivers/clk/samsung/clk-exynos-audss.c | 76 +-
+ drivers/clk/samsung/clk-exynos-clkout.c | 2 -
+ drivers/clk/samsung/clk-exynos4.c | 111 +-
+ drivers/clk/samsung/clk-exynos4412-isp.c | 179 +++
+ drivers/clk/samsung/clk-exynos5250.c | 18 +-
+ drivers/clk/samsung/clk-exynos5420.c | 5 +-
+ drivers/clk/samsung/clk-exynos5433.c | 409 ++++--
+ drivers/clk/samsung/clk-exynos5440.c | 12 +-
+ drivers/clk/samsung/clk-pll.c | 11 +-
+ drivers/clk/samsung/clk-s3c2443.c | 16 +-
+ drivers/clk/samsung/clk.c | 45 +-
+ drivers/clk/samsung/clk.h | 80 +-
+ drivers/clk/sirf/clk-atlas6.c | 2 +-
+ drivers/clk/sirf/clk-atlas7.c | 18 +-
+ drivers/clk/sirf/clk-common.c | 92 +-
+ drivers/clk/sirf/clk-prima2.c | 2 +-
+ drivers/clk/spear/clk-aux-synth.c | 10 +-
+ drivers/clk/spear/clk-frac-synth.c | 6 +-
+ drivers/clk/spear/clk-gpt-synth.c | 6 +-
+ drivers/clk/spear/clk-vco-pll.c | 12 +-
+ drivers/clk/spear/clk.h | 4 +-
+ drivers/clk/spear/spear1310_clock.c | 2 +-
+ drivers/clk/spear/spear1340_clock.c | 2 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 4 +-
+ drivers/clk/sunxi/clk-factors.c | 2 -
+ drivers/clk/sunxi/clk-sun9i-mmc.c | 2 +-
+ drivers/clk/ti/clk-dra7-atl.c | 3 +-
+ drivers/clk/ti/divider.c | 4 +-
+ drivers/clk/ti/mux.c | 4 +-
+ drivers/clk/uniphier/clk-uniphier-mio.c | 7 +-
+ drivers/clk/uniphier/clk-uniphier-sys.c | 2 +-
+ drivers/clk/ux500/clk-prcc.c | 6 +-
+ drivers/clk/ux500/clk-prcmu.c | 6 +-
+ drivers/clk/ux500/clk-sysctrl.c | 6 +-
+ drivers/clk/versatile/clk-icst.c | 7 +-
+ include/dt-bindings/clock/exynos4.h | 35 +
+ include/dt-bindings/clock/gxbb-clkc.h | 11 +
+ include/dt-bindings/clock/imx7d-clock.h | 8 +-
+ include/dt-bindings/clock/mt2712-clk.h | 427 ++++++
+ include/dt-bindings/clock/mt7622-clk.h | 289 ++++
+ include/dt-bindings/clock/qcom,rpmcc.h | 17 +
+ include/dt-bindings/clock/r8a77970-cpg-mssr.h | 48 +
+ include/dt-bindings/clock/s3c2443.h | 2 +
+ include/linux/clk-provider.h | 25 +-
+ include/linux/soc/qcom/smd-rpm.h | 4 +
+ include/soc/at91/atmel-sfr.h | 2 +
+ 152 files changed, 6664 insertions(+), 827 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,jpgdecsys.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mcucfg.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mfgcfg.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,pciesys.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ssusbsys.txt
+ create mode 100644 drivers/clk/mediatek/clk-mt2712-bdp.c
+ create mode 100644 drivers/clk/mediatek/clk-mt2712-img.c
+ create mode 100644 drivers/clk/mediatek/clk-mt2712-jpgdec.c
+ create mode 100644 drivers/clk/mediatek/clk-mt2712-mfg.c
+ create mode 100644 drivers/clk/mediatek/clk-mt2712-mm.c
+ create mode 100644 drivers/clk/mediatek/clk-mt2712-vdec.c
+ create mode 100644 drivers/clk/mediatek/clk-mt2712-venc.c
+ create mode 100644 drivers/clk/mediatek/clk-mt2712.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7622-aud.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7622-eth.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7622-hif.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7622.c
+ create mode 100644 drivers/clk/renesas/r8a77970-cpg-mssr.c
+ create mode 100644 drivers/clk/samsung/clk-exynos4412-isp.c
+ create mode 100644 include/dt-bindings/clock/mt2712-clk.h
+ create mode 100644 include/dt-bindings/clock/mt7622-clk.h
+ create mode 100644 include/dt-bindings/clock/r8a77970-cpg-mssr.h
+Merging clk-samsung/for-next (a4f21e9ceb5c clk: samsung: Remove obsolete clkdev alias support)
+$ git merge clk-samsung/for-next
+Already up-to-date.
+Merging c6x/for-linux-next (62016565bb04 c6x: remove unused KTHREAD_SIZE definition)
+$ git merge c6x/for-linux-next
+Auto-merging arch/c6x/kernel/asm-offsets.c
+Merge made by the 'recursive' strategy.
+ arch/c6x/kernel/asm-offsets.c | 1 -
+ 1 file changed, 1 deletion(-)
+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 (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (c8b61d508986 m68k: add Sysam stmark2 open board support)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (dfe390a6d844 microblaze: add missing include to mmu_context_mm.h)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/mmu_context_mm.h | 1 +
+ 1 file changed, 1 insertion(+)
+Merging mips/mips-next (e0c5f36b2a63 MIPS: Add iomem resource for kernel bss section.)
+$ git merge mips/mips-next
+Already up-to-date.
+Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized)
+$ git merge nios2/for-next
+Already up-to-date.
+Merging openrisc/for-next (610f01b9a88a openrisc: fix possible deadlock scenario during timer sync)
+$ git merge openrisc/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (2ebe916e60b0 arch: Fix duplicates in Kconfig for parisc and sparc)
+$ git merge parisc-hd/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/Kconfig | 19 ++-
+ arch/parisc/Makefile | 2 +-
+ arch/parisc/include/asm/pdc.h | 255 -----------------------------------
+ arch/parisc/include/asm/topology.h | 36 +++++
+ arch/parisc/include/uapi/asm/mman.h | 4 +-
+ arch/parisc/include/uapi/asm/pdc.h | 256 +++++++++++++++++++++++++++++++++++-
+ arch/parisc/kernel/Makefile | 4 +-
+ arch/parisc/kernel/processor.c | 13 ++
+ arch/parisc/kernel/setup.c | 2 +
+ arch/parisc/kernel/syscall.S | 6 +-
+ arch/parisc/kernel/topology.c | 153 +++++++++++++++++----
+ arch/sparc/Kconfig | 3 -
+ 12 files changed, 455 insertions(+), 298 deletions(-)
+ create mode 100644 arch/parisc/include/asm/topology.h
+Merging powerpc/next (3ffa9d9e2a7c powerpc/64s: Fix Power9 DD2.0 workarounds by adding DD2.1 feature)
+$ git merge powerpc/next
+Resolved 'arch/powerpc/kvm/powerpc.c' using previous resolution.
+Resolved 'arch/powerpc/mm/numa.c' using previous resolution.
+Auto-merging tools/testing/selftests/powerpc/tm/Makefile
+Auto-merging drivers/crypto/nx/nx-842-powernv.c
+Auto-merging drivers/cpuidle/cpuidle-powernv.c
+Auto-merging arch/powerpc/platforms/powernv/pci.h
+Auto-merging arch/powerpc/platforms/powernv/Makefile
+Auto-merging arch/powerpc/platforms/Kconfig.cputype
+Auto-merging arch/powerpc/mm/numa.c
+CONFLICT (content): Merge conflict in arch/powerpc/mm/numa.c
+Auto-merging arch/powerpc/mm/hugetlbpage-radix.c
+Auto-merging arch/powerpc/mm/Makefile
+Auto-merging arch/powerpc/lib/Makefile
+Auto-merging arch/powerpc/kvm/powerpc.c
+CONFLICT (content): Merge conflict in arch/powerpc/kvm/powerpc.c
+Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kernel/watchdog.c
+Auto-merging arch/powerpc/kernel/tm.S
+Auto-merging arch/powerpc/kernel/tau_6xx.c
+Auto-merging arch/powerpc/kernel/signal_64.c
+Auto-merging arch/powerpc/kernel/exceptions-64s.S
+Auto-merging arch/powerpc/kernel/Makefile
+Auto-merging arch/powerpc/include/uapi/asm/cputable.h
+Auto-merging arch/powerpc/include/asm/uaccess.h
+Auto-merging arch/powerpc/include/asm/topology.h
+Auto-merging arch/powerpc/include/asm/tm.h
+Auto-merging arch/powerpc/include/asm/switch_to.h
+Auto-merging arch/powerpc/include/asm/string.h
+Auto-merging arch/powerpc/include/asm/pgtable-types.h
+Auto-merging arch/powerpc/include/asm/pgtable-be-types.h
+Auto-merging arch/powerpc/include/asm/nohash/64/pgtable.h
+Auto-merging arch/powerpc/include/asm/mmu_context.h
+Auto-merging arch/powerpc/include/asm/hw_irq.h
+Auto-merging arch/powerpc/include/asm/hugetlb.h
+Auto-merging arch/powerpc/include/asm/cputable.h
+Auto-merging arch/powerpc/include/asm/book3s/64/tlbflush.h
+Auto-merging arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
+Auto-merging arch/powerpc/include/asm/book3s/64/tlbflush-hash.h
+Auto-merging arch/powerpc/include/asm/book3s/64/mmu.h
+Auto-merging arch/powerpc/Kconfig.debug
+Auto-merging arch/powerpc/Kconfig
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 737d618a3c8be84be7056320d49946e3e43954b9] Merge remote-tracking branch 'powerpc/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 4 +
+ arch/powerpc/Kconfig | 8 +-
+ arch/powerpc/Kconfig.debug | 6 +
+ arch/powerpc/boot/dts/acadia.dts | 2 +-
+ arch/powerpc/configs/powernv_defconfig | 2 +
+ arch/powerpc/configs/pseries_defconfig | 1 +
+ arch/powerpc/configs/skiroot_defconfig | 232 +++++++++++++
+ arch/powerpc/include/asm/book3s/64/mmu-hash.h | 2 +-
+ arch/powerpc/include/asm/book3s/64/mmu.h | 2 +-
+ arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 22 ++
+ .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 3 +
+ arch/powerpc/include/asm/book3s/64/tlbflush.h | 15 +
+ arch/powerpc/include/asm/cputable.h | 12 +-
+ arch/powerpc/include/asm/eeh.h | 10 +-
+ arch/powerpc/include/asm/emulated_ops.h | 4 +
+ arch/powerpc/include/asm/epapr_hcalls.h | 12 +-
+ arch/powerpc/include/asm/exception-64s.h | 5 +
+ arch/powerpc/include/asm/hugetlb.h | 6 -
+ arch/powerpc/include/asm/hw_irq.h | 1 +
+ arch/powerpc/include/asm/kprobes.h | 2 +-
+ arch/powerpc/include/asm/kvm_book3s_asm.h | 4 -
+ arch/powerpc/include/asm/mce.h | 4 +-
+ arch/powerpc/include/asm/mmu_context.h | 50 +++
+ arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +-
+ arch/powerpc/include/asm/opal-api.h | 3 +
+ arch/powerpc/include/asm/opal.h | 6 +-
+ arch/powerpc/include/asm/paca.h | 13 +-
+ arch/powerpc/include/asm/page_64.h | 6 +-
+ arch/powerpc/include/asm/pci-bridge.h | 1 +
+ arch/powerpc/include/asm/pgtable-be-types.h | 2 +-
+ arch/powerpc/include/asm/pgtable-types.h | 4 +-
+ arch/powerpc/include/asm/powernv.h | 4 +
+ arch/powerpc/include/asm/ppc_asm.h | 27 +-
+ arch/powerpc/include/asm/processor.h | 3 +
+ arch/powerpc/include/asm/string.h | 2 +
+ arch/powerpc/include/asm/switch_to.h | 5 +
+ arch/powerpc/include/asm/tlbflush.h | 2 +-
+ arch/powerpc/include/asm/tm.h | 7 +-
+ arch/powerpc/include/asm/topology.h | 8 +
+ arch/powerpc/include/asm/uaccess.h | 22 ++
+ arch/powerpc/include/asm/vas.h | 21 ++
+ arch/powerpc/include/uapi/asm/cputable.h | 1 +
+ arch/powerpc/kernel/Makefile | 2 +-
+ arch/powerpc/kernel/asm-offsets.c | 6 +-
+ arch/powerpc/kernel/cputable.c | 24 +-
+ arch/powerpc/kernel/dt_cpu_ftrs.c | 4 +-
+ arch/powerpc/kernel/eeh.c | 46 +--
+ arch/powerpc/kernel/eeh_driver.c | 2 +-
+ arch/powerpc/kernel/eeh_pe.c | 8 +-
+ arch/powerpc/kernel/entry_64.S | 4 +-
+ arch/powerpc/kernel/exceptions-64s.S | 49 ++-
+ arch/powerpc/kernel/fadump.c | 17 +-
+ arch/powerpc/kernel/head_32.S | 2 +-
+ arch/powerpc/kernel/head_64.S | 16 +-
+ arch/powerpc/kernel/idle_book3s.S | 70 ++--
+ arch/powerpc/kernel/irq.c | 51 ++-
+ arch/powerpc/kernel/kprobes-ftrace.c | 34 +-
+ arch/powerpc/kernel/kprobes.c | 92 +++--
+ arch/powerpc/kernel/machine_kexec_64.c | 4 +-
+ arch/powerpc/kernel/mce.c | 147 +++++---
+ arch/powerpc/kernel/mce_power.c | 115 ++++++-
+ arch/powerpc/kernel/module_64.c | 3 +-
+ arch/powerpc/kernel/optprobes.c | 15 +-
+ arch/powerpc/kernel/paca.c | 16 +-
+ arch/powerpc/kernel/pci_64.c | 4 +-
+ arch/powerpc/kernel/process.c | 225 +++++++++++--
+ arch/powerpc/kernel/prom.c | 37 +-
+ arch/powerpc/kernel/setup-common.c | 7 +-
+ arch/powerpc/kernel/setup.h | 6 +
+ arch/powerpc/kernel/setup_64.c | 19 +-
+ arch/powerpc/kernel/signal.c | 2 +-
+ arch/powerpc/kernel/signal_32.c | 6 +-
+ arch/powerpc/kernel/signal_64.c | 7 +-
+ arch/powerpc/kernel/sysfs.c | 11 +
+ arch/powerpc/kernel/tau_6xx.c | 3 +-
+ arch/powerpc/kernel/tm.S | 59 +---
+ arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 4 +-
+ arch/powerpc/kernel/traps.c | 256 +++++++++++---
+ arch/powerpc/kernel/watchdog.c | 29 +-
+ arch/powerpc/kvm/book3s_hv.c | 20 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 8 -
+ arch/powerpc/kvm/powerpc.c | 3 +-
+ arch/powerpc/lib/Makefile | 2 +-
+ arch/powerpc/lib/pmem.c | 67 ++++
+ arch/powerpc/lib/sstep.c | 20 ++
+ arch/powerpc/mm/Makefile | 6 +-
+ arch/powerpc/mm/dump_hashpagetable.c | 2 +-
+ arch/powerpc/mm/dump_linuxpagetables.c | 10 +-
+ arch/powerpc/mm/hash_utils_64.c | 1 +
+ arch/powerpc/mm/hugetlbpage-radix.c | 20 +-
+ arch/powerpc/mm/init_64.c | 21 +-
+ arch/powerpc/mm/mmap.c | 49 +--
+ arch/powerpc/mm/mmu_context.c | 9 -
+ arch/powerpc/mm/mmu_context_book3s64.c | 33 +-
+ arch/powerpc/mm/numa.c | 63 +++-
+ arch/powerpc/mm/pgtable-radix.c | 10 +
+ arch/powerpc/mm/pgtable_64.c | 2 +-
+ arch/powerpc/mm/slb_low.S | 6 +-
+ arch/powerpc/mm/slice.c | 62 ++--
+ arch/powerpc/mm/tlb-radix.c | 347 +++++++++++++------
+ arch/powerpc/net/bpf_jit64.h | 7 +-
+ arch/powerpc/net/bpf_jit_comp64.c | 16 +-
+ arch/powerpc/oprofile/op_model_cell.c | 8 +-
+ arch/powerpc/perf/hv-24x7.c | 2 +-
+ arch/powerpc/platforms/Kconfig.cputype | 19 +-
+ arch/powerpc/platforms/powermac/low_i2c.c | 4 +-
+ arch/powerpc/platforms/powernv/Makefile | 3 +-
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 42 +--
+ arch/powerpc/platforms/powernv/npu-dma.c | 28 +-
+ arch/powerpc/platforms/powernv/opal-async.c | 180 +++++++---
+ arch/powerpc/platforms/powernv/opal-hmi.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-irqchip.c | 8 +-
+ .../powerpc/platforms/powernv/opal-memory-errors.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-sensor.c | 17 +-
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 5 +-
+ arch/powerpc/platforms/powernv/opal.c | 2 +
+ arch/powerpc/platforms/powernv/pci-ioda.c | 29 +-
+ arch/powerpc/platforms/powernv/pci.h | 4 +
+ arch/powerpc/platforms/powernv/setup.c | 26 +-
+ arch/powerpc/platforms/powernv/smp.c | 59 ++++
+ arch/powerpc/platforms/powernv/vas-debug.c | 209 ++++++++++++
+ arch/powerpc/platforms/powernv/vas-window.c | 242 +++++++++++---
+ arch/powerpc/platforms/powernv/vas.c | 31 +-
+ arch/powerpc/platforms/powernv/vas.h | 93 +++---
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +
+ arch/powerpc/platforms/pseries/iommu.c | 19 +-
+ arch/powerpc/platforms/pseries/lpar.c | 8 +-
+ arch/powerpc/platforms/pseries/lparcfg.c | 2 +-
+ arch/powerpc/platforms/pseries/vio.c | 2 +
+ arch/powerpc/sysdev/axonram.c | 2 +-
+ arch/powerpc/sysdev/ipic.c | 4 +-
+ arch/powerpc/xmon/xmon.c | 169 +++++++++-
+ drivers/cpuidle/cpuidle-powernv.c | 4 +-
+ drivers/crypto/nx/nx-842-powernv.c | 167 ++++------
+ drivers/crypto/nx/nx-842.c | 2 +-
+ drivers/misc/cxl/api.c | 16 +-
+ drivers/misc/cxl/context.c | 3 +
+ drivers/misc/cxl/cxl.h | 22 +-
+ drivers/misc/cxl/debugfs.c | 29 +-
+ drivers/misc/cxl/fault.c | 15 +-
+ drivers/misc/cxl/file.c | 24 +-
+ drivers/misc/cxl/native.c | 27 +-
+ drivers/misc/cxl/pci.c | 88 +++--
+ drivers/mtd/devices/powernv_flash.c | 83 +++--
+ .../selftests/powerpc/benchmarks/context_switch.c | 17 +-
+ .../selftests/powerpc/dscr/dscr_sysfs_test.c | 6 +-
+ tools/testing/selftests/powerpc/tm/.gitignore | 1 +
+ tools/testing/selftests/powerpc/tm/Makefile | 3 +-
+ .../testing/selftests/powerpc/tm/tm-unavailable.c | 371 +++++++++++++++++++++
+ tools/testing/selftests/powerpc/tm/tm.h | 5 +
+ 150 files changed, 3696 insertions(+), 1144 deletions(-)
+ create mode 100644 arch/powerpc/configs/skiroot_defconfig
+ create mode 100644 arch/powerpc/lib/pmem.c
+ create mode 100644 arch/powerpc/platforms/powernv/vas-debug.c
+ create mode 100644 tools/testing/selftests/powerpc/tm/tm-unavailable.c
+Merging fsl/next (a4e89ffb5923 powerpc/e6500: Update machine check for L1D cache err)
+$ 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 risc-v/for-linux-next (f0b0655e9936 Merge tag 'v4.14-rc8' into for-linux-next)
+$ git merge risc-v/for-linux-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging s390/features (049a2c2d486e s390: enable CPU alternatives unconditionally)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 17 +----
+ arch/s390/include/asm/alternative.h | 20 +-----
+ arch/s390/include/asm/cpu_mf.h | 2 +-
+ arch/s390/include/asm/futex.h | 9 ++-
+ arch/s390/include/asm/lowcore.h | 37 +++++------
+ arch/s390/include/asm/mmu_context.h | 36 +++++------
+ arch/s390/include/asm/processor.h | 6 +-
+ arch/s390/include/asm/ptrace.h | 2 +
+ arch/s390/include/asm/uaccess.h | 29 +++------
+ arch/s390/include/asm/vdso.h | 1 +
+ arch/s390/kernel/Makefile | 3 +-
+ arch/s390/kernel/asm-offsets.c | 2 +-
+ arch/s390/kernel/entry.S | 33 +++++++---
+ arch/s390/kernel/head64.S | 2 +-
+ arch/s390/kernel/module.c | 15 ++---
+ arch/s390/kernel/nmi.c | 2 -
+ arch/s390/kernel/vdso.c | 44 ++-----------
+ arch/s390/kernel/vdso32/getcpu.S | 16 +----
+ arch/s390/kernel/vdso64/clock_gettime.S | 19 ++----
+ arch/s390/kernel/vdso64/getcpu.S | 15 +----
+ arch/s390/lib/spinlock.c | 7 ++-
+ arch/s390/lib/uaccess.c | 90 +++++++++++++++++++++++---
+ arch/s390/mm/fault.c | 108 +++++++++++++++++++-------------
+ arch/s390/mm/gmap.c | 9 +--
+ arch/s390/mm/init.c | 1 +
+ arch/s390/mm/pgalloc.c | 4 +-
+ drivers/s390/char/con3215.c | 6 +-
+ drivers/s390/char/con3270.c | 10 +--
+ drivers/s390/char/sclp.c | 45 +++++++------
+ drivers/s390/char/sclp_con.c | 5 +-
+ drivers/s390/char/sclp_tty.c | 5 +-
+ drivers/s390/char/sclp_vt220.c | 6 +-
+ drivers/s390/char/tape_core.c | 14 ++---
+ drivers/s390/char/tty3270.c | 8 +--
+ drivers/s390/cio/device.c | 8 +--
+ drivers/s390/cio/device.h | 2 +
+ drivers/s390/cio/device_fsm.c | 10 ++-
+ drivers/s390/cio/eadm_sch.c | 9 ++-
+ drivers/s390/cio/qdio.h | 2 +-
+ drivers/s390/cio/qdio_main.c | 4 +-
+ drivers/s390/cio/qdio_setup.c | 3 +-
+ drivers/s390/crypto/ap_bus.c | 10 +--
+ drivers/s390/crypto/ap_bus.h | 2 +-
+ drivers/s390/crypto/ap_queue.c | 2 +-
+ 44 files changed, 331 insertions(+), 349 deletions(-)
+Merging sparc-next/master (9cd6681cb116 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
+$ git merge sh/for-next
+Auto-merging arch/sh/include/asm/futex.h
+Merge made by the 'recursive' strategy.
+ arch/sh/include/asm/futex.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+Merging tile/master (777a45b45866 arch/tile: Implement ->set_state_oneshot_stopped())
+$ git merge tile/master
+Already up-to-date.
+Merging uml/linux-next (6d20e6b235aa um: return negative in tuntap_open_tramp())
+$ git merge uml/linux-next
+Already up-to-date.
+Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
+$ git merge unicore32/unicore32
+Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution.
+Auto-merging arch/unicore32/include/uapi/asm/unistd.h
+Auto-merging arch/unicore32/include/uapi/asm/sigcontext.h
+Auto-merging arch/unicore32/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
+Auto-merging arch/unicore32/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9373ef2a4769] Merge remote-tracking branch 'unicore32/unicore32'
+$ git diff -M --stat --summary HEAD^..
+ arch/unicore32/Kconfig | 14 +
+ arch/unicore32/include/asm/Kbuild | 1 -
+ 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(+), 1 deletion(-)
+ 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 (271335b9726e Merge branch 'xtensa-fixes' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging fscrypt/master (a0b3bc855374 fscrypt: lock mutex before checking for bounce page pool)
+$ git merge fscrypt/master
+Already up-to-date.
+Merging befs/for-next (5771a8c08880 Linux v4.13-rc1)
+$ git merge befs/for-next
+Already up-to-date.
+Merging btrfs/next (5226fcac7841 squashfs: Add zstd support)
+$ git merge btrfs/next
+Auto-merging crypto/testmgr.h
+Auto-merging crypto/testmgr.c
+Auto-merging crypto/Makefile
+Auto-merging crypto/Kconfig
+Merge made by the 'recursive' strategy.
+ crypto/Kconfig | 9 ++
+ crypto/Makefile | 1 +
+ crypto/testmgr.c | 10 +++
+ crypto/testmgr.h | 71 +++++++++++++++
+ crypto/zstd.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 356 insertions(+)
+ create mode 100644 crypto/zstd.c
+Merging btrfs-kdave/for-next (32a7ff6bee24 Merge branch 'for-next-next-v4.15-20171115' into for-next-20171115)
+$ git merge btrfs-kdave/for-next
+Merge made by the 'recursive' strategy.
+ fs/btrfs/compression.c | 28 ++-
+ fs/btrfs/compression.h | 5 +-
+ fs/btrfs/ctree.h | 18 +-
+ fs/btrfs/delayed-inode.c | 59 +++--
+ fs/btrfs/delayed-ref.c | 2 +-
+ fs/btrfs/delayed-ref.h | 2 +-
+ fs/btrfs/dir-item.c | 108 ---------
+ fs/btrfs/disk-io.c | 55 +++--
+ fs/btrfs/disk-io.h | 3 +
+ fs/btrfs/export.c | 5 -
+ fs/btrfs/extent-tree.c | 4 +-
+ fs/btrfs/extent_io.c | 83 +++----
+ fs/btrfs/extent_io.h | 44 ++--
+ fs/btrfs/file.c | 475 ++++++++++++++++++++++++++++-----------
+ fs/btrfs/free-space-cache.c | 8 +-
+ fs/btrfs/inode.c | 100 +++++----
+ fs/btrfs/ioctl.c | 41 ++--
+ fs/btrfs/props.c | 9 +-
+ fs/btrfs/qgroup.c | 172 +++++++++-----
+ fs/btrfs/qgroup.h | 28 ++-
+ fs/btrfs/ref-verify.c | 6 +-
+ fs/btrfs/relocation.c | 3 +-
+ fs/btrfs/root-tree.c | 7 -
+ fs/btrfs/send.c | 6 -
+ fs/btrfs/super.c | 271 ++++++++++++----------
+ fs/btrfs/sysfs.c | 2 +-
+ fs/btrfs/tests/extent-io-tests.c | 6 +-
+ fs/btrfs/tests/inode-tests.c | 24 +-
+ fs/btrfs/transaction.c | 3 +-
+ fs/btrfs/tree-checker.c | 168 +++++++++++++-
+ fs/btrfs/tree-checker.h | 14 +-
+ fs/btrfs/tree-log.c | 47 +---
+ fs/btrfs/volumes.c | 212 +++++++++++------
+ fs/btrfs/volumes.h | 26 ++-
+ fs/btrfs/xattr.c | 6 -
+ fs/btrfs/zstd.c | 19 +-
+ include/trace/events/btrfs.h | 17 +-
+ 37 files changed, 1281 insertions(+), 805 deletions(-)
+Merging ceph/master (3cfa3b16dd2f rbd: default to single-major device number scheme)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ drivers/block/rbd.c | 65 ++++--------------
+ fs/ceph/caps.c | 9 ++-
+ fs/ceph/inode.c | 9 ++-
+ fs/ceph/locks.c | 177 +++++++++++++++++++++++++++++++++++---------------
+ fs/ceph/mds_client.c | 96 +++++++++++++++++----------
+ fs/ceph/super.c | 5 +-
+ fs/ceph/super.h | 4 +-
+ net/ceph/ceph_hash.c | 12 +++-
+ net/ceph/crypto.c | 4 +-
+ net/ceph/messenger.c | 1 +
+ net/ceph/mon_client.c | 5 +-
+ 11 files changed, 237 insertions(+), 150 deletions(-)
+Merging cifs/for-next (87df26175e67 x86/mm: Unbreak modules that rely on external PAGE_KERNEL availability)
+$ git merge cifs/for-next
+Already up-to-date.
+Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
+$ git merge configfs/for-next
+Already up-to-date.
+Merging ecryptfs/next (4670269faba7 eCryptfs: constify attribute_group structures.)
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c | 44 ++++++---------------------------------
+ fs/ecryptfs/ecryptfs_kernel.h | 9 +++++++-
+ fs/ecryptfs/inode.c | 4 ----
+ fs/ecryptfs/keystore.c | 48 +++++++++++--------------------------------
+ fs/ecryptfs/main.c | 4 ++--
+ fs/ecryptfs/messaging.c | 13 ++++--------
+ fs/ecryptfs/miscdev.c | 8 ++------
+ fs/ecryptfs/mmap.c | 2 --
+ 8 files changed, 34 insertions(+), 98 deletions(-)
+Merging ext3/for_next (b8b099238223 Pull error handling fix in dquot_file_open().)
+$ git merge ext3/for_next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ext4/dev (232530680290 ext4: improve smp scalability for inode generation)
+$ git merge ext4/dev
+Already up-to-date.
+Merging f2fs/dev (ead710b7d82d f2fs: deny accessing encryption policy if encryption is off)
+$ git merge f2fs/dev
+Auto-merging include/trace/events/f2fs.h
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/inode.c
+Auto-merging fs/f2fs/f2fs.h
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 37 ++-
+ fs/f2fs/acl.c | 3 +
+ fs/f2fs/checkpoint.c | 64 +++-
+ fs/f2fs/data.c | 37 ++-
+ fs/f2fs/debug.c | 31 +-
+ fs/f2fs/dir.c | 32 +-
+ fs/f2fs/f2fs.h | 222 +++++++++++---
+ fs/f2fs/file.c | 123 ++++++--
+ fs/f2fs/gc.c | 37 ++-
+ fs/f2fs/inline.c | 1 +
+ fs/f2fs/inode.c | 26 +-
+ fs/f2fs/namei.c | 101 +++++--
+ fs/f2fs/node.c | 410 +++++++++++++------------
+ fs/f2fs/node.h | 16 +-
+ fs/f2fs/recovery.c | 8 +-
+ fs/f2fs/segment.c | 509 ++++++++++++++++++++++++--------
+ fs/f2fs/segment.h | 39 ++-
+ fs/f2fs/shrinker.c | 2 +-
+ fs/f2fs/super.c | 219 ++++++++++++--
+ fs/f2fs/sysfs.c | 53 +++-
+ fs/f2fs/xattr.c | 174 ++++++-----
+ include/linux/f2fs_fs.h | 10 +-
+ include/trace/events/f2fs.h | 116 +++++++-
+ 23 files changed, 1648 insertions(+), 622 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 (c6cdd51404b7 fuse: fix READDIRPLUS skipping an entry)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging jfs/jfs-next (88a96fa84186 jfs: Add missing NULL pointer check in __get_metapage)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging nfs/linux-next (bebc6082da0a Linux 4.14)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (ade7340656f3 lockd: fix "list_add double add" caused by legacy signal interface)
+$ git merge nfsd/nfsd-next
+Auto-merging net/sunrpc/xprtrdma/svc_rdma_backchannel.c
+Auto-merging net/sunrpc/svc_xprt.c
+Auto-merging include/trace/events/sunrpc.h
+Auto-merging include/linux/sunrpc/svc.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/nfsd/nfssvc.c
+Auto-merging fs/nfsd/nfs4proc.c
+Auto-merging fs/nfsd/nfs4layouts.c
+Auto-merging fs/nfsd/nfs3xdr.c
+Auto-merging fs/nfsd/fault_inject.c
+Auto-merging fs/nfsd/export.c
+Auto-merging fs/lockd/mon.c
+Auto-merging fs/lockd/host.c
+Merge made by the 'recursive' strategy.
+ fs/lockd/host.c | 24 +-
+ fs/lockd/mon.c | 3 +-
+ fs/lockd/svc.c | 58 +++--
+ fs/lockd/svcsubs.c | 2 +-
+ fs/nfs_common/grace.c | 34 ++-
+ fs/nfsd/export.c | 10 +-
+ fs/nfsd/fault_inject.c | 5 +-
+ fs/nfsd/netns.h | 5 +-
+ fs/nfsd/nfs3xdr.c | 10 +-
+ fs/nfsd/nfs4idmap.c | 4 +-
+ fs/nfsd/nfs4layouts.c | 4 +-
+ fs/nfsd/nfs4proc.c | 19 +-
+ fs/nfsd/nfs4state.c | 404 ++++++++++++++++++++---------
+ fs/nfsd/nfsctl.c | 3 +
+ fs/nfsd/nfssvc.c | 18 +-
+ fs/nfsd/state.h | 11 +-
+ fs/nfsd/xdr4.h | 13 +-
+ include/linux/fs.h | 4 +-
+ include/linux/sunrpc/cache.h | 2 +-
+ include/linux/sunrpc/svc.h | 1 +
+ include/trace/events/sunrpc.h | 17 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 18 +-
+ net/sunrpc/cache.c | 2 +-
+ net/sunrpc/svc_xprt.c | 106 +++-----
+ net/sunrpc/svcauth_unix.c | 4 +-
+ net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 6 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 11 +-
+ 27 files changed, 494 insertions(+), 304 deletions(-)
+Merging orangefs/for-next (0b08273c8ab7 orangefs: Adjust three checks for null pointers)
+$ git merge orangefs/for-next
+Already up-to-date.
+Merging overlayfs/overlayfs-next (d9768076068f ovl: remove unneeded arg from ovl_verify_origin())
+$ git merge overlayfs/overlayfs-next
+Auto-merging fs/overlayfs/readdir.c
+Auto-merging fs/overlayfs/ovl_entry.h
+Merge made by the 'recursive' strategy.
+ fs/overlayfs/copy_up.c | 8 +-
+ fs/overlayfs/dir.c | 25 +-
+ fs/overlayfs/inode.c | 63 ++++-
+ fs/overlayfs/namei.c | 59 ++--
+ fs/overlayfs/overlayfs.h | 13 +-
+ fs/overlayfs/ovl_entry.h | 14 +-
+ fs/overlayfs/readdir.c | 55 +++-
+ fs/overlayfs/super.c | 688 ++++++++++++++++++++++++++---------------------
+ fs/overlayfs/util.c | 21 +-
+ include/linux/path.h | 6 +
+ 10 files changed, 576 insertions(+), 376 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 (89b68cd92663 UBI: Fix two typos in comments)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (2d1d1da3d9cc xfs: on failed mount, force-reclaim inodes after unmounting quota controls)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging file-locks/locks-next (3b9f8ed25dbe Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
+$ git merge file-locks/locks-next
+Already up-to-date.
+Merging vfs/for-next (7d8c430e7e22 Merge branch 'work.mount' into for-next)
+$ git merge vfs/for-next
+Resolved 'drivers/staging/pi433/pi433_if.c' using previous resolution.
+Resolved 'fs/btrfs/super.c' using previous resolution.
+Resolved 'fs/ext2/super.c' using previous resolution.
+Resolved 'fs/f2fs/checkpoint.c' using previous resolution.
+Resolved 'fs/f2fs/super.c' using previous resolution.
+Resolved 'fs/overlayfs/super.c' using previous resolution.
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging security/selinux/hooks.c
+Auto-merging security/apparmor/include/lib.h
+Auto-merging security/apparmor/apparmorfs.c
+Auto-merging net/ceph/pagevec.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/sched/core.c
+Auto-merging ipc/syscall.c
+Auto-merging ipc/shm.c
+Auto-merging ipc/sem.c
+Auto-merging ipc/msg.c
+Auto-merging include/uapi/linux/cramfs_fs.h
+Auto-merging include/uapi/linux/bfs_fs.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/compat.h
+Auto-merging include/linux/bio.h
+Auto-merging include/linux/acct.h
+Auto-merging fs/xfs/xfs_log.c
+Auto-merging fs/ufs/ialloc.c
+Auto-merging fs/ufs/balloc.c
+Auto-merging fs/udf/super.c
+Auto-merging fs/ubifs/ubifs.h
+Auto-merging fs/ubifs/super.c
+Auto-merging fs/sysv/inode.c
+Auto-merging fs/super.c
+Auto-merging fs/statfs.c
+Auto-merging fs/signalfd.c
+Auto-merging fs/select.c
+Auto-merging fs/reiserfs/xattr.c
+Auto-merging fs/reiserfs/journal.c
+Auto-merging fs/read_write.c
+Auto-merging fs/pstore/platform.c
+Auto-merging fs/proc_namespace.c
+Auto-merging fs/proc/root.c
+Auto-merging fs/proc/inode.c
+Auto-merging fs/proc/base.c
+Auto-merging fs/overlayfs/super.c
+CONFLICT (content): Merge conflict in fs/overlayfs/super.c
+Auto-merging fs/orangefs/super.c
+Auto-merging fs/orangefs/orangefs-kernel.h
+Auto-merging fs/nsfs.c
+Auto-merging fs/notify/fsnotify.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/nfs/dir.c
+Auto-merging fs/ncpfs/inode.c
+Auto-merging fs/namei.c
+Auto-merging fs/jfs/super.c
+Auto-merging fs/iomap.c
+Auto-merging fs/inode.c
+Auto-merging fs/hpfs/map.c
+Auto-merging fs/gfs2/trans.c
+Auto-merging fs/gfs2/super.c
+Auto-merging fs/fs-writeback.c
+Auto-merging fs/file.c
+Auto-merging fs/fhandle.c
+Auto-merging fs/f2fs/super.c
+CONFLICT (content): Merge conflict in fs/f2fs/super.c
+Auto-merging fs/f2fs/recovery.c
+Auto-merging fs/f2fs/gc.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/checkpoint.c
+CONFLICT (content): Merge conflict in fs/f2fs/checkpoint.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/ioctl.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext2/super.c
+CONFLICT (content): Merge conflict in fs/ext2/super.c
+Auto-merging fs/ext2/ialloc.c
+Auto-merging fs/ext2/balloc.c
+Auto-merging fs/efs/super.c
+Auto-merging fs/ecryptfs/main.c
+Auto-merging fs/coredump.c
+Auto-merging fs/compat_ioctl.c
+Auto-merging fs/coda/upcall.c
+Auto-merging fs/coda/inode.c
+Auto-merging fs/cifs/cifsglob.h
+Auto-merging fs/ceph/super.c
+Auto-merging fs/btrfs/volumes.c
+Auto-merging fs/btrfs/super.c
+CONFLICT (content): Merge conflict in fs/btrfs/super.c
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/ctree.h
+Auto-merging fs/binfmt_elf_fdpic.c
+Auto-merging fs/aio.c
+Auto-merging fs/affs/bitmap.c
+Auto-merging fs/affs/amigaffs.c
+Auto-merging drivers/vhost/scsi.c
+Auto-merging drivers/tty/vt/vt_ioctl.c
+Auto-merging drivers/tty/vt/selection.c
+Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+Auto-merging drivers/staging/pi433/pi433_if.c
+CONFLICT (content): Merge conflict in drivers/staging/pi433/pi433_if.c
+Auto-merging drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
+Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c
+Auto-merging drivers/staging/lustre/lustre/llite/file.c
+Auto-merging drivers/staging/lustre/lnet/lnet/lib-move.c
+Auto-merging drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
+Auto-merging drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
+Auto-merging drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
+Auto-merging drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+Auto-merging drivers/scsi/cxlflash/main.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+Auto-merging drivers/net/ethernet/broadcom/tg3.c
+Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2.c
+Auto-merging drivers/net/ethernet/broadcom/bgmac.h
+Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c
+Auto-merging block/blk-map.c
+Auto-merging block/bio.c
+Auto-merging arch/sparc/kernel/sys_sparc32.c
+Auto-merging arch/sparc/kernel/signal32.c
+Auto-merging arch/s390/kernel/compat_signal.c
+Auto-merging arch/powerpc/kernel/signal_32.c
+Auto-merging arch/parisc/kernel/signal.c
+Auto-merging arch/mips/include/asm/compat-signal.h
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 992e6830c20f1b9d3a2d4df852351a080f838a2d] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/cramfs.txt | 42 ++
+ Documentation/filesystems/porting | 4 -
+ MAINTAINERS | 4 +-
+ arch/mips/include/asm/compat-signal.h | 37 +-
+ arch/parisc/kernel/signal.c | 9 +-
+ arch/parisc/kernel/signal32.c | 13 -
+ arch/parisc/kernel/signal32.h | 2 -
+ arch/powerpc/kernel/signal_32.c | 31 +-
+ arch/s390/kernel/compat_signal.c | 33 +-
+ arch/sparc/kernel/signal32.c | 9 +-
+ arch/sparc/kernel/sys_sparc32.c | 8 +-
+ block/bio.c | 192 +++-----
+ block/blk-map.c | 7 -
+ drivers/char/ipmi/bt-bmc.c | 6 -
+ drivers/gpu/drm/r128/r128_drv.h | 4 +
+ drivers/gpu/drm/r128/r128_ioc32.c | 99 ++--
+ drivers/gpu/drm/r128/r128_state.c | 6 +-
+ drivers/gpu/drm/via/via_dmablit.c | 6 +-
+ drivers/i2c/i2c-dev.c | 268 +++++++----
+ drivers/mtd/mtdchar.c | 24 +-
+ drivers/mtd/mtdsuper.c | 6 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 2 +-
+ drivers/net/ethernet/broadcom/bgmac.h | 6 +-
+ drivers/net/ethernet/broadcom/bnx2.c | 6 +-
+ drivers/net/ethernet/broadcom/cnic_if.h | 8 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +-
+ drivers/net/ethernet/broadcom/tg3.c | 2 +-
+ drivers/net/ethernet/brocade/bna/bfa_ioc.c | 26 +-
+ drivers/net/ethernet/brocade/bna/bfa_ioc.h | 4 +-
+ drivers/net/ethernet/brocade/bna/bfi.h | 94 ++--
+ drivers/net/ethernet/brocade/bna/bfi_enet.h | 96 ++--
+ drivers/net/ethernet/brocade/bna/bna.h | 2 +-
+ drivers/net/ethernet/brocade/bna/bna_enet.c | 6 +-
+ drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 34 +-
+ drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 10 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 9 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
+ drivers/net/ethernet/via/via-rhine.c | 6 +-
+ drivers/net/ethernet/via/via-velocity.c | 15 +-
+ drivers/net/wireless/cisco/airo.c | 4 +-
+ drivers/rapidio/devices/rio_mport_cdev.c | 6 +-
+ drivers/scsi/cxlflash/main.c | 6 -
+ drivers/scsi/st.c | 6 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 4 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 9 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 157 ++-----
+ .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 99 +---
+ drivers/staging/lustre/lnet/lnet/lib-move.c | 2 +-
+ drivers/staging/lustre/lustre/llite/file.c | 2 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 14 +-
+ .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 6 +-
+ drivers/staging/pi433/pi433_if.c | 90 +---
+ .../interface/vchiq_arm/vchiq_2835_arm.c | 20 +-
+ drivers/tty/vt/selection.c | 50 +-
+ drivers/tty/vt/vt_ioctl.c | 68 ++-
+ drivers/vhost/scsi.c | 73 +--
+ drivers/video/fbdev/pvr2fb.c | 4 +-
+ drivers/virt/fsl_hypervisor.c | 4 +-
+ drivers/xen/pvcalls-back.c | 16 +-
+ fs/9p/vfs_inode.c | 3 +
+ fs/9p/vfs_inode_dotl.c | 3 +
+ fs/9p/vfs_super.c | 6 +-
+ fs/adfs/super.c | 4 +-
+ fs/affs/amigaffs.c | 2 +-
+ fs/affs/bitmap.c | 6 +-
+ fs/affs/super.c | 16 +-
+ fs/afs/super.c | 4 +-
+ fs/aio.c | 55 ++-
+ fs/befs/ChangeLog | 2 +-
+ fs/befs/linuxvfs.c | 4 +-
+ fs/binfmt_elf_fdpic.c | 2 +
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/extent_io.c | 2 +-
+ fs/btrfs/ioctl.c | 4 +-
+ fs/btrfs/super.c | 52 +--
+ fs/btrfs/volumes.c | 2 +-
+ fs/ceph/super.c | 8 +-
+ fs/cifs/cifs_fs_sb.h | 2 +-
+ fs/cifs/cifsfs.c | 12 +-
+ fs/cifs/cifsglob.h | 4 +-
+ fs/cifs/inode.c | 2 +-
+ fs/cifs/xattr.c | 8 +-
+ fs/coda/inode.c | 4 +-
+ fs/coda/upcall.c | 3 +-
+ fs/compat_ioctl.c | 123 +----
+ fs/coredump.c | 7 +-
+ fs/cramfs/Kconfig | 39 +-
+ fs/cramfs/README | 31 +-
+ fs/cramfs/inode.c | 513 ++++++++++++++++++---
+ fs/ecryptfs/main.c | 8 +-
+ fs/efs/super.c | 4 +-
+ fs/eventpoll.c | 4 +-
+ fs/ext2/balloc.c | 4 +-
+ fs/ext2/ialloc.c | 4 +-
+ fs/ext2/super.c | 20 +-
+ fs/ext4/inode.c | 4 +-
+ fs/ext4/ioctl.c | 86 ++--
+ fs/ext4/super.c | 52 +--
+ fs/f2fs/checkpoint.c | 10 +-
+ fs/f2fs/f2fs.h | 2 +-
+ fs/f2fs/gc.c | 2 +-
+ fs/f2fs/recovery.c | 8 +-
+ fs/f2fs/super.c | 28 +-
+ fs/fat/fatent.c | 6 +-
+ fs/fat/inode.c | 10 +-
+ fs/fat/misc.c | 2 +-
+ fs/fat/namei_msdos.c | 2 +-
+ fs/fhandle.c | 4 +-
+ fs/file.c | 12 +-
+ fs/freevxfs/vxfs_super.c | 4 +-
+ fs/fs-writeback.c | 2 +-
+ fs/fuse/inode.c | 12 +-
+ fs/gfs2/ops_fstype.c | 16 +-
+ fs/gfs2/super.c | 10 +-
+ fs/gfs2/trans.c | 2 +-
+ fs/hfs/mdb.c | 4 +-
+ fs/hfs/super.c | 16 +-
+ fs/hfsplus/super.c | 22 +-
+ fs/hpfs/map.c | 2 +-
+ fs/hpfs/super.c | 8 +-
+ fs/inode.c | 10 +-
+ fs/internal.h | 1 +
+ fs/iomap.c | 24 +-
+ fs/isofs/inode.c | 2 +-
+ fs/jffs2/fs.c | 4 +-
+ fs/jffs2/os-linux.h | 2 +-
+ fs/jffs2/super.c | 4 +-
+ fs/jfs/super.c | 10 +-
+ fs/kernfs/mount.c | 2 +-
+ fs/libfs.c | 6 +-
+ fs/locks.c | 2 +-
+ fs/minix/inode.c | 4 +-
+ fs/namei.c | 14 +-
+ fs/ncpfs/inode.c | 4 +-
+ fs/nfs/dir.c | 2 +-
+ fs/nfs/fscache.c | 2 +-
+ fs/nfs/inode.c | 2 +-
+ fs/nfs/internal.h | 2 +-
+ fs/nfs/super.c | 24 +-
+ fs/nilfs2/segment.c | 2 +-
+ fs/nilfs2/super.c | 24 +-
+ fs/nilfs2/the_nilfs.c | 6 +-
+ fs/notify/fsnotify.c | 2 +-
+ fs/nsfs.c | 2 +-
+ fs/ntfs/super.c | 32 +-
+ fs/ocfs2/file.c | 2 +-
+ fs/ocfs2/super.c | 28 +-
+ fs/ocfs2/xattr.c | 2 +-
+ fs/openpromfs/inode.c | 4 +-
+ fs/orangefs/orangefs-kernel.h | 6 -
+ fs/orangefs/super.c | 8 +-
+ fs/overlayfs/super.c | 10 +-
+ fs/proc/base.c | 2 +-
+ fs/proc/inode.c | 2 +-
+ fs/proc/internal.h | 2 +-
+ fs/proc/root.c | 2 +-
+ fs/proc_namespace.c | 8 +-
+ fs/pstore/platform.c | 2 +-
+ fs/qnx4/inode.c | 4 +-
+ fs/qnx6/inode.c | 4 +-
+ fs/read_write.c | 21 -
+ fs/reiserfs/inode.c | 2 +-
+ fs/reiserfs/journal.c | 6 +-
+ fs/reiserfs/prints.c | 4 +-
+ fs/reiserfs/super.c | 18 +-
+ fs/reiserfs/xattr.c | 10 +-
+ fs/romfs/super.c | 4 +-
+ fs/select.c | 68 ++-
+ fs/signalfd.c | 4 +-
+ fs/squashfs/super.c | 4 +-
+ fs/statfs.c | 8 +-
+ fs/super.c | 46 +-
+ fs/sysfs/mount.c | 2 +-
+ fs/sysv/inode.c | 2 +-
+ fs/sysv/super.c | 2 +-
+ fs/ubifs/file.c | 2 +-
+ fs/ubifs/io.c | 2 +-
+ fs/ubifs/super.c | 20 +-
+ fs/ubifs/ubifs.h | 4 +-
+ fs/udf/super.c | 6 +-
+ fs/ufs/balloc.c | 8 +-
+ fs/ufs/ialloc.c | 10 +-
+ fs/ufs/super.c | 30 +-
+ fs/xfs/xfs_log.c | 6 +-
+ fs/xfs/xfs_super.c | 8 +-
+ fs/xfs/xfs_super.h | 2 +-
+ include/linux/acct.h | 3 -
+ include/linux/bio.h | 4 +-
+ include/linux/compat.h | 10 +-
+ include/linux/fs.h | 19 +-
+ include/linux/uio.h | 6 +-
+ include/uapi/linux/bfs_fs.h | 2 +-
+ include/uapi/linux/cramfs_fs.h | 26 +-
+ ipc/mqueue.c | 2 +-
+ ipc/msg.c | 4 +-
+ ipc/sem.c | 4 +-
+ ipc/shm.c | 4 +-
+ ipc/syscall.c | 2 +-
+ kernel/compat.c | 77 ++--
+ kernel/sched/core.c | 36 +-
+ kernel/signal.c | 77 +---
+ lib/iov_iter.c | 22 +
+ mm/shmem.c | 10 +-
+ net/9p/client.c | 3 +-
+ net/9p/trans_virtio.c | 13 +-
+ net/9p/trans_xen.c | 4 +-
+ net/ceph/pagevec.c | 4 +-
+ scripts/gdb/linux/constants.py.in | 12 +-
+ scripts/gdb/linux/proc.py | 8 +-
+ security/apparmor/apparmorfs.c | 2 +-
+ security/apparmor/include/lib.h | 2 +-
+ security/selinux/hooks.c | 2 +-
+ virt/kvm/kvm_main.c | 7 +-
+ 214 files changed, 1990 insertions(+), 2028 deletions(-)
+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 (9afe77ed849d added new line symbol after warning about dropped messages)
+$ git merge printk/for-next
+Auto-merging include/linux/printk.h
+Merge made by the 'recursive' strategy.
+ include/linux/printk.h | 6 ++----
+ kernel/printk/printk.c | 2 +-
+ kernel/printk/printk_safe.c | 2 +-
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+Merging pci/next (91f3140fdef6 Merge branch 'pci/host-xilinx' into next)
+$ git merge pci/next
+Resolved 'drivers/pci/host/pcie-tango.c' using previous resolution.
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/pci_regs.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/of_address.h
+Auto-merging drivers/pci/setup-res.c
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/pci/pcie/portdrv_pci.c
+Auto-merging drivers/pci/pcie/portdrv_core.c
+Auto-merging drivers/pci/pcie/aspm.c
+Auto-merging drivers/pci/pci.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/pci-sysfs.c
+Removing drivers/pci/hotplug-pci.c
+Auto-merging drivers/pci/host/pcie-tango.c
+CONFLICT (content): Merge conflict in drivers/pci/host/pcie-tango.c
+Auto-merging drivers/pci/host/pci-tegra.c
+Auto-merging drivers/pci/host/pci-ftpci100.c
+Auto-merging drivers/pci/host/Makefile
+Auto-merging drivers/pci/dwc/pci-dra7xx.c
+Auto-merging drivers/pci/dwc/Makefile
+Auto-merging drivers/pci/Makefile
+Auto-merging arch/x86/pci/intel_mid_pci.c
+Auto-merging arch/x86/pci/fixup.c
+Auto-merging arch/x86/include/asm/pci.h
+Auto-merging arch/sparc/include/asm/pci_32.h
+Auto-merging arch/sh/include/asm/pci.h
+Auto-merging arch/powerpc/kernel/eeh_driver.c
+Auto-merging arch/parisc/include/asm/pci.h
+Auto-merging arch/ia64/include/asm/pci.h
+Auto-merging arch/cris/include/asm/pci.h
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+Auto-merging arch/alpha/kernel/pci_impl.h
+Auto-merging arch/alpha/kernel/pci.c
+Auto-merging arch/alpha/include/asm/pci.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5a21dfa64e36] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ .../interrupt-controller/fsl,ls-scfg-msi.txt | 1 +
+ .../bindings/pci/designware-pcie-ecam.txt | 42 +
+ .../bindings/pci/hisilicon-histb-pcie.txt | 68 ++
+ .../devicetree/bindings/pci/layerscape-pci.txt | 1 +
+ .../bindings/pci/nvidia,tegra20-pcie.txt | 134 ++-
+ .../devicetree/bindings/pci/pci-rcar-gen2.txt | 10 +-
+ .../devicetree/bindings/pci/v3-v360epc-pci.txt | 75 +-
+ MAINTAINERS | 15 +
+ arch/alpha/include/asm/pci.h | 5 -
+ arch/alpha/kernel/pci.c | 11 +-
+ arch/alpha/kernel/pci_impl.h | 8 -
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 31 +
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 75 ++
+ arch/cris/include/asm/pci.h | 9 -
+ arch/frv/include/asm/pci.h | 4 -
+ arch/ia64/include/asm/pci.h | 4 -
+ arch/mips/include/asm/pci.h | 4 -
+ arch/mn10300/include/asm/pci.h | 4 -
+ arch/mn10300/unit-asb2305/pci-asb2305.h | 3 -
+ arch/parisc/include/asm/pci.h | 8 -
+ arch/powerpc/include/asm/pci.h | 2 -
+ arch/powerpc/kernel/eeh_driver.c | 4 +-
+ arch/sh/include/asm/pci.h | 4 -
+ arch/sparc/include/asm/pci_32.h | 2 -
+ arch/x86/include/asm/pci.h | 2 -
+ arch/x86/pci/fixup.c | 85 ++
+ arch/x86/pci/intel_mid_pci.c | 2 +-
+ arch/xtensa/include/asm/pci.h | 2 -
+ drivers/irqchip/irq-ls-scfg-msi.c | 1 +
+ drivers/misc/pci_endpoint_test.c | 33 +-
+ drivers/of/address.c | 19 +-
+ drivers/pci/Kconfig | 17 +-
+ drivers/pci/Makefile | 3 -
+ drivers/pci/dwc/Kconfig | 10 +
+ drivers/pci/dwc/Makefile | 1 +
+ drivers/pci/dwc/pci-dra7xx.c | 17 +
+ drivers/pci/dwc/pci-layerscape.c | 12 +
+ drivers/pci/dwc/pcie-histb.c | 470 ++++++++++
+ drivers/pci/host/Kconfig | 6 +
+ drivers/pci/host/Makefile | 1 +
+ drivers/pci/host/pci-ftpci100.c | 22 +-
+ drivers/pci/host/pci-host-generic.c | 43 +
+ drivers/pci/host/pci-hyperv.c | 8 +-
+ drivers/pci/host/pci-rcar-gen2.c | 20 +-
+ drivers/pci/host/pci-tegra.c | 158 +++-
+ drivers/pci/host/pci-v3-semi.c | 959 +++++++++++++++++++++
+ drivers/pci/host/pci-xgene.c | 24 +-
+ drivers/pci/host/pcie-altera.c | 8 +-
+ drivers/pci/host/pcie-iproc-msi.c | 19 +-
+ drivers/pci/host/pcie-iproc.c | 20 +-
+ drivers/pci/host/pcie-rcar.c | 20 +-
+ drivers/pci/host/pcie-tango.c | 205 ++++-
+ drivers/pci/host/pcie-xilinx.c | 6 +-
+ drivers/pci/hotplug-pci.c | 29 -
+ drivers/pci/hotplug/acpiphp_glue.c | 15 +-
+ drivers/pci/hotplug/cpci_hotplug_pci.c | 7 +-
+ drivers/pci/hotplug/cpqphp.h | 2 +-
+ drivers/pci/hotplug/cpqphp_core.c | 3 +-
+ drivers/pci/hotplug/cpqphp_ctrl.c | 19 +-
+ drivers/pci/hotplug/ibmphp_pci.c | 19 +-
+ drivers/pci/hotplug/pciehp_ctrl.c | 7 +-
+ drivers/pci/hotplug/pciehp_hpc.c | 25 +-
+ drivers/pci/hotplug/pciehp_pci.c | 11 +-
+ drivers/pci/hotplug/shpchp_hpc.c | 9 +-
+ drivers/pci/hotplug/shpchp_pci.c | 6 +-
+ drivers/pci/iov.c | 34 +-
+ drivers/pci/pci-acpi.c | 2 +-
+ drivers/pci/pci-sysfs.c | 35 +-
+ drivers/pci/pci.c | 154 +++-
+ drivers/pci/pci.h | 11 +-
+ drivers/pci/pcie/aer/aerdrv_core.c | 9 +-
+ drivers/pci/pcie/aspm.c | 46 +-
+ drivers/pci/pcie/pme.c | 5 +-
+ drivers/pci/pcie/portdrv_core.c | 171 ++--
+ drivers/pci/pcie/portdrv_pci.c | 1 +
+ drivers/pci/probe.c | 187 +++-
+ drivers/pci/quirks.c | 42 +-
+ drivers/pci/remove.c | 2 +-
+ drivers/pci/rom.c | 19 +-
+ drivers/pci/setup-bus.c | 299 ++++++-
+ drivers/pci/setup-res.c | 58 ++
+ drivers/pci/switch/switchtec.c | 2 +-
+ drivers/pcmcia/cardbus.c | 5 +-
+ include/linux/of_address.h | 10 +-
+ include/linux/pci.h | 16 +-
+ include/uapi/linux/pci_regs.h | 44 +-
+ init/Kconfig | 9 -
+ 87 files changed, 3456 insertions(+), 574 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pci/designware-pcie-ecam.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
+ create mode 100644 drivers/pci/dwc/pcie-histb.c
+ create mode 100644 drivers/pci/host/pci-v3-semi.c
+ delete mode 100644 drivers/pci/hotplug-pci.c
+Merging pstore/for-next/pstore (e19b205be43d Linux 4.14-rc2)
+$ git merge pstore/for-next/pstore
+Already up-to-date.
+Merging hid/for-next (55c25de30188 Merge branch 'for-4.15/upstream' into for-next)
+$ git merge hid/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging i2c/i2c/for-next (a7d4b13f2a0d Merge branch 'i2c/for-4.15' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+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 (0bcea5c474d1 firmware: dmi: handle missing DMI data gracefully)
+$ git merge dmi/master
+Merge made by the 'recursive' strategy.
+ drivers/firmware/dmi-sysfs.c | 2 +-
+ drivers/firmware/dmi_scan.c | 64 +++++++++++++++++++-------------------------
+ 2 files changed, 29 insertions(+), 37 deletions(-)
+Merging hwmon-staging/hwmon-next (ded0eb83449e dt-bindings: pmbus: Add Maxim MAX31785 documentation)
+$ git merge hwmon-staging/hwmon-next
+Already up-to-date.
+Merging jc_docs/docs-next (47427379ea80 documentation: fb: update list of available compiled-in fonts)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging v4l-dvb/master (30b4e122d71c media: rc: sir_ir: detect presence of port)
+$ git merge v4l-dvb/master
+Already up-to-date.
+Merging v4l-dvb-next/master (db6321a1af84 media: platform: VIDEO_QCOM_CAMSS should depend on HAS_DMA)
+$ git merge v4l-dvb-next/master
+Already up-to-date.
+Merging fbdev/fbdev-for-next (d447ebf9c77b fbcon: Initialize ops->info early)
+$ git merge fbdev/fbdev-for-next
+CONFLICT (modify/delete): include/video/iga.h deleted in fbdev/fbdev-for-next and modified in HEAD. Version HEAD of include/video/iga.h left in tree.
+Removing drivers/video/fbdev/igafb.c
+Auto-merging drivers/video/fbdev/aty/radeon_pm.c
+Auto-merging drivers/video/fbdev/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f include/video/iga.h
+include/video/iga.h: needs merge
+rm 'include/video/iga.h'
+$ git commit -v -a
+[master 2bb37116c777] Merge remote-tracking branch 'fbdev/fbdev-for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/google,goldfish-fb.txt | 17 +
+ drivers/video/fbdev/Kconfig | 10 -
+ drivers/video/fbdev/Makefile | 1 -
+ drivers/video/fbdev/aty/atyfb_base.c | 4 +-
+ drivers/video/fbdev/aty/radeon_base.c | 10 +-
+ drivers/video/fbdev/aty/radeon_pm.c | 3 +
+ drivers/video/fbdev/au1200fb.c | 43 +-
+ drivers/video/fbdev/cirrusfb.c | 6 +-
+ drivers/video/fbdev/controlfb.h | 2 +
+ drivers/video/fbdev/core/fbcon.c | 11 +-
+ drivers/video/fbdev/core/fbcon.h | 1 +
+ drivers/video/fbdev/dnfb.c | 15 +-
+ drivers/video/fbdev/goldfishfb.c | 8 +-
+ drivers/video/fbdev/igafb.c | 579 ---------------------
+ drivers/video/fbdev/intelfb/intelfbhw.c | 9 +-
+ drivers/video/fbdev/matrox/matroxfb_base.c | 2 +-
+ drivers/video/fbdev/mxsfb.c | 13 +-
+ drivers/video/fbdev/omap/hwa742.c | 6 +-
+ drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 6 +-
+ drivers/video/fbdev/pxa3xx-gcu.c | 24 +-
+ drivers/video/fbdev/sa1100fb.c | 75 +--
+ drivers/video/fbdev/sa1100fb.h | 2 +
+ drivers/video/fbdev/sis/init301.c | 2 +-
+ drivers/video/fbdev/sis/sis_main.c | 4 +
+ drivers/video/fbdev/sm501fb.c | 16 +-
+ drivers/video/fbdev/udlfb.c | 10 +-
+ include/video/iga.h | 25 -
+ 27 files changed, 159 insertions(+), 745 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/google,goldfish-fb.txt
+ delete mode 100644 drivers/video/fbdev/igafb.c
+ delete mode 100644 include/video/iga.h
+Merging pm/linux-next (e23d3f3f9c76 Merge branch 'pm-x86' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/cpu/Makefile | 2 +-
+ arch/x86/kernel/cpu/aperfmperf.c | 74 ++++++++++++++++++++++++++++------------
+ arch/x86/kernel/cpu/cpu.h | 3 ++
+ arch/x86/kernel/cpu/proc.c | 6 +++-
+ drivers/acpi/utils.c | 1 +
+ drivers/base/power/runtime.c | 30 ++++++----------
+ fs/proc/cpuinfo.c | 6 ++++
+ include/linux/cpufreq.h | 1 +
+ 8 files changed, 79 insertions(+), 44 deletions(-)
+Merging cpupower/cpupower (dbdc468f35ee cpupower : Fix cpupower working when cpu0 is offline)
+$ git merge cpupower/cpupower
+Merge made by the 'recursive' strategy.
+ tools/power/cpupower/bench/system.c | 2 +-
+ tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c | 9 ++++++---
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
+$ git merge idle/next
+Already up-to-date.
+Merging opp/opp/linux-next (9e66317d3c92 Linux 4.14-rc3)
+$ git merge opp/opp/linux-next
+Already up-to-date.
+Merging thermal/next (1e032393d968 Merge branches 'thermal-core', 'thermal-tool', 'thermal-intel' and 'thermal-soc' into next)
+$ git merge thermal/next
+Resolved 'tools/thermal/tmon/Makefile' using previous resolution.
+Auto-merging tools/thermal/tmon/Makefile
+CONFLICT (content): Merge conflict in tools/thermal/tmon/Makefile
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f54c8200150fab80441e81c3f04049a0c23d6e98] Merge remote-tracking branch 'thermal/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/thermal/brcm,avs-tmon.txt | 20 +
+ .../devicetree/bindings/thermal/imx-thermal.txt | 7 +
+ .../bindings/thermal/rockchip-thermal.txt | 1 +
+ MAINTAINERS | 8 +
+ drivers/thermal/Kconfig | 3 +-
+ drivers/thermal/armada_thermal.c | 2 +-
+ drivers/thermal/broadcom/Kconfig | 7 +
+ drivers/thermal/broadcom/Makefile | 1 +
+ drivers/thermal/broadcom/brcmstb_thermal.c | 387 +++++++++++++
+ drivers/thermal/cpu_cooling.c | 2 +-
+ drivers/thermal/hisi_thermal.c | 612 ++++++++++++++-------
+ drivers/thermal/imx_thermal.c | 104 +++-
+ .../int340x_thermal/processor_thermal_device.c | 6 +
+ drivers/thermal/intel_bxt_pmic_thermal.c | 3 +-
+ drivers/thermal/intel_pch_thermal.c | 11 +
+ drivers/thermal/intel_powerclamp.c | 4 +-
+ drivers/thermal/qcom-spmi-temp-alarm.c | 43 +-
+ drivers/thermal/rcar_gen3_thermal.c | 34 +-
+ drivers/thermal/rockchip_thermal.c | 67 +++
+ drivers/thermal/step_wise.c | 11 +-
+ drivers/thermal/tegra/soctherm.c | 2 +-
+ drivers/thermal/thermal-generic-adc.c | 24 +-
+ drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 3 +-
+ include/linux/thermal.h | 2 +-
+ tools/thermal/tmon/Makefile | 18 +-
+ 25 files changed, 1055 insertions(+), 327 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
+ create mode 100644 drivers/thermal/broadcom/brcmstb_thermal.c
+Merging thermal-soc/next (b2fd708ffa7f thermal: cpu_cooling: pr_err() strings should end with newlines)
+$ git merge thermal-soc/next
+Already up-to-date.
+Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
+$ git merge ieee1394/for-next
+Auto-merging drivers/firewire/net.c
+Merge made by the 'recursive' strategy.
+ drivers/firewire/net.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump)
+$ git merge dlm/next
+Already up-to-date.
+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 (50895b9de1d3 tcp: highest_sack fix)
+$ git merge net-next/master
+Already up-to-date.
+Merging ipsec-next/master (2a171788ba7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging netfilter-next/master (347fdfb20f3f netfilter: nf_ct_h323: Extend nf_h323_error_boundary to work on bits as well)
+$ git merge netfilter-next/master
+Auto-merging net/netfilter/nfnetlink_queue.c
+Merge made by the 'recursive' strategy.
+ include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 12 +--
+ include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 12 +--
+ include/net/netfilter/nf_conntrack_l4proto.h | 19 ++--
+ net/ipv4/netfilter/arp_tables.c | 1 -
+ net/ipv4/netfilter/ip_tables.c | 1 -
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 +
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +-
+ net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +-
+ net/ipv6/netfilter/ip6_tables.c | 1 -
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 2 +-
+ net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 4 +-
+ net/netfilter/ipset/ip_set_core.c | 2 +-
+ net/netfilter/ipvs/ip_vs_proto_tcp.c | 1 +
+ net/netfilter/ipvs/ip_vs_proto_udp.c | 1 +
+ net/netfilter/nf_conntrack_h323_asn1.c | 131 +++++++++++++++++++------
+ net/netfilter/nf_conntrack_netlink.c | 4 +-
+ net/netfilter/nf_conntrack_proto.c | 18 ++--
+ net/netfilter/nf_conntrack_proto_dccp.c | 21 ++--
+ net/netfilter/nf_conntrack_proto_generic.c | 4 +-
+ net/netfilter/nf_conntrack_proto_gre.c | 4 +-
+ net/netfilter/nf_conntrack_proto_sctp.c | 21 ++--
+ net/netfilter/nf_conntrack_proto_tcp.c | 22 ++---
+ net/netfilter/nf_conntrack_proto_udp.c | 10 +-
+ net/netfilter/nf_tables_api.c | 7 ++
+ net/netfilter/nfnetlink_log.c | 5 +
+ net/netfilter/nfnetlink_queue.c | 5 +
+ net/netfilter/nft_cmp.c | 2 +
+ net/netfilter/x_tables.c | 11 ++-
+ 28 files changed, 211 insertions(+), 117 deletions(-)
+Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support)
+$ git merge nfc-next/master
+Already up-to-date.
+Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.)
+$ git merge ipvs-next/master
+Auto-merging net/netfilter/ipvs/ip_vs_proto_tcp.c
+Merge made by the 'recursive' strategy.
+ net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging wireless-drivers-next/master (fdd0bd88ceae brcmfmac: add CLM download support)
+$ git merge wireless-drivers-next/master
+Already up-to-date.
+Merging bluetooth/master (869efc02aba6 Bluetooth: btusb: Fix BT_HCIBTUSB_AUTOSUSPEND Kconfig option name)
+$ git merge bluetooth/master
+Auto-merging drivers/bluetooth/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 --
+ drivers/bluetooth/Kconfig | 10 ++++++++++
+ drivers/bluetooth/btusb.c | 7 +++++++
+ drivers/bluetooth/hci_qca.c | 3 +++
+ net/bluetooth/af_bluetooth.c | 38 +++++++++++++++++---------------------
+ 5 files changed, 37 insertions(+), 23 deletions(-)
+Merging mac80211-next/master (5048a9c329af mac80211: make __ieee80211_start_rx_ba_session static)
+$ git merge mac80211-next/master
+Auto-merging net/wireless/nl80211.c
+Auto-merging net/mac80211/sta_info.c
+Auto-merging net/mac80211/cfg.c
+Merge made by the 'recursive' strategy.
+ include/net/mac80211.h | 4 ++++
+ net/mac80211/agg-rx.c | 57 ++++++++++++++++-----------------------------
+ net/mac80211/agg-tx.c | 57 ++++++++++++++-------------------------------
+ net/mac80211/cfg.c | 3 +++
+ net/mac80211/debugfs.c | 1 +
+ net/mac80211/ht.c | 1 +
+ net/mac80211/ibss.c | 7 +++---
+ net/mac80211/ieee80211_i.h | 7 ++----
+ net/mac80211/iface.c | 2 +-
+ net/mac80211/led.c | 11 +++++----
+ net/mac80211/main.c | 3 +--
+ net/mac80211/mesh.c | 29 +++++++++++------------
+ net/mac80211/mesh.h | 2 +-
+ net/mac80211/mesh_hwmp.c | 5 ++--
+ net/mac80211/mesh_pathtbl.c | 3 +--
+ net/mac80211/mesh_plink.c | 2 +-
+ net/mac80211/mlme.c | 33 ++++++++++++--------------
+ net/mac80211/ocb.c | 10 ++++----
+ net/mac80211/offchannel.c | 4 ++--
+ net/mac80211/sta_info.c | 15 +++---------
+ net/mac80211/sta_info.h | 12 ++++++++--
+ net/mac80211/tdls.c | 6 ++++-
+ net/mac80211/wme.c | 1 +
+ net/wireless/nl80211.c | 26 +++++++++++++++++++--
+ net/wireless/reg.c | 42 +++++++++++++++++++++------------
+ 25 files changed, 171 insertions(+), 172 deletions(-)
+Merging rdma/for-next (4190b4e96954 RDMA/core: Rename kernel modify_cq to better describe its usage)
+$ git merge rdma/for-next
+Resolved 'drivers/infiniband/hw/hfi1/file_ops.c' using previous resolution.
+Resolved 'drivers/net/ethernet/mellanox/mlx4/catas.c' using previous resolution.
+Auto-merging include/uapi/rdma/vmw_pvrdma-abi.h
+Auto-merging include/uapi/rdma/mlx5-abi.h
+Auto-merging include/uapi/rdma/ib_user_verbs.h
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Auto-merging include/linux/mlx5/cq.h
+Auto-merging drivers/net/ethernet/mellanox/mlx4/catas.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/catas.c
+Auto-merging drivers/infiniband/sw/rdmavt/qp.c
+Auto-merging drivers/infiniband/hw/qedr/qedr_roce_cm.c
+Auto-merging drivers/infiniband/hw/qedr/Kconfig
+Auto-merging drivers/infiniband/hw/hfi1/user_sdma.c
+Auto-merging drivers/infiniband/hw/hfi1/ud.c
+Auto-merging drivers/infiniband/hw/hfi1/uc.c
+Auto-merging drivers/infiniband/hw/hfi1/sdma.c
+Auto-merging drivers/infiniband/hw/hfi1/ruc.c
+Auto-merging drivers/infiniband/hw/hfi1/pio.c
+Auto-merging drivers/infiniband/hw/hfi1/file_ops.c
+CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/file_ops.c
+Removing drivers/infiniband/core/umem_rbtree.c
+Auto-merging drivers/infiniband/core/Makefile
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ad16b769b79ea5df0f4bd39e34ce0597d1e3ad81] Merge remote-tracking branch 'rdma/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 3 +-
+ drivers/infiniband/Kconfig | 2 +-
+ drivers/infiniband/core/Makefile | 2 +-
+ drivers/infiniband/core/addr.c | 29 +-
+ drivers/infiniband/core/cm.c | 38 +-
+ drivers/infiniband/core/cma.c | 19 +-
+ drivers/infiniband/core/iwcm.c | 3 -
+ drivers/infiniband/core/mad.c | 3 +-
+ drivers/infiniband/core/rw.c | 24 +-
+ drivers/infiniband/core/security.c | 66 +-
+ drivers/infiniband/core/sysfs.c | 16 +-
+ drivers/infiniband/core/umem_odp.c | 72 +
+ drivers/infiniband/core/umem_rbtree.c | 109 -
+ drivers/infiniband/core/user_mad.c | 13 +-
+ drivers/infiniband/core/uverbs.h | 36 +-
+ drivers/infiniband/core/uverbs_cmd.c | 189 +-
+ drivers/infiniband/core/uverbs_ioctl.c | 13 +-
+ drivers/infiniband/core/uverbs_ioctl_merge.c | 2 +-
+ drivers/infiniband/core/uverbs_main.c | 23 +-
+ drivers/infiniband/core/uverbs_marshall.c | 13 +-
+ drivers/infiniband/core/uverbs_std_types.c | 20 +-
+ drivers/infiniband/core/verbs.c | 52 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 78 +-
+ drivers/infiniband/hw/bnxt_re/main.c | 19 +-
+ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 39 +-
+ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 1 +
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 18 +-
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 6 +-
+ drivers/infiniband/hw/bnxt_re/qplib_res.h | 2 +-
+ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 5 +-
+ drivers/infiniband/hw/bnxt_re/roce_hsi.h | 2 +-
+ drivers/infiniband/hw/cxgb3/Kconfig | 2 +-
+ drivers/infiniband/hw/cxgb3/cxio_hal.c | 6 +-
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 18 +-
+ drivers/infiniband/hw/cxgb3/iwch_provider.c | 1 -
+ drivers/infiniband/hw/cxgb3/iwch_provider.h | 1 -
+ drivers/infiniband/hw/cxgb3/iwch_qp.c | 3 +
+ drivers/infiniband/hw/cxgb4/Kconfig | 2 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 330 +-
+ drivers/infiniband/hw/cxgb4/cq.c | 127 +-
+ drivers/infiniband/hw/cxgb4/device.c | 69 +-
+ drivers/infiniband/hw/cxgb4/ev.c | 10 +-
+ drivers/infiniband/hw/cxgb4/id_table.c | 1 -
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 95 +-
+ drivers/infiniband/hw/cxgb4/mem.c | 268 +-
+ drivers/infiniband/hw/cxgb4/provider.c | 66 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 186 +-
+ drivers/infiniband/hw/cxgb4/resource.c | 46 +-
+ drivers/infiniband/hw/cxgb4/t4.h | 29 +-
+ drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 4 +-
+ drivers/infiniband/hw/hfi1/aspm.h | 7 +-
+ drivers/infiniband/hw/hfi1/chip.c | 385 +--
+ drivers/infiniband/hw/hfi1/chip.h | 6 +-
+ drivers/infiniband/hw/hfi1/common.h | 1 +
+ drivers/infiniband/hw/hfi1/debugfs.c | 60 +-
+ drivers/infiniband/hw/hfi1/driver.c | 22 +-
+ drivers/infiniband/hw/hfi1/file_ops.c | 486 +--
+ drivers/infiniband/hw/hfi1/firmware.c | 113 +-
+ drivers/infiniband/hw/hfi1/hfi.h | 35 +-
+ drivers/infiniband/hw/hfi1/init.c | 53 +-
+ drivers/infiniband/hw/hfi1/intr.c | 57 +-
+ drivers/infiniband/hw/hfi1/mad.c | 144 +-
+ drivers/infiniband/hw/hfi1/mad.h | 4 +-
+ drivers/infiniband/hw/hfi1/mmu_rb.c | 24 +-
+ drivers/infiniband/hw/hfi1/pio.c | 17 -
+ drivers/infiniband/hw/hfi1/pio.h | 6 -
+ drivers/infiniband/hw/hfi1/rc.c | 7 +-
+ drivers/infiniband/hw/hfi1/ruc.c | 11 +-
+ drivers/infiniband/hw/hfi1/sdma.c | 36 +-
+ drivers/infiniband/hw/hfi1/sysfs.c | 2 +-
+ drivers/infiniband/hw/hfi1/trace.c | 27 +-
+ drivers/infiniband/hw/hfi1/trace.h | 10 +
+ drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 49 +-
+ drivers/infiniband/hw/hfi1/trace_rx.h | 11 +-
+ drivers/infiniband/hw/hfi1/uc.c | 3 +-
+ drivers/infiniband/hw/hfi1/ud.c | 8 +-
+ drivers/infiniband/hw/hfi1/user_exp_rcv.c | 9 +-
+ drivers/infiniband/hw/hfi1/user_sdma.c | 92 +-
+ drivers/infiniband/hw/hfi1/user_sdma.h | 29 +-
+ drivers/infiniband/hw/hfi1/verbs.c | 65 +-
+ drivers/infiniband/hw/hfi1/verbs_txreq.h | 2 +
+ drivers/infiniband/hw/hfi1/vnic_main.c | 44 +-
+ drivers/infiniband/hw/hns/Kconfig | 25 +-
+ drivers/infiniband/hw/hns/Makefile | 8 +-
+ drivers/infiniband/hw/hns/hns_roce_ah.c | 16 +-
+ drivers/infiniband/hw/hns/hns_roce_alloc.c | 35 +-
+ drivers/infiniband/hw/hns/hns_roce_cmd.c | 107 +-
+ drivers/infiniband/hw/hns/hns_roce_cmd.h | 54 +
+ drivers/infiniband/hw/hns/hns_roce_common.h | 23 +
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 95 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 134 +-
+ drivers/infiniband/hw/hns/hns_roce_eq.c | 6 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 719 ++++-
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 33 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 609 +++-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 7 +
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3296 ++++++++++++++++++++
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 1177 +++++++
+ drivers/infiniband/hw/hns/hns_roce_main.c | 384 +--
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 692 +++-
+ drivers/infiniband/hw/hns/hns_roce_pd.c | 20 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 226 +-
+ drivers/infiniband/hw/i40iw/Kconfig | 1 +
+ drivers/infiniband/hw/i40iw/i40iw.h | 3 -
+ drivers/infiniband/hw/i40iw/i40iw_cm.c | 30 +-
+ drivers/infiniband/hw/i40iw/i40iw_cm.h | 1 +
+ drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 76 +-
+ drivers/infiniband/hw/i40iw/i40iw_d.h | 30 +-
+ drivers/infiniband/hw/i40iw/i40iw_hw.c | 3 +-
+ drivers/infiniband/hw/i40iw/i40iw_main.c | 48 +-
+ drivers/infiniband/hw/i40iw/i40iw_p.h | 3 +-
+ drivers/infiniband/hw/i40iw/i40iw_puda.c | 19 +-
+ drivers/infiniband/hw/i40iw/i40iw_puda.h | 2 -
+ drivers/infiniband/hw/i40iw/i40iw_type.h | 13 +-
+ drivers/infiniband/hw/i40iw/i40iw_uk.c | 76 +-
+ drivers/infiniband/hw/i40iw/i40iw_user.h | 23 +-
+ drivers/infiniband/hw/i40iw/i40iw_utils.c | 30 +-
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 47 +-
+ drivers/infiniband/hw/mlx4/ah.c | 8 +-
+ drivers/infiniband/hw/mlx4/cq.c | 10 +-
+ drivers/infiniband/hw/mlx4/main.c | 23 +
+ drivers/infiniband/hw/mlx4/mcg.c | 1 +
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 19 +-
+ drivers/infiniband/hw/mlx4/mr.c | 284 +-
+ drivers/infiniband/hw/mlx4/qp.c | 26 +-
+ drivers/infiniband/hw/mlx5/ah.c | 4 -
+ drivers/infiniband/hw/mlx5/cq.c | 38 +-
+ drivers/infiniband/hw/mlx5/main.c | 57 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 18 +
+ drivers/infiniband/hw/mlx5/mr.c | 4 +-
+ drivers/infiniband/hw/mlx5/odp.c | 6 +-
+ drivers/infiniband/hw/mlx5/qp.c | 149 +-
+ drivers/infiniband/hw/mthca/mthca_main.c | 10 +-
+ drivers/infiniband/hw/nes/nes.c | 33 +-
+ drivers/infiniband/hw/nes/nes.h | 6 +-
+ drivers/infiniband/hw/nes/nes_cm.c | 14 +-
+ drivers/infiniband/hw/nes/nes_hw.c | 27 +-
+ drivers/infiniband/hw/nes/nes_hw.h | 1 +
+ drivers/infiniband/hw/nes/nes_mgt.c | 9 +-
+ drivers/infiniband/hw/nes/nes_nic.c | 12 +-
+ drivers/infiniband/hw/nes/nes_utils.c | 24 +-
+ drivers/infiniband/hw/nes/nes_verbs.c | 22 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 15 -
+ drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 14 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +-
+ drivers/infiniband/hw/qedr/Kconfig | 1 +
+ drivers/infiniband/hw/qedr/Makefile | 2 +-
+ drivers/infiniband/hw/qedr/main.c | 118 +-
+ drivers/infiniband/hw/qedr/qedr.h | 31 +-
+ drivers/infiniband/hw/qedr/qedr_hsi_rdma.h | 6 +-
+ drivers/infiniband/hw/qedr/qedr_iw_cm.c | 749 +++++
+ drivers/infiniband/hw/qedr/qedr_iw_cm.h | 49 +
+ .../hw/qedr/{qedr_cm.c => qedr_roce_cm.c} | 31 +-
+ .../hw/qedr/{qedr_cm.h => qedr_roce_cm.h} | 0
+ drivers/infiniband/hw/qedr/verbs.c | 359 ++-
+ drivers/infiniband/hw/qedr/verbs.h | 2 +
+ drivers/infiniband/hw/qib/Kconfig | 1 +
+ drivers/infiniband/hw/qib/qib.h | 30 +-
+ drivers/infiniband/hw/qib/qib_7220.h | 2 +-
+ drivers/infiniband/hw/qib/qib_diag.c | 6 -
+ drivers/infiniband/hw/qib/qib_driver.c | 9 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 9 -
+ drivers/infiniband/hw/qib/qib_iba6120.c | 81 +-
+ drivers/infiniband/hw/qib/qib_iba7220.c | 95 +-
+ drivers/infiniband/hw/qib/qib_iba7322.c | 196 +-
+ drivers/infiniband/hw/qib/qib_init.c | 29 +-
+ drivers/infiniband/hw/qib/qib_intr.c | 6 +-
+ drivers/infiniband/hw/qib/qib_mad.c | 16 +-
+ drivers/infiniband/hw/qib/qib_pcie.c | 128 +-
+ drivers/infiniband/hw/qib/qib_rc.c | 2 +-
+ drivers/infiniband/hw/qib/qib_sd7220.c | 12 +-
+ drivers/infiniband/hw/qib/qib_sdma.c | 2 +-
+ drivers/infiniband/hw/qib/qib_tx.c | 8 +-
+ drivers/infiniband/hw/qib/qib_verbs.c | 9 +-
+ drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 -
+ drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h | 25 +-
+ drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 1 +
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 25 +
+ drivers/infiniband/hw/vmw_pvrdma/Makefile | 2 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 25 +
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 54 +
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 59 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 55 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 319 ++
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 3 +
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 18 +
+ drivers/infiniband/sw/rdmavt/Kconfig | 1 +
+ drivers/infiniband/sw/rdmavt/mcast.c | 2 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 13 +-
+ drivers/infiniband/sw/rxe/rxe_comp.c | 8 +-
+ drivers/infiniband/sw/rxe/rxe_loc.h | 4 +-
+ drivers/infiniband/sw/rxe/rxe_pool.c | 16 +-
+ drivers/infiniband/sw/rxe/rxe_qp.c | 4 +-
+ drivers/infiniband/sw/rxe/rxe_req.c | 4 +-
+ drivers/infiniband/sw/rxe/rxe_task.c | 2 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 11 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h | 16 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 56 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 5 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 135 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 29 +-
+ drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 17 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 2 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 14 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c | 42 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 22 +-
+ .../infiniband/ulp/opa_vnic/opa_vnic_internal.h | 7 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 44 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 1 +
+ .../infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 22 +-
+ drivers/infiniband/ulp/srp/ib_srp.c | 90 +-
+ drivers/infiniband/ulp/srp/ib_srp.h | 3 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 331 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.h | 9 +-
+ drivers/net/ethernet/chelsio/cxgb3/t3cdev.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/catas.c | 8 +-
+ drivers/staging/lustre/lnet/Kconfig | 2 +-
+ include/linux/mlx4/cq.h | 3 +
+ include/linux/mlx5/cq.h | 9 +-
+ include/linux/mlx5/mlx5_ifc.h | 9 +-
+ include/rdma/ib_addr.h | 16 +-
+ include/rdma/ib_pack.h | 19 +-
+ include/rdma/ib_sa.h | 12 +-
+ include/rdma/ib_umem_odp.h | 4 -
+ include/rdma/ib_verbs.h | 35 +-
+ include/rdma/opa_addr.h | 6 +-
+ include/rdma/rdmavt_qp.h | 6 +-
+ include/uapi/rdma/ib_user_verbs.h | 22 +-
+ include/uapi/rdma/mlx5-abi.h | 52 +-
+ include/uapi/rdma/vmw_pvrdma-abi.h | 2 +
+ 231 files changed, 12878 insertions(+), 3733 deletions(-)
+ delete mode 100644 drivers/infiniband/core/umem_rbtree.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2.h
+ create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.c
+ create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.h
+ rename drivers/infiniband/hw/qedr/{qedr_cm.c => qedr_roce_cm.c} (96%)
+ rename drivers/infiniband/hw/qedr/{qedr_cm.h => qedr_roce_cm.h} (100%)
+ create mode 100644 drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
+Merging gfs2/for-next (37cb8e1f8e10 Merge tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
+$ git merge gfs2/for-next
+Already up-to-date.
+Merging mtd/master (36de80740008 mtd: nand: atmel: fix buffer overflow in atmel_pmecc_user)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (1530578abdac mtd: Avoid probe failures when mtd->dbg.dfs_dir is invalid)
+$ git merge l2-mtd/master
+Resolved 'Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt' using previous resolution.
+Auto-merging lib/Kconfig
+Auto-merging include/linux/platform_data/mtd-nand-omap2.h
+Auto-merging include/linux/mtd/nand-gpio.h
+Auto-merging drivers/mtd/nand/Makefile
+Auto-merging arch/um/Kconfig.common
+Auto-merging Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8f0867b967c627d9e3431b33fb9198e3eb9d414a] Merge remote-tracking branch 'l2-mtd/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mtd/cadence-quadspi.txt | 7 +-
+ .../devicetree/bindings/mtd/denali-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/jedec,spi-nor.txt | 1 +
+ .../devicetree/bindings/mtd/mtk-quadspi.txt | 15 +-
+ .../devicetree/bindings/mtd/pxa3xx-nand.txt | 4 +
+ arch/arm/mach-pxa/cm-x255.c | 19 +-
+ arch/um/Kconfig.common | 1 -
+ drivers/mtd/Kconfig | 1 -
+ drivers/mtd/chips/map_ram.c | 34 +-
+ drivers/mtd/chips/map_rom.c | 34 +-
+ drivers/mtd/devices/docg3.c | 7 +-
+ drivers/mtd/devices/lart.c | 2 +-
+ drivers/mtd/devices/m25p80.c | 1 +
+ drivers/mtd/devices/mtdram.c | 36 +-
+ drivers/mtd/devices/slram.c | 9 +-
+ drivers/mtd/maps/cfi_flagadm.c | 2 +-
+ drivers/mtd/maps/impa7.c | 2 +-
+ drivers/mtd/maps/netsc520.c | 2 +-
+ drivers/mtd/maps/nettel.c | 2 +-
+ drivers/mtd/maps/plat-ram.c | 38 +-
+ drivers/mtd/maps/sbc_gxx.c | 2 +-
+ drivers/mtd/maps/ts5500_flash.c | 2 +-
+ drivers/mtd/maps/uclinux.c | 2 +-
+ drivers/mtd/mtdconcat.c | 27 --
+ drivers/mtd/mtdcore.c | 61 +++-
+ drivers/mtd/mtdpart.c | 14 -
+ drivers/mtd/mtdswap.c | 4 +-
+ drivers/mtd/nand/Kconfig | 5 +-
+ drivers/mtd/nand/Makefile | 2 +-
+ drivers/mtd/nand/ams-delta.c | 2 +-
+ drivers/mtd/nand/atmel/nand-controller.c | 7 +-
+ drivers/mtd/nand/atmel/pmecc.c | 17 +-
+ drivers/mtd/nand/atmel/pmecc.h | 1 +
+ drivers/mtd/nand/au1550nd.c | 3 +-
+ drivers/mtd/nand/cmx270_nand.c | 2 +-
+ drivers/mtd/nand/denali.c | 291 +++++++--------
+ drivers/mtd/nand/denali.h | 44 ++-
+ drivers/mtd/nand/denali_dt.c | 4 +-
+ drivers/mtd/nand/denali_pci.c | 5 +-
+ drivers/mtd/nand/diskonchip.c | 3 +-
+ drivers/mtd/nand/gpio.c | 112 +++---
+ drivers/mtd/nand/hisi504_nand.c | 3 +-
+ drivers/mtd/nand/mtk_ecc.c | 13 +-
+ drivers/mtd/nand/mxc_nand.c | 19 +-
+ drivers/mtd/nand/nand_base.c | 34 +-
+ drivers/mtd/nand/nandsim.c | 13 +-
+ drivers/mtd/nand/nuc900_nand.c | 2 +-
+ drivers/mtd/nand/omap2.c | 377 +++++++++++--------
+ drivers/mtd/nand/pxa3xx_nand.c | 41 ++-
+ drivers/mtd/nand/qcom_nandc.c | 127 ++++++-
+ drivers/mtd/nand/sh_flctl.c | 9 +-
+ drivers/mtd/parsers/Kconfig | 8 +
+ drivers/mtd/parsers/Makefile | 1 +
+ drivers/mtd/parsers/sharpslpart.c | 398 +++++++++++++++++++++
+ drivers/mtd/spi-nor/Kconfig | 6 +-
+ drivers/mtd/spi-nor/cadence-quadspi.c | 55 ++-
+ drivers/mtd/spi-nor/intel-spi-pci.c | 3 +
+ drivers/mtd/spi-nor/intel-spi.c | 209 ++++++++---
+ drivers/mtd/spi-nor/mtk-quadspi.c | 70 +++-
+ drivers/mtd/spi-nor/spi-nor.c | 105 ++++--
+ drivers/mtd/spi-nor/stm32-quadspi.c | 35 +-
+ include/linux/mtd/mtd.h | 6 +-
+ include/linux/mtd/nand-gpio.h | 5 -
+ include/linux/mtd/rawnand.h | 3 +
+ include/linux/mtd/spi-nor.h | 10 +
+ include/linux/platform_data/mtd-nand-omap2.h | 17 -
+ lib/Kconfig | 4 -
+ 67 files changed, 1648 insertions(+), 754 deletions(-)
+ create mode 100644 drivers/mtd/parsers/sharpslpart.c
+Merging nand/nand/next (30863e38ebeb mtd: nand: Fix writing mtdoops to nand flash.)
+$ git merge nand/nand/next
+Already up-to-date.
+Merging spi-nor/spi-nor/next (ec0a9f62b393 mtd: intel-spi: Add Intel Lewisburg PCH SPI super SKU PCI ID)
+$ git merge spi-nor/spi-nor/next
+Already up-to-date.
+Merging crypto/master (1d9ddde12e3c lib/mpi: call cond_resched() from mpi_powm() loop)
+$ git merge crypto/master
+Already up-to-date.
+Merging drm/drm-next (f150891fd987 Merge tag 'exynos-drm-next-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
+$ git merge drm/drm-next
+Resolved 'drivers/gpu/drm/pl111/Makefile' using previous resolution.
+Resolved 'drivers/gpu/drm/sun4i/Makefile' using previous resolution.
+Resolved 'drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c' using previous resolution.
+Auto-merging scripts/coccinelle/api/drm-get-put.cocci
+Auto-merging mm/shmem.c
+Auto-merging include/uapi/drm/i915_drm.h
+Auto-merging include/uapi/drm/etnaviv_drm.h
+Auto-merging include/linux/shmem_fs.h
+Auto-merging include/linux/scatterlist.h
+Auto-merging include/drm/drm_of.h
+Auto-merging include/drm/drm_fb_cma_helper.h
+Auto-merging include/drm/drm_edid.h
+Auto-merging drivers/staging/vboxvideo/vbox_mode.c
+Auto-merging drivers/rapidio/devices/rio_mport_cdev.c
+Auto-merging drivers/gpu/host1x/dev.c
+Auto-merging drivers/gpu/host1x/bus.c
+Auto-merging drivers/gpu/host1x/Makefile
+Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c
+Auto-merging drivers/gpu/drm/vc4/Makefile
+Auto-merging drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
+Auto-merging drivers/gpu/drm/tegra/drm.c
+Auto-merging drivers/gpu/drm/sun4i/Makefile
+CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/Makefile
+Auto-merging drivers/gpu/drm/rockchip/Makefile
+Auto-merging drivers/gpu/drm/radeon/radeon_trace.h
+Removing drivers/gpu/drm/radeon/radeon_kfd.c
+Auto-merging drivers/gpu/drm/radeon/Makefile
+Removing drivers/gpu/drm/pl111/pl111_connector.c
+Auto-merging drivers/gpu/drm/pl111/Makefile
+CONFLICT (content): Merge conflict in drivers/gpu/drm/pl111/Makefile
+Auto-merging drivers/gpu/drm/panel/Makefile
+Auto-merging drivers/gpu/drm/omapdrm/dss/Makefile
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h
+CONFLICT (modify/delete): drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h deleted in drm/drm-next and modified in HEAD. Version HEAD of drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h left in tree.
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp10b.c
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp100.c
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gm20b.c
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h
+Auto-merging drivers/gpu/drm/nouveau/nv50_display.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_sgdma.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.h
+Auto-merging drivers/gpu/drm/nouveau/nouveau_fence.h
+Auto-merging drivers/gpu/drm/nouveau/nouveau_drv.h
+Auto-merging drivers/gpu/drm/nouveau/nouveau_display.h
+Auto-merging drivers/gpu/drm/nouveau/nouveau_chan.h
+Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.h
+Auto-merging drivers/gpu/drm/nouveau/nouveau_abi16.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/os.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/object.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/mm.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/memory.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/client.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/os.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/object.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/ioctl.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/device.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/class.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/cla06f.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/cl906f.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/cl826f.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/cl826e.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/cl506f.h
+Auto-merging drivers/gpu/drm/nouveau/include/nvif/cl506e.h
+Auto-merging drivers/gpu/drm/msm/Makefile
+Auto-merging drivers/gpu/drm/i915/selftests/i915_mock_selftests.h
+Auto-merging drivers/gpu/drm/i915/selftests/i915_live_selftests.h
+Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
+Auto-merging drivers/gpu/drm/i915/intel_guc_fw.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_trace.h
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/Makefile
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+Auto-merging drivers/gpu/drm/etnaviv/Makefile
+Auto-merging drivers/gpu/drm/drm_trace.h
+Auto-merging drivers/gpu/drm/drm_edid.c
+Auto-merging drivers/gpu/drm/bridge/Makefile
+Auto-merging drivers/gpu/drm/armada/armada_trace.h
+Auto-merging drivers/gpu/drm/armada/Makefile
+Auto-merging drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+Removing drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h
+Removing drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
+Removing drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
+Removing drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h
+Removing drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
+Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/Makefile
+Removing drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h
+Removing drivers/gpu/drm/amd/powerplay/inc/eventmgr.h
+Removing drivers/gpu/drm/amd/powerplay/inc/eventmanager.h
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c
+Removing drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/psm.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.h
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.h
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/Makefile
+Auto-merging drivers/gpu/drm/amd/powerplay/Makefile
+Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/Makefile
+Auto-merging drivers/gpu/drm/Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h
+drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h: needs merge
+rm 'drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h'
+$ git commit -v -a
+[master 73c918b30ed0a747d176446e5b60a2fb364d335a] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ .../bindings/display/bridge/adi,adv7511.txt | 4 +
+ .../devicetree/bindings/display/bridge/sii9234.txt | 49 +
+ .../devicetree/bindings/display/faraday,tve200.txt | 54 +
+ .../devicetree/bindings/display/msm/dsi.txt | 36 +-
+ .../devicetree/bindings/display/msm/edp.txt | 20 +-
+ .../devicetree/bindings/display/msm/hdmi.txt | 8 +-
+ .../devicetree/bindings/display/msm/mdp5.txt | 32 +-
+ .../bindings/display/panel/orisetech,otm8009a.txt | 21 +
+ .../panel/raspberrypi,7inch-touchscreen.txt | 49 +
+ .../bindings/display/panel/samsung,s6e63j0x03.txt | 24 +
+ .../bindings/display/panel/seiko,43wvf1g.txt | 23 +
+ .../display/panel/toshiba,lt089ac29000.txt | 8 +
+ .../bindings/display/rockchip/rockchip-lvds.txt | 99 +
+ .../bindings/display/sunxi/sun4i-drm.txt | 12 +
+ .../display/tegra/nvidia,tegra20-host1x.txt | 4 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/gpu/drm-uapi.rst | 55 +
+ Documentation/gpu/index.rst | 1 +
+ Documentation/gpu/todo.rst | 55 +-
+ Documentation/gpu/tve200.rst | 6 +
+ MAINTAINERS | 13 +-
+ arch/powerpc/kernel/pci-common.c | 12 -
+ drivers/dma-buf/dma-buf.c | 2 +-
+ drivers/dma-buf/reservation.c | 56 +-
+ drivers/dma-buf/sw_sync.c | 10 +-
+ drivers/gpu/drm/Kconfig | 7 +-
+ drivers/gpu/drm/Makefile | 8 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 121 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 159 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 56 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 153 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 386 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 114 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 265 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 169 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 63 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 128 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 29 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 82 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 12 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 108 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 52 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 122 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 29 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 329 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 66 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 37 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 56 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 104 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 109 +
+ .../eventmgr/eventinit.h => amdgpu/amdgpu_sched.h} | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 58 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 19 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 498 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 32 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 70 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c | 61 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 109 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 191 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 688 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 68 +-
+ drivers/gpu/drm/amd/amdgpu/atom.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/atom.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 109 +-
+ drivers/gpu/drm/amd/amdgpu/cik_dpm.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 29 +
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/cz_ih.c | 29 +
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 349 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 373 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 104 +-
+ drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 29 +
+ drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 68 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 52 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 4 +
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 63 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 52 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 18 +-
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/si_dpm.c | 83 +-
+ drivers/gpu/drm/amd/amdgpu/si_dpm.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/si_ih.c | 14 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 51 +-
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 29 +
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 499 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 18 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 -
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 97 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/vid.h | 10 +
+ drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +-
+ drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 8 +-
+ drivers/gpu/drm/amd/amdkfd/cik_int.h | 3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 12 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 14 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 115 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 459 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 24 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 20 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 20 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 50 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 615 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.h | 18 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 83 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 20 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_module.c | 6 -
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 3 +
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 34 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 7 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 29 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 90 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 128 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 175 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 73 +-
+ drivers/gpu/drm/amd/include/amd_shared.h | 100 +
+ .../amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h | 2 +
+ .../gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 15 +
+ drivers/gpu/drm/amd/include/atombios.h | 1 +
+ drivers/gpu/drm/amd/include/atomfirmware.h | 19 +-
+ drivers/gpu/drm/amd/include/cgs_common.h | 32 +-
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 6 +
+ drivers/gpu/drm/amd/include/linux/chash.h | 366 +
+ drivers/gpu/drm/amd/include/v9_structs.h | 12 +-
+ drivers/gpu/drm/amd/include/vi_structs.h | 259 -
+ drivers/gpu/drm/amd/lib/Kconfig | 28 +
+ drivers/gpu/drm/amd/lib/Makefile | 11 +
+ drivers/gpu/drm/amd/lib/chash.c | 638 +
+ drivers/gpu/drm/amd/powerplay/Makefile | 5 +-
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 528 +-
+ drivers/gpu/drm/amd/powerplay/eventmgr/Makefile | 11 -
+ .../drm/amd/powerplay/eventmgr/eventactionchains.c | 291 -
+ .../drm/amd/powerplay/eventmgr/eventactionchains.h | 62 -
+ drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 195 -
+ .../drm/amd/powerplay/eventmgr/eventmanagement.c | 215 -
+ .../drm/amd/powerplay/eventmgr/eventmanagement.h | 59 -
+ drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c | 104 -
+ .../drm/amd/powerplay/eventmgr/eventsubchains.c | 410 -
+ .../drm/amd/powerplay/eventmgr/eventsubchains.h | 100 -
+ .../gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 445 -
+ .../gpu/drm/amd/powerplay/eventmgr/eventtasks.h | 89 -
+ drivers/gpu/drm/amd/powerplay/eventmgr/psm.c | 119 -
+ drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 5 +-
+ .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 46 +-
+ .../drm/amd/powerplay/hwmgr/cz_clockpowergating.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 640 +-
+ .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 161 -
+ .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 151 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 417 +-
+ .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 2489 ++--
+ .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 250 +
+ .../powerplay/{eventmgr/psm.h => hwmgr/pp_psm.h} | 28 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 88 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 8 +-
+ .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 20 -
+ .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 157 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 510 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h | 6 +-
+ .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 66 +-
+ .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 473 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 9 +-
+ .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 110 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 183 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 5 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 499 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 -
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 129 +-
+ .../amd/powerplay/hwmgr/vega10_processpptables.c | 35 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 281 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 14 +-
+ drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 152 +-
+ drivers/gpu/drm/amd/powerplay/inc/eventmanager.h | 109 -
+ drivers/gpu/drm/amd/powerplay/inc/eventmgr.h | 124 -
+ drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h | 10299 ----------------
+ .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 6 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 200 +-
+ .../gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h | 11792 +++----------------
+ drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 7 -
+ drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 7 +-
+ drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 211 +-
+ drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 5 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 6 +-
+ .../smumgr/{iceland_smc.c => ci_smumgr.c} | 2236 ++--
+ drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.h | 78 +
+ drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 308 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 2498 ----
+ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h | 53 -
+ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 2537 +++-
+ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 9 +
+ .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2567 +++-
+ .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 2 +-
+ .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 2364 ----
+ .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 2380 +++-
+ drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 130 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h | 8 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 263 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 40 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 261 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 3275 -----
+ drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h | 62 -
+ .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 3181 ++++-
+ .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h | 20 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 194 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 16 +-
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 66 +-
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 19 +-
+ drivers/gpu/drm/arc/arcpgu_drv.c | 3 +-
+ drivers/gpu/drm/arm/hdlcd_drv.c | 3 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 3 +-
+ drivers/gpu/drm/armada/Makefile | 2 -
+ drivers/gpu/drm/armada/armada_510.c | 1 -
+ drivers/gpu/drm/armada/armada_crtc.c | 22 +-
+ drivers/gpu/drm/armada/armada_drv.c | 5 +-
+ drivers/gpu/drm/armada/armada_fb.c | 9 +-
+ drivers/gpu/drm/armada/armada_fbdev.c | 7 +-
+ drivers/gpu/drm/armada/armada_gem.c | 49 +-
+ drivers/gpu/drm/armada/armada_gem.h | 4 -
+ drivers/gpu/drm/armada/armada_overlay.c | 4 +-
+ drivers/gpu/drm/armada/armada_trace.h | 2 +-
+ drivers/gpu/drm/ast/ast_mode.c | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 1 +
+ drivers/gpu/drm/bochs/bochs_kms.c | 2 +-
+ drivers/gpu/drm/bridge/Kconfig | 10 +-
+ drivers/gpu/drm/bridge/Makefile | 1 +
+ drivers/gpu/drm/bridge/adv7511/Kconfig | 8 +
+ drivers/gpu/drm/bridge/adv7511/Makefile | 1 +
+ drivers/gpu/drm/bridge/adv7511/adv7511.h | 45 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 2 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 337 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 140 +-
+ drivers/gpu/drm/bridge/adv7511/adv7533.c | 38 +-
+ drivers/gpu/drm/bridge/panel.c | 10 +-
+ drivers/gpu/drm/bridge/sii9234.c | 994 ++
+ drivers/gpu/drm/bridge/sil-sii8620.c | 96 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 108 +-
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 2 +-
+ drivers/gpu/drm/drm_agpsupport.c | 45 +-
+ drivers/gpu/drm/drm_atomic.c | 36 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 325 +-
+ drivers/gpu/drm/drm_auth.c | 32 +-
+ drivers/gpu/drm/drm_bridge.c | 7 +-
+ drivers/gpu/drm/drm_color_mgmt.c | 4 +-
+ drivers/gpu/drm/drm_connector.c | 26 +-
+ drivers/gpu/drm/drm_crtc.c | 15 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 4 +-
+ drivers/gpu/drm/drm_crtc_internal.h | 1 +
+ drivers/gpu/drm/drm_debugfs_crc.c | 2 +-
+ drivers/gpu/drm/drm_dp_dual_mode_helper.c | 16 +-
+ drivers/gpu/drm/drm_dp_helper.c | 7 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c | 74 +
+ drivers/gpu/drm/drm_drv.c | 54 +-
+ drivers/gpu/drm/drm_edid.c | 15 +
+ drivers/gpu/drm/drm_edid_load.c | 16 +
+ drivers/gpu/drm/drm_encoder.c | 7 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 77 +-
+ drivers/gpu/drm/drm_fb_helper.c | 8 +-
+ drivers/gpu/drm/drm_framebuffer.c | 10 +-
+ drivers/gpu/drm/drm_gem.c | 17 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 86 +-
+ drivers/gpu/drm/drm_internal.h | 7 +-
+ drivers/gpu/drm/drm_ioctl.c | 8 +-
+ drivers/gpu/drm/drm_kms_helper_common.c | 28 +
+ drivers/gpu/drm/drm_lease.c | 767 ++
+ drivers/gpu/drm/drm_mode_config.c | 23 +-
+ drivers/gpu/drm/drm_mode_object.c | 37 +-
+ drivers/gpu/drm/drm_modeset_lock.c | 98 +-
+ drivers/gpu/drm/drm_of.c | 2 +
+ drivers/gpu/drm/drm_pci.c | 2 +-
+ drivers/gpu/drm/drm_plane.c | 89 +-
+ drivers/gpu/drm/drm_plane_helper.c | 2 +-
+ drivers/gpu/drm/drm_prime.c | 4 +-
+ drivers/gpu/drm/drm_probe_helper.c | 21 +-
+ drivers/gpu/drm/drm_property.c | 6 +-
+ drivers/gpu/drm/drm_scdc_helper.c | 12 +-
+ drivers/gpu/drm/drm_syncobj.c | 93 +-
+ drivers/gpu/drm/drm_trace.h | 2 +-
+ drivers/gpu/drm/drm_vblank.c | 457 +-
+ drivers/gpu/drm/etnaviv/Kconfig | 2 -
+ drivers/gpu/drm/etnaviv/Makefile | 3 +-
+ drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 36 +
+ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 15 +-
+ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 6 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 43 +
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 6 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 -
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 69 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 217 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 13 +-
+ drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 197 +-
+ drivers/gpu/drm/etnaviv/etnaviv_iommu.h | 7 +-
+ drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 120 +-
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 106 +-
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 36 +-
+ drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 495 +
+ drivers/gpu/drm/etnaviv/etnaviv_perfmon.h | 49 +
+ drivers/gpu/drm/exynos/Kconfig | 1 +
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c | 15 +
+ drivers/gpu/drm/exynos/exynos_drm_drv.h | 3 +
+ drivers/gpu/drm/exynos/exynos_drm_mic.c | 6 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 310 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c | 460 +-
+ drivers/gpu/drm/exynos/regs-hdmi.h | 8 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 3 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 6 +-
+ drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +-
+ drivers/gpu/drm/gma500/mid_bios.c | 2 +-
+ drivers/gpu/drm/gma500/psb_intel_sdvo.c | 9 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 3 +
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 7 +-
+ drivers/gpu/drm/i2c/ch7006_drv.c | 2 +-
+ drivers/gpu/drm/i2c/sil164_drv.c | 2 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
+ drivers/gpu/drm/i915/Kconfig | 1 +
+ drivers/gpu/drm/i915/Makefile | 10 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 26 +-
+ drivers/gpu/drm/i915/gvt/cfg_space.c | 30 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 37 +-
+ drivers/gpu/drm/i915/gvt/execlist.c | 127 +-
+ drivers/gpu/drm/i915/gvt/gtt.c | 5 +-
+ drivers/gpu/drm/i915/gvt/gvt.c | 2 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 14 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 44 +-
+ drivers/gpu/drm/i915/gvt/mmio.c | 47 +-
+ drivers/gpu/drm/i915/gvt/render.c | 2 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 115 +-
+ drivers/gpu/drm/i915/gvt/scheduler.h | 1 +
+ drivers/gpu/drm/i915/i915_debugfs.c | 638 +-
+ drivers/gpu/drm/i915/i915_drv.c | 93 +-
+ drivers/gpu/drm/i915/i915_drv.h | 368 +-
+ drivers/gpu/drm/i915/i915_gem.c | 649 +-
+ drivers/gpu/drm/i915/i915_gem_clflush.c | 1 +
+ drivers/gpu/drm/i915/i915_gem_context.c | 123 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 18 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 14 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 47 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 91 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 726 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 66 +-
+ drivers/gpu/drm/i915/i915_gem_internal.c | 18 +-
+ drivers/gpu/drm/i915/i915_gem_object.h | 42 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 52 +-
+ drivers/gpu/drm/i915/i915_gem_request.h | 48 +-
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 131 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 21 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 144 +-
+ drivers/gpu/drm/i915/i915_gemfs.c | 74 +
+ drivers/gpu/drm/i915/i915_gemfs.h | 34 +
+ drivers/gpu/drm/i915/i915_gpu_error.c | 43 +-
+ drivers/gpu/drm/i915/i915_guc_submission.c | 476 +-
+ drivers/gpu/drm/i915/i915_guc_submission.h | 80 +
+ drivers/gpu/drm/i915/i915_irq.c | 1101 +-
+ drivers/gpu/drm/i915/i915_oa_cflgt2.c | 109 +
+ drivers/gpu/drm/i915/i915_oa_cflgt2.h | 34 +
+ drivers/gpu/drm/i915/i915_params.c | 207 +-
+ drivers/gpu/drm/i915/i915_params.h | 85 +-
+ drivers/gpu/drm/i915/i915_pci.c | 341 +-
+ drivers/gpu/drm/i915/i915_perf.c | 14 +-
+ drivers/gpu/drm/i915/i915_pvinfo.h | 1 +
+ drivers/gpu/drm/i915/i915_reg.h | 89 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 2 -
+ drivers/gpu/drm/i915/i915_sw_fence.c | 45 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 76 +-
+ drivers/gpu/drm/i915/i915_trace.h | 118 +-
+ drivers/gpu/drm/i915/i915_utils.h | 18 +
+ drivers/gpu/drm/i915/i915_vgpu.h | 6 +
+ drivers/gpu/drm/i915/i915_vma.c | 144 +-
+ drivers/gpu/drm/i915/i915_vma.h | 49 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 49 +-
+ drivers/gpu/drm/i915/intel_audio.c | 2 +-
+ drivers/gpu/drm/i915/intel_bios.c | 392 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 20 +-
+ drivers/gpu/drm/i915/intel_cdclk.c | 318 +-
+ drivers/gpu/drm/i915/intel_crt.c | 136 +-
+ drivers/gpu/drm/i915/intel_csr.c | 39 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 1039 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 41 +-
+ drivers/gpu/drm/i915/intel_display.c | 747 +-
+ drivers/gpu/drm/i915/intel_dp.c | 293 +-
+ drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 2 +-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 76 +-
+ drivers/gpu/drm/i915/intel_drv.h | 157 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 76 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 45 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 534 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 41 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 7 +-
+ drivers/gpu/drm/i915/intel_fifo_underrun.c | 14 +-
+ drivers/gpu/drm/i915/intel_guc.c | 369 +
+ drivers/gpu/drm/i915/intel_guc.h | 120 +
+ .../i915/{intel_guc_loader.c => intel_guc_fw.c} | 252 +-
+ drivers/gpu/drm/i915/intel_guc_fw.h | 33 +
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 62 +-
+ drivers/gpu/drm/i915/intel_guc_log.c | 32 +-
+ drivers/gpu/drm/i915/intel_guc_log.h | 59 +
+ drivers/gpu/drm/i915/intel_gvt.c | 12 +-
+ drivers/gpu/drm/i915/intel_hangcheck.c | 2 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 183 +-
+ drivers/gpu/drm/i915/intel_huc.c | 172 +-
+ drivers/gpu/drm/i915/intel_huc.h | 41 +
+ drivers/gpu/drm/i915/intel_lrc.c | 707 +-
+ drivers/gpu/drm/i915/intel_lrc.h | 37 +-
+ drivers/gpu/drm/i915/intel_lspcon.c | 22 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 51 +-
+ drivers/gpu/drm/i915/intel_opregion.c | 2 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 2 +-
+ drivers/gpu/drm/i915/intel_panel.c | 8 +-
+ drivers/gpu/drm/i915/intel_pipe_crc.c | 80 +-
+ drivers/gpu/drm/i915/intel_pm.c | 1244 +-
+ drivers/gpu/drm/i915/intel_psr.c | 450 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 194 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 184 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 128 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 40 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 6 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 39 +-
+ drivers/gpu/drm/i915/intel_tv.c | 16 +-
+ drivers/gpu/drm/i915/intel_uc.c | 363 +-
+ drivers/gpu/drm/i915/intel_uc.h | 247 +-
+ drivers/gpu/drm/i915/intel_uc_fw.c | 318 +
+ drivers/gpu/drm/i915/intel_uc_fw.h | 121 +
+ drivers/gpu/drm/i915/intel_uncore.c | 268 +-
+ drivers/gpu/drm/i915/intel_uncore.h | 18 +
+ drivers/gpu/drm/i915/intel_vbt_defs.h | 339 +-
+ drivers/gpu/drm/i915/selftests/huge_gem_object.c | 14 +-
+ drivers/gpu/drm/i915/selftests/huge_pages.c | 1734 +++
+ drivers/gpu/drm/i915/selftests/i915_gem_context.c | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 162 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 15 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_object.c | 8 -
+ drivers/gpu/drm/i915/selftests/i915_gem_request.c | 12 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_timeline.c | 2 +-
+ .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 +
+ .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 +
+ drivers/gpu/drm/i915/selftests/i915_random.c | 5 -
+ drivers/gpu/drm/i915/selftests/i915_random.h | 5 +
+ drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 42 +
+ drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 50 +-
+ drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 78 +
+ drivers/gpu/drm/i915/selftests/lib_sw_fence.h | 42 +
+ drivers/gpu/drm/i915/selftests/mock_context.c | 6 +-
+ drivers/gpu/drm/i915/selftests/mock_engine.c | 8 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 20 +
+ drivers/gpu/drm/i915/selftests/mock_gtt.c | 11 +-
+ drivers/gpu/drm/i915/selftests/scatterlist.c | 15 +
+ drivers/gpu/drm/imx/imx-drm-core.c | 3 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 6 +-
+ drivers/gpu/drm/meson/meson_drv.c | 3 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
+ drivers/gpu/drm/msm/Makefile | 4 +-
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 10 +-
+ drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 10 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 261 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 109 +-
+ drivers/gpu/drm/msm/adreno/a5xx_power.c | 9 +-
+ drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 305 +
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 78 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 297 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 66 +-
+ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 8 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 30 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +-
+ drivers/gpu/drm/msm/edp/edp_ctrl.c | 22 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 10 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 2 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 2 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 4 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 3 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 7 +
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 2 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 160 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 2 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 10 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 10 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c | 71 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h | 7 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 232 +-
+ drivers/gpu/drm/msm/msm_atomic.c | 41 +-
+ drivers/gpu/drm/msm/msm_drv.c | 83 +-
+ drivers/gpu/drm/msm/msm_drv.h | 37 +-
+ drivers/gpu/drm/msm/msm_fence.c | 2 +-
+ drivers/gpu/drm/msm/msm_fence.h | 2 +-
+ drivers/gpu/drm/msm/msm_gem.c | 22 +-
+ drivers/gpu/drm/msm/msm_gem.h | 5 +-
+ drivers/gpu/drm/msm/msm_gem_submit.c | 37 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 235 +-
+ drivers/gpu/drm/msm/msm_gpu.h | 51 +-
+ drivers/gpu/drm/msm/msm_rd.c | 142 +-
+ drivers/gpu/drm/msm/msm_ringbuffer.c | 36 +-
+ drivers/gpu/drm/msm/msm_ringbuffer.h | 33 +-
+ drivers/gpu/drm/msm/msm_submitqueue.c | 152 +
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 5 +-
+ drivers/gpu/drm/nouveau/Kbuild | 2 +
+ drivers/gpu/drm/nouveau/Kconfig | 7 +
+ drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/cl506e.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/cl506f.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/cl826e.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/cl826f.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/cl906f.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/cla06f.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/class.h | 17 +
+ drivers/gpu/drm/nouveau/include/nvif/device.h | 5 -
+ drivers/gpu/drm/nouveau/include/nvif/if0008.h | 42 +
+ drivers/gpu/drm/nouveau/include/nvif/if000a.h | 22 +
+ drivers/gpu/drm/nouveau/include/nvif/if000b.h | 11 +
+ drivers/gpu/drm/nouveau/include/nvif/if000c.h | 64 +
+ drivers/gpu/drm/nouveau/include/nvif/if000d.h | 12 +
+ drivers/gpu/drm/nouveau/include/nvif/if500b.h | 25 +
+ drivers/gpu/drm/nouveau/include/nvif/if500d.h | 21 +
+ drivers/gpu/drm/nouveau/include/nvif/if900b.h | 23 +
+ drivers/gpu/drm/nouveau/include/nvif/if900d.h | 21 +
+ drivers/gpu/drm/nouveau/include/nvif/ifb00d.h | 27 +
+ drivers/gpu/drm/nouveau/include/nvif/ifc00d.h | 21 +
+ drivers/gpu/drm/nouveau/include/nvif/ioctl.h | 10 +-
+ drivers/gpu/drm/nouveau/include/nvif/mem.h | 18 +
+ drivers/gpu/drm/nouveau/include/nvif/mmu.h | 56 +
+ drivers/gpu/drm/nouveau/include/nvif/object.h | 7 +-
+ drivers/gpu/drm/nouveau/include/nvif/os.h | 14 -
+ drivers/gpu/drm/nouveau/include/nvif/vmm.h | 42 +
+ drivers/gpu/drm/nouveau/include/nvkm/core/client.h | 3 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 1 +
+ drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h | 14 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/memory.h | 64 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/mm.h | 32 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/object.h | 41 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/oclass.h | 31 +
+ drivers/gpu/drm/nouveau/include/nvkm/core/os.h | 19 +
+ drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h | 1 +
+ drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h | 1 +
+ .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 5 +-
+ drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 3 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h | 9 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 36 +-
+ .../gpu/drm/nouveau/include/nvkm/subdev/instmem.h | 1 +
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h | 7 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 140 +-
+ .../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_abi16.c | 42 +-
+ drivers/gpu/drm/nouveau/nouveau_abi16.h | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_bios.c | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 391 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.h | 17 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.c | 51 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.h | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_display.h | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_dma.c | 15 +-
+ drivers/gpu/drm/nouveau/nouveau_dma.h | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 161 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 33 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 7 +-
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 58 -
+ drivers/gpu/drm/nouveau/nouveau_fence.h | 7 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 123 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.h | 3 -
+ drivers/gpu/drm/nouveau/nouveau_mem.c | 198 +
+ drivers/gpu/drm/nouveau/nouveau_mem.h | 30 +
+ drivers/gpu/drm/nouveau/nouveau_sgdma.c | 54 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 280 +-
+ drivers/gpu/drm/nouveau/nouveau_vmm.c | 135 +
+ drivers/gpu/drm/nouveau/nouveau_vmm.h | 31 +
+ drivers/gpu/drm/nouveau/nv50_display.c | 12 +-
+ drivers/gpu/drm/nouveau/nv50_fbcon.c | 9 +-
+ drivers/gpu/drm/nouveau/nv84_fence.c | 43 +-
+ drivers/gpu/drm/nouveau/nvc0_fbcon.c | 9 +-
+ drivers/gpu/drm/nouveau/nvif/Kbuild | 3 +
+ drivers/gpu/drm/nouveau/nvif/mem.c | 88 +
+ drivers/gpu/drm/nouveau/nvif/mmu.c | 117 +
+ drivers/gpu/drm/nouveau/nvif/object.c | 87 +-
+ drivers/gpu/drm/nouveau/nvif/vmm.c | 167 +
+ drivers/gpu/drm/nouveau/nvkm/core/client.c | 2 +
+ drivers/gpu/drm/nouveau/nvkm/core/engine.c | 10 +
+ drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c | 47 +-
+ drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 15 +-
+ drivers/gpu/drm/nouveau/nvkm/core/memory.c | 100 +-
+ drivers/gpu/drm/nouveau/nvkm/core/mm.c | 5 +-
+ drivers/gpu/drm/nouveau/nvkm/core/object.c | 14 +-
+ drivers/gpu/drm/nouveau/nvkm/core/oproxy.c | 13 +-
+ drivers/gpu/drm/nouveau/nvkm/core/ramht.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 98 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 24 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 9 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/channv50.c | 4 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/channv50.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c | 8 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 43 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c | 13 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/changf100.h | 5 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/changk104.h | 5 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/channv50.c | 14 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/channv50.h | 5 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmag84.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c | 2 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv50.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 18 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 19 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 2 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifog84.c | 6 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c | 45 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 51 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c | 123 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c | 9 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 83 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 9 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c | 13 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/falcon/v1.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild | 2 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 60 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/g84.c | 10 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 151 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h | 16 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm107.c | 65 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm20b.c | 42 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c | 174 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h | 16 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h | 20 +-
+ .../gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 7 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c | 5 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c | 12 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 35 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 24 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h | 2 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c | 18 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm20b.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c | 1 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c | 1 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp10b.c | 1 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gt215.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.c | 9 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv10.c | 1 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv1a.c | 1 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c | 13 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv25.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv35.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv36.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv41.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c | 1 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv46.c | 1 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv47.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv49.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv4e.c | 1 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c | 30 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 13 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c | 144 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 11 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c | 94 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c | 2 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 2 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c | 2 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c | 2 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 2 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c | 20 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c | 7 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv04.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv10.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv20.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c | 7 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv41.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv49.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv4e.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c | 98 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c | 266 +-
+ .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 61 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.c | 70 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c | 71 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 329 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h | 14 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c | 25 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c | 20 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp100.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild | 29 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 696 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/g84.c | 41 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c | 228 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gk104.c | 41 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gk20a.c | 41 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gm200.c | 97 +
+ .../nvkm/subdev/mmu/gm20b.c} | 49 +-
+ .../nvkm/subdev/mmu/gp100.c} | 37 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp10b. | 0
+ .../nvkm/subdev/mmu/gp10b.c} | 44 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c | 242 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.h | 23 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memgf100.c | 94 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv04.c | 69 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv50.c | 88 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.c | 122 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h | 19 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c | 104 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c | 190 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv50.c | 231 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h | 70 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c | 192 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.h | 26 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.c | 178 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.h | 14 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 352 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.h | 14 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 1513 +++
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 310 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgf100.c | 403 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgk104.c | 102 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgk20a.c | 71 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgm200.c | 185 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgm20b.c | 70 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 347 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp10b.c | 49 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv04.c | 140 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv41.c | 113 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv44.c | 230 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c | 385 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 2 +-
+ .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c | 43 +-
+ .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.h | 5 +-
+ .../nvkm/subdev/secboot/ls_ucode_msgqueue.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c | 56 +
+ drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 8 +-
+ .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 18 +-
+ drivers/gpu/drm/omapdrm/dss/Kconfig | 8 +
+ drivers/gpu/drm/omapdrm/dss/Makefile | 1 +
+ drivers/gpu/drm/omapdrm/dss/hdmi.h | 7 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4.c | 62 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 381 +
+ drivers/gpu/drm/omapdrm/dss/hdmi4_cec.h | 55 +
+ drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4_core.h | 4 +
+ drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 +
+ drivers/gpu/drm/panel/Kconfig | 33 +
+ drivers/gpu/drm/panel/Makefile | 4 +
+ drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 491 +
+ .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 514 +
+ drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 532 +
+ drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 372 +
+ drivers/gpu/drm/panel/panel-simple.c | 51 +-
+ drivers/gpu/drm/pl111/Kconfig | 3 +-
+ drivers/gpu/drm/pl111/Makefile | 4 +-
+ drivers/gpu/drm/pl111/pl111_connector.c | 126 -
+ drivers/gpu/drm/pl111/pl111_debugfs.c | 6 +
+ drivers/gpu/drm/pl111/pl111_display.c | 79 +-
+ drivers/gpu/drm/pl111/pl111_drm.h | 37 +-
+ drivers/gpu/drm/pl111/pl111_drv.c | 149 +-
+ drivers/gpu/drm/pl111/pl111_versatile.c | 270 +
+ drivers/gpu/drm/pl111/pl111_versatile.h | 9 +
+ drivers/gpu/drm/radeon/Makefile | 5 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 46 +-
+ drivers/gpu/drm/radeon/ci_dpm.c | 22 +
+ drivers/gpu/drm/radeon/ci_dpm.h | 1 -
+ drivers/gpu/drm/radeon/ci_smc.c | 21 -
+ drivers/gpu/drm/radeon/cik.c | 14 +-
+ drivers/gpu/drm/radeon/cikd.h | 2 -
+ drivers/gpu/drm/radeon/r100.c | 2 +-
+ drivers/gpu/drm/radeon/r600_cs.c | 2 +-
+ drivers/gpu/drm/radeon/r600_hdmi.c | 2 +-
+ drivers/gpu/drm/radeon/radeon.h | 3 -
+ drivers/gpu/drm/radeon/radeon_connectors.c | 16 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 10 -
+ drivers/gpu/drm/radeon/radeon_fb.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_kfd.c | 870 --
+ drivers/gpu/drm/radeon/radeon_kms.c | 7 -
+ drivers/gpu/drm/radeon/radeon_mode.h | 4 -
+ drivers/gpu/drm/radeon/radeon_trace.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 33 +-
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 3 +-
+ drivers/gpu/drm/rockchip/Kconfig | 9 +
+ drivers/gpu/drm/rockchip/Makefile | 1 +
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 26 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 -
+ drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 86 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 19 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 14 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 14 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 +
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 8 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 18 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 32 +-
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 586 +
+ drivers/gpu/drm/rockchip/rockchip_lvds.h | 114 +
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_kms.c | 3 +-
+ drivers/gpu/drm/sti/sti_drv.c | 3 +-
+ drivers/gpu/drm/sti/sti_dvo.c | 6 +-
+ drivers/gpu/drm/stm/drv.c | 3 +-
+ drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 8 +-
+ drivers/gpu/drm/stm/ltdc.c | 16 +-
+ drivers/gpu/drm/stm/ltdc.h | 2 -
+ drivers/gpu/drm/sun4i/Makefile | 33 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 113 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.h | 3 +-
+ drivers/gpu/drm/sun4i/sun4i_crtc.c | 32 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 76 +-
+ drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 3 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi.h | 112 +
+ drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 39 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 277 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 227 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 69 +-
+ drivers/gpu/drm/sun4i/sun4i_rgb.c | 29 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 466 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.h | 30 +-
+ drivers/gpu/drm/sun4i/sun4i_tv.c | 12 -
+ drivers/gpu/drm/tegra/Kconfig | 1 +
+ drivers/gpu/drm/tegra/dc.c | 84 +-
+ drivers/gpu/drm/tegra/dc.h | 120 +
+ drivers/gpu/drm/tegra/drm.c | 30 +-
+ drivers/gpu/drm/tegra/drm.h | 106 +-
+ drivers/gpu/drm/tegra/gr2d.c | 2 +-
+ drivers/gpu/drm/tegra/gr3d.c | 2 +-
+ drivers/gpu/drm/tegra/hdmi.c | 17 +-
+ drivers/gpu/drm/tegra/output.c | 6 +
+ drivers/gpu/drm/tegra/sor.c | 5 +-
+ drivers/gpu/drm/tegra/vic.c | 22 +-
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 57 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 5 +-
+ drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 +-
+ drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c | 2 -
+ drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 4 +-
+ drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 3 +-
+ drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 6 +-
+ drivers/gpu/drm/tinydrm/mi0283qt.c | 22 +-
+ drivers/gpu/drm/tinydrm/mipi-dbi.c | 7 +-
+ drivers/gpu/drm/tinydrm/repaper.c | 45 +-
+ drivers/gpu/drm/tinydrm/st7586.c | 25 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 43 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_memory.c | 12 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc.c | 405 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 256 +-
+ drivers/gpu/drm/tve200/Kconfig | 16 +
+ drivers/gpu/drm/tve200/Makefile | 4 +
+ drivers/gpu/drm/tve200/tve200_display.c | 338 +
+ drivers/gpu/drm/tve200/tve200_drm.h | 126 +
+ drivers/gpu/drm/tve200/tve200_drv.c | 303 +
+ drivers/gpu/drm/udl/udl_connector.c | 156 +-
+ drivers/gpu/drm/udl/udl_connector.h | 13 +
+ drivers/gpu/drm/udl/udl_drv.c | 4 +
+ drivers/gpu/drm/udl/udl_main.c | 5 +
+ drivers/gpu/drm/vc4/Makefile | 2 -
+ drivers/gpu/drm/vc4/vc4_bo.c | 287 +-
+ drivers/gpu/drm/vc4/vc4_dpi.c | 17 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 10 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 30 +
+ drivers/gpu/drm/vc4/vc4_dsi.c | 144 +-
+ drivers/gpu/drm/vc4/vc4_gem.c | 156 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 15 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 40 +-
+ drivers/gpu/drm/vc4/vc4_trace.h | 2 +-
+ drivers/gpu/drm/via/via_verifier.c | 10 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +-
+ drivers/gpu/drm/zte/zx_drm_drv.c | 3 +-
+ drivers/gpu/host1x/Makefile | 3 +-
+ drivers/gpu/host1x/bus.c | 3 +-
+ drivers/gpu/host1x/channel.c | 3 +-
+ drivers/gpu/host1x/debug.c | 14 +-
+ drivers/gpu/host1x/debug.h | 14 +-
+ drivers/gpu/host1x/dev.c | 69 +-
+ drivers/gpu/host1x/dev.h | 19 +
+ drivers/gpu/host1x/hw/cdma_hw.c | 49 +-
+ drivers/gpu/host1x/hw/channel_hw.c | 24 +
+ drivers/gpu/host1x/hw/debug_hw.c | 240 +-
+ drivers/gpu/host1x/hw/debug_hw_1x01.c | 154 +
+ drivers/gpu/host1x/hw/debug_hw_1x06.c | 135 +
+ drivers/gpu/host1x/hw/host1x01.c | 2 +
+ drivers/gpu/host1x/hw/host1x02.c | 2 +
+ drivers/gpu/host1x/hw/host1x04.c | 2 +
+ drivers/gpu/host1x/hw/host1x05.c | 2 +
+ drivers/gpu/host1x/hw/host1x06.c | 44 +
+ drivers/gpu/host1x/hw/host1x06.h | 26 +
+ drivers/gpu/host1x/hw/host1x06_hardware.h | 142 +
+ drivers/gpu/host1x/hw/hw_host1x04_channel.h | 12 +
+ drivers/gpu/host1x/hw/hw_host1x05_channel.h | 12 +
+ drivers/gpu/host1x/hw/hw_host1x06_hypervisor.h | 32 +
+ drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 181 +
+ drivers/gpu/host1x/hw/hw_host1x06_vm.h | 47 +
+ drivers/gpu/host1x/hw/intr_hw.c | 29 +-
+ drivers/gpu/host1x/hw/syncpt_hw.c | 46 +
+ drivers/gpu/host1x/syncpt.c | 24 +-
+ drivers/gpu/host1x/syncpt.h | 2 +-
+ drivers/gpu/vga/vgaarb.c | 72 +-
+ drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 +-
+ drivers/rapidio/devices/rio_mport_cdev.c | 4 +-
+ drivers/staging/vboxvideo/vbox_mode.c | 2 +-
+ include/drm/bridge/mhl.h | 4 +
+ include/drm/drmP.h | 4 +
+ include/drm/drm_atomic.h | 188 +-
+ include/drm/drm_auth.h | 21 +
+ include/drm/drm_bridge.h | 2 +-
+ include/drm/drm_connector.h | 14 +-
+ include/drm/drm_crtc.h | 37 +-
+ include/drm/drm_dp_helper.h | 23 +
+ include/drm/drm_dp_mst_helper.h | 2 +
+ include/drm/drm_drv.h | 7 +-
+ include/drm/drm_edid.h | 2 +
+ include/drm/drm_encoder.h | 4 +-
+ include/drm/drm_fb_cma_helper.h | 13 -
+ include/drm/drm_framebuffer.h | 1 +
+ include/drm/drm_gem_framebuffer_helper.h | 2 +-
+ include/drm/drm_lease.h | 46 +
+ include/drm/drm_mode_config.h | 13 -
+ include/drm/drm_mode_object.h | 5 +
+ include/drm/drm_modeset_helper_vtables.h | 2 +-
+ include/drm/drm_modeset_lock.h | 12 +-
+ include/drm/drm_of.h | 31 +
+ include/drm/drm_plane.h | 20 +-
+ include/drm/drm_property.h | 6 +-
+ include/drm/drm_syncobj.h | 5 +
+ include/drm/drm_vblank.h | 25 +-
+ include/drm/i915_pciids.h | 154 +-
+ include/drm/ttm/ttm_debug.h | 31 +
+ include/drm/ttm/ttm_memory.h | 5 +-
+ include/drm/ttm/ttm_page_alloc.h | 33 +-
+ include/dt-bindings/msm/msm-bus-ids.h | 887 ++
+ include/linux/dma-fence.h | 7 +-
+ include/linux/host1x.h | 2 +-
+ include/linux/scatterlist.h | 17 +-
+ include/linux/shmem_fs.h | 2 +
+ include/linux/sync_file.h | 4 +
+ include/uapi/drm/amdgpu_drm.h | 50 +-
+ include/uapi/drm/drm.h | 41 +
+ include/uapi/drm/drm_mode.h | 70 +-
+ include/uapi/drm/etnaviv_drm.h | 43 +-
+ include/uapi/drm/i915_drm.h | 33 +-
+ include/uapi/drm/msm_drm.h | 24 +
+ include/uapi/drm/vc4_drm.h | 19 +
+ include/uapi/linux/kfd_ioctl.h | 2 +-
+ lib/scatterlist.c | 95 +-
+ mm/shmem.c | 30 +-
+ scripts/coccinelle/api/drm-get-put.cocci | 5 +
+ tools/testing/scatterlist/Makefile | 30 +
+ tools/testing/scatterlist/linux/mm.h | 125 +
+ tools/testing/scatterlist/main.c | 79 +
+ 1033 files changed, 65661 insertions(+), 56210 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/sii9234.txt
+ create mode 100644 Documentation/devicetree/bindings/display/faraday,tve200.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e63j0x03.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/seiko,43wvf1g.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt
+ create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
+ create mode 100644 Documentation/gpu/tve200.rst
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+ rename drivers/gpu/drm/amd/{powerplay/eventmgr/eventinit.h => amdgpu/amdgpu_sched.h} (73%)
+ create mode 100644 drivers/gpu/drm/amd/include/linux/chash.h
+ create mode 100644 drivers/gpu/drm/amd/lib/Kconfig
+ create mode 100644 drivers/gpu/drm/amd/lib/Makefile
+ create mode 100644 drivers/gpu/drm/amd/lib/chash.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/Makefile
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/psm.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
+ rename drivers/gpu/drm/amd/powerplay/{eventmgr/psm.h => hwmgr/pp_psm.h} (62%)
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/eventmanager.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/eventmgr.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h
+ rename drivers/gpu/drm/amd/powerplay/smumgr/{iceland_smc.c => ci_smumgr.c} (56%)
+ create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h
+ create mode 100644 drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
+ create mode 100644 drivers/gpu/drm/bridge/sii9234.c
+ create mode 100644 drivers/gpu/drm/drm_lease.c
+ create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
+ create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_perfmon.h
+ create mode 100644 drivers/gpu/drm/i915/i915_gemfs.c
+ create mode 100644 drivers/gpu/drm/i915/i915_gemfs.h
+ create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.h
+ create mode 100644 drivers/gpu/drm/i915/intel_guc.c
+ create mode 100644 drivers/gpu/drm/i915/intel_guc.h
+ rename drivers/gpu/drm/i915/{intel_guc_loader.c => intel_guc_fw.c} (58%)
+ create mode 100644 drivers/gpu/drm/i915/intel_guc_fw.h
+ create mode 100644 drivers/gpu/drm/i915/intel_guc_log.h
+ create mode 100644 drivers/gpu/drm/i915/intel_huc.h
+ create mode 100644 drivers/gpu/drm/i915/intel_uc_fw.c
+ create mode 100644 drivers/gpu/drm/i915/intel_uc_fw.h
+ create mode 100644 drivers/gpu/drm/i915/selftests/huge_pages.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/lib_sw_fence.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/lib_sw_fence.h
+ create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_preempt.c
+ create mode 100644 drivers/gpu/drm/msm/msm_submitqueue.c
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if0008.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if000a.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if000b.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if000c.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if000d.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if500b.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if500d.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if900b.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if900d.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/ifb00d.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/ifc00d.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/mem.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/mmu.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/vmm.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/oclass.h
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_mem.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_mem.h
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_vmm.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_vmm.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvif/mem.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvif/mmu.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvif/vmm.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm107.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm20b.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/g84.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gk104.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gk20a.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gm200.c
+ rename drivers/gpu/drm/{amd/powerplay/smumgr/polaris10_smc.h => nouveau/nvkm/subdev/mmu/gm20b.c} (54%)
+ rename drivers/gpu/drm/{amd/powerplay/smumgr/iceland_smc.h => nouveau/nvkm/subdev/mmu/gp100.c} (60%)
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp10b.
+ rename drivers/gpu/drm/{radeon/radeon_kfd.h => nouveau/nvkm/subdev/mmu/gp10b.c} (59%)
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memgf100.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv04.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv50.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgf100.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgk104.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgk20a.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgm200.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgm20b.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp10b.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv04.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv41.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv44.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c
+ create mode 100644 drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c
+ create mode 100644 drivers/gpu/drm/omapdrm/dss/hdmi4_cec.h
+ create mode 100644 drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
+ create mode 100644 drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
+ create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
+ create mode 100644 drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
+ delete mode 100644 drivers/gpu/drm/pl111/pl111_connector.c
+ create mode 100644 drivers/gpu/drm/pl111/pl111_versatile.c
+ create mode 100644 drivers/gpu/drm/pl111/pl111_versatile.h
+ delete mode 100644 drivers/gpu/drm/radeon/radeon_kfd.c
+ create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
+ create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
+ create mode 100644 drivers/gpu/drm/tve200/Kconfig
+ create mode 100644 drivers/gpu/drm/tve200/Makefile
+ create mode 100644 drivers/gpu/drm/tve200/tve200_display.c
+ create mode 100644 drivers/gpu/drm/tve200/tve200_drm.h
+ create mode 100644 drivers/gpu/drm/tve200/tve200_drv.c
+ create mode 100644 drivers/gpu/drm/udl/udl_connector.h
+ create mode 100644 drivers/gpu/host1x/hw/debug_hw_1x01.c
+ create mode 100644 drivers/gpu/host1x/hw/debug_hw_1x06.c
+ create mode 100644 drivers/gpu/host1x/hw/host1x06.c
+ create mode 100644 drivers/gpu/host1x/hw/host1x06.h
+ create mode 100644 drivers/gpu/host1x/hw/host1x06_hardware.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x06_hypervisor.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x06_uclass.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x06_vm.h
+ create mode 100644 include/drm/drm_lease.h
+ create mode 100644 include/drm/ttm/ttm_debug.h
+ create mode 100644 include/dt-bindings/msm/msm-bus-ids.h
+ create mode 100644 tools/testing/scatterlist/Makefile
+ create mode 100644 tools/testing/scatterlist/linux/mm.h
+ create mode 100644 tools/testing/scatterlist/main.c
+Merging drm-amd-dc/drm-next-amd-dc-staging (26c860d55796 Merge branch 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux into drm-next)
+$ git merge drm-amd-dc/drm-next-amd-dc-staging
+Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/Makefile
+Auto-merging Documentation/gpu/todo.rst
+Merge made by the 'recursive' strategy.
+ Documentation/gpu/todo.rst | 10 +
+ drivers/gpu/drm/amd/amdgpu/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/Makefile | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 16 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 59 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 105 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 33 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 29 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 99 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 17 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 12 +
+ drivers/gpu/drm/amd/amdgpu/vi.c | 21 +
+ drivers/gpu/drm/amd/display/Kconfig | 45 +
+ drivers/gpu/drm/amd/display/Makefile | 22 +
+ drivers/gpu/drm/amd/display/TODO | 107 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 17 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4884 ++++++++++++++++
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 261 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 498 ++
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 755 +++
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 102 +
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 436 ++
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 35 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 379 ++
+ drivers/gpu/drm/amd/display/dc/Makefile | 33 +
+ drivers/gpu/drm/amd/display/dc/basics/Makefile | 11 +
+ drivers/gpu/drm/amd/display/dc/basics/conversion.c | 104 +
+ drivers/gpu/drm/amd/display/dc/basics/conversion.h | 46 +
+ drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 567 ++
+ drivers/gpu/drm/amd/display/dc/basics/fixpt32_32.c | 161 +
+ .../gpu/drm/amd/display/dc/basics/grph_object_id.c | 75 +
+ .../gpu/drm/amd/display/dc/basics/log_helpers.c | 102 +
+ drivers/gpu/drm/amd/display/dc/basics/logger.c | 397 ++
+ drivers/gpu/drm/amd/display/dc/basics/logger.h | 30 +
+ drivers/gpu/drm/amd/display/dc/basics/vector.c | 307 +
+ drivers/gpu/drm/amd/display/dc/bios/Makefile | 27 +
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 3871 +++++++++++++
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser.h | 33 +
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1934 +++++++
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.h | 33 +
+ .../drm/amd/display/dc/bios/bios_parser_common.c | 288 +
+ .../drm/amd/display/dc/bios/bios_parser_common.h | 33 +
+ .../drm/amd/display/dc/bios/bios_parser_helper.c | 82 +
+ .../drm/amd/display/dc/bios/bios_parser_helper.h | 40 +
+ .../amd/display/dc/bios/bios_parser_interface.c | 56 +
+ .../display/dc/bios/bios_parser_types_internal.h | 72 +
+ .../display/dc/bios/bios_parser_types_internal2.h | 74 +
+ .../gpu/drm/amd/display/dc/bios/command_table.c | 2424 ++++++++
+ .../gpu/drm/amd/display/dc/bios/command_table.h | 102 +
+ .../gpu/drm/amd/display/dc/bios/command_table2.c | 812 +++
+ .../gpu/drm/amd/display/dc/bios/command_table2.h | 105 +
+ .../drm/amd/display/dc/bios/command_table_helper.c | 290 +
+ .../drm/amd/display/dc/bios/command_table_helper.h | 90 +
+ .../amd/display/dc/bios/command_table_helper2.c | 265 +
+ .../amd/display/dc/bios/command_table_helper2.h | 82 +
+ .../dc/bios/dce110/command_table_helper_dce110.c | 364 ++
+ .../dc/bios/dce110/command_table_helper_dce110.h | 34 +
+ .../dc/bios/dce112/command_table_helper2_dce112.c | 418 ++
+ .../dc/bios/dce112/command_table_helper2_dce112.h | 34 +
+ .../dc/bios/dce112/command_table_helper_dce112.c | 418 ++
+ .../dc/bios/dce112/command_table_helper_dce112.h | 34 +
+ .../dc/bios/dce80/command_table_helper_dce80.c | 354 ++
+ .../dc/bios/dce80/command_table_helper_dce80.h | 33 +
+ drivers/gpu/drm/amd/display/dc/calcs/Makefile | 18 +
+ drivers/gpu/drm/amd/display/dc/calcs/bw_fixed.c | 191 +
+ .../gpu/drm/amd/display/dc/calcs/custom_float.c | 197 +
+ drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 3255 +++++++++++
+ .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c | 1899 ++++++
+ .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.h | 37 +
+ .../gpu/drm/amd/display/dc/calcs/dcn_calc_math.c | 120 +
+ .../gpu/drm/amd/display/dc/calcs/dcn_calc_math.h | 40 +
+ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 1626 ++++++
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 1633 ++++++
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 359 ++
+ .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 101 +
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2365 ++++++++
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 775 +++
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2587 +++++++++
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 331 ++
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2795 +++++++++
+ drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 104 +
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 398 ++
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 193 +
+ drivers/gpu/drm/amd/display/dc/dc.h | 1103 ++++
+ drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 218 +
+ drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 115 +
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 467 ++
+ drivers/gpu/drm/amd/display/dc/dc_helper.c | 171 +
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 706 +++
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 652 +++
+ drivers/gpu/drm/amd/display/dc/dce/Makefile | 15 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 485 ++
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 228 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 918 +++
+ drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 148 +
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 1383 +++++
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 145 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 827 +++
+ drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h | 137 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 620 ++
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 218 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 209 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 631 ++
+ drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 268 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_ipp.h | 238 +
+ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 1379 +++++
+ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 268 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 700 +++
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 347 ++
+ drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 567 ++
+ drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 310 +
+ .../gpu/drm/amd/display/dc/dce/dce_scl_filters.c | 1119 ++++
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 1617 ++++++
+ .../drm/amd/display/dc/dce/dce_stream_encoder.h | 733 +++
+ drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 1463 +++++
+ drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 516 ++
+ drivers/gpu/drm/amd/display/dc/dce100/Makefile | 23 +
+ .../amd/display/dc/dce100/dce100_hw_sequencer.c | 152 +
+ .../amd/display/dc/dce100/dce100_hw_sequencer.h | 42 +
+ .../drm/amd/display/dc/dce100/dce100_resource.c | 933 +++
+ .../drm/amd/display/dc/dce100/dce100_resource.h | 26 +
+ drivers/gpu/drm/amd/display/dc/dce110/Makefile | 12 +
+ .../drm/amd/display/dc/dce110/dce110_compressor.c | 522 ++
+ .../drm/amd/display/dc/dce110/dce110_compressor.h | 81 +
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 2987 ++++++++++
+ .../amd/display/dc/dce110/dce110_hw_sequencer.h | 81 +
+ .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 1052 ++++
+ .../drm/amd/display/dc/dce110/dce110_mem_input_v.h | 35 +
+ .../drm/amd/display/dc/dce110/dce110_opp_csc_v.c | 738 +++
+ .../amd/display/dc/dce110/dce110_opp_regamma_v.c | 555 ++
+ .../gpu/drm/amd/display/dc/dce110/dce110_opp_v.c | 54 +
+ .../gpu/drm/amd/display/dc/dce110/dce110_opp_v.h | 39 +
+ .../drm/amd/display/dc/dce110/dce110_resource.c | 1327 +++++
+ .../drm/amd/display/dc/dce110/dce110_resource.h | 49 +
+ .../display/dc/dce110/dce110_timing_generator.c | 1966 +++++++
+ .../display/dc/dce110/dce110_timing_generator.h | 273 +
+ .../display/dc/dce110/dce110_timing_generator_v.c | 688 +++
+ .../display/dc/dce110/dce110_timing_generator_v.h | 33 +
+ .../drm/amd/display/dc/dce110/dce110_transform_v.c | 716 +++
+ .../drm/amd/display/dc/dce110/dce110_transform_v.h | 58 +
+ drivers/gpu/drm/amd/display/dc/dce112/Makefile | 10 +
+ .../drm/amd/display/dc/dce112/dce112_compressor.c | 854 +++
+ .../drm/amd/display/dc/dce112/dce112_compressor.h | 78 +
+ .../amd/display/dc/dce112/dce112_hw_sequencer.c | 163 +
+ .../amd/display/dc/dce112/dce112_hw_sequencer.h | 36 +
+ .../drm/amd/display/dc/dce112/dce112_resource.c | 1283 ++++
+ .../drm/amd/display/dc/dce112/dce112_resource.h | 61 +
+ drivers/gpu/drm/amd/display/dc/dce120/Makefile | 11 +
+ .../amd/display/dc/dce120/dce120_hw_sequencer.c | 257 +
+ .../amd/display/dc/dce120/dce120_hw_sequencer.h | 36 +
+ .../drm/amd/display/dc/dce120/dce120_resource.c | 1004 ++++
+ .../drm/amd/display/dc/dce120/dce120_resource.h | 39 +
+ .../display/dc/dce120/dce120_timing_generator.c | 1175 ++++
+ .../display/dc/dce120/dce120_timing_generator.h | 40 +
+ drivers/gpu/drm/amd/display/dc/dce80/Makefile | 13 +
+ .../drm/amd/display/dc/dce80/dce80_compressor.c | 834 +++
+ .../drm/amd/display/dc/dce80/dce80_compressor.h | 78 +
+ .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 117 +
+ .../drm/amd/display/dc/dce80/dce80_hw_sequencer.h | 36 +
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 1257 ++++
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.h | 47 +
+ .../amd/display/dc/dce80/dce80_timing_generator.c | 239 +
+ .../amd/display/dc/dce80/dce80_timing_generator.h | 45 +
+ drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 11 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 123 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 99 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 481 ++
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 1386 +++++
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 816 +++
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 702 +++
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 960 +++
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 683 +++
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2958 ++++++++++
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 38 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 70 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 167 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 363 ++
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 138 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 351 ++
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 186 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1468 +++++
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.h | 47 +
+ .../amd/display/dc/dcn10/dcn10_timing_generator.c | 1206 ++++
+ .../amd/display/dc/dcn10/dcn10_timing_generator.h | 374 ++
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 105 +
+ drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 131 +
+ drivers/gpu/drm/amd/display/dc/dm_services.h | 387 ++
+ drivers/gpu/drm/amd/display/dc/dm_services_types.h | 282 +
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 22 +
+ drivers/gpu/drm/amd/display/dc/dml/dc_features.h | 559 ++
+ .../drm/amd/display/dc/dml/display_mode_enums.h | 111 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 138 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 50 +
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 557 ++
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 6124 ++++++++++++++++++++
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 598 ++
+ .../drm/amd/display/dc/dml/display_rq_dlg_calc.c | 1763 ++++++
+ .../drm/amd/display/dc/dml/display_rq_dlg_calc.h | 148 +
+ .../amd/display/dc/dml/display_rq_dlg_helpers.c | 392 ++
+ .../amd/display/dc/dml/display_rq_dlg_helpers.h | 47 +
+ .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 1905 ++++++
+ .../amd/display/dc/dml/dml1_display_rq_dlg_calc.h | 67 +
+ .../gpu/drm/amd/display/dc/dml/dml_common_defs.c | 43 +
+ .../gpu/drm/amd/display/dc/dml/dml_common_defs.h | 39 +
+ .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 121 +
+ .../gpu/drm/amd/display/dc/dml/soc_bounding_box.c | 69 +
+ .../gpu/drm/amd/display/dc/dml/soc_bounding_box.h | 35 +
+ drivers/gpu/drm/amd/display/dc/gpio/Makefile | 58 +
+ .../amd/display/dc/gpio/dce110/hw_factory_dce110.c | 178 +
+ .../amd/display/dc/gpio/dce110/hw_factory_dce110.h | 32 +
+ .../display/dc/gpio/dce110/hw_translate_dce110.c | 387 ++
+ .../display/dc/gpio/dce110/hw_translate_dce110.h | 34 +
+ .../amd/display/dc/gpio/dce120/hw_factory_dce120.c | 197 +
+ .../amd/display/dc/gpio/dce120/hw_factory_dce120.h | 32 +
+ .../display/dc/gpio/dce120/hw_translate_dce120.c | 408 ++
+ .../display/dc/gpio/dce120/hw_translate_dce120.h | 34 +
+ .../amd/display/dc/gpio/dce80/hw_factory_dce80.c | 173 +
+ .../amd/display/dc/gpio/dce80/hw_factory_dce80.h | 32 +
+ .../amd/display/dc/gpio/dce80/hw_translate_dce80.c | 411 ++
+ .../amd/display/dc/gpio/dce80/hw_translate_dce80.h | 32 +
+ .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 192 +
+ .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.h | 32 +
+ .../amd/display/dc/gpio/dcn10/hw_translate_dcn10.c | 408 ++
+ .../amd/display/dc/gpio/dcn10/hw_translate_dcn10.h | 34 +
+ drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 150 +
+ .../display/dc/gpio/diagnostics/hw_factory_diag.c | 63 +
+ .../display/dc/gpio/diagnostics/hw_factory_diag.h | 32 +
+ .../dc/gpio/diagnostics/hw_translate_diag.c | 40 +
+ .../dc/gpio/diagnostics/hw_translate_diag.h | 34 +
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 272 +
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_regs.h | 45 +
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 591 ++
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.h | 56 +
+ drivers/gpu/drm/amd/display/dc/gpio/hpd_regs.h | 79 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 232 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.h | 46 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 107 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h | 74 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.c | 203 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.h | 144 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 162 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.h | 46 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 90 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.h | 50 +
+ drivers/gpu/drm/amd/display/dc/i2caux/Makefile | 78 +
+ drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c | 571 ++
+ drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h | 119 +
+ .../amd/display/dc/i2caux/dce100/i2caux_dce100.c | 105 +
+ .../amd/display/dc/i2caux/dce100/i2caux_dce100.h | 32 +
+ .../display/dc/i2caux/dce110/aux_engine_dce110.c | 470 ++
+ .../display/dc/i2caux/dce110/aux_engine_dce110.h | 78 +
+ .../dc/i2caux/dce110/i2c_hw_engine_dce110.c | 570 ++
+ .../dc/i2caux/dce110/i2c_hw_engine_dce110.h | 210 +
+ .../dc/i2caux/dce110/i2c_sw_engine_dce110.c | 160 +
+ .../dc/i2caux/dce110/i2c_sw_engine_dce110.h | 43 +
+ .../amd/display/dc/i2caux/dce110/i2caux_dce110.c | 311 +
+ .../amd/display/dc/i2caux/dce110/i2caux_dce110.h | 53 +
+ .../amd/display/dc/i2caux/dce112/i2caux_dce112.c | 128 +
+ .../amd/display/dc/i2caux/dce112/i2caux_dce112.h | 32 +
+ .../amd/display/dc/i2caux/dce120/i2caux_dce120.c | 118 +
+ .../amd/display/dc/i2caux/dce120/i2caux_dce120.h | 32 +
+ .../display/dc/i2caux/dce80/i2c_hw_engine_dce80.c | 875 +++
+ .../display/dc/i2caux/dce80/i2c_hw_engine_dce80.h | 54 +
+ .../display/dc/i2caux/dce80/i2c_sw_engine_dce80.c | 173 +
+ .../display/dc/i2caux/dce80/i2c_sw_engine_dce80.h | 43 +
+ .../drm/amd/display/dc/i2caux/dce80/i2caux_dce80.c | 284 +
+ .../drm/amd/display/dc/i2caux/dce80/i2caux_dce80.h | 38 +
+ .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c | 118 +
+ .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.h | 32 +
+ .../display/dc/i2caux/diagnostics/i2caux_diag.c | 97 +
+ .../display/dc/i2caux/diagnostics/i2caux_diag.h | 32 +
+ drivers/gpu/drm/amd/display/dc/i2caux/engine.h | 120 +
+ .../gpu/drm/amd/display/dc/i2caux/engine_base.c | 52 +
+ drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.c | 118 +
+ drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.h | 113 +
+ .../amd/display/dc/i2caux/i2c_generic_hw_engine.c | 284 +
+ .../amd/display/dc/i2caux/i2c_generic_hw_engine.h | 77 +
+ .../gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.c | 244 +
+ .../gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.h | 80 +
+ .../gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.c | 601 ++
+ .../gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.h | 81 +
+ drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 485 ++
+ drivers/gpu/drm/amd/display/dc/i2caux/i2caux.h | 122 +
+ drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h | 166 +
+ drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 182 +
+ drivers/gpu/drm/amd/display/dc/inc/compressor.h | 136 +
+ drivers/gpu/drm/amd/display/dc/inc/core_status.h | 50 +
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 283 +
+ drivers/gpu/drm/amd/display/dc/inc/custom_float.h | 40 +
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 141 +
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 64 +
+ drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h | 481 ++
+ drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 635 ++
+ drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 48 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 62 +
+ .../gpu/drm/amd/display/dc/inc/hw/display_clock.h | 85 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 50 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 134 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/gpio.h | 86 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 105 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 141 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h | 112 +
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 134 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 175 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 61 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 289 +
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 130 +
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 183 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 311 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 197 +
+ drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 79 +
+ drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 392 ++
+ drivers/gpu/drm/amd/display/dc/inc/resource.h | 172 +
+ drivers/gpu/drm/amd/display/dc/irq/Makefile | 48 +
+ .../amd/display/dc/irq/dce110/irq_service_dce110.c | 430 ++
+ .../amd/display/dc/irq/dce110/irq_service_dce110.h | 53 +
+ .../amd/display/dc/irq/dce120/irq_service_dce120.c | 289 +
+ .../amd/display/dc/irq/dce120/irq_service_dce120.h | 34 +
+ .../amd/display/dc/irq/dce80/irq_service_dce80.c | 303 +
+ .../amd/display/dc/irq/dce80/irq_service_dce80.h | 35 +
+ .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 356 ++
+ .../amd/display/dc/irq/dcn10/irq_service_dcn10.h | 34 +
+ drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 170 +
+ drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 85 +
+ drivers/gpu/drm/amd/display/dc/irq_types.h | 193 +
+ drivers/gpu/drm/amd/display/dc/os_types.h | 96 +
+ drivers/gpu/drm/amd/display/dc/virtual/Makefile | 9 +
+ .../amd/display/dc/virtual/virtual_link_encoder.c | 124 +
+ .../amd/display/dc/virtual/virtual_link_encoder.h | 34 +
+ .../display/dc/virtual/virtual_stream_encoder.c | 136 +
+ .../display/dc/virtual/virtual_stream_encoder.h | 39 +
+ drivers/gpu/drm/amd/display/include/audio_types.h | 106 +
+ .../amd/display/include/bios_parser_interface.h | 44 +
+ .../drm/amd/display/include/bios_parser_types.h | 310 +
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 143 +
+ drivers/gpu/drm/amd/display/include/dal_types.h | 49 +
+ .../drm/amd/display/include/ddc_service_types.h | 154 +
+ drivers/gpu/drm/amd/display/include/dpcd_defs.h | 149 +
+ drivers/gpu/drm/amd/display/include/fixed31_32.h | 466 ++
+ drivers/gpu/drm/amd/display/include/fixed32_32.h | 129 +
+ .../gpu/drm/amd/display/include/gpio_interface.h | 92 +
+ .../amd/display/include/gpio_service_interface.h | 105 +
+ drivers/gpu/drm/amd/display/include/gpio_types.h | 332 ++
+ .../amd/display/include/grph_object_ctrl_defs.h | 445 ++
+ .../gpu/drm/amd/display/include/grph_object_defs.h | 140 +
+ .../gpu/drm/amd/display/include/grph_object_id.h | 294 +
+ .../gpu/drm/amd/display/include/i2caux_interface.h | 92 +
+ .../amd/display/include/irq_service_interface.h | 51 +
+ .../drm/amd/display/include/link_service_types.h | 170 +
+ .../gpu/drm/amd/display/include/logger_interface.h | 188 +
+ drivers/gpu/drm/amd/display/include/logger_types.h | 166 +
+ .../gpu/drm/amd/display/include/set_mode_types.h | 107 +
+ drivers/gpu/drm/amd/display/include/signal_types.h | 95 +
+ drivers/gpu/drm/amd/display/include/vector.h | 150 +
+ .../gpu/drm/amd/display/modules/freesync/Makefile | 10 +
+ .../drm/amd/display/modules/freesync/freesync.c | 1483 +++++
+ .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 167 +
+ .../include/asic_reg/raven1/DCN/dcn_1_0_offset.h | 6 +
+ .../include/asic_reg/raven1/DCN/dcn_1_0_sh_mask.h | 5 +
+ .../include/asic_reg/vega10/DC/dce_12_0_offset.h | 4 +
+ .../include/asic_reg/vega10/DC/dce_12_0_sh_mask.h | 8 +
+ include/drm/drm_dp_helper.h | 20 +
+ 368 files changed, 132279 insertions(+), 75 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
+ create mode 100644 drivers/gpu/drm/amd/display/Kconfig
+ create mode 100644 drivers/gpu/drm/amd/display/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/TODO
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/conversion.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/conversion.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/fixpt32_32.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/grph_object_id.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/log_helpers.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/logger.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/logger.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/vector.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser2.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser_common.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser_common.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser_helper.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser_helper.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser_types_internal.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/bios_parser_types_internal2.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/command_table.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/command_table.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/command_table2.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/command_table2.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/command_table_helper.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/command_table_helper.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/bw_fixed.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/custom_float.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/dcn_calc_auto.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/dcn_calc_math.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/dcn_calc_math.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_debug.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_sink.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_surface.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc_bios_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc_ddc_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dp_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc_helper.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_abm.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_ipp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_opp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_scl_filters.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_transform.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce100/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_v.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_v.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator_v.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator_v.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce112/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce120/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce120/dce120_hw_sequencer.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce120/dce120_hw_sequencer.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce80/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_compressor.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_compressor.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_hw_sequencer.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dm_helpers.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dm_pp_smu.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dm_services.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dm_services_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dc_features.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_enums.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_calc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_calc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/soc_bounding_box.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/soc_bounding_box.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_translate_dce110.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_translate_dce110.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce120/hw_factory_dce120.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce120/hw_factory_dce120.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce120/hw_translate_dce120.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce120/hw_translate_dce120.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_factory_dce80.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_factory_dce80.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_translate_dce80.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_translate_dce80.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_factory_dcn10.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_factory_dcn10.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_translate_dcn10.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_translate_dcn10.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/diagnostics/hw_factory_diag.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/diagnostics/hw_factory_diag.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/diagnostics/hw_translate_diag.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/diagnostics/hw_translate_diag.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/gpio_regs.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/gpio_service.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hpd_regs.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_translate.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce100/i2caux_dce100.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce100/i2caux_dce100.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_sw_engine_dce110.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_sw_engine_dce110.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2caux_dce110.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2caux_dce110.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce112/i2caux_dce112.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce112/i2caux_dce112.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce120/i2caux_dce120.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce120/i2caux_dce120.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_hw_engine_dce80.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_hw_engine_dce80.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_sw_engine_dce80.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_sw_engine_dce80.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2caux_dce80.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2caux_dce80.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/diagnostics/i2caux_diag.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/diagnostics/i2caux_diag.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/engine.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/engine_base.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_generic_hw_engine.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_generic_hw_engine.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2caux.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/clock_source.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/compressor.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/core_status.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/core_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/custom_float.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/abm.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/audio.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/display_clock.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/gpio.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_hwss.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/irq_service.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/irq_service.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/os_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/virtual/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/audio_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/bios_parser_interface.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/bios_parser_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/dal_asic_id.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/dal_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/ddc_service_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/dpcd_defs.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/fixed31_32.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/fixed32_32.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/gpio_interface.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/gpio_service_interface.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/gpio_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/grph_object_defs.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/grph_object_id.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/i2caux_interface.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/irq_service_interface.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/link_service_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/logger_interface.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/logger_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/set_mode_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/signal_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/include/vector.h
+ create mode 100644 drivers/gpu/drm/amd/display/modules/freesync/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/modules/freesync/freesync.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h
+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 (e8c49fa96838 drm/i915: Reorder context-close to avoid calling i915_vma_close() under RCU)
+$ git merge drm-intel/for-linux-next
+Already up-to-date.
+Merging drm-tegra/drm/tegra/for-next (fb83be887390 drm/tegra: hdmi: Add cec-notifier support)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging drm-misc/for-linux-next (a9386bb05193 Merge tag 'drm-misc-next-fixes-2017-11-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
+$ 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 (ad9d50c79043 drm/msm: free kstrdup'd cmdline)
+$ git merge drm-msm/msm-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +-
+ drivers/gpu/drm/msm/msm_drv.h | 3 ++-
+ drivers/gpu/drm/msm/msm_gpu.c | 2 ++
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables)
+$ git merge hdlcd/for-upstream/hdlcd
+Already up-to-date.
+Merging mali-dp/for-upstream/mali-dp (a593a185218e drm: gem_cma_helper.c: Allow importing of contiguous scatterlists with nents > 1)
+$ git merge mali-dp/for-upstream/mali-dp
+Merge made by the 'recursive' strategy.
+ drivers/dma-buf/dma-buf.c | 6 ++--
+ drivers/gpu/drm/arm/hdlcd_drv.c | 4 +--
+ drivers/gpu/drm/arm/malidp_crtc.c | 16 +++++----
+ drivers/gpu/drm/arm/malidp_drv.c | 34 +++++++++----------
+ drivers/gpu/drm/arm/malidp_hw.c | 46 +++++++++++++------------
+ drivers/gpu/drm/arm/malidp_hw.h | 65 +++++++++++++++++++++---------------
+ drivers/gpu/drm/arm/malidp_planes.c | 21 ++++++------
+ drivers/gpu/drm/drm_atomic.c | 2 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 22 ++++++++++--
+ drivers/gpu/drm/drm_mm.c | 2 +-
+ drivers/gpu/drm/drm_vma_manager.c | 15 +++------
+ include/drm/drm_mm.h | 2 +-
+ 12 files changed, 132 insertions(+), 103 deletions(-)
+Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
+$ git merge sunxi-drm/sunxi-drm/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging imx-drm/imx-drm/next (e64b9189bfd5 gpu: ipu-v3: ipu-dc: Remove unused 'di' variable)
+$ git merge imx-drm/imx-drm/next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt | 2 +-
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +-
+ drivers/gpu/drm/imx/parallel-display.c | 2 +-
+ drivers/gpu/ipu-v3/ipu-dc.c | 3 ---
+ 4 files changed, 3 insertions(+), 6 deletions(-)
+Merging etnaviv/etnaviv/next (330b52bd9bba drm/etnaviv: short-circuit perfmon ioctls)
+$ git merge etnaviv/etnaviv/next
+Already up-to-date.
+Merging kconfig/for-next (6f7da290413b Linux 4.12)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging regmap/for-next (a15fdc340db1 Merge remote-tracking branches 'regmap/topic/const' and 'regmap/topic/hwspinlock' into regmap-next)
+$ git merge regmap/for-next
+Already up-to-date.
+Merging sound/for-next (3aabf94c2d95 ALSA: hda/realtek - Fix ALC275 no sound issue)
+$ git merge sound/for-next
+Already up-to-date.
+Merging sound-asoc/for-next (c05c9c1c0ca7 Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus)
+$ git merge sound-asoc/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging modules/modules-next (ece1996a21ee module: Do not paper over type mismatches in module_param_call())
+$ git merge modules/modules-next
+Auto-merging security/apparmor/lsm.c
+Auto-merging net/sunrpc/svc.c
+Auto-merging net/netfilter/nf_conntrack_core.c
+Auto-merging kernel/module.c
+Auto-merging include/net/netfilter/nf_conntrack.h
+Auto-merging include/linux/moduleparam.h
+Auto-merging fs/lockd/svc.c
+Auto-merging fs/fuse/inode.c
+Auto-merging drivers/tty/serial/kgdboc.c
+Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c
+Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c
+Auto-merging drivers/scsi/fcoe/fcoe_transport.c
+Auto-merging drivers/pci/pcie/aspm.c
+Auto-merging drivers/media/pci/tw686x/tw686x-core.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/isdn/hardware/mISDN/w6692.c
+Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c
+Auto-merging drivers/infiniband/hw/qib/qib_iba7322.c
+Auto-merging drivers/android/binder.c
+Auto-merging drivers/acpi/sysfs.c
+Auto-merging drivers/acpi/ec.c
+Auto-merging drivers/acpi/button.c
+Merge made by the 'recursive' strategy.
+ arch/powerpc/platforms/pseries/cmm.c | 2 +-
+ arch/x86/oprofile/nmi_int.c | 2 +-
+ drivers/acpi/button.c | 6 ++++--
+ drivers/acpi/ec.c | 6 ++++--
+ drivers/acpi/sysfs.c | 8 +++++---
+ drivers/android/binder.c | 2 +-
+ drivers/char/ipmi/ipmi_poweroff.c | 2 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 4 ++--
+ drivers/edac/edac_mc_sysfs.c | 2 +-
+ drivers/edac/edac_module.c | 3 ++-
+ drivers/hid/hid-magicmouse.c | 3 ++-
+ drivers/ide/ide.c | 4 ++--
+ drivers/infiniband/hw/qib/qib_iba7322.c | 4 ++--
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +-
+ drivers/isdn/hardware/mISDN/avmfritz.c | 2 +-
+ drivers/isdn/hardware/mISDN/mISDNinfineon.c | 2 +-
+ drivers/isdn/hardware/mISDN/netjet.c | 2 +-
+ drivers/isdn/hardware/mISDN/speedfax.c | 2 +-
+ drivers/isdn/hardware/mISDN/w6692.c | 2 +-
+ drivers/md/md.c | 6 +++---
+ drivers/media/pci/tw686x/tw686x-core.c | 4 ++--
+ drivers/media/usb/uvc/uvc_driver.c | 4 ++--
+ drivers/message/fusion/mptbase.c | 4 ++--
+ drivers/misc/kgdbts.c | 3 ++-
+ drivers/mtd/devices/block2mtd.c | 2 +-
+ drivers/mtd/devices/phram.c | 2 +-
+ drivers/mtd/ubi/build.c | 2 +-
+ drivers/pci/pcie/aspm.c | 5 +++--
+ drivers/platform/x86/thinkpad_acpi.c | 2 +-
+ drivers/scsi/fcoe/fcoe_transport.c | 20 ++++++++++++--------
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
+ drivers/tty/serial/kgdboc.c | 3 ++-
+ fs/fuse/inode.c | 4 ++--
+ fs/lockd/svc.c | 2 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 4 ++--
+ include/linux/moduleparam.h | 16 ++++------------
+ include/net/netfilter/nf_conntrack.h | 2 +-
+ kernel/module.c | 4 +---
+ net/netfilter/nf_conntrack_core.c | 2 +-
+ net/netfilter/nf_nat_ftp.c | 2 +-
+ net/netfilter/nf_nat_irc.c | 2 +-
+ net/sunrpc/svc.c | 4 ++--
+ security/apparmor/lsm.c | 16 ++++++++--------
+ 44 files changed, 92 insertions(+), 87 deletions(-)
+Merging input/next (c1b433e04ef9 Input: gamecon - mark expected switch fall-throughs)
+$ git merge input/next
+Already up-to-date.
+Merging block/for-next (50da70ed9c48 Merge branch 'for-4.15/block' into for-next)
+$ git merge block/for-next
+Merge made by the 'recursive' strategy.
+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 (914d7a7f29d5 dm: discard support requires all targets in a table support discards)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm-table.c
+Auto-merging drivers/md/dm-mpath.c
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-mpath.c | 2 --
+ drivers/md/dm-table.c | 43 ++++++++++++++++++++++---------------------
+ 2 files changed, 22 insertions(+), 23 deletions(-)
+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 (37cb8e1f8e10 Merge tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
+$ git merge mmc/next
+Already up-to-date.
+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 (0868b99c214a md: free unused memory after bitmap resize)
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/for-mfd-next (b2596d703513 dt-bindings: mfd: mc13xxx: Remove obsolete property)
+$ git merge mfd/for-mfd-next
+Auto-merging include/linux/mfd/rtsx_pci.h
+Auto-merging drivers/mfd/Makefile
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/acpi/Makefile
+Auto-merging drivers/acpi/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mfd/aspeed-scu.txt | 6 +
+ .../devicetree/bindings/mfd/brcm,iproc-cdru.txt | 16 ++
+ .../devicetree/bindings/mfd/brcm,iproc-mhb.txt | 18 ++
+ Documentation/devicetree/bindings/mfd/max77693.txt | 6 +
+ Documentation/devicetree/bindings/mfd/mc13xxx.txt | 1 -
+ .../devicetree/bindings/mfd/sprd,sc27xx-pmic.txt | 40 ++++
+ MAINTAINERS | 2 +-
+ drivers/acpi/Kconfig | 6 +
+ drivers/acpi/Makefile | 1 +
+ drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 137 +++++++++++
+ drivers/mfd/Kconfig | 36 ++-
+ drivers/mfd/Makefile | 2 +
+ drivers/mfd/axp20x.c | 2 +
+ drivers/mfd/fsl-imx25-tsadc.c | 17 +-
+ drivers/mfd/intel_soc_pmic_chtdc_ti.c | 184 +++++++++++++++
+ drivers/mfd/lpc_ich.c | 1 +
+ drivers/mfd/max77693.c | 5 +-
+ drivers/mfd/mxs-lradc.c | 6 +-
+ drivers/mfd/rts5249.c | 155 +++++++++++-
+ drivers/mfd/rtsx_pcr.c | 142 ++++++++++-
+ drivers/mfd/rtsx_pcr.h | 14 ++
+ drivers/mfd/sprd-sc27xx-spi.c | 259 +++++++++++++++++++++
+ drivers/mfd/ssbi.c | 2 +-
+ drivers/mfd/stw481x.c | 10 +-
+ drivers/mfd/tps65217.c | 28 +--
+ drivers/mfd/tps65218.c | 8 -
+ drivers/regulator/tps65217-regulator.c | 5 -
+ drivers/video/backlight/tps65217_bl.c | 14 +-
+ include/linux/mfd/rtsx_pci.h | 84 +++++++
+ include/linux/mfd/tps65217.h | 6 -
+ 30 files changed, 1138 insertions(+), 75 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/brcm,iproc-cdru.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/brcm,iproc-mhb.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/sprd,sc27xx-pmic.txt
+ create mode 100644 drivers/acpi/pmic/intel_pmic_chtdc_ti.c
+ create mode 100644 drivers/mfd/intel_soc_pmic_chtdc_ti.c
+ create mode 100644 drivers/mfd/sprd-sc27xx-spi.c
+Merging backlight/for-backlight-next (29fae2c1db24 backlight: ili922x: Remove redundant variable len)
+$ git merge backlight/for-backlight-next
+Auto-merging drivers/video/backlight/tps65217_bl.c
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/ili922x.c | 3 +--
+ drivers/video/backlight/pwm_bl.c | 7 +++++--
+ drivers/video/backlight/tps65217_bl.c | 3 +--
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+Merging battery/for-next (838c8afa67f9 power: supply: cpcap-charger: fix incorrect return value check)
+$ git merge battery/for-next
+Merge made by the 'recursive' strategy.
+ drivers/power/supply/cpcap-charger.c | 2 +-
+ drivers/power/supply/generic-adc-battery.c | 2 --
+ drivers/power/supply/max8997_charger.c | 3 +--
+ drivers/power/supply/pcf50633-charger.c | 2 --
+ drivers/power/supply/power_supply_core.c | 2 +-
+ drivers/power/supply/twl4030_charger.c | 2 +-
+ 6 files changed, 4 insertions(+), 9 deletions(-)
+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 (f77447db122a Merge tag 'regulator-v4.15' into regulator-next)
+$ git merge regulator/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging security/next-testing (e5729f86a298 ima: Remove redundant conditional operator)
+$ git merge security/next-testing
+Already up-to-date.
+Merging integrity/next (e87dafe70acc ima: Remove redundant conditional operator)
+$ git merge integrity/next
+Resolved 'Documentation/ABI/testing/evm' using previous resolution.
+Auto-merging Documentation/ABI/testing/evm
+CONFLICT (content): Merge conflict in Documentation/ABI/testing/evm
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b6fac60f758a] Merge remote-tracking branch 'integrity/next'
+$ git diff -M --stat --summary HEAD^..
+Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
+$ git merge keys/keys-next
+Merge made by the 'recursive' strategy.
+ Documentation/security/keys/core.rst | 10 +++++-----
+ crypto/asymmetric_keys/pkcs7_key_type.c | 1 +
+ crypto/asymmetric_keys/pkcs7_parser.c | 5 +++++
+ crypto/asymmetric_keys/public_key.c | 2 ++
+ crypto/asymmetric_keys/x509_public_key.c | 1 +
+ include/linux/key-type.h | 2 +-
+ include/linux/key.h | 7 ++++---
+ security/keys/gc.c | 20 ++++++++++----------
+ security/keys/internal.h | 8 ++++----
+ security/keys/key.c | 27 ++++++++++-----------------
+ security/keys/keyring.c | 20 ++++++++++----------
+ security/keys/permission.c | 5 ++---
+ security/keys/proc.c | 21 ++++++++++-----------
+ security/keys/process_keys.c | 2 +-
+ 14 files changed, 66 insertions(+), 65 deletions(-)
+Merging selinux/next (5794ed762ac2 selinux: remove extraneous initialization of slots_used and max_chain_len)
+$ git merge selinux/next
+Auto-merging security/selinux/ss/hashtab.h
+Auto-merging security/selinux/ss/hashtab.c
+Auto-merging security/selinux/hooks.c
+Merge made by the 'recursive' strategy.
+ security/selinux/hooks.c | 55 ++++++++++++++++-----------------------
+ security/selinux/ss/conditional.c | 1 -
+ security/selinux/ss/hashtab.c | 19 +++++++++++---
+ security/selinux/ss/hashtab.h | 4 +++
+ security/selinux/ss/services.c | 4 +++
+ 5 files changed, 47 insertions(+), 36 deletions(-)
+Merging tpmdd/next (f8b73d394f91 tpm: parse TPM event logs based on EFI table)
+$ git merge tpmdd/next
+Resolved 'include/linux/tpm_eventlog.h' using previous resolution.
+Auto-merging include/linux/tpm_eventlog.h
+CONFLICT (content): Merge conflict in include/linux/tpm_eventlog.h
+Auto-merging include/linux/efi.h
+Auto-merging drivers/firmware/efi/libstub/Makefile
+Auto-merging drivers/firmware/efi/Makefile
+Auto-merging drivers/char/tpm/tpm_eventlog_of.c
+Auto-merging drivers/char/tpm/tpm_eventlog_acpi.c
+Auto-merging drivers/char/tpm/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 287ed653486d] Merge remote-tracking branch 'tpmdd/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/boot/compressed/eboot.c | 1 +
+ drivers/char/tpm/Makefile | 5 +-
+ drivers/char/tpm/tpm-chip.c | 3 +-
+ drivers/char/tpm/tpm-interface.c | 62 +-----------
+ drivers/char/tpm/tpm.h | 41 ++++++--
+ drivers/char/tpm/tpm1_eventlog.c | 13 ++-
+ drivers/char/tpm/tpm2_eventlog.c | 2 +-
+ .../char/tpm/{tpm_acpi.c => tpm_eventlog_acpi.c} | 4 +-
+ drivers/char/tpm/tpm_eventlog_efi.c | 66 +++++++++++++
+ drivers/char/tpm/{tpm_of.c => tpm_eventlog_of.c} | 6 +-
+ drivers/char/tpm/tpm_tis_core.c | 110 +++++++++++++++------
+ drivers/char/tpm/xen-tpmfront.c | 61 ++++++++++++
+ drivers/firmware/efi/Makefile | 2 +-
+ drivers/firmware/efi/efi.c | 4 +
+ drivers/firmware/efi/libstub/Makefile | 3 +-
+ drivers/firmware/efi/libstub/tpm.c | 81 +++++++++++++++
+ drivers/firmware/efi/tpm.c | 40 ++++++++
+ include/linux/efi.h | 46 +++++++++
+ {drivers/char/tpm => include/linux}/tpm_eventlog.h | 35 ++-----
+ 19 files changed, 449 insertions(+), 136 deletions(-)
+ rename drivers/char/tpm/{tpm_acpi.c => tpm_eventlog_acpi.c} (97%)
+ create mode 100644 drivers/char/tpm/tpm_eventlog_efi.c
+ rename drivers/char/tpm/{tpm_of.c => tpm_eventlog_of.c} (93%)
+ create mode 100644 drivers/firmware/efi/tpm.c
+ rename {drivers/char/tpm => include/linux}/tpm_eventlog.h (78%)
+Merging watchdog/master (4cb30b044a8f watchdog: mei_wdt: constify mei_cl_device_id)
+$ git merge watchdog/master
+Already up-to-date.
+Merging iommu/next (a593472591a5 Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (d04222983379 Merge branches 'iommu/arm/smmu', 'iommu/updates', 'vfio/fixes', 'vfio/platform', 'iommu/vt-d', 'iommu/ipmmu-vmsa' and 'iommu/iova' into next)
+$ git merge vfio/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/next (42d5e37654e4 audit: filter PATH records keyed on filesystem magic)
+$ git merge audit/next
+Auto-merging kernel/auditsc.c
+Auto-merging kernel/audit.h
+Auto-merging include/uapi/linux/audit.h
+Auto-merging include/linux/audit.h
+Auto-merging include/asm-generic/audit_write.h
+Auto-merging include/asm-generic/audit_dir_write.h
+Merge made by the 'recursive' strategy.
+ include/asm-generic/audit_dir_write.h | 3 ++
+ include/asm-generic/audit_write.h | 3 ++
+ include/linux/audit.h | 8 ----
+ include/uapi/linux/audit.h | 8 +++-
+ kernel/audit.c | 76 +++++++++++++----------------------
+ kernel/audit.h | 2 +-
+ kernel/auditfilter.c | 39 ++++++++++++++----
+ kernel/auditsc.c | 23 +++++++++++
+ 8 files changed, 97 insertions(+), 65 deletions(-)
+Merging devicetree/for-next (aa25e446ce76 dt-bindings: usb: add #phy-cells to usb-nop-xceiv)
+$ git merge devicetree/for-next
+Already up-to-date.
+Merging mailbox/mailbox-for-next (1f90a2162fb3 mailbox/omap: unregister mbox class)
+$ git merge mailbox/mailbox-for-next
+Auto-merging drivers/mailbox/pcc.c
+Merge made by the 'recursive' strategy.
+ drivers/mailbox/Kconfig | 3 +-
+ drivers/mailbox/bcm-flexrm-mailbox.c | 66 ++++++++++++++++++++++++++----------
+ drivers/mailbox/mailbox-test.c | 11 +++---
+ drivers/mailbox/mailbox.c | 4 +--
+ drivers/mailbox/omap-mailbox.c | 6 +++-
+ drivers/mailbox/pcc.c | 4 +--
+ 6 files changed, 66 insertions(+), 28 deletions(-)
+Merging spi/for-next (abbdb5ce31c2 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spreadtrum' and 'spi/topic/tegra114' into spi-next)
+$ git merge spi/for-next
+Already up-to-date.
+Merging tip/auto-latest (a2c95b3e7d98 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Auto-merging tools/objtool/arch/x86/lib/insn.c
+Auto-merging tools/objtool/arch/x86/lib/inat.c
+Auto-merging tools/objtool/arch/x86/include/asm/insn.h
+Auto-merging tools/objtool/arch/x86/include/asm/inat.h
+Auto-merging kernel/events/core.c
+Merge made by the 'recursive' strategy.
+ arch/x86/Kconfig | 12 ++++--
+ arch/x86/events/intel/core.c | 35 +++++++++++------
+ arch/x86/events/intel/uncore_snbep.c | 8 ++++
+ arch/x86/kernel/cpu/common.c | 2 +
+ arch/x86/kernel/umip.c | 24 ++++++++----
+ drivers/clocksource/timer-of.c | 9 ++++-
+ drivers/clocksource/timer-of.h | 2 +-
+ drivers/irqchip/Kconfig | 7 ++++
+ drivers/irqchip/Makefile | 3 +-
+ drivers/irqchip/irq-gic-v3.c | 11 ++++--
+ drivers/irqchip/irq-gic-v4.c | 7 +++-
+ drivers/irqchip/irq-s3c24xx.c | 4 +-
+ drivers/irqchip/irq-sni-exiu.c | 4 +-
+ include/linux/compiler.h | 21 ++++++----
+ include/linux/irq.h | 11 +++++-
+ include/linux/irqchip/arm-gic-v4.h | 1 +
+ include/linux/timekeeper_internal.h | 7 ----
+ include/linux/timekeeping.h | 6 ---
+ kernel/events/core.c | 1 +
+ kernel/irq/manage.c | 13 ++++++-
+ kernel/jump_label.c | 2 +-
+ kernel/time/Kconfig | 4 --
+ kernel/time/timekeeping.c | 45 ----------------------
+ kernel/time/timer_list.c | 2 +-
+ tools/objtool/.gitignore | 2 +-
+ tools/objtool/Makefile | 22 +++--------
+ tools/objtool/arch/x86/Build | 10 ++---
+ tools/objtool/arch/x86/decode.c | 6 +--
+ .../objtool/arch/x86/{insn => include/asm}/inat.h | 12 +++++-
+ .../arch/x86/{insn => include/asm}/inat_types.h | 0
+ .../objtool/arch/x86/{insn => include/asm}/insn.h | 2 +-
+ .../objtool/{ => arch/x86/include/asm}/orc_types.h | 0
+ tools/objtool/arch/x86/{insn => lib}/inat.c | 2 +-
+ tools/objtool/arch/x86/{insn => lib}/insn.c | 4 +-
+ .../arch/x86/{insn => lib}/x86-opcode-map.txt | 0
+ .../arch/x86/{insn => tools}/gen-insn-attr-x86.awk | 0
+ tools/objtool/orc.h | 2 +-
+ tools/objtool/sync-check.sh | 29 ++++++++++++++
+ 38 files changed, 191 insertions(+), 141 deletions(-)
+ rename tools/objtool/arch/x86/{insn => include/asm}/inat.h (95%)
+ rename tools/objtool/arch/x86/{insn => include/asm}/inat_types.h (100%)
+ rename tools/objtool/arch/x86/{insn => include/asm}/insn.h (99%)
+ rename tools/objtool/{ => arch/x86/include/asm}/orc_types.h (100%)
+ rename tools/objtool/arch/x86/{insn => lib}/inat.c (99%)
+ rename tools/objtool/arch/x86/{insn => lib}/insn.c (99%)
+ rename tools/objtool/arch/x86/{insn => lib}/x86-opcode-map.txt (100%)
+ rename tools/objtool/arch/x86/{insn => tools}/gen-insn-attr-x86.awk (100%)
+ create mode 100755 tools/objtool/sync-check.sh
+Merging clockevents/clockevents/next (8a7507eea818 clocksource/drivers/mips-gic-timer: Add fastpath for local timer updates)
+$ git merge clockevents/clockevents/next
+Resolved 'drivers/clocksource/mips-gic-timer.c' using previous resolution.
+Auto-merging drivers/clocksource/mips-gic-timer.c
+CONFLICT (content): Merge conflict in drivers/clocksource/mips-gic-timer.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 93b297b24028] Merge remote-tracking branch 'clockevents/clockevents/next'
+$ git diff -M --stat --summary HEAD^..
+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 (a8e9b186f153 EDAC, sb_edac: Fix missing break in switch)
+$ git merge edac-amd/for-next
+Already up-to-date.
+Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
+$ git merge irqchip/irqchip/for-next
+Already up-to-date.
+Merging ftrace/for-next (a96a5037ed0f tracing, thermal: Hide cpu cooling trace events when not in use)
+$ git merge ftrace/for-next
+Auto-merging kernel/trace/tracing_map.h
+Auto-merging kernel/trace/trace_uprobe.c
+Auto-merging kernel/trace/trace_syscalls.c
+Auto-merging kernel/trace/trace_selftest.c
+Auto-merging kernel/trace/trace_kprobe.c
+Auto-merging kernel/trace/trace.h
+Auto-merging kernel/trace/ring_buffer.c
+Auto-merging kernel/trace/ftrace.c
+Auto-merging kernel/trace/Makefile
+Auto-merging kernel/trace/Kconfig
+Auto-merging kernel/printk/printk_safe.c
+Auto-merging kernel/module.c
+Auto-merging kernel/kallsyms.c
+Auto-merging kernel/events/core.c
+Auto-merging include/trace/events/xen.h
+Auto-merging include/trace/events/vmscan.h
+Auto-merging include/trace/events/thermal.h
+Auto-merging include/trace/events/dma_fence.h
+Auto-merging include/linux/trace_events.h
+Auto-merging include/linux/perf_event.h
+Auto-merging include/linux/init.h
+Auto-merging include/linux/ftrace.h
+Merge made by the 'recursive' strategy.
+ drivers/dma-buf/dma-fence.c | 1 -
+ include/linux/ftrace.h | 113 +++++-------
+ include/linux/init.h | 4 +-
+ include/linux/perf_event.h | 2 +-
+ include/linux/trace_events.h | 9 +-
+ include/trace/events/dma_fence.h | 40 -----
+ include/trace/events/preemptirq.h | 70 ++++++++
+ include/trace/events/thermal.h | 4 +
+ include/trace/events/vmscan.h | 4 +
+ include/trace/events/xen.h | 35 ++--
+ kernel/events/core.c | 13 +-
+ kernel/kallsyms.c | 43 ++++-
+ kernel/module.c | 2 +
+ kernel/printk/printk_safe.c | 15 +-
+ kernel/trace/Kconfig | 11 ++
+ kernel/trace/Makefile | 1 +
+ kernel/trace/ftrace.c | 354 ++++++++++++++++++++++++++++++++------
+ kernel/trace/ring_buffer.c | 64 ++-----
+ kernel/trace/trace.c | 91 ++++++++++
+ kernel/trace/trace.h | 9 +-
+ kernel/trace/trace_event_perf.c | 82 +++++----
+ kernel/trace/trace_events.c | 31 ++--
+ kernel/trace/trace_events_hist.c | 128 +++++++++-----
+ kernel/trace/trace_irqsoff.c | 133 +++++++++++---
+ kernel/trace/trace_kprobe.c | 22 +--
+ kernel/trace/trace_probe.c | 86 ---------
+ kernel/trace/trace_probe.h | 7 -
+ kernel/trace/trace_selftest.c | 34 +---
+ kernel/trace/trace_syscalls.c | 4 +-
+ kernel/trace/trace_uprobe.c | 4 +-
+ kernel/trace/tracing_map.c | 3 +-
+ kernel/trace/tracing_map.h | 2 +-
+ 32 files changed, 903 insertions(+), 518 deletions(-)
+ create mode 100644 include/trace/events/preemptirq.h
+Merging rcu/rcu/next (ad4e25a3a1a5 Merge branches 'doc.2017.10.20a', 'fixes.2017.10.19a', 'stall.2017.10.09a' and 'torture.2017.10.09a' into HEAD)
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging kvm/linux-next (61d750773df3 Merge tag 'kvm-ppc-next-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc)
+$ git merge kvm/linux-next
+Resolved 'arch/arm/kvm/emulate.c' using previous resolution.
+Resolved 'arch/arm64/kvm/inject_fault.c' using previous resolution.
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging virt/kvm/arm/vgic/vgic-its.c
+Auto-merging virt/kvm/arm/arm.c
+Auto-merging drivers/irqchip/irq-gic.c
+Auto-merging drivers/irqchip/irq-gic-v3.c
+Auto-merging drivers/clocksource/arm_arch_timer.c
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/x86/kvm/mmu.h
+Auto-merging arch/x86/kvm/mmu.c
+Auto-merging arch/x86/kvm/lapic.c
+Auto-merging arch/x86/include/asm/kvm_host.h
+Auto-merging arch/x86/include/asm/kvm_emulate.h
+Auto-merging arch/powerpc/kvm/powerpc.c
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kernel/asm-offsets.c
+Auto-merging arch/arm64/kvm/sys_regs.c
+Auto-merging arch/arm64/kvm/inject_fault.c
+CONFLICT (content): Merge conflict in arch/arm64/kvm/inject_fault.c
+Auto-merging arch/arm64/kvm/hyp/switch.c
+Auto-merging arch/arm64/include/uapi/asm/kvm.h
+Auto-merging arch/arm64/include/asm/arch_timer.h
+Auto-merging arch/arm/kvm/emulate.c
+CONFLICT (content): Merge conflict in arch/arm/kvm/emulate.c
+Auto-merging arch/arm/include/uapi/asm/kvm.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4e2453874856f5792766628c369ff03b80e060be] Merge remote-tracking branch 'kvm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 4 +
+ Documentation/virtual/kvm/devices/arm-vgic-its.txt | 20 +
+ arch/arm/include/asm/kvm_asm.h | 2 +
+ arch/arm/include/asm/kvm_emulate.h | 38 +-
+ arch/arm/include/asm/kvm_hyp.h | 4 +-
+ arch/arm/include/uapi/asm/kvm.h | 7 +
+ arch/arm/kvm/emulate.c | 137 -------
+ arch/arm/kvm/hyp/switch.c | 7 +-
+ arch/arm64/include/asm/arch_timer.h | 8 +-
+ arch/arm64/include/asm/kvm_asm.h | 2 +
+ arch/arm64/include/asm/kvm_emulate.h | 5 +-
+ arch/arm64/include/asm/kvm_hyp.h | 4 +-
+ arch/arm64/include/asm/timex.h | 2 +-
+ arch/arm64/include/uapi/asm/kvm.h | 7 +
+ arch/arm64/kvm/hyp/switch.c | 6 +-
+ arch/arm64/kvm/inject_fault.c | 88 +---
+ arch/arm64/kvm/sys_regs.c | 41 +-
+ arch/powerpc/include/asm/kvm_book3s.h | 3 +-
+ arch/powerpc/include/asm/kvm_book3s_64.h | 140 ++++++-
+ arch/powerpc/include/asm/kvm_book3s_asm.h | 13 +-
+ arch/powerpc/include/asm/kvm_host.h | 6 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 3 +
+ arch/powerpc/kernel/asm-offsets.c | 3 +
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 128 +++---
+ arch/powerpc/kvm/book3s_64_mmu_radix.c | 51 +--
+ arch/powerpc/kvm/book3s_64_slb.S | 2 +-
+ arch/powerpc/kvm/book3s_hv.c | 347 ++++++++++------
+ arch/powerpc/kvm/book3s_hv_builtin.c | 117 +++++-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 65 +--
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 197 ++++++++-
+ arch/powerpc/kvm/book3s_pr.c | 16 +-
+ arch/powerpc/kvm/book3s_pr_papr.c | 2 +
+ arch/powerpc/kvm/e500_mmu_host.c | 2 +-
+ arch/powerpc/kvm/powerpc.c | 3 +-
+ arch/x86/include/asm/kvm_emulate.h | 2 +
+ arch/x86/include/asm/kvm_host.h | 8 +
+ arch/x86/include/asm/vmx.h | 4 +-
+ arch/x86/kvm/emulate.c | 9 +
+ arch/x86/kvm/lapic.c | 91 ++++-
+ arch/x86/kvm/mmu.c | 115 +++---
+ arch/x86/kvm/mmu.h | 3 +-
+ arch/x86/kvm/paging_tmpl.h | 18 +-
+ arch/x86/kvm/svm.c | 241 +++++++----
+ arch/x86/kvm/vmx.c | 208 ++++++----
+ arch/x86/kvm/x86.c | 94 +++--
+ drivers/clocksource/arm_arch_timer.c | 35 +-
+ drivers/irqchip/irq-gic-v3.c | 8 +-
+ drivers/irqchip/irq-gic.c | 6 +-
+ include/kvm/arm_arch_timer.h | 26 +-
+ tools/kvm/kvm_stat/kvm_stat | 30 +-
+ virt/kvm/arm/aarch32.c | 97 ++++-
+ virt/kvm/arm/arch_timer.c | 452 ++++++++++++++-------
+ virt/kvm/arm/arm.c | 45 +-
+ virt/kvm/arm/hyp/timer-sr.c | 74 ++--
+ virt/kvm/arm/vgic/vgic-its.c | 199 ++++-----
+ virt/kvm/arm/vgic/vgic-mmio-v2.c | 22 +-
+ virt/kvm/arm/vgic/vgic-mmio-v3.c | 17 +-
+ virt/kvm/arm/vgic/vgic-mmio.c | 44 +-
+ virt/kvm/arm/vgic/vgic-v2.c | 5 +-
+ virt/kvm/arm/vgic/vgic-v3.c | 12 +-
+ virt/kvm/arm/vgic/vgic.c | 62 +--
+ virt/kvm/arm/vgic/vgic.h | 3 +-
+ virt/kvm/kvm_main.c | 2 +-
+ 63 files changed, 2184 insertions(+), 1228 deletions(-)
+Merging kvm-arm/next (95b110ab9a09 KVM: arm/arm64: Don't queue VLPIs on INV/INVALL)
+$ git merge kvm-arm/next
+Auto-merging virt/kvm/arm/vgic/vgic-its.c
+Auto-merging virt/kvm/arm/arm.c
+Auto-merging arch/arm64/kvm/Makefile
+Auto-merging arch/arm64/kvm/Kconfig
+Auto-merging arch/arm/kvm/Makefile
+Auto-merging arch/arm/kvm/Kconfig
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 4 +
+ Documentation/virtual/kvm/devices/arm-vgic-its.txt | 2 +
+ arch/arm/kvm/Kconfig | 5 +
+ arch/arm/kvm/Makefile | 1 +
+ arch/arm64/kvm/Kconfig | 3 +
+ arch/arm64/kvm/Makefile | 1 +
+ include/kvm/arm_vgic.h | 41 ++-
+ virt/kvm/arm/arch_timer.c | 24 +-
+ virt/kvm/arm/arm.c | 48 ++-
+ virt/kvm/arm/hyp/vgic-v3-sr.c | 9 +-
+ virt/kvm/arm/vgic/vgic-init.c | 7 +
+ virt/kvm/arm/vgic/vgic-its.c | 204 ++++++++----
+ virt/kvm/arm/vgic/vgic-mmio-v3.c | 5 +
+ virt/kvm/arm/vgic/vgic-v3.c | 14 +
+ virt/kvm/arm/vgic/vgic-v4.c | 364 +++++++++++++++++++++
+ virt/kvm/arm/vgic/vgic.c | 67 +++-
+ virt/kvm/arm/vgic/vgic.h | 10 +
+ 17 files changed, 695 insertions(+), 114 deletions(-)
+ create mode 100644 virt/kvm/arm/vgic/vgic-v4.c
+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 (432953b4455d KVM: PPC: Book3S HV: Cosmetic post-merge cleanups)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging kvms390/next (da9a1446d248 KVM: s390: provide a capability for AIS state migration)
+$ git merge kvms390/next
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging include/uapi/linux/kvm.h
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging Documentation/virtual/kvm/api.txt
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 9 +++++
+ Documentation/virtual/kvm/devices/s390_flic.txt | 5 +++
+ arch/s390/include/asm/kvm_host.h | 25 +++++++++++--
+ arch/s390/kvm/interrupt.c | 26 +++++++++++--
+ arch/s390/kvm/kvm-s390.c | 1 +
+ arch/s390/kvm/vsie.c | 50 +++++++++----------------
+ include/linux/kvm_host.h | 1 +
+ include/uapi/linux/kvm.h | 1 +
+ virt/kvm/kvm_main.c | 4 +-
+ 9 files changed, 80 insertions(+), 42 deletions(-)
+Merging xen-tip/linux-next (646d944c2ef5 xen/pvcalls: fix potential endless loop in pvcalls-front.c)
+$ git merge xen-tip/linux-next
+Auto-merging include/xen/xen-ops.h
+Auto-merging drivers/xen/time.c
+Auto-merging drivers/xen/pvcalls-back.c
+Auto-merging drivers/xen/grant-table.c
+Auto-merging drivers/xen/Makefile
+Auto-merging arch/x86/xen/xen-ops.h
+Auto-merging arch/x86/xen/time.c
+Auto-merging arch/x86/xen/suspend.c
+Auto-merging arch/x86/xen/mmu_pv.c
+Auto-merging arch/x86/kernel/kvmclock.c
+Auto-merging arch/x86/include/asm/xen/page.h
+Auto-merging arch/x86/include/asm/pvclock.h
+Auto-merging arch/x86/entry/vdso/vma.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +
+ arch/arm/xen/grant-table.c | 9 +-
+ arch/x86/entry/vdso/vma.c | 2 +-
+ arch/x86/include/asm/pvclock.h | 19 +-
+ arch/x86/include/asm/xen/cpuid.h | 42 +-
+ arch/x86/include/asm/xen/page.h | 11 +-
+ arch/x86/kernel/kvmclock.c | 7 +-
+ arch/x86/kernel/pvclock.c | 14 +
+ arch/x86/xen/grant-table.c | 60 +-
+ arch/x86/xen/mmu.c | 14 +-
+ arch/x86/xen/mmu_pv.c | 4 +-
+ arch/x86/xen/suspend.c | 4 +
+ arch/x86/xen/time.c | 99 ++-
+ arch/x86/xen/xen-ops.h | 2 +
+ drivers/ptp/ptp_kvm.c | 5 +-
+ drivers/xen/Kconfig | 11 +
+ drivers/xen/Makefile | 1 +
+ drivers/xen/grant-table.c | 244 +++++-
+ drivers/xen/manage.c | 7 +-
+ drivers/xen/privcmd.c | 3 -
+ drivers/xen/pvcalls-back.c | 4 +
+ drivers/xen/pvcalls-front.c | 1278 ++++++++++++++++++++++++++++
+ drivers/xen/pvcalls-front.h | 28 +
+ drivers/xen/time.c | 72 +-
+ drivers/xen/xenbus/xenbus_probe_frontend.c | 2 +
+ include/xen/grant_table.h | 5 +-
+ include/xen/interface/vcpu.h | 42 +
+ include/xen/xen-ops.h | 25 +
+ 28 files changed, 1941 insertions(+), 75 deletions(-)
+ create mode 100644 drivers/xen/pvcalls-front.c
+ create mode 100644 drivers/xen/pvcalls-front.h
+Merging percpu/for-next (438a50618095 percpu: don't forget to free the temporary struct pcpu_alloc_info)
+$ git merge percpu/for-next
+Auto-merging mm/percpu.c
+Merge made by the 'recursive' strategy.
+ mm/percpu.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging workqueues/for-next (56e87829c90f Merge branch 'for-4.15' into for-next)
+$ git merge workqueues/for-next
+Auto-merging kernel/workqueue.c
+Merge made by the 'recursive' strategy.
+ kernel/workqueue.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging drivers-x86/for-next (73ed298b0605 platform/x86: Revert intel_pmc_ipc: Use MFD framework to create dependent devices)
+$ git merge drivers-x86/for-next
+Resolved 'Documentation/admin-guide/thunderbolt.rst' using previous resolution.
+Resolved 'tools/Makefile' using previous resolution.
+Auto-merging tools/Makefile
+CONFLICT (content): Merge conflict in tools/Makefile
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Auto-merging drivers/platform/x86/Makefile
+Auto-merging drivers/platform/x86/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/thunderbolt.rst
+CONFLICT (content): Merge conflict in Documentation/admin-guide/thunderbolt.rst
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 37aad8107eb6a82b19b7ffdd9aabd4d94e19b6db] Merge remote-tracking branch 'drivers-x86/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/dell-smbios-wmi | 41 ++
+ .../ABI/testing/sysfs-platform-dell-smbios | 21 +
+ .../testing/sysfs-platform-intel-wmi-thunderbolt | 11 +
+ Documentation/admin-guide/thunderbolt.rst | 15 +
+ MAINTAINERS | 39 +-
+ drivers/platform/x86/Kconfig | 56 ++-
+ drivers/platform/x86/Makefile | 4 +
+ drivers/platform/x86/asus-wmi.c | 63 +++
+ drivers/platform/x86/dell-laptop.c | 283 +++++-------
+ drivers/platform/x86/dell-smbios-smm.c | 196 ++++++++
+ drivers/platform/x86/dell-smbios-wmi.c | 271 +++++++++++
+ drivers/platform/x86/dell-smbios.c | 512 +++++++++++++++++++--
+ drivers/platform/x86/dell-smbios.h | 49 +-
+ drivers/platform/x86/dell-smo8800.c | 3 +-
+ drivers/platform/x86/dell-wmi-descriptor.c | 170 +++++++
+ drivers/platform/x86/dell-wmi-descriptor.h | 21 +
+ drivers/platform/x86/dell-wmi.c | 95 +---
+ drivers/platform/x86/fujitsu-laptop.c | 14 +-
+ drivers/platform/x86/hp-wmi.c | 2 +-
+ drivers/platform/x86/hp_accel.c | 1 +
+ drivers/platform/x86/ideapad-laptop.c | 7 +
+ drivers/platform/x86/intel-hid.c | 18 +
+ drivers/platform/x86/intel-wmi-thunderbolt.c | 98 ++++
+ drivers/platform/x86/intel_cht_int33fe.c | 114 ++++-
+ drivers/platform/x86/intel_ips.c | 160 +++----
+ drivers/platform/x86/intel_ips.h | 4 -
+ drivers/platform/x86/intel_punit_ipc.c | 8 +-
+ drivers/platform/x86/intel_telemetry_core.c | 3 +-
+ drivers/platform/x86/intel_telemetry_debugfs.c | 24 +-
+ drivers/platform/x86/intel_telemetry_pltdrv.c | 25 +-
+ drivers/platform/x86/intel_turbo_max_3.c | 1 +
+ drivers/platform/x86/mlx-platform.c | 4 +-
+ drivers/platform/x86/peaq-wmi.c | 19 +-
+ drivers/platform/x86/silead_dmi.c | 48 ++
+ drivers/platform/x86/sony-laptop.c | 16 +-
+ drivers/platform/x86/thinkpad_acpi.c | 132 +++++-
+ drivers/platform/x86/wmi.c | 254 ++++++++--
+ include/linux/wmi.h | 13 +-
+ include/uapi/linux/wmi.h | 73 +++
+ tools/Makefile | 14 +-
+ tools/wmi/Makefile | 18 +
+ tools/wmi/dell-smbios-example.c | 210 +++++++++
+ 42 files changed, 2578 insertions(+), 552 deletions(-)
+ create mode 100644 Documentation/ABI/testing/dell-smbios-wmi
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-dell-smbios
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-intel-wmi-thunderbolt
+ create mode 100644 drivers/platform/x86/dell-smbios-smm.c
+ create mode 100644 drivers/platform/x86/dell-smbios-wmi.c
+ create mode 100644 drivers/platform/x86/dell-wmi-descriptor.c
+ create mode 100644 drivers/platform/x86/dell-wmi-descriptor.h
+ create mode 100644 drivers/platform/x86/intel-wmi-thunderbolt.c
+ create mode 100644 include/uapi/linux/wmi.h
+ create mode 100644 tools/wmi/Makefile
+ create mode 100644 tools/wmi/dell-smbios-example.c
+Merging chrome-platform/for-next (859eb05676f6 platform/chrome: Use proper protocol transfer function)
+$ git merge chrome-platform/for-next
+Auto-merging drivers/platform/chrome/chromeos_laptop.c
+Merge made by the 'recursive' strategy.
+ drivers/platform/chrome/chromeos_laptop.c | 22 +++----
+ drivers/platform/chrome/cros_ec_debugfs.c | 18 +++++
+ drivers/platform/chrome/cros_ec_debugfs.h | 2 +
+ drivers/platform/chrome/cros_ec_dev.c | 49 ++++++++------
+ drivers/platform/chrome/cros_ec_proto.c | 8 ++-
+ drivers/platform/chrome/cros_ec_sysfs.c | 105 ++++++++++++++++++++++++------
+ include/linux/mfd/cros_ec.h | 1 +
+ 7 files changed, 149 insertions(+), 56 deletions(-)
+Merging hsi/for-next (8635d6b3afe6 dt-bindings: hsi: add omap4 hsi controller bindings)
+$ git merge hsi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hsi/clients/hsi_char.c | 4 ++--
+ drivers/hsi/controllers/omap_ssi_core.c | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+Merging leds/for-next (3faee9423ce0 leds: Add driver for PC Engines APU/APU2 LEDs)
+$ git merge leds/for-next
+Already up-to-date.
+Merging ipmi/for-next (71c07ce42ccc ipmi_si_platform: Fix typo in parameter description)
+$ git merge ipmi/for-next
+Auto-merging drivers/char/ipmi/ipmi_dmi.h
+Auto-merging drivers/char/ipmi/ipmi_dmi.c
+Auto-merging drivers/char/ipmi/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/IPMI.txt | 4 +-
+ drivers/char/ipmi/Kconfig | 35 +-
+ drivers/char/ipmi/Makefile | 10 +-
+ drivers/char/ipmi/ipmi_dmi.c | 76 +-
+ drivers/char/ipmi/ipmi_dmi.h | 8 +-
+ drivers/char/ipmi/ipmi_msghandler.c | 1275 ++++++++++++-----
+ drivers/char/ipmi/ipmi_powernv.c | 4 +-
+ drivers/char/ipmi/ipmi_poweroff.c | 2 +-
+ drivers/char/ipmi/ipmi_si.h | 49 +
+ drivers/char/ipmi/ipmi_si_hardcode.c | 146 ++
+ drivers/char/ipmi/ipmi_si_hotmod.c | 242 ++++
+ drivers/char/ipmi/ipmi_si_intf.c | 2478 +++++++---------------------------
+ drivers/char/ipmi/ipmi_si_mem_io.c | 144 ++
+ drivers/char/ipmi/ipmi_si_parisc.c | 58 +
+ drivers/char/ipmi/ipmi_si_pci.c | 166 +++
+ drivers/char/ipmi/ipmi_si_platform.c | 593 ++++++++
+ drivers/char/ipmi/ipmi_si_port_io.c | 112 ++
+ drivers/char/ipmi/ipmi_si_sm.h | 23 +
+ drivers/char/ipmi/ipmi_ssif.c | 112 +-
+ drivers/char/ipmi/ipmi_watchdog.c | 13 +-
+ include/linux/ipmi.h | 8 +-
+ include/linux/ipmi_smi.h | 27 +-
+ 22 files changed, 3187 insertions(+), 2398 deletions(-)
+ create mode 100644 drivers/char/ipmi/ipmi_si.h
+ create mode 100644 drivers/char/ipmi/ipmi_si_hardcode.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_hotmod.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_mem_io.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_parisc.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_pci.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_platform.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_port_io.c
+Merging driver-core/driver-core-next (0ff26c662d5f driver core: Fix device link deferred probe)
+$ git merge driver-core/driver-core-next
+Auto-merging lib/Kconfig.debug
+Auto-merging drivers/infiniband/hw/hfi1/debugfs.c
+Auto-merging drivers/base/dd.c
+Auto-merging drivers/base/core.c
+Auto-merging drivers/base/arch_topology.c
+Merge made by the 'recursive' strategy.
+ drivers/base/arch_topology.c | 2 +-
+ drivers/base/core.c | 2 +-
+ drivers/base/dd.c | 16 ++-
+ drivers/base/test/test_async_driver_probe.c | 6 +-
+ drivers/infiniband/hw/hfi1/debugfs.c | 20 +--
+ fs/debugfs/file.c | 216 ++++++++++++++++------------
+ fs/debugfs/inode.c | 62 +++++---
+ fs/debugfs/internal.h | 20 ++-
+ include/linux/debugfs.h | 38 +----
+ lib/Kconfig.debug | 1 -
+ 10 files changed, 217 insertions(+), 166 deletions(-)
+Merging usb/usb-next (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
+$ git merge usb/usb-next
+Already up-to-date.
+Merging usb-gadget/next (ce2b21a4e5ce usb: dwc2: Fix UDC state tracking)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (7c36e6e14da5 USB: serial: f81534: implement break control)
+$ git merge usb-serial/usb-next
+Already up-to-date.
+Merging usb-chipidea-next/ci-for-usb-next (2a53e060a053 usb: chipidea: fix trivial typo in Kconfig)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Already up-to-date.
+Merging phy-next/next (36914111e682 drivers: phy: add calibrate method)
+$ git merge phy-next/next
+Already up-to-date.
+Merging tty/tty-next (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
+$ git merge tty/tty-next
+Already up-to-date.
+Merging char-misc/char-misc-next (f13d1a8a801d VME: Return -EBUSY when DMA list in use)
+$ git merge char-misc/char-misc-next
+Resolved 'drivers/misc/lkdtm_core.c' using previous resolution.
+Auto-merging drivers/w1/slaves/Makefile
+Auto-merging drivers/thunderbolt/tb.c
+Auto-merging drivers/nvmem/Makefile
+Auto-merging drivers/misc/lkdtm_core.c
+CONFLICT (content): Merge conflict in drivers/misc/lkdtm_core.c
+Auto-merging drivers/hv/vmbus_drv.c
+Auto-merging drivers/hv/Makefile
+Auto-merging drivers/android/binder.c
+Auto-merging arch/x86/include/asm/mshyperv.h
+Auto-merging arch/x86/hyperv/hv_init.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2ed9ef2deeba] Merge remote-tracking branch 'char-misc/char-misc-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-bus-vmbus | 70 ++
+ Documentation/ABI/testing/sysfs-driver-w1_ds28e17 | 21 +
+ .../bindings/nvmem/allwinner,sunxi-sid.txt | 1 +
+ .../devicetree/bindings/nvmem/amlogic-efuse.txt | 2 +-
+ .../bindings/nvmem/amlogic-meson-mx-efuse.txt | 22 +
+ .../devicetree/bindings/nvmem/rockchip-efuse.txt | 1 +
+ .../devicetree/bindings/nvmem/snvs-lpgpr.txt | 20 +
+ .../devicetree/bindings/nvmem/uniphier-efuse.txt | 49 ++
+ Documentation/trace/coresight-cpu-debug.txt | 22 +-
+ Documentation/w1/slaves/00-INDEX | 2 +
+ Documentation/w1/slaves/w1_ds28e17 | 68 ++
+ MAINTAINERS | 5 +-
+ arch/x86/hyperv/hv_init.c | 15 +-
+ arch/x86/include/asm/mshyperv.h | 2 +-
+ drivers/android/binder.c | 2 +-
+ drivers/android/binder_alloc.c | 18 +-
+ drivers/char/pcmcia/cm4000_cs.c | 6 +-
+ drivers/char/pcmcia/cm4040_cs.c | 7 +-
+ drivers/char/pcmcia/synclink_cs.c | 8 +-
+ drivers/fpga/xilinx-pr-decoupler.c | 2 +-
+ drivers/fsi/fsi-core.c | 6 +-
+ drivers/hv/Makefile | 4 +-
+ drivers/hv/channel.c | 23 +-
+ drivers/hv/channel_mgmt.c | 36 +-
+ drivers/hv/connection.c | 7 +
+ drivers/hv/hv_trace.c | 4 +
+ drivers/hv/hv_trace.h | 327 +++++++++
+ drivers/hv/hyperv_vmbus.h | 4 +
+ drivers/hv/vmbus_drv.c | 209 +++++-
+ .../coresight/coresight-dynamic-replicator.c | 4 +-
+ drivers/hwtracing/coresight/coresight-etb10.c | 4 +-
+ drivers/hwtracing/coresight/coresight-etm3x.c | 24 +-
+ drivers/hwtracing/coresight/coresight-funnel.c | 4 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 8 +-
+ drivers/hwtracing/coresight/coresight-tmc.c | 4 +-
+ drivers/hwtracing/coresight/coresight-tpiu.c | 4 +-
+ drivers/misc/altera-stapl/Kconfig | 3 +-
+ drivers/misc/genwqe/card_base.h | 7 +-
+ drivers/misc/genwqe/card_dev.c | 6 +-
+ drivers/misc/genwqe/card_utils.c | 43 +-
+ drivers/misc/lkdtm_core.c | 18 +-
+ drivers/misc/mei/mei-trace.c | 1 -
+ drivers/misc/mei/mei-trace.h | 19 -
+ drivers/misc/mic/Kconfig | 4 +
+ drivers/nvmem/Kconfig | 35 +-
+ drivers/nvmem/Makefile | 6 +
+ drivers/nvmem/bcm-ocotp.c | 1 -
+ drivers/nvmem/core.c | 13 +-
+ drivers/nvmem/imx-iim.c | 24 +-
+ drivers/nvmem/imx-ocotp.c | 193 +++++-
+ drivers/nvmem/lpc18xx_eeprom.c | 1 -
+ drivers/nvmem/lpc18xx_otp.c | 1 -
+ drivers/nvmem/meson-efuse.c | 5 +-
+ drivers/nvmem/meson-mx-efuse.c | 265 +++++++
+ drivers/nvmem/mtk-efuse.c | 47 +-
+ drivers/nvmem/mxs-ocotp.c | 1 -
+ drivers/nvmem/qfprom.c | 27 +-
+ drivers/nvmem/rockchip-efuse.c | 5 +-
+ drivers/nvmem/snvs_lpgpr.c | 156 +++++
+ drivers/nvmem/sunxi_sid.c | 7 +-
+ drivers/nvmem/uniphier-efuse.c | 97 +++
+ drivers/nvmem/vf610-ocotp.c | 1 -
+ drivers/parport/parport_ip32.c | 2 +-
+ drivers/pcmcia/cistpl.c | 2 +-
+ drivers/pcmcia/cs_internal.h | 2 +-
+ drivers/pcmcia/m32r_cfc.c | 7 +-
+ drivers/pcmcia/m32r_pcc.c | 7 +-
+ drivers/thunderbolt/tb.c | 1 +
+ drivers/vme/bridges/vme_ca91cx42.c | 73 +-
+ drivers/vme/bridges/vme_fake.c | 35 +-
+ drivers/vme/bridges/vme_tsi148.c | 83 +--
+ drivers/vme/vme.c | 214 +++---
+ drivers/w1/slaves/Kconfig | 15 +
+ drivers/w1/slaves/Makefile | 1 +
+ drivers/w1/slaves/w1_ds28e17.c | 771 +++++++++++++++++++++
+ drivers/w1/slaves/w1_therm.c | 59 +-
+ drivers/w1/w1_io.c | 3 +-
+ include/linux/hyperv.h | 10 +
+ include/linux/w1.h | 1 +
+ 79 files changed, 2770 insertions(+), 517 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-w1_ds28e17
+ create mode 100644 Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/snvs-lpgpr.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/uniphier-efuse.txt
+ create mode 100644 Documentation/w1/slaves/w1_ds28e17
+ create mode 100644 drivers/hv/hv_trace.c
+ create mode 100644 drivers/hv/hv_trace.h
+ create mode 100644 drivers/nvmem/meson-mx-efuse.c
+ create mode 100644 drivers/nvmem/snvs_lpgpr.c
+ create mode 100644 drivers/nvmem/uniphier-efuse.c
+ create mode 100644 drivers/w1/slaves/w1_ds28e17.c
+Merging extcon/extcon-next (d1ee96706144 extcon: max8997: Delete unneeded initialization in max8997_muic_set_path())
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ drivers/extcon/extcon-max77693.c | 2 +-
+ drivers/extcon/extcon-max8997.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging staging/staging-next (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
+$ git merge staging/staging-next
+Already up-to-date.
+Merging mux/for-next (aae4e7a8bc44 Linux 4.13-rc4)
+$ git merge mux/for-next
+Already up-to-date.
+Merging slave-dma/next (97d7fc7575b7 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Auto-merging drivers/dma/Makefile
+Merge made by the 'recursive' strategy.
+ drivers/dma/Kconfig | 8 ++++++++
+ drivers/dma/Makefile | 1 +
+ 2 files changed, 9 insertions(+)
+Merging cgroup/for-next (cefe6851e890 Merge branch 'for-4.15' into for-next)
+$ git merge cgroup/for-next
+Resolved 'kernel/cgroup/Makefile' using previous resolution.
+Resolved 'kernel/cgroup/cgroup.c' using previous resolution.
+Auto-merging kernel/sched/stop_task.c
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sched/rt.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/deadline.c
+Auto-merging kernel/sched/cputime.c
+CONFLICT (modify/delete): kernel/sched/cpuacct.h deleted in cgroup/for-next and modified in HEAD. Version HEAD of kernel/sched/cpuacct.h left in tree.
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/cgroup/cgroup.c
+CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
+Auto-merging kernel/cgroup/cgroup-internal.h
+Auto-merging kernel/cgroup/Makefile
+CONFLICT (content): Merge conflict in kernel/cgroup/Makefile
+Auto-merging include/linux/sched/cputime.h
+Auto-merging include/linux/cgroup.h
+Auto-merging include/linux/cgroup-defs.h
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f kernel/sched/cpuacct.h
+kernel/sched/cpuacct.h: needs merge
+rm 'kernel/sched/cpuacct.h'
+$ git commit -v -a
+[master 52b806b8b049] Merge remote-tracking branch 'cgroup/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cgroup-v2.txt | 42 ++---
+ MAINTAINERS | 2 +-
+ include/linux/cgroup-defs.h | 59 +++++++
+ include/linux/cgroup.h | 58 +++++++
+ include/linux/sched/cputime.h | 3 +-
+ kernel/cgroup/Makefile | 2 +-
+ kernel/cgroup/cgroup-internal.h | 9 ++
+ kernel/cgroup/cgroup.c | 157 ++++++++++++++++++-
+ kernel/cgroup/stat.c | 334 ++++++++++++++++++++++++++++++++++++++++
+ kernel/sched/core.c | 174 ++++++++++++++++++++-
+ kernel/sched/cpuacct.h | 18 ---
+ kernel/sched/cputime.c | 14 +-
+ kernel/sched/deadline.c | 2 +-
+ kernel/sched/fair.c | 2 +-
+ kernel/sched/rt.c | 2 +-
+ kernel/sched/sched.h | 2 +-
+ kernel/sched/stop_task.c | 2 +-
+ 17 files changed, 821 insertions(+), 61 deletions(-)
+ create mode 100644 kernel/cgroup/stat.c
+ delete mode 100644 kernel/sched/cpuacct.h
+Merging scsi/for-next (341b2aa83368 scsi: lpfc: Fix hard lock up NMI in els timeout handling.)
+$ git merge scsi/for-next
+Already up-to-date.
+Merging scsi-mkp/for-next (341b2aa83368 scsi: lpfc: Fix hard lock up NMI in els timeout handling.)
+$ git merge scsi-mkp/for-next
+Already up-to-date.
+Merging target-updates/for-next (97488c73190b tcmu: Add a missing unlock on an error path)
+$ git merge target-updates/for-next
+Auto-merging include/target/target_core_base.h
+Auto-merging drivers/target/target_core_user.c
+Auto-merging drivers/target/target_core_internal.h
+Auto-merging drivers/target/target_core_configfs.c
+Auto-merging drivers/target/target_core_alua.h
+Auto-merging drivers/target/iscsi/iscsi_target_util.c
+Auto-merging drivers/target/iscsi/iscsi_target_erl1.c
+Auto-merging drivers/target/iscsi/iscsi_target.c
+Merge made by the 'recursive' strategy.
+ drivers/target/iscsi/cxgbit/cxgbit.h | 2 +
+ drivers/target/iscsi/cxgbit/cxgbit_cm.c | 45 +++++
+ drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 8 +
+ drivers/target/iscsi/cxgbit/cxgbit_main.c | 1 +
+ drivers/target/iscsi/iscsi_target.c | 80 ++++-----
+ drivers/target/iscsi/iscsi_target_configfs.c | 3 +-
+ drivers/target/iscsi/iscsi_target_erl1.c | 7 +-
+ drivers/target/iscsi/iscsi_target_parameters.c | 39 ++---
+ drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 2 -
+ drivers/target/iscsi/iscsi_target_tpg.c | 7 +-
+ drivers/target/iscsi/iscsi_target_util.c | 4 +
+ drivers/target/target_core_alua.c | 51 +++---
+ drivers/target/target_core_alua.h | 9 -
+ drivers/target/target_core_configfs.c | 14 +-
+ drivers/target/target_core_fabric_configfs.c | 2 -
+ drivers/target/target_core_file.c | 4 +
+ drivers/target/target_core_internal.h | 1 +
+ drivers/target/target_core_pr.c | 41 ++---
+ drivers/target/target_core_tmr.c | 12 +-
+ drivers/target/target_core_transport.c | 84 +++++----
+ drivers/target/target_core_user.c | 208 +++++++++++++++--------
+ include/target/target_core_base.h | 2 +
+ 22 files changed, 387 insertions(+), 239 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 (2ea659a9ef48 Linux 4.12-rc1)
+$ git merge target-bva/for-next
+Already up-to-date.
+Merging libata/for-next (d9d72867f89b Merge branch 'for-4.15' into for-next)
+$ git merge libata/for-next
+Auto-merging drivers/ata/libata.h
+Auto-merging drivers/ata/libata-eh.c
+Auto-merging drivers/ata/libata-core.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ata/ahci-ceva.txt | 39 ++++
+ drivers/ata/ahci.c | 9 +-
+ drivers/ata/ahci_ceva.c | 197 +++++++++++++++++----
+ drivers/ata/ahci_imx.c | 2 +-
+ drivers/ata/libahci_platform.c | 1 +
+ drivers/ata/libata-core.c | 8 +-
+ drivers/ata/libata-eh.c | 14 +-
+ drivers/ata/libata-scsi.c | 19 +-
+ drivers/ata/libata.h | 2 +-
+ drivers/ata/pata_artop.c | 2 +-
+ drivers/ata/pata_atp867x.c | 2 +
+ drivers/ata/pata_pdc2027x.c | 6 +-
+ drivers/ata/sata_dwc_460ex.c | 1 +
+ drivers/ata/sata_mv.c | 8 +-
+ drivers/ata/sata_rcar.c | 7 +-
+ include/linux/libata.h | 1 +
+ 16 files changed, 244 insertions(+), 74 deletions(-)
+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 (b4ebef9a9020 fw_cfg: write vmcoreinfo details)
+$ git merge vhost/linux-next
+Auto-merging drivers/vhost/scsi.c
+Merge made by the 'recursive' strategy.
+ drivers/firmware/qemu_fw_cfg.c | 292 +++++++++++++++++++++++++++++++++----
+ drivers/vhost/scsi.c | 4 +-
+ drivers/vhost/vhost.c | 4 +-
+ drivers/vhost/vsock.c | 2 +
+ drivers/virtio/virtio_balloon.c | 24 ++-
+ include/linux/balloon_compaction.h | 35 ++++-
+ kernel/crash_core.c | 1 +
+ mm/balloon_compaction.c | 28 +++-
+ 8 files changed, 344 insertions(+), 46 deletions(-)
+Merging rpmsg/for-next (fd21c7c7519b Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Auto-merging include/linux/qcom_scm.h
+Auto-merging drivers/firmware/qcom_scm.h
+Auto-merging drivers/firmware/qcom_scm.c
+Auto-merging drivers/firmware/qcom_scm-64.c
+Auto-merging drivers/firmware/qcom_scm-32.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 1 +
+ .../devicetree/bindings/soc/qcom/qcom,glink.txt | 10 +
+ drivers/firmware/qcom_scm-32.c | 7 +
+ drivers/firmware/qcom_scm-64.c | 27 ++
+ drivers/firmware/qcom_scm.c | 95 +++++++
+ drivers/firmware/qcom_scm.h | 5 +
+ drivers/hwspinlock/Kconfig | 2 +-
+ drivers/remoteproc/Kconfig | 4 -
+ drivers/remoteproc/qcom_q6v5_pil.c | 291 ++++++++++++++++++---
+ drivers/remoteproc/remoteproc_debugfs.c | 130 +++++++++
+ drivers/rpmsg/Kconfig | 3 +-
+ drivers/rpmsg/qcom_glink_native.c | 50 +++-
+ include/linux/qcom_scm.h | 16 ++
+ 13 files changed, 585 insertions(+), 56 deletions(-)
+Merging gpio/for-next (24f0966c3e3f gpio: tegra186: Remove tegra186_gpio_lock_class)
+$ git merge gpio/for-next
+Already up-to-date.
+Merging pinctrl/for-next (eeb690bceb1e pinctrl: gemini: Fix missing pad descriptions)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/stm32/pinctrl-stm32.c
+Auto-merging drivers/pinctrl/pinctrl-mcp23s08.c
+Auto-merging drivers/pinctrl/pinctrl-amd.c
+Auto-merging drivers/pinctrl/intel/pinctrl-cherryview.c
+Auto-merging drivers/pinctrl/intel/Makefile
+Auto-merging drivers/pinctrl/Kconfig
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging arch/blackfin/Kconfig.debug
+Auto-merging arch/blackfin/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/pinctrl/pinctrl-mcp23s08.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/cortina,gemini-pinctrl.txt | 10 +-
+ .../pinctrl/marvell,armada-37xx-pinctrl.txt | 4 +-
+ .../bindings/pinctrl/pinctrl-bindings.txt | 4 +
+ .../pinctrl-mcp23s08.txt} | 59 +
+ .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 +
+ .../bindings/pinctrl/renesas,rza1-pinctrl.txt | 6 +-
+ Documentation/driver-api/pinctl.rst | 6 +-
+ Documentation/gpio/gpio-legacy.txt | 10 +-
+ Documentation/translations/zh_CN/gpio.txt | 6 +-
+ MAINTAINERS | 1 +
+ arch/blackfin/Kconfig | 7 +-
+ arch/blackfin/Kconfig.debug | 1 +
+ arch/blackfin/include/asm/gpio.h | 20 +
+ arch/blackfin/kernel/bfin_gpio.c | 3 +
+ arch/blackfin/kernel/debug-mmrs.c | 2 +-
+ arch/blackfin/mach-common/ints-priority.c | 2 +-
+ arch/blackfin/mach-common/pm.c | 2 +-
+ drivers/gpio/Kconfig | 9 -
+ drivers/gpio/gpio-aspeed.c | 4 +-
+ drivers/gpio/gpio-em.c | 4 +-
+ drivers/gpio/gpio-pxa.c | 14 +-
+ drivers/gpio/gpio-rcar.c | 4 +-
+ drivers/gpio/gpio-tegra.c | 4 +-
+ drivers/gpio/gpio-tz1090.c | 4 +-
+ drivers/gpio/gpiolib.c | 4 +-
+ drivers/pinctrl/Kconfig | 32 +-
+ drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 21 +-
+ drivers/pinctrl/core.c | 12 +-
+ drivers/pinctrl/core.h | 2 +-
+ drivers/pinctrl/intel/Kconfig | 11 +-
+ drivers/pinctrl/intel/Makefile | 1 +
+ drivers/pinctrl/intel/pinctrl-cedarfork.c | 375 ++++
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +-
+ drivers/pinctrl/intel/pinctrl-intel.c | 20 +-
+ drivers/pinctrl/intel/pinctrl-intel.h | 3 +
+ drivers/pinctrl/meson/Kconfig | 41 +
+ drivers/pinctrl/meson/Makefile | 9 +-
+ drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 892 ++++-----
+ drivers/pinctrl/meson/pinctrl-meson-gxl.c | 852 ++++-----
+ drivers/pinctrl/meson/pinctrl-meson.c | 200 +-
+ drivers/pinctrl/meson/pinctrl-meson.h | 47 +-
+ drivers/pinctrl/meson/pinctrl-meson8-pmx.c | 108 ++
+ drivers/pinctrl/meson/pinctrl-meson8-pmx.h | 48 +
+ drivers/pinctrl/meson/pinctrl-meson8.c | 992 +++++-----
+ drivers/pinctrl/meson/pinctrl-meson8b.c | 808 +++++----
+ drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 64 +
+ drivers/pinctrl/pinconf-generic.c | 2 +
+ drivers/pinctrl/pinctrl-amd.c | 4 +-
+ drivers/pinctrl/pinctrl-gemini.c | 333 +++-
+ drivers/pinctrl/pinctrl-ingenic.c | 2 +-
+ drivers/pinctrl/pinctrl-max77620.c | 21 +-
+ drivers/pinctrl/pinctrl-mcp23s08.c | 20 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 43 +-
+ drivers/pinctrl/pinctrl-rza1.c | 134 ++
+ drivers/pinctrl/pinctrl-single.c | 4 +-
+ drivers/pinctrl/pinctrl-sx150x.c | 2 +-
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 6 +
+ drivers/pinctrl/samsung/Kconfig | 2 +-
+ drivers/pinctrl/sh-pfc/core.c | 131 +-
+ drivers/pinctrl/sh-pfc/core.h | 11 +-
+ drivers/pinctrl/sh-pfc/gpio.c | 4 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 403 +++--
+ drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 1 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 542 +++---
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 1904 +++++++++++++++++---
+ drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 573 +++---
+ drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 394 +++-
+ drivers/pinctrl/sh-pfc/pinctrl.c | 12 +-
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 24 +-
+ drivers/pinctrl/sirf/pinctrl-atlas7.c | 4 +-
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 4 +-
+ drivers/pinctrl/spear/pinctrl-plgpio.c | 6 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +-
+ drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun5i.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c | 3 +-
+ drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c | 3 +-
+ drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 13 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.h | 1 +
+ drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 4 -
+ drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 14 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 4 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 4 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 4 +-
+ include/dt-bindings/gpio/meson-gxbb-gpio.h | 2 +-
+ include/dt-bindings/gpio/meson-gxl-gpio.h | 2 +-
+ include/linux/pinctrl/consumer.h | 8 +-
+ include/linux/pinctrl/pinconf-generic.h | 5 +
+ 96 files changed, 6241 insertions(+), 3161 deletions(-)
+ rename Documentation/devicetree/bindings/{gpio/gpio-mcp23s08.txt => pinctrl/pinctrl-mcp23s08.txt} (66%)
+ create mode 100644 drivers/pinctrl/intel/pinctrl-cedarfork.c
+ create mode 100644 drivers/pinctrl/meson/Kconfig
+ create mode 100644 drivers/pinctrl/meson/pinctrl-meson8-pmx.c
+ create mode 100644 drivers/pinctrl/meson/pinctrl-meson8-pmx.h
+Merging pinctrl-samsung/for-next (2bd6bf03f4c1 Linux 4.14-rc1)
+$ git merge pinctrl-samsung/for-next
+Already up-to-date.
+Merging pwm/for-next (f83e2ae2606b pwm: stm32-lp: Remove pwm_is_enabled() check before calling pwm_disable())
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 1 +
+ drivers/pwm/pwm-atmel-tcb.c | 63 +++++++-
+ drivers/pwm/pwm-img.c | 160 ++++++++++++++++++---
+ drivers/pwm/pwm-mediatek.c | 53 +++++--
+ drivers/pwm/pwm-stm32-lp.c | 3 +-
+ drivers/pwm/pwm-sun4i.c | 8 +-
+ 6 files changed, 252 insertions(+), 36 deletions(-)
+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 a21ee4cccc6f] 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 (3fda0e737e90 userns: Simplify insert_extent)
+$ git merge userns/for-next
+Auto-merging kernel/user_namespace.c
+Auto-merging include/linux/user_namespace.h
+Merge made by the 'recursive' strategy.
+ include/linux/user_namespace.h | 23 ++-
+ kernel/user.c | 30 ++--
+ kernel/user_namespace.c | 349 ++++++++++++++++++++++++++++++++++-------
+ 3 files changed, 325 insertions(+), 77 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 (9e66317d3c92 Linux 4.14-rc3)
+$ git merge random/dev
+Already up-to-date.
+Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
+$ git merge aio/master
+Already up-to-date.
+Merging kselftest/next (c3e0d179bff5 selftests: firmware: skip unsupported custom firmware fallback tests)
+$ git merge kselftest/next
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/Makefile | 3 +-
+ tools/testing/selftests/android/Makefile | 46 ++++
+ tools/testing/selftests/android/ion/.gitignore | 2 +
+ tools/testing/selftests/android/ion/Makefile | 16 ++
+ tools/testing/selftests/android/ion/README | 101 ++++++++
+ tools/testing/selftests/android/ion/config | 4 +
+ tools/testing/selftests/android/ion/ion.h | 143 ++++++++++++
+ tools/testing/selftests/android/ion/ion_test.sh | 55 +++++
+ .../testing/selftests/android/ion/ionapp_export.c | 135 +++++++++++
+ .../testing/selftests/android/ion/ionapp_import.c | 88 +++++++
+ tools/testing/selftests/android/ion/ionutils.c | 259 +++++++++++++++++++++
+ tools/testing/selftests/android/ion/ionutils.h | 55 +++++
+ tools/testing/selftests/android/ion/ipcsocket.c | 227 ++++++++++++++++++
+ tools/testing/selftests/android/ion/ipcsocket.h | 35 +++
+ tools/testing/selftests/android/run.sh | 3 +
+ .../selftests/breakpoints/breakpoint_test_arm64.c | 1 +
+ tools/testing/selftests/cpu-hotplug/config | 1 -
+ tools/testing/selftests/exec/execveat.c | 27 ++-
+ tools/testing/selftests/firmware/fw_fallback.sh | 38 ++-
+ tools/testing/selftests/firmware/fw_filesystem.sh | 34 +--
+ tools/testing/selftests/ftrace/config | 4 +
+ tools/testing/selftests/ftrace/ftracetest | 7 +
+ .../selftests/ftrace/test.d/00basic/basic4.tc | 2 +-
+ .../selftests/ftrace/test.d/event/event-enable.tc | 2 +-
+ .../selftests/ftrace/test.d/event/event-pid.tc | 2 +-
+ .../ftrace/test.d/event/subsystem-enable.tc | 2 +-
+ .../ftrace/test.d/event/toplevel-enable.tc | 2 +-
+ .../ftrace/test.d/ftrace/fgraph-filter-stack.tc | 2 +-
+ .../ftrace/test.d/ftrace/fgraph-filter.tc | 2 +-
+ .../ftrace/test.d/ftrace/func-filter-pid.tc | 2 +-
+ .../ftrace/test.d/ftrace/func_event_triggers.tc | 5 +-
+ .../ftrace/test.d/ftrace/func_profiler.tc | 2 +-
+ .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 4 +-
+ .../test.d/ftrace/func_traceonoff_triggers.tc | 2 +-
+ .../ftrace/test.d/instances/instance-event.tc | 2 +-
+ .../selftests/ftrace/test.d/instances/instance.tc | 2 +-
+ .../selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +-
+ .../selftests/ftrace/test.d/kprobe/kprobe_args.tc | 2 +-
+ .../ftrace/test.d/kprobe/kprobe_args_type.tc | 2 +-
+ .../ftrace/test.d/kprobe/kretprobe_args.tc | 2 +-
+ tools/testing/selftests/ftrace/test.d/template | 1 +
+ .../ftrace/test.d/trigger/trigger-eventonoff.tc | 2 +-
+ .../ftrace/test.d/trigger/trigger-filter.tc | 2 +-
+ .../ftrace/test.d/trigger/trigger-hist-mod.tc | 2 +-
+ .../ftrace/test.d/trigger/trigger-hist.tc | 2 +-
+ .../ftrace/test.d/trigger/trigger-multihist.tc | 2 +-
+ .../ftrace/test.d/trigger/trigger-snapshot.tc | 2 +-
+ .../ftrace/test.d/trigger/trigger-stacktrace.tc | 2 +-
+ .../ftrace/test.d/trigger/trigger-traceonoff.tc | 2 +-
+ tools/testing/selftests/memfd/memfd_test.c | 4 +-
+ tools/testing/selftests/memory-hotplug/Makefile | 4 +-
+ tools/testing/selftests/seccomp/.gitignore | 1 +
+ tools/testing/selftests/timers/.gitignore | 2 +
+ tools/testing/selftests/vDSO/vdso_test.c | 19 +-
+ tools/testing/selftests/vm/.gitignore | 2 +
+ 55 files changed, 1303 insertions(+), 71 deletions(-)
+ create mode 100644 tools/testing/selftests/android/Makefile
+ create mode 100644 tools/testing/selftests/android/ion/.gitignore
+ create mode 100644 tools/testing/selftests/android/ion/Makefile
+ create mode 100644 tools/testing/selftests/android/ion/README
+ create mode 100644 tools/testing/selftests/android/ion/config
+ create mode 100644 tools/testing/selftests/android/ion/ion.h
+ create mode 100755 tools/testing/selftests/android/ion/ion_test.sh
+ create mode 100644 tools/testing/selftests/android/ion/ionapp_export.c
+ create mode 100644 tools/testing/selftests/android/ion/ionapp_import.c
+ create mode 100644 tools/testing/selftests/android/ion/ionutils.c
+ create mode 100644 tools/testing/selftests/android/ion/ionutils.h
+ create mode 100644 tools/testing/selftests/android/ion/ipcsocket.c
+ create mode 100644 tools/testing/selftests/android/ion/ipcsocket.h
+ create mode 100755 tools/testing/selftests/android/run.sh
+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 (3602b15a20a6 Merge branch 'for-4.15/callbacks' into for-next)
+$ git merge livepatching/for-next
+Merge made by the 'recursive' strategy.
+Merging coresight/next (1b551764f971 doc: coresight: correct usage for disabling idle states)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+Merging rtc/rtc-next (b64bfde0ef60 rtc: sprd: Add Spreadtrum RTC driver)
+$ git merge rtc/rtc-next
+Auto-merging drivers/rtc/Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/trivial-devices.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/rtc/pcf85363.txt | 17 +
+ .../devicetree/bindings/rtc/rtc-mt7622.txt | 21 +
+ .../devicetree/bindings/rtc/sprd,sc27xx-rtc.txt | 27 +
+ .../devicetree/bindings/trivial-devices.txt | 2 +-
+ MAINTAINERS | 3 +
+ drivers/rtc/Kconfig | 42 +-
+ drivers/rtc/Makefile | 3 +
+ drivers/rtc/interface.c | 6 +-
+ drivers/rtc/rtc-abx80x.c | 12 +-
+ drivers/rtc/rtc-armada38x.c | 101 ++++
+ drivers/rtc/rtc-at91rm9200.c | 19 +-
+ drivers/rtc/rtc-ds1305.c | 70 +--
+ drivers/rtc/rtc-ds1307.c | 57 +-
+ drivers/rtc/rtc-ds1390.c | 7 +
+ drivers/rtc/rtc-ds1511.c | 75 +--
+ drivers/rtc/rtc-jz4740.c | 6 +-
+ drivers/rtc/rtc-m41t80.c | 84 ++-
+ drivers/rtc/rtc-m48t86.c | 58 +-
+ drivers/rtc/rtc-mt7622.c | 422 +++++++++++++
+ drivers/rtc/rtc-omap.c | 57 +-
+ drivers/rtc/rtc-pcf8523.c | 40 ++
+ drivers/rtc/rtc-pcf85363.c | 220 +++++++
+ drivers/rtc/rtc-pcf8563.c | 4 +-
+ drivers/rtc/rtc-pl031.c | 48 +-
+ drivers/rtc/rtc-rv3029c2.c | 18 +-
+ drivers/rtc/rtc-rx8010.c | 7 +-
+ drivers/rtc/rtc-sc27xx.c | 662 +++++++++++++++++++++
+ drivers/rtc/rtc-sysfs.c | 25 +-
+ drivers/rtc/rtc-xgene.c | 47 +-
+ 29 files changed, 1884 insertions(+), 276 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/pcf85363.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mt7622.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/sprd,sc27xx-rtc.txt
+ create mode 100644 drivers/rtc/rtc-mt7622.c
+ create mode 100644 drivers/rtc/rtc-pcf85363.c
+ create mode 100644 drivers/rtc/rtc-sc27xx.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 (4247f24c2358 Merge branch 'for-4.15/dax' into libnvdimm-for-next)
+$ git merge nvdimm/libnvdimm-for-next
+Resolved 'arch/parisc/include/uapi/asm/mman.h' using previous resolution.
+Resolved 'fs/dax.c' using previous resolution.
+Resolved 'fs/ext4/inode.c' using previous resolution.
+Resolved 'include/linux/iomap.h' using previous resolution.
+Auto-merging tools/testing/nvdimm/Kbuild
+Auto-merging tools/include/uapi/asm-generic/mman-common.h
+Auto-merging include/uapi/asm-generic/mman.h
+Auto-merging include/uapi/asm-generic/mman-common.h
+Auto-merging include/trace/events/fs_dax.h
+Auto-merging include/linux/mman.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/iomap.h
+CONFLICT (content): Merge conflict in include/linux/iomap.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/dax.h
+Auto-merging fs/xfs/xfs_trace.h
+Auto-merging fs/xfs/xfs_iomap.c
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/proc/task_mmu.c
+Auto-merging fs/jbd2/journal.c
+Auto-merging fs/ext4/inode.c
+CONFLICT (content): Merge conflict in fs/ext4/inode.c
+Auto-merging fs/ext4/file.c
+Auto-merging fs/ext2/file.c
+Auto-merging fs/dax.c
+CONFLICT (content): Merge conflict in fs/dax.c
+Auto-merging drivers/nvdimm/Makefile
+Auto-merging drivers/block/brd.c
+Auto-merging drivers/block/Kconfig
+Auto-merging arch/xtensa/include/uapi/asm/mman.h
+Auto-merging arch/parisc/include/uapi/asm/mman.h
+CONFLICT (content): Merge conflict in arch/parisc/include/uapi/asm/mman.h
+Auto-merging arch/mips/include/uapi/asm/mman.h
+Auto-merging arch/alpha/include/uapi/asm/mman.h
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d4cd5215faf9] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 8 +-
+ arch/alpha/include/uapi/asm/mman.h | 1 +
+ arch/mips/include/uapi/asm/mman.h | 1 +
+ arch/parisc/include/uapi/asm/mman.h | 1 +
+ arch/xtensa/include/uapi/asm/mman.h | 1 +
+ drivers/acpi/nfit/core.c | 274 ++++++++++++++++++++++-
+ drivers/acpi/nfit/mce.c | 2 +-
+ drivers/acpi/nfit/nfit.h | 37 +++-
+ drivers/block/Kconfig | 12 -
+ drivers/block/brd.c | 65 ------
+ drivers/dax/device.c | 3 +-
+ drivers/dax/super.c | 14 +-
+ drivers/nvdimm/Makefile | 1 +
+ drivers/nvdimm/badrange.c | 293 ++++++++++++++++++++++++
+ drivers/nvdimm/bus.c | 24 +-
+ drivers/nvdimm/core.c | 260 +---------------------
+ drivers/nvdimm/dimm.c | 3 +
+ drivers/nvdimm/dimm_devs.c | 19 ++
+ drivers/nvdimm/label.c | 2 +-
+ drivers/nvdimm/namespace_devs.c | 6 +-
+ drivers/nvdimm/nd-core.h | 3 +-
+ drivers/nvdimm/nd.h | 7 +-
+ drivers/nvdimm/pfn_devs.c | 8 +
+ drivers/nvdimm/region_devs.c | 8 +-
+ fs/dax.c | 319 ++++++++++++++++++---------
+ fs/ext2/file.c | 2 +-
+ fs/ext4/file.c | 26 ++-
+ fs/ext4/inode.c | 15 ++
+ fs/jbd2/journal.c | 17 ++
+ fs/proc/task_mmu.c | 1 +
+ fs/xfs/xfs_file.c | 44 ++--
+ fs/xfs/xfs_iomap.c | 5 +
+ fs/xfs/xfs_trace.h | 2 -
+ include/linux/dax.h | 4 +-
+ include/linux/fs.h | 1 +
+ include/linux/iomap.h | 5 +
+ include/linux/jbd2.h | 1 +
+ include/linux/libnvdimm.h | 21 +-
+ include/linux/mm.h | 9 +-
+ include/linux/mman.h | 48 +++-
+ include/trace/events/fs_dax.h | 3 +-
+ include/uapi/asm-generic/mman-common.h | 1 +
+ include/uapi/asm-generic/mman.h | 1 +
+ mm/mmap.c | 15 ++
+ tools/include/uapi/asm-generic/mman-common.h | 1 +
+ tools/testing/nvdimm/Kbuild | 1 +
+ tools/testing/nvdimm/test/nfit.c | 319 ++++++++++++++++++++++++---
+ tools/testing/nvdimm/test/nfit_test.h | 52 +++++
+ 48 files changed, 1406 insertions(+), 560 deletions(-)
+ create mode 100644 drivers/nvdimm/badrange.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 kspp/for-next/kspp (3889a28c449c lkdtm: Update usercopy tests for whitelisting)
+$ git merge kspp/for-next/kspp
+Resolved 'virt/kvm/kvm_main.c' using previous resolution.
+Auto-merging virt/kvm/kvm_main.c
+CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
+Auto-merging net/sctp/socket.c
+Auto-merging net/ipv6/raw.c
+Auto-merging net/core/sock.c
+Auto-merging mm/slub.c
+Auto-merging mm/slab_common.c
+Auto-merging mm/slab.h
+Auto-merging mm/slab.c
+Auto-merging kernel/fork.c
+Auto-merging include/net/sock.h
+Auto-merging include/net/sctp/structs.h
+Auto-merging include/linux/stddef.h
+Auto-merging include/linux/slub_def.h
+Auto-merging include/linux/slab_def.h
+Auto-merging include/linux/slab.h
+Auto-merging include/linux/sched/task.h
+Auto-merging fs/ufs/super.c
+Auto-merging fs/orangefs/super.c
+Auto-merging fs/jfs/super.c
+Auto-merging fs/freevxfs/vxfs_super.c
+Auto-merging fs/fhandle.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext2/super.c
+Auto-merging fs/dcache.c
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/befs/linuxvfs.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/misc/lkdtm_usercopy.c
+Auto-merging drivers/misc/lkdtm_core.c
+Auto-merging drivers/misc/lkdtm.h
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/include/asm/processor.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/arm64/include/asm/processor.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/include/asm/processor.h
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8b78d31505f3] Merge remote-tracking branch 'kspp/for-next/kspp'
+$ git diff -M --stat --summary HEAD^..
+ arch/Kconfig | 11 +++++
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/processor.h | 7 +++
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/processor.h | 8 ++++
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/processor.h | 8 ++++
+ arch/x86/kvm/x86.c | 7 +--
+ drivers/misc/lkdtm.h | 4 +-
+ drivers/misc/lkdtm_core.c | 4 +-
+ drivers/misc/lkdtm_usercopy.c | 88 +++++++++++++++++++++-----------------
+ drivers/scsi/scsi_lib.c | 9 ++--
+ fs/befs/linuxvfs.c | 14 +++---
+ fs/cifs/cifsfs.c | 10 +++--
+ fs/dcache.c | 9 ++--
+ fs/exofs/super.c | 7 ++-
+ fs/ext2/super.c | 12 +++---
+ fs/ext4/super.c | 12 +++---
+ fs/fhandle.c | 3 +-
+ fs/freevxfs/vxfs_super.c | 8 +++-
+ fs/jfs/super.c | 8 ++--
+ fs/orangefs/super.c | 15 ++++---
+ fs/ufs/super.c | 13 +++---
+ include/linux/sched/task.h | 14 ++++++
+ include/linux/slab.h | 27 +++++++++---
+ include/linux/slab_def.h | 3 ++
+ include/linux/slub_def.h | 3 ++
+ include/linux/stddef.h | 2 +
+ include/net/sctp/structs.h | 9 +++-
+ include/net/sock.h | 2 +
+ kernel/fork.c | 31 +++++++++++---
+ mm/slab.c | 35 ++++++++++++---
+ mm/slab.h | 8 +++-
+ mm/slab_common.c | 54 ++++++++++++++++++-----
+ mm/slub.c | 46 ++++++++++++++++----
+ mm/usercopy.c | 12 ++++++
+ net/caif/caif_socket.c | 2 +
+ net/core/sock.c | 4 +-
+ net/ipv4/raw.c | 2 +
+ net/ipv6/raw.c | 2 +
+ net/sctp/socket.c | 10 ++++-
+ security/Kconfig | 12 ++++++
+ virt/kvm/kvm_main.c | 8 +++-
+ 43 files changed, 408 insertions(+), 138 deletions(-)
+Merging akpm-current/current (e5410482eb3e sysvipc-make-get_maxid-o1-again-checkpatch-fixes)
+$ git merge --no-ff akpm-current/current
+Resolved 'Makefile' using previous resolution.
+Resolved 'arch/x86/mm/kasan_init_64.c' using previous resolution.
+Recorded preimage for 'drivers/block/brd.c'
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' using previous resolution.
+Resolved 'drivers/net/ethernet/netronome/nfp/nfp_net_common.c' using previous resolution.
+Resolved 'fs/ext4/file.c' using previous resolution.
+Resolved 'include/linux/slab.h' using previous resolution.
+Resolved 'include/net/inet_sock.h' using previous resolution.
+Resolved 'include/net/sock.h' using previous resolution.
+Resolved 'include/uapi/linux/prctl.h' using previous resolution.
+Resolved 'kernel/fork.c' using previous resolution.
+Resolved 'kernel/softirq.c' using previous resolution.
+Resolved 'mm/slab.h' using previous resolution.
+Resolved 'mm/slab_common.c' using previous resolution.
+Auto-merging tools/perf/builtin-kmem.c
+Auto-merging security/selinux/hooks.c
+Auto-merging security/apparmor/lsm.c
+Auto-merging scripts/kernel-doc
+Auto-merging net/ipv4/tcp_input.c
+Auto-merging net/ipv4/inet_timewait_sock.c
+Auto-merging net/core/sock.c
+Auto-merging net/core/skbuff.c
+Auto-merging mm/vmscan.c
+Auto-merging mm/sparse.c
+Auto-merging mm/slub.c
+Auto-merging mm/slab_common.c
+CONFLICT (content): Merge conflict in mm/slab_common.c
+Auto-merging mm/slab.h
+CONFLICT (content): Merge conflict in mm/slab.h
+Auto-merging mm/slab.c
+Auto-merging mm/shmem.c
+Auto-merging mm/page_io.c
+Auto-merging mm/page-writeback.c
+Auto-merging mm/memory.c
+Auto-merging mm/huge_memory.c
+Auto-merging lib/Makefile
+Removing lib/Kconfig.kmemcheck
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/trace/ring_buffer.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/sys.c
+Auto-merging kernel/softirq.c
+CONFLICT (content): Merge conflict in kernel/softirq.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/power/snapshot.c
+Auto-merging kernel/locking/lockdep.c
+Auto-merging kernel/fork.c
+CONFLICT (content): Merge conflict in kernel/fork.c
+Auto-merging kernel/exit.c
+Auto-merging kernel/bpf/core.c
+Auto-merging ipc/shm.c
+Auto-merging ipc/sem.c
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/prctl.h
+CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
+Auto-merging include/net/sock.h
+CONFLICT (content): Merge conflict in include/net/sock.h
+Auto-merging include/net/inet_sock.h
+CONFLICT (content): Merge conflict in include/net/inet_sock.h
+Auto-merging include/linux/slub_def.h
+Auto-merging include/linux/slab_def.h
+Auto-merging include/linux/slab.h
+CONFLICT (content): Merge conflict in include/linux/slab.h
+Auto-merging include/linux/skbuff.h
+Auto-merging include/linux/mmzone.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/filter.h
+Auto-merging include/linux/dma-mapping.h
+Auto-merging include/linux/compiler-clang.h
+Auto-merging include/linux/backing-dev.h
+Auto-merging include/asm-generic/vmlinux.lds.h
+Auto-merging fs/xfs/kmem.h
+Auto-merging fs/userfaultfd.c
+Auto-merging fs/proc/task_mmu.c
+Auto-merging fs/proc/internal.h
+Auto-merging fs/proc/array.c
+Auto-merging fs/ocfs2/super.c
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/ocfs2/dlmfs/dlmfs.c
+Auto-merging fs/ocfs2/cluster/nodemanager.c
+Auto-merging fs/nilfs2/the_nilfs.c
+Auto-merging fs/nilfs2/super.c
+Auto-merging fs/nilfs2/segment.c
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/dev.c
+Auto-merging fs/file_table.c
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/f2fs/checkpoint.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/file.c
+CONFLICT (content): Merge conflict in fs/ext4/file.c
+Auto-merging fs/exec.c
+Auto-merging fs/eventpoll.c
+Auto-merging fs/ecryptfs/main.c
+Auto-merging fs/dcache.c
+Auto-merging fs/dax.c
+Auto-merging fs/buffer.c
+Auto-merging fs/btrfs/extent_io.c
+Auto-merging drivers/staging/lustre/lustre/mdc/mdc_request.c
+Auto-merging drivers/rapidio/devices/rio_mport_cdev.c
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/net/ethernet/ti/netcp_core.c
+Auto-merging drivers/net/ethernet/sfc/rx.c
+Auto-merging drivers/net/ethernet/sfc/falcon/rx.c
+Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c
+Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/en_rx.c
+Auto-merging drivers/net/ethernet/cavium/liquidio/octeon_network.h
+Auto-merging drivers/net/ethernet/amazon/ena/ena_netdev.c
+Auto-merging drivers/infiniband/sw/rdmavt/qp.c
+Auto-merging drivers/infiniband/hw/qib/qib_init.c
+Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+Auto-merging drivers/char/random.c
+Auto-merging drivers/block/brd.c
+CONFLICT (content): Merge conflict in drivers/block/brd.c
+Auto-merging block/genhd.c
+Auto-merging block/blk-mq.c
+Auto-merging arch/x86/platform/efi/efi_64.c
+Auto-merging arch/x86/mm/pageattr.c
+Removing arch/x86/mm/kmemcheck/shadow.c
+Removing arch/x86/mm/kmemcheck/kmemcheck.c
+Removing arch/x86/mm/kmemcheck/Makefile
+Auto-merging arch/x86/mm/kasan_init_64.c
+CONFLICT (content): Merge conflict in arch/x86/mm/kasan_init_64.c
+Auto-merging arch/x86/mm/init_64.c
+Auto-merging arch/x86/mm/init.c
+Auto-merging arch/x86/mm/fault.c
+Auto-merging arch/x86/kernel/traps.c
+Auto-merging arch/x86/kernel/espfix_64.c
+Auto-merging arch/x86/include/asm/pgtable_types.h
+Auto-merging arch/x86/include/asm/dma-mapping.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/include/asm/mmu_context.h
+Auto-merging arch/powerpc/mm/pgtable_64.c
+Auto-merging arch/powerpc/mm/mmu_context_book3s64.c
+Auto-merging arch/ia64/kernel/asm-offsets.c
+Auto-merging arch/arm64/Kconfig
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging MAINTAINERS
+Removing Documentation/dev-tools/kmemcheck.rst
+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 'drivers/block/brd.c'.
+[master a9b007581255693d92dd254451bbe4273f03311c] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/dynamic-debug-howto.rst | 6 +-
+ Documentation/admin-guide/kernel-parameters.txt | 7 -
+ Documentation/clearing-warn-once.txt | 7 +
+ Documentation/dev-tools/index.rst | 1 -
+ Documentation/dev-tools/kcov.rst | 99 ++-
+ Documentation/dev-tools/kmemcheck.rst | 733 ---------------------
+ Documentation/filesystems/proc.txt | 4 +-
+ Documentation/sysctl/vm.txt | 52 +-
+ Documentation/vm/mmu_notifier.txt | 93 +++
+ MAINTAINERS | 10 -
+ Makefile | 2 +-
+ arch/arm/include/asm/dma-iommu.h | 1 -
+ arch/arm/include/asm/page.h | 2 +
+ arch/arm/include/asm/pgalloc.h | 2 +-
+ arch/arm/mm/pgd.c | 2 +-
+ arch/arm64/Kconfig | 2 +-
+ arch/arm64/include/asm/pgalloc.h | 2 +-
+ arch/arm64/mm/kasan_init.c | 130 ++--
+ arch/frv/mm/init.c | 14 -
+ arch/h8300/mm/init.c | 13 -
+ arch/ia64/kernel/asm-offsets.c | 4 +-
+ arch/m32r/Kconfig | 4 +-
+ arch/mips/include/asm/pgtable-64.h | 8 +-
+ arch/mn10300/kernel/head.S | 8 -
+ arch/mn10300/mm/fault.c | 2 +-
+ arch/openrisc/include/asm/dma-mapping.h | 1 -
+ arch/powerpc/include/asm/pgalloc.h | 2 +-
+ arch/powerpc/mm/hugetlbpage.c | 1 +
+ arch/powerpc/mm/mmu_context_book3s64.c | 2 +-
+ arch/powerpc/mm/pgtable_64.c | 2 +-
+ arch/powerpc/platforms/cell/spufs/sched.c | 2 +-
+ arch/s390/include/asm/mmu_context.h | 4 +-
+ arch/sh/boot/compressed/misc.c | 14 +
+ arch/sh/kernel/dwarf.c | 4 +-
+ arch/sh/kernel/head_64.S | 8 -
+ arch/sh/kernel/process.c | 2 +-
+ arch/sparc/include/asm/pgtable_64.h | 30 +
+ arch/sparc/mm/hugetlbpage.c | 3 +-
+ arch/sparc/mm/init_64.c | 38 +-
+ arch/tile/mm/homecache.c | 2 +-
+ arch/um/kernel/mem.c | 3 -
+ arch/unicore32/include/asm/pgalloc.h | 2 +-
+ arch/unicore32/mm/pgd.c | 2 +-
+ arch/x86/Kconfig | 5 +-
+ arch/x86/Makefile | 5 -
+ arch/x86/include/asm/dma-mapping.h | 1 -
+ arch/x86/include/asm/kmemcheck.h | 42 --
+ arch/x86/include/asm/pgtable.h | 5 -
+ arch/x86/include/asm/pgtable_types.h | 13 -
+ arch/x86/include/asm/string_32.h | 9 -
+ arch/x86/include/asm/string_64.h | 8 -
+ arch/x86/include/asm/xor.h | 5 +-
+ arch/x86/kernel/cpu/intel.c | 15 -
+ arch/x86/kernel/espfix_64.c | 2 +-
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ arch/x86/kernel/traps.c | 5 -
+ arch/x86/mm/Makefile | 2 -
+ arch/x86/mm/fault.c | 6 -
+ arch/x86/mm/init.c | 8 +-
+ arch/x86/mm/init_64.c | 13 +-
+ arch/x86/mm/kasan_init_64.c | 143 +++-
+ arch/x86/mm/kmemcheck/Makefile | 1 -
+ arch/x86/mm/kmemcheck/error.c | 227 -------
+ arch/x86/mm/kmemcheck/error.h | 15 -
+ arch/x86/mm/kmemcheck/kmemcheck.c | 658 ------------------
+ arch/x86/mm/kmemcheck/opcode.c | 106 ---
+ arch/x86/mm/kmemcheck/opcode.h | 9 -
+ arch/x86/mm/kmemcheck/pte.c | 22 -
+ arch/x86/mm/kmemcheck/pte.h | 10 -
+ arch/x86/mm/kmemcheck/selftest.c | 70 --
+ arch/x86/mm/kmemcheck/selftest.h | 6 -
+ arch/x86/mm/kmemcheck/shadow.c | 173 -----
+ arch/x86/mm/kmemcheck/shadow.h | 18 -
+ arch/x86/mm/pageattr.c | 10 +-
+ arch/x86/mm/pgtable.c | 2 +-
+ arch/x86/platform/efi/efi_64.c | 2 +-
+ block/blk-mq.c | 2 +-
+ block/genhd.c | 2 +-
+ crypto/xor.c | 7 +-
+ drivers/block/brd.c | 2 +
+ drivers/block/zram/zcomp.c | 6 +-
+ drivers/block/zram/zram_drv.c | 18 +-
+ drivers/char/random.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 2 +-
+ drivers/infiniband/hw/qib/qib_init.c | 5 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 2 +-
+ drivers/misc/c2port/core.c | 2 -
+ drivers/misc/lkdtm_bugs.c | 4 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 2 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 3 +-
+ .../net/ethernet/cavium/liquidio/octeon_network.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 3 +-
+ drivers/net/ethernet/sfc/falcon/rx.c | 2 +-
+ drivers/net/ethernet/sfc/rx.c | 2 +-
+ drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 2 +-
+ drivers/net/ethernet/ti/netcp_core.c | 2 +-
+ drivers/net/virtio_net.c | 1 -
+ drivers/nvdimm/btt.c | 3 +
+ drivers/nvdimm/pmem.c | 2 +
+ drivers/rapidio/devices/rio_mport_cdev.c | 5 +-
+ drivers/rapidio/switches/idt_gen2.c | 2 +-
+ drivers/rapidio/switches/idt_gen3.c | 2 +-
+ drivers/rapidio/switches/idtcps.c | 2 +-
+ drivers/rapidio/switches/tsi568.c | 2 +-
+ drivers/rapidio/switches/tsi57x.c | 2 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 2 +-
+ drivers/watchdog/watchdog_core.c | 35 -
+ drivers/watchdog/watchdog_dev.c | 32 +
+ fs/afs/write.c | 15 +-
+ fs/autofs4/waitq.c | 15 +-
+ fs/btrfs/extent_io.c | 23 +-
+ fs/buffer.c | 4 +-
+ fs/cachefiles/rdwr.c | 10 +-
+ fs/ceph/addr.c | 30 +-
+ fs/cifs/file.c | 21 +-
+ fs/dax.c | 13 +-
+ fs/dcache.c | 5 +-
+ fs/ecryptfs/main.c | 2 +-
+ fs/eventpoll.c | 131 ++--
+ fs/exec.c | 1 +
+ fs/ext4/inode.c | 20 +-
+ fs/f2fs/checkpoint.c | 15 +-
+ fs/f2fs/data.c | 11 +-
+ fs/f2fs/file.c | 13 +-
+ fs/f2fs/node.c | 73 +-
+ fs/fat/dir.c | 1 -
+ fs/file_table.c | 2 +-
+ fs/fscache/page.c | 2 +-
+ fs/fuse/dev.c | 2 +-
+ fs/fuse/inode.c | 6 +-
+ fs/gfs2/aops.c | 22 +-
+ fs/hfs/bnode.c | 4 -
+ fs/hfsplus/bnode.c | 4 -
+ fs/hugetlbfs/inode.c | 3 +-
+ fs/nilfs2/btree.c | 6 +-
+ fs/nilfs2/namei.c | 2 +-
+ fs/nilfs2/page.c | 15 +-
+ fs/nilfs2/segment.c | 33 +-
+ fs/nilfs2/segment.h | 1 +
+ fs/nilfs2/sufile.c | 32 +-
+ fs/nilfs2/super.c | 1 -
+ fs/nilfs2/the_nilfs.c | 8 +-
+ fs/nilfs2/the_nilfs.h | 5 +-
+ fs/ocfs2/alloc.c | 2 -
+ fs/ocfs2/aops.c | 26 +-
+ fs/ocfs2/buffer_head_io.h | 3 -
+ fs/ocfs2/cluster/heartbeat.h | 2 -
+ fs/ocfs2/cluster/nodemanager.c | 63 +-
+ fs/ocfs2/cluster/quorum.c | 9 +-
+ fs/ocfs2/dlm/dlmcommon.h | 1 +
+ fs/ocfs2/dlm/dlmdomain.c | 15 +-
+ fs/ocfs2/dlm/dlmmaster.c | 66 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 14 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 1 -
+ fs/ocfs2/dlmglue.c | 2 +-
+ fs/ocfs2/file.c | 9 +-
+ fs/ocfs2/filecheck.c | 357 ++++------
+ fs/ocfs2/filecheck.h | 29 +-
+ fs/ocfs2/ocfs2.h | 8 +
+ fs/ocfs2/stackglue.c | 6 -
+ fs/ocfs2/stackglue.h | 3 -
+ fs/ocfs2/super.c | 39 +-
+ fs/ocfs2/super.h | 3 -
+ fs/pipe.c | 23 +-
+ fs/proc/Makefile | 1 +
+ fs/proc/array.c | 6 +
+ fs/proc/internal.h | 23 +-
+ fs/proc/loadavg.c | 2 +-
+ fs/proc/task_mmu.c | 19 +-
+ fs/proc/util.c | 23 +
+ fs/seq_file.c | 10 -
+ fs/userfaultfd.c | 2 +-
+ fs/xfs/kmem.h | 2 +-
+ include/asm-generic/bug.h | 13 +-
+ include/asm-generic/sections.h | 1 +
+ include/asm-generic/vmlinux.lds.h | 3 +
+ include/linux/backing-dev.h | 10 +-
+ include/linux/bitfield.h | 2 +-
+ include/linux/bootmem.h | 27 +
+ include/linux/bug.h | 5 +
+ include/linux/c2port.h | 4 -
+ include/linux/compiler-clang.h | 3 +
+ include/linux/crash_core.h | 2 +
+ include/linux/dma-mapping.h | 8 +-
+ include/linux/filter.h | 2 -
+ include/linux/genalloc.h | 3 +-
+ include/linux/gfp.h | 18 +-
+ include/linux/hmm.h | 4 +-
+ include/linux/hugetlb.h | 2 +-
+ include/linux/init_task.h | 1 -
+ include/linux/interrupt.h | 15 -
+ include/linux/iopoll.h | 24 +-
+ include/linux/ipc_namespace.h | 3 +
+ include/linux/kasan.h | 4 +-
+ include/linux/kcov.h | 12 +-
+ include/linux/kernel.h | 3 +-
+ include/linux/kmemcheck.h | 171 -----
+ include/linux/kmemleak.h | 8 +-
+ include/linux/list_lru.h | 3 +-
+ include/linux/memblock.h | 24 +-
+ include/linux/mm.h | 85 ++-
+ include/linux/mm_types.h | 19 +-
+ include/linux/mmu_notifier.h | 20 +-
+ include/linux/mmzone.h | 9 +-
+ include/linux/net.h | 3 -
+ include/linux/nodemask.h | 2 +-
+ include/linux/page-flags.h | 2 +-
+ include/linux/page-isolation.h | 2 +-
+ include/linux/pageblock-flags.h | 11 +
+ include/linux/pagemap.h | 26 +-
+ include/linux/pagevec.h | 20 +-
+ include/linux/pid.h | 2 -
+ include/linux/pid_namespace.h | 18 +-
+ include/linux/pipe_fs_i.h | 1 +
+ include/linux/radix-tree.h | 8 +-
+ include/linux/reboot.h | 4 +
+ include/linux/ring_buffer.h | 3 -
+ include/linux/sched/mm.h | 24 +-
+ include/linux/sched/signal.h | 3 +
+ include/linux/skbuff.h | 5 +-
+ include/linux/slab.h | 83 ++-
+ include/linux/slab_def.h | 2 +-
+ include/linux/slub_def.h | 2 +-
+ include/linux/swap.h | 35 +-
+ include/linux/sysctl.h | 3 +
+ include/linux/thread_info.h | 5 +-
+ include/linux/types.h | 1 +
+ include/linux/vmstat.h | 10 +
+ include/net/inet_sock.h | 3 -
+ include/net/inet_timewait_sock.h | 4 -
+ include/net/sock.h | 5 +-
+ include/trace/events/kmem.h | 11 +-
+ include/trace/events/mmflags.h | 2 -
+ include/uapi/linux/kcov.h | 24 +
+ include/uapi/linux/prctl.h | 4 +
+ include/uapi/linux/sysctl.h | 4 +
+ init/Kconfig | 6 -
+ init/do_mounts.c | 3 +-
+ init/initramfs.c | 10 +-
+ init/main.c | 4 +-
+ init/version.c | 2 +-
+ ipc/sem.c | 1 +
+ ipc/shm.c | 1 +
+ ipc/util.c | 97 +--
+ ipc/util.h | 26 +-
+ kernel/bpf/core.c | 6 -
+ kernel/cred.c | 1 +
+ kernel/exit.c | 4 +
+ kernel/fork.c | 471 ++++++-------
+ kernel/kcov.c | 216 +++++-
+ kernel/locking/lockdep.c | 3 -
+ kernel/panic.c | 47 +-
+ kernel/pid.c | 247 ++-----
+ kernel/pid_namespace.c | 59 +-
+ kernel/power/snapshot.c | 4 +-
+ kernel/reboot.c | 27 +
+ kernel/signal.c | 3 +-
+ kernel/softirq.c | 10 -
+ kernel/sys.c | 11 +
+ kernel/sysctl.c | 83 ++-
+ kernel/trace/ring_buffer.c | 3 -
+ lib/Kconfig | 2 +-
+ lib/Kconfig.debug | 25 +-
+ lib/Kconfig.kmemcheck | 94 ---
+ lib/Makefile | 2 +
+ lib/bug.c | 25 +-
+ lib/dma-debug.c | 6 +-
+ lib/dynamic_debug.c | 4 +
+ lib/genalloc.c | 10 +-
+ lib/idr.c | 2 +-
+ lib/int_sqrt.c | 7 +-
+ lib/interval_tree_test.c | 4 +-
+ lib/nmi_backtrace.c | 4 +-
+ lib/radix-tree.c | 30 +-
+ lib/rbtree_test.c | 2 +-
+ lib/string.c | 141 ----
+ lib/test_find_bit.c | 141 ++++
+ lib/test_kasan.c | 5 +-
+ lib/test_kmod.c | 8 +-
+ lib/test_list_sort.c | 9 +-
+ lib/test_string.c | 141 ++++
+ mm/Kconfig.debug | 1 -
+ mm/Makefile | 2 -
+ mm/cma.c | 2 +-
+ mm/compaction.c | 48 +-
+ mm/debug.c | 5 +-
+ mm/filemap.c | 221 +++++--
+ mm/hmm.c | 3 +-
+ mm/huge_memory.c | 78 ++-
+ mm/hugetlb.c | 20 +-
+ mm/internal.h | 1 +
+ mm/kasan/kasan.c | 2 +-
+ mm/khugepaged.c | 2 +-
+ mm/kmemcheck.c | 125 ----
+ mm/kmemleak.c | 11 +-
+ mm/ksm.c | 15 +-
+ mm/list_lru.c | 60 +-
+ mm/memblock.c | 68 +-
+ mm/memcontrol.c | 2 +-
+ mm/memory-failure.c | 2 +-
+ mm/memory.c | 90 ++-
+ mm/memory_hotplug.c | 52 +-
+ mm/mempolicy.c | 16 +-
+ mm/mempool.c | 2 +-
+ mm/migrate.c | 15 +-
+ mm/mlock.c | 9 +-
+ mm/mmu_notifier.c | 11 +-
+ mm/oom_kill.c | 67 +-
+ mm/page-writeback.c | 47 +-
+ mm/page_alloc.c | 461 +++++++------
+ mm/page_ext.c | 4 -
+ mm/page_io.c | 6 +-
+ mm/page_isolation.c | 10 +-
+ mm/page_owner.c | 8 +-
+ mm/percpu-vm.c | 2 +-
+ mm/rmap.c | 65 +-
+ mm/shmem.c | 17 +-
+ mm/slab.c | 45 +-
+ mm/slab.h | 41 +-
+ mm/slab_common.c | 61 +-
+ mm/slob.c | 4 +-
+ mm/slub.c | 63 +-
+ mm/sparse-vmemmap.c | 34 +-
+ mm/sparse.c | 6 +-
+ mm/swap.c | 35 +-
+ mm/swap_slots.c | 11 +-
+ mm/swap_state.c | 11 +-
+ mm/swapfile.c | 21 +-
+ mm/truncate.c | 144 ++--
+ mm/vmscan.c | 25 +-
+ mm/vmstat.c | 77 ++-
+ mm/workingset.c | 10 +-
+ mm/zsmalloc.c | 2 +-
+ net/core/skbuff.c | 9 +-
+ net/core/sock.c | 2 -
+ net/ipv4/inet_timewait_sock.c | 3 -
+ net/ipv4/tcp_input.c | 1 -
+ net/rds/ib_fmr.c | 4 +-
+ net/socket.c | 1 -
+ scripts/Makefile.kcov | 7 +
+ scripts/bloat-o-meter | 89 ++-
+ scripts/checkpatch.pl | 43 +-
+ scripts/decodecode | 8 +
+ scripts/get_maintainer.pl | 211 +++++-
+ scripts/kernel-doc | 2 -
+ scripts/parse-maintainers.pl | 52 +-
+ scripts/spelling.txt | 4 +
+ security/apparmor/lsm.c | 1 +
+ security/selinux/hooks.c | 1 +
+ tools/include/linux/kmemcheck.h | 8 -
+ tools/lib/traceevent/parse-filter.c | 6 +-
+ tools/perf/builtin-kmem.c | 2 -
+ tools/testing/radix-tree/multiorder.c | 2 +-
+ tools/vm/slabinfo.c | 11 +-
+ 363 files changed, 4441 insertions(+), 5472 deletions(-)
+ create mode 100644 Documentation/clearing-warn-once.txt
+ delete mode 100644 Documentation/dev-tools/kmemcheck.rst
+ create mode 100644 Documentation/vm/mmu_notifier.txt
+ delete mode 100644 arch/x86/mm/kmemcheck/Makefile
+ delete mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c
+ delete mode 100644 arch/x86/mm/kmemcheck/shadow.c
+ create mode 100644 fs/proc/util.c
+ delete mode 100644 lib/Kconfig.kmemcheck
+ create mode 100644 lib/test_find_bit.c
+ create mode 100644 lib/test_string.c
+ create mode 100644 scripts/Makefile.kcov
+$ 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: tools/objtool/Makefile: don't assume sync-check.sh is executable
+Applying: mm: add infrastructure for get_user_pages_fast() benchmarking
+Applying: drivers/pcmcia/sa1111_badge4.c: avoid unused function warning
+Applying: arch/ia64/include/asm/topology.h: remove unused parent_node() macro
+Applying: arch/sh/include/asm/topology.h: remove unused parent_node() macro
+Applying: arch/sparc/include/asm/topology_64.h: remove unused parent_node() macro
+Applying: arch/tile/include/asm/topology.h: remove unused parent_node() macro
+Applying: include/asm-generic/topology.h: remove unused parent_node() macro
+Applying: EXPERT Kconfig menu: fix broken EXPERT menu
+Applying: sparc64: NG4 memset 32 bits overflow
+Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + d175d9159eac...7e8a1fd62911 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (7e8a1fd62911 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ arch/ia64/include/asm/topology.h | 7 --
+ arch/sh/include/asm/topology.h | 1 -
+ arch/sparc/include/asm/topology_64.h | 2 -
+ arch/sparc/lib/NG4memset.S | 26 ++--
+ arch/tile/include/asm/topology.h | 6 -
+ drivers/pcmcia/sa1111_badge4.c | 2 +
+ include/asm-generic/topology.h | 3 -
+ include/linux/crc-ccitt.h | 7 ++
+ init/Kconfig | 184 +++++++++++++++--------------
+ lib/crc-ccitt.c | 58 ++++++++-
+ mm/Kconfig | 9 ++
+ mm/Makefile | 1 +
+ mm/gup_benchmark.c | 100 ++++++++++++++++
+ tools/objtool/Makefile | 2 +-
+ tools/testing/selftests/vm/Makefile | 1 +
+ tools/testing/selftests/vm/gup_benchmark.c | 91 ++++++++++++++
+ 16 files changed, 375 insertions(+), 125 deletions(-)
+ create mode 100644 mm/gup_benchmark.c
+ create mode 100644 tools/testing/selftests/vm/gup_benchmark.c
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..7c8d49a
--- /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.14-rc5
+Unchanged quilt series dmi
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000..8ab4a73
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20171116
