summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2020-06-02 20:33:21 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2020-06-02 20:33:21 +1000
commit0e21d4620dd047da7952f44a2e1ac777ded2d57e (patch)
tree7c8b9baa1fd4fc8027c645248728bba798c59e2c
parentd4ce43d444be206765c7c00aacc6921ea9de7d0c (diff)
downloadlinux-0e21d4620dd047da7952f44a2e1ac777ded2d57e.tar.gz
Add linux-next specific files for 20200602
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--Next/SHA1s325
-rw-r--r--Next/Trees327
-rw-r--r--Next/merge.log21746
-rw-r--r--Next/quilt-import.log2
-rw-r--r--localversion-next1
5 files changed, 22401 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..e07ced750f0c
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,325 @@
+Name SHA1
+---- ----
+origin 9bf9511e3d9f328c03f6f79bfb741c3d18f2f2c0
+fixes da03d0610044987a60bf86c4dfe607f0f96979fb
+kbuild-current 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c
+arc-current 9d9368e839c217e0788f2ec9cbe7f5db47d1bbf0
+arm-current 3866f217aaa81bf7165c7f27362eee5d7919c496
+arm-soc-fixes 99706d62fb50486eadb4441eaed311491fd7addf
+uniphier-fixes 0e698dfa282211e414076f9dc7e83c1c288314fd
+arm64-fixes ba051f097fc30b00f6b66044386901141351a557
+m68k-current 3381df0954199458fa3993db72fb427f0ed1e43b
+powerpc-fixes 2f26ed1764b42a8c40d9c48441c73a70d805decf
+s390-fixes 4c1cbcbd6c56c79de2c07159be4f55386bb0bef2
+sparc fcdf818d239ee38c258a2ad56f9e49834d23f402
+fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f
+net bdc48fa11e46f867ea4d75fa59ee87a7f48be144
+bpf bdc48fa11e46f867ea4d75fa59ee87a7f48be144
+ipsec f6a23d85d078c2ffde79c66ca81d0a1dde451649
+netfilter 45ebf73ebcec88a34a778f5feaa0b82b1c76069e
+ipvs 0141317611ab913d6c227b82f3dd02ff3e6fc5d8
+wireless-drivers f92f26f2ed2c9f92c9270c705bca96310c3cdf5a
+mac80211 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162
+rdma-fixes 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162
+sound-current 7fccfecf24fd1248c619e2cd7d55916327bf8dc1
+sound-asoc-fixes 358c7c61fd04d324f83d7968daf8dd9a6ff86a9a
+regmap-fixes 323ca2daef47cd5f0c9c5006edf4ed20d2b2ecec
+regulator-fixes 5fb565b69dabd5a256fc116702331b54a4621dc9
+spi-fixes 0c0c5b8fabe596a7322f0b9b93b88f489b3f4bb3
+pci-current ef46738cc47adb6f70d548c03bd44508f18e14a5
+driver-core.current 9cb1fd0efd195590b828b9b865421ad345a4a145
+tty.current 9cb1fd0efd195590b828b9b865421ad345a4a145
+usb.current b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce
+usb-gadget-fixes 172b14b48ca10b280482b164506892ea09edb946
+usb-serial-fixes 399ad9477c523f721f8e51d4f824bdf7267f120c
+usb-chipidea-fixes b3f3736ac305dd0affe6570d3f3c86ab598fb584
+phy 820eeb9de62f1f479c04fc6575d874611b1e2095
+staging.current 9cb1fd0efd195590b828b9b865421ad345a4a145
+char-misc.current 9cb1fd0efd195590b828b9b865421ad345a4a145
+soundwire-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+thunderbolt-fixes 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162
+input-current 642aa86eaf8f1e6fe894f20fd7f12f0db52ee03c
+crypto-current 58ca0060ec4e51208d2eee12198fc55fd9e4feb3
+ide 63bef48fd6c9d3f1ba4f0e23b4da1e007db6a3c0
+vfio-fixes 5cbf3264bc715e9eb384e2b68601f8c02bb9a61d
+kselftest-fixes 851c4df54dc1bcae41d07e46e3d89e035b0a7140
+modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de
+slave-dma-fixes 3a5fd0dbd87853f8bd2ea275a5b3b41d6686e761
+backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85
+mtd-fixes f3a6a6c5e0f5a303fd8ec84ea33c0da5869d715f
+mfd-fixes 603d9299da32955d49995738541f750f2ae74839
+v4l-dvb-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26
+mips-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+omap-fixes 98ece19f247159a51003796ede7112fef2df5d7f
+kvm-fixes bf61dc10fa2428a6a116c7a219fb04ee87854a89
+kvms390-fixes 5615e74f48dcc982655543e979b6c3f3f877e6f6
+hwmon-fixes b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce
+nvdimm-fixes f84afbdd3a9e5e10633695677b95422572f920dc
+btrfs-fixes 4f28062adf927665e6d770a9888c2db84b88fd92
+vfs-fixes 9e4636545933131de15e1ecd06733538ae939b2f
+dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3
+i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf
+drivers-x86-fixes 2ef96a5bb12be62ef75b5828c0aab838ebb29cb8
+samsung-krzk-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+pinctrl-samsung-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+devicetree-fixes 4bc77b2d211e107fa54b1f39cd0d7dac5537b8cb
+scsi-fixes f2e6b75f6ee82308ef7b00f29e71e5f1c6b3d52a
+drm-fixes ed9244bd0b265c4c0866a9246c6e7cca1cca3acf
+amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes 822d6bd1890dbeaedf661d30d2c5280e127ef4b3
+mmc-fixes 202500d21654874aa03243e91f96de153ec61860
+rtc-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+gnss-fixes 2ef96a5bb12be62ef75b5828c0aab838ebb29cb8
+hyperv-fixes 38dce4195f0daefb566279fd9fd51e1fbd62ae1b
+soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7
+risc-v-fixes 8356c379cfba8b1b90b0a2423f6afbbe2cdc5d91
+pidfd-fixes 3f2c788a13143620c5471ac96ac4f033fc9ac3f3
+fpga-fixes 9edd5112d9639b816407e87ff72322d558ab7719
+spdx 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162
+gpio-intel-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+pinctrl-intel-fixes 69388e15f5078c961b9e5319e22baea4c57deff1
+erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919
+integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf
+drm-misc-fixes abf56fadf0e208abfb13ad1ac0094416058da0ad
+kspp-gustavo 27284084ced264c4f7a6e894b6b77b13185e0400
+kbuild 18fed02fb59c5b8e31fe4849619eb86c342df38b
+compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b
+leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+dma-mapping 94d1aed9f477bdb2625b2537c1ef2643963094f1
+asm-generic 060dc911501f6ee222569304f50962172a52b1d6
+arc def9d2780727cec3313ed3522d0123158d87224d
+arm 03c7f5f0b844e9f652e87daf5c51bb93ccf75296
+arm64 082af5ec5080b028f7d0846a6c27cbb87f288205
+arm-perf 10f6cd2af21bb44faab31a50ec3361d7649e5a39
+arm-soc 71cf8963c33b40b60e66ece52cc384b0218dff16
+amlogic 9233c526bc0eef54e26db2ede3d3fbe4aef6b4a6
+aspeed fa4c8ec6feaa3237f5d44cb8c6d0aa0dff6e1bcc
+at91 ec539e70d882af33660bcab178a59b1251588a22
+imx-mxs 0414897ac89ff1569e7613a46fa144cfe785e18d
+keystone a158c2b7ec23cb32b1aace55938486c8de16d217
+mediatek 64ee939736e7a977edea80e75025551318333e30
+mvebu 869da228bd454b8b451ba0d1a04c3f3f2a8d275d
+omap 712c602893d7cd2060aa5cd146340465d9cd8b3e
+qcom 98cfcf1a9c542d6bec7b29915d838caaf72da737
+raspberrypi f5e216e4268933c565d61bedd70add4953b5f2d1
+realtek 486f29df69413411a205d3101bae0427a892bee4
+renesas 1bd79704bee273dc5cc6b09a5b46f9baae49e996
+reset a6138255cc91e5ce5d132bcad78465e1d278d61b
+rockchip 8a66d46f40353ab7194c4cb2078f575163925e49
+samsung-krzk 0f6a82638f62ae270f3ef109fb181bec3b731233
+scmi 9cb1fd0efd195590b828b9b865421ad345a4a145
+sunxi 243cd8fba48d3d79dd715b8884877b63861dcf93
+tegra cd049d898ab8de59cdb645e89a8038299adeadd9
+ti-k3 cae809434da10402b0fdbd395c6eb924d7aa46f4
+uniphier 0e698dfa282211e414076f9dc7e83c1c288314fd
+clk 166e4b4841974465d73d650468895b725023c81e
+clk-samsung 25bdae0f1c6609ceaf55fe6700654f0be2253d8e
+c6x 8adcc59974b8a65b7eac7d503364837c297139bc
+csky f36e0aab6f1f78d770ce859df3f07a9c5763ce5f
+h8300 beab3d5cb0e14e6397c4e596b3dbf1d36bf49d06
+ia64 172e7890406d6183b9b39271ffb434ff0a97ce72
+m68k 3381df0954199458fa3993db72fb427f0ed1e43b
+m68knommu 9e2b6ed41f8f99c97b13c9d15cbef235dbd97fb6
+microblaze 8f3d9f354286745c751374f5f1fcafee6b3f3136
+mips 9bd0bd264578fe191bf5d2ff23f9887b91862536
+nds32 d785c5a324cd8812720a409dc85050558281a567
+nios2 0ec8a5054d7fc5e31509fed7893358564ede2477
+openrisc 6bd140e14d9aaa734ec37985b8b20a96c0ece948
+parisc-hd 775024cf49ff76c30757bac9a21f6e908b63f6b5
+powerpc 30df74d67d48949da87e3a5b57c381763e8fd526
+fsl a76bea0287ce13d28494b19649d80d8ee5e7b757
+soc-fsl e9e4ef9116b12951eaee3f8447ba9bbb40ab3620
+risc-v 09c0533d129ce460e6214c14f744ddbac3733889
+sifive 467e050e9760fc31dcf854ec88401e18419f5f78
+s390 e1750a3d9abbea2ece29cac8dc5a6f5bc19c1492
+sh a193018e5290ee9d9fe62ad80cd8f874711eb575
+sparc-next 0a2576dae0328f6cb50cef9eee9ba760ddcc4691
+uml 2e27d33d22afa3d12746f854d6a4fad7ad7b86de
+xtensa 3ead2f97bd44a9a106572d306cb04a878c569cb2
+fscrypt e3b1078bedd323df343894a27eb3b3c34944dfd1
+afs 78074a0f5e6bb803636bc104b27c4cf9247f6711
+btrfs 8113246479a51f14966daa18c1fb943811000b6c
+ceph dc1dad8e1a612650b1e786e992cb0c6e101e226a
+cifs 0804cd01f125ad2e18c754768095f98683a222c1
+configfs 8aebfffacfa379ba400da573a5bf9e49634e38cb
+ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238
+erofs 34f853b849eb6a509eb8f40f2f5946ebb1f62739
+exfat cdc9b981b14429d39badb59da8c08dfa71f3c032
+ext3 16ec8bfe257b50d183ba30c6050e28a40372bbe9
+ext4 38bd76b9696c5582dcef4ab1af437e0666021f65
+f2fs ca7f76e680745d3b8a386638045f85dac1c4b2f4
+fsverity 9cd6b593cfc9eaa476c9a3fa768b08bca73213d0
+fuse 9b46418c40fe910e6537618f9932a8be78a3dd6c
+jfs 7aba5dcc234635b44b2781dbc268048cfba388ad
+nfs 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162
+nfs-anna 07e620d607d9ea08f9e94249f3174359e971b449
+nfsd 037e910b52b04fbd41990f643dff97c7e43b0e47
+orangefs 0df556457748d160013e88202c11712c16a83b0c
+overlayfs 144da23beab87b27992e5e1b41bd954de0bf2581
+ubifs 0e7572cffe442290c347e779bf8bd4306bb0aa7c
+v9fs c6f141412d24c8d8a9d98ef45303c0235829044b
+xfs 6dcde60efd946e38fac8d276a6ca47492103e856
+zonefs 568776f992c4cb5e1b5715dc4ab62e6ae906b80d
+iomap b75dfde1212991b24b220c3995101c60a7b8ae74
+djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953
+file-locks dbdaf6a3250b9cda6d7f761e9ff8b8bed8409a38
+vfs 4f929588b2ad8eb171f2c28d1a604e2808379245
+printk e35456906bd4a82e26319c722b0058b6679ec50b
+pci 1f420e4dcf0085ca7a1c8f67e9c42d3f8f5f4f8d
+pstore 78c08247b9d3e03192f8b359aa079024e805a948
+hid 5d7d489e9129000525ae2090e6c9254e56c6a9d6
+i2c bc2cc7f2c1de764702c6bd37cc82641fcec3ee8c
+i3c b4203ce0556348dcfe29f897d1dbe65102874d89
+dmi 8cf87c7446968660a8e997b4427be5340c2825ef
+hwmon-staging 87976ce2825d9f1ca2e70ee7d38dec490ad5a6e2
+jc_docs e35b5a4c494a75a683ddf4901a43e0a128d5bfe3
+v4l-dvb 938b29db3aa9c293c7c1366b16e55e308f1a1ddd
+v4l-dvb-next 83fac9617e226725b6e2db4a086465cdba2db1a5
+fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f
+pm f3448fe9c0bf1ba47ac889bafbd1a06661443ff6
+cpufreq-arm 6cc3d0e9a097981c8a0317c65b8a2278593bd2b0
+cpupower 7b0bf99b9ee497cc0f079472566aff716d033d43
+opp 45679f9b508f10c12a1e93cf2bdccbc1c594aa39
+thermal 64488908b523f91f6396762e2997454b84013be7
+thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67
+ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610
+dlm fe204591cc9480347af7d2d6029b24a62e449486
+swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c
+rdma 70ae395550333607bda245db5270211b6ef8ab00
+net-next 9a25c1df24a6fea9dc79eec950453c4e00f707fd
+bpf-next 9a25c1df24a6fea9dc79eec950453c4e00f707fd
+ipsec-next 7d4343d501f9b5ddbc92f278adba339d16d010e1
+mlx5-next 6b646a7e4af69814dd1a3340fca0f02d4977420d
+netfilter-next eae9d3c0167df840e821317040efcf0ca6789cb9
+ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0
+wireless-drivers-next 1806c13dc2532090d742ce03847b22367fb20ad6
+bluetooth e5aeebddfc312ea7bb55dfe6c7264e71a3b43992
+mac80211-next 1806c13dc2532090d742ce03847b22367fb20ad6
+gfs2 45f2fac0d0294eba662223ccb608e567c99ab0ac
+mtd 3f5540032f5dfd0af1205370e4548d6bb90db900
+nand 86f2b225adf4ecd2edfdc8541a7342645556ac3b
+spi-nor e8aec15dd5842b5b11b0e621a2293348d3574a61
+crypto 58ca0060ec4e51208d2eee12198fc55fd9e4feb3
+drm 9ca1f474cea0edc14a1d7ec933e5472c0ff115d3
+amdgpu dd7260b0a216f584c516f18fa81e34a73cf9960d
+drm-intel 0e386959272e4adf192867681a65cc0aa580c247
+drm-tegra f923db184ca36ebb1249d8d1145591b61ec5f661
+drm-misc 6f27e4c287d7bdcad1f24efcaace044617aac2f3
+drm-msm 721a35ad71d969e448472972605bf443d3181320
+mali-dp f634c6a8028789b05a9277a3d51303829ae29547
+imx-drm 2c76b324c7944fedf453abca5003569d9556c6df
+etnaviv f232d9ec029ce3e2543b05213e2979e01e503408
+regmap 323ca2daef47cd5f0c9c5006edf4ed20d2b2ecec
+sound 7318234c8d7c0f209f993ee46a7ea148efdb28b9
+sound-asoc 358c7c61fd04d324f83d7968daf8dd9a6ff86a9a
+modules 5c3a7db0c7ec4bbd5bd3f48af9be859a8fa3e532
+input d0ac7079d5fcaaaf3eb99c197a08ac1b399754f4
+block 09b9828e0a3e2351ba04a94a25daf9bca76819d6
+device-mapper 99ca08aebf11fcd7ce1794591bcd6a6f9f602bed
+pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6
+mmc ae5c0585dfc2168c589de5878df2e591dfbd4bf0
+md e820d55cb99dd93ac2dc949cf486bb187e5cd70d
+mfd 7edd363421dab1d4806802ac65613d1c0ec85824
+backlight 479da1f538a2f3547e15f9d5922c611b69ec2fbc
+battery 805f64e8b5cf5838b1a0b4b9abce9084db2cf8f4
+regulator 5fb565b69dabd5a256fc116702331b54a4621dc9
+security 60cf7c5ed5f7087c4de87a7676b8c82d96fd166c
+apparmor e37986097ba63c94b1af9d5ad5486d120a809f72
+integrity 8eb613c0b8f19627ba1846dcf78bb2c85edbe8dd
+keys 4fd499e0119932fa0e59cef2d0bce4ed434789ab
+selinux fe5a90b8c14914397a3bb0c214d142103c1ba3bf
+smack ef26650a201fbbb4ba90b63a82bf7950f2699a82
+tomoyo 27acbf41be3928999b3a291fceee2a4b50218f00
+tpmdd ab91c2a89f86be2898cee208d492816ec238b2cf
+watchdog 072cb8b628d312f5785ffdf324286a0519aed910
+iommu 290b3a52b334899e88a73637d32d9a3477057c31
+vfio ea20868c7197827f2585a65800b9de7d2b2c4bee
+audit 9d44a121c5a79bc8a9d67c058456bd52a83c79e7
+devicetree 2a975ac9c30c938ee6d4131988045dabca9c7367
+mailbox d61b7997ca467a8249d104f529194a3c6337e767
+spi fb02b9eb4e335f8965badd1e6ee24fdc284cb395
+tip 88e97a302abe9446e9a0bd6f25fe9046fbe16292
+clockevents 809eb4e9bf9d84eb5b703358afd0d564d514f6d2
+edac daeb3bc9a92fdf8d240c728f7c6a7d9f0a5533a3
+irqchip 5a7f796d4f2028bde4c2ac778dfe0456851871b2
+ftrace c200784a08d4ea82f82a30678955b7f2c7550af4
+rcu 8747b07d19443724745de86964e8818404112220
+kvm 13ffbd8db1dd43d63d086517872a4e702a6bf309
+kvm-arm 7ae2f3db6167aa7184529fdacd1de72619baf93b
+kvm-ppc 11362b1befeadaae4d159a8cddcdaf6b8afe08f9
+kvms390 0b545fd17f84184f9536bde68c3521e36c488448
+xen-tip 4969a3a2cd3c2dbb1bcdc6a3a516de9ff972372e
+percpu dedac37ea96b23c23b72d6e90f01d060d5287e4e
+workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda
+drivers-x86 47a94c551a7401a196cba881470dc9cb92573e82
+chrome-platform bbb7ad49b8350b79261ce087c8e101d92f15533d
+hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+leds 59ea3c9faf3235b66bc31ca883d59ce58b8b2b27
+ipmi 2a556ce779e39b15cbb74e896ca640e86baeb1a1
+driver-core 8c3e315d4296421cd26b3300ee0ac117f0877f20
+usb 347052e3bf1b62a25c11f7a673acfbaf554d67a1
+usb-gadget 1c11e74e9079289d8aaccc34b74cbf6463c0b791
+usb-serial c432df155919582a3cefa35a8f86256c830fa9a4
+usb-chipidea-next 6dbbbccdba6118b30837c42f3d356ecf0aaf4a1f
+phy-next ac0a95a3ea7811f5cc4489924ddb54f0ea0f3007
+tty a1b44ea340b21c99b34c93acad233da727cb88ba
+char-misc 05c8a4fc44a916dd897769ca69b42381f9177ec4
+extcon b2e5575a8d04028d17f6c914eea31036589bc79a
+soundwire fcbcf1f7b56855ffe1cec768cb1013c5a4c854c3
+thunderbolt 4caf2511ec498277333d229f8a7ad1fa9331df65
+staging 77f55d1305c11fb729b88f2c3f7881ba0831fa6f
+mux 05f19f7f8944b6a269b2ac152bceaa322138be6b
+icc b35da2e86f256a3a4be7c3b31507016100b00847
+slave-dma be4cf718cd9929e867ed1ff06d23fb4d08cc2d36
+cgroup 936f2a70f2077f64fab1dcb3eca71879e82ecd3f
+scsi a7a4293b22dfb72161276393c58a03e45ad4232f
+scsi-mkp 22617e21633142dd2b81541cb3b95d6fb59aa85f
+vhost bf338dcc28f3f896e2fc2e2690853b5da83a0789
+rpmsg 71f56fef13d43b4f7957f51a6aee3135c5012bb8
+gpio 5e9fc19f525b67967cc10d3ca8e85214fc3c26bd
+gpio-brgl e33a58a29c6ad6f844cdc184210aa1feb5e2fbe0
+gpio-intel 7e73aa90a38c8815acea7af71e285658bf5ab879
+pinctrl c22ea274178f3405c9b3b6b9ac05ae513ca622a8
+pinctrl-intel 6d649fca349155698ba4b8858b258a62003c5c54
+pinctrl-samsung f354157a7d184db430c1a564c506434e33b1bec5
+pwm 6f0841a8197b20d01de9d41cb1eeed09b7b31f9b
+userns d35bec8a57881c840c6fffaacc7b9947555733ca
+ktest 1091c8fce8aa9c5abe1a73acab4bcaf58a729005
+random ab9a7e27044b87ff2be47b8f8e095400e7fccc44
+kselftest 619ee76f5c9f6a1d601d1a056a454d62bf676ae4
+y2038 c4e71212a245017d2ab05f322f7722f0b87a55da
+livepatching 8631420cac7db95f362c32eb22c47356575f316e
+coresight c9d7e3da1f3c4cf5dddfc5d7ce4d76d013aba1cc
+rtc ac363ace16e044cc7a4da38611889091c4d6fecb
+nvdimm f6d2b802f80d0ca89ee1f51c1781b3f79cdb25d5
+at24 8f3d9f354286745c751374f5f1fcafee6b3f3136
+ntb 5a1daba43835a254aa4c84a6bd65f65105824a87
+kspp c7527373fe28f97d8a196ab562db5589be0d34b9
+cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+gnss 9b5816b56af6a424619ab51d24de34dfc65102d8
+fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13
+slimbus f9a478d658a2346c75d364843399d42c37632abd
+nvmem be00147a195b73697da8fb742a4889a1b3e6cadc
+xarray 27586ca786a729cda6c807621a1494900a56e7bc
+hyperv afaa33da08abd10be8978781d7c99a9e67d2bbff
+auxdisplay 3f03b64981723b61048ea46642bcaa9b518f3ad3
+kgdb c22a0166cab46b5979780bbe27936136223f81b1
+pidfd 2b40c5db73e239531ea54991087f4edc07fbb08e
+devfreq 8fc0e48e0faefef5064f3cb803d3d12314e16ec4
+hmm f07e2f6be37a750737b93f5635485171ad459eb9
+fpga 2d80c057efda0198a5993255710629e9418149d2
+kunit 0e698dfa282211e414076f9dc7e83c1c288314fd
+cel 0a8e7b7d08466b5fc52f8e96070acc116d82a8bb
+generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c
+cfi 11399346ac39a26ade2a90303d38ad318163c665
+kunit-next 6d6861d45e38d42a7df9db244c871ee3856acf57
+trivial c1a371cf80fbc06280cc0064ca99a39d0428ded3
+zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+mhi 3781a7a11294872693c48169e2af05d700f6455b
+notifications 87a10a4bdb88d53a3e4c2f04cc3d542cefa11e0b
+fsinfo 93737ccf05ec69f46260bea65464a9c0fd3a03d4
+akpm-current 5f1b7a0f9e0054685d7d813e0fbefce24edf0a23
+akpm cffaeabf2a6f6d912f74d1662374da177cef5a2d
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..ae446f2f4a83
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,327 @@
+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
+arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes
+uniphier-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git#fixes
+arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/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/fs/fscrypt/fscrypt.git#for-stable
+net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master
+bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.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
+rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus
+regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus
+regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus
+spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.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/phy/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
+soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes
+thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes
+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
+modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus
+slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.git#fixes
+backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/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 git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes
+at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes
+omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes
+kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master
+kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master
+hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon
+nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes
+btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes
+vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes
+dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus
+i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#master
+drivers-x86-fixes git git://git.infradead.org/linux-platform-drivers-x86.git#fixes
+samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes
+pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#pinctrl-fixes
+devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus
+scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes
+drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes
+amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes
+drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes
+mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes
+rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes
+gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus
+hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes
+soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix
+risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes
+pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes
+fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes
+spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus
+gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes
+pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes
+erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes
+integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-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
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+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/soc/soc.git#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/at91/linux-at91.git#at91-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
+mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-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
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next
+raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next
+realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next
+renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-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
+ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next
+uniphier git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git#for-next
+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
+csky git git://github.com/c-sky/csky-linux.git#linux-next
+h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-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
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next
+nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#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
+soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next
+risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next
+sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-next
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master
+afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next
+btrfs 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
+erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev
+exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev
+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
+fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity
+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
+nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.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
+ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next
+v9fs git git://github.com/martinetd/linux#9p-next
+xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next
+zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next
+iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next
+djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-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.git#for-next
+printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.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/hid/hid.git#for-next
+i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next
+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
+cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next
+cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower
+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/thermal/linux.git#thermal/linux-next
+thermal-rzhang 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
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master
+bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master
+wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next
+mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next
+nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next
+spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://git.freedesktop.org/git/drm/drm.git#drm-next
+amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-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-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next
+mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp
+imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next
+etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/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
+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/linux.git#pcmcia-next
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#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
+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
+apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next
+integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity
+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
+smack git git://github.com/cschaufler/smack-next#next
+tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master
+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
+vfio git git://github.com/awilliam/linux-vfio.git#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#timers/drivers/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next
+irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvm-ppc git git://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/dennis/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/linux-platform-drivers-x86.git#for-next
+chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.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/pavel/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/phy/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
+soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next
+thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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
+icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-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
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next
+gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next
+gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.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
+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
+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
+livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/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
+nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next
+ntb git https://github.com/jonmason/ntb.git#ntb-next
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+cisco git https://github.com/daniel-walker/cisco-linux.git#for-next
+gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next
+fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next
+slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next
+nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next
+xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray
+hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next
+auxdisplay git https://github.com/ojeda/linux.git#auxdisplay
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next
+pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next
+devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next
+hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm
+fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next
+kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test
+cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next
+generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next
+cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next
+kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit
+trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next
+mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next
+notifications git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#notifications-pipe-core
+fsinfo git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fsinfo-core
+akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/
+akpm mmotm https://www.ozlabs.org/~akpm/mmotm/
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 000000000000..b021731dcb2c
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,21746 @@
+$ date -R
+Tue, 02 Jun 2020 07:48:06 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files: 66% (9371/13988) Updating files: 67% (9372/13988) Updating files: 68% (9512/13988) Updating files: 69% (9652/13988) Updating files: 70% (9792/13988) Updating files: 71% (9932/13988) Updating files: 72% (10072/13988) Updating files: 73% (10212/13988) Updating files: 74% (10352/13988) Updating files: 75% (10491/13988) Updating files: 76% (10631/13988) Updating files: 77% (10771/13988) Updating files: 78% (10911/13988) Updating files: 79% (11051/13988) Updating files: 80% (11191/13988) Updating files: 81% (11331/13988) Updating files: 82% (11471/13988) Updating files: 83% (11611/13988) Updating files: 84% (11750/13988) Updating files: 85% (11890/13988) Updating files: 86% (12030/13988) Updating files: 87% (12170/13988) Updating files: 88% (12310/13988) Updating files: 89% (12450/13988) Updating files: 90% (12590/13988) Updating files: 91% (12730/13988) Updating files: 92% (12869/13988) Updating files: 93% (13009/13988) Updating files: 94% (13149/13988) Updating files: 95% (13289/13988) Updating files: 96% (13429/13988) Updating files: 97% (13569/13988) Updating files: 98% (13709/13988) Updating files: 99% (13849/13988) Updating files: 100% (13988/13988) Updating files: 100% (13988/13988), done.
+HEAD is now at 75caf310d16c Merge branch 'akpm' (patches from Andrew)
+Merging origin/master (9bf9511e3d9f Merge tag 'x86_cache_updates_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge origin/master
+Updating 75caf310d16c..9bf9511e3d9f
+Fast-forward
+ Documentation/ABI/testing/debugfs-hisi-hpre | 89 +-
+ Documentation/ABI/testing/debugfs-hisi-sec | 94 +-
+ Documentation/ABI/testing/debugfs-hisi-zip | 70 +-
+ Documentation/ABI/testing/dev-kmsg | 5 +
+ Documentation/admin-guide/pstore-blk.rst | 243 ++
+ Documentation/admin-guide/ramoops.rst | 14 +-
+ Documentation/core-api/printk-formats.rst | 22 +-
+ .../devicetree/bindings/hwmon/baikal,bt1-pvt.yaml | 107 +
+ .../devicetree/bindings/mfd/gateworks-gsc.yaml | 196 +
+ Documentation/devicetree/bindings/mfd/max8998.txt | 8 +
+ .../bindings/regulator/anatop-regulator.txt | 40 -
+ .../bindings/regulator/anatop-regulator.yaml | 94 +
+ .../bindings/regulator/maxim,max77826.yaml | 68 +
+ .../bindings/reserved-memory/ramoops.txt | 13 +-
+ .../devicetree/bindings/rng/arm-cctrng.yaml | 54 +
+ .../devicetree/bindings/spi/brcm,spi-bcm-qspi.txt | 10 +
+ .../bindings/spi/mikrotik,rb4xx-spi.yaml | 36 +
+ .../devicetree/bindings/spi/renesas,rspi.yaml | 144 +
+ .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 41 -
+ .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 133 +
+ .../bindings/spi/socionext,uniphier-spi.yaml | 57 +
+ Documentation/devicetree/bindings/spi/spi-dw.txt | 24 -
+ Documentation/devicetree/bindings/spi/spi-rspi.txt | 73 -
+ .../devicetree/bindings/spi/spi-uniphier.txt | 28 -
+ Documentation/devicetree/bindings/spi/ti_qspi.txt | 2 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/filesystems/f2fs.rst | 6 +-
+ Documentation/filesystems/fscrypt.rst | 33 +-
+ Documentation/hwmon/amd_energy.rst | 109 +
+ Documentation/hwmon/bt1-pvt.rst | 117 +
+ Documentation/hwmon/gsc-hwmon.rst | 53 +
+ Documentation/hwmon/ina2xx.rst | 19 +
+ Documentation/hwmon/index.rst | 4 +
+ Documentation/hwmon/lm90.rst | 23 +-
+ Documentation/hwmon/max16601.rst | 159 +
+ Documentation/process/coding-style.rst | 23 +-
+ Documentation/security/siphash.rst | 2 +-
+ MAINTAINERS | 43 +-
+ Makefile | 2 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts | 2 +-
+ arch/arm/boot/dts/am437x-idk-evm.dts | 2 +-
+ arch/arm/boot/dts/am437x-sk-evm.dts | 4 +-
+ arch/arm/boot/dts/am571x-idk.dts | 4 +-
+ arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 4 +-
+ arch/arm/boot/dts/am57xx-idk-common.dtsi | 4 +-
+ arch/arm/boot/dts/bcm-hr2.dtsi | 6 +-
+ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 +-
+ arch/arm/boot/dts/dm814x.dtsi | 2 +-
+ arch/arm/boot/dts/imx6q-b450v3.dts | 7 -
+ arch/arm/boot/dts/imx6q-b650v3.dts | 7 -
+ arch/arm/boot/dts/imx6q-b850v3.dts | 11 -
+ arch/arm/boot/dts/imx6q-bx50v3.dtsi | 15 +
+ arch/arm/boot/dts/mmp3-dell-ariel.dts | 12 +-
+ arch/arm/boot/dts/mmp3.dtsi | 8 +-
+ arch/arm/crypto/sha1_glue.c | 1 -
+ arch/arm/crypto/sha1_neon_glue.c | 1 -
+ arch/arm/crypto/sha256_glue.c | 1 -
+ arch/arm/crypto/sha256_neon_glue.c | 1 -
+ arch/arm/kernel/armksyms.c | 1 -
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 4 +-
+ arch/arm64/crypto/aes-glue.c | 4 +-
+ arch/arm64/crypto/crct10dif-ce-core.S | 2 +-
+ arch/arm64/crypto/sha256-glue.c | 1 -
+ arch/arm64/crypto/sha512-glue.c | 1 -
+ arch/arm64/kernel/smp.c | 2 +-
+ arch/ia64/include/asm/device.h | 2 +-
+ arch/microblaze/kernel/microblaze_ksyms.c | 1 -
+ arch/mips/cavium-octeon/crypto/octeon-md5.c | 1 -
+ arch/parisc/mm/init.c | 2 +-
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/crypto/md5-glue.c | 1 -
+ arch/powerpc/crypto/sha1-spe-glue.c | 1 -
+ arch/powerpc/crypto/sha1.c | 33 +-
+ arch/powerpc/crypto/sha256-spe-glue.c | 1 -
+ arch/powerpc/kernel/Makefile | 3 +
+ arch/powerpc/kernel/exceptions-64s.S | 2 +
+ arch/powerpc/kernel/nvram_64.c | 4 +-
+ arch/s390/crypto/sha1_s390.c | 12 +-
+ arch/sparc/crypto/md5_glue.c | 1 -
+ arch/sparc/crypto/sha1_glue.c | 1 -
+ arch/sparc/crypto/sha256_glue.c | 1 -
+ arch/sparc/crypto/sha512_glue.c | 1 -
+ arch/unicore32/kernel/ksyms.c | 1 -
+ arch/x86/crypto/sha1_ssse3_glue.c | 1 -
+ arch/x86/crypto/sha256_ssse3_glue.c | 1 -
+ arch/x86/crypto/sha512_ssse3_glue.c | 1 -
+ arch/x86/include/asm/device.h | 2 +-
+ arch/x86/include/asm/dma.h | 2 +-
+ arch/x86/include/asm/io_bitmap.h | 4 +-
+ arch/x86/include/asm/processor.h | 3 +-
+ .../x86/include/asm/{resctrl_sched.h => resctrl.h} | 9 +-
+ arch/x86/include/uapi/asm/unistd.h | 11 +-
+ arch/x86/kernel/cpu/amd.c | 3 +
+ arch/x86/kernel/cpu/common.c | 40 -
+ arch/x86/kernel/cpu/intel.c | 7 +
+ arch/x86/kernel/cpu/microcode/core.c | 15 +-
+ arch/x86/kernel/cpu/resctrl/core.c | 32 +-
+ arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 8 +-
+ arch/x86/kernel/cpu/resctrl/internal.h | 15 +-
+ arch/x86/kernel/cpu/resctrl/monitor.c | 27 +-
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +-
+ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +-
+ arch/x86/kernel/fpu/xstate.c | 86 +-
+ arch/x86/kernel/ioport.c | 22 +-
+ arch/x86/kernel/process.c | 4 +-
+ arch/x86/kernel/process_32.c | 2 +-
+ arch/x86/kernel/process_64.c | 2 +-
+ block/blk-core.c | 11 +-
+ crypto/Kconfig | 3 +-
+ crypto/algapi.c | 32 +-
+ crypto/algif_rng.c | 2 +-
+ crypto/api.c | 3 +-
+ crypto/blake2b_generic.c | 4 +-
+ crypto/crypto_engine.c | 168 +-
+ crypto/drbg.c | 30 +-
+ crypto/essiv.c | 4 +-
+ crypto/internal.h | 1 +
+ crypto/jitterentropy-kcapi.c | 27 +
+ crypto/jitterentropy.c | 417 ++-
+ crypto/lrw.c | 6 +-
+ crypto/sha1_generic.c | 5 +-
+ crypto/sha256_generic.c | 14 +-
+ crypto/shash.c | 16 +
+ crypto/xts.c | 6 +-
+ drivers/base/regmap/regmap-debugfs.c | 6 +
+ drivers/base/regmap/regmap-i2c.c | 61 +
+ drivers/base/regmap/regmap-irq.c | 84 +-
+ drivers/base/regmap/regmap.c | 23 +
+ drivers/char/hw_random/Kconfig | 13 +
+ drivers/char/hw_random/Makefile | 1 +
+ drivers/char/hw_random/cctrng.c | 735 ++++
+ drivers/char/hw_random/cctrng.h | 72 +
+ drivers/char/hw_random/omap-rng.c | 5 +-
+ drivers/char/hw_random/optee-rng.c | 2 +-
+ drivers/char/hw_random/xgene-rng.c | 4 +-
+ drivers/char/random.c | 8 +-
+ drivers/char/tpm/eventlog/tpm2.c | 12 +-
+ drivers/char/tpm/tpm_ftpm_tee.c | 2 +-
+ drivers/clk/qcom/Kconfig | 1 +
+ drivers/clk/qcom/gcc-sm8150.c | 3 +-
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 4 +-
+ drivers/crypto/amlogic/amlogic-gxl-core.c | 4 +-
+ drivers/crypto/atmel-sha.c | 1 -
+ drivers/crypto/axis/artpec6_crypto.c | 10 +-
+ drivers/crypto/bcm/cipher.c | 27 +-
+ drivers/crypto/cavium/nitrox/nitrox_main.c | 2 +-
+ drivers/crypto/ccp/Kconfig | 3 +-
+ drivers/crypto/ccp/ccp-crypto-sha.c | 9 +-
+ drivers/crypto/ccp/sev-dev.c | 43 +
+ drivers/crypto/ccree/cc_cipher.c | 9 +-
+ drivers/crypto/ccree/cc_debugfs.c | 4 +-
+ drivers/crypto/chelsio/chcr_algo.c | 3 +-
+ drivers/crypto/chelsio/chcr_ipsec.c | 1 -
+ drivers/crypto/chelsio/chtls/chtls_io.c | 2 +-
+ drivers/crypto/hisilicon/Kconfig | 4 +
+ drivers/crypto/hisilicon/hpre/hpre.h | 18 +-
+ drivers/crypto/hisilicon/hpre/hpre_crypto.c | 99 +-
+ drivers/crypto/hisilicon/hpre/hpre_main.c | 355 +-
+ drivers/crypto/hisilicon/qm.c | 3769 ++++++++++++++------
+ drivers/crypto/hisilicon/qm.h | 120 +-
+ drivers/crypto/hisilicon/sec2/sec.h | 5 +-
+ drivers/crypto/hisilicon/sec2/sec_crypto.c | 20 +-
+ drivers/crypto/hisilicon/sec2/sec_main.c | 379 +-
+ drivers/crypto/hisilicon/zip/zip.h | 8 +
+ drivers/crypto/hisilicon/zip/zip_crypto.c | 20 +-
+ drivers/crypto/hisilicon/zip/zip_main.c | 362 +-
+ drivers/crypto/marvell/octeontx/otx_cptpf_main.c | 4 +-
+ drivers/crypto/marvell/octeontx/otx_cptpf_mbox.c | 12 +-
+ drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 95 +-
+ drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 6 +-
+ drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 12 +-
+ drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c | 10 +-
+ drivers/crypto/mediatek/mtk-sha.c | 7 +-
+ drivers/crypto/n2_core.c | 7 +-
+ drivers/crypto/omap-sham.c | 21 +-
+ drivers/crypto/s5p-sss.c | 39 +-
+ drivers/crypto/stm32/stm32-crc32.c | 230 +-
+ drivers/crypto/stm32/stm32-hash.c | 38 +-
+ drivers/edac/amd64_edac.c | 2 +-
+ drivers/edac/amd8131_edac.c | 8 -
+ drivers/edac/armada_xp_edac.c | 14 +-
+ drivers/edac/i10nm_base.c | 29 +-
+ drivers/edac/skx_base.c | 33 +-
+ drivers/edac/skx_common.c | 17 +-
+ drivers/edac/skx_common.h | 13 +-
+ drivers/edac/thunderx_edac.c | 8 +-
+ drivers/edac/xgene_edac.c | 3 -
+ drivers/firmware/raspberrypi.c | 12 +-
+ drivers/gpio/gpio-bcm-kona.c | 2 +-
+ drivers/gpio/gpio-exar.c | 7 +-
+ drivers/gpio/gpio-mlxbf2.c | 6 +-
+ drivers/gpio/gpio-mvebu.c | 15 +-
+ drivers/gpio/gpio-pxa.c | 4 +-
+ drivers/gpio/gpiolib.c | 26 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 -
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +
+ drivers/gpu/drm/ingenic/ingenic-drm.c | 6 +-
+ drivers/hwmon/Kconfig | 59 +-
+ drivers/hwmon/Makefile | 3 +
+ drivers/hwmon/adt7411.c | 3 +-
+ drivers/hwmon/amd_energy.c | 408 +++
+ drivers/hwmon/applesmc.c | 12 +-
+ drivers/hwmon/bt1-pvt.c | 1146 ++++++
+ drivers/hwmon/bt1-pvt.h | 244 ++
+ drivers/hwmon/dell-smm-hwmon.c | 26 +-
+ drivers/hwmon/gsc-hwmon.c | 390 ++
+ drivers/hwmon/hwmon.c | 136 +-
+ drivers/hwmon/ina2xx.c | 183 +
+ drivers/hwmon/lm70.c | 47 +-
+ drivers/hwmon/lm75.c | 8 +-
+ drivers/hwmon/lm75.h | 31 +-
+ drivers/hwmon/lm90.c | 45 +-
+ drivers/hwmon/nct6775.c | 10 +-
+ drivers/hwmon/nct7802.c | 6 +-
+ drivers/hwmon/nct7904.c | 138 +-
+ drivers/hwmon/pmbus/Kconfig | 9 +
+ drivers/hwmon/pmbus/Makefile | 1 +
+ drivers/hwmon/pmbus/max16601.c | 314 ++
+ drivers/hwmon/pmbus/pmbus_core.c | 8 +-
+ drivers/i3c/master.c | 16 +-
+ drivers/infiniband/core/rdma_core.c | 20 +-
+ drivers/infiniband/hw/mlx5/mr.c | 1 +
+ drivers/infiniband/hw/qib/qib_sysfs.c | 9 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h | 4 +
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 15 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 10 +-
+ drivers/iommu/iommu.c | 2 +-
+ drivers/media/usb/pulse8-cec/pulse8-cec.c | 6 +-
+ drivers/mfd/Kconfig | 15 +
+ drivers/mfd/Makefile | 1 +
+ drivers/mfd/gateworks-gsc.c | 277 ++
+ drivers/mmc/core/block.c | 2 +-
+ drivers/mmc/host/sdhci.c | 9 +-
+ drivers/mtd/Kconfig | 10 +
+ drivers/mtd/Makefile | 1 +
+ drivers/mtd/mtdpstore.c | 578 +++
+ drivers/net/bonding/bond_sysfs_slave.c | 4 +-
+ drivers/net/dsa/ocelot/felix.c | 8 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 16 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 5 -
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 9 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 24 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 41 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 20 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 18 +
+ .../net/ethernet/netronome/nfp/flower/offload.c | 3 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +-
+ drivers/net/usb/qmi_wwan.c | 1 +
+ drivers/nfc/s3fwrn5/firmware.c | 10 +-
+ drivers/nfc/st21nfca/dep.c | 4 +-
+ drivers/nvme/host/pci.c | 11 +-
+ drivers/platform/chrome/chromeos_pstore.c | 2 +-
+ drivers/power/supply/bd70528-charger.c | 10 +-
+ drivers/regulator/88pg86x.c | 4 +-
+ drivers/regulator/88pm800-regulator.c | 4 +-
+ drivers/regulator/Kconfig | 11 +
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/ab8500.c | 22 -
+ drivers/regulator/act8865-regulator.c | 4 +-
+ drivers/regulator/act8945a-regulator.c | 2 +-
+ drivers/regulator/arizona-ldo1.c | 2 +-
+ drivers/regulator/arizona-micsupp.c | 4 +-
+ drivers/regulator/as3711-regulator.c | 6 +-
+ drivers/regulator/as3722-regulator.c | 4 +-
+ drivers/regulator/axp20x-regulator.c | 16 +-
+ drivers/regulator/bcm590xx-regulator.c | 8 +-
+ drivers/regulator/bd70528-regulator.c | 8 +-
+ drivers/regulator/bd71828-regulator.c | 10 +-
+ drivers/regulator/bd718x7-regulator.c | 238 +-
+ drivers/regulator/core.c | 59 +-
+ drivers/regulator/da903x.c | 2 +-
+ drivers/regulator/db8500-prcmu.c | 2 +-
+ drivers/regulator/helpers.c | 130 +-
+ drivers/regulator/hi6421-regulator.c | 4 +-
+ drivers/regulator/lochnagar-regulator.c | 4 +-
+ drivers/regulator/lp873x-regulator.c | 4 +-
+ drivers/regulator/lp87565-regulator.c | 2 +-
+ drivers/regulator/lp8788-buck.c | 2 +-
+ drivers/regulator/max77650-regulator.c | 2 +-
+ drivers/regulator/max77826-regulator.c | 301 ++
+ drivers/regulator/max8998.c | 105 +
+ drivers/regulator/mcp16502.c | 4 +-
+ drivers/regulator/mp8859.c | 2 +-
+ drivers/regulator/mt6323-regulator.c | 6 +-
+ drivers/regulator/mt6358-regulator.c | 8 +-
+ drivers/regulator/mt6380-regulator.c | 6 +-
+ drivers/regulator/mt6397-regulator.c | 6 +-
+ drivers/regulator/palmas-regulator.c | 4 +-
+ drivers/regulator/qcom-rpmh-regulator.c | 10 +-
+ drivers/regulator/qcom_rpm-regulator.c | 24 +-
+ drivers/regulator/qcom_smd-regulator.c | 78 +-
+ drivers/regulator/rk808-regulator.c | 10 +-
+ drivers/regulator/s2mps11.c | 14 +-
+ drivers/regulator/sky81452-regulator.c | 2 +-
+ drivers/regulator/stpmic1_regulator.c | 18 +-
+ drivers/regulator/tps65086-regulator.c | 10 +-
+ drivers/regulator/tps65217-regulator.c | 4 +-
+ drivers/regulator/tps65218-regulator.c | 6 +-
+ drivers/regulator/tps65912-regulator.c | 4 +-
+ drivers/regulator/tps80031-regulator.c | 7 +-
+ drivers/regulator/twl-regulator.c | 4 +-
+ drivers/regulator/twl6030-regulator.c | 2 +-
+ drivers/regulator/wm831x-dcdc.c | 2 +-
+ drivers/regulator/wm831x-ldo.c | 4 +-
+ drivers/regulator/wm8350-regulator.c | 2 +-
+ drivers/regulator/wm8400-regulator.c | 2 +-
+ drivers/soc/mediatek/mtk-cmdq-helper.c | 4 +-
+ drivers/spi/Kconfig | 22 +-
+ drivers/spi/Makefile | 6 +-
+ drivers/spi/spi-amd.c | 315 ++
+ drivers/spi/spi-armada-3700.c | 10 +-
+ drivers/spi/spi-atmel.c | 1 +
+ drivers/spi/spi-axi-spi-engine.c | 32 +-
+ drivers/spi/spi-bcm-qspi.c | 181 +-
+ drivers/spi/spi-bcm2835.c | 26 +-
+ drivers/spi/spi-bcm2835aux.c | 4 +-
+ drivers/spi/{spi-dw.c => spi-dw-core.c} | 233 +-
+ drivers/spi/spi-dw-dma.c | 480 +++
+ drivers/spi/spi-dw-mid.c | 322 --
+ drivers/spi/spi-dw-mmio.c | 86 +-
+ drivers/spi/spi-dw-pci.c | 50 +-
+ drivers/spi/spi-dw.h | 66 +-
+ drivers/spi/spi-ep93xx.c | 8 +-
+ drivers/spi/spi-fsl-dspi.c | 47 +-
+ drivers/spi/spi-fsl-lpspi.c | 21 +-
+ drivers/spi/spi-fsl-qspi.c | 11 +-
+ drivers/spi/spi-fsl-spi.c | 2 +-
+ drivers/spi/spi-hisi-sfc-v3xx.c | 26 +-
+ drivers/spi/spi-imx.c | 31 +-
+ drivers/spi/spi-mem.c | 10 +-
+ drivers/spi/spi-mtk-nor.c | 2 +-
+ drivers/spi/spi-mux.c | 8 +-
+ drivers/spi/spi-orion.c | 70 +-
+ drivers/spi/spi-pxa2xx.c | 6 +-
+ drivers/spi/spi-rb4xx.c | 19 +-
+ drivers/spi/spi-rockchip.c | 229 +-
+ drivers/spi/spi-sc18is602.c | 2 +-
+ drivers/spi/spi-sh-msiof.c | 2 +-
+ drivers/spi/spi-sprd-adi.c | 2 +-
+ drivers/spi/spi-stm32-qspi.c | 62 +-
+ drivers/spi/spi-stm32.c | 19 +-
+ drivers/spi/spi-sun6i.c | 1 +
+ drivers/spi/spi-tegra114.c | 1 +
+ drivers/spi/spi-tegra20-sflash.c | 1 +
+ drivers/spi/spi-tegra20-slink.c | 1 +
+ drivers/spi/spi-uniphier.c | 11 +-
+ drivers/spi/spi.c | 14 +-
+ drivers/spi/spidev.c | 3 +-
+ fs/ceph/caps.c | 2 +-
+ fs/crypto/crypto.c | 15 +-
+ fs/crypto/fname.c | 59 +-
+ fs/crypto/fscrypt_private.h | 111 +-
+ fs/crypto/hkdf.c | 6 +-
+ fs/crypto/hooks.c | 4 +-
+ fs/crypto/keyring.c | 122 +-
+ fs/crypto/keysetup.c | 109 +-
+ fs/crypto/policy.c | 195 +-
+ fs/ecryptfs/crypto.c | 17 +-
+ fs/ext4/ext4.h | 7 +-
+ fs/ext4/super.c | 68 +-
+ fs/ext4/sysfs.c | 2 +
+ fs/f2fs/f2fs.h | 4 +-
+ fs/f2fs/hash.c | 1 -
+ fs/f2fs/super.c | 85 +-
+ fs/f2fs/sysfs.c | 4 +
+ fs/gfs2/lops.c | 15 +-
+ fs/nfsd/nfs4recover.c | 26 +-
+ fs/pstore/Kconfig | 109 +
+ fs/pstore/Makefile | 6 +
+ fs/pstore/blk.c | 517 +++
+ fs/pstore/ftrace.c | 54 +
+ fs/pstore/inode.c | 129 +-
+ fs/pstore/internal.h | 11 +-
+ fs/pstore/platform.c | 117 +-
+ fs/pstore/ram.c | 155 +-
+ fs/pstore/zone.c | 1465 ++++++++
+ fs/ubifs/auth.c | 20 +-
+ fs/ubifs/master.c | 9 +-
+ fs/ubifs/replay.c | 14 +-
+ fs/verity/enable.c | 2 +
+ fs/verity/fsverity_private.h | 4 +-
+ fs/verity/measure.c | 2 +
+ fs/verity/open.c | 1 +
+ fs/verity/signature.c | 3 +
+ fs/verity/verify.c | 3 +
+ include/crypto/acompress.h | 2 +-
+ include/crypto/algapi.h | 2 +
+ include/crypto/drbg.h | 6 +-
+ include/crypto/engine.h | 15 +-
+ include/crypto/hash.h | 19 +
+ include/crypto/sha.h | 28 +-
+ include/crypto/sha256_base.h | 6 +-
+ include/linux/console.h | 2 +-
+ include/linux/cryptohash.h | 14 -
+ include/linux/filter.h | 4 +-
+ include/linux/fscrypt.h | 214 +-
+ include/linux/fsverity.h | 19 +-
+ include/linux/hwmon.h | 3 +
+ include/linux/ieee80211.h | 2 +-
+ include/linux/kmsg_dump.h | 12 +-
+ include/linux/linear_range.h | 48 +
+ include/linux/mfd/gsc.h | 76 +
+ include/linux/mfd/max8998.h | 1 +
+ include/linux/netfilter/nf_conntrack_pptp.h | 2 +-
+ include/linux/padata.h | 6 +-
+ include/linux/parser.h | 5 +-
+ include/linux/platform_data/gsc_hwmon.h | 44 +
+ include/linux/printk.h | 3 +-
+ include/linux/psp-sev.h | 2 +
+ include/linux/pstore.h | 9 +-
+ include/linux/pstore_blk.h | 118 +
+ include/linux/pstore_ram.h | 2 +-
+ include/linux/pstore_zone.h | 60 +
+ include/linux/regmap.h | 109 +-
+ include/linux/regulator/coupler.h | 8 +
+ include/linux/regulator/driver.h | 27 +-
+ include/linux/tpm_eventlog.h | 2 +-
+ include/linux/virtio_net.h | 25 +-
+ include/net/espintcp.h | 1 +
+ include/net/ip_fib.h | 12 +
+ include/net/nexthop.h | 100 +-
+ include/net/tcp.h | 1 -
+ include/net/tls.h | 4 +
+ include/rdma/uverbs_std_types.h | 2 +-
+ include/trace/events/regulator.h | 32 +
+ include/uapi/linux/fscrypt.h | 3 +-
+ include/uapi/linux/psp-sev.h | 2 +
+ include/uapi/linux/xfrm.h | 2 +-
+ kernel/bpf/core.c | 18 +-
+ kernel/bpf/verifier.c | 34 +-
+ kernel/padata.c | 14 +-
+ kernel/printk/console_cmdline.h | 1 +
+ kernel/printk/printk.c | 177 +-
+ kernel/reboot.c | 6 +-
+ kernel/sched/fair.c | 2 +-
+ lib/Kconfig | 3 +
+ lib/Kconfig.debug | 12 +
+ lib/Makefile | 2 +
+ lib/crypto/chacha.c | 1 -
+ lib/crypto/sha256.c | 20 +-
+ lib/linear_ranges.c | 245 ++
+ lib/mpi/longlong.h | 2 +-
+ lib/sha1.c | 24 +-
+ lib/test_linear_ranges.c | 228 ++
+ lib/test_printf.c | 13 +-
+ lib/vsprintf.c | 39 +-
+ net/bluetooth/smp.c | 6 +-
+ net/bridge/br_multicast.c | 3 +-
+ net/bridge/netfilter/nft_reject_bridge.c | 6 +
+ net/ceph/osd_client.c | 4 +-
+ net/core/neighbour.c | 4 +-
+ net/core/secure_seq.c | 1 -
+ net/dsa/slave.c | 1 +
+ net/ipv4/devinet.c | 1 +
+ net/ipv4/esp4_offload.c | 30 +-
+ net/ipv4/fib_frontend.c | 19 +-
+ net/ipv4/fib_trie.c | 51 +-
+ net/ipv4/ip_vti.c | 23 +-
+ net/ipv4/netfilter/nf_nat_pptp.c | 7 +-
+ net/ipv4/nexthop.c | 102 +-
+ net/ipv6/addrconf.c | 10 +-
+ net/ipv6/esp6_offload.c | 37 +-
+ net/ipv6/seg6_hmac.c | 1 -
+ net/l2tp/l2tp_core.c | 3 +
+ net/l2tp/l2tp_ip.c | 29 +-
+ net/l2tp/l2tp_ip6.c | 30 +-
+ net/mac80211/mesh_hwmp.c | 7 +
+ net/mptcp/crypto.c | 4 +-
+ net/mptcp/protocol.c | 67 +-
+ net/netfilter/ipset/ip_set_list_set.c | 2 +-
+ net/netfilter/nf_conntrack_core.c | 80 +-
+ net/netfilter/nf_conntrack_pptp.c | 62 +-
+ net/netfilter/nfnetlink_cthelper.c | 3 +-
+ net/qrtr/ns.c | 10 +-
+ net/sched/act_ct.c | 3 +
+ net/sched/sch_fq_pie.c | 4 +-
+ net/sctp/Kconfig | 2 +-
+ net/sctp/auth.c | 10 +-
+ net/sctp/sm_make_chunk.c | 23 +-
+ net/sctp/ulpevent.c | 3 +
+ net/tls/tls_sw.c | 33 +-
+ net/vmw_vsock/af_vsock.c | 2 +-
+ net/vmw_vsock/virtio_transport_common.c | 8 +
+ net/wireless/core.c | 2 +-
+ net/xdp/xdp_umem.c | 8 +-
+ net/xfrm/espintcp.c | 2 +
+ net/xfrm/xfrm_device.c | 8 +-
+ net/xfrm/xfrm_input.c | 2 +-
+ net/xfrm/xfrm_interface.c | 21 +
+ net/xfrm/xfrm_output.c | 15 +-
+ net/xfrm/xfrm_policy.c | 7 +-
+ scripts/checkpatch.pl | 14 +-
+ security/keys/encrypted-keys/encrypted.c | 18 +-
+ sound/core/hwdep.c | 4 +-
+ sound/pci/hda/patch_realtek.c | 39 +-
+ sound/usb/mixer.c | 8 +
+ sound/usb/mixer_maps.c | 19 +
+ sound/usb/quirks-table.h | 25 +
+ tools/arch/x86/include/uapi/asm/unistd.h | 2 +-
+ tools/spi/Makefile | 4 +-
+ tools/spi/spidev_test.c | 21 +-
+ tools/testing/selftests/bpf/verifier/bounds.c | 46 +-
+ tools/testing/selftests/pstore/pstore_tests | 2 +-
+ .../tc-testing/tc-tests/qdiscs/fq_pie.json | 21 +
+ 512 files changed, 19677 insertions(+), 5256 deletions(-)
+ create mode 100644 Documentation/admin-guide/pstore-blk.rst
+ create mode 100644 Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/regulator/anatop-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/anatop-regulator.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
+ create mode 100644 Documentation/devicetree/bindings/rng/arm-cctrng.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/mikrotik,rb4xx-spi.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/renesas,rspi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/socionext,uniphier-spi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/spi-dw.txt
+ delete mode 100644 Documentation/devicetree/bindings/spi/spi-rspi.txt
+ delete mode 100644 Documentation/devicetree/bindings/spi/spi-uniphier.txt
+ create mode 100644 Documentation/hwmon/amd_energy.rst
+ create mode 100644 Documentation/hwmon/bt1-pvt.rst
+ create mode 100644 Documentation/hwmon/gsc-hwmon.rst
+ create mode 100644 Documentation/hwmon/max16601.rst
+ rename arch/x86/include/asm/{resctrl_sched.h => resctrl.h} (92%)
+ create mode 100644 drivers/char/hw_random/cctrng.c
+ create mode 100644 drivers/char/hw_random/cctrng.h
+ create mode 100644 drivers/hwmon/amd_energy.c
+ create mode 100644 drivers/hwmon/bt1-pvt.c
+ create mode 100644 drivers/hwmon/bt1-pvt.h
+ create mode 100644 drivers/hwmon/gsc-hwmon.c
+ create mode 100644 drivers/hwmon/pmbus/max16601.c
+ create mode 100644 drivers/mfd/gateworks-gsc.c
+ create mode 100644 drivers/mtd/mtdpstore.c
+ create mode 100644 drivers/regulator/max77826-regulator.c
+ create mode 100644 drivers/spi/spi-amd.c
+ rename drivers/spi/{spi-dw.c => spi-dw-core.c} (70%)
+ create mode 100644 drivers/spi/spi-dw-dma.c
+ delete mode 100644 drivers/spi/spi-dw-mid.c
+ create mode 100644 fs/pstore/blk.c
+ create mode 100644 fs/pstore/zone.c
+ delete mode 100644 include/linux/cryptohash.h
+ create mode 100644 include/linux/linear_range.h
+ create mode 100644 include/linux/mfd/gsc.h
+ create mode 100644 include/linux/platform_data/gsc_hwmon.h
+ create mode 100644 include/linux/pstore_blk.h
+ create mode 100644 include/linux/pstore_zone.h
+ create mode 100644 lib/linear_ranges.c
+ create mode 100644 lib/test_linear_ranges.c
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json
+Merging fixes/master (da03d0610044 device_cgroup: Fix RCU list debugging warning)
+$ git merge fixes/master
+Merge made by the 'recursive' strategy.
+ security/device_cgroup.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging kbuild-current/fixes (6a8b55ed4056 Linux 5.7-rc3)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (9d9368e839c2 ARC: [arcompact] fix bitrot with 2 levels of interrupt)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ arch/arc/include/asm/irqflags-compact.h | 5 ++++-
+ arch/arc/kernel/entry.S | 16 +++++-----------
+ 2 files changed, 9 insertions(+), 12 deletions(-)
+Merging arm-current/fixes (3866f217aaa8 ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook)
+$ git merge arm-current/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (99706d62fb50 Merge tag 'omap-for-v5.7/cpsw-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes)
+$ git merge arm-soc-fixes/arm/fixes
+Already up to date.
+Merging uniphier-fixes/fixes (0e698dfa2822 Linux 5.7-rc4)
+$ git merge uniphier-fixes/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (ba051f097fc3 arm64/kernel: Fix return value when cpu_online() fails in __cpu_up())
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+Merging m68k-current/for-linus (3381df095419 m68k: tools: Replace zero-length array with flexible-array member)
+$ git merge m68k-current/for-linus
+Merge made by the 'recursive' strategy.
+ arch/m68k/amiga/config.c | 7 ++---
+ arch/m68k/configs/amiga_defconfig | 6 ++++-
+ arch/m68k/configs/apollo_defconfig | 6 ++++-
+ arch/m68k/configs/atari_defconfig | 6 ++++-
+ arch/m68k/configs/bvme6000_defconfig | 6 ++++-
+ arch/m68k/configs/hp300_defconfig | 6 ++++-
+ arch/m68k/configs/mac_defconfig | 6 ++++-
+ arch/m68k/configs/multi_defconfig | 6 ++++-
+ arch/m68k/configs/mvme147_defconfig | 6 ++++-
+ arch/m68k/configs/mvme16x_defconfig | 6 ++++-
+ arch/m68k/configs/q40_defconfig | 6 ++++-
+ arch/m68k/configs/sun3_defconfig | 6 ++++-
+ arch/m68k/configs/sun3x_defconfig | 6 ++++-
+ arch/m68k/include/asm/mac_via.h | 1 +
+ arch/m68k/include/asm/uaccess_mm.h | 2 +-
+ arch/m68k/mac/config.c | 21 ++-------------
+ arch/m68k/mac/iop.c | 51 ++++++++++++++++++++----------------
+ arch/m68k/mac/via.c | 6 ++++-
+ arch/m68k/tools/amiga/dmesg.c | 2 +-
+ 19 files changed, 102 insertions(+), 60 deletions(-)
+Merging powerpc-fixes/fixes (2f26ed1764b4 powerpc/64s: Disable sanitisers for C syscall/interrupt entry/exit code)
+$ git merge powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (4c1cbcbd6c56 s390/kaslr: add support for R_390_JMP_SLOT relocation type)
+$ git merge s390-fixes/fixes
+Already up to date.
+Merging sparc/master (fcdf818d239e Merge branch 'sparc-scnprintf')
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/kernel/cpumap.c | 2 +-
+ arch/sparc/kernel/ds.c | 8 ++++----
+ arch/sparc/kernel/pci.c | 2 +-
+ arch/sparc/kernel/vio.c | 2 +-
+ arch/sparc/mm/init_64.c | 10 +++++-----
+ drivers/tty/vcc.c | 1 +
+ 6 files changed, 13 insertions(+), 12 deletions(-)
+Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key)
+$ git merge fscrypt-current/for-stable
+Already up to date.
+Merging net/master (bdc48fa11e46 checkpatch/coding-style: deprecate 80-column warning)
+$ git merge net/master
+Already up to date.
+Merging bpf/master (bdc48fa11e46 checkpatch/coding-style: deprecate 80-column warning)
+$ git merge bpf/master
+Already up to date.
+Merging ipsec/master (f6a23d85d078 xfrm: fix a NULL-ptr deref in xfrm_local_error)
+$ git merge ipsec/master
+Already up to date.
+Merging netfilter/master (45ebf73ebcec sctp: check assoc before SCTP_ADDR_{MADE_PRIM, ADDED} event)
+$ git merge netfilter/master
+Already up to date.
+Merging ipvs/master (0141317611ab Merge branch 'hns3-fixes')
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (f92f26f2ed2c iwlwifi: pcie: handle QuZ configs with killer NICs as well)
+$ git merge wireless-drivers/master
+Already up to date.
+Merging mac80211/master (3d77e6a8804a Linux 5.7)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (3d77e6a8804a Linux 5.7)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (7fccfecf24fd ALSA: usb-audio: Add Pioneer DJ DJM-900NXS2 support)
+$ git merge sound-current/for-linus
+Removing sound/soc/codecs/rt5682-sdw.h
+Removing Documentation/devicetree/bindings/sound/simple-card.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 2 +
+ Documentation/devicetree/bindings/sound/da7213.txt | 8 +-
+ .../devicetree/bindings/sound/fsl,asrc.txt | 4 +
+ .../devicetree/bindings/sound/fsl,easrc.yaml | 101 +
+ .../devicetree/bindings/sound/fsl,esai.txt | 1 +
+ .../bindings/sound/marvell,mmp-sspa.yaml | 122 ++
+ .../devicetree/bindings/sound/nau8810.txt | 5 +-
+ .../devicetree/bindings/sound/nau8825.txt | 2 +-
+ .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 1 +
+ .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 25 +
+ .../devicetree/bindings/sound/qcom,q6adm.txt | 2 +-
+ .../devicetree/bindings/sound/qcom,q6afe.txt | 46 +-
+ .../devicetree/bindings/sound/qcom,q6asm.txt | 7 +-
+ .../devicetree/bindings/sound/qcom,q6core.txt | 2 +-
+ .../devicetree/bindings/sound/renesas,rsnd.txt | 1 +
+ .../devicetree/bindings/sound/rockchip-i2s.yaml | 12 +-
+ Documentation/devicetree/bindings/sound/rt1016.txt | 17 +
+ Documentation/devicetree/bindings/sound/rt1308.txt | 0
+ .../devicetree/bindings/sound/simple-card.txt | 351 ----
+ .../devicetree/bindings/sound/simple-card.yaml | 484 +++++
+ .../devicetree/bindings/sound/tlv320adcx140.yaml | 51 +
+ Documentation/devicetree/bindings/sound/wm8994.txt | 18 +-
+ .../devicetree/bindings/sound/zl38060.yaml | 69 +
+ drivers/soundwire/intel.c | 4 +-
+ include/sound/control.h | 2 +-
+ include/sound/hda_codec.h | 11 +-
+ include/sound/hdaudio.h | 10 +-
+ include/sound/intel-nhlt.h | 6 +-
+ include/sound/soc-acpi.h | 2 +-
+ include/sound/soc-card.h | 69 +
+ include/sound/soc-component.h | 46 +-
+ include/sound/soc-dai.h | 62 +-
+ include/sound/soc-dapm.h | 2 +-
+ include/sound/soc-link.h | 27 +
+ include/sound/soc.h | 104 +-
+ include/sound/sof.h | 5 +-
+ include/sound/sof/channel_map.h | 2 +-
+ include/sound/sof/control.h | 2 +-
+ include/sound/sof/dai-imx.h | 2 +-
+ include/sound/sof/dai-intel.h | 22 +-
+ include/sound/sof/dai.h | 2 +-
+ include/sound/sof/ext_manifest.h | 95 +
+ include/sound/sof/header.h | 2 +-
+ include/sound/sof/info.h | 28 +-
+ include/sound/sof/pm.h | 2 +-
+ include/sound/sof/stream.h | 2 +-
+ include/sound/sof/topology.h | 20 +-
+ include/sound/sof/trace.h | 4 +-
+ include/sound/sof/xtensa.h | 2 +-
+ include/uapi/sound/skl-tplg-interface.h | 2 +
+ include/uapi/sound/sof/abi.h | 2 +-
+ include/uapi/sound/sof/tokens.h | 8 +
+ sound/core/oss/pcm_plugin.h | 2 +-
+ sound/core/seq/oss/seq_oss_timer.h | 10 -
+ sound/drivers/portman2x4.c | 2 +-
+ sound/firewire/Kconfig | 8 +-
+ sound/firewire/amdtp-am824.c | 3 +-
+ sound/firewire/amdtp-stream.c | 326 +--
+ sound/firewire/amdtp-stream.h | 20 +-
+ sound/firewire/fireface/ff-protocol-latter.c | 58 +-
+ sound/firewire/fireface/ff-stream.c | 10 +-
+ sound/firewire/fireface/ff.c | 61 +-
+ sound/firewire/fireface/ff.h | 11 +-
+ sound/firewire/fireworks/fireworks.h | 2 +-
+ sound/firewire/motu/amdtp-motu.c | 19 +-
+ sound/firewire/motu/motu-pcm.c | 14 +-
+ sound/firewire/motu/motu-proc.c | 20 +-
+ sound/firewire/motu/motu-protocol-v2.c | 314 +--
+ sound/firewire/motu/motu-protocol-v3.c | 312 +--
+ sound/firewire/motu/motu-stream.c | 16 +-
+ sound/firewire/motu/motu.c | 114 +-
+ sound/firewire/motu/motu.h | 125 +-
+ sound/hda/ext/hdac_ext_bus.c | 2 +-
+ sound/hda/hdac_bus.c | 6 +-
+ sound/hda/hdac_controller.c | 13 +
+ sound/hda/hdac_device.c | 2 +-
+ sound/hda/hdac_stream.c | 2 +-
+ sound/hda/intel-dsp-config.c | 117 +-
+ sound/hda/intel-nhlt.c | 51 +-
+ sound/hda/local.h | 3 +
+ sound/isa/ad1816a/ad1816a.c | 2 +-
+ sound/isa/wavefront/wavefront_synth.c | 8 +-
+ sound/pci/ac97/ac97_patch.c | 2 +-
+ sound/pci/hda/Kconfig | 4 +-
+ sound/pci/hda/hda_tegra.c | 50 +
+ sound/pci/hda/patch_hdmi.c | 13 +-
+ sound/pci/hda/patch_realtek.c | 51 +-
+ sound/pci/oxygen/xonar_pcm179x.c | 4 +-
+ sound/ppc/pmac.c | 4 +-
+ sound/soc/Makefile | 2 +-
+ sound/soc/amd/Kconfig | 15 +-
+ sound/soc/amd/Makefile | 1 +
+ sound/soc/amd/raven/acp3x-i2s.c | 6 +-
+ sound/soc/amd/raven/acp3x-pcm-dma.c | 49 +-
+ sound/soc/amd/renoir/Makefile | 7 +
+ sound/soc/amd/renoir/acp3x-pdm-dma.c | 524 +++++
+ sound/soc/amd/renoir/acp3x-rn.c | 77 +
+ sound/soc/amd/renoir/rn-pci-acp3x.c | 344 ++++
+ sound/soc/amd/renoir/rn_acp3x.h | 88 +
+ sound/soc/amd/renoir/rn_chip_offset_byte.h | 349 ++++
+ sound/soc/atmel/atmel_ssc_dai.c | 4 +-
+ sound/soc/bcm/bcm2835-i2s.c | 6 +-
+ sound/soc/bcm/cygnus-ssp.c | 4 +-
+ sound/soc/cirrus/ep93xx-i2s.c | 4 +-
+ sound/soc/codecs/Kconfig | 40 +-
+ sound/soc/codecs/Makefile | 6 +
+ sound/soc/codecs/ad1980.c | 2 +-
+ sound/soc/codecs/ad73311.c | 2 +-
+ sound/soc/codecs/adau7118-i2c.c | 7 +
+ sound/soc/codecs/adav80x.c | 4 +-
+ sound/soc/codecs/arizona.c | 2 +-
+ sound/soc/codecs/cros_ec_codec.c | 22 +-
+ sound/soc/codecs/cs4271.c | 4 +-
+ sound/soc/codecs/cs47l15.c | 9 +-
+ sound/soc/codecs/cs47l24.c | 8 +-
+ sound/soc/codecs/cs47l35.c | 9 +-
+ sound/soc/codecs/cs47l85.c | 9 +-
+ sound/soc/codecs/cs47l90.c | 9 +-
+ sound/soc/codecs/cs47l92.c | 9 +-
+ sound/soc/codecs/da7213.c | 102 +-
+ sound/soc/codecs/da7213.h | 9 +
+ sound/soc/codecs/dmic.c | 4 +-
+ sound/soc/codecs/hdac_hda.h | 4 -
+ sound/soc/codecs/jz4725b.c | 4 +-
+ sound/soc/codecs/jz4740.c | 4 +-
+ sound/soc/codecs/jz4770.c | 2 +-
+ sound/soc/codecs/madera.c | 2 +-
+ sound/soc/codecs/max9768.c | 2 +-
+ sound/soc/codecs/max98090.c | 6 +-
+ sound/soc/codecs/max98373.c | 2 +-
+ sound/soc/codecs/max98390.c | 1040 ++++++++++
+ sound/soc/codecs/max98390.h | 663 ++++++
+ sound/soc/codecs/max9867.c | 95 +-
+ sound/soc/codecs/max9867.h | 1 -
+ sound/soc/codecs/nau8810.c | 39 +-
+ sound/soc/codecs/nau8810.h | 8 +
+ sound/soc/codecs/rl6231.c | 29 +-
+ sound/soc/codecs/rl6231.h | 1 +
+ sound/soc/codecs/rt1015.c | 29 +-
+ sound/soc/codecs/rt1015.h | 1 +
+ sound/soc/codecs/rt1016.c | 695 +++++++
+ sound/soc/codecs/rt1016.h | 232 +++
+ sound/soc/codecs/rt1308-sdw.c | 15 +-
+ sound/soc/codecs/rt5677-spi.c | 12 +-
+ sound/soc/codecs/rt5682-i2c.c | 306 +++
+ sound/soc/codecs/rt5682-sdw.c | 462 ++++-
+ sound/soc/codecs/rt5682-sdw.h | 20 -
+ sound/soc/codecs/rt5682.c | 888 +-------
+ sound/soc/codecs/rt5682.h | 32 +-
+ sound/soc/codecs/rt700-sdw.c | 3 -
+ sound/soc/codecs/rt700.c | 3 +
+ sound/soc/codecs/rt711-sdw.c | 3 -
+ sound/soc/codecs/rt711.c | 3 +
+ sound/soc/codecs/rt715-sdw.c | 3 -
+ sound/soc/codecs/rt715.c | 3 +
+ sound/soc/codecs/sta32x.c | 11 +-
+ sound/soc/codecs/tas2552.c | 1 +
+ sound/soc/codecs/tlv320adcx140.c | 96 +-
+ sound/soc/codecs/tlv320adcx140.h | 11 +
+ sound/soc/codecs/tlv320aic23.c | 2 +-
+ sound/soc/codecs/tlv320dac33.c | 2 +-
+ sound/soc/codecs/uda1380.c | 2 +-
+ sound/soc/codecs/wcd9335.c | 44 +-
+ sound/soc/codecs/wcd934x.c | 30 +-
+ sound/soc/codecs/wl1273.c | 2 +-
+ sound/soc/codecs/wm5102.c | 9 +-
+ sound/soc/codecs/wm5110.c | 8 +-
+ sound/soc/codecs/wm8524.c | 4 +-
+ sound/soc/codecs/wm8711.c | 2 +-
+ sound/soc/codecs/wm8753.c | 4 +-
+ sound/soc/codecs/wm8782.c | 2 +-
+ sound/soc/codecs/wm8900.c | 6 -
+ sound/soc/codecs/wm8962.c | 9 +-
+ sound/soc/codecs/wm8990.c | 98 -
+ sound/soc/codecs/wm8991.c | 8 -
+ sound/soc/codecs/wm8994.c | 8 -
+ sound/soc/codecs/wm_adsp.c | 18 +-
+ sound/soc/codecs/wm_adsp.h | 18 +-
+ sound/soc/codecs/zl38060.c | 638 ++++++
+ sound/soc/dwc/dwc-i2s.c | 2 +-
+ sound/soc/fsl/Kconfig | 11 +
+ sound/soc/fsl/Makefile | 2 +
+ sound/soc/fsl/fsl-asoc-card.c | 24 +-
+ sound/soc/fsl/fsl_asrc.c | 368 ++--
+ sound/soc/fsl/fsl_asrc.h | 74 +-
+ sound/soc/fsl/fsl_asrc_common.h | 106 +
+ sound/soc/fsl/fsl_asrc_dma.c | 55 +-
+ sound/soc/fsl/fsl_audmix.c | 4 +-
+ sound/soc/fsl/fsl_easrc.c | 2117 ++++++++++++++++++++
+ sound/soc/fsl/fsl_easrc.h | 651 ++++++
+ sound/soc/fsl/fsl_esai.c | 52 +-
+ sound/soc/fsl/fsl_micfil.c | 17 +-
+ sound/soc/fsl/fsl_spdif.c | 4 +-
+ sound/soc/hisilicon/hi6210-i2s.c | 16 +-
+ sound/soc/img/img-i2s-in.c | 1 +
+ sound/soc/img/img-i2s-out.c | 8 +-
+ sound/soc/img/img-spdif-in.c | 4 +-
+ sound/soc/img/img-spdif-out.c | 4 +-
+ sound/soc/intel/Kconfig | 8 +-
+ sound/soc/intel/Makefile | 2 +-
+ sound/soc/intel/atom/Makefile | 2 +-
+ sound/soc/intel/atom/sst-atom-controls.h | 2 +-
+ sound/soc/intel/atom/sst-mfld-platform-compress.c | 43 +-
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 16 +-
+ sound/soc/intel/atom/sst-mfld-platform.h | 2 +-
+ sound/soc/intel/atom/sst/Makefile | 2 +-
+ sound/soc/intel/baytrail/sst-baytrail-ipc.c | 4 +-
+ sound/soc/intel/boards/Kconfig | 83 +-
+ sound/soc/intel/boards/Makefile | 6 +-
+ sound/soc/intel/boards/bdw-rt5650.c | 29 +
+ sound/soc/intel/boards/bdw-rt5677.c | 26 +
+ sound/soc/intel/boards/broadwell.c | 43 +-
+ sound/soc/intel/boards/bytcht_cx2072x.c | 5 +-
+ sound/soc/intel/boards/bytcht_da7213.c | 3 +
+ sound/soc/intel/boards/bytcht_es8316.c | 3 +
+ sound/soc/intel/boards/bytcr_rt5640.c | 19 +-
+ sound/soc/intel/boards/bytcr_rt5651.c | 6 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 +
+ sound/soc/intel/boards/cht_bsw_nau8824.c | 7 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 3 +
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 3 +
+ sound/soc/intel/boards/cml_rt1011_rt5682.c | 224 ++-
+ sound/soc/intel/boards/ehl_rt5660.c | 323 +++
+ sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +-
+ sound/soc/intel/boards/hda_dsp_common.c | 2 +-
+ sound/soc/intel/boards/hda_dsp_common.h | 2 +-
+ sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +-
+ sound/soc/intel/boards/kbl_da7219_max98927.c | 2 +-
+ sound/soc/intel/boards/kbl_rt5660.c | 2 +-
+ sound/soc/intel/boards/skl_hda_dsp_common.c | 2 +-
+ sound/soc/intel/boards/skl_hda_dsp_common.h | 2 +-
+ sound/soc/intel/boards/skl_hda_dsp_generic.c | 33 +-
+ sound/soc/intel/boards/sof_da7219_max98373.c | 23 +-
+ sound/soc/intel/boards/sof_maxim_common.c | 2 +-
+ sound/soc/intel/boards/sof_maxim_common.h | 2 +-
+ sound/soc/intel/boards/sof_pcm512x.c | 11 +-
+ sound/soc/intel/boards/sof_rt5682.c | 2 +-
+ sound/soc/intel/boards/sof_sdw.c | 65 +-
+ sound/soc/intel/boards/sof_sdw_common.h | 2 +-
+ sound/soc/intel/boards/sof_sdw_dmic.c | 2 +-
+ sound/soc/intel/boards/sof_sdw_hdmi.c | 11 +-
+ sound/soc/intel/boards/sof_sdw_rt1308.c | 4 +-
+ sound/soc/intel/boards/sof_sdw_rt5682.c | 5 +-
+ sound/soc/intel/boards/sof_sdw_rt700.c | 13 +-
+ sound/soc/intel/boards/sof_sdw_rt711.c | 13 +-
+ sound/soc/intel/boards/sof_sdw_rt715.c | 2 +-
+ sound/soc/intel/boards/sof_wm8804.c | 298 +++
+ sound/soc/intel/common/Makefile | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 4 +-
+ sound/soc/intel/common/soc-acpi-intel-cfl-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 9 +-
+ sound/soc/intel/common/soc-acpi-intel-glk-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-hda-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-icl-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-skl-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 2 +-
+ sound/soc/intel/common/soc-intel-quirks.h | 2 +-
+ sound/soc/intel/common/sst-dsp.c | 9 +-
+ sound/soc/intel/haswell/sst-haswell-dsp.c | 185 +-
+ sound/soc/intel/skylake/Makefile | 2 +-
+ sound/soc/intel/skylake/skl-i2s.h | 2 +-
+ sound/soc/intel/skylake/skl-ssp-clk.c | 2 +-
+ sound/soc/intel/skylake/skl-sst-utils.c | 2 +-
+ sound/soc/intel/skylake/skl-topology.c | 184 +-
+ sound/soc/intel/skylake/skl-topology.h | 5 +-
+ sound/soc/intel/skylake/skl.h | 2 +-
+ sound/soc/jz4740/Kconfig | 2 +-
+ sound/soc/jz4740/jz4740-i2s.c | 12 +-
+ sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 7 +-
+ sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 8 +-
+ sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 7 +-
+ sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 16 +-
+ sound/soc/meson/axg-tdm-interface.c | 2 +-
+ sound/soc/mxs/mxs-saif.c | 5 +-
+ sound/soc/pxa/Kconfig | 25 +-
+ sound/soc/pxa/mmp-sspa.c | 445 ++--
+ sound/soc/pxa/mmp-sspa.h | 32 +-
+ sound/soc/pxa/pxa-ssp.c | 8 +-
+ sound/soc/pxa/pxa2xx-i2s.c | 2 +-
+ sound/soc/qcom/lpass-apq8016.c | 9 +-
+ sound/soc/qcom/lpass-cpu.c | 235 ++-
+ sound/soc/qcom/lpass-lpaif-reg.h | 30 +-
+ sound/soc/qcom/lpass.h | 4 +
+ sound/soc/qcom/qdsp6/q6asm-dai.c | 55 +-
+ sound/soc/sh/rcar/gen.c | 8 +
+ sound/soc/sh/rcar/rsnd.h | 9 +
+ sound/soc/sh/rcar/ssi.c | 145 ++
+ sound/soc/soc-card.c | 225 +++
+ sound/soc/soc-compress.c | 281 ++-
+ sound/soc/soc-core.c | 245 +--
+ sound/soc/soc-dai.c | 485 +++--
+ sound/soc/soc-dapm.c | 30 +-
+ sound/soc/soc-generic-dmaengine-pcm.c | 6 +-
+ sound/soc/soc-jack.c | 38 -
+ sound/soc/soc-link.c | 155 ++
+ sound/soc/soc-pcm.c | 251 +--
+ sound/soc/soc-topology.c | 96 +-
+ sound/soc/sof/Makefile | 2 +-
+ sound/soc/sof/compress.c | 9 +-
+ sound/soc/sof/compress.h | 9 +-
+ sound/soc/sof/control.c | 6 +-
+ sound/soc/sof/core.c | 9 +-
+ sound/soc/sof/debug.c | 2 +-
+ sound/soc/sof/imx/Kconfig | 34 +-
+ sound/soc/sof/imx/Makefile | 4 +-
+ sound/soc/sof/imx/imx8.c | 4 +-
+ sound/soc/sof/imx/imx8m.c | 285 +++
+ sound/soc/sof/intel/Makefile | 2 +-
+ sound/soc/sof/intel/apl.c | 2 +-
+ sound/soc/sof/intel/bdw.c | 2 +-
+ sound/soc/sof/intel/byt.c | 172 +-
+ sound/soc/sof/intel/cnl.c | 2 +-
+ sound/soc/sof/intel/hda-bus.c | 2 +-
+ sound/soc/sof/intel/hda-codec.c | 58 +-
+ sound/soc/sof/intel/hda-compress.c | 2 +-
+ sound/soc/sof/intel/hda-ctrl.c | 2 +-
+ sound/soc/sof/intel/hda-dai.c | 2 +-
+ sound/soc/sof/intel/hda-dsp.c | 10 +-
+ sound/soc/sof/intel/hda-ipc.c | 2 +-
+ sound/soc/sof/intel/hda-ipc.h | 2 +-
+ sound/soc/sof/intel/hda-loader.c | 11 +-
+ sound/soc/sof/intel/hda-pcm.c | 2 +-
+ sound/soc/sof/intel/hda-stream.c | 2 +-
+ sound/soc/sof/intel/hda-trace.c | 2 +-
+ sound/soc/sof/intel/hda.c | 28 +-
+ sound/soc/sof/intel/hda.h | 2 +-
+ sound/soc/sof/intel/intel-ipc.c | 2 +-
+ sound/soc/sof/intel/shim.h | 2 +-
+ sound/soc/sof/ipc.c | 11 +-
+ sound/soc/sof/loader.c | 213 +-
+ sound/soc/sof/nocodec.c | 8 +-
+ sound/soc/sof/ops.c | 2 +-
+ sound/soc/sof/ops.h | 2 +-
+ sound/soc/sof/pcm.c | 18 +-
+ sound/soc/sof/pm.c | 29 +-
+ sound/soc/sof/probe.c | 2 +-
+ sound/soc/sof/probe.h | 2 +-
+ sound/soc/sof/sof-acpi-dev.c | 2 +-
+ sound/soc/sof/sof-audio.c | 2 +-
+ sound/soc/sof/sof-audio.h | 4 +-
+ sound/soc/sof/sof-of-dev.c | 16 +-
+ sound/soc/sof/sof-pci-dev.c | 4 +-
+ sound/soc/sof/sof-priv.h | 7 +-
+ sound/soc/sof/topology.c | 485 +++--
+ sound/soc/sof/trace.c | 2 +-
+ sound/soc/sof/utils.c | 2 +-
+ sound/soc/sof/xtensa/Makefile | 2 +-
+ sound/soc/sof/xtensa/core.c | 2 +-
+ sound/soc/sprd/sprd-pcm-compress.c | 49 +-
+ sound/soc/sprd/sprd-pcm-dma.c | 2 +-
+ sound/soc/sprd/sprd-pcm-dma.h | 2 +-
+ sound/soc/tegra/tegra_alc5632.c | 7 +-
+ sound/soc/tegra/tegra_asoc_utils.c | 113 +-
+ sound/soc/tegra/tegra_asoc_utils.h | 1 -
+ sound/soc/tegra/tegra_max98090.c | 22 +-
+ sound/soc/tegra/tegra_rt5640.c | 22 +-
+ sound/soc/tegra/tegra_rt5677.c | 7 +-
+ sound/soc/tegra/tegra_sgtl5000.c | 7 +-
+ sound/soc/tegra/tegra_wm8753.c | 22 +-
+ sound/soc/tegra/tegra_wm8903.c | 42 +-
+ sound/soc/tegra/tegra_wm9712.c | 8 +-
+ sound/soc/tegra/trimslice.c | 18 +-
+ sound/soc/ti/davinci-mcasp.c | 6 +-
+ sound/soc/ti/omap-dmic.c | 4 +-
+ sound/soc/ti/omap-mcbsp.c | 21 +-
+ sound/soc/ti/omap-mcpdm.c | 8 +-
+ sound/soc/uniphier/aio-compress.c | 45 +-
+ sound/soc/uniphier/aio-cpu.c | 4 +-
+ sound/soc/uniphier/aio-dma.c | 2 +-
+ sound/soc/uniphier/aio.h | 2 +-
+ sound/soc/ux500/mop500.c | 11 +-
+ sound/usb/card.h | 5 +
+ sound/usb/endpoint.c | 244 ++-
+ sound/usb/endpoint.h | 1 +
+ sound/usb/line6/driver.c | 20 +
+ sound/usb/line6/driver.h | 1 +
+ sound/usb/mixer_quirks.c | 418 ++++
+ sound/usb/pcm.c | 11 +
+ sound/usb/proc.c | 53 +
+ sound/usb/quirks-table.h | 154 +-
+ sound/usb/quirks.c | 41 +-
+ sound/usb/usx2y/usbusx2y.h | 2 +-
+ 386 files changed, 17122 insertions(+), 4983 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/fsl,easrc.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/rt1016.txt
+ mode change 100755 => 100644 Documentation/devicetree/bindings/sound/rt1308.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/simple-card.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/zl38060.yaml
+ create mode 100644 include/sound/soc-card.h
+ create mode 100644 include/sound/soc-link.h
+ create mode 100644 include/sound/sof/ext_manifest.h
+ create mode 100644 sound/soc/amd/renoir/Makefile
+ create mode 100644 sound/soc/amd/renoir/acp3x-pdm-dma.c
+ create mode 100644 sound/soc/amd/renoir/acp3x-rn.c
+ create mode 100644 sound/soc/amd/renoir/rn-pci-acp3x.c
+ create mode 100644 sound/soc/amd/renoir/rn_acp3x.h
+ create mode 100644 sound/soc/amd/renoir/rn_chip_offset_byte.h
+ create mode 100644 sound/soc/codecs/max98390.c
+ create mode 100644 sound/soc/codecs/max98390.h
+ create mode 100644 sound/soc/codecs/rt1016.c
+ create mode 100644 sound/soc/codecs/rt1016.h
+ create mode 100644 sound/soc/codecs/rt5682-i2c.c
+ delete mode 100644 sound/soc/codecs/rt5682-sdw.h
+ create mode 100644 sound/soc/codecs/zl38060.c
+ create mode 100644 sound/soc/fsl/fsl_asrc_common.h
+ create mode 100644 sound/soc/fsl/fsl_easrc.c
+ create mode 100644 sound/soc/fsl/fsl_easrc.h
+ create mode 100644 sound/soc/intel/boards/ehl_rt5660.c
+ create mode 100644 sound/soc/intel/boards/sof_wm8804.c
+ create mode 100644 sound/soc/soc-card.c
+ create mode 100644 sound/soc/soc-link.c
+ create mode 100644 sound/soc/sof/imx/imx8m.c
+Merging sound-asoc-fixes/for-linus (358c7c61fd04 Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Already up to date.
+Merging regmap-fixes/for-linus (323ca2daef47 Merge remote-tracking branch 'regmap/for-5.8' into regmap-linus)
+$ git merge regmap-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regmap.c | 100 ++++++++++++++++++++-----------------------
+ 1 file changed, 46 insertions(+), 54 deletions(-)
+Merging regulator-fixes/for-linus (5fb565b69dab Merge remote-tracking branch 'regulator/for-5.8' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Already up to date.
+Merging spi-fixes/for-linus (0c0c5b8fabe5 Merge remote-tracking branch 'spi/for-5.7' into spi-linus)
+$ git merge spi-fixes/for-linus
+Already up to date.
+Merging pci-current/for-linus (ef46738cc47a MAINTAINERS: Add Rob Herring and remove Andy Murray as PCI reviewers)
+$ git merge pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (9cb1fd0efd19 Linux 5.7-rc7)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (9cb1fd0efd19 Linux 5.7-rc7)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (b9bbe6ed63b2 Linux 5.7-rc6)
+$ git merge usb.current/usb-linus
+Already up to date.
+Merging usb-gadget-fixes/fixes (172b14b48ca1 usb: cdns3: gadget: make a bunch of functions static)
+$ git merge usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (399ad9477c52 USB: serial: option: add Telit LE910C1-EUX compositions)
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/option.c | 4 ++++
+ drivers/usb/serial/qcserial.c | 1 +
+ 2 files changed, 5 insertions(+)
+Merging usb-chipidea-fixes/ci-for-usb-stable (b3f3736ac305 usb: chipidea: msm: Ensure proper controller reset using role switch API)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Merge made by the 'recursive' strategy.
+Merging phy/fixes (820eeb9de62f phy: qualcomm: usb-hs-28nm: Prepare clocks in init)
+$ git merge phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (9cb1fd0efd19 Linux 5.7-rc7)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging char-misc.current/char-misc-linus (9cb1fd0efd19 Linux 5.7-rc7)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (3d77e6a8804a Linux 5.7)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (642aa86eaf8f Input: synaptics - add a second working PNP_ID for Lenovo T470s)
+$ git merge input-current/for-linus
+Already up to date.
+Merging crypto-current/master (58ca0060ec4e crypto: hisilicon - fix driver compatibility issue with different versions of devices)
+$ git merge crypto-current/master
+Already up to date.
+Merging ide/master (63bef48fd6c9 Merge branch 'akpm' (patches from Andrew))
+$ git merge ide/master
+Already up to date.
+Merging vfio-fixes/for-linus (5cbf3264bc71 vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn())
+$ git merge vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (851c4df54dc1 selftests/lkdtm: Use grep -E instead of egrep)
+$ git merge kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
+$ git merge modules-fixes/modules-linus
+Already up to date.
+Merging slave-dma-fixes/fixes (3a5fd0dbd878 dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()')
+$ git merge slave-dma-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (f3a6a6c5e0f5 mtd:rawnand: brcmnand: Fix PM resume crash)
+$ git merge mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge v4l-dvb-fixes/fixes
+Already up to date.
+Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
+$ git merge reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (98ece19f2471 soc: ti: omap-prm: use atomic iopoll instead of sleeping one)
+$ git merge omap-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/soc/ti/omap_prm.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+Merging kvm-fixes/master (bf61dc10fa24 x86/kvm: Remove defunct KVM_DEBUG_FS Kconfig)
+$ git merge kvm-fixes/master
+Auto-merging arch/x86/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/x86/Kconfig | 8 -----
+ arch/x86/kernel/kvm.c | 1 -
+ arch/x86/kvm/mmu.h | 2 +-
+ arch/x86/kvm/mmu/mmu.c | 56 ++++++++++++------------------
+ arch/x86/kvm/svm/svm.c | 2 +-
+ arch/x86/kvm/vmx/vmx.c | 6 ++--
+ arch/x86/kvm/x86.c | 4 +++
+ tools/testing/selftests/kvm/.gitignore | 1 +
+ tools/testing/selftests/kvm/lib/kvm_util.c | 11 ++++--
+ 9 files changed, 42 insertions(+), 49 deletions(-)
+Merging kvms390-fixes/master (5615e74f48dc KVM: s390: Remove false WARN_ON_ONCE for the PQAP instruction)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (b9bbe6ed63b2 Linux 5.7-rc6)
+$ git merge hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (f84afbdd3a9e libnvdimm: Out of bounds read in __nd_ioctl())
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (4f28062adf92 Merge branch 'misc-5.7' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging vfs-fixes/fixes (9e4636545933 copy_xstate_to_kernel(): don't leave parts of destination uninitialized)
+$ git merge vfs-fixes/fixes
+Already up to date.
+Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU)
+$ git merge dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
+$ git merge i3c-fixes/master
+Already up to date.
+Merging drivers-x86-fixes/fixes (2ef96a5bb12b Linux 5.7-rc5)
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/pinctrl-fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge pinctrl-samsung-fixes/pinctrl-fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (4bc77b2d211e dt-bindings: phy: qcom-qusb2: Fix defaults)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (f2e6b75f6ee8 scsi: target: Put lun_ref at end of tmr processing)
+$ git merge scsi-fixes/fixes
+Already up to date.
+Merging drm-fixes/drm-fixes (ed9244bd0b26 Merge tag 'drm-misc-fixes-2020-05-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
+$ git merge amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (822d6bd1890d drm/i915: work around false-positive maybe-uninitialized warning)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 30 +++++++--
+ drivers/gpu/drm/i915/gt/selftest_workarounds.c | 2 +
+ drivers/gpu/drm/i915/i915_pmu.c | 84 +++++++++++++-------------
+ 3 files changed, 68 insertions(+), 48 deletions(-)
+Merging mmc-fixes/fixes (202500d21654 mmc: block: Fix use-after-free issue for rpmb)
+$ git merge mmc-fixes/fixes
+Already up to date.
+Merging rtc-fixes/rtc-fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (2ef96a5bb12b Linux 5.7-rc5)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (38dce4195f0d x86/hyperv: Properly suspend/resume reenlightenment notifications)
+$ git merge hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
+$ git merge soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (8356c379cfba RISC-V: gp_in_global needs register keyword)
+$ git merge risc-v-fixes/fixes
+Already up to date.
+Merging pidfd-fixes/fixes (3f2c788a1314 fork: prevent accidental access to clone3 features)
+$ git merge pidfd-fixes/fixes
+Already up to date.
+Merging fpga-fixes/fixes (9edd5112d963 fpga: zynqmp: fix modular build)
+$ git merge fpga-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/fpga/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging spdx/spdx-linus (3d77e6a8804a Linux 5.7)
+$ git merge spdx/spdx-linus
+Already up to date.
+Merging gpio-intel-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (69388e15f507 pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler)
+$ git merge pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2)
+$ git merge erofs-fixes/fixes
+Already up to date.
+Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
+$ git merge integrity-fixes/fixes
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (abf56fadf0e2 gpu/drm: Ingenic: Fix opaque pointer casted to wrong type)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Already up to date.
+Merging kspp-gustavo/for-next/kspp (27284084ced2 treewide: Replace zero-length array with flexible-array)
+$ git merge kspp-gustavo/for-next/kspp
+Auto-merging sound/soc/sof/probe.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/kvm_host.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/efi.h
+Auto-merging include/linux/dmaengine.h
+Auto-merging fs/binfmt_elf.c
+Auto-merging drivers/dma/ti/k3-udma.c
+Auto-merging drivers/dma/tegra20-apb-dma.c
+Merge made by the 'recursive' strategy.
+ arch/ia64/kernel/unwind_i.h | 2 +-
+ arch/um/drivers/vector_kern.h | 2 +-
+ arch/um/drivers/vhost_user.h | 2 +-
+ arch/x86/kvm/vmx/vmcs.h | 2 +-
+ block/partitions/ldm.h | 2 +-
+ drivers/amba/tegra-ahb.c | 2 +-
+ drivers/block/drbd/drbd_int.h | 2 +-
+ drivers/block/drbd/drbd_protocol.h | 8 ++---
+ drivers/block/rbd_types.h | 2 +-
+ drivers/crypto/chelsio/chcr_crypto.h | 8 ++---
+ drivers/dma/milbeaut-hdmac.c | 2 +-
+ drivers/dma/milbeaut-xdmac.c | 2 +-
+ drivers/dma/moxart-dma.c | 2 +-
+ drivers/dma/tegra20-apb-dma.c | 2 +-
+ drivers/dma/ti/edma.c | 2 +-
+ drivers/dma/ti/k3-udma.c | 2 +-
+ drivers/dma/timb_dma.c | 2 +-
+ drivers/firewire/core-cdev.c | 2 +-
+ drivers/firewire/core-transaction.c | 2 +-
+ drivers/firewire/core.h | 2 +-
+ drivers/firewire/nosy.c | 2 +-
+ drivers/firewire/ohci.c | 2 +-
+ drivers/firmware/dmi-sysfs.c | 2 +-
+ drivers/firmware/google/memconsole-coreboot.c | 2 +-
+ drivers/firmware/google/vpd.c | 2 +-
+ drivers/firmware/iscsi_ibft.c | 2 +-
+ drivers/firmware/pcdp.h | 2 +-
+ drivers/fpga/dfl.h | 2 +-
+ drivers/hwtracing/stm/policy.c | 2 +-
+ drivers/hwtracing/stm/stm.h | 4 +--
+ drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +-
+ drivers/media/platform/qcom/venus/hfi_msgs.h | 10 +++---
+ drivers/media/usb/pwc/pwc.h | 2 +-
+ drivers/net/can/peak_canfd/peak_pciefd_main.c | 4 +--
+ drivers/net/wireless/ath/carl9170/fwcmd.h | 2 +-
+ drivers/net/wireless/ath/carl9170/hw.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 12 ++++----
+ .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 4 +--
+ drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 +-
+ drivers/oprofile/cpu_buffer.h | 2 +-
+ drivers/phy/samsung/phy-samsung-usb2.h | 2 +-
+ drivers/rapidio/rio-scan.c | 2 +-
+ drivers/soc/ti/knav_qmss.h | 2 +-
+ drivers/thermal/imx8mm_thermal.c | 2 +-
+ drivers/w1/w1_netlink.h | 4 +--
+ fs/aio.c | 2 +-
+ fs/binfmt_elf.c | 2 +-
+ fs/hfs/btree.h | 2 +-
+ fs/hfsplus/hfsplus_fs.h | 2 +-
+ fs/isofs/rock.h | 8 ++---
+ fs/jffs2/nodelist.h | 2 +-
+ fs/jffs2/summary.h | 4 +--
+ fs/jfs/jfs_dtree.c | 2 +-
+ fs/jfs/jfs_xattr.h | 4 +--
+ fs/notify/fanotify/fanotify.h | 2 +-
+ fs/select.c | 4 +--
+ fs/squashfs/squashfs_fs.h | 16 +++++-----
+ include/drm/drm_displayid.h | 2 +-
+ include/keys/encrypted-type.h | 2 +-
+ include/keys/rxrpc-type.h | 4 +--
+ include/linux/can/skb.h | 2 +-
+ include/linux/cb710.h | 2 +-
+ include/linux/ceph/mon_client.h | 2 +-
+ include/linux/crush/crush.h | 2 +-
+ include/linux/dma/ti-cppi5.h | 4 +--
+ include/linux/dmaengine.h | 4 +--
+ include/linux/efi.h | 2 +-
+ include/linux/fs.h | 2 +-
+ include/linux/fscache-cache.h | 2 +-
+ include/linux/kexec.h | 2 +-
+ include/linux/kprobes.h | 2 +-
+ include/linux/kvm_host.h | 2 +-
+ include/linux/libata.h | 2 +-
+ include/linux/mailbox/zynqmp-ipi-message.h | 2 +-
+ include/linux/mm.h | 2 +-
+ include/linux/mtd/cfi.h | 6 ++--
+ include/linux/mtd/qinfo.h | 2 +-
+ include/linux/platform_data/cros_ec_commands.h | 4 +--
+ include/linux/platform_data/cros_ec_proto.h | 2 +-
+ include/linux/sctp.h | 36 +++++++++++-----------
+ include/linux/tifm.h | 2 +-
+ include/rdma/rdmavt_qp.h | 2 +-
+ kernel/params.c | 2 +-
+ kernel/trace/trace_probe.h | 2 +-
+ kernel/tracepoint.c | 2 +-
+ mm/slab.h | 2 +-
+ samples/mei/mei-amt-version.c | 2 +-
+ security/integrity/ima/ima.h | 2 +-
+ security/integrity/integrity.h | 4 +--
+ sound/soc/sof/probe.h | 8 ++---
+ tools/testing/nvdimm/test/nfit_test.h | 6 ++--
+ 93 files changed, 154 insertions(+), 154 deletions(-)
+Merging kbuild/for-next (18fed02fb59c Merge branch 'kconfig' into for-next)
+$ git merge kbuild/for-next
+Removing scripts/kconfig/tests/rand_nested_choice/expected_stdout2
+Removing scripts/kconfig/tests/rand_nested_choice/expected_stdout1
+Removing scripts/kconfig/tests/rand_nested_choice/expected_stdout0
+Removing scripts/kconfig/tests/rand_nested_choice/__init__.py
+Removing scripts/kconfig/tests/rand_nested_choice/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging init/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ .gitignore | 1 +
+ Documentation/admin-guide/README.rst | 11 +-
+ Documentation/kbuild/makefiles.rst | 183 ++++++++---
+ Documentation/kbuild/modules.rst | 12 -
+ Kconfig | 2 -
+ Makefile | 104 +++---
+ arch/arm/Makefile | 2 -
+ arch/arm64/Makefile | 2 -
+ arch/h8300/boot/compressed/Makefile | 2 +-
+ arch/hexagon/Makefile | 2 +-
+ arch/um/Makefile | 2 +-
+ arch/um/drivers/Makefile | 4 +-
+ arch/unicore32/lib/Makefile | 4 +-
+ include/linux/kconfig.h | 2 +
+ init/Kconfig | 30 +-
+ init/Makefile | 2 +-
+ lib/Kconfig.debug | 17 +
+ net/bpfilter/Kconfig | 6 +-
+ net/bpfilter/Makefile | 11 +-
+ samples/Kconfig | 26 +-
+ samples/Makefile | 5 +-
+ samples/auxdisplay/Makefile | 11 +-
+ samples/connector/Makefile | 12 +-
+ samples/hidraw/Makefile | 9 +-
+ samples/mei/Makefile | 9 +-
+ samples/pidfd/Makefile | 8 +-
+ samples/seccomp/Makefile | 42 +--
+ samples/timers/Makefile | 17 +-
+ samples/uhid/.gitignore | 2 +
+ samples/uhid/Makefile | 9 +-
+ samples/uhid/uhid-example.c | 4 +-
+ samples/vfs/Makefile | 11 +-
+ samples/watchdog/Makefile | 10 +-
+ scripts/Kbuild.include | 2 +-
+ scripts/Makefile.build | 35 +-
+ scripts/Makefile.clean | 2 +-
+ scripts/Makefile.host | 4 +-
+ scripts/Makefile.lib | 33 +-
+ scripts/Makefile.modpost | 29 +-
+ scripts/Makefile.userprogs | 45 +++
+ scripts/basic/fixdep.c | 2 +-
+ scripts/checkstack.pl | 87 +++--
+ scripts/gcc-plugins/Makefile | 2 +-
+ scripts/headers_install.sh | 11 +-
+ scripts/kconfig/Makefile | 11 +-
+ scripts/kconfig/menu.c | 3 +-
+ scripts/kconfig/parser.y | 30 +-
+ scripts/kconfig/streamline_config.pl | 21 ++
+ scripts/kconfig/symbol.c | 2 +-
+ scripts/kconfig/tests/rand_nested_choice/Kconfig | 35 --
+ .../kconfig/tests/rand_nested_choice/__init__.py | 17 -
+ .../tests/rand_nested_choice/expected_stdout0 | 2 -
+ .../tests/rand_nested_choice/expected_stdout1 | 4 -
+ .../tests/rand_nested_choice/expected_stdout2 | 5 -
+ scripts/link-vmlinux.sh | 2 -
+ scripts/mkcompile_h | 3 +-
+ scripts/mod/modpost.c | 360 ++++++++++-----------
+ scripts/mod/modpost.h | 19 +-
+ scripts/mod/sumversion.c | 114 ++-----
+ scripts/modules-check.sh | 16 +-
+ usr/include/Makefile | 6 +-
+ 61 files changed, 762 insertions(+), 714 deletions(-)
+ create mode 100644 samples/uhid/.gitignore
+ create mode 100644 scripts/Makefile.userprogs
+ delete mode 100644 scripts/kconfig/tests/rand_nested_choice/Kconfig
+ delete mode 100644 scripts/kconfig/tests/rand_nested_choice/__init__.py
+ delete mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout0
+ delete mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout1
+ delete mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout2
+Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4)
+$ git merge compiler-attributes/compiler-attributes
+Already up to date.
+Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge leaks/leaks-next
+Already up to date.
+Merging dma-mapping/for-next (94d1aed9f477 Merge branch 'dma-sg_table-helper' into dma-mapping-for-next)
+$ git merge dma-mapping/for-next
+Auto-merging arch/x86/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/x86/Kconfig | 1 +
+ drivers/iommu/dma-iommu.c | 5 +-
+ include/linux/dma-direct.h | 2 +
+ include/linux/dma-mapping.h | 86 ++++++++++++++-
+ include/linux/iommu.h | 16 +++
+ include/linux/scatterlist.h | 50 ++++++++-
+ kernel/dma/Kconfig | 6 +-
+ kernel/dma/Makefile | 1 +
+ kernel/dma/contiguous.c | 4 +-
+ kernel/dma/debug.c | 2 +-
+ kernel/dma/direct.c | 56 ++++++++--
+ kernel/dma/pool.c | 264 ++++++++++++++++++++++++++++++++++++++++++++
+ kernel/dma/remap.c | 121 +-------------------
+ 13 files changed, 470 insertions(+), 144 deletions(-)
+ create mode 100644 kernel/dma/pool.c
+Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates)
+$ git merge asm-generic/master
+Already up to date.
+Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (03c7f5f0b844 Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Removing arch/arm/boot/compressed/libfdt_env.h
+Auto-merging arch/arm/boot/compressed/head.S
+CONFLICT (content): Merge conflict in arch/arm/boot/compressed/head.S
+Auto-merging arch/arm/Kconfig
+Resolved 'arch/arm/boot/compressed/head.S' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c24c51f17e10] Merge remote-tracking branch 'arm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 13 +++-
+ arch/arm/boot/compressed/.gitignore | 9 ---
+ arch/arm/boot/compressed/Makefile | 38 ++++------
+ arch/arm/boot/compressed/atags_to_fdt.c | 1 +
+ arch/arm/boot/compressed/fdt.c | 2 +
+ arch/arm/boot/compressed/fdt_ro.c | 2 +
+ arch/arm/boot/compressed/fdt_rw.c | 2 +
+ arch/arm/boot/compressed/fdt_wip.c | 2 +
+ arch/arm/boot/compressed/head.S | 80 +++++++++-------------
+ arch/arm/boot/compressed/libfdt_env.h | 24 -------
+ arch/arm/boot/compressed/vmlinux.lds.S | 5 ++
+ arch/arm/include/asm/assembler.h | 3 +-
+ arch/arm/kernel/module.c | 22 +++++-
+ arch/arm/kernel/sys_oabi-compat.c | 15 ++--
+ arch/arm/mm/proc-macros.S | 3 +-
+ drivers/firmware/efi/libstub/arm32-stub.c | 45 ++----------
+ drivers/gpu/drm/armada/armada_drv.c | 2 +-
+ .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +-
+ drivers/media/cec/cec-notifier.c | 2 +-
+ drivers/net/phy/swphy.c | 2 +-
+ include/linux/moduleloader.h | 5 ++
+ include/media/cec-notifier.h | 2 +-
+ kernel/module.c | 9 ++-
+ 24 files changed, 122 insertions(+), 170 deletions(-)
+ create mode 100644 arch/arm/boot/compressed/fdt.c
+ create mode 100644 arch/arm/boot/compressed/fdt_ro.c
+ create mode 100644 arch/arm/boot/compressed/fdt_rw.c
+ create mode 100644 arch/arm/boot/compressed/fdt_wip.c
+ delete mode 100644 arch/arm/boot/compressed/libfdt_env.h
+Merging arm64/for-next/core (082af5ec5080 Merge branch 'for-next/scs' into for-next/core)
+$ git merge arm64/for-next/core
+Auto-merging tools/testing/selftests/wireguard/qemu/debug.config
+Auto-merging mm/page_alloc.c
+Auto-merging lib/Kconfig
+Auto-merging kernel/fork.c
+Auto-merging include/linux/mm.h
+Auto-merging fs/binfmt_elf.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/arm64/kvm/hyp/sysreg-sr.c
+Auto-merging arch/arm64/kernel/vdso/Makefile
+Auto-merging arch/arm64/kernel/smp.c
+Auto-merging arch/arm64/kernel/ptrace.c
+Auto-merging arch/arm64/Makefile
+Auto-merging arch/arm64/Kconfig
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 +
+ Documentation/arm64/booting.rst | 3 +-
+ Documentation/arm64/cpu-feature-registers.rst | 2 +
+ Documentation/arm64/elf_hwcaps.rst | 5 +
+ Documentation/arm64/silicon-errata.rst | 8 +-
+ Documentation/filesystems/proc.rst | 1 +
+ MAINTAINERS | 9 +
+ Makefile | 6 +
+ arch/Kconfig | 25 ++
+ arch/arm64/Kconfig | 162 +++++---
+ arch/arm64/Makefile | 16 +-
+ arch/arm64/include/asm/asm_pointer_auth.h | 43 +-
+ arch/arm64/include/asm/assembler.h | 50 +++
+ arch/arm64/include/asm/cacheflush.h | 6 +-
+ arch/arm64/include/asm/compiler.h | 4 -
+ arch/arm64/include/asm/cpu.h | 4 +
+ arch/arm64/include/asm/cpucaps.h | 17 +-
+ arch/arm64/include/asm/cpufeature.h | 30 ++
+ arch/arm64/include/asm/debug-monitors.h | 2 +
+ arch/arm64/include/asm/elf.h | 50 +++
+ arch/arm64/include/asm/esr.h | 2 +-
+ arch/arm64/include/asm/exception.h | 1 +
+ arch/arm64/include/asm/hwcap.h | 1 +
+ arch/arm64/include/asm/insn.h | 30 +-
+ arch/arm64/include/asm/kvm_emulate.h | 6 +-
+ arch/arm64/include/asm/kvm_host.h | 6 +-
+ arch/arm64/include/asm/kvm_hyp.h | 20 +-
+ arch/arm64/include/asm/kvm_mmu.h | 19 +-
+ arch/arm64/include/asm/linkage.h | 46 +++
+ arch/arm64/include/asm/mman.h | 37 ++
+ arch/arm64/include/asm/pgtable-hwdef.h | 2 +-
+ arch/arm64/include/asm/pgtable-prot.h | 11 +
+ arch/arm64/include/asm/pgtable.h | 9 +-
+ arch/arm64/include/asm/ptrace.h | 1 +
+ arch/arm64/include/asm/scs.h | 29 ++
+ arch/arm64/include/asm/smp.h | 11 -
+ arch/arm64/include/asm/stacktrace.h | 40 +-
+ arch/arm64/include/asm/suspend.h | 2 +-
+ arch/arm64/include/asm/sysreg.h | 77 +++-
+ arch/arm64/include/asm/thread_info.h | 13 +
+ arch/arm64/include/uapi/asm/hwcap.h | 1 +
+ arch/arm64/include/uapi/asm/mman.h | 9 +
+ arch/arm64/include/uapi/asm/ptrace.h | 9 +
+ arch/arm64/kernel/Makefile | 1 +
+ arch/arm64/kernel/asm-offsets.c | 7 +-
+ arch/arm64/kernel/cpu-reset.S | 4 +-
+ arch/arm64/kernel/cpu_errata.c | 29 +-
+ arch/arm64/kernel/cpufeature.c | 455 +++++++++++++++++----
+ arch/arm64/kernel/cpuinfo.c | 9 +-
+ arch/arm64/kernel/crash_core.c | 4 +
+ arch/arm64/kernel/debug-monitors.c | 4 +-
+ arch/arm64/kernel/efi-entry.S | 2 +-
+ arch/arm64/kernel/efi-header.S | 2 +-
+ arch/arm64/kernel/efi-rt-wrapper.S | 15 +-
+ arch/arm64/kernel/entry-common.c | 13 +-
+ arch/arm64/kernel/entry-fpsimd.S | 20 +-
+ arch/arm64/kernel/entry-ftrace.S | 5 +-
+ arch/arm64/kernel/entry.S | 69 +++-
+ arch/arm64/kernel/head.S | 49 ++-
+ arch/arm64/kernel/hibernate-asm.S | 16 +-
+ arch/arm64/kernel/hyp-stub.S | 20 +-
+ arch/arm64/kernel/image-vars.h | 2 +-
+ arch/arm64/kernel/insn.c | 46 ++-
+ arch/arm64/kernel/machine_kexec_file.c | 14 +-
+ arch/arm64/kernel/paravirt.c | 2 +-
+ arch/arm64/kernel/probes/decode-insn.c | 2 +-
+ arch/arm64/kernel/probes/kprobes_trampoline.S | 4 +-
+ arch/arm64/kernel/process.c | 41 +-
+ arch/arm64/kernel/ptrace.c | 2 +-
+ arch/arm64/kernel/reloc_test_syms.S | 44 +-
+ arch/arm64/kernel/relocate_kernel.S | 4 +-
+ arch/arm64/kernel/scs.c | 16 +
+ arch/arm64/kernel/sdei.c | 28 +-
+ arch/arm64/kernel/signal.c | 16 +
+ arch/arm64/kernel/sleep.S | 13 +-
+ arch/arm64/kernel/smccc-call.S | 8 +-
+ arch/arm64/kernel/smp.c | 10 +-
+ arch/arm64/kernel/syscall.c | 18 +
+ arch/arm64/kernel/traps.c | 133 +++---
+ arch/arm64/kernel/vdso.c | 155 ++++---
+ arch/arm64/kernel/vdso/Makefile | 12 +-
+ arch/arm64/kernel/vdso/note.S | 3 +
+ arch/arm64/kernel/vdso/sigreturn.S | 54 ++-
+ arch/arm64/kernel/vdso/vdso.S | 3 +
+ arch/arm64/kernel/vdso32/sigreturn.S | 19 +-
+ arch/arm64/kernel/vmlinux.lds.S | 18 +-
+ arch/arm64/kvm/hyp/switch.c | 6 +-
+ arch/arm64/kvm/hyp/sysreg-sr.c | 6 +-
+ arch/arm64/kvm/hyp/tlb.c | 11 +-
+ arch/arm64/kvm/reset.c | 65 ++-
+ arch/arm64/kvm/sys_regs.c | 6 +-
+ arch/arm64/lib/copy_from_user.S | 32 +-
+ arch/arm64/lib/copy_in_user.S | 32 +-
+ arch/arm64/lib/copy_to_user.S | 32 +-
+ arch/arm64/lib/crc32.S | 2 +-
+ arch/arm64/lib/memcpy.S | 32 +-
+ arch/arm64/mm/context.c | 8 +-
+ arch/arm64/mm/dump.c | 5 +
+ arch/arm64/mm/init.c | 2 +-
+ arch/arm64/mm/mmu.c | 24 ++
+ arch/arm64/mm/pageattr.c | 4 +-
+ arch/arm64/mm/proc.S | 60 +--
+ arch/arm64/net/bpf_jit.h | 30 ++
+ arch/arm64/net/bpf_jit_comp.c | 85 +++-
+ arch/x86/Kconfig | 1 +
+ arch/x86/Kconfig.debug | 9 -
+ arch/x86/entry/entry_32.S | 2 -
+ arch/x86/include/asm/doublefault.h | 2 +-
+ arch/x86/include/asm/traps.h | 2 -
+ arch/x86/kernel/Makefile | 4 +-
+ arch/x86/kernel/dumpstack_32.c | 4 -
+ arch/x86/kernel/traps.c | 2 -
+ arch/x86/mm/cpu_entry_area.c | 4 +-
+ drivers/acpi/arm64/gtdt.c | 4 +-
+ drivers/acpi/arm64/iort.c | 126 +++---
+ drivers/base/node.c | 6 +
+ drivers/firmware/Kconfig | 6 +-
+ drivers/firmware/Makefile | 3 +-
+ drivers/firmware/arm_sdei.c | 49 +--
+ drivers/firmware/efi/libstub/Makefile | 3 +
+ drivers/firmware/psci/psci.c | 21 +-
+ drivers/firmware/smccc/Kconfig | 16 +
+ drivers/firmware/smccc/Makefile | 3 +
+ drivers/firmware/smccc/smccc.c | 31 ++
+ drivers/perf/Kconfig | 9 +-
+ drivers/perf/arm_dsu_pmu.c | 4 +-
+ drivers/perf/arm_smmuv3_pmu.c | 5 +-
+ drivers/perf/arm_spe_pmu.c | 4 +-
+ drivers/perf/hisilicon/Kconfig | 7 +
+ drivers/perf/hisilicon/Makefile | 3 +-
+ drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 10 +-
+ drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 12 +-
+ drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 10 +-
+ drivers/perf/hisilicon/hisi_uncore_pmu.c | 23 +-
+ fs/Kconfig.binfmt | 6 +
+ fs/binfmt_elf.c | 145 ++++++-
+ fs/compat_binfmt_elf.c | 4 +
+ fs/proc/meminfo.c | 4 +
+ fs/proc/task_mmu.c | 3 +
+ include/linux/arm-smccc.h | 25 +-
+ include/linux/compiler-clang.h | 4 +
+ include/linux/compiler_types.h | 4 +
+ include/linux/elf.h | 43 ++
+ include/linux/linkage.h | 8 +-
+ include/linux/mm.h | 3 +
+ include/linux/mmzone.h | 3 +
+ include/linux/psci.h | 7 -
+ include/linux/scs.h | 72 ++++
+ include/uapi/linux/elf.h | 11 +
+ init/init_task.c | 8 +
+ kernel/Makefile | 1 +
+ kernel/fork.c | 9 +
+ kernel/sched/core.c | 5 +
+ kernel/scs.c | 104 +++++
+ lib/Kconfig | 3 +
+ mm/page_alloc.c | 6 +
+ mm/vmstat.c | 3 +
+ .../testing/selftests/wireguard/qemu/debug.config | 1 -
+ virt/kvm/arm/arm.c | 4 +-
+ 159 files changed, 2559 insertions(+), 976 deletions(-)
+ create mode 100644 arch/arm64/include/asm/mman.h
+ create mode 100644 arch/arm64/include/asm/scs.h
+ create mode 100644 arch/arm64/include/uapi/asm/mman.h
+ create mode 100644 arch/arm64/kernel/scs.c
+ create mode 100644 drivers/firmware/smccc/Kconfig
+ create mode 100644 drivers/firmware/smccc/Makefile
+ create mode 100644 drivers/firmware/smccc/smccc.c
+ create mode 100644 drivers/perf/hisilicon/Kconfig
+ create mode 100644 include/linux/scs.h
+ create mode 100644 kernel/scs.c
+Merging arm-perf/for-next/perf (10f6cd2af21b pmu/smmuv3: Clear IRQ affinity hint on device removal)
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (71cf8963c33b Merge branch 'arm/soc' into for-next)
+$ git merge arm-soc/for-next
+Removing include/linux/platform_data/clk-integrator.h
+Removing include/linux/firmware/imx/types.h
+Removing drivers/misc/vexpress-syscfg.c
+Auto-merging drivers/mfd/Kconfig
+Removing arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
+Removing arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
+Removing arch/arm/plat-versatile/sched-clock.c
+Removing arch/arm/plat-versatile/include/plat/sched_clock.h
+Removing arch/arm/plat-versatile/Kconfig
+Removing arch/arm/mach-pxa/include/mach/io.h
+Removing arch/arm/mach-pxa/em-x270.c
+Removing arch/arm/mach-pxa/cm-x2xx.c
+Removing arch/arm/mach-pxa/cm-x2xx-pci.h
+Removing arch/arm/mach-pxa/cm-x2xx-pci.c
+Removing arch/arm/mach-pxa/cm-x270.c
+Removing arch/arm/mach-pxa/cm-x255.c
+Removing arch/arm/mach-integrator/lm.h
+Removing arch/arm/mach-integrator/lm.c
+Removing arch/arm/mach-integrator/impd1.h
+Removing arch/arm/mach-integrator/impd1.c
+Removing arch/arm/configs/em_x270_defconfig
+Removing arch/arm/configs/cm_x2xx_defconfig
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 4 +
+ Documentation/devicetree/bindings/arm/arm,scmi.txt | 3 +-
+ .../devicetree/bindings/arm/atmel-at91.yaml | 7 +
+ Documentation/devicetree/bindings/arm/cpus.yaml | 1 +
+ Documentation/devicetree/bindings/arm/fsl.yaml | 4 +
+ .../devicetree/bindings/arm/mediatek.yaml | 22 +
+ .../bindings/arm/mediatek/mediatek,mmsys.txt | 7 +-
+ Documentation/devicetree/bindings/arm/qcom.yaml | 7 +
+ Documentation/devicetree/bindings/arm/realtek.yaml | 21 +
+ Documentation/devicetree/bindings/arm/renesas.yaml | 10 +
+ .../devicetree/bindings/arm/rockchip.yaml | 5 +
+ .../bindings/arm/samsung/samsung-boards.yaml | 1 +
+ .../bindings/arm/socionext/uniphier.yaml | 1 +
+ .../devicetree/bindings/arm/stm32/stm32.yaml | 3 +
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 5 +
+ .../bindings/bus/arm,integrator-ap-lm.yaml | 83 ++
+ .../devicetree/bindings/bus/baikal,bt1-apb.yaml | 90 ++
+ .../devicetree/bindings/bus/baikal,bt1-axi.yaml | 107 ++
+ .../bindings/cpufreq/nvidia,tegra20-cpufreq.txt | 56 +
+ .../display/tegra/nvidia,tegra20-host1x.txt | 73 +-
+ .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 2 +
+ .../devicetree/bindings/i2c/i2c-mt65xx.txt | 1 +
+ .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 6 +
+ .../devicetree/bindings/iommu/arm,smmu.yaml | 1 +
+ .../memory-controllers/baikal,bt1-l2-ctl.yaml | 63 +
+ .../memory-controllers/nvidia,tegra210-emc.yaml | 82 ++
+ .../bindings/power/amlogic,meson-ee-pwrc.yaml | 102 +-
+ .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 +
+ .../bindings/power/renesas,rcar-sysc.yaml | 1 +
+ .../devicetree/bindings/reset/fsl,imx7-src.txt | 6 +-
+ .../devicetree/bindings/reset/renesas,rst.yaml | 1 +
+ .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 1 +
+ .../devicetree/bindings/soc/qcom/qcom,apr.txt | 20 +-
+ .../devicetree/bindings/soc/ti/k3-socinfo.yaml | 40 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 8 +
+ MAINTAINERS | 23 +-
+ arch/arm/Kconfig | 4 +-
+ arch/arm/Kconfig.debug | 10 +
+ arch/arm/Makefile | 3 +
+ arch/arm/arm-soc-for-next-contents.txt | 252 ++++
+ arch/arm/boot/dts/Makefile | 19 +-
+ arch/arm/boot/dts/am335x-guardian.dts | 1 +
+ arch/arm/boot/dts/am33xx-l4.dtsi | 6 +-
+ arch/arm/boot/dts/am33xx.dtsi | 20 +
+ arch/arm/boot/dts/am3517-evm.dts | 1 +
+ arch/arm/boot/dts/am3517.dtsi | 24 +-
+ arch/arm/boot/dts/am4372.dtsi | 20 +
+ arch/arm/boot/dts/am437x-l4.dtsi | 7 +-
+ arch/arm/boot/dts/am571x-idk.dts | 48 +-
+ arch/arm/boot/dts/am5729-beagleboneai.dts | 731 +++++++++++
+ arch/arm/boot/dts/am572x-idk-common.dtsi | 63 +-
+ arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 63 +-
+ arch/arm/boot/dts/am57xx-idk-common.dtsi | 58 +
+ arch/arm/boot/dts/armada-370-xp.dtsi | 2 -
+ arch/arm/boot/dts/armada-375.dtsi | 2 -
+ arch/arm/boot/dts/armada-38x.dtsi | 2 -
+ arch/arm/boot/dts/armada-39x.dtsi | 4 -
+ arch/arm/boot/dts/aspeed-ast2600-evb.dts | 4 +
+ .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 78 +-
+ .../boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 231 ++++
+ arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 202 ++-
+ arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 310 ++++-
+ arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts | 326 +++++
+ arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 35 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 112 ++
+ arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 34 +
+ arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 37 +-
+ arch/arm/boot/dts/aspeed-g4.dtsi | 10 +
+ arch/arm/boot/dts/aspeed-g5.dtsi | 43 +-
+ arch/arm/boot/dts/aspeed-g6.dtsi | 64 +-
+ arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 2 +-
+ arch/arm/boot/dts/at91-kizbox3-hs.dts | 4 +-
+ arch/arm/boot/dts/at91-kizbox3_common.dtsi | 48 +-
+ arch/arm/boot/dts/at91-sam9x60ek.dts | 23 +
+ arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 54 +
+ arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 64 +-
+ arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 16 +-
+ arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 12 -
+ arch/arm/boot/dts/at91-sama5d2_icp.dts | 767 ++++++++++++
+ arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 25 +-
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 118 +-
+ arch/arm/boot/dts/at91-wb50n.dtsi | 4 -
+ arch/arm/boot/dts/at91rm9200.dtsi | 296 +----
+ arch/arm/boot/dts/at91sam9g45.dtsi | 338 +----
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 +-
+ arch/arm/boot/dts/at91sam9n12.dtsi | 324 +----
+ arch/arm/boot/dts/at91sam9n12ek.dts | 2 +-
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 13 +-
+ arch/arm/boot/dts/bcm2835-common.dtsi | 1 -
+ arch/arm/boot/dts/bcm2835-rpi-common.dtsi | 12 +
+ arch/arm/boot/dts/bcm2835.dtsi | 1 +
+ arch/arm/boot/dts/bcm2836.dtsi | 1 +
+ arch/arm/boot/dts/bcm2837.dtsi | 1 +
+ arch/arm/boot/dts/berlin2.dtsi | 6 +-
+ arch/arm/boot/dts/berlin2cd.dtsi | 2 +-
+ arch/arm/boot/dts/berlin2q.dtsi | 6 +-
+ arch/arm/boot/dts/dm814x.dtsi | 74 +-
+ arch/arm/boot/dts/dm816x.dtsi | 78 +-
+ arch/arm/boot/dts/dove.dtsi | 3 +-
+ arch/arm/boot/dts/dra7-evm-common.dtsi | 1 +
+ arch/arm/boot/dts/dra7-evm.dts | 54 +
+ arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi | 39 +
+ arch/arm/boot/dts/dra7-l4.dtsi | 57 +-
+ arch/arm/boot/dts/dra7.dtsi | 46 +
+ arch/arm/boot/dts/dra71-evm.dts | 42 +
+ arch/arm/boot/dts/dra72-evm-common.dtsi | 18 +-
+ arch/arm/boot/dts/dra72-evm-revc.dts | 42 +
+ arch/arm/boot/dts/dra72-evm.dts | 42 +
+ arch/arm/boot/dts/dra72x.dtsi | 6 +
+ arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi | 18 +
+ arch/arm/boot/dts/dra74x.dtsi | 21 +
+ arch/arm/boot/dts/dra76-evm.dts | 54 +
+ arch/arm/boot/dts/e60k02.dtsi | 2 +
+ arch/arm/boot/dts/exynos3250-monk.dts | 3 +-
+ arch/arm/boot/dts/exynos3250-rinato.dts | 48 +-
+ arch/arm/boot/dts/exynos4210-i9100.dts | 768 ++++++++++++
+ arch/arm/boot/dts/exynos4210-origen.dts | 7 +-
+ arch/arm/boot/dts/exynos4210-trats.dts | 41 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 33 +-
+ arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 6 +-
+ arch/arm/boot/dts/exynos4412-midas.dtsi | 17 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +-
+ arch/arm/boot/dts/exynos4412-origen.dts | 14 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 13 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +-
+ arch/arm/boot/dts/imx50.dtsi | 8 +-
+ arch/arm/boot/dts/imx51.dtsi | 3 +-
+ arch/arm/boot/dts/imx53-cx9020.dts | 25 +-
+ arch/arm/boot/dts/imx53.dtsi | 3 +-
+ arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts | 31 +
+ arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 115 +-
+ arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi | 44 +
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 11 +-
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 14 +
+ arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 31 +
+ arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 31 +
+ arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 35 +-
+ arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 11 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 13 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 13 +-
+ arch/arm/boot/dts/imx6sx.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ul.dtsi | 2 +-
+ arch/arm/boot/dts/imx7-tqma7.dtsi | 2 +-
+ arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 +
+ arch/arm/boot/dts/imx7d-colibri.dtsi | 4 +
+ arch/arm/boot/dts/imx7d-nitrogen7.dts | 4 +
+ arch/arm/boot/dts/imx7d-pinfunc.h | 2 +-
+ arch/arm/boot/dts/imx7d-sdb.dts | 4 +
+ arch/arm/boot/dts/imx7d-tqma7.dtsi | 4 +
+ arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +-
+ arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +-
+ arch/arm/boot/dts/imx7s.dtsi | 2 +-
+ arch/arm/boot/dts/integratorap-im-pd1.dts | 270 ++++
+ arch/arm/boot/dts/integratorap.dts | 53 +-
+ arch/arm/boot/dts/keystone-k2e.dtsi | 4 +-
+ arch/arm/boot/dts/keystone-k2g.dtsi | 4 +-
+ arch/arm/boot/dts/keystone-k2hk.dtsi | 4 +-
+ arch/arm/boot/dts/keystone-k2l.dtsi | 4 +-
+ arch/arm/boot/dts/kirkwood-l-50.dts | 438 +++++++
+ .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 14 +
+ arch/arm/boot/dts/kirkwood.dtsi | 2 +-
+ arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 1 +
+ arch/arm/boot/dts/ls1021a-twr.dts | 14 +
+ arch/arm/boot/dts/meson.dtsi | 3 +
+ arch/arm/boot/dts/meson8b-odroidc1.dts | 3 +-
+ arch/arm/boot/dts/meson8b.dtsi | 5 +-
+ arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 4 +-
+ arch/arm/boot/dts/meson8m2.dtsi | 13 +-
+ arch/arm/boot/dts/mmp2.dtsi | 2 +-
+ arch/arm/boot/dts/mmp3.dtsi | 26 +-
+ arch/arm/boot/dts/mt2701-evb.dts | 21 +
+ arch/arm/boot/dts/mt2701.dtsi | 33 +
+ arch/arm/boot/dts/mt7623.dtsi | 25 +
+ arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 1 +
+ arch/arm/boot/dts/omap2.dtsi | 31 +-
+ arch/arm/boot/dts/omap2420.dtsi | 68 +-
+ arch/arm/boot/dts/omap2430.dtsi | 68 +-
+ arch/arm/boot/dts/omap3-beagle.dts | 33 +
+ arch/arm/boot/dts/omap3-devkit8000.dts | 33 +
+ arch/arm/boot/dts/omap3-gta04.dtsi | 1 +
+ arch/arm/boot/dts/omap3.dtsi | 134 +-
+ arch/arm/boot/dts/omap4-l4.dtsi | 4 +-
+ arch/arm/boot/dts/omap4.dtsi | 10 +
+ arch/arm/boot/dts/omap5-l4.dtsi | 35 +-
+ arch/arm/boot/dts/omap5.dtsi | 96 ++
+ arch/arm/boot/dts/pxa168.dtsi | 8 +-
+ arch/arm/boot/dts/pxa3xx.dtsi | 2 +-
+ arch/arm/boot/dts/pxa910.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 1 +
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 6 +
+ arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 405 +++++-
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 11 +
+ arch/arm/boot/dts/r8a7740.dtsi | 2 +-
+ arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 37 +
+ arch/arm/boot/dts/r8a7742-iwg21m.dtsi | 53 +
+ arch/arm/boot/dts/r8a7742.dtsi | 648 ++++++++++
+ arch/arm/boot/dts/r8a7743.dtsi | 12 +-
+ arch/arm/boot/dts/r8a7744.dtsi | 12 +-
+ arch/arm/boot/dts/r8a7745.dtsi | 12 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 12 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 95 +-
+ arch/arm/boot/dts/r8a7793.dtsi | 14 +-
+ arch/arm/boot/dts/r8a7794.dtsi | 12 +-
+ arch/arm/boot/dts/rk3036-kylin.dts | 2 +-
+ arch/arm/boot/dts/rk3066a-mk808.dts | 2 +-
+ arch/arm/boot/dts/rk3188-radxarock.dts | 6 +-
+ arch/arm/boot/dts/rk3229-xms6.dts | 19 +-
+ arch/arm/boot/dts/rk322x.dtsi | 10 +
+ arch/arm/boot/dts/rk3288-firefly-reload.dts | 12 +-
+ arch/arm/boot/dts/rk3288-firefly.dtsi | 12 +-
+ arch/arm/boot/dts/rk3288-miqi.dts | 2 +-
+ arch/arm/boot/dts/rk3288-phycore-som.dtsi | 6 +-
+ arch/arm/boot/dts/rk3288-rock2-square.dts | 4 +-
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 6 +-
+ arch/arm/boot/dts/rk3288.dtsi | 1 -
+ arch/arm/boot/dts/rtd1195-horseradish.dts | 32 +
+ arch/arm/boot/dts/rtd1195-mele-x1000.dts | 32 +
+ arch/arm/boot/dts/rtd1195.dtsi | 217 ++++
+ arch/arm/boot/dts/s5pv210-aries.dtsi | 359 +++++-
+ arch/arm/boot/dts/s5pv210-fascinate4g.dts | 249 ++++
+ arch/arm/boot/dts/s5pv210-galaxys.dts | 292 +++++
+ arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 9 +-
+ arch/arm/boot/dts/s5pv210.dtsi | 23 +-
+ arch/arm/boot/dts/sama5d2.dtsi | 295 ++++-
+ arch/arm/boot/dts/sama5d3.dtsi | 430 +------
+ arch/arm/boot/dts/sama5d3_can.dtsi | 20 +-
+ arch/arm/boot/dts/sama5d3_emac.dtsi | 8 +-
+ arch/arm/boot/dts/sama5d3_gmac.dtsi | 11 +-
+ arch/arm/boot/dts/sama5d3_lcd.dtsi | 19 +-
+ arch/arm/boot/dts/sama5d3_mci2.dtsi | 11 +-
+ arch/arm/boot/dts/sama5d3_tcb1.dtsi | 12 +-
+ arch/arm/boot/dts/sama5d3_uart.dtsi | 20 +-
+ arch/arm/boot/dts/sama5d3xmb.dtsi | 6 +-
+ arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 6 +-
+ arch/arm/boot/dts/sama5d4.dtsi | 6 +-
+ arch/arm/boot/dts/sh73a0.dtsi | 2 +-
+ arch/arm/boot/dts/socfpga.dtsi | 16 +
+ arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 65 +
+ arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 39 +-
+ arch/arm/boot/dts/stih407-family.dtsi | 14 -
+ arch/arm/boot/dts/stih418.dtsi | 8 +-
+ arch/arm/boot/dts/stm32f429.dtsi | 4 +-
+ arch/arm/boot/dts/stm32h743.dtsi | 4 +-
+ arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 666 +++++++++-
+ arch/arm/boot/dts/stm32mp151.dtsi | 37 +-
+ arch/arm/boot/dts/stm32mp157.dtsi | 8 +-
+ arch/arm/boot/dts/stm32mp157a-avenger96.dts | 314 +----
+ arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts | 38 +
+ arch/arm/boot/dts/stm32mp157a-iot-box.dts | 68 ++
+ arch/arm/boot/dts/stm32mp157a-stinger96.dts | 12 +
+ arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 342 ++++++
+ arch/arm/boot/dts/stm32mp157c-dhcom-pdk2.dts | 265 +---
+ arch/arm/boot/dts/stm32mp157c-dk2.dts | 8 -
+ arch/arm/boot/dts/stm32mp157c-ed1.dts | 7 +-
+ arch/arm/boot/dts/stm32mp157c-ev1.dts | 14 +-
+ arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 252 ++++
+ arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 337 +++++
+ ...c-dhcom-som.dtsi => stm32mp15xx-dhcom-som.dtsi} | 9 +-
+ arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 401 ++++++
+ arch/arm/boot/dts/stm32mp15xx-dhcor-io1v8.dtsi | 23 +
+ arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 209 ++++
+ arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 20 +-
+ arch/arm/boot/dts/stm32mp15xx-osd32.dtsi | 230 ++++
+ .../arm/boot/dts/sun7i-a20-olinuxino-lime-emmc.dts | 32 +
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 10 +
+ .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 2 +-
+ arch/arm/boot/dts/sun8i-h3.dtsi | 24 +-
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 10 +
+ arch/arm/boot/dts/tegra114-dalmore.dts | 3 +-
+ arch/arm/boot/dts/tegra124-venice2.dts | 2 +-
+ arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 2 +-
+ arch/arm/boot/dts/tegra20-colibri-iris.dts | 2 +-
+ arch/arm/boot/dts/tegra20-harmony.dts | 2 +-
+ arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +-
+ arch/arm/boot/dts/tegra20-paz00.dts | 2 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts | 2 +-
+ arch/arm/boot/dts/tegra20-ventana.dts | 2 +-
+ arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +-
+ arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 2 +-
+ arch/arm/boot/dts/tegra30-beaver.dts | 40 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +-
+ arch/arm/boot/dts/uniphier-ld4.dtsi | 2 +
+ arch/arm/boot/dts/uniphier-ld6b-ref.dts | 1 +
+ arch/arm/boot/dts/uniphier-pro4-ace.dts | 1 +
+ arch/arm/boot/dts/uniphier-pro4-ref.dts | 1 +
+ arch/arm/boot/dts/uniphier-pro4-sanji.dts | 1 +
+ arch/arm/boot/dts/uniphier-pro4.dtsi | 10 +
+ arch/arm/boot/dts/uniphier-pro5.dtsi | 12 +
+ arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 1 +
+ arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 1 +
+ arch/arm/boot/dts/uniphier-pxs2.dtsi | 12 +
+ arch/arm/boot/dts/uniphier-sld8.dtsi | 2 +
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 328 ++---
+ arch/arm/configs/bcm2835_defconfig | 1 +
+ arch/arm/configs/cm_x2xx_defconfig | 173 ---
+ arch/arm/configs/em_x270_defconfig | 178 ---
+ arch/arm/configs/exynos_defconfig | 8 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 2 +
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/configs/pxa_defconfig | 2 -
+ arch/arm/configs/sama5_defconfig | 2 +
+ arch/arm/configs/shmobile_defconfig | 2 +
+ arch/arm/configs/sunxi_defconfig | 1 +
+ arch/arm/configs/u8500_defconfig | 14 +
+ arch/arm/kernel/time.c | 2 +-
+ arch/arm/mach-actions/Kconfig | 1 -
+ arch/arm/mach-alpine/Kconfig | 1 -
+ arch/arm/mach-asm9260/Kconfig | 1 -
+ arch/arm/mach-aspeed/Kconfig | 1 -
+ arch/arm/mach-berlin/Kconfig | 1 -
+ arch/arm/mach-clps711x/Kconfig | 5 -
+ arch/arm/mach-davinci/Kconfig | 1 -
+ arch/arm/mach-davinci/board-dm644x-evm.c | 26 +-
+ arch/arm/mach-imx/common.h | 1 -
+ arch/arm/mach-imx/cpu.c | 159 ---
+ arch/arm/mach-imx/mach-imx6q.c | 8 +-
+ arch/arm/mach-imx/mach-imx6sl.c | 8 +-
+ arch/arm/mach-imx/mach-imx6sx.c | 8 +-
+ arch/arm/mach-imx/mach-imx6ul.c | 8 +-
+ arch/arm/mach-imx/mach-imx7d.c | 6 -
+ arch/arm/mach-imx/mach-imx7ulp.c | 2 +-
+ arch/arm/mach-imx/mach-pcm037.c | 2 +-
+ arch/arm/mach-imx/mach-vf610.c | 47 +
+ arch/arm/mach-imx/mxc.h | 22 +-
+ arch/arm/mach-integrator/Kconfig | 9 +-
+ arch/arm/mach-integrator/Makefile | 3 +-
+ arch/arm/mach-integrator/impd1.c | 475 --------
+ arch/arm/mach-integrator/impd1.h | 15 -
+ arch/arm/mach-integrator/integrator_ap.c | 31 -
+ arch/arm/mach-integrator/lm.c | 96 --
+ arch/arm/mach-integrator/lm.h | 24 -
+ arch/arm/mach-mediatek/mediatek.c | 2 +-
+ arch/arm/mach-mmp/Kconfig | 1 -
+ arch/arm/mach-mmp/mmp-dt.c | 2 +-
+ arch/arm/mach-mmp/mmp2-dt.c | 2 +-
+ arch/arm/mach-mvebu/Kconfig | 3 -
+ arch/arm/mach-omap2/Kconfig | 1 -
+ arch/arm/mach-omap2/Makefile | 6 +-
+ arch/arm/mach-omap2/board-generic.c | 39 +-
+ arch/arm/mach-omap2/clockdomains44xx_data.c | 2 +-
+ arch/arm/mach-omap2/clockdomains54xx_data.c | 2 +-
+ arch/arm/mach-omap2/common.h | 7 +
+ arch/arm/mach-omap2/omap-smp.c | 2 +-
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 20 -
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 19 -
+ .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 8 -
+ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 47 -
+ .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 2 -
+ .../omap_hwmod_33xx_43xx_interconnect_data.c | 8 -
+ .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 62 -
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 10 -
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 146 +--
+ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 45 -
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 90 --
+ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 89 --
+ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 176 ---
+ arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 74 --
+ arch/arm/mach-omap2/omap_hwmod_common_data.h | 3 -
+ arch/arm/mach-omap2/pm33xx-core.c | 2 +-
+ arch/arm/mach-omap2/sleep34xx.S | 2 +-
+ arch/arm/mach-omap2/timer.c | 585 +--------
+ arch/arm/mach-prima2/Kconfig | 1 -
+ arch/arm/mach-pxa/Kconfig | 17 -
+ arch/arm/mach-pxa/Makefile | 5 -
+ arch/arm/mach-pxa/cm-x255.c | 240 ----
+ arch/arm/mach-pxa/cm-x270.c | 419 -------
+ arch/arm/mach-pxa/cm-x2xx-pci.c | 196 ---
+ arch/arm/mach-pxa/cm-x2xx-pci.h | 14 -
+ arch/arm/mach-pxa/cm-x2xx.c | 538 --------
+ arch/arm/mach-pxa/em-x270.c | 1286 --------------------
+ arch/arm/mach-pxa/include/mach/io.h | 18 -
+ arch/arm/mach-realtek/Kconfig | 11 +
+ arch/arm/mach-realtek/Makefile | 2 +
+ arch/arm/mach-realtek/rtd1195.c | 40 +
+ arch/arm/mach-realview/Kconfig | 10 -
+ arch/arm/mach-rockchip/platsmp.c | 2 +-
+ arch/arm/mach-rockchip/rockchip.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 7 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +
+ arch/arm/mach-socfpga/Kconfig | 1 -
+ arch/arm/mach-tegra/pm.c | 4 +
+ arch/arm/mach-tegra/reset-handler.S | 7 +-
+ arch/arm/mach-tegra/sleep-tegra30.S | 16 +-
+ arch/arm/mach-tegra/tegra.c | 8 +-
+ arch/arm/mach-versatile/Kconfig | 1 -
+ arch/arm/mach-versatile/versatile_dt.c | 5 -
+ arch/arm/mach-vexpress/Kconfig | 3 -
+ arch/arm/mach-vexpress/core.h | 1 +
+ arch/arm/mach-vexpress/dcscb.c | 1 +
+ arch/arm/mach-vexpress/v2m.c | 23 +
+ arch/arm/mm/cache-b15-rac.c | 3 +-
+ arch/arm/plat-samsung/adc.c | 8 +-
+ arch/arm/plat-versatile/Kconfig | 7 -
+ arch/arm/plat-versatile/Makefile | 1 -
+ arch/arm/plat-versatile/include/plat/sched_clock.h | 7 -
+ arch/arm/plat-versatile/sched-clock.c | 28 -
+ arch/arm64/Kconfig.platforms | 3 -
+ .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 9 +
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 12 +
+ .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 9 +-
+ .../boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi | 117 ++
+ .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 3 +
+ .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 65 +
+ .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 17 +-
+ .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 43 +-
+ .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 13 +
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 60 +
+ arch/arm64/boot/dts/amlogic/Makefile | 4 +
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 +-
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 11 +
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 32 +-
+ .../boot/dts/amlogic/meson-g12b-gtking-pro.dts | 125 ++
+ arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 145 +++
+ .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 18 +-
+ arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi | 15 +
+ .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 377 +-----
+ arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 423 +++++++
+ arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 22 +
+ .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 78 +-
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 98 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 23 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 2 +-
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 +-
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 +-
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +-
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +-
+ .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 4 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 6 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 23 +
+ .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 73 +-
+ .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 +-
+ .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 4 +
+ .../boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts | 80 ++
+ .../boot/dts/amlogic/meson-gxl-s905w-p281.dts | 4 +
+ .../boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts | 4 +
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 +
+ .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 77 +-
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 +-
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 +-
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 79 +-
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +-
+ .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 3 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 4 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts | 4 +
+ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 7 +-
+ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 4 +-
+ .../arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 402 ++++++
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 24 +
+ arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi | 4 +-
+ arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi | 11 +-
+ arch/arm64/boot/dts/arm/foundation-v8.dtsi | 142 +--
+ arch/arm64/boot/dts/arm/fvp-base-revc.dts | 10 +-
+ arch/arm64/boot/dts/arm/juno-base.dtsi | 82 +-
+ arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 166 +--
+ arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 2 +-
+ .../boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 4 +-
+ arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 152 +--
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 15 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 15 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 15 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 15 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 13 +
+ .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 4 +-
+ .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 5 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 6 +
+ arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 33 +
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 65 +
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 130 +-
+ .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 285 +++++
+ .../arm64/boot/dts/freescale/imx8mm-beacon-kit.dts | 19 +
+ .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 410 +++++++
+ arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 12 +
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 14 +-
+ arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 12 +
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 12 +-
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi | 88 +-
+ .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 +-
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 10 +-
+ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 95 +-
+ arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 18 +-
+ arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 1 +
+ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 +-
+ .../arm64/boot/dts/hisilicon/hi6220-coresight.dtsi | 130 +-
+ .../arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi | 6 +-
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 3 +
+ .../boot/dts/marvell/armada-3720-espressobin.dtsi | 2 +-
+ .../boot/dts/marvell/armada-3720-turris-mox.dts | 10 +-
+ arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 22 +-
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 +-
+ .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +-
+ .../dts/marvell/armada-8040-mcbin-singleshot.dts | 4 +-
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 4 +-
+ arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 1 -
+ arch/arm64/boot/dts/mediatek/Makefile | 3 +
+ arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 74 ++
+ arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 158 ++-
+ arch/arm64/boot/dts/mediatek/mt6358.dtsi | 358 ++++++
+ arch/arm64/boot/dts/mediatek/mt6797-x20-dev.dts | 49 +
+ arch/arm64/boot/dts/mediatek/mt6797.dtsi | 231 +++-
+ .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +
+ arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +
+ arch/arm64/boot/dts/mediatek/mt7622.dtsi | 11 +
+ .../boot/dts/mediatek/mt8173-elm-hana-rev7.dts | 27 +
+ arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dts | 14 +
+ arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi | 70 ++
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dts | 14 +
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1173 ++++++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 80 +-
+ arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 147 +++
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 50 +-
+ arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 3 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 5 +-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 30 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 3 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 10 +
+ arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 7 +-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 89 +-
+ arch/arm64/boot/dts/qcom/Makefile | 1 +
+ .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 74 --
+ arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 89 --
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 257 +++-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 53 +-
+ arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 112 +-
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 474 ++++----
+ .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 25 +-
+ arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 221 ++--
+ .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 98 +-
+ .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 54 +
+ .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 35 +
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 228 +++-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 87 +-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 38 +-
+ arch/arm64/boot/dts/qcom/pm8150.dtsi | 14 +-
+ arch/arm64/boot/dts/qcom/pm8150b.dtsi | 14 +-
+ arch/arm64/boot/dts/qcom/pm8150l.dtsi | 14 +-
+ arch/arm64/boot/dts/qcom/pmi8994.dtsi | 6 +
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 85 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 100 ++
+ arch/arm64/boot/dts/qcom/sc7180-idp.dts | 66 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 955 +++++++++++++--
+ .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 46 +
+ arch/arm64/boot/dts/qcom/sdm660.dtsi | 372 ++++++
+ arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +
+ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 210 ++++
+ arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 98 +-
+ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 13 +
+ arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 351 ++++++
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 126 +-
+ arch/arm64/boot/dts/realtek/Makefile | 6 +
+ arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts | 6 +-
+ arch/arm64/boot/dts/realtek/rtd1293.dtsi | 12 +-
+ arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts | 6 +-
+ .../arm64/boot/dts/realtek/rtd1295-probox2-ava.dts | 6 +-
+ arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts | 30 +
+ arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 4 +-
+ arch/arm64/boot/dts/realtek/rtd1295.dtsi | 21 +-
+ arch/arm64/boot/dts/realtek/rtd1296-ds418.dts | 4 +-
+ arch/arm64/boot/dts/realtek/rtd1296.dtsi | 8 +-
+ arch/arm64/boot/dts/realtek/rtd129x.dtsi | 221 ++--
+ arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts | 30 +
+ arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts | 36 +
+ arch/arm64/boot/dts/realtek/rtd1395.dtsi | 65 +
+ arch/arm64/boot/dts/realtek/rtd139x.dtsi | 193 +++
+ arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts | 44 +
+ arch/arm64/boot/dts/realtek/rtd1619.dtsi | 12 +
+ arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 229 ++++
+ arch/arm64/boot/dts/renesas/Makefile | 3 +-
+ .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi | 94 ++
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 18 +-
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 18 +-
+ .../boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts | 72 ++
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 18 +-
+ arch/arm64/boot/dts/renesas/r8a77950.dtsi | 14 +-
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 34 +-
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 22 +-
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 403 +++++-
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 20 +-
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 10 +-
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 16 +-
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 20 +-
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 20 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 1 +
+ arch/arm64/boot/dts/rockchip/px30.dtsi | 3 +
+ arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 7 +-
+ arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 557 +++++++++
+ arch/arm64/boot/dts/rockchip/rk3326.dtsi | 15 +
+ arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 4 +-
+ .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 29 +-
+ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 10 +-
+ arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 7 +-
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 4 +-
+ .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 11 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 29 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 27 +
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 34 +-
+ arch/arm64/boot/dts/socionext/Makefile | 1 +
+ .../boot/dts/socionext/uniphier-ld11-global.dts | 1 +
+ .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 1 +
+ arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 12 +
+ .../boot/dts/socionext/uniphier-ld20-akebi96.dts | 189 +++
+ .../boot/dts/socionext/uniphier-ld20-global.dts | 1 +
+ .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 1 +
+ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 16 +
+ .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 18 +
+ arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 12 +
+ arch/arm64/boot/dts/sprd/sc9863a.dtsi | 66 +
+ arch/arm64/boot/dts/sprd/sharkl3.dtsi | 164 +++
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 104 ++
+ arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 11 +
+ .../boot/dts/ti/k3-am654-industrial-thermal.dtsi | 45 +
+ .../boot/dts/ti/k3-j721e-common-proc-board.dts | 20 +
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 75 ++
+ arch/arm64/configs/defconfig | 18 +-
+ drivers/amba/bus.c | 14 +-
+ drivers/bus/Kconfig | 41 +-
+ drivers/bus/Makefile | 4 +-
+ drivers/bus/arm-integrator-lm.c | 128 ++
+ drivers/bus/bt1-apb.c | 421 +++++++
+ drivers/bus/bt1-axi.c | 314 +++++
+ drivers/bus/ti-sysc.c | 25 +-
+ drivers/bus/vexpress-config.c | 354 ++++--
+ drivers/clk/Makefile | 2 +-
+ drivers/clk/mediatek/Kconfig | 7 +
+ drivers/clk/mediatek/Makefile | 1 +
+ drivers/clk/mediatek/clk-mt2701-mm.c | 9 +-
+ drivers/clk/mediatek/clk-mt2712-mm.c | 9 +-
+ drivers/clk/mediatek/clk-mt6779-mm.c | 9 +-
+ drivers/clk/mediatek/clk-mt6797-mm.c | 9 +-
+ drivers/clk/mediatek/clk-mt8173-mm.c | 146 +++
+ drivers/clk/mediatek/clk-mt8173.c | 104 --
+ drivers/clk/mediatek/clk-mt8183-mm.c | 9 +-
+ drivers/clk/ti/clk-816x.c | 1 +
+ drivers/clk/versatile/Kconfig | 21 +-
+ drivers/clk/versatile/clk-impd1.c | 121 --
+ drivers/clk/versatile/clk-vexpress-osc.c | 20 +-
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/timer-ti-32k.c | 48 +-
+ drivers/clocksource/timer-ti-dm-systimer.c | 727 +++++++++++
+ drivers/cpufreq/Kconfig.arm | 6 +-
+ drivers/cpufreq/tegra20-cpufreq.c | 217 +---
+ drivers/cpuidle/cpuidle-tegra.c | 1 -
+ drivers/firmware/arm_scmi/Makefile | 4 +-
+ drivers/firmware/arm_scmi/base.c | 7 +
+ drivers/firmware/arm_scmi/common.h | 11 +
+ drivers/firmware/arm_scmi/driver.c | 133 +-
+ drivers/firmware/arm_scmi/mailbox.c | 17 +
+ drivers/firmware/arm_scmi/perf.c | 5 +
+ drivers/firmware/arm_scmi/power.c | 6 +
+ drivers/firmware/arm_scmi/sensors.c | 4 +
+ drivers/firmware/arm_scmi/shmem.c | 15 +
+ drivers/firmware/arm_scmi/smc.c | 153 +++
+ drivers/firmware/imx/imx-scu.c | 64 +-
+ drivers/firmware/qcom_scm-legacy.c | 2 +-
+ drivers/firmware/qcom_scm.c | 11 +-
+ drivers/firmware/tegra/bpmp-tegra186.c | 4 +-
+ drivers/firmware/tegra/bpmp.c | 9 +-
+ drivers/firmware/trusted_foundations.c | 21 +-
+ drivers/gpu/drm/mediatek/Kconfig | 1 +
+ drivers/gpu/drm/mediatek/mtk_disp_color.c | 5 +-
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +-
+ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +-
+ drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 19 +-
+ drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 259 +---
+ drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 7 -
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 45 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 8 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +-
+ drivers/memory/Kconfig | 11 +
+ drivers/memory/Makefile | 1 +
+ drivers/memory/bt1-l2-ctl.c | 322 +++++
+ drivers/memory/samsung/exynos5422-dmc.c | 8 +-
+ drivers/mfd/Kconfig | 5 +-
+ drivers/mfd/vexpress-sysreg.c | 99 +-
+ drivers/misc/Kconfig | 9 -
+ drivers/misc/Makefile | 1 -
+ drivers/misc/vexpress-syscfg.c | 280 -----
+ drivers/of/of_reserved_mem.c | 41 +-
+ drivers/power/reset/Kconfig | 2 +-
+ drivers/power/reset/vexpress-poweroff.c | 8 +-
+ drivers/reset/hisilicon/hi6220_reset.c | 69 +-
+ drivers/reset/reset-imx7.c | 101 ++
+ drivers/soc/amlogic/meson-ee-pwrc.c | 112 +-
+ drivers/soc/fsl/dpio/dpio-service.c | 6 +-
+ drivers/soc/fsl/dpio/qbman-portal.c | 12 -
+ drivers/soc/fsl/qbman/qman.c | 5 -
+ drivers/soc/fsl/qe/qe.c | 4 +-
+ drivers/soc/fsl/qe/ucc.c | 2 +-
+ drivers/soc/imx/Makefile | 3 +
+ drivers/soc/imx/soc-imx.c | 192 +++
+ drivers/soc/imx/soc-imx8m.c | 7 +-
+ drivers/soc/mediatek/Kconfig | 7 +
+ drivers/soc/mediatek/Makefile | 1 +
+ drivers/soc/mediatek/mtk-mmsys.c | 378 ++++++
+ drivers/soc/qcom/Kconfig | 6 +-
+ drivers/soc/qcom/cmd-db.c | 78 +-
+ drivers/soc/qcom/pdr_interface.c | 4 -
+ drivers/soc/qcom/qcom_aoss.c | 1 +
+ drivers/soc/qcom/rpmh-internal.h | 59 +-
+ drivers/soc/qcom/rpmh-rsc.c | 746 ++++++++----
+ drivers/soc/qcom/rpmh.c | 97 +-
+ drivers/soc/qcom/rpmhpd.c | 24 +
+ drivers/soc/qcom/rpmpd.c | 5 +
+ drivers/soc/qcom/smp2p.c | 4 +-
+ drivers/soc/qcom/socinfo.c | 6 +
+ drivers/soc/renesas/Kconfig | 11 +
+ drivers/soc/renesas/Makefile | 1 +
+ drivers/soc/renesas/r8a7742-sysc.c | 42 +
+ drivers/soc/renesas/rcar-rst.c | 1 +
+ drivers/soc/renesas/rcar-sysc.c | 3 +
+ drivers/soc/renesas/rcar-sysc.h | 1 +
+ drivers/soc/tegra/Kconfig | 1 +
+ drivers/soc/tegra/fuse/fuse-tegra.c | 57 +-
+ drivers/soc/tegra/fuse/fuse-tegra20.c | 1 +
+ drivers/soc/tegra/fuse/fuse-tegra30.c | 6 +
+ drivers/soc/tegra/fuse/fuse.h | 8 +
+ drivers/soc/tegra/fuse/tegra-apbmisc.c | 32 +-
+ drivers/soc/tegra/pmc.c | 3 +
+ drivers/soc/ti/Kconfig | 10 +
+ drivers/soc/ti/Makefile | 1 +
+ drivers/soc/ti/k3-socinfo.c | 152 +++
+ drivers/soc/ti/knav_qmss_queue.c | 2 +-
+ drivers/staging/media/Kconfig | 2 +
+ drivers/staging/media/Makefile | 1 +
+ drivers/staging/media/tegra-video/Kconfig | 12 +
+ drivers/staging/media/tegra-video/Makefile | 8 +
+ drivers/staging/media/tegra-video/TODO | 11 +
+ drivers/staging/media/tegra-video/csi.c | 539 ++++++++
+ drivers/staging/media/tegra-video/csi.h | 147 +++
+ drivers/staging/media/tegra-video/tegra210.c | 978 +++++++++++++++
+ drivers/staging/media/tegra-video/vi.c | 1074 ++++++++++++++++
+ drivers/staging/media/tegra-video/vi.h | 257 ++++
+ drivers/staging/media/tegra-video/video.c | 155 +++
+ drivers/staging/media/tegra-video/video.h | 29 +
+ drivers/tee/Kconfig | 2 +
+ drivers/tee/optee/call.c | 6 +-
+ drivers/tee/tee_core.c | 159 +++
+ drivers/tee/tee_shm.c | 31 +-
+ drivers/thermal/imx_sc_thermal.c | 2 +-
+ include/asm-generic/io.h | 64 +-
+ include/dt-bindings/clock/r8a7742-cpg-mssr.h | 42 +
+ include/dt-bindings/clock/tegra114-car.h | 14 +-
+ include/dt-bindings/clock/tegra124-car-common.h | 14 +-
+ include/dt-bindings/clock/tegra20-car.h | 2 +-
+ include/dt-bindings/clock/tegra210-car.h | 16 +-
+ include/dt-bindings/clock/tegra30-car.h | 14 +-
+ include/dt-bindings/firmware/imx/rsrc.h | 84 ++
+ include/dt-bindings/pinctrl/rockchip.h | 11 -
+ include/dt-bindings/power/meson-gxbb-power.h | 13 +
+ include/dt-bindings/power/meson8-power.h | 13 +
+ include/dt-bindings/power/qcom-rpmpd.h | 12 +
+ include/dt-bindings/power/r8a7742-sysc.h | 29 +
+ .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 +-
+ include/dt-bindings/reset/imx8mp-reset.h | 50 +
+ include/dt-bindings/reset/imx8mq-reset.h | 56 +-
+ include/dt-bindings/reset/realtek,rtd1195.h | 74 ++
+ include/dt-bindings/reset/realtek,rtd1295.h | 3 +
+ include/linux/firmware/imx/sci.h | 1 -
+ include/linux/firmware/imx/types.h | 65 -
+ include/linux/firmware/trusted_foundations.h | 1 +
+ include/linux/fsl/bestcomm/bestcomm.h | 2 +-
+ include/linux/of_reserved_mem.h | 12 +
+ include/linux/platform_data/clk-integrator.h | 2 -
+ include/linux/scmi_protocol.h | 6 +
+ include/linux/scpi_protocol.h | 6 +
+ include/linux/soc/mediatek/mtk-mmsys.h | 20 +
+ include/linux/tee_drv.h | 17 +
+ include/linux/vexpress.h | 30 -
+ include/soc/fsl/qe/qe.h | 2 +-
+ include/soc/imx/cpu.h | 36 +
+ include/soc/qcom/cmd-db.h | 1 +
+ include/uapi/linux/tee.h | 9 +
+ kernel/cpu_pm.c | 4 +-
+ lib/logic_pio.c | 22 +-
+ 786 files changed, 35671 insertions(+), 12357 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/bus/arm,integrator-ap-lm.yaml
+ create mode 100644 Documentation/devicetree/bindings/bus/baikal,bt1-apb.yaml
+ create mode 100644 Documentation/devicetree/bindings/bus/baikal,bt1-axi.yaml
+ create mode 100644 Documentation/devicetree/bindings/cpufreq/nvidia,tegra20-cpufreq.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/baikal,bt1-l2-ctl.yaml
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra210-emc.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/ti/k3-socinfo.yaml
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/am5729-beagleboneai.dts
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts
+ create mode 100644 arch/arm/boot/dts/at91-sama5d2_icp.dts
+ create mode 100644 arch/arm/boot/dts/bcm2835-rpi-common.dtsi
+ create mode 100644 arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi
+ create mode 100644 arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos4210-i9100.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi
+ create mode 100644 arch/arm/boot/dts/integratorap-im-pd1.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-l-50.dts
+ create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7.dts
+ create mode 100644 arch/arm/boot/dts/r8a7742-iwg21m.dtsi
+ create mode 100644 arch/arm/boot/dts/r8a7742.dtsi
+ create mode 100644 arch/arm/boot/dts/rtd1195-horseradish.dts
+ create mode 100644 arch/arm/boot/dts/rtd1195-mele-x1000.dts
+ create mode 100644 arch/arm/boot/dts/rtd1195.dtsi
+ create mode 100644 arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp157a-iot-box.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp157a-stinger96.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp157a-stinger96.dtsi
+ create mode 100644 arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
+ rename arch/arm/boot/dts/{stm32mp157c-dhcom-som.dtsi => stm32mp15xx-dhcom-som.dtsi} (98%)
+ create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi
+ create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcor-io1v8.dtsi
+ create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi
+ create mode 100644 arch/arm/boot/dts/stm32mp15xx-osd32.dtsi
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime-emmc.dts
+ delete mode 100644 arch/arm/configs/cm_x2xx_defconfig
+ delete mode 100644 arch/arm/configs/em_x270_defconfig
+ delete mode 100644 arch/arm/mach-integrator/impd1.c
+ delete mode 100644 arch/arm/mach-integrator/impd1.h
+ delete mode 100644 arch/arm/mach-integrator/lm.c
+ delete mode 100644 arch/arm/mach-integrator/lm.h
+ delete mode 100644 arch/arm/mach-pxa/cm-x255.c
+ delete mode 100644 arch/arm/mach-pxa/cm-x270.c
+ delete mode 100644 arch/arm/mach-pxa/cm-x2xx-pci.c
+ delete mode 100644 arch/arm/mach-pxa/cm-x2xx-pci.h
+ delete mode 100644 arch/arm/mach-pxa/cm-x2xx.c
+ delete mode 100644 arch/arm/mach-pxa/em-x270.c
+ delete mode 100644 arch/arm/mach-pxa/include/mach/io.h
+ create mode 100644 arch/arm/mach-realtek/Kconfig
+ create mode 100644 arch/arm/mach-realtek/Makefile
+ create mode 100644 arch/arm/mach-realtek/rtd1195.c
+ delete mode 100644 arch/arm/plat-versatile/Kconfig
+ delete mode 100644 arch/arm/plat-versatile/include/plat/sched_clock.h
+ delete mode 100644 arch/arm/plat-versatile/sched-clock.c
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-beacon-kit.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt6358.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+ delete mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
+ delete mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sdm660.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1395.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd139x.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1619.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd16xx.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/aistarvision-mipi-adapter-2.1.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3326.dtsi
+ create mode 100644 arch/arm64/boot/dts/socionext/uniphier-ld20-akebi96.dts
+ create mode 100644 arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
+ create mode 100644 drivers/bus/arm-integrator-lm.c
+ create mode 100644 drivers/bus/bt1-apb.c
+ create mode 100644 drivers/bus/bt1-axi.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8173-mm.c
+ create mode 100644 drivers/clocksource/timer-ti-dm-systimer.c
+ create mode 100644 drivers/firmware/arm_scmi/smc.c
+ create mode 100644 drivers/memory/bt1-l2-ctl.c
+ delete mode 100644 drivers/misc/vexpress-syscfg.c
+ create mode 100644 drivers/soc/imx/soc-imx.c
+ create mode 100644 drivers/soc/mediatek/mtk-mmsys.c
+ create mode 100644 drivers/soc/renesas/r8a7742-sysc.c
+ create mode 100644 drivers/soc/ti/k3-socinfo.c
+ create mode 100644 drivers/staging/media/tegra-video/Kconfig
+ create mode 100644 drivers/staging/media/tegra-video/Makefile
+ create mode 100644 drivers/staging/media/tegra-video/TODO
+ create mode 100644 drivers/staging/media/tegra-video/csi.c
+ create mode 100644 drivers/staging/media/tegra-video/csi.h
+ create mode 100644 drivers/staging/media/tegra-video/tegra210.c
+ create mode 100644 drivers/staging/media/tegra-video/vi.c
+ create mode 100644 drivers/staging/media/tegra-video/vi.h
+ create mode 100644 drivers/staging/media/tegra-video/video.c
+ create mode 100644 drivers/staging/media/tegra-video/video.h
+ create mode 100644 include/dt-bindings/clock/r8a7742-cpg-mssr.h
+ create mode 100644 include/dt-bindings/power/meson-gxbb-power.h
+ create mode 100644 include/dt-bindings/power/meson8-power.h
+ create mode 100644 include/dt-bindings/power/r8a7742-sysc.h
+ create mode 100644 include/dt-bindings/reset/imx8mp-reset.h
+ create mode 100644 include/dt-bindings/reset/realtek,rtd1195.h
+ delete mode 100644 include/linux/firmware/imx/types.h
+ delete mode 100644 include/linux/platform_data/clk-integrator.h
+ create mode 100644 include/linux/soc/mediatek/mtk-mmsys.h
+ create mode 100644 include/soc/imx/cpu.h
+Merging amlogic/for-next (9233c526bc0e Merge branch 'v5.8/defconfig' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging aspeed/for-next (fa4c8ec6feaa ARM: dts: aspeed: Change KCS nodes to v2 binding)
+$ git merge aspeed/for-next
+Already up to date.
+Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
+$ git merge at91/at91-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (0414897ac89f Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/imx/Kconfig | 8 +-
+ drivers/clk/imx/clk-composite-8m.c | 56 ++++++++++-
+ drivers/clk/imx/clk-gate2.c | 31 +++++--
+ drivers/clk/imx/clk-imx6ul.c | 2 +-
+ drivers/clk/imx/clk-imx7ulp.c | 6 +-
+ drivers/clk/imx/clk-imx8mm.c | 27 +++---
+ drivers/clk/imx/clk-imx8mn.c | 25 +++--
+ drivers/clk/imx/clk-imx8mp.c | 148 +++++++++++++++---------------
+ drivers/clk/imx/clk-imx8mq.c | 29 +++---
+ drivers/clk/imx/clk-pll14xx.c | 8 +-
+ drivers/clk/imx/clk-pllv3.c | 16 +---
+ drivers/clk/imx/clk-sscg-pll.c | 10 --
+ drivers/clk/imx/clk.h | 62 ++++++++++++-
+ include/dt-bindings/clock/imx7ulp-clock.h | 5 +-
+ include/dt-bindings/clock/imx8mp-clock.h | 90 +++++++++++++++++-
+ 15 files changed, 358 insertions(+), 165 deletions(-)
+Merging keystone/next (a158c2b7ec23 Merge branch 'for_5.8/driver-soc' into next)
+$ git merge keystone/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mediatek/for-next (64ee939736e7 Merge branch 'v5.7-next/soc' into for-next)
+$ git merge mediatek/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (869da228bd45 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 (712c602893d7 Merge branch 'fixes' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/am335x-baltos.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-boneblack-common.dtsi | 1 +
+ arch/arm/boot/dts/am335x-boneblack-wireless.dts | 1 -
+ arch/arm/boot/dts/am335x-boneblue.dts | 1 -
+ arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 1 -
+ arch/arm/boot/dts/am335x-evm.dts | 3 +--
+ arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
+ arch/arm/boot/dts/am335x-lxm.dts | 2 +-
+ arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 2 +-
+ arch/arm/boot/dts/am335x-pepper.dts | 4 ++--
+ arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +-
+ arch/arm/boot/dts/am33xx-l4.dtsi | 6 ++----
+ arch/arm/boot/dts/am33xx.dtsi | 3 ++-
+ arch/arm/boot/dts/am4372.dtsi | 3 ++-
+ arch/arm/boot/dts/am437x-cm-t43.dts | 2 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts | 4 ++--
+ arch/arm/boot/dts/am437x-l4.dtsi | 5 ++---
+ arch/arm/boot/dts/am437x-sk-evm.dts | 2 +-
+ 19 files changed, 22 insertions(+), 26 deletions(-)
+Merging qcom/for-next (98cfcf1a9c54 Merge branches 'arm64-defconfig-for-5.8', 'arm64-for-5.8', 'drivers-for-5.8' and 'dts-for-5.8' into for-next)
+$ git merge qcom/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging raspberrypi/for-next (f5e216e42689 ARM: dts: bcm283x: Use firmware PM driver for V3D)
+$ git merge raspberrypi/for-next
+Merge made by the 'recursive' strategy.
+Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
+$ git merge realtek/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (1bd79704bee2 Merge branch 'renesas-dt-bindings-for-v5.8' into renesas-next)
+$ git merge renesas/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging reset/reset/next (a6138255cc91 dt-bindings: reset: Convert i.MX7 reset to json-schema)
+$ git merge reset/reset/next
+Removing Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
+Removing Documentation/devicetree/bindings/reset/fsl,imx-src.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/reset/fsl,imx-src.txt | 49 -------------
+ .../devicetree/bindings/reset/fsl,imx-src.yaml | 82 ++++++++++++++++++++++
+ .../devicetree/bindings/reset/fsl,imx7-src.txt | 56 ---------------
+ .../devicetree/bindings/reset/fsl,imx7-src.yaml | 58 +++++++++++++++
+ drivers/reset/reset-simple.c | 23 +++++-
+ drivers/reset/reset-socfpga.c | 3 +-
+ drivers/reset/reset-sunxi.c | 3 +-
+ drivers/reset/reset-uniphier-glue.c | 3 +-
+ {drivers => include/linux}/reset/reset-simple.h | 7 ++
+ 9 files changed, 171 insertions(+), 113 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx7-src.yaml
+ rename {drivers => include/linux}/reset/reset-simple.h (74%)
+Merging rockchip/for-next (8a66d46f4035 Merge branch 'v5.8-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/rockchip/clk-pll.c | 70 +++++++++++++++++++++++++-----------------
+ 1 file changed, 41 insertions(+), 29 deletions(-)
+Merging samsung-krzk/for-next (0f6a82638f62 Merge branch 'next/dt-late' into for-next)
+$ git merge samsung-krzk/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/exynos5800.dtsi | 6 ++--
+ arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 4 +++
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 43 +++++++++++++++++++++++--
+ 3 files changed, 48 insertions(+), 5 deletions(-)
+Merging scmi/for-linux-next (9cb1fd0efd19 Linux 5.7-rc7)
+$ git merge scmi/for-linux-next
+Already up to date.
+Merging sunxi/sunxi/for-next (243cd8fba48d Merge branch 'sunxi/dt-for-5.8' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/sunxi/clk-sunxi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging tegra/for-next (cd049d898ab8 Merge branch for-5.8/arm64/dt into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/tegra/Kconfig | 4 -
+ drivers/clk/tegra/Makefile | 4 +-
+ drivers/clk/tegra/clk-pll.c | 12 +-
+ drivers/clk/tegra/clk-tegra-super-cclk.c | 212 ++
+ .../clk/tegra/{clk-emc.c => clk-tegra124-emc.c} | 0
+ drivers/clk/tegra/clk-tegra20.c | 7 +-
+ drivers/clk/tegra/clk-tegra210-emc.c | 369 ++++
+ drivers/clk/tegra/clk-tegra210.c | 94 +-
+ drivers/clk/tegra/clk-tegra30.c | 6 +-
+ drivers/clk/tegra/clk.h | 24 +-
+ drivers/i2c/busses/i2c-tegra.c | 248 ++-
+ drivers/memory/tegra/Kconfig | 14 +
+ drivers/memory/tegra/Makefile | 4 +
+ drivers/memory/tegra/mc.h | 1 +
+ drivers/memory/tegra/tegra124-emc.c | 6 +-
+ drivers/memory/tegra/tegra186-emc.c | 21 +-
+ drivers/memory/tegra/tegra186.c | 4 +-
+ drivers/memory/tegra/tegra20-emc.c | 34 +-
+ drivers/memory/tegra/tegra210-emc-cc-r21021.c | 1775 +++++++++++++++++
+ drivers/memory/tegra/tegra210-emc-core.c | 2100 ++++++++++++++++++++
+ drivers/memory/tegra/tegra210-emc-table.c | 90 +
+ drivers/memory/tegra/tegra210-emc.h | 1016 ++++++++++
+ drivers/memory/tegra/tegra210-mc.h | 50 +
+ drivers/memory/tegra/tegra30-emc.c | 122 +-
+ include/dt-bindings/clock/tegra210-car.h | 4 +-
+ include/linux/clk/tegra.h | 27 +
+ 26 files changed, 6035 insertions(+), 213 deletions(-)
+ create mode 100644 drivers/clk/tegra/clk-tegra-super-cclk.c
+ rename drivers/clk/tegra/{clk-emc.c => clk-tegra124-emc.c} (100%)
+ create mode 100644 drivers/clk/tegra/clk-tegra210-emc.c
+ create mode 100644 drivers/memory/tegra/tegra210-emc-cc-r21021.c
+ create mode 100644 drivers/memory/tegra/tegra210-emc-core.c
+ create mode 100644 drivers/memory/tegra/tegra210-emc-table.c
+ create mode 100644 drivers/memory/tegra/tegra210-emc.h
+ create mode 100644 drivers/memory/tegra/tegra210-mc.h
+Merging ti-k3/ti-k3-next (cae809434da1 arm64: dts: ti: k3-j721e-main: Add main domain watchdog entries)
+$ git merge ti-k3/ti-k3-next
+Already up to date.
+Merging uniphier/for-next (0e698dfa2822 Linux 5.7-rc4)
+$ git merge uniphier/for-next
+Already up to date.
+Merging clk/clk-next (166e4b484197 Merge branches 'clk-vc5', 'clk-hsdk', 'clk-mediatek' and 'clk-baikal' into clk-next)
+$ git merge clk/clk-next
+Auto-merging drivers/clk/sprd/sc9863a-clk.c
+Auto-merging drivers/clk/qcom/gcc-sm8150.c
+Auto-merging drivers/clk/qcom/Kconfig
+Auto-merging drivers/clk/mmp/clk.h
+Auto-merging drivers/clk/mediatek/Makefile
+Auto-merging drivers/clk/mediatek/Kconfig
+Auto-merging drivers/clk/clk.c
+Auto-merging drivers/clk/Makefile
+Auto-merging arch/arm64/Kconfig.platforms
+Removing arch/arm/mach-mmp/clock.h
+Removing arch/arm/mach-mmp/clock.c
+Removing arch/arm/mach-mmp/clock-pxa910.c
+Removing arch/arm/mach-mmp/clock-pxa168.c
+Removing arch/arm/mach-mmp/clock-mmp2.c
+Auto-merging arch/arm/mach-mmp/Kconfig
+Auto-merging arch/arm/mach-clps711x/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+Removing Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
+Removing Documentation/devicetree/bindings/clock/qcom,a53pll.txt
+Auto-merging Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,audsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,camsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,infracfg.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,mipi0a.txt | 28 +
+ .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,pericfg.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,topckgen.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,vcodecsys.txt | 27 +
+ .../bindings/clock/baikal,bt1-ccu-div.yaml | 188 +
+ .../bindings/clock/baikal,bt1-ccu-pll.yaml | 131 +
+ .../devicetree/bindings/clock/idt,versaclock5.txt | 1 +
+ .../devicetree/bindings/clock/intel,agilex.yaml | 46 +
+ .../devicetree/bindings/clock/intel,cgu-lgm.yaml | 44 +
+ .../bindings/clock/marvell,mmp2-audio-clock.yaml | 74 +
+ .../bindings/clock/marvell,mmp2-clock.yaml | 5 +
+ .../devicetree/bindings/clock/qcom,a53pll.txt | 22 -
+ .../devicetree/bindings/clock/qcom,a53pll.yaml | 40 +
+ .../devicetree/bindings/clock/qcom,gcc.yaml | 3 +
+ .../devicetree/bindings/clock/qcom,mmcc.yaml | 4 +
+ .../bindings/clock/renesas,cpg-div6-clock.yaml | 60 +
+ .../bindings/clock/renesas,cpg-div6-clocks.txt | 40 -
+ .../bindings/clock/renesas,cpg-mssr.yaml | 1 +
+ .../bindings/clock/renesas,cpg-mstp-clocks.txt | 60 -
+ .../bindings/clock/renesas,cpg-mstp-clocks.yaml | 82 +
+ .../bindings/clock/renesas,rcar-usb2-clock-sel.txt | 4 +-
+ .../devicetree/bindings/clock/silabs,si5341.txt | 11 +-
+ .../bindings/clock/sprd,sc9863a-clk.yaml | 1 +
+ MAINTAINERS | 1 +
+ arch/Kconfig | 6 -
+ arch/arm/Kconfig | 5 +-
+ arch/arm/mach-mmp/Kconfig | 2 +
+ arch/arm/mach-mmp/Makefile | 6 -
+ arch/arm/mach-mmp/clock-mmp2.c | 114 -
+ arch/arm/mach-mmp/clock-pxa168.c | 94 -
+ arch/arm/mach-mmp/clock-pxa910.c | 70 -
+ arch/arm/mach-mmp/clock.c | 105 -
+ arch/arm/mach-mmp/clock.h | 65 -
+ arch/arm/mach-mmp/pxa168.c | 1 -
+ arch/arm/mach-mmp/time.c | 1 -
+ arch/arm/mach-vt8500/Kconfig | 1 -
+ arch/arm64/Kconfig.platforms | 1 -
+ arch/c6x/Kconfig | 1 +
+ arch/h8300/Kconfig | 1 -
+ arch/m68k/Kconfig.cpu | 2 +-
+ arch/mips/Kconfig | 7 +-
+ arch/mips/loongson2ef/Kconfig | 2 +-
+ arch/mips/loongson64/smp.c | 1 -
+ arch/mips/ralink/Kconfig | 4 +
+ arch/sh/boards/Kconfig | 5 +
+ arch/unicore32/Kconfig | 2 +-
+ drivers/clk/Kconfig | 33 +-
+ drivers/clk/Makefile | 4 +-
+ drivers/clk/at91/at91rm9200.c | 12 +-
+ drivers/clk/at91/at91sam9260.c | 13 +-
+ drivers/clk/at91/at91sam9g45.c | 10 +-
+ drivers/clk/at91/at91sam9n12.c | 12 +-
+ drivers/clk/at91/at91sam9rl.c | 10 +-
+ drivers/clk/at91/at91sam9x5.c | 10 +-
+ drivers/clk/at91/pmc.c | 47 +-
+ drivers/clk/at91/pmc.h | 8 +-
+ drivers/clk/at91/sam9x60.c | 10 +-
+ drivers/clk/at91/sama5d2.c | 13 +-
+ drivers/clk/at91/sama5d3.c | 10 +-
+ drivers/clk/at91/sama5d4.c | 10 +-
+ drivers/clk/baikal-t1/Kconfig | 42 +
+ drivers/clk/baikal-t1/Makefile | 3 +
+ drivers/clk/baikal-t1/ccu-div.c | 602 +++
+ drivers/clk/baikal-t1/ccu-div.h | 110 +
+ drivers/clk/baikal-t1/ccu-pll.c | 558 +++
+ drivers/clk/baikal-t1/ccu-pll.h | 64 +
+ drivers/clk/baikal-t1/clk-ccu-div.c | 485 +++
+ drivers/clk/baikal-t1/clk-ccu-pll.c | 204 +
+ drivers/clk/bcm/clk-bcm2835.c | 80 +-
+ drivers/clk/clk-ast2600.c | 31 +-
+ drivers/clk/clk-hsdk-pll.c | 70 +-
+ drivers/clk/clk-si5341.c | 69 +-
+ drivers/clk/clk-versaclock5.c | 11 +
+ drivers/clk/clk.c | 4 -
+ drivers/clk/ingenic/Kconfig | 10 +
+ drivers/clk/ingenic/Makefile | 1 +
+ drivers/clk/ingenic/cgu.c | 28 +-
+ drivers/clk/ingenic/cgu.h | 4 +
+ drivers/clk/ingenic/jz4725b-cgu.c | 4 +
+ drivers/clk/ingenic/jz4740-cgu.c | 4 +
+ drivers/clk/ingenic/jz4770-cgu.c | 8 +-
+ drivers/clk/ingenic/jz4780-cgu.c | 3 +
+ drivers/clk/ingenic/tcu.c | 2 +-
+ drivers/clk/ingenic/x1000-cgu.c | 123 +-
+ drivers/clk/ingenic/x1830-cgu.c | 448 +++
+ drivers/clk/mediatek/Kconfig | 86 +
+ drivers/clk/mediatek/Makefile | 7 +
+ drivers/clk/mediatek/clk-mt6765-audio.c | 100 +
+ drivers/clk/mediatek/clk-mt6765-cam.c | 74 +
+ drivers/clk/mediatek/clk-mt6765-img.c | 70 +
+ drivers/clk/mediatek/clk-mt6765-mipi0a.c | 68 +
+ drivers/clk/mediatek/clk-mt6765-mm.c | 96 +
+ drivers/clk/mediatek/clk-mt6765-vcodec.c | 70 +
+ drivers/clk/mediatek/clk-mt6765.c | 952 +++++
+ drivers/clk/mediatek/clk-mux.c | 2 +-
+ drivers/clk/meson/g12a.c | 30 +-
+ drivers/clk/meson/gxbb.c | 40 +-
+ drivers/clk/meson/meson8b.c | 120 +-
+ drivers/clk/meson/meson8b.h | 5 +-
+ drivers/clk/mmp/Makefile | 3 +-
+ drivers/clk/mmp/clk-audio.c | 443 +++
+ drivers/clk/mmp/clk-frac.c | 27 +-
+ drivers/clk/mmp/clk-of-mmp2.c | 104 +-
+ drivers/clk/mmp/clk.h | 11 +
+ drivers/clk/mmp/pwr-island.c | 115 +
+ drivers/clk/qcom/Kconfig | 8 +
+ drivers/clk/qcom/Makefile | 1 +
+ drivers/clk/qcom/gcc-msm8916.c | 8 +-
+ drivers/clk/qcom/gcc-msm8939.c | 3988 ++++++++++++++++++++
+ drivers/clk/qcom/gcc-msm8998.c | 27 +
+ drivers/clk/qcom/gcc-sc7180.c | 94 +-
+ drivers/clk/qcom/gcc-sm8150.c | 148 +
+ drivers/clk/qcom/gdsc.c | 23 +
+ drivers/clk/qcom/gdsc.h | 4 +
+ drivers/clk/qcom/mmcc-msm8996.c | 2 +
+ drivers/clk/renesas/Kconfig | 8 +-
+ drivers/clk/renesas/Makefile | 1 +
+ drivers/clk/renesas/r8a7742-cpg-mssr.c | 275 ++
+ drivers/clk/renesas/r9a06g032-clocks.c | 6 +-
+ drivers/clk/renesas/renesas-cpg-mssr.c | 14 +-
+ drivers/clk/renesas/renesas-cpg-mssr.h | 1 +
+ drivers/clk/samsung/clk-exynos5420.c | 18 +-
+ drivers/clk/samsung/clk-exynos5433.c | 3 +-
+ drivers/clk/samsung/clk-s3c2443.c | 2 +-
+ drivers/clk/socfpga/Makefile | 2 +
+ drivers/clk/socfpga/clk-agilex.c | 454 +++
+ drivers/clk/socfpga/clk-gate-s10.c | 5 +-
+ drivers/clk/socfpga/clk-periph-s10.c | 10 +-
+ drivers/clk/socfpga/clk-pll-a10.c | 4 +-
+ drivers/clk/socfpga/clk-pll-s10.c | 78 +-
+ drivers/clk/socfpga/clk-pll.c | 4 +-
+ drivers/clk/socfpga/clk-s10.c | 160 +-
+ drivers/clk/socfpga/stratix10-clk.h | 10 +-
+ drivers/clk/sprd/gate.c | 7 +
+ drivers/clk/sprd/gate.h | 9 +
+ drivers/clk/sprd/pll.c | 2 +-
+ drivers/clk/sprd/sc9863a-clk.c | 64 +-
+ drivers/clk/st/clk-flexgen.c | 1 +
+ drivers/clk/ti/clk-44xx.c | 14 +-
+ drivers/clk/ti/clk-54xx.c | 14 +-
+ drivers/clk/ti/clk-7xx.c | 15 +-
+ drivers/clk/ti/composite.c | 1 +
+ drivers/clk/versatile/clk-versatile.c | 2 +-
+ drivers/clk/x86/Kconfig | 8 +
+ drivers/clk/x86/Makefile | 1 +
+ drivers/clk/x86/clk-cgu-pll.c | 156 +
+ drivers/clk/x86/clk-cgu.c | 636 ++++
+ drivers/clk/x86/clk-cgu.h | 335 ++
+ drivers/clk/x86/clk-lgm.c | 475 +++
+ drivers/clk/zynqmp/clk-zynqmp.h | 1 +
+ drivers/clk/zynqmp/clkc.c | 24 +-
+ drivers/clk/zynqmp/divider.c | 27 +-
+ drivers/i2c/busses/i2c-s3c2410.c | 3 +-
+ drivers/mmc/host/Kconfig | 2 +-
+ include/dt-bindings/clock/agilex-clock.h | 70 +
+ include/dt-bindings/clock/at91.h | 4 +
+ include/dt-bindings/clock/bt1-ccu.h | 48 +
+ include/dt-bindings/clock/intel,lgm-clk.h | 165 +
+ include/dt-bindings/clock/marvell,mmp2-audio.h | 10 +
+ include/dt-bindings/clock/marvell,mmp2.h | 3 +
+ include/dt-bindings/clock/meson8b-clkc.h | 1 +
+ include/dt-bindings/clock/mt6765-clk.h | 313 ++
+ include/dt-bindings/clock/qcom,gcc-msm8939.h | 206 +
+ include/dt-bindings/clock/qcom,gcc-msm8998.h | 1 +
+ include/dt-bindings/clock/qcom,gcc-sc7180.h | 1 +
+ include/dt-bindings/clock/sprd,sc9863a-clk.h | 5 +
+ include/dt-bindings/clock/x1000-cgu.h | 64 +-
+ include/dt-bindings/clock/x1830-cgu.h | 55 +
+ include/dt-bindings/power/marvell,mmp2.h | 11 +
+ include/dt-bindings/reset/bt1-ccu.h | 25 +
+ include/dt-bindings/reset/qcom,gcc-msm8939.h | 110 +
+ 177 files changed, 14170 insertions(+), 1047 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mipi0a.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vcodecsys.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/baikal,bt1-ccu-div.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/baikal,bt1-ccu-pll.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/intel,agilex.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/intel,cgu-lgm.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/marvell,mmp2-audio-clock.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-div6-clock.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.yaml
+ delete mode 100644 arch/arm/mach-mmp/clock-mmp2.c
+ delete mode 100644 arch/arm/mach-mmp/clock-pxa168.c
+ delete mode 100644 arch/arm/mach-mmp/clock-pxa910.c
+ delete mode 100644 arch/arm/mach-mmp/clock.c
+ delete mode 100644 arch/arm/mach-mmp/clock.h
+ create mode 100644 drivers/clk/baikal-t1/Kconfig
+ create mode 100644 drivers/clk/baikal-t1/Makefile
+ create mode 100644 drivers/clk/baikal-t1/ccu-div.c
+ create mode 100644 drivers/clk/baikal-t1/ccu-div.h
+ create mode 100644 drivers/clk/baikal-t1/ccu-pll.c
+ create mode 100644 drivers/clk/baikal-t1/ccu-pll.h
+ create mode 100644 drivers/clk/baikal-t1/clk-ccu-div.c
+ create mode 100644 drivers/clk/baikal-t1/clk-ccu-pll.c
+ create mode 100644 drivers/clk/ingenic/x1830-cgu.c
+ create mode 100644 drivers/clk/mediatek/clk-mt6765-audio.c
+ create mode 100644 drivers/clk/mediatek/clk-mt6765-cam.c
+ create mode 100644 drivers/clk/mediatek/clk-mt6765-img.c
+ create mode 100644 drivers/clk/mediatek/clk-mt6765-mipi0a.c
+ create mode 100644 drivers/clk/mediatek/clk-mt6765-mm.c
+ create mode 100644 drivers/clk/mediatek/clk-mt6765-vcodec.c
+ create mode 100644 drivers/clk/mediatek/clk-mt6765.c
+ create mode 100644 drivers/clk/mmp/clk-audio.c
+ create mode 100644 drivers/clk/mmp/pwr-island.c
+ create mode 100644 drivers/clk/qcom/gcc-msm8939.c
+ create mode 100644 drivers/clk/renesas/r8a7742-cpg-mssr.c
+ create mode 100644 drivers/clk/socfpga/clk-agilex.c
+ create mode 100644 drivers/clk/x86/Kconfig
+ create mode 100644 drivers/clk/x86/clk-cgu-pll.c
+ create mode 100644 drivers/clk/x86/clk-cgu.c
+ create mode 100644 drivers/clk/x86/clk-cgu.h
+ create mode 100644 drivers/clk/x86/clk-lgm.c
+ create mode 100644 include/dt-bindings/clock/agilex-clock.h
+ create mode 100644 include/dt-bindings/clock/bt1-ccu.h
+ create mode 100644 include/dt-bindings/clock/intel,lgm-clk.h
+ create mode 100644 include/dt-bindings/clock/marvell,mmp2-audio.h
+ create mode 100644 include/dt-bindings/clock/mt6765-clk.h
+ create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8939.h
+ create mode 100644 include/dt-bindings/clock/x1830-cgu.h
+ create mode 100644 include/dt-bindings/power/marvell,mmp2.h
+ create mode 100644 include/dt-bindings/reset/bt1-ccu.h
+ create mode 100644 include/dt-bindings/reset/qcom,gcc-msm8939.h
+Merging clk-samsung/for-next (25bdae0f1c66 clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1)
+$ git merge clk-samsung/for-next
+Already up to date.
+Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge c6x/for-linux-next
+Already up to date.
+Merging csky/linux-next (f36e0aab6f1f csky: Fixup CONFIG_DEBUG_RSEQ)
+$ git merge csky/linux-next
+Already up to date.
+Merging h8300/h8300-next (beab3d5cb0e1 irq-renesas-h8s: Fix external interrupt control.)
+$ git merge h8300/h8300-next
+Auto-merging drivers/tty/serial/sh-sci.c
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig.cpu | 4 ++
+ arch/h8300/boot/dts/edosk2674.dts | 10 ++++-
+ arch/h8300/configs/edosk2674_defconfig | 10 ++---
+ arch/h8300/configs/h8300h-sim_defconfig | 8 +---
+ arch/h8300/configs/h8s-sim_defconfig | 8 +---
+ arch/h8300/lib/memset.S | 17 +++++----
+ drivers/clocksource/h8300_timer8.c | 20 +++++-----
+ drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++-
+ drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++--------
+ drivers/net/ethernet/smsc/Kconfig | 1 -
+ drivers/net/ethernet/smsc/smc91x.c | 10 +++++
+ drivers/tty/serial/sh-sci.c | 5 +--
+ 12 files changed, 120 insertions(+), 59 deletions(-)
+Merging ia64/next (172e7890406d tty/serial: cleanup after ioc*_serial driver removal)
+$ git merge ia64/next
+Already up to date.
+Merging m68k/for-next (3381df095419 m68k: tools: Replace zero-length array with flexible-array member)
+$ git merge m68k/for-next
+Already up to date.
+Merging m68knommu/for-next (9e2b6ed41f8f m68k,nommu: fix implicit cast from __user in __{get,put}_user_asm())
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/coldfire/pci.c | 4 +++-
+ arch/m68k/configs/stmark2_defconfig | 1 -
+ arch/m68k/include/asm/uaccess_no.h | 6 +++---
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+Merging microblaze/next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge microblaze/next
+Already up to date.
+Merging mips/mips-next (9bd0bd264578 MIPS: ralink: drop ralink_clk_init for mt7621)
+$ git merge mips/mips-next
+Auto-merging init/Kconfig
+Removing arch/mips/pmcs-msp71xx/msp_usb.c
+Removing arch/mips/pmcs-msp71xx/msp_time.c
+Removing arch/mips/pmcs-msp71xx/msp_smp.c
+Removing arch/mips/pmcs-msp71xx/msp_setup.c
+Removing arch/mips/pmcs-msp71xx/msp_serial.c
+Removing arch/mips/pmcs-msp71xx/msp_prom.c
+Removing arch/mips/pmcs-msp71xx/msp_pci.c
+Removing arch/mips/pmcs-msp71xx/msp_irq_slp.c
+Removing arch/mips/pmcs-msp71xx/msp_irq_per.c
+Removing arch/mips/pmcs-msp71xx/msp_irq_cic.c
+Removing arch/mips/pmcs-msp71xx/msp_irq.c
+Removing arch/mips/pmcs-msp71xx/msp_hwbutton.c
+Removing arch/mips/pmcs-msp71xx/msp_eth.c
+Removing arch/mips/pmcs-msp71xx/msp_elb.c
+Removing arch/mips/pmcs-msp71xx/Platform
+Removing arch/mips/pmcs-msp71xx/Makefile
+Removing arch/mips/pmcs-msp71xx/Kconfig
+Removing arch/mips/pci/pci-lasat.c
+Removing arch/mips/pci/pci-emma2rh.c
+Removing arch/mips/pci/ops-pmcmsp.c
+Removing arch/mips/pci/ops-nile4.c
+Removing arch/mips/pci/ops-loongson3.c
+Removing arch/mips/pci/ops-emma2rh.c
+Removing arch/mips/pci/fixup-pmcmsp.c
+Removing arch/mips/pci/fixup-loongson3.c
+Removing arch/mips/pci/fixup-emma2rh.c
+Removing arch/mips/loongson64/rtc.c
+Removing arch/mips/loongson64/pci.c
+Auto-merging arch/mips/loongson2ef/Kconfig
+CONFLICT (content): Merge conflict in arch/mips/loongson2ef/Kconfig
+Removing arch/mips/lasat/sysctl.c
+Removing arch/mips/lasat/setup.c
+Removing arch/mips/lasat/serial.c
+Removing arch/mips/lasat/reset.c
+Removing arch/mips/lasat/prom.h
+Removing arch/mips/lasat/prom.c
+Removing arch/mips/lasat/picvue_proc.c
+Removing arch/mips/lasat/picvue.h
+Removing arch/mips/lasat/picvue.c
+Removing arch/mips/lasat/lasat_models.h
+Removing arch/mips/lasat/lasat_board.c
+Removing arch/mips/lasat/interrupt.c
+Removing arch/mips/lasat/image/romscript.normal
+Removing arch/mips/lasat/image/head.S
+Removing arch/mips/lasat/image/Makefile
+Removing arch/mips/lasat/ds1603.h
+Removing arch/mips/lasat/ds1603.c
+Removing arch/mips/lasat/at93c.h
+Removing arch/mips/lasat/at93c.c
+Removing arch/mips/lasat/Platform
+Removing arch/mips/lasat/Makefile
+Removing arch/mips/lasat/Kconfig
+Removing arch/mips/kernel/8250-platform.c
+Removing arch/mips/jz4740/timer.c
+Removing arch/mips/jz4740/time.c
+Removing arch/mips/jz4740/reset.h
+Removing arch/mips/jz4740/reset.c
+Removing arch/mips/jz4740/prom.c
+Removing arch/mips/jz4740/pm.c
+Removing arch/mips/include/asm/nile4.h
+Auto-merging arch/mips/include/asm/module.h
+CONFLICT (content): Merge conflict in arch/mips/include/asm/module.h
+Removing arch/mips/include/asm/mach-xilfpga/irq.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/war.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h
+Removing arch/mips/include/asm/mach-pmcs-msp71xx/cpu-feature-overrides.h
+Removing arch/mips/include/asm/mach-loongson64/mc146818rtc.h
+Removing arch/mips/include/asm/mach-lasat/mach-gt64120.h
+Removing arch/mips/include/asm/mach-lasat/irq.h
+Removing arch/mips/include/asm/mach-jz4740/timer.h
+Removing arch/mips/include/asm/mach-jz4740/dma.h
+Removing arch/mips/include/asm/mach-jz4740/base.h
+Removing arch/mips/include/asm/mach-emma2rh/irq.h
+Removing arch/mips/include/asm/mach-au1x00/ioremap.h
+Removing arch/mips/include/asm/lasat/serial.h
+Removing arch/mips/include/asm/lasat/picvue.h
+Removing arch/mips/include/asm/lasat/lasatint.h
+Removing arch/mips/include/asm/lasat/lasat.h
+Removing arch/mips/include/asm/lasat/head.h
+Removing arch/mips/include/asm/lasat/eeprom.h
+Removing arch/mips/include/asm/lasat/ds1603.h
+Removing arch/mips/include/asm/emma/markeins.h
+Removing arch/mips/include/asm/emma/emma2rh.h
+Removing arch/mips/include/asm/clock.h
+Removing arch/mips/emma/markeins/setup.c
+Removing arch/mips/emma/markeins/platform.c
+Removing arch/mips/emma/markeins/led.c
+Removing arch/mips/emma/markeins/irq.c
+Removing arch/mips/emma/markeins/Makefile
+Removing arch/mips/emma/common/prom.c
+Removing arch/mips/emma/common/Makefile
+Removing arch/mips/emma/Platform
+Removing arch/mips/emma/Makefile
+Removing arch/mips/configs/msp71xx_defconfig
+Removing arch/mips/configs/markeins_defconfig
+Removing arch/mips/configs/lasat_defconfig
+Auto-merging arch/mips/Kconfig
+Resolved 'arch/mips/include/asm/module.h' using previous resolution.
+Resolved 'arch/mips/loongson2ef/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 96a1f35e33e2] Merge remote-tracking branch 'mips/mips-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/mips/loongson/rs780e-acpi.yaml | 40 +
+ .../devicetree/bindings/pci/loongson.yaml | 62 ++
+ arch/mips/Kbuild | 2 +-
+ arch/mips/Kbuild.platforms | 76 +-
+ arch/mips/Kconfig | 174 ++--
+ arch/mips/Kconfig.debug | 10 +
+ arch/mips/Makefile | 48 +-
+ arch/mips/alchemy/Platform | 3 -
+ arch/mips/alchemy/common/setup.c | 17 +-
+ arch/mips/alchemy/devboards/db1550.c | 2 +-
+ arch/mips/ar7/Platform | 1 -
+ arch/mips/ar7/setup.c | 2 +-
+ arch/mips/ath25/Platform | 1 -
+ arch/mips/ath79/Platform | 1 -
+ arch/mips/ath79/setup.c | 3 +-
+ arch/mips/bcm47xx/Platform | 1 -
+ arch/mips/bcm63xx/Platform | 1 -
+ arch/mips/bcm63xx/cpu.c | 2 +-
+ arch/mips/bcm63xx/dev-flash.c | 2 +-
+ arch/mips/bmips/Platform | 1 -
+ arch/mips/boot/compressed/Makefile | 2 +-
+ arch/mips/boot/dts/Makefile | 30 +-
+ arch/mips/boot/dts/ingenic/ci20.dts | 3 +
+ arch/mips/boot/dts/ingenic/gcw0.dts | 505 ++++++++++-
+ arch/mips/boot/dts/ingenic/gcw0_proto.dts | 13 +
+ arch/mips/boot/dts/ingenic/jz4740.dtsi | 33 +-
+ arch/mips/boot/dts/ingenic/jz4770.dtsi | 227 ++++-
+ arch/mips/boot/dts/ingenic/jz4780.dtsi | 65 +-
+ arch/mips/boot/dts/ingenic/x1000.dtsi | 9 +-
+ arch/mips/boot/dts/loongson/rs780e-pch.dtsi | 17 +
+ arch/mips/boot/dts/mscc/ocelot.dtsi | 2 +-
+ arch/mips/boot/dts/qca/ar9331.dtsi | 2 +-
+ arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 6 +-
+ arch/mips/cavium-octeon/Platform | 1 -
+ .../mips/cavium-octeon/executive/cvmx-helper-npi.c | 12 -
+ arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +-
+ arch/mips/cavium-octeon/octeon-platform.c | 4 +-
+ arch/mips/cavium-octeon/octeon-usb.c | 2 +-
+ arch/mips/cobalt/Platform | 1 -
+ arch/mips/configs/ath79_defconfig | 1 -
+ arch/mips/configs/ci20_defconfig | 62 +-
+ arch/mips/configs/db1xxx_defconfig | 1 -
+ arch/mips/configs/gcw0_defconfig | 131 ++-
+ arch/mips/configs/generic/board-ocelot.config | 1 -
+ arch/mips/configs/lasat_defconfig | 55 --
+ arch/mips/configs/loongson3_defconfig | 4 +-
+ arch/mips/configs/markeins_defconfig | 185 ----
+ arch/mips/configs/msp71xx_defconfig | 77 --
+ arch/mips/configs/pistachio_defconfig | 1 -
+ arch/mips/configs/rt305x_defconfig | 1 -
+ arch/mips/dec/Platform | 1 -
+ arch/mips/dec/int-handler.S | 4 +-
+ arch/mips/dec/tc.c | 2 +-
+ arch/mips/emma/Makefile | 7 -
+ arch/mips/emma/Platform | 4 -
+ arch/mips/emma/common/Makefile | 6 -
+ arch/mips/emma/common/prom.c | 56 --
+ arch/mips/emma/markeins/Makefile | 6 -
+ arch/mips/emma/markeins/irq.c | 293 -------
+ arch/mips/emma/markeins/led.c | 44 -
+ arch/mips/emma/markeins/platform.c | 199 -----
+ arch/mips/emma/markeins/setup.c | 115 ---
+ arch/mips/fw/cfe/cfe_api.c | 5 -
+ arch/mips/generic/Platform | 1 -
+ arch/mips/include/asm/asm-eva.h | 2 +-
+ arch/mips/include/asm/asm.h | 24 +-
+ arch/mips/include/asm/asmmacro.h | 18 +-
+ arch/mips/include/asm/bootinfo.h | 13 +-
+ arch/mips/include/asm/branch.h | 3 +
+ arch/mips/include/asm/cacheops.h | 2 +-
+ arch/mips/include/asm/clock.h | 49 --
+ arch/mips/include/asm/compiler.h | 5 +
+ arch/mips/include/asm/cpu-features.h | 47 +-
+ arch/mips/include/asm/cpu-info.h | 11 +-
+ arch/mips/include/asm/cpu-type.h | 7 +-
+ arch/mips/include/asm/cpu.h | 18 +-
+ arch/mips/include/asm/emma/emma2rh.h | 248 ------
+ arch/mips/include/asm/emma/markeins.h | 28 -
+ arch/mips/include/asm/fpu.h | 6 +-
+ arch/mips/include/asm/fpu_emulator.h | 4 -
+ arch/mips/include/asm/hazards.h | 8 +-
+ arch/mips/include/asm/io.h | 87 +-
+ arch/mips/include/asm/lasat/ds1603.h | 19 -
+ arch/mips/include/asm/lasat/eeprom.h | 18 -
+ arch/mips/include/asm/lasat/head.h | 23 -
+ arch/mips/include/asm/lasat/lasat.h | 245 ------
+ arch/mips/include/asm/lasat/lasatint.h | 15 -
+ arch/mips/include/asm/lasat/picvue.h | 16 -
+ arch/mips/include/asm/lasat/serial.h | 14 -
+ arch/mips/include/asm/maar.h | 17 +-
+ .../include/asm/mach-ath25/cpu-feature-overrides.h | 1 -
+ .../include/asm/mach-ath79/cpu-feature-overrides.h | 1 -
+ arch/mips/include/asm/mach-au1x00/ioremap.h | 38 -
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 6 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 +-
+ arch/mips/include/asm/mach-bcm63xx/ioremap.h | 5 -
+ arch/mips/include/asm/mach-bmips/ioremap.h | 5 -
+ arch/mips/include/asm/mach-emma2rh/irq.h | 15 -
+ arch/mips/include/asm/mach-generic/ioremap.h | 9 -
+ arch/mips/include/asm/mach-generic/irq.h | 6 -
+ arch/mips/include/asm/mach-ip27/spaces.h | 12 +-
+ arch/mips/include/asm/mach-ip30/war.h | 6 +-
+ arch/mips/include/asm/mach-jz4740/base.h | 27 -
+ arch/mips/include/asm/mach-jz4740/dma.h | 23 -
+ arch/mips/include/asm/mach-jz4740/irq.h | 45 +-
+ arch/mips/include/asm/mach-jz4740/timer.h | 126 ---
+ .../asm/mach-lantiq/falcon/cpu-feature-overrides.h | 1 -
+ arch/mips/include/asm/mach-lasat/irq.h | 14 -
+ arch/mips/include/asm/mach-lasat/mach-gt64120.h | 28 -
+ arch/mips/include/asm/mach-loongson2ef/loongson.h | 1 +
+ arch/mips/include/asm/mach-loongson64/boot_param.h | 11 +
+ .../asm/mach-loongson64/cpu-feature-overrides.h | 1 +
+ .../mips/include/asm/mach-loongson64/cpucfg-emul.h | 74 ++
+ .../include/asm/mach-loongson64/loongson_regs.h | 29 +-
+ .../mips/include/asm/mach-loongson64/mc146818rtc.h | 36 -
+ arch/mips/include/asm/mach-loongson64/spaces.h | 8 +
+ .../asm/mach-pmcs-msp71xx/cpu-feature-overrides.h | 22 -
+ .../include/asm/mach-pmcs-msp71xx/msp_cic_int.h | 139 ---
+ .../asm/mach-pmcs-msp71xx/msp_gpio_macros.h | 343 --------
+ arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h | 31 -
+ arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h | 189 -----
+ arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h | 159 ----
+ .../include/asm/mach-pmcs-msp71xx/msp_regops.h | 237 ------
+ arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h | 652 --------------
+ .../include/asm/mach-pmcs-msp71xx/msp_slp_int.h | 129 ---
+ arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h | 124 ---
+ arch/mips/include/asm/mach-pmcs-msp71xx/war.h | 28 -
+ .../asm/mach-ralink/mt7620/cpu-feature-overrides.h | 1 -
+ arch/mips/include/asm/mach-ralink/mt7621.h | 2 -
+ .../asm/mach-ralink/mt7621/cpu-feature-overrides.h | 1 -
+ .../asm/mach-ralink/rt288x/cpu-feature-overrides.h | 1 -
+ .../asm/mach-ralink/rt305x/cpu-feature-overrides.h | 1 -
+ .../asm/mach-ralink/rt3883/cpu-feature-overrides.h | 1 -
+ .../asm/mach-rc32434/cpu-feature-overrides.h | 1 -
+ arch/mips/include/asm/mach-rc32434/pci.h | 3 -
+ arch/mips/include/asm/mach-tx39xx/ioremap.h | 9 -
+ arch/mips/include/asm/mach-tx49xx/ioremap.h | 9 -
+ arch/mips/include/asm/mach-xilfpga/irq.h | 14 -
+ arch/mips/include/asm/mipsregs.h | 61 +-
+ arch/mips/include/asm/nile4.h | 310 -------
+ arch/mips/include/asm/octeon/cvmx-sli-defs.h | 2 +-
+ arch/mips/include/asm/page.h | 2 +-
+ arch/mips/include/asm/pgtable-64.h | 4 +-
+ arch/mips/include/asm/pgtable-bits.h | 20 +-
+ arch/mips/include/asm/pgtable.h | 108 ++-
+ arch/mips/include/asm/smp.h | 2 +-
+ arch/mips/include/asm/stackframe.h | 2 +-
+ arch/mips/include/asm/switch_to.h | 8 +-
+ arch/mips/include/asm/unaligned-emul.h | 779 +++++++++++++++++
+ arch/mips/include/uapi/asm/hwcap.h | 1 +
+ arch/mips/include/uapi/asm/inst.h | 26 +
+ arch/mips/jazz/Platform | 1 -
+ arch/mips/jz4740/Kconfig | 9 +-
+ arch/mips/jz4740/Makefile | 7 +-
+ arch/mips/jz4740/Platform | 1 -
+ arch/mips/jz4740/pm.c | 34 -
+ arch/mips/jz4740/prom.c | 19 -
+ arch/mips/jz4740/reset.c | 24 -
+ arch/mips/jz4740/reset.h | 7 -
+ arch/mips/jz4740/setup.c | 64 +-
+ arch/mips/jz4740/time.c | 17 -
+ arch/mips/jz4740/timer.c | 42 -
+ arch/mips/kernel/8250-platform.c | 46 -
+ arch/mips/kernel/Makefile | 2 -
+ arch/mips/kernel/branch.c | 26 +-
+ arch/mips/kernel/cevt-r4k.c | 44 +
+ arch/mips/kernel/cps-vec-ns16550.S | 18 +-
+ arch/mips/kernel/cpu-probe.c | 171 +++-
+ arch/mips/kernel/csrc-r4k.c | 40 +
+ arch/mips/kernel/entry.S | 6 +-
+ arch/mips/kernel/genex.S | 12 +-
+ arch/mips/kernel/head.S | 3 +
+ arch/mips/kernel/idle.c | 5 +-
+ arch/mips/kernel/mips-cm.c | 66 +-
+ arch/mips/kernel/mips-r2-to-r6-emul.c | 2 +-
+ arch/mips/kernel/perf_event_mipsxx.c | 373 +++++++-
+ arch/mips/kernel/proc.c | 4 +
+ arch/mips/kernel/r4k_fpu.S | 14 +-
+ arch/mips/kernel/scall64-o32.S | 2 +-
+ arch/mips/kernel/setup.c | 18 +-
+ arch/mips/kernel/signal.c | 4 +-
+ arch/mips/kernel/spram.c | 4 +-
+ arch/mips/kernel/time.c | 70 ++
+ arch/mips/kernel/traps.c | 52 +-
+ arch/mips/kernel/unaligned.c | 776 +----------------
+ arch/mips/kernel/vmlinux.lds.S | 2 +-
+ arch/mips/kernel/watch.c | 26 +-
+ arch/mips/kvm/emulate.c | 12 +-
+ arch/mips/kvm/mips.c | 4 +-
+ arch/mips/kvm/tlb.c | 4 +-
+ arch/mips/kvm/vz.c | 16 +-
+ arch/mips/lantiq/Platform | 1 -
+ arch/mips/lasat/Kconfig | 16 -
+ arch/mips/lasat/Makefile | 15 -
+ arch/mips/lasat/Platform | 7 -
+ arch/mips/lasat/at93c.c | 148 ----
+ arch/mips/lasat/at93c.h | 19 -
+ arch/mips/lasat/ds1603.c | 190 -----
+ arch/mips/lasat/ds1603.h | 32 -
+ arch/mips/lasat/image/Makefile | 53 --
+ arch/mips/lasat/image/head.S | 32 -
+ arch/mips/lasat/image/romscript.normal | 23 -
+ arch/mips/lasat/interrupt.c | 119 ---
+ arch/mips/lasat/lasat_board.c | 268 ------
+ arch/mips/lasat/lasat_models.h | 68 --
+ arch/mips/lasat/picvue.c | 242 ------
+ arch/mips/lasat/picvue.h | 45 -
+ arch/mips/lasat/picvue_proc.c | 208 -----
+ arch/mips/lasat/prom.c | 126 ---
+ arch/mips/lasat/prom.h | 8 -
+ arch/mips/lasat/reset.c | 48 --
+ arch/mips/lasat/serial.c | 80 --
+ arch/mips/lasat/setup.c | 141 ---
+ arch/mips/lasat/sysctl.c | 268 ------
+ arch/mips/lib/csum_partial.S | 6 +-
+ arch/mips/loongson2ef/Kconfig | 1 -
+ arch/mips/loongson2ef/Platform | 1 -
+ arch/mips/loongson2ef/common/init.c | 4 +-
+ arch/mips/loongson2ef/lemote-2f/clock.c | 98 +--
+ arch/mips/loongson32/Platform | 1 -
+ arch/mips/loongson64/Kconfig | 12 +-
+ arch/mips/loongson64/Makefile | 6 +-
+ arch/mips/loongson64/Platform | 1 -
+ arch/mips/loongson64/cop2-ex.c | 290 ++++++-
+ arch/mips/loongson64/cpucfg-emul.c | 227 +++++
+ arch/mips/loongson64/dma.c | 9 +-
+ arch/mips/loongson64/env.c | 20 +
+ arch/mips/loongson64/init.c | 63 +-
+ arch/mips/loongson64/pci.c | 51 --
+ arch/mips/loongson64/rtc.c | 39 -
+ arch/mips/loongson64/time.c | 8 +-
+ arch/mips/loongson64/vbios_quirk.c | 29 +
+ arch/mips/math-emu/cp1emu.c | 28 +-
+ arch/mips/math-emu/dp_add.c | 3 +-
+ arch/mips/math-emu/dp_div.c | 3 +-
+ arch/mips/math-emu/dp_fmax.c | 6 +-
+ arch/mips/math-emu/dp_fmin.c | 6 +-
+ arch/mips/math-emu/dp_maddf.c | 3 +-
+ arch/mips/math-emu/dp_mul.c | 3 +-
+ arch/mips/math-emu/dp_sqrt.c | 5 +-
+ arch/mips/math-emu/dp_sub.c | 3 +-
+ arch/mips/math-emu/sp_add.c | 3 +-
+ arch/mips/math-emu/sp_div.c | 3 +-
+ arch/mips/math-emu/sp_fdp.c | 3 +-
+ arch/mips/math-emu/sp_fmax.c | 6 +-
+ arch/mips/math-emu/sp_fmin.c | 6 +-
+ arch/mips/math-emu/sp_maddf.c | 3 +-
+ arch/mips/math-emu/sp_mul.c | 3 +-
+ arch/mips/math-emu/sp_sub.c | 3 +-
+ arch/mips/mm/Makefile | 2 +-
+ arch/mips/mm/c-r4k.c | 31 +-
+ arch/mips/mm/cache.c | 1 -
+ arch/mips/mm/dma-noncoherent.c | 1 +
+ arch/mips/mm/init.c | 8 +-
+ arch/mips/mm/ioremap.c | 151 +---
+ arch/mips/mm/ioremap64.c | 23 +
+ arch/mips/mm/sc-mips.c | 7 +-
+ arch/mips/mm/tlbex.c | 2 +-
+ arch/mips/mti-malta/Platform | 1 -
+ arch/mips/mti-malta/malta-init.c | 8 +-
+ arch/mips/netlogic/Platform | 1 -
+ arch/mips/netlogic/xlr/fmn.c | 2 +-
+ arch/mips/oprofile/common.c | 2 +-
+ arch/mips/oprofile/op_model_mipsxx.c | 26 +-
+ arch/mips/paravirt/Platform | 1 -
+ arch/mips/pci/Makefile | 7 -
+ arch/mips/pci/fixup-emma2rh.c | 84 --
+ arch/mips/pci/fixup-loongson3.c | 71 --
+ arch/mips/pci/fixup-pmcmsp.c | 216 -----
+ arch/mips/pci/fixup-sni.c | 3 +-
+ arch/mips/pci/ops-bcm63xx.c | 2 +-
+ arch/mips/pci/ops-emma2rh.c | 167 ----
+ arch/mips/pci/ops-loongson3.c | 116 ---
+ arch/mips/pci/ops-nile4.c | 136 ---
+ arch/mips/pci/ops-pmcmsp.c | 944 ---------------------
+ arch/mips/pci/pci-alchemy.c | 2 +-
+ arch/mips/pci/pci-emma2rh.c | 72 --
+ arch/mips/pci/pci-lasat.c | 88 --
+ arch/mips/pic32/Platform | 1 -
+ arch/mips/pistachio/Platform | 1 -
+ arch/mips/pistachio/init.c | 8 +-
+ arch/mips/pmcs-msp71xx/Kconfig | 50 --
+ arch/mips/pmcs-msp71xx/Makefile | 13 -
+ arch/mips/pmcs-msp71xx/Platform | 7 -
+ arch/mips/pmcs-msp71xx/msp_elb.c | 46 -
+ arch/mips/pmcs-msp71xx/msp_eth.c | 111 ---
+ arch/mips/pmcs-msp71xx/msp_hwbutton.c | 165 ----
+ arch/mips/pmcs-msp71xx/msp_irq.c | 155 ----
+ arch/mips/pmcs-msp71xx/msp_irq_cic.c | 208 -----
+ arch/mips/pmcs-msp71xx/msp_irq_per.c | 127 ---
+ arch/mips/pmcs-msp71xx/msp_irq_slp.c | 102 ---
+ arch/mips/pmcs-msp71xx/msp_pci.c | 50 --
+ arch/mips/pmcs-msp71xx/msp_prom.c | 513 -----------
+ arch/mips/pmcs-msp71xx/msp_serial.c | 154 ----
+ arch/mips/pmcs-msp71xx/msp_setup.c | 228 -----
+ arch/mips/pmcs-msp71xx/msp_smp.c | 56 --
+ arch/mips/pmcs-msp71xx/msp_time.c | 90 --
+ arch/mips/pmcs-msp71xx/msp_usb.c | 173 ----
+ arch/mips/pnx833x/Platform | 1 -
+ arch/mips/ralink/Platform | 1 -
+ arch/mips/ralink/bootrom.c | 2 +-
+ arch/mips/ralink/mt7621.c | 43 -
+ arch/mips/rb532/Platform | 1 -
+ arch/mips/sgi-ip22/Platform | 2 -
+ arch/mips/sgi-ip27/Platform | 3 -
+ arch/mips/sgi-ip27/ip27-timer.c | 9 -
+ arch/mips/sgi-ip30/Platform | 3 -
+ arch/mips/sgi-ip32/Platform | 1 -
+ arch/mips/sibyte/Platform | 4 -
+ arch/mips/sni/Platform | 1 -
+ arch/mips/tools/elf-entry.c | 9 +-
+ arch/mips/tools/loongson3-llsc-check.c | 2 +
+ arch/mips/txx9/Kconfig | 14 +-
+ arch/mips/txx9/Platform | 3 -
+ arch/mips/vdso/Kconfig | 18 +
+ arch/mips/vdso/Makefile | 43 +-
+ arch/mips/vdso/vdso.lds.S | 2 +-
+ arch/mips/vr41xx/Makefile | 5 +
+ arch/mips/vr41xx/Platform | 3 -
+ drivers/cpufreq/loongson2_cpufreq.c | 22 +-
+ drivers/pci/controller/Kconfig | 10 +
+ drivers/pci/controller/Makefile | 1 +
+ drivers/pci/controller/pci-loongson.c | 247 ++++++
+ drivers/pci/probe.c | 2 +-
+ drivers/platform/mips/Kconfig | 6 +
+ drivers/platform/mips/Makefile | 1 +
+ .../platform/mips/rs780e-acpi.c | 58 +-
+ include/asm-generic/pgtable.h | 33 +
+ init/Kconfig | 3 +
+ mm/memory.c | 30 +-
+ sound/soc/txx9/txx9aclc-ac97.c | 1 +
+ 331 files changed, 4668 insertions(+), 13056 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mips/loongson/rs780e-acpi.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/loongson.yaml
+ create mode 100644 arch/mips/boot/dts/ingenic/gcw0_proto.dts
+ delete mode 100644 arch/mips/configs/lasat_defconfig
+ delete mode 100644 arch/mips/configs/markeins_defconfig
+ delete mode 100644 arch/mips/configs/msp71xx_defconfig
+ delete mode 100644 arch/mips/emma/Makefile
+ delete mode 100644 arch/mips/emma/Platform
+ delete mode 100644 arch/mips/emma/common/Makefile
+ delete mode 100644 arch/mips/emma/common/prom.c
+ delete mode 100644 arch/mips/emma/markeins/Makefile
+ delete mode 100644 arch/mips/emma/markeins/irq.c
+ delete mode 100644 arch/mips/emma/markeins/led.c
+ delete mode 100644 arch/mips/emma/markeins/platform.c
+ delete mode 100644 arch/mips/emma/markeins/setup.c
+ delete mode 100644 arch/mips/include/asm/clock.h
+ delete mode 100644 arch/mips/include/asm/emma/emma2rh.h
+ delete mode 100644 arch/mips/include/asm/emma/markeins.h
+ delete mode 100644 arch/mips/include/asm/lasat/ds1603.h
+ delete mode 100644 arch/mips/include/asm/lasat/eeprom.h
+ delete mode 100644 arch/mips/include/asm/lasat/head.h
+ delete mode 100644 arch/mips/include/asm/lasat/lasat.h
+ delete mode 100644 arch/mips/include/asm/lasat/lasatint.h
+ delete mode 100644 arch/mips/include/asm/lasat/picvue.h
+ delete mode 100644 arch/mips/include/asm/lasat/serial.h
+ delete mode 100644 arch/mips/include/asm/mach-au1x00/ioremap.h
+ delete mode 100644 arch/mips/include/asm/mach-emma2rh/irq.h
+ delete mode 100644 arch/mips/include/asm/mach-jz4740/base.h
+ delete mode 100644 arch/mips/include/asm/mach-jz4740/dma.h
+ delete mode 100644 arch/mips/include/asm/mach-jz4740/timer.h
+ delete mode 100644 arch/mips/include/asm/mach-lasat/irq.h
+ delete mode 100644 arch/mips/include/asm/mach-lasat/mach-gt64120.h
+ create mode 100644 arch/mips/include/asm/mach-loongson64/cpucfg-emul.h
+ delete mode 100644 arch/mips/include/asm/mach-loongson64/mc146818rtc.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/cpu-feature-overrides.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h
+ delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/war.h
+ delete mode 100644 arch/mips/include/asm/mach-xilfpga/irq.h
+ delete mode 100644 arch/mips/include/asm/nile4.h
+ create mode 100644 arch/mips/include/asm/unaligned-emul.h
+ delete mode 100644 arch/mips/jz4740/pm.c
+ delete mode 100644 arch/mips/jz4740/prom.c
+ delete mode 100644 arch/mips/jz4740/reset.c
+ delete mode 100644 arch/mips/jz4740/reset.h
+ delete mode 100644 arch/mips/jz4740/time.c
+ delete mode 100644 arch/mips/jz4740/timer.c
+ delete mode 100644 arch/mips/kernel/8250-platform.c
+ delete mode 100644 arch/mips/lasat/Kconfig
+ delete mode 100644 arch/mips/lasat/Makefile
+ delete mode 100644 arch/mips/lasat/Platform
+ delete mode 100644 arch/mips/lasat/at93c.c
+ delete mode 100644 arch/mips/lasat/at93c.h
+ delete mode 100644 arch/mips/lasat/ds1603.c
+ delete mode 100644 arch/mips/lasat/ds1603.h
+ delete mode 100644 arch/mips/lasat/image/Makefile
+ delete mode 100644 arch/mips/lasat/image/head.S
+ delete mode 100644 arch/mips/lasat/image/romscript.normal
+ delete mode 100644 arch/mips/lasat/interrupt.c
+ delete mode 100644 arch/mips/lasat/lasat_board.c
+ delete mode 100644 arch/mips/lasat/lasat_models.h
+ delete mode 100644 arch/mips/lasat/picvue.c
+ delete mode 100644 arch/mips/lasat/picvue.h
+ delete mode 100644 arch/mips/lasat/picvue_proc.c
+ delete mode 100644 arch/mips/lasat/prom.c
+ delete mode 100644 arch/mips/lasat/prom.h
+ delete mode 100644 arch/mips/lasat/reset.c
+ delete mode 100644 arch/mips/lasat/serial.c
+ delete mode 100644 arch/mips/lasat/setup.c
+ delete mode 100644 arch/mips/lasat/sysctl.c
+ create mode 100644 arch/mips/loongson64/cpucfg-emul.c
+ delete mode 100644 arch/mips/loongson64/pci.c
+ delete mode 100644 arch/mips/loongson64/rtc.c
+ create mode 100644 arch/mips/loongson64/vbios_quirk.c
+ create mode 100644 arch/mips/mm/ioremap64.c
+ delete mode 100644 arch/mips/pci/fixup-emma2rh.c
+ delete mode 100644 arch/mips/pci/fixup-loongson3.c
+ delete mode 100644 arch/mips/pci/fixup-pmcmsp.c
+ delete mode 100644 arch/mips/pci/ops-emma2rh.c
+ delete mode 100644 arch/mips/pci/ops-loongson3.c
+ delete mode 100644 arch/mips/pci/ops-nile4.c
+ delete mode 100644 arch/mips/pci/ops-pmcmsp.c
+ delete mode 100644 arch/mips/pci/pci-emma2rh.c
+ delete mode 100644 arch/mips/pci/pci-lasat.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/Kconfig
+ delete mode 100644 arch/mips/pmcs-msp71xx/Makefile
+ delete mode 100644 arch/mips/pmcs-msp71xx/Platform
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_elb.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_eth.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_hwbutton.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_irq.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_irq_cic.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_irq_per.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_irq_slp.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_pci.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_prom.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_serial.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_setup.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_smp.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_time.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_usb.c
+ create mode 100644 arch/mips/vdso/Kconfig
+ create mode 100644 arch/mips/vr41xx/Makefile
+ create mode 100644 drivers/pci/controller/pci-loongson.c
+ rename arch/mips/loongson64/acpi_init.c => drivers/platform/mips/rs780e-acpi.c (70%)
+$ git am -3 ../patches/0001-mips-vermagic-updates.patch
+Applying: mips: vermagic updates
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/mips/include/asm/vermagic.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 13c17c2d822e] Merge remote-tracking branch 'mips/mips-next'
+ Date: Tue Jun 2 09:09:24 2020 +1000
+Merging nds32/next (d785c5a324cd nds32: configs: Cleanup CONFIG_CROSS_COMPILE)
+$ git merge nds32/next
+Merge made by the 'recursive' strategy.
+ arch/nds32/configs/defconfig | 1 -
+ arch/nds32/kernel/time.c | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+Merging nios2/for-next (0ec8a5054d7f MAINTAINERS: Remove nios2-dev@lists.rocketboards.org)
+$ git merge nios2/for-next
+Already up to date.
+Merging openrisc/for-next (6bd140e14d9a openrisc: Fix issue with argument clobbering for clone/fork)
+$ git merge openrisc/for-next
+Merge made by the 'recursive' strategy.
+ arch/openrisc/kernel/entry.S | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging parisc-hd/for-next (775024cf49ff parisc: MAINTAINERS: Update references to parisc website)
+$ git merge parisc-hd/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ arch/parisc/Kconfig | 2 +-
+ arch/parisc/Makefile | 4 ++--
+ arch/parisc/boot/compressed/Makefile | 1 +
+ arch/parisc/kernel/firmware.c | 3 ++-
+ arch/parisc/kernel/hardware.c | 3 ++-
+ arch/parisc/kernel/module.c | 4 ++--
+ kernel/sysctl.c | 20 +++++++++++---------
+ 8 files changed, 22 insertions(+), 17 deletions(-)
+Merging powerpc/next (30df74d67d48 powerpc/watchpoint/xmon: Support 2nd DAWR)
+$ git merge powerpc/next
+Auto-merging include/asm-generic/pgtable.h
+Auto-merging arch/powerpc/mm/nohash/8xx.c
+Auto-merging arch/powerpc/kernel/setup_64.c
+Auto-merging arch/powerpc/kernel/nvram_64.c
+Auto-merging arch/powerpc/kernel/exceptions-64s.S
+Auto-merging arch/powerpc/include/asm/uaccess.h
+Auto-merging arch/powerpc/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 39 +
+ Documentation/powerpc/index.rst | 1 +
+ Documentation/powerpc/vas-api.rst | 292 ++++++
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
+ MAINTAINERS | 2 +-
+ arch/powerpc/Kconfig | 3 +-
+ arch/powerpc/boot/dts/pcm032.dts | 4 +-
+ arch/powerpc/boot/wrapper | 3 +-
+ arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +-
+ arch/powerpc/include/asm/book3s/64/mmu.h | 3 +
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 20 +-
+ arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 3 +-
+ arch/powerpc/include/asm/code-patching.h | 37 +-
+ arch/powerpc/include/asm/cputable.h | 6 +-
+ arch/powerpc/include/asm/debug.h | 2 +-
+ arch/powerpc/include/asm/fadump-internal.h | 4 +-
+ arch/powerpc/include/asm/firmware.h | 1 +
+ arch/powerpc/include/asm/ftrace.h | 14 +
+ arch/powerpc/include/asm/hw_breakpoint.h | 32 +-
+ arch/powerpc/include/asm/icswx.h | 20 +-
+ arch/powerpc/include/asm/idle.h | 93 ++
+ arch/powerpc/include/asm/inst.h | 109 +++
+ arch/powerpc/include/asm/iommu.h | 4 +-
+ arch/powerpc/include/asm/kprobes.h | 2 +-
+ arch/powerpc/include/asm/kvm_book3s.h | 2 +-
+ arch/powerpc/include/asm/kvm_book3s_64.h | 34 +-
+ arch/powerpc/include/asm/mmu.h | 9 -
+ arch/powerpc/include/asm/mmu_context.h | 30 +
+ arch/powerpc/include/asm/nohash/32/pgtable.h | 4 +-
+ arch/powerpc/include/asm/page.h | 7 -
+ arch/powerpc/include/asm/ppc-opcode.h | 3 +
+ arch/powerpc/include/asm/processor.h | 10 +-
+ arch/powerpc/include/asm/ptrace.h | 46 +-
+ arch/powerpc/include/asm/reg.h | 13 +-
+ arch/powerpc/include/asm/sstep.h | 17 +-
+ arch/powerpc/include/asm/switch_to.h | 2 -
+ arch/powerpc/include/asm/syscall.h | 5 +-
+ arch/powerpc/include/asm/uaccess.h | 45 +
+ arch/powerpc/include/asm/uprobes.h | 7 +-
+ arch/powerpc/include/asm/vas.h | 13 +-
+ arch/powerpc/include/asm/xive.h | 9 +-
+ arch/powerpc/include/uapi/asm/vas-api.h | 24 +
+ arch/powerpc/kernel/align.c | 18 +-
+ arch/powerpc/kernel/asm-offsets.c | 8 +
+ arch/powerpc/kernel/crash_dump.c | 7 +-
+ arch/powerpc/kernel/dawr.c | 23 +-
+ arch/powerpc/kernel/eeh.c | 31 +
+ arch/powerpc/kernel/epapr_paravirt.c | 7 +-
+ arch/powerpc/kernel/exceptions-64s.S | 47 +-
+ arch/powerpc/kernel/fadump.c | 153 ++-
+ arch/powerpc/kernel/head_64.S | 9 +-
+ arch/powerpc/kernel/head_booke.h | 2 +-
+ arch/powerpc/kernel/hw_breakpoint.c | 641 ++++++++++--
+ arch/powerpc/kernel/jump_label.c | 5 +-
+ arch/powerpc/kernel/kgdb.c | 9 +-
+ arch/powerpc/kernel/kprobes.c | 37 +-
+ arch/powerpc/kernel/mce.c | 16 +-
+ arch/powerpc/kernel/mce_power.c | 19 +-
+ arch/powerpc/kernel/module_32.c | 17 +-
+ arch/powerpc/kernel/module_64.c | 20 +-
+ arch/powerpc/kernel/nvram_64.c | 4 +-
+ arch/powerpc/kernel/optprobes.c | 100 +-
+ arch/powerpc/kernel/optprobes_head.S | 3 +
+ arch/powerpc/kernel/pci-hotplug.c | 2 -
+ arch/powerpc/kernel/pci_64.c | 6 +-
+ arch/powerpc/kernel/process.c | 113 +--
+ arch/powerpc/kernel/prom.c | 10 +-
+ arch/powerpc/kernel/prom_init.c | 24 +-
+ arch/powerpc/kernel/ptrace/ptrace-noadv.c | 72 +-
+ arch/powerpc/kernel/ptrace/ptrace-tm.c | 2 +-
+ arch/powerpc/kernel/ptrace/ptrace-view.c | 2 +-
+ arch/powerpc/kernel/ptrace/ptrace32.c | 4 +-
+ arch/powerpc/kernel/security.c | 48 +-
+ arch/powerpc/kernel/setup_32.c | 8 +-
+ arch/powerpc/kernel/setup_64.c | 15 +-
+ arch/powerpc/kernel/signal.c | 22 +-
+ arch/powerpc/kernel/signal_32.c | 2 +-
+ arch/powerpc/kernel/signal_64.c | 10 +-
+ arch/powerpc/kernel/sysfs.c | 82 +-
+ arch/powerpc/kernel/trace/ftrace.c | 168 ++--
+ arch/powerpc/kernel/traps.c | 45 +-
+ arch/powerpc/kernel/uprobes.c | 5 +-
+ arch/powerpc/kernel/vecemu.c | 20 +-
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 13 +-
+ arch/powerpc/kvm/book3s_64_mmu_radix.c | 38 +-
+ arch/powerpc/kvm/book3s_64_vio_hv.c | 66 +-
+ arch/powerpc/kvm/book3s_hv.c | 12 +-
+ arch/powerpc/kvm/book3s_hv_nested.c | 39 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 60 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 18 +-
+ arch/powerpc/kvm/emulate_loadstore.c | 2 +-
+ arch/powerpc/lib/Makefile | 2 +-
+ arch/powerpc/lib/code-patching.c | 313 +++---
+ arch/powerpc/lib/feature-fixups-test.S | 69 ++
+ arch/powerpc/lib/feature-fixups.c | 162 ++-
+ arch/powerpc/lib/inst.c | 73 ++
+ arch/powerpc/lib/sstep.c | 460 ++++++---
+ arch/powerpc/lib/test_code-patching.S | 20 +
+ arch/powerpc/lib/test_emulate_step.c | 56 +-
+ arch/powerpc/mm/book3s64/hash_pgtable.c | 11 -
+ arch/powerpc/mm/book3s64/hash_tlb.c | 22 +-
+ arch/powerpc/mm/book3s64/hash_utils.c | 62 +-
+ arch/powerpc/mm/book3s64/pgtable.c | 24 +-
+ arch/powerpc/mm/book3s64/radix_pgtable.c | 21 +-
+ arch/powerpc/mm/fault.c | 92 +-
+ arch/powerpc/mm/hugetlbpage.c | 2 +-
+ arch/powerpc/mm/init_64.c | 4 +-
+ arch/powerpc/mm/nohash/8xx.c | 5 +-
+ arch/powerpc/mm/slice.c | 2 +-
+ arch/powerpc/perf/8xx-pmu.c | 9 +-
+ arch/powerpc/perf/callchain_64.c | 46 +-
+ arch/powerpc/perf/core-book3s.c | 4 +-
+ arch/powerpc/platforms/86xx/mpc86xx_smp.c | 5 +-
+ arch/powerpc/platforms/cell/iommu.c | 6 +-
+ arch/powerpc/platforms/powermac/bootx_init.c | 14 +-
+ arch/powerpc/platforms/powermac/nvram.c | 2 +-
+ arch/powerpc/platforms/powermac/smp.c | 5 +-
+ arch/powerpc/platforms/powernv/Makefile | 2 +-
+ arch/powerpc/platforms/powernv/idle.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-fadump.c | 2 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 10 +-
+ arch/powerpc/platforms/powernv/vas-api.c | 278 ++++++
+ arch/powerpc/platforms/powernv/vas-debug.c | 2 +-
+ arch/powerpc/platforms/powernv/vas-fault.c | 382 ++++++++
+ arch/powerpc/platforms/powernv/vas-window.c | 238 ++++-
+ arch/powerpc/platforms/powernv/vas.c | 85 +-
+ arch/powerpc/platforms/powernv/vas.h | 59 +-
+ arch/powerpc/platforms/ps3/mm.c | 52 +-
+ arch/powerpc/platforms/ps3/setup.c | 2 +-
+ arch/powerpc/platforms/pseries/eeh_pseries.c | 8 +-
+ arch/powerpc/platforms/pseries/ras.c | 62 +-
+ arch/powerpc/platforms/pseries/rtas-fadump.c | 2 +-
+ arch/powerpc/platforms/pseries/setup.c | 22 +-
+ arch/powerpc/sysdev/xive/native.c | 6 +-
+ arch/powerpc/tools/head_check.sh | 8 +-
+ arch/powerpc/xmon/Makefile | 2 +-
+ arch/powerpc/xmon/xmon.c | 223 +++--
+ arch/powerpc/xmon/xmon_bpts.S | 11 +
+ arch/powerpc/xmon/xmon_bpts.h | 14 +
+ arch/s390/include/asm/pgtable.h | 4 +-
+ drivers/block/ps3disk.c | 1 -
+ drivers/cpuidle/cpuidle-pseries.c | 39 +-
+ drivers/crypto/nx/Makefile | 2 +-
+ .../nx/{nx-842-powernv.c => nx-common-powernv.c} | 204 ++--
+ drivers/macintosh/windfarm_pm112.c | 21 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 -
+ drivers/ps3/ps3-lpm.c | 8 +-
+ drivers/ps3/ps3-vuart.c | 5 +-
+ drivers/vfio/pci/vfio_pci_nvlink2.c | 2 +-
+ drivers/video/fbdev/ps3fb.c | 4 +-
+ include/asm-generic/pgtable.h | 4 +-
+ kernel/events/hw_breakpoint.c | 16 +
+ mm/huge_memory.c | 4 +-
+ sound/ppc/snd_ps3.c | 2 +-
+ tools/testing/selftests/powerpc/Makefile | 1 +
+ .../selftests/powerpc/nx-gzip/99-nx-gzip.rules | 1 +
+ tools/testing/selftests/powerpc/nx-gzip/Makefile | 8 +
+ tools/testing/selftests/powerpc/nx-gzip/README | 45 +
+ .../testing/selftests/powerpc/nx-gzip/gunz_test.c | 1028 ++++++++++++++++++++
+ .../testing/selftests/powerpc/nx-gzip/gzfht_test.c | 433 +++++++++
+ tools/testing/selftests/powerpc/nx-gzip/gzip_vas.c | 316 ++++++
+ .../selftests/powerpc/nx-gzip/include/copy-paste.h | 56 ++
+ .../selftests/powerpc/nx-gzip/include/crb.h | 155 +++
+ .../testing/selftests/powerpc/nx-gzip/include/nx.h | 38 +
+ .../selftests/powerpc/nx-gzip/include/nx_dbg.h | 95 ++
+ .../selftests/powerpc/nx-gzip/include/nxu.h | 650 +++++++++++++
+ .../selftests/powerpc/nx-gzip/include/vas-api.h | 1 +
+ .../selftests/powerpc/nx-gzip/nx-gzip-test.sh | 46 +
+ tools/testing/selftests/powerpc/pmu/.gitignore | 1 +
+ tools/testing/selftests/powerpc/pmu/Makefile | 8 +-
+ .../selftests/powerpc/pmu/count_stcx_fail.c | 161 +++
+ tools/testing/selftests/powerpc/pmu/ebb/trace.h | 4 +-
+ tools/testing/selftests/powerpc/pmu/loop.S | 35 +
+ tools/testing/selftests/powerpc/signal/Makefile | 2 +-
+ .../powerpc/signal/sig_sc_double_restart.c | 174 ++++
+ 175 files changed, 8041 insertions(+), 1561 deletions(-)
+ create mode 100644 Documentation/powerpc/vas-api.rst
+ create mode 100644 arch/powerpc/include/asm/idle.h
+ create mode 100644 arch/powerpc/include/asm/inst.h
+ create mode 100644 arch/powerpc/include/uapi/asm/vas-api.h
+ create mode 100644 arch/powerpc/lib/inst.c
+ create mode 100644 arch/powerpc/lib/test_code-patching.S
+ create mode 100644 arch/powerpc/platforms/powernv/vas-api.c
+ create mode 100644 arch/powerpc/platforms/powernv/vas-fault.c
+ create mode 100644 arch/powerpc/xmon/xmon_bpts.S
+ create mode 100644 arch/powerpc/xmon/xmon_bpts.h
+ rename drivers/crypto/nx/{nx-842-powernv.c => nx-common-powernv.c} (87%)
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/99-nx-gzip.rules
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/Makefile
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/README
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/gunz_test.c
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/gzfht_test.c
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/gzip_vas.c
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/copy-paste.h
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/crb.h
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/nx.h
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/nx_dbg.h
+ create mode 100644 tools/testing/selftests/powerpc/nx-gzip/include/nxu.h
+ create mode 120000 tools/testing/selftests/powerpc/nx-gzip/include/vas-api.h
+ create mode 100755 tools/testing/selftests/powerpc/nx-gzip/nx-gzip-test.sh
+ create mode 100644 tools/testing/selftests/powerpc/pmu/count_stcx_fail.c
+ create mode 100644 tools/testing/selftests/powerpc/signal/sig_sc_double_restart.c
+Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
+$ git merge fsl/next
+Already up to date.
+Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register)
+$ git merge soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (09c0533d129c soc: sifive: l2 cache: Mark l2_get_priv_group as static)
+$ git merge risc-v/for-next
+Auto-merging arch/riscv/mm/init.c
+Merge made by the 'recursive' strategy.
+ arch/riscv/Kbuild | 1 +
+ arch/riscv/Kconfig | 7 +
+ arch/riscv/Kconfig.socs | 17 +-
+ arch/riscv/boot/dts/Makefile | 2 +
+ arch/riscv/boot/dts/kendryte/Makefile | 4 +-
+ arch/riscv/configs/nommu_k210_defconfig | 7 +-
+ arch/riscv/include/asm/cacheinfo.h | 15 ++
+ arch/riscv/include/asm/gdb_xml.h | 117 ++++++++++
+ arch/riscv/include/asm/kdebug.h | 12 +
+ arch/riscv/include/asm/kgdb.h | 112 +++++++++
+ arch/riscv/include/asm/parse_asm.h | 219 ++++++++++++++++++
+ arch/riscv/include/asm/patch.h | 4 +-
+ arch/riscv/include/asm/soc.h | 39 ++++
+ arch/riscv/kernel/Makefile | 1 +
+ arch/riscv/kernel/cacheinfo.c | 17 ++
+ arch/riscv/kernel/ftrace.c | 15 +-
+ arch/riscv/kernel/head.S | 11 +-
+ arch/riscv/kernel/kgdb.c | 390 ++++++++++++++++++++++++++++++++
+ arch/riscv/kernel/patch.c | 46 ++--
+ arch/riscv/kernel/setup.c | 4 +
+ arch/riscv/kernel/soc.c | 27 +++
+ arch/riscv/kernel/traps.c | 5 +
+ arch/riscv/kernel/vmlinux.lds.S | 5 +
+ arch/riscv/mm/init.c | 9 +
+ drivers/soc/kendryte/k210-sysctl.c | 12 +
+ drivers/soc/sifive/sifive_l2_cache.c | 40 +++-
+ kernel/debug/debug_core.c | 12 +
+ 27 files changed, 1119 insertions(+), 31 deletions(-)
+ create mode 100644 arch/riscv/include/asm/cacheinfo.h
+ create mode 100644 arch/riscv/include/asm/gdb_xml.h
+ create mode 100644 arch/riscv/include/asm/kdebug.h
+ create mode 100644 arch/riscv/include/asm/kgdb.h
+ create mode 100644 arch/riscv/include/asm/parse_asm.h
+ create mode 100644 arch/riscv/kernel/kgdb.c
+Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
+$ git merge sifive/for-next
+Already up to date.
+Merging s390/features (e1750a3d9abb s390/pci: Log new handle in clp_disable_fh())
+$ git merge s390/features
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kernel/smp.c
+CONFLICT (content): Merge conflict in arch/s390/kernel/smp.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/s390/kernel/smp.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 03c646973ae2] Merge remote-tracking branch 's390/features'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 2 +
+ Documentation/s390/index.rst | 1 +
+ Documentation/s390/pci.rst | 125 +++++++
+ Documentation/s390/zfcpdump.rst | 4 +-
+ MAINTAINERS | 1 +
+ arch/s390/appldata/appldata_mem.c | 4 -
+ arch/s390/appldata/appldata_net_sum.c | 4 -
+ arch/s390/appldata/appldata_os.c | 4 -
+ arch/s390/include/asm/ccwdev.h | 5 +
+ arch/s390/include/asm/chsc.h | 62 ++++
+ arch/s390/include/asm/io.h | 2 +-
+ arch/s390/include/asm/ipl.h | 11 +
+ arch/s390/include/asm/nmi.h | 2 +-
+ arch/s390/include/asm/pci.h | 42 ++-
+ arch/s390/include/asm/pci_clp.h | 13 +-
+ arch/s390/include/asm/processor.h | 20 +-
+ arch/s390/include/asm/qdio.h | 33 --
+ arch/s390/include/asm/smp.h | 1 +
+ arch/s390/include/uapi/asm/ipl.h | 25 ++
+ arch/s390/kernel/Makefile | 5 -
+ arch/s390/kernel/entry.S | 464 ++++++------------------
+ arch/s390/kernel/ftrace.c | 16 -
+ arch/s390/kernel/idle.c | 14 +-
+ arch/s390/kernel/ipl.c | 209 +++++++++++
+ arch/s390/kernel/nmi.c | 23 +-
+ arch/s390/kernel/ptrace.c | 2 +-
+ arch/s390/kernel/setup.c | 16 +-
+ arch/s390/kernel/smp.c | 8 +
+ arch/s390/kvm/kvm-s390.c | 3 -
+ arch/s390/kvm/vsie.c | 2 -
+ arch/s390/lib/delay.c | 4 +-
+ arch/s390/pci/Makefile | 3 +-
+ arch/s390/pci/pci.c | 225 +++++-------
+ arch/s390/pci/pci_bus.c | 328 +++++++++++++++++
+ arch/s390/pci/pci_bus.h | 31 ++
+ arch/s390/pci/pci_clp.c | 8 +-
+ arch/s390/pci/pci_event.c | 39 +-
+ arch/s390/pci/pci_sysfs.c | 4 +-
+ drivers/iommu/s390-iommu.c | 8 +-
+ drivers/pci/hotplug/s390_pci_hpc.c | 16 +-
+ drivers/pci/iov.c | 39 +-
+ drivers/s390/cio/chsc.c | 40 +-
+ drivers/s390/cio/chsc.h | 50 +--
+ drivers/s390/cio/device_ops.c | 23 ++
+ drivers/s390/cio/idset.c | 12 -
+ drivers/s390/cio/qdio.h | 16 +-
+ drivers/s390/cio/qdio_main.c | 299 ++++-----------
+ drivers/s390/cio/qdio_setup.c | 100 +++--
+ drivers/s390/cio/qdio_thinint.c | 61 ++--
+ drivers/s390/crypto/ap_bus.c | 94 +++--
+ drivers/s390/crypto/ap_bus.h | 25 +-
+ drivers/s390/crypto/ap_card.c | 47 ++-
+ drivers/s390/crypto/ap_queue.c | 10 +-
+ drivers/s390/net/qeth_l2_main.c | 198 +++++-----
+ include/linux/pci.h | 8 +
+ 55 files changed, 1600 insertions(+), 1211 deletions(-)
+ create mode 100644 Documentation/s390/pci.rst
+ create mode 100644 arch/s390/include/asm/chsc.h
+ create mode 100644 arch/s390/pci/pci_bus.c
+ create mode 100644 arch/s390/pci/pci_bus.h
+Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay)
+$ git merge sh/sh-next
+Merge made by the 'recursive' strategy.
+ arch/sh/include/asm/cache.h | 2 +-
+ arch/sh/kernel/Makefile | 2 --
+ arch/sh/kernel/sh_ksyms_32.c | 17 +++++++++++++++++
+ arch/sh/lib/delay.c | 1 +
+ 4 files changed, 19 insertions(+), 3 deletions(-)
+Merging sparc-next/master (0a2576dae032 oradax: convert get_user_pages() --> pin_user_pages())
+$ git merge sparc-next/master
+Auto-merging arch/sparc/mm/srmmu.c
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/page_32.h | 12 ++---
+ arch/sparc/include/asm/pgalloc_32.h | 11 +++--
+ arch/sparc/include/asm/pgtable_32.h | 40 ++++++++++------
+ arch/sparc/include/asm/pgtsrmmu.h | 36 ++------------
+ arch/sparc/include/asm/viking.h | 5 +-
+ arch/sparc/kernel/head_32.S | 8 ++--
+ arch/sparc/mm/hypersparc.S | 3 +-
+ arch/sparc/mm/srmmu.c | 95 +++++++++++++------------------------
+ arch/sparc/mm/viking.S | 5 +-
+ drivers/sbus/char/oradax.c | 8 ++--
+ 10 files changed, 88 insertions(+), 135 deletions(-)
+Merging uml/linux-next (2e27d33d22af um: Fix typo in vector driver transport option definition)
+$ git merge uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (3ead2f97bd44 xtensa: Fix spelling/grammar in comment)
+$ git merge xtensa/xtensa-for-next
+Merge made by the 'recursive' strategy.
+ arch/xtensa/include/asm/uaccess.h | 32 ++++++++++++++++----------------
+ arch/xtensa/kernel/entry.S | 4 ++--
+ 2 files changed, 18 insertions(+), 18 deletions(-)
+Merging fscrypt/master (e3b1078bedd3 fscrypt: add support for IV_INO_LBLK_32 policies)
+$ git merge fscrypt/master
+Already up to date.
+Merging afs/afs-next (78074a0f5e6b afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly)
+$ git merge afs/afs-next
+Auto-merging include/linux/fs.h
+Merge made by the 'recursive' strategy.
+ fs/afs/Makefile | 2 +
+ fs/afs/afs.h | 3 +-
+ fs/afs/afs_vl.h | 1 +
+ fs/afs/callback.c | 345 ++++--------
+ fs/afs/cell.c | 10 +-
+ fs/afs/cmservice.c | 67 +--
+ fs/afs/dir.c | 1253 ++++++++++++++++++++----------------------
+ fs/afs/dir_silly.c | 190 ++++---
+ fs/afs/dynroot.c | 93 ++++
+ fs/afs/file.c | 62 ++-
+ fs/afs/flock.c | 114 ++--
+ fs/afs/fs_operation.c | 239 ++++++++
+ fs/afs/fs_probe.c | 339 +++++++++---
+ fs/afs/fsclient.c | 1305 +++++++++++++++++---------------------------
+ fs/afs/inode.c | 491 ++++++++---------
+ fs/afs/internal.h | 523 ++++++++++--------
+ fs/afs/main.c | 6 +-
+ fs/afs/proc.c | 42 +-
+ fs/afs/protocol_yfs.h | 2 +-
+ fs/afs/rotate.c | 445 ++++++---------
+ fs/afs/rxrpc.c | 45 +-
+ fs/afs/security.c | 8 +-
+ fs/afs/server.c | 299 ++++++----
+ fs/afs/server_list.c | 40 +-
+ fs/afs/super.c | 107 ++--
+ fs/afs/vl_alias.c | 384 +++++++++++++
+ fs/afs/vl_rotate.c | 4 +
+ fs/afs/vlclient.c | 146 ++++-
+ fs/afs/volume.c | 154 ++++--
+ fs/afs/write.c | 148 +++--
+ fs/afs/xattr.c | 300 +++++-----
+ fs/afs/yfsclient.c | 914 +++++++++++++------------------
+ fs/ext4/inode.c | 44 +-
+ fs/inode.c | 173 +++++-
+ include/linux/fs.h | 3 +
+ include/trace/events/afs.h | 111 +++-
+ net/rxrpc/peer_event.c | 3 +
+ net/rxrpc/proc.c | 6 +-
+ 38 files changed, 4487 insertions(+), 3934 deletions(-)
+ create mode 100644 fs/afs/fs_operation.c
+ create mode 100644 fs/afs/vl_alias.c
+Merging btrfs/for-next (8113246479a5 Merge branch 'for-next-next-v5.7-20200528' into for-next-20200528)
+$ git merge btrfs/for-next
+Auto-merging include/linux/fs.h
+Merge made by the 'recursive' strategy.
+ .clang-format | 1 +
+ Documentation/block/biovecs.rst | 2 +
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/backref.c | 837 ++++++++++++++++++++++++-
+ fs/btrfs/backref.h | 297 +++++++++
+ fs/btrfs/block-group.c | 233 ++++---
+ fs/btrfs/block-group.h | 14 +-
+ fs/btrfs/block-rsv.c | 5 +-
+ fs/btrfs/btrfs_inode.h | 44 +-
+ fs/btrfs/compression.c | 36 +-
+ fs/btrfs/compression.h | 2 -
+ fs/btrfs/ctree.c | 180 +++---
+ fs/btrfs/ctree.h | 121 ++--
+ fs/btrfs/disk-io.c | 93 +--
+ fs/btrfs/disk-io.h | 4 +-
+ fs/btrfs/export.c | 17 +-
+ fs/btrfs/extent-io-tree.h | 1 +
+ fs/btrfs/extent-tree.c | 23 +-
+ fs/btrfs/extent_io.c | 288 ++++-----
+ fs/btrfs/extent_io.h | 67 +-
+ fs/btrfs/file-item.c | 62 +-
+ fs/btrfs/file.c | 111 +++-
+ fs/btrfs/free-space-cache.c | 81 +--
+ fs/btrfs/inode.c | 1319 ++++++++++++++-------------------------
+ fs/btrfs/ioctl.c | 102 ++-
+ fs/btrfs/locking.c | 1 +
+ fs/btrfs/misc.h | 54 ++
+ fs/btrfs/props.c | 9 +-
+ fs/btrfs/qgroup.c | 14 +
+ fs/btrfs/relocation.c | 1319 +++++++++------------------------------
+ fs/btrfs/root-tree.c | 12 +-
+ fs/btrfs/scrub.c | 59 +-
+ fs/btrfs/send.c | 89 ++-
+ fs/btrfs/space-info.c | 81 ++-
+ fs/btrfs/space-info.h | 1 +
+ fs/btrfs/struct-funcs.c | 223 +++----
+ fs/btrfs/super.c | 38 +-
+ fs/btrfs/transaction.c | 78 +--
+ fs/btrfs/transaction.h | 3 +-
+ fs/btrfs/tree-checker.c | 4 -
+ fs/btrfs/tree-defrag.c | 2 +-
+ fs/btrfs/tree-log.c | 192 +++---
+ fs/btrfs/uuid-tree.c | 6 +-
+ fs/btrfs/volumes.c | 80 +--
+ fs/direct-io.c | 19 -
+ fs/iomap/direct-io.c | 17 +-
+ include/linux/bio.h | 8 +
+ include/linux/fs.h | 4 +-
+ include/linux/iomap.h | 2 +
+ include/trace/events/btrfs.h | 1 +
+ include/uapi/linux/btrfs_tree.h | 9 -
+ mm/filemap.c | 3 +-
+ 52 files changed, 3224 insertions(+), 3045 deletions(-)
+Merging ceph/master (dc1dad8e1a61 rbd: compression_hint option)
+$ git merge ceph/master
+Auto-merging include/linux/crush/crush.h
+Merge made by the 'recursive' strategy.
+ drivers/block/rbd.c | 44 ++++-
+ fs/ceph/Makefile | 2 +-
+ fs/ceph/acl.c | 2 +-
+ fs/ceph/addr.c | 20 ++
+ fs/ceph/caps.c | 425 ++++++++++++++++++++++++++--------------
+ fs/ceph/debugfs.c | 100 +++++++++-
+ fs/ceph/dir.c | 26 ++-
+ fs/ceph/export.c | 9 +-
+ fs/ceph/file.c | 30 +++
+ fs/ceph/inode.c | 4 +-
+ fs/ceph/mds_client.c | 48 ++++-
+ fs/ceph/mds_client.h | 15 +-
+ fs/ceph/metric.c | 148 ++++++++++++++
+ fs/ceph/metric.h | 62 ++++++
+ fs/ceph/quota.c | 62 +++++-
+ fs/ceph/super.h | 34 +++-
+ fs/ceph/xattr.c | 4 +-
+ include/linux/ceph/libceph.h | 13 +-
+ include/linux/ceph/osd_client.h | 8 +-
+ include/linux/ceph/osdmap.h | 19 +-
+ include/linux/ceph/rados.h | 14 ++
+ include/linux/crush/crush.h | 12 ++
+ net/ceph/ceph_common.c | 75 +++++++
+ net/ceph/crush/crush.c | 3 +-
+ net/ceph/debugfs.c | 6 +-
+ net/ceph/osd_client.c | 103 +++++++++-
+ net/ceph/osdmap.c | 363 +++++++++++++++++++++++++++++-----
+ 27 files changed, 1402 insertions(+), 249 deletions(-)
+ create mode 100644 fs/ceph/metric.c
+ create mode 100644 fs/ceph/metric.h
+Merging cifs/for-next (0804cd01f125 cifs: multichannel: try to rebind when reconnecting a channel)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifs_debug.h | 145 +++++++--------
+ fs/cifs/cifsencrypt.c | 8 +-
+ fs/cifs/cifsfs.c | 2 +
+ fs/cifs/cifsglob.h | 20 +-
+ fs/cifs/cifsproto.h | 36 ++--
+ fs/cifs/cifsroot.c | 6 +-
+ fs/cifs/cifssmb.c | 81 ++++----
+ fs/cifs/connect.c | 126 ++++++-------
+ fs/cifs/dfs_cache.c | 14 +-
+ fs/cifs/file.c | 56 +++---
+ fs/cifs/inode.c | 15 +-
+ fs/cifs/link.c | 2 +-
+ fs/cifs/misc.c | 60 +++++-
+ fs/cifs/netmisc.c | 6 +-
+ fs/cifs/readdir.c | 10 +-
+ fs/cifs/sess.c | 55 ++++--
+ fs/cifs/smb1ops.c | 2 +-
+ fs/cifs/smb2inode.c | 137 ++++++++------
+ fs/cifs/smb2misc.c | 20 +-
+ fs/cifs/smb2ops.c | 166 ++++++++++-------
+ fs/cifs/smb2pdu.c | 497 +++++++++++++++++++++++++++++++-------------------
+ fs/cifs/smb2pdu.h | 13 +-
+ fs/cifs/smb2proto.h | 25 ++-
+ fs/cifs/smbdirect.c | 165 +++++++----------
+ fs/cifs/transport.c | 75 +++++---
+ 25 files changed, 1022 insertions(+), 720 deletions(-)
+Merging configfs/for-next (8aebfffacfa3 configfs: fix config_item refcnt leak in configfs_rmdir())
+$ git merge configfs/for-next
+Already up to date.
+Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
+$ git merge ecryptfs/next
+Already up to date.
+Merging erofs/dev (34f853b849eb erofs: suppress false positive last_block warning)
+$ git merge erofs/dev
+Merge made by the 'recursive' strategy.
+ fs/erofs/data.c | 4 +-
+ fs/erofs/inode.c | 6 --
+ fs/erofs/internal.h | 27 +++---
+ fs/erofs/namei.c | 2 -
+ fs/erofs/super.c | 255 +++++++++++++++++++++++-----------------------------
+ fs/erofs/xattr.c | 4 +-
+ fs/erofs/xattr.h | 7 +-
+ fs/erofs/zdata.c | 4 +-
+ 8 files changed, 136 insertions(+), 173 deletions(-)
+Merging exfat/dev (cdc9b981b144 exfat: replace 'time_ms' with 'time_cs')
+$ git merge exfat/dev
+Merge made by the 'recursive' strategy.
+ fs/exfat/Kconfig | 7 ++++---
+ fs/exfat/balloc.c | 8 +++-----
+ fs/exfat/dir.c | 17 ++++++++---------
+ fs/exfat/exfat_fs.h | 13 +++++++++----
+ fs/exfat/exfat_raw.h | 4 ++--
+ fs/exfat/fatent.c | 13 +++++--------
+ fs/exfat/file.c | 2 +-
+ fs/exfat/inode.c | 4 ++--
+ fs/exfat/misc.c | 22 +++++++++++-----------
+ fs/exfat/namei.c | 49 ++++++++++++++++---------------------------------
+ fs/exfat/nls.c | 33 ++++++++-------------------------
+ fs/exfat/super.c | 49 ++++++++++++++++++++++---------------------------
+ 12 files changed, 91 insertions(+), 130 deletions(-)
+Merging ext3/for_next (16ec8bfe257b Pull ext2 xattr cleanups.)
+$ git merge ext3/for_next
+Auto-merging fs/notify/fanotify/fanotify.c
+Merge made by the 'recursive' strategy.
+ fs/ext2/file.c | 2 --
+ fs/ext2/namei.c | 6 ------
+ fs/ext2/symlink.c | 4 ----
+ fs/ext2/xattr.h | 1 +
+ fs/notify/fanotify/fanotify.c | 9 ++++++---
+ fs/notify/fanotify/fanotify_user.c | 8 +++++---
+ fs/notify/fdinfo.c | 1 -
+ fs/notify/group.c | 1 +
+ fs/notify/inotify/inotify_user.c | 4 +---
+ fs/notify/mark.c | 6 +++++-
+ 10 files changed, 19 insertions(+), 23 deletions(-)
+Merging ext4/dev (38bd76b9696c Merge branch 'ext4-dax' into dev)
+$ git merge ext4/dev
+Auto-merging include/uapi/linux/fiemap.h
+Auto-merging include/linux/iomap.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/overlayfs/inode.c
+Auto-merging fs/gfs2/inode.c
+Auto-merging fs/ext4/super.c
+CONFLICT (content): Merge conflict in fs/ext4/super.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/cifs/smb2ops.c
+Auto-merging fs/cifs/inode.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/extent_io.h
+Resolved 'fs/ext4/super.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c1aeb4c287a9] Merge remote-tracking branch 'ext4/dev'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/dax.txt | 142 ++++++++-
+ Documentation/filesystems/ext4/verity.rst | 3 +
+ Documentation/filesystems/fiemap.txt | 12 +-
+ drivers/block/loop.c | 6 +-
+ fs/bad_inode.c | 1 +
+ fs/btrfs/extent_io.h | 1 +
+ fs/btrfs/inode.c | 4 +-
+ fs/cifs/inode.c | 1 +
+ fs/cifs/smb2ops.c | 6 +-
+ fs/dcache.c | 19 ++
+ fs/ext2/inode.c | 1 +
+ fs/ext4/Kconfig | 3 +-
+ fs/ext4/acl.c | 5 +-
+ fs/ext4/balloc.c | 5 +-
+ fs/ext4/ext4.h | 67 ++--
+ fs/ext4/ext4_extents.h | 9 +-
+ fs/ext4/ext4_jbd2.h | 11 +-
+ fs/ext4/extents.c | 444 ++++++++++++++------------
+ fs/ext4/extents_status.c | 2 +-
+ fs/ext4/file.c | 17 +-
+ fs/ext4/fsync.c | 28 +-
+ fs/ext4/ialloc.c | 3 +-
+ fs/ext4/indirect.c | 4 +-
+ fs/ext4/inline.c | 6 +-
+ fs/ext4/inode.c | 134 +++++---
+ fs/ext4/ioctl.c | 73 +++--
+ fs/ext4/mballoc.c | 512 +++++++++++++++++++-----------
+ fs/ext4/mballoc.h | 16 +-
+ fs/ext4/migrate.c | 12 +-
+ fs/ext4/namei.c | 76 +++--
+ fs/ext4/super.c | 129 +++++---
+ fs/ext4/verity.c | 5 +-
+ fs/ext4/xattr.c | 13 +-
+ fs/f2fs/data.c | 3 +-
+ fs/f2fs/inline.c | 1 +
+ fs/fs-writeback.c | 1 +
+ fs/gfs2/inode.c | 1 +
+ fs/hpfs/file.c | 1 +
+ fs/internal.h | 2 -
+ fs/ioctl.c | 82 ++---
+ fs/iomap/fiemap.c | 11 +-
+ fs/jbd2/transaction.c | 14 +-
+ fs/nilfs2/inode.c | 3 +-
+ fs/ocfs2/extent_map.c | 4 +-
+ fs/overlayfs/inode.c | 5 +-
+ fs/stat.c | 3 +
+ fs/xfs/xfs_icache.c | 4 +-
+ fs/xfs/xfs_inode.h | 3 +-
+ fs/xfs/xfs_iops.c | 1 +
+ fs/xfs/xfs_super.c | 2 +-
+ include/linux/dcache.h | 2 +
+ include/linux/fiemap.h | 25 ++
+ include/linux/fs.h | 37 +--
+ include/linux/iomap.h | 2 +-
+ include/linux/writeback.h | 1 +
+ include/trace/events/ext4.h | 9 +-
+ include/uapi/linux/fiemap.h | 6 +-
+ include/uapi/linux/fs.h | 1 +
+ include/uapi/linux/stat.h | 1 +
+ 59 files changed, 1251 insertions(+), 744 deletions(-)
+ create mode 100644 include/linux/fiemap.h
+Merging f2fs/dev (ca7f76e68074 f2fs: fix wrong discard space)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/sysfs.c
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/inline.c
+Auto-merging fs/f2fs/hash.c
+Auto-merging fs/f2fs/f2fs.h
+CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/data.c
+Auto-merging Documentation/filesystems/f2fs.rst
+Resolved 'fs/f2fs/f2fs.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 857e7ba5ab27] Merge remote-tracking branch 'f2fs/dev'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-fs-f2fs | 15 ++
+ Documentation/filesystems/f2fs.rst | 2 +-
+ fs/f2fs/Kconfig | 10 +
+ fs/f2fs/acl.h | 2 +-
+ fs/f2fs/checkpoint.c | 33 ++-
+ fs/f2fs/compress.c | 175 +++++++++++---
+ fs/f2fs/data.c | 142 +++++++++++-
+ fs/f2fs/dir.c | 364 ++++++++++++++++-------------
+ fs/f2fs/f2fs.h | 162 +++++++++----
+ fs/f2fs/file.c | 392 ++++++++++++++++++++++++++++++--
+ fs/f2fs/gc.c | 125 ++++++----
+ fs/f2fs/gc.h | 2 +-
+ fs/f2fs/hash.c | 76 +++----
+ fs/f2fs/inline.c | 49 ++--
+ fs/f2fs/namei.c | 19 +-
+ fs/f2fs/node.c | 93 ++++++--
+ fs/f2fs/node.h | 5 +-
+ fs/f2fs/recovery.c | 51 ++++-
+ fs/f2fs/segment.c | 40 +++-
+ fs/f2fs/segment.h | 2 +-
+ fs/f2fs/super.c | 86 ++++---
+ fs/f2fs/sysfs.c | 95 ++++++--
+ fs/f2fs/trace.h | 2 +-
+ fs/f2fs/xattr.h | 8 +-
+ include/trace/events/f2fs.h | 83 ++++++-
+ 25 files changed, 1524 insertions(+), 509 deletions(-)
+Merging fsverity/fsverity (9cd6b593cfc9 fs-verity: remove unnecessary extern keywords)
+$ git merge fsverity/fsverity
+Already up to date.
+Merging fuse/for-next (9b46418c40fe fuse: copy_file_range should truncate cache)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/virtiofs.rst | 14 ++++
+ fs/fuse/dev.c | 14 ++--
+ fs/fuse/dir.c | 12 +++-
+ fs/fuse/file.c | 120 +++++++++++++++++++++++++--------
+ fs/fuse/fuse_i.h | 3 +-
+ fs/fuse/inode.c | 26 +++++--
+ fs/fuse/virtio_fs.c | 115 ++++++++++++++++++++-----------
+ 7 files changed, 219 insertions(+), 85 deletions(-)
+Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member)
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+Merging nfs/linux-next (3d77e6a8804a Linux 5.7)
+$ git merge nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (07e620d607d9 NFS: Fix direct WRITE throughput regression)
+$ git merge nfs-anna/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/direct.c | 4 +-
+ fs/nfs/dns_resolve.c | 1 -
+ fs/nfs/inode.c | 14 +-
+ fs/nfs/nfs3proc.c | 2 +-
+ fs/nfs/nfs4proc.c | 2 +-
+ fs/nfs/nfstrace.h | 106 ++++++++++-
+ fs/nfs/pagelist.c | 2 +
+ fs/nfs/read.c | 2 +
+ fs/nfs/sysfs.h | 2 +-
+ include/linux/nfs4.h | 4 +-
+ include/linux/nfs_fs.h | 1 +
+ include/linux/nfs_xdr.h | 2 +-
+ include/linux/sunrpc/auth.h | 5 +-
+ include/trace/events/rpcgss.h | 89 +++++++++-
+ include/trace/events/rpcrdma.h | 4 -
+ include/trace/events/sunrpc.h | 329 +++++++++++++++++++++++++++++------
+ net/sunrpc/addr.c | 4 +-
+ net/sunrpc/auth.c | 2 +-
+ net/sunrpc/auth_gss/auth_gss.c | 56 ++++--
+ net/sunrpc/auth_gss/gss_rpc_upcall.c | 2 +-
+ net/sunrpc/auth_gss/trace.c | 1 +
+ net/sunrpc/clnt.c | 54 +++---
+ net/sunrpc/rpcb_clnt.c | 6 -
+ net/sunrpc/svc_xprt.c | 4 +-
+ net/sunrpc/xprt.c | 23 +--
+ net/sunrpc/xprtrdma/rpc_rdma.c | 4 +-
+ net/sunrpc/xprtrdma/transport.c | 10 +-
+ net/sunrpc/xprtrdma/verbs.c | 1 -
+ 28 files changed, 576 insertions(+), 160 deletions(-)
+Merging nfsd/nfsd-next (037e910b52b0 SUNRPC: Remove unreachable error condition in rpcb_getport_async())
+$ git merge nfsd/nfsd-next
+Auto-merging net/sunrpc/svc_xprt.c
+CONFLICT (content): Merge conflict in net/sunrpc/svc_xprt.c
+Auto-merging include/trace/events/sunrpc.h
+CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h
+Auto-merging include/trace/events/rpcrdma.h
+Auto-merging include/linux/fs.h
+Resolved 'include/trace/events/sunrpc.h' using previous resolution.
+Resolved 'net/sunrpc/svc_xprt.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c4a58a91d47e] Merge remote-tracking branch 'nfsd/nfsd-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/locking.rst | 2 +
+ fs/locks.c | 3 +
+ fs/nfsd/nfs4callback.c | 39 +--
+ fs/nfsd/nfs4proc.c | 9 +-
+ fs/nfsd/nfs4state.c | 166 ++++++++----
+ fs/nfsd/nfscache.c | 57 ++--
+ fs/nfsd/nfsctl.c | 26 +-
+ fs/nfsd/nfsd.h | 2 +
+ fs/nfsd/nfssvc.c | 6 +
+ fs/nfsd/state.h | 7 -
+ fs/nfsd/trace.h | 345 ++++++++++++++++++++++++
+ include/linux/fs.h | 1 +
+ include/linux/kthread.h | 1 +
+ include/linux/sunrpc/gss_api.h | 1 +
+ include/linux/sunrpc/svc.h | 2 +
+ include/linux/sunrpc/svc_rdma.h | 6 +-
+ include/linux/sunrpc/svc_xprt.h | 6 +
+ include/linux/sunrpc/svcauth_gss.h | 3 +-
+ include/linux/sunrpc/svcsock.h | 6 +-
+ include/trace/events/rpcrdma.h | 142 ++++++++--
+ include/trace/events/sunrpc.h | 419 +++++++++++++++++++++++++++--
+ kernel/kthread.c | 17 ++
+ net/sunrpc/auth_gss/gss_mech_switch.c | 12 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 18 +-
+ net/sunrpc/sunrpc.h | 1 +
+ net/sunrpc/sunrpc_syms.c | 2 +
+ net/sunrpc/svc.c | 29 +-
+ net/sunrpc/svc_xprt.c | 53 ++--
+ net/sunrpc/svcauth.c | 25 ++
+ net/sunrpc/svcauth_unix.c | 9 -
+ net/sunrpc/svcsock.c | 407 ++++++++++++++--------------
+ net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 121 +++------
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 21 +-
+ net/sunrpc/xprtrdma/svc_rdma_rw.c | 92 ++++---
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 10 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 55 ++--
+ net/sunrpc/xprtsock.c | 12 +-
+ 37 files changed, 1500 insertions(+), 633 deletions(-)
+Merging orangefs/for-next (0df556457748 orangefs: convert get_user_pages() --> pin_user_pages())
+$ git merge orangefs/for-next
+Merge made by the 'recursive' strategy.
+ fs/orangefs/orangefs-bufmap.c | 9 +++------
+ fs/orangefs/orangefs-mod.c | 2 +-
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+Merging overlayfs/overlayfs-next (144da23beab8 ovl: return required buffer size for file handles)
+$ git merge overlayfs/overlayfs-next
+Auto-merging include/linux/fs.h
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/overlayfs.rst | 7 ++-
+ fs/overlayfs/copy_up.c | 7 +--
+ fs/overlayfs/dir.c | 49 ++++++++++++-----
+ fs/overlayfs/export.c | 18 +++----
+ fs/overlayfs/namei.c | 11 ----
+ fs/overlayfs/overlayfs.h | 6 +--
+ fs/overlayfs/ovl_entry.h | 3 ++
+ fs/overlayfs/readdir.c | 18 +++++--
+ fs/overlayfs/super.c | 94 ++++++++++++++++++++++++++++++---
+ fs/overlayfs/util.c | 3 +-
+ fs/sync.c | 3 +-
+ include/linux/fs.h | 2 +
+ 12 files changed, 165 insertions(+), 56 deletions(-)
+Merging ubifs/linux-next (0e7572cffe44 ubi: Fix seq_file usage in detailed_erase_block_info debugfs file)
+$ git merge ubifs/linux-next
+Already up to date.
+Merging v9fs/9p-next (c6f141412d24 9p: document short read behaviour with O_NONBLOCK)
+$ git merge v9fs/9p-next
+Already up to date.
+Merging xfs/for-next (6dcde60efd94 xfs: more lockdep whackamole with kmem_alloc*)
+$ git merge xfs/for-next
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/xfs/xfs_iops.c
+Auto-merging fs/xfs/xfs_inode.h
+Auto-merging fs/xfs/xfs_icache.c
+Merge made by the 'recursive' strategy.
+ .../filesystems/xfs-self-describing-metadata.txt | 10 +-
+ fs/xfs/Makefile | 5 +-
+ fs/xfs/kmem.h | 8 +-
+ fs/xfs/libxfs/xfs_ag_resv.h | 2 +-
+ fs/xfs/libxfs/xfs_alloc.h | 2 +-
+ fs/xfs/libxfs/xfs_alloc_btree.h | 2 +-
+ fs/xfs/libxfs/xfs_attr.c | 16 +-
+ fs/xfs/libxfs/xfs_attr.h | 2 +-
+ fs/xfs/libxfs/xfs_attr_leaf.c | 59 +-
+ fs/xfs/libxfs/xfs_attr_leaf.h | 2 +-
+ fs/xfs/libxfs/xfs_attr_remote.h | 2 +-
+ fs/xfs/libxfs/xfs_attr_sf.h | 2 +-
+ fs/xfs/libxfs/xfs_bit.h | 2 +-
+ fs/xfs/libxfs/xfs_bmap.c | 310 +--
+ fs/xfs/libxfs/xfs_bmap.h | 2 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c | 5 +-
+ fs/xfs/libxfs/xfs_bmap_btree.h | 2 +-
+ fs/xfs/libxfs/xfs_btree.h | 2 +-
+ fs/xfs/libxfs/xfs_da_btree.h | 2 +-
+ fs/xfs/libxfs/xfs_da_format.h | 2 +-
+ fs/xfs/libxfs/xfs_defer.c | 162 +-
+ fs/xfs/libxfs/xfs_defer.h | 26 +-
+ fs/xfs/libxfs/xfs_dir2.c | 8 +-
+ fs/xfs/libxfs/xfs_dir2.h | 2 +-
+ fs/xfs/libxfs/xfs_dir2_block.c | 2 +-
+ fs/xfs/libxfs/xfs_dir2_priv.h | 2 +-
+ fs/xfs/libxfs/xfs_dir2_sf.c | 13 +-
+ fs/xfs/libxfs/xfs_errortag.h | 6 +-
+ fs/xfs/libxfs/xfs_format.h | 9 +-
+ fs/xfs/libxfs/xfs_fs.h | 2 +-
+ fs/xfs/libxfs/xfs_health.h | 2 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 186 +-
+ fs/xfs/libxfs/xfs_inode_buf.h | 10 +-
+ fs/xfs/libxfs/xfs_inode_fork.c | 320 ++-
+ fs/xfs/libxfs/xfs_inode_fork.h | 68 +-
+ fs/xfs/libxfs/xfs_log_recover.h | 83 +-
+ fs/xfs/libxfs/xfs_quota_defs.h | 1 -
+ fs/xfs/libxfs/xfs_rtbitmap.c | 2 +-
+ fs/xfs/libxfs/xfs_sb.c | 2 +-
+ fs/xfs/libxfs/xfs_symlink_remote.c | 16 +-
+ fs/xfs/libxfs/xfs_trans_inode.c | 2 +-
+ fs/xfs/scrub/bmap.c | 40 +-
+ fs/xfs/scrub/dabtree.c | 2 +-
+ fs/xfs/scrub/dir.c | 7 +-
+ fs/xfs/scrub/ialloc.c | 3 +-
+ fs/xfs/scrub/parent.c | 2 +-
+ fs/xfs/xfs_aops.c | 2 +-
+ fs/xfs/xfs_attr_inactive.c | 9 +-
+ fs/xfs/xfs_attr_list.c | 4 +-
+ fs/xfs/xfs_bmap_item.c | 237 +-
+ fs/xfs/xfs_bmap_item.h | 11 -
+ fs/xfs/xfs_bmap_util.c | 79 +-
+ fs/xfs/xfs_buf.c | 70 +-
+ fs/xfs/xfs_buf.h | 2 +
+ fs/xfs/xfs_buf_item.c | 106 +-
+ fs/xfs/xfs_buf_item.h | 2 -
+ fs/xfs/xfs_buf_item_recover.c | 984 +++++++
+ fs/xfs/xfs_dir2_readdir.c | 2 +-
+ fs/xfs/xfs_dquot.c | 118 +-
+ fs/xfs/xfs_dquot.h | 2 +-
+ fs/xfs/xfs_dquot_item.c | 17 +-
+ fs/xfs/xfs_dquot_item_recover.c | 201 ++
+ fs/xfs/xfs_error.c | 3 +
+ fs/xfs/xfs_extfree_item.c | 216 +-
+ fs/xfs/xfs_extfree_item.h | 25 +-
+ fs/xfs/xfs_file.c | 2 +-
+ fs/xfs/xfs_fsops.c | 5 +-
+ fs/xfs/xfs_icache.c | 341 ++-
+ fs/xfs/xfs_icache.h | 51 +-
+ fs/xfs/xfs_icreate_item.c | 152 ++
+ fs/xfs/xfs_inode.c | 263 +-
+ fs/xfs/xfs_inode.h | 6 +-
+ fs/xfs/xfs_inode_item.c | 54 +-
+ fs/xfs/xfs_inode_item.h | 6 +-
+ fs/xfs/xfs_inode_item_recover.c | 394 +++
+ fs/xfs/xfs_ioctl.c | 100 +-
+ fs/xfs/xfs_iomap.c | 113 +-
+ fs/xfs/xfs_iops.c | 79 +-
+ fs/xfs/xfs_itable.c | 6 +-
+ fs/xfs/xfs_log_recover.c | 2801 ++------------------
+ fs/xfs/xfs_message.c | 22 +
+ fs/xfs/xfs_message.h | 24 +-
+ fs/xfs/xfs_mount.c | 40 +-
+ fs/xfs/xfs_mount.h | 157 +-
+ fs/xfs/xfs_pnfs.c | 5 +-
+ fs/xfs/xfs_qm.c | 66 +-
+ fs/xfs/xfs_qm.h | 78 +-
+ fs/xfs/xfs_qm_syscalls.c | 83 +-
+ fs/xfs/xfs_quotaops.c | 30 +-
+ fs/xfs/xfs_refcount_item.c | 252 +-
+ fs/xfs/xfs_refcount_item.h | 11 -
+ fs/xfs/xfs_rmap_item.c | 229 +-
+ fs/xfs/xfs_rmap_item.h | 13 -
+ fs/xfs/xfs_super.c | 68 +-
+ fs/xfs/xfs_symlink.c | 10 +-
+ fs/xfs/xfs_trace.h | 4 +-
+ fs/xfs/xfs_trans.c | 203 +-
+ fs/xfs/xfs_trans.h | 6 +-
+ fs/xfs/xfs_trans_ail.c | 79 +-
+ fs/xfs/xfs_trans_dquot.c | 23 +-
+ fs/xfs/xfs_trans_priv.h | 21 +-
+ fs/xfs/xfs_xattr.c | 1 -
+ 102 files changed, 4366 insertions(+), 4939 deletions(-)
+ create mode 100644 fs/xfs/xfs_buf_item_recover.c
+ create mode 100644 fs/xfs/xfs_dquot_item_recover.c
+ create mode 100644 fs/xfs/xfs_inode_item_recover.c
+Merging zonefs/for-next (568776f992c4 zonefs: Replace uuid_copy() with import_uuid())
+$ git merge zonefs/for-next
+Merge made by the 'recursive' strategy.
+ fs/zonefs/super.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging iomap/iomap-for-next (b75dfde12129 fibmap: Warn and return an error in case of block > INT_MAX)
+$ git merge iomap/iomap-for-next
+Already up to date.
+Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate())
+$ git merge djw-vfs/vfs-for-next
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/xfs/xfs_mount.h
+Auto-merging fs/xfs/xfs_iops.c
+Auto-merging fs/xfs/xfs_ioctl.c
+Auto-merging fs/xfs/xfs_inode.h
+Auto-merging fs/xfs/xfs_icache.c
+Merge made by the 'recursive' strategy.
+ fs/xfs/xfs_ioctl.c | 108 ++++++++++-------------------------------------------
+ 1 file changed, 20 insertions(+), 88 deletions(-)
+Merging file-locks/locks-next (dbdaf6a3250b locks: reinstate locks_delete_block optimization)
+$ git merge file-locks/locks-next
+Auto-merging fs/locks.c
+Auto-merging fs/cifs/file.c
+Merge made by the 'recursive' strategy.
+Merging vfs/for-next (4f929588b2ad Merge branches 'uaccess.misc' and 'uaccess.comedi' into for-next)
+$ git merge vfs/for-next
+Auto-merging net/ipv6/route.c
+Auto-merging net/ipv6/addrconf.c
+Auto-merging net/ipv4/route.c
+Auto-merging net/ipv4/devinet.c
+Auto-merging net/core/neighbour.c
+Auto-merging mm/vmstat.c
+Auto-merging mm/page_alloc.c
+Auto-merging kernel/umh.c
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/sysctl.c
+CONFLICT (content): Merge conflict in kernel/sysctl.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/printk/printk.c
+Auto-merging kernel/bpf/syscall.c
+Auto-merging include/uapi/linux/stat.h
+Auto-merging include/linux/writeback.h
+Auto-merging include/linux/printk.h
+Auto-merging include/linux/mmzone.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/kprobes.h
+Auto-merging include/linux/ftrace.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/device_cgroup.h
+Auto-merging fs/stat.c
+Auto-merging fs/splice.c
+Auto-merging fs/select.c
+Auto-merging fs/internal.h
+Auto-merging fs/inode.c
+Auto-merging fs/fuse/dev.c
+Auto-merging fs/dcache.c
+Auto-merging fs/compat_binfmt_elf.c
+Auto-merging fs/btrfs/send.c
+Auto-merging fs/binfmt_elf.c
+Auto-merging fs/aio.c
+Auto-merging drivers/usb/core/devio.c
+Removing drivers/staging/comedi/comedi_compat32.h
+Removing drivers/staging/comedi/comedi_compat32.c
+Auto-merging drivers/firewire/core-cdev.c
+Auto-merging drivers/crypto/ccp/sev-dev.c
+Auto-merging drivers/char/random.c
+Auto-merging arch/x86/kvm/hyperv.c
+CONFLICT (modify/delete): arch/mips/lasat/sysctl.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of arch/mips/lasat/sysctl.c left in tree.
+Resolved 'kernel/sysctl.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/mips/lasat/sysctl.c
+rm 'arch/mips/lasat/sysctl.c'
+$ git commit --no-edit -v -a
+[master a916de7e713e] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/include/asm/checksum.h | 3 +-
+ arch/alpha/kernel/syscalls/syscall.tbl | 1 +
+ arch/alpha/lib/csum_partial_copy.c | 6 +-
+ arch/arm/include/asm/checksum.h | 14 +
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/arm64/include/asm/unistd.h | 2 +-
+ arch/arm64/include/asm/unistd32.h | 2 +
+ arch/arm64/kernel/armv8_deprecated.c | 2 +-
+ arch/arm64/kernel/fpsimd.c | 3 +-
+ arch/c6x/lib/checksum.c | 22 -
+ arch/ia64/include/asm/checksum.h | 10 -
+ arch/ia64/kernel/syscalls/syscall.tbl | 1 +
+ arch/ia64/lib/csum_partial_copy.c | 32 +-
+ arch/m68k/include/asm/checksum.h | 3 +-
+ arch/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/m68k/lib/checksum.c | 4 +-
+ arch/microblaze/kernel/syscalls/syscall.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 1 +
+ arch/nios2/include/asm/checksum.h | 2 -
+ arch/parisc/include/asm/checksum.h | 7 -
+ arch/parisc/kernel/syscalls/syscall.tbl | 1 +
+ arch/parisc/lib/checksum.c | 20 -
+ arch/powerpc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/platforms/cell/spufs/coredump.c | 87 +-
+ arch/powerpc/platforms/cell/spufs/file.c | 330 +-
+ arch/powerpc/platforms/cell/spufs/spufs.h | 3 +-
+ arch/s390/appldata/appldata_base.c | 11 +-
+ arch/s390/include/asm/checksum.h | 19 -
+ arch/s390/kernel/debug.c | 2 +-
+ arch/s390/kernel/syscalls/syscall.tbl | 1 +
+ arch/s390/kernel/topology.c | 2 +-
+ arch/s390/mm/cmm.c | 12 +-
+ arch/sh/include/asm/checksum_32.h | 9 +-
+ arch/sh/kernel/syscalls/syscall.tbl | 1 +
+ arch/sparc/include/asm/checksum.h | 1 +
+ arch/sparc/include/asm/checksum_32.h | 15 +-
+ arch/sparc/include/asm/checksum_64.h | 2 +-
+ arch/sparc/kernel/syscalls/syscall.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/x86/ia32/ia32_signal.c | 2 +-
+ arch/x86/include/asm/checksum.h | 2 +
+ arch/x86/include/asm/checksum_32.h | 21 +-
+ arch/x86/include/asm/checksum_64.h | 12 +-
+ arch/x86/include/asm/compat.h | 8 +-
+ arch/x86/include/asm/pgtable_32.h | 7 -
+ arch/x86/kernel/itmt.c | 3 +-
+ arch/x86/kernel/signal.c | 28 +-
+ arch/x86/kernel/sys_ia32.c | 40 +-
+ arch/x86/kvm/hyperv.c | 2 +-
+ arch/x86/lib/csum-wrappers_64.c | 35 +-
+ arch/x86/um/asm/checksum.h | 20 -
+ arch/xtensa/include/asm/checksum.h | 11 +-
+ arch/xtensa/kernel/syscalls/syscall.tbl | 1 +
+ drivers/cdrom/cdrom.c | 2 +-
+ drivers/char/nvram.c | 4 -
+ drivers/char/pcmcia/cm4000_cs.c | 14 -
+ drivers/char/random.c | 2 +-
+ drivers/char/virtio_console.c | 2 +-
+ drivers/crypto/ccp/sev-dev.c | 15 +-
+ drivers/firewire/core-cdev.c | 4 +-
+ drivers/firmware/efi/test/efi_test.c | 12 -
+ drivers/fpga/dfl-afu-dma-region.c | 4 -
+ drivers/fpga/dfl-fme-pr.c | 4 -
+ drivers/gpu/drm/drm_file.c | 3 -
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 5 +-
+ drivers/infiniband/hw/hfi1/user_exp_rcv.c | 7 -
+ drivers/macintosh/mac_hid.c | 3 +-
+ drivers/macintosh/via-pmu.c | 2 -
+ drivers/misc/vmw_vmci/vmci_host.c | 2 -
+ drivers/parport/procfs.c | 39 +-
+ drivers/scsi/esas2r/esas2r_ioctl.c | 2 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 12 -
+ drivers/scsi/scsi_ioctl.c | 20 +-
+ drivers/staging/comedi/Makefile | 1 -
+ drivers/staging/comedi/comedi_compat32.c | 455 ---
+ drivers/staging/comedi/comedi_compat32.h | 28 -
+ drivers/staging/comedi/comedi_fops.c | 564 +++-
+ drivers/staging/comedi/comedi_internal.h | 2 +-
+ drivers/staging/comedi/range.c | 17 +-
+ drivers/tty/n_hdlc.c | 7 -
+ drivers/usb/core/devices.c | 2 -
+ drivers/usb/core/devio.c | 9 -
+ drivers/usb/gadget/function/f_hid.c | 6 -
+ drivers/video/fbdev/amifb.c | 4 -
+ drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 3 -
+ fs/aio.c | 8 +
+ fs/binfmt_elf.c | 35 +-
+ fs/binfmt_elf_fdpic.c | 52 +-
+ fs/binfmt_flat.c | 22 +-
+ fs/btrfs/send.c | 7 -
+ fs/char_dev.c | 3 +
+ fs/compat_binfmt_elf.c | 2 +-
+ fs/dcache.c | 2 +-
+ fs/drop_caches.c | 2 +-
+ fs/eventfd.c | 64 +-
+ fs/fat/dir.c | 4 -
+ fs/file_table.c | 4 +-
+ fs/fs_context.c | 30 -
+ fs/fscache/main.c | 3 +-
+ fs/fuse/dev.c | 2 +-
+ fs/inode.c | 2 +-
+ fs/internal.h | 1 -
+ fs/mount.h | 12 +-
+ fs/namei.c | 21 +-
+ fs/namespace.c | 96 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 36 +-
+ fs/open.c | 58 +-
+ fs/pipe.c | 96 +-
+ fs/proc/proc_sysctl.c | 47 +-
+ fs/proc_namespace.c | 4 +-
+ fs/pstore/ram_core.c | 4 +-
+ fs/quota/dquot.c | 2 +-
+ fs/readdir.c | 104 +-
+ fs/select.c | 112 +-
+ fs/splice.c | 81 +-
+ fs/stat.c | 11 +-
+ fs/super.c | 2 +-
+ fs/utimes.c | 6 +-
+ fs/xfs/xfs_sysctl.c | 4 +-
+ include/asm-generic/checksum.h | 9 -
+ include/linux/bpf-cgroup.h | 9 +-
+ include/linux/compaction.h | 2 +-
+ include/linux/compat.h | 11 +-
+ include/linux/coredump.h | 4 +
+ include/linux/device_cgroup.h | 3 +
+ include/linux/file.h | 2 +
+ include/linux/fs.h | 12 +-
+ include/linux/ftrace.h | 3 +-
+ include/linux/hugetlb.h | 15 +-
+ include/linux/kprobes.h | 2 +-
+ include/linux/latencytop.h | 4 +-
+ include/linux/mm.h | 14 +-
+ include/linux/mmzone.h | 27 +-
+ include/linux/mount.h | 4 +-
+ include/linux/nmi.h | 15 +-
+ include/linux/perf_event.h | 13 +-
+ include/linux/pid.h | 3 +
+ include/linux/pipe_fs_i.h | 40 +-
+ include/linux/printk.h | 2 +-
+ include/linux/regset.h | 2 +-
+ include/linux/sched/sysctl.h | 44 +-
+ include/linux/security.h | 2 +-
+ include/linux/signal.h | 8 +
+ include/linux/stat.h | 1 +
+ include/linux/syscalls.h | 6 +-
+ include/linux/sysctl.h | 61 +-
+ include/linux/timer.h | 3 +-
+ include/linux/uaccess.h | 8 +
+ include/linux/vmstat.h | 8 +-
+ include/linux/writeback.h | 28 +-
+ include/net/checksum.h | 14 +-
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/fcntl.h | 10 +
+ include/uapi/linux/stat.h | 18 +-
+ ipc/ipc_sysctl.c | 10 +-
+ ipc/mq_sysctl.c | 4 +-
+ kernel/bpf/cgroup.c | 35 +-
+ kernel/bpf/syscall.c | 25 +-
+ kernel/compat.c | 12 +-
+ kernel/events/callchain.c | 2 +-
+ kernel/events/core.c | 6 +-
+ kernel/exit.c | 12 +-
+ kernel/kprobes.c | 2 +-
+ kernel/latencytop.c | 4 +-
+ kernel/pid_namespace.c | 2 +-
+ kernel/printk/printk.c | 2 +-
+ kernel/relay.c | 7 +-
+ kernel/sched/core.c | 9 +-
+ kernel/sched/fair.c | 3 +-
+ kernel/sched/rt.c | 10 +-
+ kernel/sched/topology.c | 2 +-
+ kernel/seccomp.c | 2 +-
+ kernel/signal.c | 106 +-
+ kernel/sys.c | 33 +-
+ kernel/sysctl.c | 3861 +++++++++++------------
+ kernel/time/timer.c | 3 +-
+ kernel/trace/trace.c | 13 +-
+ kernel/umh.c | 2 +-
+ kernel/utsname_sysctl.c | 2 +-
+ kernel/watchdog.c | 12 +-
+ lib/checksum.c | 20 -
+ lib/strncpy_from_user.c | 4 +-
+ lib/strnlen_user.c | 4 +-
+ lib/usercopy.c | 6 +-
+ mm/compaction.c | 2 +-
+ mm/hugetlb.c | 9 +-
+ mm/page-writeback.c | 16 +-
+ mm/page_alloc.c | 42 +-
+ mm/util.c | 10 +-
+ mm/vmstat.c | 4 +-
+ net/bridge/br_netfilter_hooks.c | 2 +-
+ net/core/neighbour.c | 28 +-
+ net/core/sysctl_net_core.c | 27 +-
+ net/decnet/dn_dev.c | 7 +-
+ net/decnet/sysctl_net_decnet.c | 27 +-
+ net/ipv4/devinet.c | 9 +-
+ net/ipv4/route.c | 3 +-
+ net/ipv4/sysctl_net_ipv4.c | 38 +-
+ net/ipv6/addrconf.c | 33 +-
+ net/ipv6/ndisc.c | 3 +-
+ net/ipv6/route.c | 5 +-
+ net/ipv6/sysctl_net_ipv6.c | 3 +-
+ net/mpls/af_mpls.c | 5 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 6 +-
+ net/netfilter/nf_conntrack_standalone.c | 2 +-
+ net/netfilter/nf_log.c | 2 +-
+ net/phonet/sysctl.c | 3 +-
+ net/rds/tcp.c | 6 +-
+ net/sctp/sysctl.c | 32 +-
+ net/smc/smc_rx.c | 8 -
+ net/sunrpc/sysctl.c | 29 +-
+ net/sunrpc/xprtrdma/svc_rdma.c | 7 +-
+ samples/vfs/test-statx.c | 2 +-
+ security/apparmor/lsm.c | 2 +-
+ security/min_addr.c | 2 +-
+ security/tomoyo/common.c | 2 -
+ security/yama/yama_lsm.c | 2 +-
+ sound/core/pcm_native.c | 12 +-
+ tools/include/uapi/linux/stat.h | 11 +-
+ 222 files changed, 3722 insertions(+), 4332 deletions(-)
+ delete mode 100644 drivers/staging/comedi/comedi_compat32.c
+ delete mode 100644 drivers/staging/comedi/comedi_compat32.h
+Merging printk/for-next (e35456906bd4 Merge branch 'for-5.8' into for-next)
+$ git merge printk/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging pci/next (1f420e4dcf00 Merge branch 'remotes/lorenzo/pci/vmd')
+$ git merge pci/next
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/quirks.c
+CONFLICT (content): Merge conflict in drivers/pci/quirks.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/pci/controller/Makefile
+Auto-merging drivers/pci/controller/Kconfig
+Auto-merging drivers/firmware/raspberrypi.c
+Auto-merging drivers/firmware/Kconfig
+Auto-merging drivers/base/platform.c
+Auto-merging MAINTAINERS
+Resolved 'drivers/pci/quirks.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1969cb7185df] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/PCI/endpoint/pci-endpoint.rst | 16 +-
+ .../devicetree/bindings/pci/aardvark-pci.txt | 4 +
+ .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 +
+ .../devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml | 2 +-
+ .../bindings/pci/cdns,cdns-pcie-host.yaml | 3 +-
+ .../devicetree/bindings/pci/cdns-pcie-ep.yaml | 25 +
+ .../devicetree/bindings/pci/cdns-pcie-host.yaml | 10 +
+ .../devicetree/bindings/pci/cdns-pcie.yaml | 8 -
+ .../devicetree/bindings/pci/rcar-pci-ep.yaml | 77 ++
+ Documentation/devicetree/bindings/pci/rcar-pci.txt | 3 +-
+ .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 92 ++
+ MAINTAINERS | 7 +-
+ arch/arm64/kernel/pci.c | 4 +-
+ arch/x86/pci/fixup.c | 4 +
+ arch/x86/pci/xen.c | 16 +-
+ drivers/acpi/pci_mcfg.c | 8 +-
+ drivers/acpi/pci_root.c | 11 +-
+ drivers/base/platform.c | 40 +-
+ drivers/firmware/Kconfig | 3 +-
+ drivers/firmware/raspberrypi.c | 61 +
+ drivers/pci/controller/Kconfig | 22 +-
+ drivers/pci/controller/Makefile | 3 +-
+ drivers/pci/controller/cadence/pcie-cadence-ep.c | 2 +-
+ drivers/pci/controller/cadence/pcie-cadence-host.c | 10 +-
+ drivers/pci/controller/cadence/pcie-cadence.h | 6 +-
+ drivers/pci/controller/dwc/Kconfig | 16 +-
+ drivers/pci/controller/dwc/Makefile | 1 +
+ drivers/pci/controller/dwc/pci-dra7xx.c | 8 +-
+ drivers/pci/controller/dwc/pci-imx6.c | 4 +-
+ drivers/pci/controller/dwc/pci-meson.c | 4 +-
+ drivers/pci/controller/dwc/pcie-al.c | 2 +-
+ drivers/pci/controller/dwc/pcie-designware-ep.c | 22 +-
+ drivers/pci/controller/dwc/pcie-designware-host.c | 4 +-
+ drivers/pci/controller/dwc/pcie-designware.c | 7 +-
+ drivers/pci/controller/dwc/pcie-designware.h | 3 +-
+ drivers/pci/controller/dwc/pcie-hisi.c | 19 +-
+ drivers/pci/controller/dwc/pcie-intel-gw.c | 2 +-
+ drivers/pci/controller/dwc/pcie-tegra194.c | 9 +-
+ drivers/pci/controller/dwc/pcie-uniphier-ep.c | 383 +++++++
+ .../pci/controller/mobiveil/pcie-mobiveil-host.c | 4 +-
+ drivers/pci/controller/pci-aardvark.c | 266 ++++-
+ drivers/pci/controller/pci-host-common.c | 18 +-
+ drivers/pci/controller/pci-host-generic.c | 26 +-
+ drivers/pci/controller/pci-hyperv.c | 82 +-
+ drivers/pci/controller/pci-tegra.c | 7 +-
+ drivers/pci/controller/pci-thunder-ecam.c | 14 +-
+ drivers/pci/controller/pci-thunder-pem.c | 16 +-
+ drivers/pci/controller/pci-v3-semi.c | 6 +-
+ drivers/pci/controller/pci-xgene.c | 4 +-
+ drivers/pci/controller/pcie-altera.c | 2 +-
+ drivers/pci/controller/pcie-brcmstb.c | 37 +-
+ drivers/pci/controller/pcie-mediatek.c | 3 +
+ drivers/pci/controller/pcie-rcar-ep.c | 563 +++++++++
+ drivers/pci/controller/pcie-rcar-host.c | 1130 ++++++++++++++++++
+ drivers/pci/controller/pcie-rcar.c | 1211 +-------------------
+ drivers/pci/controller/pcie-rcar.h | 140 +++
+ drivers/pci/controller/pcie-rockchip-ep.c | 2 +-
+ drivers/pci/controller/pcie-tango.c | 13 +-
+ drivers/pci/controller/vmd.c | 6 +-
+ drivers/pci/ecam.c | 10 +-
+ drivers/pci/endpoint/functions/pci-epf-test.c | 3 +
+ drivers/pci/endpoint/pci-epc-mem.c | 204 +++-
+ drivers/pci/hotplug/pciehp.h | 2 -
+ drivers/pci/hotplug/rpaphp_core.c | 2 +-
+ drivers/pci/hotplug/shpchp.h | 2 +-
+ drivers/pci/hotplug/shpchp_ctrl.c | 3 +-
+ drivers/pci/hotplug/shpchp_pci.c | 5 +-
+ drivers/pci/of.c | 2 +-
+ drivers/pci/p2pdma.c | 2 +
+ drivers/pci/pci-acpi.c | 6 +-
+ drivers/pci/pci-bridge-emul.c | 61 +-
+ drivers/pci/pci-label.c | 4 +-
+ drivers/pci/pci.c | 64 +-
+ drivers/pci/pcie/Kconfig | 1 -
+ drivers/pci/pcie/aer.c | 340 ++----
+ drivers/pci/pcie/aspm.c | 10 -
+ drivers/pci/pcie/dpc.c | 3 +-
+ drivers/pci/pcie/edr.c | 4 +-
+ drivers/pci/pcie/pme.c | 4 +-
+ drivers/pci/pcie/portdrv.h | 13 +-
+ drivers/pci/pcie/ptm.c | 22 +-
+ drivers/pci/probe.c | 65 +-
+ drivers/pci/quirks.c | 50 +-
+ drivers/pci/remove.c | 2 +-
+ drivers/pci/setup-bus.c | 115 +-
+ drivers/pci/setup-res.c | 9 +-
+ drivers/pci/switch/switchtec.c | 2 +-
+ drivers/pcmcia/yenta_socket.c | 40 +-
+ drivers/thunderbolt/switch.c | 4 +-
+ drivers/tty/serial/8250/8250_pci.c | 6 -
+ drivers/usb/host/pci-quirks.c | 16 +
+ include/linux/pci-acpi.h | 18 +-
+ include/linux/pci-ecam.h | 25 +-
+ include/linux/pci-epc.h | 38 +-
+ include/linux/pci.h | 43 +-
+ include/linux/pci_ids.h | 6 +
+ include/soc/bcm2835/raspberrypi-firmware.h | 9 +-
+ 97 files changed, 3681 insertions(+), 2007 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pci/cdns-pcie-ep.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/rcar-pci-ep.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/socionext,uniphier-pcie-ep.yaml
+ create mode 100644 drivers/pci/controller/dwc/pcie-uniphier-ep.c
+ create mode 100644 drivers/pci/controller/pcie-rcar-ep.c
+ create mode 100644 drivers/pci/controller/pcie-rcar-host.c
+ create mode 100644 drivers/pci/controller/pcie-rcar.h
+Merging pstore/for-next/pstore (78c08247b9d3 mtd: Support kmsg dumper based on pstore/blk)
+$ git merge pstore/for-next/pstore
+Already up to date.
+Merging hid/for-next (5d7d489e9129 Merge branch 'for-5.8/multitouch' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 11 +-
+ drivers/hid/hid-apple.c | 30 ++++-
+ drivers/hid/hid-asus.c | 122 ++++++++++++++++----
+ drivers/hid/hid-ids.h | 12 +-
+ drivers/hid/hid-logitech-dj.c | 4 +-
+ drivers/hid/hid-logitech-hidpp.c | 2 +-
+ drivers/hid/hid-mcp2221.c | 169 ++++++++++++++++++++++++++++
+ drivers/hid/hid-multitouch.c | 60 ++++------
+ drivers/hid/hid-quirks.c | 1 +
+ drivers/hid/hid-sony.c | 17 +++
+ drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++
+ drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 2 +
+ 12 files changed, 364 insertions(+), 74 deletions(-)
+Merging i2c/i2c/for-next (bc2cc7f2c1de Merge branch 'i2c/for-5.8' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Removing Documentation/devicetree/bindings/i2c/i2c-designware.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/i2c-designware.txt | 73 --
+ .../devicetree/bindings/i2c/i2c-qcom-cci.txt | 92 +++
+ Documentation/devicetree/bindings/i2c/i2c.txt | 73 +-
+ .../bindings/i2c/snps,designware-i2c.yaml | 156 ++++
+ .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 8 +-
+ drivers/i2c/busses/Kconfig | 51 +-
+ drivers/i2c/busses/Makefile | 18 +-
+ drivers/i2c/busses/i2c-altera.c | 20 +-
+ drivers/i2c/busses/i2c-at91-core.c | 2 +
+ drivers/i2c/busses/i2c-at91-master.c | 49 +-
+ drivers/i2c/busses/i2c-at91.h | 7 +-
+ drivers/i2c/busses/i2c-axxia.c | 8 +-
+ drivers/i2c/busses/i2c-bcm-iproc.c | 10 +-
+ drivers/i2c/busses/i2c-bcm-kona.c | 7 +-
+ drivers/i2c/busses/i2c-brcmstb.c | 20 +-
+ drivers/i2c/busses/i2c-cadence.c | 323 +++++++-
+ drivers/i2c/busses/i2c-cht-wc.c | 6 +-
+ drivers/i2c/busses/i2c-davinci.c | 4 +-
+ drivers/i2c/busses/i2c-designware-common.c | 327 ++++++--
+ drivers/i2c/busses/i2c-designware-core.h | 75 +-
+ drivers/i2c/busses/i2c-designware-master.c | 192 +++--
+ drivers/i2c/busses/i2c-designware-pcidrv.c | 86 +-
+ drivers/i2c/busses/i2c-designware-platdrv.c | 276 +++----
+ drivers/i2c/busses/i2c-designware-slave.c | 88 ++-
+ drivers/i2c/busses/i2c-digicolor.c | 4 +-
+ drivers/i2c/busses/i2c-efm32.c | 4 -
+ drivers/i2c/busses/i2c-emev2.c | 4 +-
+ drivers/i2c/busses/i2c-exynos5.c | 4 +-
+ drivers/i2c/busses/i2c-hix5hd2.c | 4 +-
+ drivers/i2c/busses/i2c-i801.c | 12 +-
+ drivers/i2c/busses/i2c-img-scb.c | 8 +-
+ drivers/i2c/busses/i2c-imx-lpi2c.c | 4 +-
+ drivers/i2c/busses/i2c-jz4780.c | 4 +-
+ drivers/i2c/busses/i2c-lpc2k.c | 8 +-
+ drivers/i2c/busses/i2c-meson.c | 8 +-
+ drivers/i2c/busses/i2c-mt65xx.c | 329 ++++++--
+ drivers/i2c/busses/i2c-mv64xxx.c | 4 +-
+ drivers/i2c/busses/i2c-nvidia-gpu.c | 5 +-
+ drivers/i2c/busses/i2c-octeon-platdrv.c | 4 +-
+ drivers/i2c/busses/i2c-omap.c | 4 +-
+ drivers/i2c/busses/i2c-owl.c | 8 +-
+ drivers/i2c/busses/i2c-pca-platform.c | 3 +-
+ drivers/i2c/busses/i2c-piix4.c | 3 +-
+ drivers/i2c/busses/i2c-pnx.c | 1 -
+ drivers/i2c/busses/i2c-powermac.c | 18 +-
+ drivers/i2c/busses/i2c-pxa.c | 868 ++++++++++++---------
+ drivers/i2c/busses/i2c-qcom-cci.c | 791 +++++++++++++++++++
+ drivers/i2c/busses/i2c-qup.c | 18 +-
+ drivers/i2c/busses/i2c-rcar.c | 4 +-
+ drivers/i2c/busses/i2c-rk3x.c | 8 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 7 +-
+ drivers/i2c/busses/i2c-sirf.c | 4 +-
+ drivers/i2c/busses/i2c-sprd.c | 4 +-
+ drivers/i2c/busses/i2c-stm32.c | 10 +-
+ drivers/i2c/busses/i2c-stm32f4.c | 4 +-
+ drivers/i2c/busses/i2c-stm32f7.c | 138 ++--
+ drivers/i2c/busses/i2c-stu300.c | 4 +-
+ drivers/i2c/busses/i2c-sun6i-p2wi.c | 8 +-
+ drivers/i2c/busses/i2c-synquacer.c | 8 +-
+ drivers/i2c/busses/i2c-uniphier-f.c | 4 +-
+ drivers/i2c/busses/i2c-uniphier.c | 4 +-
+ drivers/i2c/busses/i2c-xlp9xx.c | 8 +-
+ drivers/i2c/busses/i2c-xlr.c | 4 +-
+ drivers/i2c/busses/i2c-zx2967.c | 4 +-
+ drivers/i2c/i2c-core-acpi.c | 6 +-
+ drivers/i2c/i2c-core-base.c | 72 +-
+ drivers/i2c/i2c-core.h | 6 +-
+ drivers/i2c/i2c-slave-eeprom.c | 39 +-
+ drivers/i2c/i2c-smbus.c | 104 ++-
+ drivers/i2c/muxes/i2c-mux-pca954x.c | 44 +-
+ drivers/platform/mellanox/mlxreg-hotplug.c | 11 +-
+ include/linux/i2c-smbus.h | 8 +-
+ include/linux/i2c.h | 8 +-
+ include/linux/platform_data/i2c-pxa.h | 48 --
+ 74 files changed, 3304 insertions(+), 1356 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-designware.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml
+ create mode 100644 drivers/i2c/busses/i2c-qcom-cci.c
+Merging i3c/i3c/next (b4203ce05563 i3c master: GETMRL's 3rd byte is optional even with BCR_IBI_PAYLOAD)
+$ git merge i3c/i3c/next
+Already up to date.
+Merging dmi/master (8cf87c744696 firmware/dmi: Report DMI Bios & EC firmware release)
+$ git merge dmi/master
+Auto-merging scripts/mod/file2alias.c
+Auto-merging include/linux/mod_devicetable.h
+Auto-merging drivers/firmware/dmi_scan.c
+Merge made by the 'recursive' strategy.
+ drivers/firmware/dmi-id.c | 6 ++++++
+ drivers/firmware/dmi_scan.c | 30 ++++++++++++++++++++++++++++++
+ include/linux/mod_devicetable.h | 2 ++
+ scripts/mod/file2alias.c | 2 ++
+ 4 files changed, 40 insertions(+)
+Merging hwmon-staging/hwmon-next (87976ce2825d hwmon: Add Baikal-T1 PVT sensor driver)
+$ git merge hwmon-staging/hwmon-next
+Already up to date.
+Merging jc_docs/docs-next (e35b5a4c494a Documentation: fixes to the maintainer-entry-profile template)
+$ git merge jc_docs/docs-next
+Auto-merging virt/kvm/arm/vgic/vgic-mmio-v3.c
+Auto-merging tools/include/uapi/linux/kvm.h
+Auto-merging samples/Kconfig
+Auto-merging mm/gup.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/relay.c
+Auto-merging include/linux/printk.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/fscache-cache.h
+Auto-merging fs/namespace.c
+Auto-merging fs/locks.c
+Auto-merging fs/inode.c
+Auto-merging fs/fuse/dev.c
+Auto-merging fs/Kconfig.binfmt
+Auto-merging drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
+Auto-merging drivers/base/platform.c
+Auto-merging drivers/base/core.c
+Auto-merging arch/x86/kvm/mmu/mmu.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst
+Auto-merging Documentation/filesystems/xfs-self-describing-metadata.rst
+Auto-merging Documentation/filesystems/proc.rst
+Auto-merging Documentation/filesystems/fiemap.rst
+CONFLICT (content): Merge conflict in Documentation/filesystems/fiemap.rst
+Removing Documentation/filesystems/devpts.txt
+Auto-merging Documentation/filesystems/debugfs.rst
+Auto-merging Documentation/filesystems/dax.txt
+Removing Documentation/filesystems/coda.txt
+Removing Documentation/filesystems/caching/fscache.txt
+Auto-merging Documentation/core-api/printk-formats.rst
+Auto-merging Documentation/arm64/booting.rst
+CONFLICT (content): Merge conflict in Documentation/arm64/booting.rst
+Auto-merging Documentation/arm64/amu.rst
+CONFLICT (content): Merge conflict in Documentation/arm64/amu.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging .mailmap
+Resolved 'Documentation/arm64/amu.rst' using previous resolution.
+Resolved 'Documentation/arm64/booting.rst' using previous resolution.
+Resolved 'Documentation/filesystems/fiemap.rst' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 80876699a8a8] Merge remote-tracking branch 'jc_docs/docs-next'
+$ git diff -M --stat --summary HEAD^..
+ .mailmap | 5 +-
+ CREDITS | 6 +-
+ Documentation/ABI/stable/sysfs-devices-node | 2 +-
+ Documentation/ABI/testing/procfs-smaps_rollup | 2 +-
+ Documentation/Makefile | 6 +-
+ Documentation/PCI/boot-interrupts.rst | 34 +-
+ Documentation/admin-guide/acpi/ssdt-overlays.rst | 2 +-
+ Documentation/admin-guide/bug-hunting.rst | 53 +-
+ Documentation/admin-guide/cpu-load.rst | 2 +-
+ Documentation/admin-guide/hw-vuln/l1tf.rst | 2 +-
+ Documentation/admin-guide/init.rst | 76 +-
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ .../admin-guide/kernel-per-CPU-kthreads.rst | 2 +-
+ Documentation/admin-guide/mm/userfaultfd.rst | 211 +--
+ Documentation/admin-guide/nfs/nfsroot.rst | 2 +-
+ Documentation/admin-guide/numastat.rst | 31 +-
+ Documentation/admin-guide/ras.rst | 28 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 157 +-
+ Documentation/arm64/booting.rst | 36 +-
+ Documentation/conf.py | 38 -
+ .../debugging-via-ohci1394.rst} | 0
+ .../dma-api-howto.rst} | 0
+ .../{DMA-API.txt => core-api/dma-api.rst} | 0
+ .../dma-attributes.rst} | 0
+ .../{DMA-ISA-LPC.txt => core-api/dma-isa-lpc.rst} | 0
+ Documentation/core-api/index.rst | 9 +
+ .../{IRQ.txt => core-api/irq/concepts.rst} | 0
+ Documentation/core-api/irq/index.rst | 11 +
+ .../irq/irq-affinity.rst} | 0
+ .../irq/irq-domain.rst} | 3 +-
+ .../irq/irqflags-tracing.rst} | 0
+ Documentation/core-api/kobject.rst | 28 +-
+ Documentation/{kref.txt => core-api/kref.rst} | 0
+ Documentation/core-api/printk-basics.rst | 115 ++
+ Documentation/core-api/printk-formats.rst | 2 +
+ Documentation/{rbtree.txt => core-api/rbtree.rst} | 0
+ Documentation/doc-guide/maintainer-profile.rst | 2 +-
+ Documentation/driver-api/dma-buf.rst | 4 +-
+ Documentation/driver-api/driver-model/device.rst | 4 +-
+ Documentation/driver-api/driver-model/overview.rst | 2 +-
+ Documentation/driver-api/index.rst | 1 +
+ Documentation/{IPMI.txt => driver-api/ipmi.rst} | 0
+ Documentation/driver-api/nvdimm/nvdimm.rst | 4 +-
+ .../driver-api/thermal/cpu-idle-cooling.rst | 3 +
+ Documentation/driver-api/thermal/index.rst | 1 +
+ .../features/core/eBPF-JIT/arch-support.txt | 2 +-
+ .../features/debug/KASAN/arch-support.txt | 6 +-
+ .../debug/gcov-profile-all/arch-support.txt | 2 +-
+ .../debug/kprobes-on-ftrace/arch-support.txt | 2 +-
+ .../features/debug/kprobes/arch-support.txt | 4 +-
+ .../features/debug/kretprobes/arch-support.txt | 2 +-
+ .../features/debug/stackprotector/arch-support.txt | 2 +-
+ .../features/debug/uprobes/arch-support.txt | 2 +-
+ .../features/io/dma-contiguous/arch-support.txt | 2 +-
+ .../features/locking/lockdep/arch-support.txt | 2 +-
+ .../features/perf/kprobes-event/arch-support.txt | 4 +-
+ .../features/perf/perf-regs/arch-support.txt | 4 +-
+ .../features/perf/perf-stackdump/arch-support.txt | 4 +-
+ .../seccomp/seccomp-filter/arch-support.txt | 2 +-
+ .../features/vm/huge-vmap/arch-support.txt | 2 +-
+ .../features/vm/pte_special/arch-support.txt | 2 +-
+ Documentation/filesystems/9p.rst | 2 +-
+ ...automount-support.txt => automount-support.rst} | 23 +-
+ .../caching/{backend-api.txt => backend-api.rst} | 165 +-
+ .../caching/{cachefiles.txt => cachefiles.rst} | 139 +-
+ Documentation/filesystems/caching/fscache.rst | 565 +++++++
+ Documentation/filesystems/caching/fscache.txt | 448 ------
+ Documentation/filesystems/caching/index.rst | 14 +
+ .../caching/{netfs-api.txt => netfs-api.rst} | 172 +-
+ .../filesystems/caching/{object.txt => object.rst} | 43 +-
+ .../caching/{operations.txt => operations.rst} | 45 +-
+ .../cifs/{cifsroot.txt => cifsroot.rst} | 56 +-
+ Documentation/filesystems/coda.rst | 1670 +++++++++++++++++++
+ Documentation/filesystems/coda.txt | 1676 --------------------
+ .../{configfs/configfs.txt => configfs.rst} | 131 +-
+ Documentation/filesystems/dax.txt | 2 +-
+ Documentation/filesystems/debugfs.rst | 5 +-
+ Documentation/filesystems/devpts.rst | 36 +
+ Documentation/filesystems/devpts.txt | 26 -
+ .../filesystems/{dnotify.txt => dnotify.rst} | 13 +-
+ Documentation/filesystems/efivarfs.rst | 17 +
+ .../filesystems/{fiemap.txt => fiemap.rst} | 137 +-
+ Documentation/filesystems/{files.txt => files.rst} | 15 +-
+ .../filesystems/{fuse-io.txt => fuse-io.rst} | 6 +
+ Documentation/filesystems/index.rst | 23 +
+ Documentation/filesystems/{locks.txt => locks.rst} | 14 +-
+ ...mandatory-locking.txt => mandatory-locking.rst} | 25 +-
+ .../filesystems/{mount_api.txt => mount_api.rst} | 329 ++--
+ Documentation/filesystems/orangefs.rst | 4 +-
+ Documentation/filesystems/proc.rst | 2 +-
+ Documentation/filesystems/{quota.txt => quota.rst} | 41 +-
+ .../filesystems/ramfs-rootfs-initramfs.rst | 2 +-
+ .../filesystems/{seq_file.txt => seq_file.rst} | 61 +-
+ .../{sharedsubtree.txt => sharedsubtree.rst} | 398 +++--
+ Documentation/filesystems/spufs/index.rst | 13 +
+ Documentation/filesystems/spufs/spu_create.rst | 131 ++
+ Documentation/filesystems/spufs/spu_run.rst | 138 ++
+ .../filesystems/{spufs.txt => spufs/spufs.rst} | 304 +---
+ .../filesystems/{sysfs-pci.txt => sysfs-pci.rst} | 23 +-
+ .../{sysfs-tagging.txt => sysfs-tagging.rst} | 22 +-
+ Documentation/filesystems/sysfs.rst | 2 +-
+ ...g-design.txt => xfs-delayed-logging-design.rst} | 65 +-
+ ...tadata.txt => xfs-self-describing-metadata.rst} | 190 +--
+ Documentation/i2c/{i2c.svg => i2c_bus.svg} | 2 +-
+ Documentation/i2c/summary.rst | 2 +-
+ Documentation/ia64/irq-redir.rst | 2 +-
+ Documentation/iio/iio_configfs.rst | 2 +-
+ .../futex-requeue-pi.rst} | 0
+ .../{hwspinlock.txt => locking/hwspinlock.rst} | 0
+ Documentation/locking/index.rst | 7 +
+ Documentation/locking/locktorture.rst | 2 +-
+ .../percpu-rw-semaphore.rst} | 0
+ .../{pi-futex.txt => locking/pi-futex.rst} | 0
+ .../preempt-locking.rst} | 0
+ .../robust-futex-ABI.rst} | 0
+ .../robust-futexes.rst} | 0
+ Documentation/locking/rt-mutex.rst | 2 +-
+ .../maintainer/maintainer-entry-profile.rst | 12 +-
+ Documentation/memory-barriers.txt | 2 +-
+ Documentation/misc-devices/index.rst | 1 +
+ Documentation/networking/scaling.rst | 4 +-
+ Documentation/nvdimm/maintainer-entry-profile.rst | 14 +-
+ Documentation/powerpc/cxl.rst | 2 +
+ Documentation/powerpc/firmware-assisted-dump.rst | 2 +-
+ Documentation/process/adding-syscalls.rst | 2 +-
+ Documentation/process/index.rst | 1 +
+ Documentation/process/submit-checklist.rst | 2 +-
+ .../unaligned-memory-access.rst} | 0
+ Documentation/s390/vfio-ap.rst | 2 +-
+ Documentation/scheduler/sched-domains.rst | 10 +-
+ Documentation/{digsig.txt => security/digsig.rst} | 0
+ Documentation/security/index.rst | 1 +
+ Documentation/security/lsm.rst | 202 +--
+ Documentation/sphinx/requirements.txt | 2 +-
+ Documentation/trace/coresight/coresight-ect.rst | 1 +
+ Documentation/trace/events.rst | 28 +-
+ .../translations/it_IT/doc-guide/kernel-doc.rst | 25 +-
+ .../translations/it_IT/kernel-hacking/hacking.rst | 18 +
+ .../translations/it_IT/kernel-hacking/locking.rst | 172 +-
+ .../translations/it_IT/process/2.Process.rst | 95 +-
+ .../translations/it_IT/process/adding-syscalls.rst | 2 +-
+ .../translations/it_IT/process/coding-style.rst | 6 +-
+ .../translations/it_IT/process/deprecated.rst | 130 +-
+ .../translations/it_IT/process/email-clients.rst | 332 +++-
+ Documentation/translations/it_IT/process/index.rst | 1 +
+ .../it_IT/process/management-style.rst | 293 +++-
+ .../it_IT/process/submit-checklist.rst | 2 +-
+ .../translations/it_IT/riscv/patch-acceptance.rst | 40 +
+ .../translations/ko_KR/memory-barriers.txt | 2 +-
+ Documentation/translations/zh_CN/IRQ.txt | 4 +-
+ .../translations/zh_CN/filesystems/debugfs.rst | 221 +++
+ .../translations/zh_CN/filesystems/index.rst | 1 +
+ .../translations/zh_CN/filesystems/sysfs.txt | 8 +-
+ .../zh_CN/process/submit-checklist.rst | 2 +-
+ .../zh_CN/video4linux/v4l2-framework.txt | 2 +-
+ Documentation/usb/gadget_configfs.rst | 4 +-
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
+ Documentation/virt/kvm/amd-memory-encryption.rst | 2 +-
+ Documentation/virt/kvm/api.rst | 12 +-
+ Documentation/virt/kvm/arm/pvtime.rst | 2 +-
+ Documentation/virt/kvm/devices/vcpu.rst | 2 +-
+ Documentation/virt/kvm/hypercalls.rst | 4 +-
+ Documentation/virt/kvm/mmu.rst | 2 +-
+ Documentation/virt/kvm/review-checklist.rst | 2 +-
+ Documentation/vm/index.rst | 1 +
+ Documentation/vm/page_frags.rst | 2 +-
+ Documentation/vm/zswap.rst | 4 +-
+ .../watchdog/convert_drivers_to_kernel_api.rst | 4 +-
+ Documentation/watchdog/watchdog-kernel-api.rst | 2 +-
+ Documentation/x86/x86_64/uefi.rst | 2 +-
+ MAINTAINERS | 28 +-
+ arch/powerpc/include/uapi/asm/kvm_para.h | 2 +-
+ arch/x86/kvm/mmu/mmu.c | 2 +-
+ drivers/ata/libata-core.c | 2 +-
+ drivers/base/core.c | 2 +-
+ drivers/base/platform.c | 6 +-
+ drivers/char/ipmi/Kconfig | 2 +-
+ drivers/char/ipmi/ipmi_si_hotmod.c | 2 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 2 +-
+ .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 2 +-
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 2 +-
+ .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +-
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 +-
+ drivers/gpu/drm/Kconfig | 2 +-
+ drivers/gpu/drm/drm_ioctl.c | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 +-
+ drivers/hwtracing/coresight/Kconfig | 2 +-
+ drivers/iio/dac/ad5761.c | 4 +-
+ drivers/iio/dac/ti-dac7612.c | 4 +-
+ drivers/leds/leds-pca963x.c | 2 +-
+ drivers/media/i2c/imx214.c | 4 +-
+ drivers/media/v4l2-core/v4l2-fwnode.c | 2 +-
+ fs/Kconfig | 2 +-
+ fs/Kconfig.binfmt | 2 +-
+ fs/adfs/Kconfig | 2 +-
+ fs/affs/Kconfig | 2 +-
+ fs/afs/Kconfig | 6 +-
+ fs/bfs/Kconfig | 2 +-
+ fs/cachefiles/Kconfig | 4 +-
+ fs/coda/Kconfig | 2 +-
+ fs/configfs/inode.c | 2 +-
+ fs/configfs/item.c | 2 +-
+ fs/cramfs/Kconfig | 2 +-
+ fs/ecryptfs/Kconfig | 2 +-
+ fs/fat/Kconfig | 8 +-
+ fs/fscache/Kconfig | 8 +-
+ fs/fscache/cache.c | 8 +-
+ fs/fscache/cookie.c | 2 +-
+ fs/fscache/object.c | 4 +-
+ fs/fscache/operation.c | 2 +-
+ fs/fuse/Kconfig | 2 +-
+ fs/fuse/dev.c | 2 +-
+ fs/hfs/Kconfig | 2 +-
+ fs/hpfs/Kconfig | 2 +-
+ fs/inode.c | 6 +-
+ fs/isofs/Kconfig | 2 +-
+ fs/locks.c | 2 +-
+ fs/namespace.c | 2 +-
+ fs/notify/inotify/Kconfig | 2 +-
+ fs/ntfs/Kconfig | 2 +-
+ fs/ocfs2/Kconfig | 2 +-
+ fs/overlayfs/Kconfig | 6 +-
+ fs/proc/Kconfig | 4 +-
+ fs/romfs/Kconfig | 2 +-
+ fs/sysfs/dir.c | 2 +-
+ fs/sysfs/file.c | 2 +-
+ fs/sysfs/mount.c | 2 +-
+ fs/sysfs/symlink.c | 2 +-
+ fs/sysv/Kconfig | 2 +-
+ fs/udf/Kconfig | 2 +-
+ include/linux/configfs.h | 2 +-
+ include/linux/fs_context.h | 2 +-
+ include/linux/fscache-cache.h | 4 +-
+ include/linux/fscache.h | 42 +-
+ include/linux/kobject.h | 2 +-
+ include/linux/kobject_ns.h | 2 +-
+ include/linux/lsm_hooks.h | 2 +-
+ include/linux/mm.h | 4 +-
+ include/linux/platform_data/ad5761.h | 2 +-
+ include/linux/printk.h | 112 +-
+ include/linux/rbtree.h | 2 +-
+ include/linux/rbtree_augmented.h | 2 +-
+ include/linux/relay.h | 2 +-
+ include/linux/spi/spi.h | 1 +
+ include/linux/sysfs.h | 2 +-
+ include/linux/watchdog.h | 4 +-
+ include/uapi/linux/ethtool_netlink.h | 2 +-
+ include/uapi/linux/firewire-cdev.h | 2 +-
+ include/uapi/linux/kvm.h | 4 +-
+ include/uapi/rdma/rdma_user_ioctl_cmds.h | 2 +-
+ kernel/futex.c | 3 +
+ kernel/relay.c | 2 +-
+ lib/Kconfig | 2 +-
+ lib/Kconfig.debug | 2 +-
+ lib/bitmap.c | 31 +-
+ lib/kobject.c | 4 +-
+ mm/gup.c | 12 +-
+ samples/Kconfig | 2 +-
+ samples/binderfs/Makefile | 6 +-
+ scripts/kernel-doc | 41 +-
+ scripts/sphinx-pre-install | 291 +++-
+ tools/include/linux/rbtree.h | 2 +-
+ tools/include/linux/rbtree_augmented.h | 2 +-
+ tools/include/uapi/linux/kvm.h | 4 +-
+ virt/kvm/arm/vgic/vgic-mmio-v3.c | 2 +-
+ virt/kvm/arm/vgic/vgic.h | 4 +-
+ 266 files changed, 6297 insertions(+), 4334 deletions(-)
+ rename Documentation/{debugging-via-ohci1394.txt => core-api/debugging-via-ohci1394.rst} (100%)
+ rename Documentation/{DMA-API-HOWTO.txt => core-api/dma-api-howto.rst} (100%)
+ rename Documentation/{DMA-API.txt => core-api/dma-api.rst} (100%)
+ rename Documentation/{DMA-attributes.txt => core-api/dma-attributes.rst} (100%)
+ rename Documentation/{DMA-ISA-LPC.txt => core-api/dma-isa-lpc.rst} (100%)
+ rename Documentation/{IRQ.txt => core-api/irq/concepts.rst} (100%)
+ create mode 100644 Documentation/core-api/irq/index.rst
+ rename Documentation/{IRQ-affinity.txt => core-api/irq/irq-affinity.rst} (100%)
+ rename Documentation/{IRQ-domain.txt => core-api/irq/irq-domain.rst} (99%)
+ rename Documentation/{irqflags-tracing.txt => core-api/irq/irqflags-tracing.rst} (100%)
+ rename Documentation/{kref.txt => core-api/kref.rst} (100%)
+ create mode 100644 Documentation/core-api/printk-basics.rst
+ rename Documentation/{rbtree.txt => core-api/rbtree.rst} (100%)
+ rename Documentation/{IPMI.txt => driver-api/ipmi.rst} (100%)
+ rename Documentation/filesystems/{automount-support.txt => automount-support.rst} (92%)
+ rename Documentation/filesystems/caching/{backend-api.txt => backend-api.rst} (87%)
+ rename Documentation/filesystems/caching/{cachefiles.txt => cachefiles.rst} (90%)
+ create mode 100644 Documentation/filesystems/caching/fscache.rst
+ delete mode 100644 Documentation/filesystems/caching/fscache.txt
+ create mode 100644 Documentation/filesystems/caching/index.rst
+ rename Documentation/filesystems/caching/{netfs-api.txt => netfs-api.rst} (91%)
+ rename Documentation/filesystems/caching/{object.txt => object.rst} (95%)
+ rename Documentation/filesystems/caching/{operations.txt => operations.rst} (90%)
+ rename Documentation/filesystems/cifs/{cifsroot.txt => cifsroot.rst} (72%)
+ create mode 100644 Documentation/filesystems/coda.rst
+ delete mode 100644 Documentation/filesystems/coda.txt
+ rename Documentation/filesystems/{configfs/configfs.txt => configfs.rst} (87%)
+ create mode 100644 Documentation/filesystems/devpts.rst
+ delete mode 100644 Documentation/filesystems/devpts.txt
+ rename Documentation/filesystems/{dnotify.txt => dnotify.rst} (88%)
+ rename Documentation/filesystems/{fiemap.txt => fiemap.rst} (70%)
+ rename Documentation/filesystems/{files.txt => files.rst} (95%)
+ rename Documentation/filesystems/{fuse-io.txt => fuse-io.rst} (95%)
+ rename Documentation/filesystems/{locks.txt => locks.rst} (91%)
+ rename Documentation/filesystems/{mandatory-locking.txt => mandatory-locking.rst} (91%)
+ rename Documentation/filesystems/{mount_api.txt => mount_api.rst} (79%)
+ rename Documentation/filesystems/{quota.txt => quota.rst} (81%)
+ rename Documentation/filesystems/{seq_file.txt => seq_file.rst} (92%)
+ rename Documentation/filesystems/{sharedsubtree.txt => sharedsubtree.rst} (72%)
+ create mode 100644 Documentation/filesystems/spufs/index.rst
+ create mode 100644 Documentation/filesystems/spufs/spu_create.rst
+ create mode 100644 Documentation/filesystems/spufs/spu_run.rst
+ rename Documentation/filesystems/{spufs.txt => spufs/spufs.rst} (57%)
+ rename Documentation/filesystems/{sysfs-pci.txt => sysfs-pci.rst} (92%)
+ rename Documentation/filesystems/{sysfs-tagging.txt => sysfs-tagging.rst} (72%)
+ rename Documentation/filesystems/{xfs-delayed-logging-design.txt => xfs-delayed-logging-design.rst} (97%)
+ rename Documentation/filesystems/{xfs-self-describing-metadata.txt => xfs-self-describing-metadata.rst} (83%)
+ rename Documentation/i2c/{i2c.svg => i2c_bus.svg} (99%)
+ rename Documentation/{futex-requeue-pi.txt => locking/futex-requeue-pi.rst} (100%)
+ rename Documentation/{hwspinlock.txt => locking/hwspinlock.rst} (100%)
+ rename Documentation/{percpu-rw-semaphore.txt => locking/percpu-rw-semaphore.rst} (100%)
+ rename Documentation/{pi-futex.txt => locking/pi-futex.rst} (100%)
+ rename Documentation/{preempt-locking.txt => locking/preempt-locking.rst} (100%)
+ rename Documentation/{robust-futex-ABI.txt => locking/robust-futex-ABI.rst} (100%)
+ rename Documentation/{robust-futexes.txt => locking/robust-futexes.rst} (100%)
+ rename Documentation/{unaligned-memory-access.txt => process/unaligned-memory-access.rst} (100%)
+ rename Documentation/{digsig.txt => security/digsig.rst} (100%)
+ create mode 100644 Documentation/translations/it_IT/riscv/patch-acceptance.rst
+ create mode 100644 Documentation/translations/zh_CN/filesystems/debugfs.rst
+Merging v4l-dvb/master (938b29db3aa9 media: Documentation: media: Refer to mbus format documentation from CSI-2 docs)
+$ git merge v4l-dvb/master
+Auto-merging drivers/staging/media/Makefile
+Auto-merging drivers/staging/media/Kconfig
+Auto-merging drivers/media/v4l2-core/v4l2-fwnode.c
+Removing drivers/media/platform/tegra-cec/Makefile
+Removing drivers/media/platform/sti/cec/Makefile
+Removing drivers/media/platform/sh_veu.c
+Removing drivers/media/platform/seco-cec/Makefile
+Removing drivers/media/platform/meson/Makefile
+Removing drivers/media/platform/cros-ec-cec/Makefile
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/configs/exynos_defconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
+Removing Documentation/media/v4l-drivers/cardlist.rst
+Removing Documentation/media/media_uapi.rst
+Removing Documentation/media/media_kapi.rst
+Removing Documentation/media/index.rst
+Removing Documentation/media/dvb-drivers/udev.rst
+Removing Documentation/media/dvb-drivers/intro.rst
+Removing Documentation/media/dvb-drivers/index.rst
+Removing Documentation/media/dvb-drivers/faq.rst
+Removing Documentation/media/dvb-drivers/cards.rst
+Removing Documentation/media/dvb-drivers/bt8xx.rst
+Removing Documentation/media/dvb-drivers/avermedia.rst
+Removing Documentation/media/cec-drivers/index.rst
+Removing Documentation/media/.gitignore
+Auto-merging Documentation/driver-api/index.rst
+Removing Documentation/devicetree/bindings/media/rockchip-vpu.txt
+Removing Documentation/devicetree/bindings/media/rockchip-rga.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/debugfs-cec-error-inj | 2 +-
+ Documentation/Makefile | 10 +-
+ Documentation/admin-guide/index.rst | 1 +
+ Documentation/admin-guide/kernel-parameters.txt | 4 +-
+ .../media}/au0828-cardlist.rst | 0
+ Documentation/admin-guide/media/avermedia.rst | 94 +
+ Documentation/admin-guide/media/bt8xx.rst | 156 +
+ .../media}/bttv-cardlist.rst | 2 +-
+ .../v4l-drivers => admin-guide/media}/bttv.rst | 443 +-
+ Documentation/admin-guide/media/building.rst | 357 +
+ .../media}/cafe_ccic.rst | 0
+ Documentation/admin-guide/media/cardlist.rst | 29 +
+ Documentation/admin-guide/media/cec-drivers.rst | 10 +
+ Documentation/admin-guide/media/ci.rst | 77 +
+ .../v4l-drivers => admin-guide/media}/cpia2.rst | 56 +-
+ Documentation/admin-guide/media/cx18-cardlist.rst | 17 +
+ .../admin-guide/media/cx231xx-cardlist.rst | 99 +
+ .../media}/cx23885-cardlist.rst | 6 +-
+ .../media}/cx88-cardlist.rst | 6 +-
+ Documentation/admin-guide/media/cx88.rst | 58 +
+ .../media}/davinci-vpbe.rst | 42 +-
+ Documentation/admin-guide/media/dvb-drivers.rst | 16 +
+ .../admin-guide/media/dvb-usb-a800-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-af9005-cardlist.rst | 20 +
+ .../admin-guide/media/dvb-usb-af9015-cardlist.rst | 80 +
+ .../admin-guide/media/dvb-usb-af9035-cardlist.rst | 74 +
+ .../admin-guide/media/dvb-usb-anysee-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-au6610-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-az6007-cardlist.rst | 20 +
+ .../admin-guide/media/dvb-usb-az6027-cardlist.rst | 24 +
+ .../admin-guide/media/dvb-usb-ce6230-cardlist.rst | 18 +
+ .../media/dvb-usb-cinergyT2-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-cxusb-cardlist.rst | 40 +
+ .../admin-guide/media/dvb-usb-dib0700-cardlist.rst | 162 +
+ .../media/dvb-usb-dibusb-mb-cardlist.rst | 42 +
+ .../media/dvb-usb-dibusb-mc-cardlist.rst | 30 +
+ .../admin-guide/media/dvb-usb-digitv-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-dtt200u-cardlist.rst | 22 +
+ .../admin-guide/media/dvb-usb-dtv5100-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-dvbsky-cardlist.rst | 42 +
+ .../admin-guide/media/dvb-usb-dw2102-cardlist.rst | 52 +
+ .../admin-guide/media/dvb-usb-ec168-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-gl861-cardlist.rst | 20 +
+ .../admin-guide/media/dvb-usb-gp8psk-cardlist.rst | 22 +
+ .../admin-guide/media/dvb-usb-lmedm04-cardlist.rst | 20 +
+ .../admin-guide/media/dvb-usb-m920x-cardlist.rst | 26 +
+ .../media/dvb-usb-mxl111sf-cardlist.rst | 36 +
+ .../media/dvb-usb-nova-t-usb2-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-opera1-cardlist.rst | 16 +
+ .../media/dvb-usb-pctv452e-cardlist.rst | 20 +
+ .../media/dvb-usb-rtl28xxu-cardlist.rst | 80 +
+ .../media/dvb-usb-technisat-usb2-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-ttusb2-cardlist.rst | 24 +
+ .../admin-guide/media/dvb-usb-umt-010-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-vp702x-cardlist.rst | 16 +
+ .../admin-guide/media/dvb-usb-vp7045-cardlist.rst | 18 +
+ .../admin-guide/media/dvb-usb-zd1301-cardlist.rst | 16 +
+ Documentation/admin-guide/media/dvb.rst | 12 +
+ Documentation/admin-guide/media/dvb_intro.rst | 616 +
+ Documentation/admin-guide/media/dvb_references.rst | 29 +
+ .../media}/em28xx-cardlist.rst | 10 +-
+ Documentation/admin-guide/media/faq.rst | 216 +
+ .../v4l-drivers => admin-guide/media}/fimc.rst | 22 +-
+ .../admin-guide/media/frontend-cardlist.rst | 226 +
+ .../media}/gspca-cardlist.rst | 0
+ Documentation/admin-guide/media/i2c-cardlist.rst | 290 +
+ .../v4l-drivers => admin-guide/media}/imx.rst | 227 +-
+ .../admin-guide/media/imx6q-sabreauto.dot | 51 +
+ Documentation/admin-guide/media/imx6q-sabresd.dot | 56 +
+ .../v4l-drivers => admin-guide/media}/imx7.rst | 0
+ Documentation/admin-guide/media/index.rst | 61 +
+ Documentation/admin-guide/media/intro.rst | 27 +
+ .../v4l-drivers => admin-guide/media}/ipu3.rst | 59 +-
+ .../v4l-drivers => admin-guide/media}/ipu3_rcb.svg | 0
+ .../media}/ivtv-cardlist.rst | 2 +-
+ .../v4l-drivers => admin-guide/media}/ivtv.rst | 0
+ .../dvb-drivers => admin-guide/media}/lmedm04.rst | 0
+ .../v4l-drivers => admin-guide/media}/meye.rst | 41 -
+ Documentation/admin-guide/media/misc-cardlist.rst | 28 +
+ Documentation/admin-guide/media/omap3isp.rst | 92 +
+ .../media}/omap4_camera.rst | 0
+ .../media}/opera-firmware.rst | 0
+ .../admin-guide/media/other-usb-cardlist.rst | 92 +
+ Documentation/admin-guide/media/pci-cardlist.rst | 107 +
+ .../v4l-drivers => admin-guide/media}/philips.rst | 0
+ .../admin-guide/media/platform-cardlist.rst | 90 +
+ .../media}/pulse8-cec.rst | 0
+ .../media}/qcom_camss.rst | 0
+ .../media}/qcom_camss_8x96_graph.dot | 0
+ .../media}/qcom_camss_graph.dot | 0
+ Documentation/admin-guide/media/radio-cardlist.rst | 44 +
+ .../media}/rcar-fdp1.rst | 0
+ .../media/remote-controller.rst} | 9 +-
+ .../media}/saa7134-cardlist.rst | 2 +-
+ Documentation/admin-guide/media/saa7134.rst | 88 +
+ .../media}/saa7164-cardlist.rst | 2 +-
+ .../v4l-drivers => admin-guide/media}/si470x.rst | 0
+ .../v4l-drivers => admin-guide/media}/si4713.rst | 0
+ .../v4l-drivers => admin-guide/media}/si476x.rst | 0
+ Documentation/admin-guide/media/siano-cardlist.rst | 56 +
+ .../media}/technisat.rst | 0
+ .../media}/tm6000-cardlist.rst | 0
+ .../media}/ttusb-dec.rst | 0
+ .../media}/tuner-cardlist.rst | 0
+ Documentation/admin-guide/media/usb-cardlist.rst | 157 +
+ .../media}/usbvision-cardlist.rst | 0
+ Documentation/admin-guide/media/v4l-drivers.rst | 33 +
+ .../v4l-drivers => admin-guide/media}/vimc.dot | 0
+ .../v4l-drivers => admin-guide/media}/vimc.rst | 11 -
+ .../v4l-drivers => admin-guide/media}/vivid.rst | 0
+ .../v4l-drivers => admin-guide/media}/zr364xx.rst | 28 +-
+ .../devicetree/bindings/media/i2c/ov8856.yaml | 142 +
+ .../devicetree/bindings/media/rockchip,vdec.yaml | 73 +
+ .../devicetree/bindings/media/rockchip-rga.txt | 34 -
+ .../devicetree/bindings/media/rockchip-rga.yaml | 83 +
+ .../devicetree/bindings/media/rockchip-vpu.txt | 43 -
+ .../devicetree/bindings/media/rockchip-vpu.yaml | 77 +
+ .../devicetree/bindings/media/video-interfaces.txt | 372 +-
+ .../bindings/phy/rockchip-mipi-dphy-rx0.yaml | 3 -
+ Documentation/doc-guide/parse-headers.rst | 2 +-
+ Documentation/driver-api/index.rst | 1 +
+ .../{media/kapi => driver-api/media}/cec-core.rst | 0
+ .../{media/kapi => driver-api/media}/csi2.rst | 6 +
+ .../driver-api/media/drivers/bttv-devel.rst | 116 +
+ .../media/drivers}/contributors.rst | 0
+ .../driver-api/media/drivers/cpia2_devel.rst | 56 +
+ .../media/drivers/cx2341x-devel.rst} | 175 -
+ .../media/drivers/cx88-devel.rst} | 52 -
+ .../media/drivers/davinci-vpbe-devel.rst | 39 +
+ .../media/drivers}/dvb-usb.rst | 0
+ .../driver-api/media/drivers/fimc-devel.rst | 33 +
+ .../media/drivers}/frontends.rst | 0
+ Documentation/driver-api/media/drivers/index.rst | 38 +
+ .../media/drivers}/pvrusb2.rst | 0
+ .../media/drivers}/pxa_camera.rst | 0
+ .../media/drivers}/radiotrack.rst | 0
+ .../media/drivers/saa7134-devel.rst} | 48 -
+ .../media/drivers}/sh_mobile_ceu_camera.rst | 0
+ .../media/drivers}/tuners.rst | 0
+ .../driver-api/media/drivers/vimc-devel.rst | 15 +
+ .../{media/kapi => driver-api/media}/dtv-ca.rst | 0
+ .../kapi => driver-api/media}/dtv-common.rst | 0
+ .../{media/kapi => driver-api/media}/dtv-core.rst | 0
+ .../{media/kapi => driver-api/media}/dtv-demux.rst | 0
+ .../kapi => driver-api/media}/dtv-frontend.rst | 0
+ .../{media/kapi => driver-api/media}/dtv-net.rst | 0
+ Documentation/driver-api/media/index.rst | 54 +
+ .../{media/kapi => driver-api/media}/mc-core.rst | 0
+ .../{media/kapi => driver-api/media}/rc-core.rst | 0
+ .../kapi => driver-api/media}/v4l2-async.rst | 0
+ .../kapi => driver-api/media}/v4l2-clocks.rst | 0
+ .../kapi => driver-api/media}/v4l2-common.rst | 0
+ .../kapi => driver-api/media}/v4l2-controls.rst | 0
+ .../{media/kapi => driver-api/media}/v4l2-core.rst | 0
+ .../{media/kapi => driver-api/media}/v4l2-dev.rst | 0
+ .../kapi => driver-api/media}/v4l2-device.rst | 0
+ .../kapi => driver-api/media}/v4l2-dv-timings.rst | 0
+ .../kapi => driver-api/media}/v4l2-event.rst | 0
+ .../{media/kapi => driver-api/media}/v4l2-fh.rst | 0
+ .../media}/v4l2-flash-led-class.rst | 0
+ .../kapi => driver-api/media}/v4l2-fwnode.rst | 0
+ .../kapi => driver-api/media}/v4l2-intro.rst | 0
+ .../{media/kapi => driver-api/media}/v4l2-mc.rst | 0
+ .../kapi => driver-api/media}/v4l2-mediabus.rst | 0
+ .../kapi => driver-api/media}/v4l2-mem2mem.rst | 0
+ .../{media/kapi => driver-api/media}/v4l2-rect.rst | 0
+ .../kapi => driver-api/media}/v4l2-subdev.rst | 53 +-
+ .../kapi => driver-api/media}/v4l2-tuner.rst | 0
+ .../kapi => driver-api/media}/v4l2-tveeprom.rst | 0
+ .../kapi => driver-api/media}/v4l2-videobuf.rst | 5 +-
+ .../kapi => driver-api/media}/v4l2-videobuf2.rst | 0
+ Documentation/fb/api.rst | 4 +-
+ Documentation/index.rst | 1 -
+ Documentation/media/.gitignore | 5 -
+ Documentation/media/cec-drivers/index.rst | 34 -
+ Documentation/media/dvb-drivers/avermedia.rst | 269 -
+ Documentation/media/dvb-drivers/bt8xx.rst | 124 -
+ Documentation/media/dvb-drivers/cards.rst | 146 -
+ Documentation/media/dvb-drivers/faq.rst | 169 -
+ Documentation/media/dvb-drivers/index.rst | 45 -
+ Documentation/media/dvb-drivers/intro.rst | 23 -
+ Documentation/media/dvb-drivers/udev.rst | 63 -
+ Documentation/media/index.rst | 26 -
+ Documentation/media/media_kapi.rst | 38 -
+ Documentation/media/media_uapi.rst | 33 -
+ Documentation/media/v4l-drivers/cardlist.rst | 20 -
+ .../translations/it_IT/doc-guide/parse-headers.rst | 2 +-
+ .../translations/zh_CN/video4linux/omap3isp.txt | 4 +-
+ .../zh_CN/video4linux/v4l2-framework.txt | 6 +-
+ Documentation/userspace-api/index.rst | 1 +
+ Documentation/{ => userspace-api}/media/Makefile | 2 +-
+ .../media/audio.h.rst.exceptions | 0
+ .../{ => userspace-api}/media/ca.h.rst.exceptions | 0
+ .../{ => userspace-api}/media/cec.h.rst.exceptions | 0
+ .../uapi => userspace-api/media}/cec/cec-api.rst | 2 +-
+ .../media}/cec/cec-func-close.rst | 2 +-
+ .../media}/cec/cec-func-ioctl.rst | 2 +-
+ .../media}/cec/cec-func-open.rst | 2 +-
+ .../media}/cec/cec-func-poll.rst | 2 +-
+ .../uapi => userspace-api/media}/cec/cec-funcs.rst | 2 +-
+ .../media}/cec/cec-header.rst | 2 +-
+ .../uapi => userspace-api/media}/cec/cec-intro.rst | 2 +-
+ .../media}/cec/cec-ioc-adap-g-caps.rst | 2 +-
+ .../media}/cec/cec-ioc-adap-g-conn-info.rst | 0
+ .../media}/cec/cec-ioc-adap-g-log-addrs.rst | 2 +-
+ .../media}/cec/cec-ioc-adap-g-phys-addr.rst | 2 +-
+ .../media}/cec/cec-ioc-dqevent.rst | 2 +-
+ .../media}/cec/cec-ioc-g-mode.rst | 2 +-
+ .../media}/cec/cec-ioc-receive.rst | 2 +-
+ .../media}/cec/cec-pin-error-inj.rst | 2 +-
+ .../{ => userspace-api}/media/conf_nitpick.py | 0
+ .../{ => userspace-api}/media/dmx.h.rst.exceptions | 0
+ .../userspace-api/media/drivers/cx2341x-uapi.rst | 179 +
+ .../userspace-api/media/drivers/imx-uapi.rst | 125 +
+ .../media/drivers}/index.rst | 39 +-
+ .../media/drivers}/max2175.rst | 2 +-
+ .../userspace-api/media/drivers/meye-uapi.rst | 53 +
+ .../media/drivers/omap3isp-uapi.rst} | 80 +-
+ .../media/drivers}/uvcvideo.rst | 0
+ .../media}/dvb/audio-bilingual-channel-select.rst | 2 +-
+ .../media}/dvb/audio-channel-select.rst | 2 +-
+ .../media}/dvb/audio-clear-buffer.rst | 2 +-
+ .../media}/dvb/audio-continue.rst | 2 +-
+ .../media}/dvb/audio-fclose.rst | 2 +-
+ .../media}/dvb/audio-fopen.rst | 2 +-
+ .../media}/dvb/audio-fwrite.rst | 2 +-
+ .../media}/dvb/audio-get-capabilities.rst | 2 +-
+ .../media}/dvb/audio-get-status.rst | 2 +-
+ .../media}/dvb/audio-pause.rst | 2 +-
+ .../media}/dvb/audio-play.rst | 2 +-
+ .../media}/dvb/audio-select-source.rst | 2 +-
+ .../media}/dvb/audio-set-av-sync.rst | 2 +-
+ .../media}/dvb/audio-set-bypass-mode.rst | 2 +-
+ .../media}/dvb/audio-set-id.rst | 2 +-
+ .../media}/dvb/audio-set-mixer.rst | 2 +-
+ .../media}/dvb/audio-set-mute.rst | 2 +-
+ .../media}/dvb/audio-set-streamtype.rst | 2 +-
+ .../media}/dvb/audio-stop.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/audio.rst | 2 +-
+ .../media}/dvb/audio_data_types.rst | 2 +-
+ .../media}/dvb/audio_function_calls.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/ca-fclose.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/ca-fopen.rst | 2 +-
+ .../media}/dvb/ca-get-cap.rst | 2 +-
+ .../media}/dvb/ca-get-descr-info.rst | 2 +-
+ .../media}/dvb/ca-get-msg.rst | 2 +-
+ .../media}/dvb/ca-get-slot-info.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/ca-reset.rst | 2 +-
+ .../media}/dvb/ca-send-msg.rst | 2 +-
+ .../media}/dvb/ca-set-descr.rst | 2 +-
+ .../{media/uapi => userspace-api/media}/dvb/ca.rst | 3 +-
+ .../media}/dvb/ca_data_types.rst | 2 +-
+ .../media}/dvb/ca_function_calls.rst | 2 +-
+ .../media/dvb/ca_high_level.rst} | 82 +-
+ .../uapi => userspace-api/media}/dvb/demux.rst | 2 +-
+ .../media}/dvb/dmx-add-pid.rst | 2 +-
+ .../media}/dvb/dmx-expbuf.rst | 2 +-
+ .../media}/dvb/dmx-fclose.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/dmx-fopen.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/dmx-fread.rst | 2 +-
+ .../media}/dvb/dmx-fwrite.rst | 2 +-
+ .../media}/dvb/dmx-get-pes-pids.rst | 2 +-
+ .../media}/dvb/dmx-get-stc.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/dmx-mmap.rst | 2 +-
+ .../media}/dvb/dmx-munmap.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/dmx-qbuf.rst | 2 +-
+ .../media}/dvb/dmx-querybuf.rst | 2 +-
+ .../media}/dvb/dmx-remove-pid.rst | 2 +-
+ .../media}/dvb/dmx-reqbufs.rst | 2 +-
+ .../media}/dvb/dmx-set-buffer-size.rst | 2 +-
+ .../media}/dvb/dmx-set-filter.rst | 2 +-
+ .../media}/dvb/dmx-set-pes-filter.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/dmx-start.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/dmx-stop.rst | 2 +-
+ .../media}/dvb/dmx_fcalls.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/dmx_types.rst | 2 +-
+ .../media}/dvb/dvb-fe-read-status.rst | 2 +-
+ .../media}/dvb/dvb-frontend-event.rst | 2 +-
+ .../media}/dvb/dvb-frontend-parameters.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/dvbapi.rst | 2 +-
+ .../media}/dvb/dvbproperty.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/dvbstb.svg | 2 +-
+ .../uapi => userspace-api/media}/dvb/examples.rst | 2 +-
+ .../media}/dvb/fe-bandwidth-t.rst | 2 +-
+ .../media}/dvb/fe-diseqc-recv-slave-reply.rst | 2 +-
+ .../media}/dvb/fe-diseqc-reset-overload.rst | 2 +-
+ .../media}/dvb/fe-diseqc-send-burst.rst | 2 +-
+ .../media}/dvb/fe-diseqc-send-master-cmd.rst | 2 +-
+ .../media}/dvb/fe-dishnetwork-send-legacy-cmd.rst | 2 +-
+ .../media}/dvb/fe-enable-high-lnb-voltage.rst | 2 +-
+ .../media}/dvb/fe-get-event.rst | 2 +-
+ .../media}/dvb/fe-get-frontend.rst | 2 +-
+ .../media}/dvb/fe-get-info.rst | 2 +-
+ .../media}/dvb/fe-get-property.rst | 2 +-
+ .../media}/dvb/fe-read-ber.rst | 2 +-
+ .../media}/dvb/fe-read-signal-strength.rst | 2 +-
+ .../media}/dvb/fe-read-snr.rst | 2 +-
+ .../media}/dvb/fe-read-status.rst | 2 +-
+ .../media}/dvb/fe-read-uncorrected-blocks.rst | 2 +-
+ .../media}/dvb/fe-set-frontend-tune-mode.rst | 2 +-
+ .../media}/dvb/fe-set-frontend.rst | 2 +-
+ .../media}/dvb/fe-set-tone.rst | 2 +-
+ .../media}/dvb/fe-set-voltage.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/fe-type-t.rst | 2 +-
+ .../media}/dvb/fe_property_parameters.rst | 2 +-
+ .../media}/dvb/frontend-header.rst | 2 +-
+ .../media}/dvb/frontend-property-cable-systems.rst | 2 +-
+ .../dvb/frontend-property-satellite-systems.rst | 2 +-
+ .../dvb/frontend-property-terrestrial-systems.rst | 2 +-
+ .../media}/dvb/frontend-stat-properties.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/frontend.rst | 2 +-
+ .../media}/dvb/frontend_f_close.rst | 2 +-
+ .../media}/dvb/frontend_f_open.rst | 2 +-
+ .../media}/dvb/frontend_fcalls.rst | 2 +-
+ .../media}/dvb/frontend_legacy_api.rst | 2 +-
+ .../media}/dvb/frontend_legacy_dvbv3_api.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/headers.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/intro.rst | 2 +-
+ .../media}/dvb/legacy_dvb_apis.rst | 2 +-
+ .../media}/dvb/net-add-if.rst | 2 +-
+ .../media}/dvb/net-get-if.rst | 2 +-
+ .../media}/dvb/net-remove-if.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/net-types.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/net.rst | 2 +-
+ .../media}/dvb/query-dvb-frontend-info.rst | 2 +-
+ .../media}/dvb/video-clear-buffer.rst | 2 +-
+ .../media}/dvb/video-command.rst | 2 +-
+ .../media}/dvb/video-continue.rst | 2 +-
+ .../media}/dvb/video-fast-forward.rst | 2 +-
+ .../media}/dvb/video-fclose.rst | 2 +-
+ .../media}/dvb/video-fopen.rst | 2 +-
+ .../media}/dvb/video-freeze.rst | 2 +-
+ .../media}/dvb/video-fwrite.rst | 2 +-
+ .../media}/dvb/video-get-capabilities.rst | 2 +-
+ .../media}/dvb/video-get-event.rst | 2 +-
+ .../media}/dvb/video-get-frame-count.rst | 2 +-
+ .../media}/dvb/video-get-pts.rst | 2 +-
+ .../media}/dvb/video-get-size.rst | 2 +-
+ .../media}/dvb/video-get-status.rst | 2 +-
+ .../media}/dvb/video-play.rst | 2 +-
+ .../media}/dvb/video-select-source.rst | 2 +-
+ .../media}/dvb/video-set-blank.rst | 2 +-
+ .../media}/dvb/video-set-display-format.rst | 2 +-
+ .../media}/dvb/video-set-format.rst | 2 +-
+ .../media}/dvb/video-set-streamtype.rst | 2 +-
+ .../media}/dvb/video-slowmotion.rst | 2 +-
+ .../media}/dvb/video-stillpicture.rst | 2 +-
+ .../media}/dvb/video-stop.rst | 2 +-
+ .../media}/dvb/video-try-command.rst | 2 +-
+ .../uapi => userspace-api/media}/dvb/video.rst | 2 +-
+ .../media}/dvb/video_function_calls.rst | 2 +-
+ .../media}/dvb/video_types.rst | 2 +-
+ .../uapi => userspace-api/media}/fdl-appendix.rst | 2 +-
+ .../media/frontend.h.rst.exceptions | 0
+ .../uapi => userspace-api/media}/gen-errors.rst | 2 +-
+ Documentation/userspace-api/media/index.rst | 67 +
+ Documentation/{ => userspace-api}/media/intro.rst | 0
+ .../media/lirc.h.rst.exceptions | 0
+ .../media/media.h.rst.exceptions | 0
+ .../media}/mediactl/media-controller-intro.rst | 2 +-
+ .../media}/mediactl/media-controller-model.rst | 2 +-
+ .../media}/mediactl/media-controller.rst | 2 +-
+ .../media}/mediactl/media-func-close.rst | 2 +-
+ .../media}/mediactl/media-func-ioctl.rst | 2 +-
+ .../media}/mediactl/media-func-open.rst | 2 +-
+ .../media}/mediactl/media-funcs.rst | 2 +-
+ .../media}/mediactl/media-header.rst | 2 +-
+ .../media}/mediactl/media-ioc-device-info.rst | 2 +-
+ .../media}/mediactl/media-ioc-enum-entities.rst | 2 +-
+ .../media}/mediactl/media-ioc-enum-links.rst | 2 +-
+ .../media}/mediactl/media-ioc-g-topology.rst | 2 +-
+ .../media}/mediactl/media-ioc-request-alloc.rst | 2 +-
+ .../media}/mediactl/media-ioc-setup-link.rst | 2 +-
+ .../media}/mediactl/media-request-ioc-queue.rst | 2 +-
+ .../media}/mediactl/media-request-ioc-reinit.rst | 2 +-
+ .../media}/mediactl/media-types.rst | 2 +-
+ .../media}/mediactl/request-api.rst | 2 +-
+ .../media}/mediactl/request-func-close.rst | 2 +-
+ .../media}/mediactl/request-func-ioctl.rst | 2 +-
+ .../media}/mediactl/request-func-poll.rst | 2 +-
+ .../{ => userspace-api}/media/net.h.rst.exceptions | 0
+ .../uapi => userspace-api/media}/rc/keytable.c.rst | 2 +-
+ .../media}/rc/lirc-dev-intro.rst | 2 +-
+ .../uapi => userspace-api/media}/rc/lirc-dev.rst | 2 +-
+ .../uapi => userspace-api/media}/rc/lirc-func.rst | 2 +-
+ .../media}/rc/lirc-get-features.rst | 2 +-
+ .../media}/rc/lirc-get-rec-mode.rst | 2 +-
+ .../media}/rc/lirc-get-rec-resolution.rst | 2 +-
+ .../media}/rc/lirc-get-send-mode.rst | 2 +-
+ .../media}/rc/lirc-get-timeout.rst | 2 +-
+ .../media}/rc/lirc-header.rst | 2 +-
+ .../uapi => userspace-api/media}/rc/lirc-read.rst | 2 +-
+ .../media}/rc/lirc-set-measure-carrier-mode.rst | 2 +-
+ .../media}/rc/lirc-set-rec-carrier-range.rst | 2 +-
+ .../media}/rc/lirc-set-rec-carrier.rst | 2 +-
+ .../media}/rc/lirc-set-rec-timeout-reports.rst | 2 +-
+ .../media}/rc/lirc-set-rec-timeout.rst | 2 +-
+ .../media}/rc/lirc-set-send-carrier.rst | 2 +-
+ .../media}/rc/lirc-set-send-duty-cycle.rst | 2 +-
+ .../media}/rc/lirc-set-transmitter-mask.rst | 2 +-
+ .../media}/rc/lirc-set-wideband-receiver.rst | 2 +-
+ .../uapi => userspace-api/media}/rc/lirc-write.rst | 2 +-
+ .../uapi => userspace-api/media}/rc/rc-intro.rst | 2 +-
+ .../uapi => userspace-api/media}/rc/rc-protos.rst | 0
+ .../media}/rc/rc-sysfs-nodes.rst | 2 +-
+ .../media}/rc/rc-table-change.rst | 2 +-
+ .../uapi => userspace-api/media}/rc/rc-tables.rst | 2 +-
+ .../media}/rc/remote_controllers.rst | 2 +-
+ .../media/typical_media_device.svg | 2 +-
+ .../uapi => userspace-api/media}/v4l/app-pri.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/async.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/audio.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/bayer.svg | 2 +-
+ .../uapi => userspace-api/media}/v4l/biblio.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/buffer.rst | 2 +-
+ .../media}/v4l/capture-example.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/capture.c.rst | 2 +-
+ .../media}/v4l/colorspaces-defs.rst | 2 +-
+ .../media}/v4l/colorspaces-details.rst | 2 +-
+ .../media}/v4l/colorspaces.rst | 2 +-
+ .../media}/v4l/common-defs.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/common.rst | 3 +-
+ .../uapi => userspace-api/media}/v4l/compat.rst | 2 +-
+ .../media}/v4l/constraints.svg | 2 +-
+ .../uapi => userspace-api/media}/v4l/control.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/crop.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/crop.svg | 2 +-
+ .../media}/v4l/depth-formats.rst | 2 +-
+ .../media}/v4l/dev-capture.rst | 2 +-
+ .../media}/v4l/dev-decoder.rst | 0
+ .../uapi => userspace-api/media}/v4l/dev-event.rst | 2 +-
+ .../media}/v4l/dev-mem2mem.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/dev-meta.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/dev-osd.rst | 2 +-
+ .../media}/v4l/dev-output.rst | 2 +-
+ .../media}/v4l/dev-overlay.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/dev-radio.rst | 2 +-
+ .../media}/v4l/dev-raw-vbi.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/dev-rds.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/dev-sdr.rst | 2 +-
+ .../media}/v4l/dev-sliced-vbi.rst | 4 +-
+ .../media}/v4l/dev-stateless-decoder.rst | 0
+ .../media}/v4l/dev-subdev.rst | 7 +-
+ .../uapi => userspace-api/media}/v4l/dev-touch.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/devices.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/diff-v4l.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/dmabuf.rst | 2 +-
+ .../media}/v4l/dv-timings.rst | 2 +-
+ .../media}/v4l/ext-ctrls-camera.rst | 153 +-
+ .../media}/v4l/ext-ctrls-codec.rst | 14 +-
+ .../media}/v4l/ext-ctrls-detect.rst | 2 +-
+ .../media}/v4l/ext-ctrls-dv.rst | 2 +-
+ .../media}/v4l/ext-ctrls-flash.rst | 2 +-
+ .../media}/v4l/ext-ctrls-fm-rx.rst | 2 +-
+ .../media}/v4l/ext-ctrls-fm-tx.rst | 2 +-
+ .../media}/v4l/ext-ctrls-image-process.rst | 4 +-
+ .../media}/v4l/ext-ctrls-image-source.rst | 2 +-
+ .../media}/v4l/ext-ctrls-jpeg.rst | 2 +-
+ .../media}/v4l/ext-ctrls-rf-tuner.rst | 2 +-
+ .../media}/v4l/extended-controls.rst | 2 +-
+ .../media}/v4l/field-order.rst | 2 +-
+ .../media}/v4l/fieldseq_bt.svg | 2 +-
+ .../media}/v4l/fieldseq_tb.svg | 2 +-
+ .../uapi => userspace-api/media}/v4l/format.rst | 2 +-
+ .../media/v4l}/fourcc.rst | 0
+ .../media}/v4l/func-close.rst | 2 +-
+ .../media}/v4l/func-ioctl.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/func-mmap.rst | 2 +-
+ .../media}/v4l/func-munmap.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/func-open.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/func-poll.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/func-read.rst | 2 +-
+ .../media}/v4l/func-select.rst | 2 +-
+ .../media}/v4l/func-write.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/hist-v4l2.rst | 2 +-
+ .../media}/v4l/hsv-formats.rst | 2 +-
+ .../{media/uapi => userspace-api/media}/v4l/io.rst | 2 +-
+ .../media}/v4l/libv4l-introduction.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/libv4l.rst | 2 +-
+ .../media}/v4l/meta-formats.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/mmap.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/nv12mt.svg | 2 +-
+ .../media}/v4l/nv12mt_example.svg | 2 +-
+ .../uapi => userspace-api/media}/v4l/open.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/pipeline.dot | 0
+ .../media}/v4l/pixfmt-bayer.rst | 2 +-
+ .../media}/v4l/pixfmt-cnf4.rst | 0
+ .../media}/v4l/pixfmt-compressed.rst | 2 +-
+ .../media}/v4l/pixfmt-grey.rst | 2 +-
+ .../media}/v4l/pixfmt-indexed.rst | 2 +-
+ .../media}/v4l/pixfmt-intro.rst | 2 +-
+ .../media}/v4l/pixfmt-inzi.rst | 2 +-
+ .../media}/v4l/pixfmt-m420.rst | 2 +-
+ .../media}/v4l/pixfmt-meta-d4xx.rst | 2 +-
+ .../media}/v4l/pixfmt-meta-intel-ipu3.rst | 2 +-
+ .../media}/v4l/pixfmt-meta-uvc.rst | 2 +-
+ .../media}/v4l/pixfmt-meta-vivid.rst | 2 +-
+ .../media}/v4l/pixfmt-meta-vsp1-hgo.rst | 2 +-
+ .../media}/v4l/pixfmt-meta-vsp1-hgt.rst | 2 +-
+ .../media}/v4l/pixfmt-nv12.rst | 2 +-
+ .../media}/v4l/pixfmt-nv12m.rst | 2 +-
+ .../media}/v4l/pixfmt-nv12mt.rst | 2 +-
+ .../media}/v4l/pixfmt-nv16.rst | 2 +-
+ .../media}/v4l/pixfmt-nv16m.rst | 2 +-
+ .../media}/v4l/pixfmt-nv24.rst | 2 +-
+ .../media}/v4l/pixfmt-packed-hsv.rst | 2 +-
+ .../media}/v4l/pixfmt-packed-yuv.rst | 2 +-
+ .../media}/v4l/pixfmt-reserved.rst | 4 +-
+ .../media}/v4l/pixfmt-rgb.rst | 138 +-
+ .../media}/v4l/pixfmt-sdr-cs08.rst | 2 +-
+ .../media}/v4l/pixfmt-sdr-cs14le.rst | 2 +-
+ .../media}/v4l/pixfmt-sdr-cu08.rst | 2 +-
+ .../media}/v4l/pixfmt-sdr-cu16le.rst | 2 +-
+ .../media}/v4l/pixfmt-sdr-pcu16be.rst | 2 +-
+ .../media}/v4l/pixfmt-sdr-pcu18be.rst | 2 +-
+ .../media}/v4l/pixfmt-sdr-pcu20be.rst | 2 +-
+ .../media}/v4l/pixfmt-sdr-ru12le.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb10-ipu3.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb10.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb10alaw8.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb10dpcm8.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb10p.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb12.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb12p.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb14.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb14p.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb16.rst | 2 +-
+ .../media}/v4l/pixfmt-srggb8.rst | 2 +-
+ .../media}/v4l/pixfmt-tch-td08.rst | 2 +-
+ .../media}/v4l/pixfmt-tch-td16.rst | 2 +-
+ .../media}/v4l/pixfmt-tch-tu08.rst | 2 +-
+ .../media}/v4l/pixfmt-tch-tu16.rst | 2 +-
+ .../media}/v4l/pixfmt-uv8.rst | 2 +-
+ .../media}/v4l/pixfmt-uyvy.rst | 2 +-
+ .../media}/v4l/pixfmt-v4l2-mplane.rst | 2 +-
+ .../media}/v4l/pixfmt-v4l2.rst | 2 +-
+ .../media}/v4l/pixfmt-vyuy.rst | 2 +-
+ .../media}/v4l/pixfmt-y10.rst | 2 +-
+ .../media}/v4l/pixfmt-y10b.rst | 2 +-
+ .../media}/v4l/pixfmt-y10p.rst | 2 +-
+ .../media}/v4l/pixfmt-y12.rst | 2 +-
+ .../media}/v4l/pixfmt-y12i.rst | 2 +-
+ .../media}/v4l/pixfmt-y14.rst | 2 +-
+ .../media}/v4l/pixfmt-y16-be.rst | 2 +-
+ .../media}/v4l/pixfmt-y16.rst | 2 +-
+ .../media}/v4l/pixfmt-y41p.rst | 2 +-
+ .../media}/v4l/pixfmt-y8i.rst | 2 +-
+ .../media}/v4l/pixfmt-yuv410.rst | 2 +-
+ .../media}/v4l/pixfmt-yuv411p.rst | 2 +-
+ .../media}/v4l/pixfmt-yuv420.rst | 2 +-
+ .../media}/v4l/pixfmt-yuv420m.rst | 2 +-
+ .../media}/v4l/pixfmt-yuv422m.rst | 2 +-
+ .../media}/v4l/pixfmt-yuv422p.rst | 2 +-
+ .../media}/v4l/pixfmt-yuv444m.rst | 2 +-
+ .../media}/v4l/pixfmt-yuyv.rst | 2 +-
+ .../media}/v4l/pixfmt-yvyu.rst | 2 +-
+ .../media}/v4l/pixfmt-z16.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/pixfmt.rst | 2 +-
+ .../media}/v4l/planar-apis.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/querycap.rst | 2 +-
+ .../{media/uapi => userspace-api/media}/v4l/rw.rst | 2 +-
+ .../media}/v4l/sdr-formats.rst | 2 +-
+ .../media}/v4l/selection-api-configuration.rst | 2 +-
+ .../media}/v4l/selection-api-examples.rst | 2 +-
+ .../media}/v4l/selection-api-intro.rst | 2 +-
+ .../media}/v4l/selection-api-targets.rst | 2 +-
+ .../media}/v4l/selection-api-vs-crop-api.rst | 2 +-
+ .../media}/v4l/selection-api.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/selection.svg | 2 +-
+ .../media}/v4l/selections-common.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/standard.rst | 2 +-
+ .../media}/v4l/streaming-par.rst | 2 +-
+ .../media}/v4l/subdev-formats.rst | 2 +-
+ .../media}/v4l/subdev-image-processing-crop.svg | 2 +-
+ .../media}/v4l/subdev-image-processing-full.svg | 2 +-
+ ...ubdev-image-processing-scaling-multi-source.svg | 2 +-
+ .../media}/v4l/tch-formats.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/tuner.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/user-func.rst | 3 +-
+ .../uapi => userspace-api/media}/v4l/userp.rst | 2 +-
+ .../media}/v4l/v4l2-selection-flags.rst | 2 +-
+ .../media}/v4l/v4l2-selection-targets.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/v4l2.rst | 2 +-
+ .../media}/v4l/v4l2grab-example.rst | 2 +-
+ .../media}/v4l/v4l2grab.c.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/vbi_525.svg | 2 +-
+ .../uapi => userspace-api/media}/v4l/vbi_625.svg | 2 +-
+ .../uapi => userspace-api/media}/v4l/vbi_hsync.svg | 2 +-
+ .../uapi => userspace-api/media}/v4l/video.rst | 2 +-
+ .../uapi => userspace-api/media}/v4l/videodev.rst | 2 +-
+ .../media}/v4l/vidioc-create-bufs.rst | 4 +-
+ .../media}/v4l/vidioc-cropcap.rst | 2 +-
+ .../media}/v4l/vidioc-dbg-g-chip-info.rst | 2 +-
+ .../media}/v4l/vidioc-dbg-g-register.rst | 2 +-
+ .../media}/v4l/vidioc-decoder-cmd.rst | 2 +-
+ .../media}/v4l/vidioc-dqevent.rst | 2 +-
+ .../media}/v4l/vidioc-dv-timings-cap.rst | 2 +-
+ .../media}/v4l/vidioc-encoder-cmd.rst | 2 +-
+ .../media}/v4l/vidioc-enum-dv-timings.rst | 2 +-
+ .../media}/v4l/vidioc-enum-fmt.rst | 54 +-
+ .../media}/v4l/vidioc-enum-frameintervals.rst | 2 +-
+ .../media}/v4l/vidioc-enum-framesizes.rst | 2 +-
+ .../media}/v4l/vidioc-enum-freq-bands.rst | 2 +-
+ .../media}/v4l/vidioc-enumaudio.rst | 2 +-
+ .../media}/v4l/vidioc-enumaudioout.rst | 2 +-
+ .../media}/v4l/vidioc-enuminput.rst | 2 +-
+ .../media}/v4l/vidioc-enumoutput.rst | 2 +-
+ .../media}/v4l/vidioc-enumstd.rst | 2 +-
+ .../media}/v4l/vidioc-expbuf.rst | 2 +-
+ .../media}/v4l/vidioc-g-audio.rst | 2 +-
+ .../media}/v4l/vidioc-g-audioout.rst | 2 +-
+ .../media}/v4l/vidioc-g-crop.rst | 2 +-
+ .../media}/v4l/vidioc-g-ctrl.rst | 2 +-
+ .../media}/v4l/vidioc-g-dv-timings.rst | 8 +-
+ .../media}/v4l/vidioc-g-edid.rst | 2 +-
+ .../media}/v4l/vidioc-g-enc-index.rst | 2 +-
+ .../media}/v4l/vidioc-g-ext-ctrls.rst | 2 +-
+ .../media}/v4l/vidioc-g-fbuf.rst | 2 +-
+ .../media}/v4l/vidioc-g-fmt.rst | 2 +-
+ .../media}/v4l/vidioc-g-frequency.rst | 2 +-
+ .../media}/v4l/vidioc-g-input.rst | 2 +-
+ .../media}/v4l/vidioc-g-jpegcomp.rst | 2 +-
+ .../media}/v4l/vidioc-g-modulator.rst | 2 +-
+ .../media}/v4l/vidioc-g-output.rst | 2 +-
+ .../media}/v4l/vidioc-g-parm.rst | 2 +-
+ .../media}/v4l/vidioc-g-priority.rst | 2 +-
+ .../media}/v4l/vidioc-g-selection.rst | 2 +-
+ .../media}/v4l/vidioc-g-sliced-vbi-cap.rst | 2 +-
+ .../media}/v4l/vidioc-g-std.rst | 8 +-
+ .../media}/v4l/vidioc-g-tuner.rst | 2 +-
+ .../media}/v4l/vidioc-log-status.rst | 2 +-
+ .../media}/v4l/vidioc-overlay.rst | 2 +-
+ .../media}/v4l/vidioc-prepare-buf.rst | 2 +-
+ .../media}/v4l/vidioc-qbuf.rst | 2 +-
+ .../media}/v4l/vidioc-query-dv-timings.rst | 2 +-
+ .../media}/v4l/vidioc-querybuf.rst | 2 +-
+ .../media}/v4l/vidioc-querycap.rst | 10 +-
+ .../media}/v4l/vidioc-queryctrl.rst | 2 +-
+ .../media}/v4l/vidioc-querystd.rst | 2 +-
+ .../media}/v4l/vidioc-reqbufs.rst | 4 +-
+ .../media}/v4l/vidioc-s-hw-freq-seek.rst | 2 +-
+ .../media}/v4l/vidioc-streamon.rst | 2 +-
+ .../v4l/vidioc-subdev-enum-frame-interval.rst | 2 +-
+ .../media}/v4l/vidioc-subdev-enum-frame-size.rst | 2 +-
+ .../media}/v4l/vidioc-subdev-enum-mbus-code.rst | 2 +-
+ .../media}/v4l/vidioc-subdev-g-crop.rst | 11 +-
+ .../media}/v4l/vidioc-subdev-g-fmt.rst | 10 +-
+ .../media}/v4l/vidioc-subdev-g-frame-interval.rst | 10 +-
+ .../media}/v4l/vidioc-subdev-g-selection.rst | 10 +-
+ .../media/v4l/vidioc-subdev-querycap.rst | 112 +
+ .../media}/v4l/vidioc-subscribe-event.rst | 2 +-
+ .../media}/v4l/yuv-formats.rst | 2 +-
+ .../media/video.h.rst.exceptions | 0
+ .../media/videodev2.h.rst.exceptions | 1 +
+ MAINTAINERS | 101 +-
+ arch/arm/configs/exynos_defconfig | 2 +-
+ arch/arm/configs/multi_v7_defconfig | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
+ drivers/media/Kconfig | 242 +-
+ drivers/media/Makefile | 2 +-
+ drivers/media/cec/Kconfig | 25 +
+ drivers/media/cec/Makefile | 16 +-
+ drivers/media/cec/core/Makefile | 16 +
+ drivers/media/cec/{ => core}/cec-adap.c | 8 +-
+ drivers/media/cec/{ => core}/cec-api.c | 0
+ drivers/media/cec/{ => core}/cec-core.c | 0
+ drivers/media/cec/{ => core}/cec-notifier.c | 0
+ drivers/media/cec/{ => core}/cec-pin-error-inj.c | 0
+ drivers/media/cec/{ => core}/cec-pin-priv.h | 0
+ drivers/media/cec/{ => core}/cec-pin.c | 0
+ drivers/media/cec/{ => core}/cec-priv.h | 0
+ drivers/media/cec/platform/Kconfig | 120 +
+ drivers/media/cec/platform/Makefile | 14 +
+ drivers/media/{ => cec}/platform/cec-gpio/Makefile | 0
+ .../media/{ => cec}/platform/cec-gpio/cec-gpio.c | 18 +-
+ drivers/media/cec/platform/cros-ec/Makefile | 2 +
+ .../platform/cros-ec}/cros-ec-cec.c | 0
+ drivers/media/cec/platform/meson/Makefile | 3 +
+ .../media/{ => cec}/platform/meson/ao-cec-g12a.c | 0
+ drivers/media/{ => cec}/platform/meson/ao-cec.c | 0
+ .../s5p-cec => cec/platform/s5p}/Makefile | 2 +-
+ .../s5p-cec => cec/platform/s5p}/exynos_hdmi_cec.h | 0
+ .../platform/s5p}/exynos_hdmi_cecctrl.c | 0
+ .../s5p-cec => cec/platform/s5p}/regs-cec.h | 0
+ .../s5p-cec => cec/platform/s5p}/s5p_cec.c | 0
+ .../s5p-cec => cec/platform/s5p}/s5p_cec.h | 0
+ drivers/media/cec/platform/seco/Makefile | 2 +
+ .../seco-cec => cec/platform/seco}/seco-cec.c | 2 +-
+ .../seco-cec => cec/platform/seco}/seco-cec.h | 0
+ drivers/media/cec/platform/sti/Makefile | 2 +
+ .../sti/cec => cec/platform/sti}/stih-cec.c | 0
+ drivers/media/cec/platform/stm32/Makefile | 2 +
+ drivers/media/{ => cec}/platform/stm32/stm32-cec.c | 0
+ drivers/media/cec/platform/tegra/Makefile | 2 +
+ .../tegra-cec => cec/platform/tegra}/tegra_cec.c | 0
+ .../tegra-cec => cec/platform/tegra}/tegra_cec.h | 0
+ drivers/media/cec/usb/Kconfig | 8 +
+ drivers/media/cec/usb/Makefile | 6 +
+ .../{usb/pulse8-cec => cec/usb/pulse8}/Kconfig | 3 +-
+ .../{usb/pulse8-cec => cec/usb/pulse8}/Makefile | 0
+ .../pulse8-cec => cec/usb/pulse8}/pulse8-cec.c | 0
+ .../rainshadow-cec => cec/usb/rainshadow}/Kconfig | 3 +-
+ .../rainshadow-cec => cec/usb/rainshadow}/Makefile | 0
+ .../usb/rainshadow}/rainshadow-cec.c | 0
+ drivers/media/common/Kconfig | 2 +-
+ drivers/media/dvb-core/Kconfig | 27 +
+ drivers/media/dvb-core/dvbdev.c | 5 +-
+ drivers/media/dvb-frontends/Kconfig | 16 +-
+ drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 2 +-
+ drivers/media/dvb-frontends/dib3000.h | 2 +-
+ drivers/media/dvb-frontends/dib3000mb.c | 2 +-
+ drivers/media/dvb-frontends/drxk_hard.c | 2 +-
+ drivers/media/dvb-frontends/eds1547.h | 2 +-
+ drivers/media/dvb-frontends/lgdt3306a.c | 14 +
+ drivers/media/dvb-frontends/m88ds3103.c | 4 +-
+ drivers/media/dvb-frontends/stv0900_core.c | 2 +-
+ drivers/media/dvb-frontends/z0194a.h | 2 +-
+ drivers/media/firewire/Kconfig | 5 +-
+ drivers/media/i2c/Kconfig | 457 +-
+ drivers/media/i2c/Makefile | 1 +
+ drivers/media/i2c/cx25840/cx25840-core.c | 40 +-
+ drivers/media/i2c/et8ek8/Kconfig | 4 +-
+ drivers/media/i2c/imx219.c | 110 +-
+ drivers/media/i2c/m5mols/Kconfig | 5 +-
+ drivers/media/i2c/max2175.c | 6 +-
+ drivers/media/i2c/ov13858.c | 13 +-
+ drivers/media/i2c/ov2740.c | 1016 ++
+ drivers/media/i2c/ov5640.c | 4 +-
+ drivers/media/i2c/ov5670.c | 14 +-
+ drivers/media/i2c/ov8856.c | 191 +-
+ drivers/media/i2c/s5k5baf.c | 2 +-
+ drivers/media/i2c/smiapp/Kconfig | 5 +-
+ drivers/media/mc/Kconfig | 19 +-
+ drivers/media/mc/mc-entity.c | 2 +-
+ drivers/media/mmc/Kconfig | 1 -
+ drivers/media/mmc/siano/Kconfig | 2 +
+ drivers/media/pci/Kconfig | 14 +-
+ drivers/media/pci/bt8xx/Kconfig | 2 +-
+ drivers/media/pci/cobalt/Kconfig | 4 +-
+ drivers/media/pci/cx18/cx18-ioctl.c | 22 +-
+ drivers/media/pci/cx18/cx18-streams.c | 4 +-
+ drivers/media/pci/cx23885/cx23885-cards.c | 51 +-
+ drivers/media/pci/cx23885/cx23885-dvb.c | 31 +
+ drivers/media/pci/cx23885/cx23885-video.c | 99 +-
+ drivers/media/pci/cx88/cx88-core.c | 3 +-
+ drivers/media/pci/cx88/cx88-input.c | 2 +-
+ drivers/media/pci/cx88/cx88-video.c | 2 +-
+ drivers/media/pci/ddbridge/Kconfig | 1 -
+ drivers/media/pci/ddbridge/Makefile | 2 +-
+ drivers/media/pci/ddbridge/ddbridge-core.c | 4 +-
+ drivers/media/pci/ddbridge/ddbridge-dummy-fe.c | 153 +
+ drivers/media/pci/ddbridge/ddbridge-dummy-fe.h | 16 +
+ drivers/media/pci/intel/ipu3/Kconfig | 4 +-
+ drivers/media/pci/ivtv/ivtv-ioctl.c | 26 +-
+ drivers/media/pci/mantis/mantis_dvb.c | 2 +-
+ drivers/media/pci/meye/Kconfig | 2 +-
+ drivers/media/pci/saa7134/saa7134-input.c | 2 +-
+ drivers/media/pci/sta2x11/Kconfig | 6 +-
+ drivers/media/platform/Kconfig | 191 +-
+ drivers/media/platform/Makefile | 19 -
+ drivers/media/platform/am437x/Kconfig | 4 +-
+ drivers/media/platform/atmel/Kconfig | 4 +-
+ drivers/media/platform/cadence/Kconfig | 8 +-
+ drivers/media/platform/coda/coda-bit.c | 9 +-
+ drivers/media/platform/coda/coda-common.c | 199 +-
+ drivers/media/platform/coda/coda-jpeg.c | 577 +
+ drivers/media/platform/coda/coda.h | 12 +-
+ drivers/media/platform/cros-ec-cec/Makefile | 2 -
+ drivers/media/platform/davinci/vpif_display.c | 1 -
+ drivers/media/platform/exynos4-is/Kconfig | 5 +-
+ drivers/media/platform/marvell-ccic/cafe-driver.c | 2 +-
+ drivers/media/platform/meson/Makefile | 3 -
+ drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 8 +-
+ drivers/media/platform/pxa_camera.c | 4 +-
+ drivers/media/platform/qcom/venus/core.c | 21 +-
+ drivers/media/platform/qcom/venus/core.h | 7 +-
+ drivers/media/platform/qcom/venus/helpers.c | 18 +-
+ drivers/media/platform/qcom/venus/helpers.h | 2 +-
+ drivers/media/platform/qcom/venus/hfi.c | 10 +-
+ drivers/media/platform/qcom/venus/hfi.h | 3 +-
+ drivers/media/platform/qcom/venus/hfi_msgs.c | 2 +
+ drivers/media/platform/qcom/venus/vdec.c | 200 +-
+ drivers/media/platform/qcom/venus/venc.c | 10 +-
+ drivers/media/platform/rcar-fcp.c | 5 +
+ drivers/media/platform/rcar-vin/Kconfig | 8 +-
+ drivers/media/platform/rcar-vin/rcar-csi2.c | 4 +-
+ drivers/media/platform/rcar-vin/rcar-v4l2.c | 40 +-
+ drivers/media/platform/seco-cec/Makefile | 2 -
+ drivers/media/platform/sh_veu.c | 1203 --
+ drivers/media/platform/sti/cec/Makefile | 2 -
+ drivers/media/platform/stm32/Makefile | 1 -
+ drivers/media/platform/sunxi/Kconfig | 2 +
+ drivers/media/platform/sunxi/Makefile | 2 +
+ drivers/media/platform/sunxi/sun4i-csi/Kconfig | 6 +-
+ drivers/media/platform/sunxi/sun4i-csi/Makefile | 2 +
+ drivers/media/platform/sunxi/sun6i-csi/Kconfig | 4 +-
+ drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 6 +-
+ drivers/media/platform/tegra-cec/Makefile | 2 -
+ drivers/media/platform/ti-vpe/cal.c | 439 +-
+ drivers/media/platform/ti-vpe/cal_regs.h | 21 +-
+ drivers/media/platform/video-mux.c | 87 +-
+ drivers/media/platform/xilinx/Kconfig | 4 +-
+ drivers/media/radio/Kconfig | 12 +-
+ drivers/media/radio/si470x/Kconfig | 2 +-
+ drivers/media/radio/wl128x/Kconfig | 5 +-
+ drivers/media/rc/gpio-ir-tx.c | 51 +-
+ drivers/media/rc/iguanair.c | 36 +-
+ drivers/media/rc/ir-rx51.c | 2 +-
+ drivers/media/rc/rc-core-priv.h | 22 +
+ drivers/media/spi/Kconfig | 8 +-
+ drivers/media/test-drivers/Kconfig | 26 +
+ drivers/media/test-drivers/Makefile | 9 +
+ .../{platform => test-drivers}/vicodec/Kconfig | 2 +
+ .../{platform => test-drivers}/vicodec/Makefile | 0
+ .../vicodec/codec-fwht.c | 0
+ .../vicodec/codec-fwht.h | 0
+ .../vicodec/codec-v4l2-fwht.c | 0
+ .../vicodec/codec-v4l2-fwht.h | 0
+ .../vicodec/vicodec-core.c | 15 +-
+ drivers/media/{platform => test-drivers}/vim2m.c | 8 -
+ .../media/{platform => test-drivers}/vimc/Kconfig | 4 +-
+ .../media/{platform => test-drivers}/vimc/Makefile | 0
+ .../{platform => test-drivers}/vimc/vimc-capture.c | 37 +-
+ .../{platform => test-drivers}/vimc/vimc-common.c | 83 +-
+ .../{platform => test-drivers}/vimc/vimc-common.h | 88 +-
+ .../{platform => test-drivers}/vimc/vimc-core.c | 90 +-
+ .../{platform => test-drivers}/vimc/vimc-debayer.c | 88 +-
+ .../{platform => test-drivers}/vimc/vimc-scaler.c | 27 +-
+ .../{platform => test-drivers}/vimc/vimc-sensor.c | 23 +-
+ .../vimc/vimc-streamer.c | 0
+ .../vimc/vimc-streamer.h | 7 +-
+ .../media/{platform => test-drivers}/vivid/Kconfig | 2 +
+ .../{platform => test-drivers}/vivid/Makefile | 0
+ .../{platform => test-drivers}/vivid/vivid-cec.c | 0
+ .../{platform => test-drivers}/vivid/vivid-cec.h | 0
+ .../{platform => test-drivers}/vivid/vivid-core.c | 0
+ .../{platform => test-drivers}/vivid/vivid-core.h | 0
+ .../{platform => test-drivers}/vivid/vivid-ctrls.c | 0
+ .../{platform => test-drivers}/vivid/vivid-ctrls.h | 0
+ .../vivid/vivid-kthread-cap.c | 0
+ .../vivid/vivid-kthread-cap.h | 0
+ .../vivid/vivid-kthread-out.c | 0
+ .../vivid/vivid-kthread-out.h | 0
+ .../vivid/vivid-kthread-touch.c | 0
+ .../vivid/vivid-kthread-touch.h | 0
+ .../vivid/vivid-meta-cap.c | 0
+ .../vivid/vivid-meta-cap.h | 0
+ .../vivid/vivid-meta-out.c | 0
+ .../vivid/vivid-meta-out.h | 0
+ .../{platform => test-drivers}/vivid/vivid-osd.c | 0
+ .../{platform => test-drivers}/vivid/vivid-osd.h | 0
+ .../vivid/vivid-radio-common.c | 0
+ .../vivid/vivid-radio-common.h | 0
+ .../vivid/vivid-radio-rx.c | 0
+ .../vivid/vivid-radio-rx.h | 0
+ .../vivid/vivid-radio-tx.c | 0
+ .../vivid/vivid-radio-tx.h | 0
+ .../vivid/vivid-rds-gen.c | 0
+ .../vivid/vivid-rds-gen.h | 0
+ .../vivid/vivid-sdr-cap.c | 0
+ .../vivid/vivid-sdr-cap.h | 0
+ .../vivid/vivid-touch-cap.c | 0
+ .../vivid/vivid-touch-cap.h | 0
+ .../vivid/vivid-vbi-cap.c | 0
+ .../vivid/vivid-vbi-cap.h | 0
+ .../vivid/vivid-vbi-gen.c | 0
+ .../vivid/vivid-vbi-gen.h | 0
+ .../vivid/vivid-vbi-out.c | 0
+ .../vivid/vivid-vbi-out.h | 0
+ .../vivid/vivid-vid-cap.c | 0
+ .../vivid/vivid-vid-cap.h | 0
+ .../vivid/vivid-vid-common.c | 0
+ .../vivid/vivid-vid-common.h | 0
+ .../vivid/vivid-vid-out.c | 0
+ .../vivid/vivid-vid-out.h | 0
+ drivers/media/tuners/Kconfig | 6 +-
+ drivers/media/tuners/si2157.c | 419 +-
+ drivers/media/tuners/si2157_priv.h | 2 +
+ drivers/media/usb/Kconfig | 12 +-
+ drivers/media/usb/Makefile | 2 -
+ drivers/media/usb/cx231xx/cx231xx-avcore.c | 35 +-
+ drivers/media/usb/cx231xx/cx231xx-input.c | 5 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 85 +-
+ drivers/media/usb/dvb-usb-v2/Kconfig | 10 +-
+ drivers/media/usb/dvb-usb-v2/ec168.c | 25 +-
+ drivers/media/usb/dvb-usb-v2/gl861.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.h | 2 +-
+ drivers/media/usb/dvb-usb/Kconfig | 3 +-
+ drivers/media/usb/dvb-usb/a800.c | 8 +-
+ drivers/media/usb/dvb-usb/af9005-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/af9005-remote.c | 2 +-
+ drivers/media/usb/dvb-usb/af9005.c | 6 +-
+ drivers/media/usb/dvb-usb/af9005.h | 2 +-
+ drivers/media/usb/dvb-usb/az6027.c | 6 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 6 +-
+ drivers/media/usb/dvb-usb/dib0700.h | 31 +-
+ drivers/media/usb/dvb-usb/dib0700_core.c | 6 +-
+ drivers/media/usb/dvb-usb/dibusb-common.c | 2 +-
+ drivers/media/usb/dvb-usb/dibusb-mb.c | 4 +-
+ drivers/media/usb/dvb-usb/dibusb-mc-common.c | 2 +-
+ drivers/media/usb/dvb-usb/dibusb-mc.c | 2 +-
+ drivers/media/usb/dvb-usb/dibusb.h | 2 +-
+ drivers/media/usb/dvb-usb/digitv.c | 31 +-
+ drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/dtt200u.c | 2 +-
+ drivers/media/usb/dvb-usb/dtt200u.h | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-common.h | 3 +-
+ drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 3 +-
+ drivers/media/usb/dvb-usb/dvb-usb-init.c | 10 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 10 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 31 +-
+ drivers/media/usb/dvb-usb/gp8psk.c | 2 +-
+ drivers/media/usb/dvb-usb/gp8psk.h | 2 +-
+ drivers/media/usb/dvb-usb/m920x.c | 6 +-
+ drivers/media/usb/dvb-usb/nova-t-usb2.c | 2 +-
+ drivers/media/usb/dvb-usb/opera1.c | 2 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 4 +-
+ drivers/media/usb/dvb-usb/ttusb2.c | 9 +-
+ drivers/media/usb/dvb-usb/ttusb2.h | 2 +-
+ drivers/media/usb/dvb-usb/umt-010.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x.c | 2 +-
+ drivers/media/usb/dvb-usb/vp7045-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/vp7045.c | 2 +-
+ drivers/media/usb/dvb-usb/vp7045.h | 2 +-
+ drivers/media/usb/gspca/Kconfig | 2 +-
+ drivers/media/usb/gspca/mr97310a.c | 1 -
+ drivers/media/usb/hdpvr/hdpvr-core.c | 4 +-
+ drivers/media/usb/hdpvr/hdpvr-i2c.c | 2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 4 +-
+ drivers/media/usb/pwc/pwc-ctrl.c | 2 +-
+ drivers/media/usb/pwc/pwc-if.c | 54 +-
+ drivers/media/usb/ttusb-dec/ttusb_dec.c | 9 +-
+ drivers/media/usb/zr364xx/Kconfig | 2 +-
+ drivers/media/v4l2-core/Kconfig | 27 +-
+ drivers/media/v4l2-core/Makefile | 3 +
+ drivers/media/v4l2-core/v4l2-common.c | 3 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 92 +-
+ drivers/media/v4l2-core/v4l2-dev.c | 25 +-
+ drivers/media/v4l2-core/v4l2-device.c | 7 +-
+ drivers/media/v4l2-core/v4l2-fwnode.c | 104 +-
+ drivers/media/v4l2-core/v4l2-h264.c | 270 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 72 +-
+ drivers/media/v4l2-core/v4l2-jpeg.c | 632 ++
+ drivers/media/v4l2-core/v4l2-mc.c | 95 +
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 11 +-
+ drivers/media/v4l2-core/v4l2-subdev.c | 91 +-
+ drivers/platform/x86/Kconfig | 1 +
+ drivers/staging/media/Kconfig | 4 +
+ drivers/staging/media/Makefile | 2 +
+ drivers/staging/media/atomisp/Kconfig | 36 +
+ drivers/staging/media/atomisp/Makefile | 363 +
+ drivers/staging/media/atomisp/TODO | 89 +
+ drivers/staging/media/atomisp/i2c/Kconfig | 86 +
+ drivers/staging/media/atomisp/i2c/Makefile | 18 +
+ drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 1406 +++
+ drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 1139 ++
+ .../media/atomisp/i2c/atomisp-libmsrlisthelper.c | 207 +
+ drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 972 ++
+ .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 1910 ++++
+ drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 1340 +++
+ drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 1288 +++
+ drivers/staging/media/atomisp/i2c/gc0310.h | 404 +
+ drivers/staging/media/atomisp/i2c/gc2235.h | 680 ++
+ drivers/staging/media/atomisp/i2c/mt9m114.h | 1791 +++
+ drivers/staging/media/atomisp/i2c/ov2680.h | 845 ++
+ drivers/staging/media/atomisp/i2c/ov2722.h | 1272 +++
+ drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 11 +
+ drivers/staging/media/atomisp/i2c/ov5693/Makefile | 2 +
+ drivers/staging/media/atomisp/i2c/ov5693/ad5823.h | 62 +
+ .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2006 ++++
+ drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 1391 +++
+ drivers/staging/media/atomisp/include/hmm/hmm.h | 102 +
+ drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 315 +
+ .../staging/media/atomisp/include/hmm/hmm_common.h | 96 +
+ .../staging/media/atomisp/include/hmm/hmm_pool.h | 115 +
+ drivers/staging/media/atomisp/include/hmm/hmm_vm.h | 65 +
+ .../staging/media/atomisp/include/linux/atomisp.h | 1359 +++
+ .../atomisp/include/linux/atomisp_gmin_platform.h | 38 +
+ .../media/atomisp/include/linux/atomisp_platform.h | 247 +
+ .../media/atomisp/include/linux/libmsrlisthelper.h | 27 +
+ .../staging/media/atomisp/include/media/lm3554.h | 130 +
+ .../staging/media/atomisp/include/mmu/isp_mmu.h | 168 +
+ .../media/atomisp/include/mmu/sh_mmu_mrfld.h | 24 +
+ drivers/staging/media/atomisp/pci/atomisp-regs.h | 199 +
+ drivers/staging/media/atomisp/pci/atomisp_acc.c | 605 +
+ drivers/staging/media/atomisp/pci/atomisp_acc.h | 119 +
+ drivers/staging/media/atomisp/pci/atomisp_cmd.c | 6629 +++++++++++
+ drivers/staging/media/atomisp/pci/atomisp_cmd.h | 442 +
+ drivers/staging/media/atomisp/pci/atomisp_common.h | 74 +
+ drivers/staging/media/atomisp/pci/atomisp_compat.h | 663 ++
+ .../media/atomisp/pci/atomisp_compat_css20.c | 4706 ++++++++
+ .../media/atomisp/pci/atomisp_compat_css20.h | 277 +
+ .../media/atomisp/pci/atomisp_compat_ioctl32.c | 1177 ++
+ .../media/atomisp/pci/atomisp_compat_ioctl32.h | 367 +
+ drivers/staging/media/atomisp/pci/atomisp_csi2.c | 426 +
+ drivers/staging/media/atomisp/pci/atomisp_csi2.h | 58 +
+ .../staging/media/atomisp/pci/atomisp_dfs_tables.h | 40 +
+ drivers/staging/media/atomisp/pci/atomisp_drvfs.c | 205 +
+ drivers/staging/media/atomisp/pci/atomisp_drvfs.h | 24 +
+ drivers/staging/media/atomisp/pci/atomisp_file.c | 227 +
+ drivers/staging/media/atomisp/pci/atomisp_file.h | 43 +
+ drivers/staging/media/atomisp/pci/atomisp_fops.c | 1306 +++
+ drivers/staging/media/atomisp/pci/atomisp_fops.h | 50 +
+ .../media/atomisp/pci/atomisp_gmin_platform.c | 1081 ++
+ drivers/staging/media/atomisp/pci/atomisp_helper.h | 28 +
+ .../staging/media/atomisp/pci/atomisp_internal.h | 307 +
+ drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 3094 ++++++
+ drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 66 +
+ drivers/staging/media/atomisp/pci/atomisp_subdev.c | 1456 +++
+ drivers/staging/media/atomisp/pci/atomisp_subdev.h | 466 +
+ drivers/staging/media/atomisp/pci/atomisp_tables.h | 187 +
+ drivers/staging/media/atomisp/pci/atomisp_tpg.c | 163 +
+ drivers/staging/media/atomisp/pci/atomisp_tpg.h | 38 +
+ .../media/atomisp/pci/atomisp_trace_event.h | 127 +
+ drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 1999 ++++
+ drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 36 +
+ .../pci/base/circbuf/interface/ia_css_circbuf.h | 376 +
+ .../base/circbuf/interface/ia_css_circbuf_comm.h | 58 +
+ .../base/circbuf/interface/ia_css_circbuf_desc.h | 173 +
+ .../media/atomisp/pci/base/circbuf/src/circbuf.c | 320 +
+ .../pci/base/refcount/interface/ia_css_refcount.h | 83 +
+ .../media/atomisp/pci/base/refcount/src/refcount.c | 275 +
+ drivers/staging/media/atomisp/pci/bits.h | 104 +
+ .../camera/pipe/interface/ia_css_pipe_binarydesc.h | 297 +
+ .../camera/pipe/interface/ia_css_pipe_stagedesc.h | 51 +
+ .../pci/camera/pipe/interface/ia_css_pipe_util.h | 39 +
+ .../atomisp/pci/camera/pipe/src/pipe_binarydesc.c | 873 ++
+ .../atomisp/pci/camera/pipe/src/pipe_stagedesc.c | 118 +
+ .../media/atomisp/pci/camera/pipe/src/pipe_util.c | 50 +
+ .../pci/camera/util/interface/ia_css_util.h | 141 +
+ .../media/atomisp/pci/camera/util/src/util.c | 225 +
+ drivers/staging/media/atomisp/pci/cell_params.h | 40 +
+ .../pci/css_2400_system/hive/ia_css_isp_configs.c | 385 +
+ .../pci/css_2400_system/hive/ia_css_isp_params.c | 3419 ++++++
+ .../pci/css_2400_system/hive/ia_css_isp_states.c | 223 +
+ .../hrt/hive_isp_css_irq_types_hrt.h | 68 +
+ .../css_2400_system/hrt/isp2400_mamoiada_params.h | 228 +
+ .../atomisp/pci/css_2401_system/csi_rx_global.h | 63 +
+ .../pci/css_2401_system/hive/ia_css_isp_configs.c | 386 +
+ .../pci/css_2401_system/hive/ia_css_isp_params.c | 3366 ++++++
+ .../pci/css_2401_system/hive/ia_css_isp_states.c | 223 +
+ .../atomisp/pci/css_2401_system/host/csi_rx.c | 40 +
+ .../pci/css_2401_system/host/csi_rx_local.h | 62 +
+ .../pci/css_2401_system/host/csi_rx_private.h | 305 +
+ .../atomisp/pci/css_2401_system/host/ibuf_ctrl.c | 22 +
+ .../pci/css_2401_system/host/ibuf_ctrl_local.h | 58 +
+ .../pci/css_2401_system/host/ibuf_ctrl_private.h | 267 +
+ .../atomisp/pci/css_2401_system/host/isys_dma.c | 40 +
+ .../pci/css_2401_system/host/isys_dma_local.h | 20 +
+ .../pci/css_2401_system/host/isys_dma_private.h | 61 +
+ .../atomisp/pci/css_2401_system/host/isys_irq.c | 43 +
+ .../pci/css_2401_system/host/isys_irq_local.h | 35 +
+ .../pci/css_2401_system/host/isys_irq_private.h | 106 +
+ .../pci/css_2401_system/host/isys_stream2mmio.c | 21 +
+ .../css_2401_system/host/isys_stream2mmio_local.h | 36 +
+ .../host/isys_stream2mmio_private.h | 167 +
+ .../pci/css_2401_system/host/pixelgen_local.h | 50 +
+ .../pci/css_2401_system/host/pixelgen_private.h | 182 +
+ .../css_2401_system/hrt/PixelGen_SysBlock_defs.h | 113 +
+ .../pci/css_2401_system/hrt/ibuf_cntrl_defs.h | 134 +
+ .../css_2401_system/hrt/mipi_backend_common_defs.h | 205 +
+ .../pci/css_2401_system/hrt/mipi_backend_defs.h | 208 +
+ .../atomisp/pci/css_2401_system/hrt/rx_csi_defs.h | 169 +
+ .../pci/css_2401_system/hrt/stream2mmio_defs.h | 68 +
+ .../atomisp/pci/css_2401_system/ibuf_ctrl_global.h | 79 +
+ .../atomisp/pci/css_2401_system/isys_dma_global.h | 89 +
+ .../atomisp/pci/css_2401_system/isys_irq_global.h | 35 +
+ .../pci/css_2401_system/isys_stream2mmio_global.h | 39 +
+ .../atomisp/pci/css_2401_system/pixelgen_global.h | 90 +
+ .../atomisp/pci/css_receiver_2400_common_defs.h | 198 +
+ .../media/atomisp/pci/css_receiver_2400_defs.h | 256 +
+ drivers/staging/media/atomisp/pci/css_trace.h | 278 +
+ drivers/staging/media/atomisp/pci/defs.h | 36 +
+ drivers/staging/media/atomisp/pci/dma_v2_defs.h | 199 +
+ drivers/staging/media/atomisp/pci/gdc_v2_defs.h | 163 +
+ drivers/staging/media/atomisp/pci/gp_timer_defs.h | 36 +
+ .../staging/media/atomisp/pci/gpio_block_defs.h | 41 +
+ .../atomisp/pci/hive_isp_css_2401_irq_types_hrt.h | 68 +
+ .../atomisp/pci/hive_isp_css_common/debug_global.h | 81 +
+ .../atomisp/pci/hive_isp_css_common/dma_global.h | 254 +
+ .../pci/hive_isp_css_common/event_fifo_global.h | 20 +
+ .../pci/hive_isp_css_common/fifo_monitor_global.h | 32 +
+ .../atomisp/pci/hive_isp_css_common/gdc_global.h | 89 +
+ .../pci/hive_isp_css_common/gp_device_global.h | 84 +
+ .../pci/hive_isp_css_common/gp_timer_global.h | 33 +
+ .../atomisp/pci/hive_isp_css_common/gpio_global.h | 45 +
+ .../atomisp/pci/hive_isp_css_common/hmem_global.h | 45 +
+ .../atomisp/pci/hive_isp_css_common/host/debug.c | 71 +
+ .../pci/hive_isp_css_common/host/debug_local.h | 20 +
+ .../pci/hive_isp_css_common/host/debug_private.h | 126 +
+ .../atomisp/pci/hive_isp_css_common/host/dma.c | 299 +
+ .../pci/hive_isp_css_common/host/dma_local.h | 207 +
+ .../pci/hive_isp_css_common/host/dma_private.h | 41 +
+ .../pci/hive_isp_css_common/host/event_fifo.c | 19 +
+ .../hive_isp_css_common/host/event_fifo_local.h | 61 +
+ .../hive_isp_css_common/host/event_fifo_private.h | 77 +
+ .../pci/hive_isp_css_common/host/fifo_monitor.c | 569 +
+ .../hive_isp_css_common/host/fifo_monitor_local.h | 99 +
+ .../host/fifo_monitor_private.h | 80 +
+ .../atomisp/pci/hive_isp_css_common/host/gdc.c | 125 +
+ .../pci/hive_isp_css_common/host/gdc_local.h | 20 +
+ .../pci/hive_isp_css_common/host/gdc_private.h | 20 +
+ .../pci/hive_isp_css_common/host/gp_device.c | 108 +
+ .../pci/hive_isp_css_common/host/gp_device_local.h | 143 +
+ .../hive_isp_css_common/host/gp_device_private.h | 46 +
+ .../pci/hive_isp_css_common/host/gp_timer.c | 70 +
+ .../pci/hive_isp_css_common/host/gp_timer_local.h | 43 +
+ .../hive_isp_css_common/host/gp_timer_private.h | 22 +
+ .../pci/hive_isp_css_common/host/gpio_local.h | 20 +
+ .../pci/hive_isp_css_common/host/gpio_private.h | 44 +
+ .../atomisp/pci/hive_isp_css_common/host/hmem.c | 19 +
+ .../pci/hive_isp_css_common/host/hmem_local.h | 20 +
+ .../pci/hive_isp_css_common/host/hmem_private.h | 30 +
+ .../pci/hive_isp_css_common/host/input_formatter.c | 241 +
+ .../host/input_formatter_local.h | 121 +
+ .../host/input_formatter_private.h | 46 +
+ .../pci/hive_isp_css_common/host/input_system.c | 1849 +++
+ .../atomisp/pci/hive_isp_css_common/host/irq.c | 451 +
+ .../pci/hive_isp_css_common/host/irq_local.h | 134 +
+ .../pci/hive_isp_css_common/host/irq_private.h | 44 +
+ .../atomisp/pci/hive_isp_css_common/host/isp.c | 128 +
+ .../pci/hive_isp_css_common/host/isp_local.h | 57 +
+ .../pci/hive_isp_css_common/host/isp_private.h | 160 +
+ .../atomisp/pci/hive_isp_css_common/host/mmu.c | 46 +
+ .../pci/hive_isp_css_common/host/mmu_local.h | 20 +
+ .../atomisp/pci/hive_isp_css_common/host/sp.c | 81 +
+ .../pci/hive_isp_css_common/host/sp_local.h | 101 +
+ .../pci/hive_isp_css_common/host/sp_private.h | 166 +
+ .../pci/hive_isp_css_common/host/timed_ctrl.c | 74 +
+ .../hive_isp_css_common/host/timed_ctrl_local.h | 20 +
+ .../hive_isp_css_common/host/timed_ctrl_private.h | 34 +
+ .../pci/hive_isp_css_common/host/vamem_local.h | 20 +
+ .../atomisp/pci/hive_isp_css_common/host/vmem.c | 276 +
+ .../pci/hive_isp_css_common/host/vmem_local.h | 57 +
+ .../pci/hive_isp_css_common/host/vmem_private.h | 20 +
+ .../hive_isp_css_common/input_formatter_global.h | 114 +
+ .../atomisp/pci/hive_isp_css_common/irq_global.h | 45 +
+ .../atomisp/pci/hive_isp_css_common/isp_global.h | 109 +
+ .../atomisp/pci/hive_isp_css_common/mmu_global.h | 22 +
+ .../atomisp/pci/hive_isp_css_common/sp_global.h | 93 +
+ .../pci/hive_isp_css_common/timed_ctrl_global.h | 54 +
+ .../atomisp/pci/hive_isp_css_common/vamem_global.h | 34 +
+ .../atomisp/pci/hive_isp_css_common/vmem_global.h | 28 +
+ .../staging/media/atomisp/pci/hive_isp_css_defs.h | 411 +
+ .../pci/hive_isp_css_include/assert_support.h | 73 +
+ .../pci/hive_isp_css_include/bitop_support.h | 24 +
+ .../atomisp/pci/hive_isp_css_include/csi_rx.h | 42 +
+ .../media/atomisp/pci/hive_isp_css_include/debug.h | 46 +
+ .../device_access/device_access.h | 177 +
+ .../media/atomisp/pci/hive_isp_css_include/dma.h | 46 +
+ .../pci/hive_isp_css_include/error_support.h | 39 +
+ .../atomisp/pci/hive_isp_css_include/event_fifo.h | 45 +
+ .../pci/hive_isp_css_include/fifo_monitor.h | 45 +
+ .../atomisp/pci/hive_isp_css_include/gdc_device.h | 47 +
+ .../atomisp/pci/hive_isp_css_include/gp_device.h | 45 +
+ .../atomisp/pci/hive_isp_css_include/gp_timer.h | 45 +
+ .../media/atomisp/pci/hive_isp_css_include/gpio.h | 45 +
+ .../media/atomisp/pci/hive_isp_css_include/hmem.h | 45 +
+ .../pci/hive_isp_css_include/host/csi_rx_public.h | 135 +
+ .../pci/hive_isp_css_include/host/debug_public.h | 98 +
+ .../pci/hive_isp_css_include/host/dma_public.h | 72 +
+ .../hive_isp_css_include/host/event_fifo_public.h | 79 +
+ .../host/fifo_monitor_public.h | 110 +
+ .../pci/hive_isp_css_include/host/gdc_public.h | 59 +
+ .../hive_isp_css_include/host/gp_device_public.h | 58 +
+ .../hive_isp_css_include/host/gp_timer_public.h | 33 +
+ .../pci/hive_isp_css_include/host/gpio_public.h | 45 +
+ .../pci/hive_isp_css_include/host/hmem_public.h | 32 +
+ .../hive_isp_css_include/host/ibuf_ctrl_public.h | 93 +
+ .../host/input_formatter_public.h | 115 +
+ .../pci/hive_isp_css_include/host/irq_public.h | 184 +
+ .../pci/hive_isp_css_include/host/isp_public.h | 185 +
+ .../hive_isp_css_include/host/isys_dma_public.h | 38 +
+ .../hive_isp_css_include/host/isys_irq_public.h | 45 +
+ .../pci/hive_isp_css_include/host/isys_public.h | 37 +
+ .../host/isys_stream2mmio_public.h | 101 +
+ .../pci/hive_isp_css_include/host/mmu_public.h | 94 +
+ .../hive_isp_css_include/host/pixelgen_public.h | 79 +
+ .../pci/hive_isp_css_include/host/sp_public.h | 223 +
+ .../pci/hive_isp_css_include/host/tag_public.h | 40 +
+ .../hive_isp_css_include/host/timed_ctrl_public.h | 59 +
+ .../pci/hive_isp_css_include/host/vamem_public.h | 18 +
+ .../pci/hive_isp_css_include/host/vmem_public.h | 20 +
+ .../atomisp/pci/hive_isp_css_include/ibuf_ctrl.h | 46 +
+ .../pci/hive_isp_css_include/input_formatter.h | 45 +
+ .../pci/hive_isp_css_include/input_system.h | 45 +
+ .../media/atomisp/pci/hive_isp_css_include/irq.h | 45 +
+ .../media/atomisp/pci/hive_isp_css_include/isp.h | 45 +
+ .../atomisp/pci/hive_isp_css_include/isys_dma.h | 46 +
+ .../atomisp/pci/hive_isp_css_include/isys_irq.h | 39 +
+ .../pci/hive_isp_css_include/isys_stream2mmio.h | 46 +
+ .../pci/hive_isp_css_include/math_support.h | 153 +
+ .../memory_access/memory_access.h | 174 +
+ .../pci/hive_isp_css_include/memory_realloc.h | 38 +
+ .../pci/hive_isp_css_include/misc_support.h | 26 +
+ .../atomisp/pci/hive_isp_css_include/mmu_device.h | 39 +
+ .../atomisp/pci/hive_isp_css_include/pixelgen.h | 46 +
+ .../pci/hive_isp_css_include/platform_support.h | 36 +
+ .../pci/hive_isp_css_include/print_support.h | 41 +
+ .../media/atomisp/pci/hive_isp_css_include/queue.h | 45 +
+ .../atomisp/pci/hive_isp_css_include/resource.h | 46 +
+ .../media/atomisp/pci/hive_isp_css_include/sp.h | 45 +
+ .../pci/hive_isp_css_include/string_support.h | 165 +
+ .../pci/hive_isp_css_include/system_types.h | 24 +
+ .../media/atomisp/pci/hive_isp_css_include/tag.h | 44 +
+ .../atomisp/pci/hive_isp_css_include/timed_ctrl.h | 45 +
+ .../pci/hive_isp_css_include/type_support.h | 40 +
+ .../media/atomisp/pci/hive_isp_css_include/vamem.h | 36 +
+ .../media/atomisp/pci/hive_isp_css_include/vmem.h | 45 +
+ .../pci/hive_isp_css_shared/host/queue_local.h | 20 +
+ .../pci/hive_isp_css_shared/host/queue_private.h | 18 +
+ .../atomisp/pci/hive_isp_css_shared/host/tag.c | 91 +
+ .../pci/hive_isp_css_shared/host/tag_local.h | 22 +
+ .../pci/hive_isp_css_shared/host/tag_private.h | 18 +
+ .../atomisp/pci/hive_isp_css_shared/queue_global.h | 18 +
+ .../pci/hive_isp_css_shared/sw_event_global.h | 35 +
+ .../atomisp/pci/hive_isp_css_shared/tag_global.h | 56 +
+ .../pci/hive_isp_css_streaming_to_mipi_types_hrt.h | 26 +
+ drivers/staging/media/atomisp/pci/hive_types.h | 128 +
+ drivers/staging/media/atomisp/pci/hmm/hmm.c | 733 ++
+ drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 1511 +++
+ .../media/atomisp/pci/hmm/hmm_dynamic_pool.c | 233 +
+ .../media/atomisp/pci/hmm/hmm_reserved_pool.c | 252 +
+ drivers/staging/media/atomisp/pci/hmm/hmm_vm.c | 212 +
+ .../atomisp/pci/hrt/hive_isp_css_custom_host_hrt.h | 106 +
+ .../media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c | 124 +
+ .../media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h | 57 +
+ drivers/staging/media/atomisp/pci/ia_css.h | 57 +
+ drivers/staging/media/atomisp/pci/ia_css_3a.h | 189 +
+ .../staging/media/atomisp/pci/ia_css_acc_types.h | 476 +
+ drivers/staging/media/atomisp/pci/ia_css_buffer.h | 85 +
+ drivers/staging/media/atomisp/pci/ia_css_control.h | 131 +
+ .../media/atomisp/pci/ia_css_device_access.c | 95 +
+ .../media/atomisp/pci/ia_css_device_access.h | 60 +
+ drivers/staging/media/atomisp/pci/ia_css_dvs.h | 297 +
+ drivers/staging/media/atomisp/pci/ia_css_env.h | 94 +
+ drivers/staging/media/atomisp/pci/ia_css_err.h | 63 +
+ .../media/atomisp/pci/ia_css_event_public.h | 196 +
+ .../staging/media/atomisp/pci/ia_css_firmware.h | 64 +
+ drivers/staging/media/atomisp/pci/ia_css_frac.h | 37 +
+ .../media/atomisp/pci/ia_css_frame_format.h | 101 +
+ .../media/atomisp/pci/ia_css_frame_public.h | 353 +
+ .../staging/media/atomisp/pci/ia_css_host_data.h | 45 +
+ .../staging/media/atomisp/pci/ia_css_input_port.h | 60 +
+ drivers/staging/media/atomisp/pci/ia_css_irq.h | 235 +
+ .../staging/media/atomisp/pci/ia_css_isp_configs.h | 183 +
+ .../staging/media/atomisp/pci/ia_css_isp_params.h | 394 +
+ .../staging/media/atomisp/pci/ia_css_isp_states.h | 73 +
+ .../media/atomisp/pci/ia_css_memory_access.c | 85 +
+ .../staging/media/atomisp/pci/ia_css_metadata.h | 72 +
+ drivers/staging/media/atomisp/pci/ia_css_mipi.h | 82 +
+ drivers/staging/media/atomisp/pci/ia_css_mmu.h | 32 +
+ .../staging/media/atomisp/pci/ia_css_mmu_private.h | 29 +
+ drivers/staging/media/atomisp/pci/ia_css_morph.h | 39 +
+ drivers/staging/media/atomisp/pci/ia_css_pipe.h | 189 +
+ .../staging/media/atomisp/pci/ia_css_pipe_public.h | 569 +
+ drivers/staging/media/atomisp/pci/ia_css_prbs.h | 53 +
+ .../staging/media/atomisp/pci/ia_css_properties.h | 41 +
+ drivers/staging/media/atomisp/pci/ia_css_shading.h | 40 +
+ drivers/staging/media/atomisp/pci/ia_css_stream.h | 111 +
+ .../media/atomisp/pci/ia_css_stream_format.h | 29 +
+ .../media/atomisp/pci/ia_css_stream_public.h | 585 +
+ drivers/staging/media/atomisp/pci/ia_css_timer.h | 68 +
+ drivers/staging/media/atomisp/pci/ia_css_tpg.h | 78 +
+ drivers/staging/media/atomisp/pci/ia_css_types.h | 605 +
+ drivers/staging/media/atomisp/pci/ia_css_version.h | 40 +
+ .../media/atomisp/pci/ia_css_version_data.h | 27 +
+ drivers/staging/media/atomisp/pci/if_defs.h | 22 +
+ .../atomisp/pci/input_formatter_subsystem_defs.h | 53 +
+ .../media/atomisp/pci/input_selector_defs.h | 88 +
+ .../media/atomisp/pci/input_switch_2400_defs.h | 30 +
+ .../media/atomisp/pci/input_system_ctrl_defs.h | 243 +
+ .../staging/media/atomisp/pci/input_system_defs.h | 126 +
+ .../media/atomisp/pci/input_system_global.h | 10 +
+ .../staging/media/atomisp/pci/input_system_local.h | 10 +
+ .../media/atomisp/pci/input_system_private.h | 10 +
+ .../media/atomisp/pci/input_system_public.h | 8 +
+ .../media/atomisp/pci/irq_controller_defs.h | 28 +
+ .../pci/isp/kernels/aa/aa_2/ia_css_aa2.host.c | 31 +
+ .../pci/isp/kernels/aa/aa_2/ia_css_aa2.host.h | 27 +
+ .../pci/isp/kernels/aa/aa_2/ia_css_aa2_param.h | 24 +
+ .../pci/isp/kernels/aa/aa_2/ia_css_aa2_types.h | 46 +
+ .../pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.c | 61 +
+ .../pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.h | 39 +
+ .../pci/isp/kernels/anr/anr_1.0/ia_css_anr_param.h | 25 +
+ .../pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 35 +
+ .../pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c | 46 +
+ .../pci/isp/kernels/anr/anr_2/ia_css_anr2.host.h | 35 +
+ .../pci/isp/kernels/anr/anr_2/ia_css_anr2_param.h | 27 +
+ .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.c | 55 +
+ .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.h | 22 +
+ .../pci/isp/kernels/anr/anr_2/ia_css_anr2_types.h | 31 +
+ .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.c | 66 +
+ .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.h | 32 +
+ .../pci/isp/kernels/bh/bh_2/ia_css_bh_param.h | 40 +
+ .../pci/isp/kernels/bh/bh_2/ia_css_bh_types.h | 35 +
+ .../pci/isp/kernels/bnlm/ia_css_bnlm.host.c | 196 +
+ .../pci/isp/kernels/bnlm/ia_css_bnlm.host.h | 40 +
+ .../pci/isp/kernels/bnlm/ia_css_bnlm_param.h | 64 +
+ .../pci/isp/kernels/bnlm/ia_css_bnlm_types.h | 106 +
+ .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c | 131 +
+ .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h | 35 +
+ .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h | 47 +
+ .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h | 71 +
+ .../pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c | 64 +
+ .../pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h | 34 +
+ .../pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h | 30 +
+ .../pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c | 28 +
+ .../pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h | 25 +
+ .../pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h | 24 +
+ .../pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c | 73 +
+ .../pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h | 43 +
+ .../pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h | 32 +
+ .../pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h | 54 +
+ .../conversion_1.0/ia_css_conversion.host.c | 36 +
+ .../conversion_1.0/ia_css_conversion.host.h | 29 +
+ .../conversion_1.0/ia_css_conversion_param.h | 28 +
+ .../conversion_1.0/ia_css_conversion_types.h | 32 +
+ .../copy_output_1.0/ia_css_copy_output.host.c | 46 +
+ .../copy_output_1.0/ia_css_copy_output.host.h | 34 +
+ .../copy_output_1.0/ia_css_copy_output_param.h | 26 +
+ .../isp/kernels/crop/crop_1.0/ia_css_crop.host.c | 64 +
+ .../isp/kernels/crop/crop_1.0/ia_css_crop.host.h | 41 +
+ .../isp/kernels/crop/crop_1.0/ia_css_crop_param.h | 32 +
+ .../isp/kernels/crop/crop_1.0/ia_css_crop_types.h | 34 +
+ .../pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.c | 127 +
+ .../pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.h | 54 +
+ .../pci/isp/kernels/csc/csc_1.0/ia_css_csc_param.h | 33 +
+ .../pci/isp/kernels/csc/csc_1.0/ia_css_csc_types.h | 78 +
+ .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c | 121 +
+ .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h | 33 +
+ .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h | 46 +
+ .../pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c | 157 +
+ .../pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h | 33 +
+ .../pci/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h | 48 +
+ .../pci/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h | 54 +
+ .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c | 58 +
+ .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h | 36 +
+ .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h | 44 +
+ .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c | 214 +
+ .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h | 24 +
+ .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h | 110 +
+ .../pci/isp/kernels/de/de_1.0/ia_css_de.host.c | 78 +
+ .../pci/isp/kernels/de/de_1.0/ia_css_de.host.h | 44 +
+ .../pci/isp/kernels/de/de_1.0/ia_css_de_param.h | 27 +
+ .../pci/isp/kernels/de/de_1.0/ia_css_de_types.h | 42 +
+ .../pci/isp/kernels/de/de_2/ia_css_de2.host.c | 53 +
+ .../pci/isp/kernels/de/de_2/ia_css_de2.host.h | 38 +
+ .../pci/isp/kernels/de/de_2/ia_css_de2_param.h | 30 +
+ .../pci/isp/kernels/de/de_2/ia_css_de2_types.h | 41 +
+ .../pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.c | 131 +
+ .../pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.h | 47 +
+ .../pci/isp/kernels/dp/dp_1.0/ia_css_dp_param.h | 36 +
+ .../pci/isp/kernels/dp/dp_1.0/ia_css_dp_types.h | 48 +
+ .../pci/isp/kernels/dpc2/ia_css_dpc2.host.c | 65 +
+ .../pci/isp/kernels/dpc2/ia_css_dpc2.host.h | 39 +
+ .../pci/isp/kernels/dpc2/ia_css_dpc2_param.h | 51 +
+ .../pci/isp/kernels/dpc2/ia_css_dpc2_types.h | 59 +
+ .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 301 +
+ .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 60 +
+ .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h | 32 +
+ .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h | 29 +
+ .../pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c | 338 +
+ .../pci/isp/kernels/eed1_8/ia_css_eed1_8.host.h | 45 +
+ .../pci/isp/kernels/eed1_8/ia_css_eed1_8_param.h | 153 +
+ .../pci/isp/kernels/eed1_8/ia_css_eed1_8_types.h | 87 +
+ .../isp/kernels/fc/fc_1.0/ia_css_formats.host.c | 63 +
+ .../isp/kernels/fc/fc_1.0/ia_css_formats.host.h | 44 +
+ .../isp/kernels/fc/fc_1.0/ia_css_formats_param.h | 25 +
+ .../isp/kernels/fc/fc_1.0/ia_css_formats_types.h | 38 +
+ .../fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h | 32 +
+ .../fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h | 24 +
+ .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 88 +
+ .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h | 44 +
+ .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h | 35 +
+ .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h | 52 +
+ .../pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.c | 117 +
+ .../pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.h | 65 +
+ .../pci/isp/kernels/gc/gc_1.0/ia_css_gc_param.h | 61 +
+ .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c | 213 +
+ .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h | 24 +
+ .../pci/isp/kernels/gc/gc_1.0/ia_css_gc_types.h | 97 +
+ .../pci/isp/kernels/gc/gc_2/ia_css_gc2.host.c | 109 +
+ .../pci/isp/kernels/gc/gc_2/ia_css_gc2.host.h | 79 +
+ .../pci/isp/kernels/gc/gc_2/ia_css_gc2_param.h | 43 +
+ .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.c | 131 +
+ .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.h | 26 +
+ .../pci/isp/kernels/gc/gc_2/ia_css_gc2_types.h | 54 +
+ .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c | 41 +
+ .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h | 31 +
+ .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h | 59 +
+ .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h | 70 +
+ .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 93 +
+ .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 28 +
+ .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 20 +
+ .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 20 +
+ .../ipu2_io_ls/common/ia_css_common_io_param.h | 20 +
+ .../ipu2_io_ls/common/ia_css_common_io_types.h | 29 +
+ .../yuv444_io_ls/ia_css_yuv444_io.host.c | 93 +
+ .../yuv444_io_ls/ia_css_yuv444_io.host.h | 28 +
+ .../yuv444_io_ls/ia_css_yuv444_io_param.h | 20 +
+ .../yuv444_io_ls/ia_css_yuv444_io_types.h | 20 +
+ .../iterator/iterator_1.0/ia_css_iterator.host.c | 80 +
+ .../iterator/iterator_1.0/ia_css_iterator.host.h | 34 +
+ .../iterator/iterator_1.0/ia_css_iterator_param.h | 38 +
+ .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c | 74 +
+ .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h | 41 +
+ .../kernels/macc/macc1_5/ia_css_macc1_5_param.h | 31 +
+ .../macc/macc1_5/ia_css_macc1_5_table.host.c | 34 +
+ .../macc/macc1_5/ia_css_macc1_5_table.host.h | 22 +
+ .../kernels/macc/macc1_5/ia_css_macc1_5_types.h | 73 +
+ .../isp/kernels/macc/macc_1.0/ia_css_macc.host.c | 49 +
+ .../isp/kernels/macc/macc_1.0/ia_css_macc.host.h | 41 +
+ .../isp/kernels/macc/macc_1.0/ia_css_macc_param.h | 25 +
+ .../kernels/macc/macc_1.0/ia_css_macc_table.host.c | 51 +
+ .../kernels/macc/macc_1.0/ia_css_macc_table.host.h | 23 +
+ .../isp/kernels/macc/macc_1.0/ia_css_macc_types.h | 63 +
+ .../isp/kernels/norm/norm_1.0/ia_css_norm.host.c | 15 +
+ .../isp/kernels/norm/norm_1.0/ia_css_norm.host.h | 20 +
+ .../isp/kernels/norm/norm_1.0/ia_css_norm_param.h | 18 +
+ .../pci/isp/kernels/ob/ob2/ia_css_ob2.host.c | 76 +
+ .../pci/isp/kernels/ob/ob2/ia_css_ob2.host.h | 40 +
+ .../pci/isp/kernels/ob/ob2/ia_css_ob2_param.h | 28 +
+ .../pci/isp/kernels/ob/ob2/ia_css_ob2_types.h | 44 +
+ .../pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.c | 154 +
+ .../pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.h | 53 +
+ .../pci/isp/kernels/ob/ob_1.0/ia_css_ob_param.h | 47 +
+ .../pci/isp/kernels/ob/ob_1.0/ia_css_ob_types.h | 68 +
+ .../kernels/output/output_1.0/ia_css_output.host.c | 163 +
+ .../kernels/output/output_1.0/ia_css_output.host.h | 75 +
+ .../output/output_1.0/ia_css_output_param.h | 36 +
+ .../output/output_1.0/ia_css_output_types.h | 47 +
+ .../kernels/qplane/qplane_2/ia_css_qplane.host.c | 61 +
+ .../kernels/qplane/qplane_2/ia_css_qplane.host.h | 43 +
+ .../kernels/qplane/qplane_2/ia_css_qplane_param.h | 30 +
+ .../kernels/qplane/qplane_2/ia_css_qplane_types.h | 31 +
+ .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 135 +
+ .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h | 38 +
+ .../pci/isp/kernels/raw/raw_1.0/ia_css_raw_param.h | 38 +
+ .../pci/isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 36 +
+ .../raw_aa_binning_1.0/ia_css_raa.host.c | 35 +
+ .../raw_aa_binning_1.0/ia_css_raa.host.h | 27 +
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 76 +
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h | 41 +
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref_param.h | 36 +
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref_state.h | 26 +
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref_types.h | 25 +
+ .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 386 +
+ .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h | 77 +
+ .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h | 53 +
+ .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 221 +
+ .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c | 158 +
+ .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 77 +
+ .../pci/isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 42 +
+ .../pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 134 +
+ .../kernels/sdis/common/ia_css_sdis_common.host.h | 101 +
+ .../kernels/sdis/common/ia_css_sdis_common_types.h | 220 +
+ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 437 +
+ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h | 101 +
+ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h | 55 +
+ .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 350 +
+ .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h | 95 +
+ .../isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h | 75 +
+ .../pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 74 +
+ .../pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 38 +
+ .../pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h | 43 +
+ .../pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h | 52 +
+ .../pci/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 63 +
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 120 +
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h | 56 +
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 40 +
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h | 26 +
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h | 57 +
+ .../pci/isp/kernels/uds/uds_1.0/ia_css_uds_param.h | 31 +
+ .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 138 +
+ .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 47 +
+ .../pci/isp/kernels/vf/vf_1.0/ia_css_vf_param.h | 37 +
+ .../pci/isp/kernels/vf/vf_1.0/ia_css_vf_types.h | 31 +
+ .../pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.c | 86 +
+ .../pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.h | 39 +
+ .../pci/isp/kernels/wb/wb_1.0/ia_css_wb_param.h | 29 +
+ .../pci/isp/kernels/wb/wb_1.0/ia_css_wb_types.h | 46 +
+ .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c | 65 +
+ .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h | 47 +
+ .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 50 +
+ .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c | 81 +
+ .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h | 22 +
+ .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h | 70 +
+ .../pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c | 248 +
+ .../pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h | 41 +
+ .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h | 83 +
+ .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 97 +
+ .../pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c | 217 +
+ .../pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h | 60 +
+ .../pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h | 49 +
+ .../pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h | 80 +
+ .../pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c | 118 +
+ .../pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h | 56 +
+ .../pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h | 45 +
+ .../pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h | 93 +
+ .../pci/isp/modes/interface/input_buf.isp.h | 37 +
+ .../atomisp/pci/isp/modes/interface/isp_const.h | 180 +
+ .../atomisp/pci/isp/modes/interface/isp_types.h | 79 +
+ .../atomisp/pci/isp2400_input_system_global.h | 155 +
+ .../media/atomisp/pci/isp2400_input_system_local.h | 539 +
+ .../atomisp/pci/isp2400_input_system_private.h | 122 +
+ .../atomisp/pci/isp2400_input_system_public.h | 369 +
+ .../staging/media/atomisp/pci/isp2400_support.h | 38 +
+ .../media/atomisp/pci/isp2400_system_global.h | 348 +
+ .../media/atomisp/pci/isp2400_system_local.h | 325 +
+ .../atomisp/pci/isp2401_input_system_global.h | 205 +
+ .../media/atomisp/pci/isp2401_input_system_local.h | 106 +
+ .../atomisp/pci/isp2401_input_system_private.h | 129 +
+ .../media/atomisp/pci/isp2401_mamoiada_params.h | 228 +
+ .../media/atomisp/pci/isp2401_system_global.h | 457 +
+ .../media/atomisp/pci/isp2401_system_local.h | 406 +
+ .../media/atomisp/pci/isp_acquisition_defs.h | 229 +
+ .../staging/media/atomisp/pci/isp_capture_defs.h | 278 +
+ drivers/staging/media/atomisp/pci/memory_realloc.c | 81 +
+ drivers/staging/media/atomisp/pci/mmu/isp_mmu.c | 566 +
+ .../staging/media/atomisp/pci/mmu/sh_mmu_mrfld.c | 77 +
+ drivers/staging/media/atomisp/pci/mmu_defs.h | 23 +
+ .../pci/runtime/binary/interface/ia_css_binary.h | 228 +
+ .../media/atomisp/pci/runtime/binary/src/binary.c | 1852 ++++
+ .../pci/runtime/bufq/interface/ia_css_bufq.h | 177 +
+ .../pci/runtime/bufq/interface/ia_css_bufq_comm.h | 50 +
+ .../media/atomisp/pci/runtime/bufq/src/bufq.c | 566 +
+ .../pci/runtime/debug/interface/ia_css_debug.h | 502 +
+ .../debug/interface/ia_css_debug_internal.h | 15 +
+ .../runtime/debug/interface/ia_css_debug_pipe.h | 67 +
+ .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 3540 ++++++
+ .../pci/runtime/event/interface/ia_css_event.h | 30 +
+ .../media/atomisp/pci/runtime/event/src/event.c | 112 +
+ .../pci/runtime/eventq/interface/ia_css_eventq.h | 53 +
+ .../media/atomisp/pci/runtime/eventq/src/eventq.c | 77 +
+ .../pci/runtime/frame/interface/ia_css_frame.h | 163 +
+ .../runtime/frame/interface/ia_css_frame_comm.h | 115 +
+ .../media/atomisp/pci/runtime/frame/src/frame.c | 989 ++
+ .../pci/runtime/ifmtr/interface/ia_css_ifmtr.h | 33 +
+ .../media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 552 +
+ .../runtime/inputfifo/interface/ia_css_inputfifo.h | 53 +
+ .../atomisp/pci/runtime/inputfifo/src/inputfifo.c | 538 +
+ .../runtime/isp_param/interface/ia_css_isp_param.h | 102 +
+ .../isp_param/interface/ia_css_isp_param_types.h | 81 +
+ .../atomisp/pci/runtime/isp_param/src/isp_param.c | 216 +
+ .../pci/runtime/isys/interface/ia_css_isys.h | 184 +
+ .../pci/runtime/isys/interface/ia_css_isys_comm.h | 53 +
+ .../atomisp/pci/runtime/isys/src/csi_rx_rmgr.c | 167 +
+ .../atomisp/pci/runtime/isys/src/csi_rx_rmgr.h | 26 +
+ .../atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.c | 121 +
+ .../atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.h | 38 +
+ .../atomisp/pci/runtime/isys/src/isys_dma_rmgr.c | 87 +
+ .../atomisp/pci/runtime/isys/src/isys_dma_rmgr.h | 24 +
+ .../media/atomisp/pci/runtime/isys/src/isys_init.c | 123 +
+ .../pci/runtime/isys/src/isys_stream2mmio_rmgr.c | 89 +
+ .../pci/runtime/isys/src/isys_stream2mmio_rmgr.h | 24 +
+ .../media/atomisp/pci/runtime/isys/src/rx.c | 600 +
+ .../atomisp/pci/runtime/isys/src/virtual_isys.c | 892 ++
+ .../atomisp/pci/runtime/isys/src/virtual_isys.h | 24 +
+ .../runtime/pipeline/interface/ia_css_pipeline.h | 286 +
+ .../pipeline/interface/ia_css_pipeline_common.h | 27 +
+ .../atomisp/pci/runtime/pipeline/src/pipeline.c | 786 ++
+ .../pci/runtime/queue/interface/ia_css_queue.h | 175 +
+ .../runtime/queue/interface/ia_css_queue_comm.h | 53 +
+ .../media/atomisp/pci/runtime/queue/src/queue.c | 422 +
+ .../atomisp/pci/runtime/queue/src/queue_access.c | 176 +
+ .../atomisp/pci/runtime/queue/src/queue_access.h | 85 +
+ .../pci/runtime/rmgr/interface/ia_css_rmgr.h | 72 +
+ .../pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 99 +
+ .../media/atomisp/pci/runtime/rmgr/src/rmgr.c | 39 +
+ .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 336 +
+ .../pci/runtime/spctrl/interface/ia_css_spctrl.h | 68 +
+ .../runtime/spctrl/interface/ia_css_spctrl_comm.h | 45 +
+ .../media/atomisp/pci/runtime/spctrl/src/spctrl.c | 184 +
+ .../tagger/interface/ia_css_tagger_common.h | 43 +
+ .../media/atomisp/pci/runtime/timer/src/timer.c | 31 +
+ .../atomisp/pci/scalar_processor_2400_params.h | 20 +
+ drivers/staging/media/atomisp/pci/sh_css.c | 11110 +++++++++++++++++++
+ drivers/staging/media/atomisp/pci/sh_css_defs.h | 410 +
+ .../staging/media/atomisp/pci/sh_css_dvs_info.h | 36 +
+ .../staging/media/atomisp/pci/sh_css_firmware.c | 333 +
+ .../staging/media/atomisp/pci/sh_css_firmware.h | 55 +
+ drivers/staging/media/atomisp/pci/sh_css_frac.h | 40 +
+ .../staging/media/atomisp/pci/sh_css_host_data.c | 42 +
+ drivers/staging/media/atomisp/pci/sh_css_hrt.c | 85 +
+ drivers/staging/media/atomisp/pci/sh_css_hrt.h | 34 +
+ .../staging/media/atomisp/pci/sh_css_internal.h | 1061 ++
+ drivers/staging/media/atomisp/pci/sh_css_legacy.h | 70 +
+ .../staging/media/atomisp/pci/sh_css_metadata.c | 16 +
+ drivers/staging/media/atomisp/pci/sh_css_metrics.c | 175 +
+ drivers/staging/media/atomisp/pci/sh_css_metrics.h | 55 +
+ drivers/staging/media/atomisp/pci/sh_css_mipi.c | 757 ++
+ drivers/staging/media/atomisp/pci/sh_css_mipi.h | 49 +
+ drivers/staging/media/atomisp/pci/sh_css_mmu.c | 60 +
+ drivers/staging/media/atomisp/pci/sh_css_morph.c | 16 +
+ .../staging/media/atomisp/pci/sh_css_param_dvs.c | 286 +
+ .../staging/media/atomisp/pci/sh_css_param_dvs.h | 85 +
+ .../media/atomisp/pci/sh_css_param_shading.c | 402 +
+ .../media/atomisp/pci/sh_css_param_shading.h | 34 +
+ drivers/staging/media/atomisp/pci/sh_css_params.c | 5247 +++++++++
+ drivers/staging/media/atomisp/pci/sh_css_params.h | 188 +
+ .../media/atomisp/pci/sh_css_params_internal.h | 21 +
+ drivers/staging/media/atomisp/pci/sh_css_pipe.c | 16 +
+ .../staging/media/atomisp/pci/sh_css_properties.c | 43 +
+ drivers/staging/media/atomisp/pci/sh_css_shading.c | 16 +
+ drivers/staging/media/atomisp/pci/sh_css_sp.c | 1829 +++
+ drivers/staging/media/atomisp/pci/sh_css_sp.h | 248 +
+ drivers/staging/media/atomisp/pci/sh_css_stream.c | 16 +
+ .../media/atomisp/pci/sh_css_stream_format.c | 76 +
+ .../media/atomisp/pci/sh_css_stream_format.h | 23 +
+ drivers/staging/media/atomisp/pci/sh_css_struct.h | 85 +
+ drivers/staging/media/atomisp/pci/sh_css_uds.h | 37 +
+ drivers/staging/media/atomisp/pci/sh_css_version.c | 37 +
+ drivers/staging/media/atomisp/pci/str2mem_defs.h | 39 +
+ .../media/atomisp/pci/streaming_to_mipi_defs.h | 28 +
+ drivers/staging/media/atomisp/pci/system_global.h | 10 +
+ drivers/staging/media/atomisp/pci/system_local.h | 10 +
+ .../media/atomisp/pci/timed_controller_defs.h | 22 +
+ drivers/staging/media/atomisp/pci/version.h | 20 +
+ drivers/staging/media/hantro/Kconfig | 6 +-
+ drivers/staging/media/hantro/Makefile | 2 +
+ drivers/staging/media/hantro/hantro.h | 7 +-
+ drivers/staging/media/hantro/hantro_drv.c | 28 +-
+ drivers/staging/media/hantro/hantro_h264.c | 237 +-
+ drivers/staging/media/hantro/hantro_hw.h | 31 +
+ drivers/staging/media/hantro/hantro_v4l2.c | 111 +-
+ drivers/staging/media/imx/Kconfig | 5 +-
+ drivers/staging/media/imx/TODO | 29 -
+ drivers/staging/media/imx/imx-ic-prp.c | 15 +-
+ drivers/staging/media/imx/imx-ic-prpencvf.c | 14 +-
+ drivers/staging/media/imx/imx-media-capture.c | 42 +-
+ drivers/staging/media/imx/imx-media-csc-scaler.c | 13 +-
+ drivers/staging/media/imx/imx-media-csi.c | 223 +-
+ drivers/staging/media/imx/imx-media-dev-common.c | 50 +-
+ drivers/staging/media/imx/imx-media-dev.c | 2 +-
+ drivers/staging/media/imx/imx-media-internal-sd.c | 6 +-
+ drivers/staging/media/imx/imx-media-of.c | 114 -
+ drivers/staging/media/imx/imx-media-utils.c | 550 +-
+ drivers/staging/media/imx/imx-media-vdic.c | 12 +-
+ drivers/staging/media/imx/imx-media.h | 63 +-
+ drivers/staging/media/imx/imx6-mipi-csi2.c | 93 +-
+ drivers/staging/media/imx/imx7-media-csi.c | 177 +-
+ drivers/staging/media/imx/imx7-mipi-csis.c | 582 +-
+ drivers/staging/media/ipu3/Kconfig | 3 +-
+ drivers/staging/media/ipu3/TODO | 6 -
+ drivers/staging/media/ipu3/include/intel-ipu3.h | 7 +-
+ drivers/staging/media/ipu3/ipu3-css-params.c | 14 +-
+ drivers/staging/media/ipu3/ipu3-css.c | 7 +
+ drivers/staging/media/ipu3/ipu3-mmu.c | 10 +-
+ drivers/staging/media/ipu3/ipu3-v4l2.c | 92 +-
+ drivers/staging/media/ipu3/ipu3.c | 5 +-
+ drivers/staging/media/ipu3/ipu3.h | 4 +
+ drivers/staging/media/meson/vdec/codec_vp9.c | 31 +
+ drivers/staging/media/omap4iss/Kconfig | 4 +-
+ .../staging/media/phy-rockchip-dphy-rx0/Kconfig | 2 +-
+ drivers/staging/media/rkisp1/Kconfig | 6 +-
+ drivers/staging/media/rkisp1/Makefile | 2 +
+ drivers/staging/media/rkisp1/TODO | 6 -
+ drivers/staging/media/rkisp1/rkisp1-capture.c | 101 +-
+ drivers/staging/media/rkisp1/rkisp1-common.h | 16 +-
+ drivers/staging/media/rkisp1/rkisp1-dev.c | 114 +-
+ drivers/staging/media/rkisp1/rkisp1-isp.c | 94 +-
+ drivers/staging/media/rkisp1/rkisp1-resizer.c | 36 +-
+ drivers/staging/media/rkvdec/Kconfig | 16 +
+ drivers/staging/media/rkvdec/Makefile | 3 +
+ drivers/staging/media/rkvdec/TODO | 11 +
+ drivers/staging/media/rkvdec/rkvdec-h264.c | 1156 ++
+ drivers/staging/media/rkvdec/rkvdec-regs.h | 223 +
+ drivers/staging/media/rkvdec/rkvdec.c | 1103 ++
+ drivers/staging/media/rkvdec/rkvdec.h | 121 +
+ .../staging/media/soc_camera}/soc-camera.rst | 0
+ drivers/staging/media/sunxi/cedrus/Kconfig | 5 +-
+ drivers/staging/media/usbvision/Kconfig | 2 +-
+ drivers/staging/media/usbvision/usbvision-core.c | 2 +-
+ include/media/cec-pin.h | 16 +-
+ include/media/dvb-usb-ids.h | 5 +-
+ include/media/h264-ctrls.h | 8 +-
+ include/media/media-entity.h | 3 +-
+ include/media/rc-map.h | 103 +-
+ include/media/v4l2-ctrls.h | 87 +-
+ include/media/v4l2-dev.h | 7 +
+ include/media/v4l2-device.h | 50 +-
+ include/media/v4l2-fh.h | 2 -
+ include/media/v4l2-fwnode.h | 85 +-
+ include/media/v4l2-h264.h | 85 +
+ include/media/v4l2-image-sizes.h | 6 +
+ include/media/v4l2-jpeg.h | 135 +
+ include/media/v4l2-mc.h | 48 +
+ include/media/v4l2-subdev.h | 17 +
+ include/uapi/linux/v4l2-controls.h | 12 +
+ include/uapi/linux/v4l2-subdev.h | 16 +
+ include/uapi/linux/videodev2.h | 5 +-
+ 1696 files changed, 161780 insertions(+), 7159 deletions(-)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/au0828-cardlist.rst (100%)
+ create mode 100644 Documentation/admin-guide/media/avermedia.rst
+ create mode 100644 Documentation/admin-guide/media/bt8xx.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/bttv-cardlist.rst (99%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/bttv.rst (79%)
+ create mode 100644 Documentation/admin-guide/media/building.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/cafe_ccic.rst (100%)
+ create mode 100644 Documentation/admin-guide/media/cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/cec-drivers.rst
+ create mode 100644 Documentation/admin-guide/media/ci.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/cpia2.rst (66%)
+ create mode 100644 Documentation/admin-guide/media/cx18-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/cx231xx-cardlist.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/cx23885-cardlist.rst (98%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/cx88-cardlist.rst (98%)
+ create mode 100644 Documentation/admin-guide/media/cx88.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/davinci-vpbe.rst (72%)
+ create mode 100644 Documentation/admin-guide/media/dvb-drivers.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-a800-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-af9005-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-af9015-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-af9035-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-anysee-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-au6610-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-az6007-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-az6027-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-ce6230-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-cinergyT2-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-cxusb-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-dib0700-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-dibusb-mb-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-dibusb-mc-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-digitv-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-dtt200u-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-dtv5100-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-dvbsky-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-dw2102-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-ec168-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-gl861-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-gp8psk-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-lmedm04-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-m920x-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-mxl111sf-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-nova-t-usb2-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-opera1-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-pctv452e-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-rtl28xxu-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-technisat-usb2-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-ttusb2-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-umt-010-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-vp702x-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-vp7045-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb-usb-zd1301-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/dvb.rst
+ create mode 100644 Documentation/admin-guide/media/dvb_intro.rst
+ create mode 100644 Documentation/admin-guide/media/dvb_references.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/em28xx-cardlist.rst (97%)
+ create mode 100644 Documentation/admin-guide/media/faq.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/fimc.rst (91%)
+ create mode 100644 Documentation/admin-guide/media/frontend-cardlist.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/gspca-cardlist.rst (100%)
+ create mode 100644 Documentation/admin-guide/media/i2c-cardlist.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/imx.rst (83%)
+ create mode 100644 Documentation/admin-guide/media/imx6q-sabreauto.dot
+ create mode 100644 Documentation/admin-guide/media/imx6q-sabresd.dot
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/imx7.rst (100%)
+ create mode 100644 Documentation/admin-guide/media/index.rst
+ create mode 100644 Documentation/admin-guide/media/intro.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/ipu3.rst (88%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/ipu3_rcb.svg (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/ivtv-cardlist.rst (99%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/ivtv.rst (100%)
+ rename Documentation/{media/dvb-drivers => admin-guide/media}/lmedm04.rst (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/meye.rst (63%)
+ create mode 100644 Documentation/admin-guide/media/misc-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/omap3isp.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/omap4_camera.rst (100%)
+ rename Documentation/{media/dvb-drivers => admin-guide/media}/opera-firmware.rst (100%)
+ create mode 100644 Documentation/admin-guide/media/other-usb-cardlist.rst
+ create mode 100644 Documentation/admin-guide/media/pci-cardlist.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/philips.rst (100%)
+ create mode 100644 Documentation/admin-guide/media/platform-cardlist.rst
+ rename Documentation/{media/cec-drivers => admin-guide/media}/pulse8-cec.rst (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss.rst (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss_8x96_graph.dot (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss_graph.dot (100%)
+ create mode 100644 Documentation/admin-guide/media/radio-cardlist.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/rcar-fdp1.rst (100%)
+ rename Documentation/{media/v4l-drivers/v4l-with-ir.rst => admin-guide/media/remote-controller.rst} (96%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/saa7134-cardlist.rst (99%)
+ create mode 100644 Documentation/admin-guide/media/saa7134.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/saa7164-cardlist.rst (97%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/si470x.rst (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/si4713.rst (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/si476x.rst (100%)
+ create mode 100644 Documentation/admin-guide/media/siano-cardlist.rst
+ rename Documentation/{media/dvb-drivers => admin-guide/media}/technisat.rst (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/tm6000-cardlist.rst (100%)
+ rename Documentation/{media/dvb-drivers => admin-guide/media}/ttusb-dec.rst (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/tuner-cardlist.rst (100%)
+ create mode 100644 Documentation/admin-guide/media/usb-cardlist.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/usbvision-cardlist.rst (100%)
+ create mode 100644 Documentation/admin-guide/media/v4l-drivers.rst
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/vimc.dot (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/vimc.rst (92%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/vivid.rst (100%)
+ rename Documentation/{media/v4l-drivers => admin-guide/media}/zr364xx.rst (77%)
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/ov8856.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/rockchip,vdec.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/rockchip-rga.txt
+ create mode 100644 Documentation/devicetree/bindings/media/rockchip-rga.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
+ create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml
+ rename {drivers/staging/media/phy-rockchip-dphy-rx0/Documentation => Documentation}/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml (98%)
+ rename Documentation/{media/kapi => driver-api/media}/cec-core.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/csi2.rst (95%)
+ create mode 100644 Documentation/driver-api/media/drivers/bttv-devel.rst
+ rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/contributors.rst (100%)
+ create mode 100644 Documentation/driver-api/media/drivers/cpia2_devel.rst
+ rename Documentation/{media/v4l-drivers/cx2341x.rst => driver-api/media/drivers/cx2341x-devel.rst} (91%)
+ rename Documentation/{media/v4l-drivers/cx88.rst => driver-api/media/drivers/cx88-devel.rst} (66%)
+ create mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst
+ rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/dvb-usb.rst (100%)
+ create mode 100644 Documentation/driver-api/media/drivers/fimc-devel.rst
+ rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/frontends.rst (100%)
+ create mode 100644 Documentation/driver-api/media/drivers/index.rst
+ rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/pvrusb2.rst (100%)
+ rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/pxa_camera.rst (100%)
+ rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/radiotrack.rst (100%)
+ rename Documentation/{media/v4l-drivers/saa7134.rst => driver-api/media/drivers/saa7134-devel.rst} (56%)
+ rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/sh_mobile_ceu_camera.rst (100%)
+ rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/tuners.rst (100%)
+ create mode 100644 Documentation/driver-api/media/drivers/vimc-devel.rst
+ rename Documentation/{media/kapi => driver-api/media}/dtv-ca.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/dtv-common.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/dtv-core.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/dtv-demux.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/dtv-frontend.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/dtv-net.rst (100%)
+ create mode 100644 Documentation/driver-api/media/index.rst
+ rename Documentation/{media/kapi => driver-api/media}/mc-core.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/rc-core.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-async.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-clocks.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-common.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-controls.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-core.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-dev.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-device.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-dv-timings.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-event.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-fh.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-flash-led-class.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-fwnode.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-intro.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-mc.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-mediabus.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-mem2mem.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-rect.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-subdev.rst (88%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-tuner.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-tveeprom.rst (100%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-videobuf.rst (98%)
+ rename Documentation/{media/kapi => driver-api/media}/v4l2-videobuf2.rst (100%)
+ delete mode 100644 Documentation/media/.gitignore
+ delete mode 100644 Documentation/media/cec-drivers/index.rst
+ delete mode 100644 Documentation/media/dvb-drivers/avermedia.rst
+ delete mode 100644 Documentation/media/dvb-drivers/bt8xx.rst
+ delete mode 100644 Documentation/media/dvb-drivers/cards.rst
+ delete mode 100644 Documentation/media/dvb-drivers/faq.rst
+ delete mode 100644 Documentation/media/dvb-drivers/index.rst
+ delete mode 100644 Documentation/media/dvb-drivers/intro.rst
+ delete mode 100644 Documentation/media/dvb-drivers/udev.rst
+ delete mode 100644 Documentation/media/index.rst
+ delete mode 100644 Documentation/media/media_kapi.rst
+ delete mode 100644 Documentation/media/media_uapi.rst
+ delete mode 100644 Documentation/media/v4l-drivers/cardlist.rst
+ rename Documentation/{ => userspace-api}/media/Makefile (97%)
+ rename Documentation/{ => userspace-api}/media/audio.h.rst.exceptions (100%)
+ rename Documentation/{ => userspace-api}/media/ca.h.rst.exceptions (100%)
+ rename Documentation/{ => userspace-api}/media/cec.h.rst.exceptions (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-api.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-close.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-ioctl.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-open.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-poll.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-funcs.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-header.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-intro.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-caps.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-conn-info.rst (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-log-addrs.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-phys-addr.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-dqevent.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-g-mode.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-receive.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/cec/cec-pin-error-inj.rst (99%)
+ rename Documentation/{ => userspace-api}/media/conf_nitpick.py (100%)
+ rename Documentation/{ => userspace-api}/media/dmx.h.rst.exceptions (100%)
+ create mode 100644 Documentation/userspace-api/media/drivers/cx2341x-uapi.rst
+ create mode 100644 Documentation/userspace-api/media/drivers/imx-uapi.rst
+ rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/index.rst (73%)
+ rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/max2175.rst (96%)
+ create mode 100644 Documentation/userspace-api/media/drivers/meye-uapi.rst
+ rename Documentation/{media/v4l-drivers/omap3isp.rst => userspace-api/media/drivers/omap3isp-uapi.rst} (77%)
+ rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/uvcvideo.rst (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-bilingual-channel-select.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-channel-select.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-clear-buffer.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-continue.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-fclose.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-fopen.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-fwrite.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-get-capabilities.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-get-status.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-pause.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-play.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-select-source.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-av-sync.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-bypass-mode.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-id.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-mixer.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-mute.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-streamtype.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-stop.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio_data_types.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/audio_function_calls.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-fclose.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-fopen.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-cap.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-descr-info.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-msg.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-slot-info.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-reset.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-send-msg.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-set-descr.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca.rst (92%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca_data_types.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/ca_function_calls.rst (92%)
+ rename Documentation/{media/dvb-drivers/ci.rst => userspace-api/media/dvb/ca_high_level.rst} (68%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/demux.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-add-pid.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-expbuf.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fclose.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fopen.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fread.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fwrite.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-get-pes-pids.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-get-stc.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-mmap.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-munmap.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-qbuf.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-querybuf.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-remove-pid.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-reqbufs.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-set-buffer-size.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-set-filter.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-set-pes-filter.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-start.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-stop.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx_fcalls.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx_types.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dvb-fe-read-status.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dvb-frontend-event.rst (91%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dvb-frontend-parameters.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dvbapi.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dvbproperty.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/dvbstb.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/examples.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-bandwidth-t.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-recv-slave-reply.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-reset-overload.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-send-burst.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-send-master-cmd.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-dishnetwork-send-legacy-cmd.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-enable-high-lnb-voltage.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-event.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-frontend.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-info.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-property.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-ber.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-signal-strength.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-snr.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-status.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-uncorrected-blocks.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-frontend-tune-mode.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-frontend.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-tone.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-voltage.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-type-t.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/fe_property_parameters.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-header.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-property-cable-systems.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-property-satellite-systems.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-property-terrestrial-systems.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-stat-properties.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_f_close.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_f_open.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_fcalls.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_legacy_api.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_legacy_dvbv3_api.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/headers.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/intro.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/legacy_dvb_apis.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/net-add-if.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/net-get-if.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/net-remove-if.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/net-types.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/net.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/query-dvb-frontend-info.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-clear-buffer.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-command.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-continue.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fast-forward.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fclose.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fopen.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-freeze.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fwrite.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-capabilities.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-event.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-frame-count.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-pts.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-size.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-status.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-play.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-select-source.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-blank.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-display-format.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-format.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-streamtype.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-slowmotion.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-stillpicture.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-stop.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video-try-command.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video_function_calls.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/dvb/video_types.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/fdl-appendix.rst (99%)
+ rename Documentation/{ => userspace-api}/media/frontend.h.rst.exceptions (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/gen-errors.rst (98%)
+ create mode 100644 Documentation/userspace-api/media/index.rst
+ rename Documentation/{ => userspace-api}/media/intro.rst (100%)
+ rename Documentation/{ => userspace-api}/media/lirc.h.rst.exceptions (100%)
+ rename Documentation/{ => userspace-api}/media/media.h.rst.exceptions (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-controller-intro.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-controller-model.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-controller.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-func-close.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-func-ioctl.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-func-open.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-funcs.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-header.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-device-info.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-enum-entities.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-enum-links.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-g-topology.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-request-alloc.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-setup-link.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-request-ioc-queue.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-request-ioc-reinit.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-types.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-api.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-func-close.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-func-ioctl.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-func-poll.rst (98%)
+ rename Documentation/{ => userspace-api}/media/net.h.rst.exceptions (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/keytable.c.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-dev-intro.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-dev.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-func.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-features.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-rec-mode.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-rec-resolution.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-send-mode.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-timeout.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-header.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-read.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-measure-carrier-mode.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-carrier-range.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-carrier.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-timeout-reports.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-timeout.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-send-carrier.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-send-duty-cycle.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-transmitter-mask.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-wideband-receiver.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-write.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/rc-intro.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/rc-protos.rst (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/rc-sysfs-nodes.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/rc-table-change.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/rc-tables.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/rc/remote_controllers.rst (95%)
+ rename Documentation/{ => userspace-api}/media/typical_media_device.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/app-pri.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/async.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/audio.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/bayer.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/biblio.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/buffer.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/capture-example.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/capture.c.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/colorspaces-defs.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/colorspaces-details.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/colorspaces.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/common-defs.rst (92%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/common.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/compat.rst (92%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/constraints.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/control.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/crop.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/crop.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/depth-formats.rst (91%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-capture.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-decoder.rst (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-event.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-mem2mem.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-meta.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-osd.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-output.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-overlay.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-radio.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-raw-vbi.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-rds.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-sdr.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-sliced-vbi.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-stateless-decoder.rst (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-subdev.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-touch.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/devices.rst (92%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/diff-v4l.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dmabuf.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/dv-timings.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-camera.rst (74%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-codec.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-detect.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-dv.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-flash.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-fm-rx.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-fm-tx.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-image-process.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-image-source.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-jpeg.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-rf-tuner.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/extended-controls.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/field-order.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/fieldseq_bt.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/fieldseq_tb.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/format.rst (98%)
+ rename Documentation/{media/v4l-drivers => userspace-api/media/v4l}/fourcc.rst (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/func-close.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/func-ioctl.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/func-mmap.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/func-munmap.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/func-open.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/func-poll.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/func-read.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/func-select.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/func-write.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/hist-v4l2.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/hsv-formats.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/io.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/libv4l-introduction.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/libv4l.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/meta-formats.rst (92%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/mmap.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/nv12mt.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/nv12mt_example.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/open.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pipeline.dot (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-bayer.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-cnf4.rst (100%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-compressed.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-grey.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-indexed.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-intro.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-inzi.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-m420.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-d4xx.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-intel-ipu3.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-uvc.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-vivid.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-vsp1-hgo.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-vsp1-hgt.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv12.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv12m.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv12mt.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv16.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv16m.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv24.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-packed-hsv.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-packed-yuv.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-reserved.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-rgb.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cs08.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cs14le.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cu08.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cu16le.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-pcu16be.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-pcu18be.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-pcu20be.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-ru12le.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10-ipu3.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10alaw8.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10dpcm8.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10p.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb12.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb12p.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb14.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb14p.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb16.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb8.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-td08.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-td16.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-tu08.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-tu16.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-uv8.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-uyvy.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-v4l2-mplane.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-v4l2.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-vyuy.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y10.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y10b.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y10p.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y12.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y12i.rst (95%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y14.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y16-be.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y16.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y41p.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y8i.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv410.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv411p.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv420.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv420m.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv422m.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv422p.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv444m.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuyv.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yvyu.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-z16.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/planar-apis.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/querycap.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/rw.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/sdr-formats.rst (92%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-configuration.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-examples.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-intro.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-targets.rst (92%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-vs-crop-api.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api.rst (92%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/selection.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/selections-common.rst (94%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/standard.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/streaming-par.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-formats.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-image-processing-crop.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-image-processing-full.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-image-processing-scaling-multi-source.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/tch-formats.rst (91%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/tuner.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/user-func.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/userp.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2-selection-flags.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2-selection-targets.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2grab-example.rst (93%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2grab.c.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vbi_525.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vbi_625.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vbi_hsync.svg (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/video.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/videodev.rst (91%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-create-bufs.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-cropcap.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dbg-g-chip-info.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dbg-g-register.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-decoder-cmd.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dqevent.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dv-timings-cap.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-encoder-cmd.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-dv-timings.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-fmt.rst (70%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-frameintervals.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-framesizes.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-freq-bands.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumaudio.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumaudioout.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enuminput.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumoutput.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumstd.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-expbuf.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-audio.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-audioout.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-crop.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-ctrl.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-dv-timings.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-edid.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-enc-index.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-ext-ctrls.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-fbuf.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-fmt.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-frequency.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-input.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-jpegcomp.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-modulator.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-output.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-parm.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-priority.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-selection.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-sliced-vbi-cap.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-std.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-tuner.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-log-status.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-overlay.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-prepare-buf.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-qbuf.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-query-dv-timings.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-querybuf.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-querycap.rst (96%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-queryctrl.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-querystd.rst (97%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-reqbufs.rst (99%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-s-hw-freq-seek.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-streamon.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-enum-frame-interval.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-enum-frame-size.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-enum-mbus-code.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-crop.rst (90%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-fmt.rst (91%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-frame-interval.rst (92%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-selection.rst (89%)
+ create mode 100644 Documentation/userspace-api/media/v4l/vidioc-subdev-querycap.rst
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subscribe-event.rst (98%)
+ rename Documentation/{media/uapi => userspace-api/media}/v4l/yuv-formats.rst (97%)
+ rename Documentation/{ => userspace-api}/media/video.h.rst.exceptions (100%)
+ rename Documentation/{ => userspace-api}/media/videodev2.h.rst.exceptions (99%)
+ create mode 100644 drivers/media/cec/core/Makefile
+ rename drivers/media/cec/{ => core}/cec-adap.c (100%)
+ rename drivers/media/cec/{ => core}/cec-api.c (100%)
+ rename drivers/media/cec/{ => core}/cec-core.c (100%)
+ rename drivers/media/cec/{ => core}/cec-notifier.c (100%)
+ rename drivers/media/cec/{ => core}/cec-pin-error-inj.c (100%)
+ rename drivers/media/cec/{ => core}/cec-pin-priv.h (100%)
+ rename drivers/media/cec/{ => core}/cec-pin.c (100%)
+ rename drivers/media/cec/{ => core}/cec-priv.h (100%)
+ create mode 100644 drivers/media/cec/platform/Kconfig
+ create mode 100644 drivers/media/cec/platform/Makefile
+ rename drivers/media/{ => cec}/platform/cec-gpio/Makefile (100%)
+ rename drivers/media/{ => cec}/platform/cec-gpio/cec-gpio.c (94%)
+ create mode 100644 drivers/media/cec/platform/cros-ec/Makefile
+ rename drivers/media/{platform/cros-ec-cec => cec/platform/cros-ec}/cros-ec-cec.c (100%)
+ create mode 100644 drivers/media/cec/platform/meson/Makefile
+ rename drivers/media/{ => cec}/platform/meson/ao-cec-g12a.c (100%)
+ rename drivers/media/{ => cec}/platform/meson/ao-cec.c (100%)
+ rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/Makefile (63%)
+ rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/exynos_hdmi_cec.h (100%)
+ rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/exynos_hdmi_cecctrl.c (100%)
+ rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/regs-cec.h (100%)
+ rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/s5p_cec.c (100%)
+ rename drivers/media/{platform/s5p-cec => cec/platform/s5p}/s5p_cec.h (100%)
+ create mode 100644 drivers/media/cec/platform/seco/Makefile
+ rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.c (99%)
+ rename drivers/media/{platform/seco-cec => cec/platform/seco}/seco-cec.h (100%)
+ create mode 100644 drivers/media/cec/platform/sti/Makefile
+ rename drivers/media/{platform/sti/cec => cec/platform/sti}/stih-cec.c (100%)
+ create mode 100644 drivers/media/cec/platform/stm32/Makefile
+ rename drivers/media/{ => cec}/platform/stm32/stm32-cec.c (100%)
+ create mode 100644 drivers/media/cec/platform/tegra/Makefile
+ rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/tegra_cec.c (100%)
+ rename drivers/media/{platform/tegra-cec => cec/platform/tegra}/tegra_cec.h (100%)
+ create mode 100644 drivers/media/cec/usb/Kconfig
+ create mode 100644 drivers/media/cec/usb/Makefile
+ rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Kconfig (91%)
+ rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/Makefile (100%)
+ rename drivers/media/{usb/pulse8-cec => cec/usb/pulse8}/pulse8-cec.c (100%)
+ rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Kconfig (92%)
+ rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/Makefile (100%)
+ rename drivers/media/{usb/rainshadow-cec => cec/usb/rainshadow}/rainshadow-cec.c (100%)
+ create mode 100644 drivers/media/i2c/ov2740.c
+ create mode 100644 drivers/media/pci/ddbridge/ddbridge-dummy-fe.c
+ create mode 100644 drivers/media/pci/ddbridge/ddbridge-dummy-fe.h
+ delete mode 100644 drivers/media/platform/cros-ec-cec/Makefile
+ delete mode 100644 drivers/media/platform/meson/Makefile
+ delete mode 100644 drivers/media/platform/seco-cec/Makefile
+ delete mode 100644 drivers/media/platform/sh_veu.c
+ delete mode 100644 drivers/media/platform/sti/cec/Makefile
+ delete mode 100644 drivers/media/platform/tegra-cec/Makefile
+ create mode 100644 drivers/media/test-drivers/Kconfig
+ create mode 100644 drivers/media/test-drivers/Makefile
+ rename drivers/media/{platform => test-drivers}/vicodec/Kconfig (85%)
+ rename drivers/media/{platform => test-drivers}/vicodec/Makefile (100%)
+ rename drivers/media/{platform => test-drivers}/vicodec/codec-fwht.c (100%)
+ rename drivers/media/{platform => test-drivers}/vicodec/codec-fwht.h (100%)
+ rename drivers/media/{platform => test-drivers}/vicodec/codec-v4l2-fwht.c (100%)
+ rename drivers/media/{platform => test-drivers}/vicodec/codec-v4l2-fwht.h (100%)
+ rename drivers/media/{platform => test-drivers}/vicodec/vicodec-core.c (99%)
+ rename drivers/media/{platform => test-drivers}/vim2m.c (99%)
+ rename drivers/media/{platform => test-drivers}/vimc/Kconfig (83%)
+ rename drivers/media/{platform => test-drivers}/vimc/Makefile (100%)
+ rename drivers/media/{platform => test-drivers}/vimc/vimc-capture.c (94%)
+ rename drivers/media/{platform => test-drivers}/vimc/vimc-common.c (81%)
+ rename drivers/media/{platform => test-drivers}/vimc/vimc-common.h (78%)
+ rename drivers/media/{platform => test-drivers}/vimc/vimc-core.c (87%)
+ rename drivers/media/{platform => test-drivers}/vimc/vimc-debayer.c (88%)
+ rename drivers/media/{platform => test-drivers}/vimc/vimc-scaler.c (96%)
+ rename drivers/media/{platform => test-drivers}/vimc/vimc-sensor.c (95%)
+ rename drivers/media/{platform => test-drivers}/vimc/vimc-streamer.c (100%)
+ rename drivers/media/{platform => test-drivers}/vimc/vimc-streamer.h (85%)
+ rename drivers/media/{platform => test-drivers}/vivid/Kconfig (95%)
+ rename drivers/media/{platform => test-drivers}/vivid/Makefile (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-cec.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-cec.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-core.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-core.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-ctrls.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-ctrls.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-cap.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-cap.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-out.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-out.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-touch.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-kthread-touch.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-meta-cap.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-meta-cap.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-meta-out.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-meta-out.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-osd.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-osd.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-common.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-common.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-rx.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-rx.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-tx.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-radio-tx.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-rds-gen.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-rds-gen.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-sdr-cap.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-sdr-cap.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-touch-cap.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-touch-cap.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-cap.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-cap.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-gen.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-gen.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-out.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vbi-out.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-cap.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-cap.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-common.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-common.h (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-out.c (100%)
+ rename drivers/media/{platform => test-drivers}/vivid/vivid-vid-out.h (100%)
+ create mode 100644 drivers/media/v4l2-core/v4l2-h264.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-jpeg.c
+ create mode 100644 drivers/staging/media/atomisp/Kconfig
+ create mode 100644 drivers/staging/media/atomisp/Makefile
+ create mode 100644 drivers/staging/media/atomisp/TODO
+ create mode 100644 drivers/staging/media/atomisp/i2c/Kconfig
+ create mode 100644 drivers/staging/media/atomisp/i2c/Makefile
+ create mode 100644 drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+ create mode 100644 drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+ create mode 100644 drivers/staging/media/atomisp/i2c/atomisp-libmsrlisthelper.c
+ create mode 100644 drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
+ create mode 100644 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+ create mode 100644 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
+ create mode 100644 drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+ create mode 100644 drivers/staging/media/atomisp/i2c/gc0310.h
+ create mode 100644 drivers/staging/media/atomisp/i2c/gc2235.h
+ create mode 100644 drivers/staging/media/atomisp/i2c/mt9m114.h
+ create mode 100644 drivers/staging/media/atomisp/i2c/ov2680.h
+ create mode 100644 drivers/staging/media/atomisp/i2c/ov2722.h
+ create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Kconfig
+ create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Makefile
+ create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ad5823.h
+ create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+ create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
+ create mode 100644 drivers/staging/media/atomisp/include/hmm/hmm.h
+ create mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_bo.h
+ create mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_common.h
+ create mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_pool.h
+ create mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_vm.h
+ create mode 100644 drivers/staging/media/atomisp/include/linux/atomisp.h
+ create mode 100644 drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h
+ create mode 100644 drivers/staging/media/atomisp/include/linux/atomisp_platform.h
+ create mode 100644 drivers/staging/media/atomisp/include/linux/libmsrlisthelper.h
+ create mode 100644 drivers/staging/media/atomisp/include/media/lm3554.h
+ create mode 100644 drivers/staging/media/atomisp/include/mmu/isp_mmu.h
+ create mode 100644 drivers/staging/media/atomisp/include/mmu/sh_mmu_mrfld.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp-regs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_cmd.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_cmd.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_common.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_compat.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_compat_css20.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_csi2.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_csi2.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_dfs_tables.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_drvfs.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_drvfs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_fops.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_fops.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_helper.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_internal.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_ioctl.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_subdev.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_subdev.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_tables.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_tpg.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_tpg.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_trace_event.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp_v4l2.h
+ create mode 100644 drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h
+ create mode 100644 drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_comm.h
+ create mode 100644 drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_desc.h
+ create mode 100644 drivers/staging/media/atomisp/pci/base/circbuf/src/circbuf.c
+ create mode 100644 drivers/staging/media/atomisp/pci/base/refcount/interface/ia_css_refcount.h
+ create mode 100644 drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c
+ create mode 100644 drivers/staging/media/atomisp/pci/bits.h
+ create mode 100644 drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_binarydesc.h
+ create mode 100644 drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_stagedesc.h
+ create mode 100644 drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_util.h
+ create mode 100644 drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c
+ create mode 100644 drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_stagedesc.c
+ create mode 100644 drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_util.c
+ create mode 100644 drivers/staging/media/atomisp/pci/camera/util/interface/ia_css_util.h
+ create mode 100644 drivers/staging/media/atomisp/pci/camera/util/src/util.c
+ create mode 100644 drivers/staging/media/atomisp/pci/cell_params.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_configs.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_params.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_states.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hrt/isp2400_mamoiada_params.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/csi_rx_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_params.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/csi_rx.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/csi_rx_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/csi_rx_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/ibuf_ctrl.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/ibuf_ctrl_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/ibuf_ctrl_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio.c
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/pixelgen_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/pixelgen_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hrt/PixelGen_SysBlock_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hrt/ibuf_cntrl_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hrt/mipi_backend_common_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hrt/mipi_backend_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hrt/rx_csi_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hrt/stream2mmio_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/ibuf_ctrl_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/isys_dma_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/isys_irq_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/isys_stream2mmio_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/pixelgen_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_receiver_2400_common_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_receiver_2400_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/css_trace.h
+ create mode 100644 drivers/staging/media/atomisp/pci/defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/dma_v2_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/gdc_v2_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/gp_timer_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/gpio_block_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_2401_irq_types_hrt.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/debug_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/dma_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/event_fifo_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/fifo_monitor_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/gdc_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/gp_device_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/gp_timer_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/gpio_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/hmem_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpio_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpio_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vamem_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/input_formatter_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/irq_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/mmu_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/timed_ctrl_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/vamem_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_common/vmem_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/assert_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/bitop_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/csi_rx.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/debug.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/device_access/device_access.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/dma.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/error_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/event_fifo.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/fifo_monitor.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/gdc_device.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/gp_device.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/gp_timer.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/gpio.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/hmem.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/csi_rx_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/debug_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/dma_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/event_fifo_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/fifo_monitor_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gdc_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_device_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_timer_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gpio_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/hmem_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/ibuf_ctrl_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/input_formatter_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/irq_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isp_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_dma_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_irq_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_stream2mmio_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/mmu_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/pixelgen_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/sp_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/tag_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/timed_ctrl_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/vamem_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/vmem_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/ibuf_ctrl.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/input_formatter.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/input_system.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/irq.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/isp.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_dma.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_irq.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_stream2mmio.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/math_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_realloc.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/misc_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/mmu_device.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/pixelgen.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/platform_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/print_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/queue.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/resource.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/sp.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/string_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/system_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/tag.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/timed_ctrl.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/type_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/vamem.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/vmem.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/queue_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/queue_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_shared/queue_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_shared/sw_event_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_shared/tag_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_streaming_to_mipi_types_hrt.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hive_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_vm.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hrt/hive_isp_css_custom_host_hrt.h
+ create mode 100644 drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c
+ create mode 100644 drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_3a.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_acc_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_buffer.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_control.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_device_access.c
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_device_access.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_dvs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_env.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_err.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_event_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_firmware.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_frac.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_frame_format.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_frame_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_host_data.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_input_port.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_irq.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_isp_configs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_isp_params.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_isp_states.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_memory_access.c
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_metadata.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_mipi.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_mmu.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_mmu_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_morph.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_pipe.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_pipe_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_prbs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_properties.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_shading.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_stream.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_stream_format.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_stream_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_timer.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_tpg.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_version.h
+ create mode 100644 drivers/staging/media/atomisp/pci/ia_css_version_data.h
+ create mode 100644 drivers/staging/media/atomisp/pci/if_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/input_formatter_subsystem_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/input_selector_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/input_switch_2400_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/input_system_ctrl_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/input_system_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/input_system_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/input_system_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/input_system_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/input_system_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/irq_controller_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_state.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sdis/common/ia_css_sdis_common.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sdis/common/ia_css_sdis_common_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/uds/uds_1.0/ia_css_uds_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/modes/interface/input_buf.isp.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp/modes/interface/isp_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2400_input_system_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2400_input_system_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2400_input_system_public.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2400_support.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2400_system_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2400_system_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2401_input_system_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2401_input_system_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2401_input_system_private.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2401_mamoiada_params.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2401_system_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp2401_system_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp_acquisition_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/isp_capture_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/memory_realloc.c
+ create mode 100644 drivers/staging/media/atomisp/pci/mmu/isp_mmu.c
+ create mode 100644 drivers/staging/media/atomisp/pci/mmu/sh_mmu_mrfld.c
+ create mode 100644 drivers/staging/media/atomisp/pci/mmu_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/binary/interface/ia_css_binary.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/bufq/interface/ia_css_bufq.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/bufq/interface/ia_css_bufq_comm.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug_internal.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug_pipe.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/event/interface/ia_css_event.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/event/src/event.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/eventq/interface/ia_css_eventq.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/eventq/src/eventq.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame_comm.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/ifmtr/interface/ia_css_ifmtr.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/inputfifo/interface/ia_css_inputfifo.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param_types.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/interface/ia_css_isys.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/interface/ia_css_isys_comm.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/csi_rx_rmgr.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/csi_rx_rmgr.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/isys_dma_rmgr.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/isys_dma_rmgr.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/isys_stream2mmio_rmgr.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/isys_stream2mmio_rmgr.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline_common.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/queue/interface/ia_css_queue.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/queue/interface/ia_css_queue_comm.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/queue/src/queue.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl_comm.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/tagger/interface/ia_css_tagger_common.h
+ create mode 100644 drivers/staging/media/atomisp/pci/runtime/timer/src/timer.c
+ create mode 100644 drivers/staging/media/atomisp/pci/scalar_processor_2400_params.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_dvs_info.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_firmware.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_firmware.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_frac.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_host_data.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_hrt.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_hrt.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_internal.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_legacy.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_metadata.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_metrics.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_metrics.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_mipi.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_mipi.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_mmu.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_morph.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_param_dvs.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_param_dvs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_param_shading.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_param_shading.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_params.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_params.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_params_internal.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_pipe.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_properties.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_shading.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_sp.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_sp.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_stream.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_stream_format.c
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_stream_format.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_struct.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_uds.h
+ create mode 100644 drivers/staging/media/atomisp/pci/sh_css_version.c
+ create mode 100644 drivers/staging/media/atomisp/pci/str2mem_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/streaming_to_mipi_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/system_global.h
+ create mode 100644 drivers/staging/media/atomisp/pci/system_local.h
+ create mode 100644 drivers/staging/media/atomisp/pci/timed_controller_defs.h
+ create mode 100644 drivers/staging/media/atomisp/pci/version.h
+ create mode 100644 drivers/staging/media/rkvdec/Kconfig
+ create mode 100644 drivers/staging/media/rkvdec/Makefile
+ create mode 100644 drivers/staging/media/rkvdec/TODO
+ create mode 100644 drivers/staging/media/rkvdec/rkvdec-h264.c
+ create mode 100644 drivers/staging/media/rkvdec/rkvdec-regs.h
+ create mode 100644 drivers/staging/media/rkvdec/rkvdec.c
+ create mode 100644 drivers/staging/media/rkvdec/rkvdec.h
+ rename {Documentation/media/v4l-drivers => drivers/staging/media/soc_camera}/soc-camera.rst (100%)
+ create mode 100644 include/media/v4l2-h264.h
+ create mode 100644 include/media/v4l2-jpeg.h
+Merging v4l-dvb-next/master (83fac9617e22 media: atomisp comment an unused code)
+$ git merge v4l-dvb-next/master
+Removing drivers/staging/media/atomisp/pci/sh_css_pipe.c
+Auto-merging drivers/staging/media/atomisp/pci/sh_css.c
+CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/sh_css.c
+Auto-merging drivers/staging/media/atomisp/pci/mmu/isp_mmu.c
+Removing drivers/staging/media/atomisp/pci/memory_realloc.c
+Removing drivers/staging/media/atomisp/pci/ia_css_memory_access.c
+Removing drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h
+Removing drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c
+Removing drivers/staging/media/atomisp/pci/hmm/hmm_vm.c
+Auto-merging drivers/staging/media/atomisp/pci/hmm/hmm.c
+Removing drivers/staging/media/atomisp/pci/hive_isp_css_include/system_types.h
+Removing drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_realloc.h
+Removing drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h
+Removing drivers/staging/media/atomisp/pci/hive_isp_css_include/error_support.h
+Auto-merging drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+Auto-merging drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+Auto-merging drivers/staging/media/atomisp/include/mmu/isp_mmu.h
+Removing drivers/staging/media/atomisp/include/hmm/hmm_vm.h
+Auto-merging drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+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-gc2235.c
+Auto-merging drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+Auto-merging drivers/staging/media/atomisp/TODO
+CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/TODO
+Auto-merging Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml
+Recorded preimage for 'drivers/staging/media/atomisp/TODO'
+Recorded preimage for 'drivers/staging/media/atomisp/i2c/atomisp-gc0310.c'
+Recorded preimage for 'drivers/staging/media/atomisp/pci/atomisp_compat_css20.c'
+Recorded preimage for 'drivers/staging/media/atomisp/pci/atomisp_v4l2.c'
+Recorded preimage for 'drivers/staging/media/atomisp/pci/sh_css.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/staging/media/atomisp/TODO'.
+Recorded resolution for 'drivers/staging/media/atomisp/i2c/atomisp-gc0310.c'.
+Recorded resolution for 'drivers/staging/media/atomisp/pci/atomisp_compat_css20.c'.
+Recorded resolution for 'drivers/staging/media/atomisp/pci/atomisp_v4l2.c'.
+Recorded resolution for 'drivers/staging/media/atomisp/pci/sh_css.c'.
+[master e15d9520e7f7] Merge remote-tracking branch 'v4l-dvb-next/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/staging/media/atomisp/Kconfig | 2 +
+ drivers/staging/media/atomisp/Makefile | 20 +-
+ drivers/staging/media/atomisp/TODO | 196 ++-
+ drivers/staging/media/atomisp/i2c/Kconfig | 3 +-
+ drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 2 +-
+ drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 1 +
+ .../media/atomisp/i2c/atomisp-libmsrlisthelper.c | 1 +
+ drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 1 +
+ .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 1 +
+ drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 3 +-
+ drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 1 +
+ drivers/staging/media/atomisp/i2c/gc0310.h | 1 +
+ drivers/staging/media/atomisp/i2c/gc2235.h | 1 +
+ drivers/staging/media/atomisp/i2c/mt9m114.h | 1 +
+ drivers/staging/media/atomisp/i2c/ov2680.h | 3 +
+ drivers/staging/media/atomisp/i2c/ov2722.h | 1 +
+ drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 1 +
+ drivers/staging/media/atomisp/i2c/ov5693/ad5823.h | 1 +
+ .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 5 +-
+ drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 1 +
+ drivers/staging/media/atomisp/include/hmm/hmm.h | 8 +-
+ drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 12 +-
+ .../staging/media/atomisp/include/hmm/hmm_common.h | 1 +
+ .../staging/media/atomisp/include/hmm/hmm_pool.h | 1 +
+ drivers/staging/media/atomisp/include/hmm/hmm_vm.h | 65 -
+ .../staging/media/atomisp/include/linux/atomisp.h | 5 +-
+ .../atomisp/include/linux/atomisp_gmin_platform.h | 1 +
+ .../media/atomisp/include/linux/atomisp_platform.h | 1 +
+ .../media/atomisp/include/linux/libmsrlisthelper.h | 1 +
+ .../staging/media/atomisp/include/media/lm3554.h | 1 +
+ .../staging/media/atomisp/include/mmu/isp_mmu.h | 1 +
+ .../media/atomisp/include/mmu/sh_mmu_mrfld.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp-regs.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_acc.c | 44 +-
+ drivers/staging/media/atomisp/pci/atomisp_acc.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_cmd.c | 724 ++++----
+ drivers/staging/media/atomisp/pci/atomisp_cmd.h | 13 +-
+ drivers/staging/media/atomisp/pci/atomisp_common.h | 3 +-
+ drivers/staging/media/atomisp/pci/atomisp_compat.h | 280 +--
+ .../media/atomisp/pci/atomisp_compat_css20.c | 765 +++------
+ .../media/atomisp/pci/atomisp_compat_css20.h | 148 +-
+ .../media/atomisp/pci/atomisp_compat_ioctl32.c | 90 +-
+ .../media/atomisp/pci/atomisp_compat_ioctl32.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_csi2.c | 5 +-
+ drivers/staging/media/atomisp/pci/atomisp_csi2.h | 1 +
+ .../staging/media/atomisp/pci/atomisp_dfs_tables.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_drvfs.c | 6 +-
+ drivers/staging/media/atomisp/pci/atomisp_drvfs.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_file.c | 8 +-
+ drivers/staging/media/atomisp/pci/atomisp_file.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_fops.c | 123 +-
+ drivers/staging/media/atomisp/pci/atomisp_fops.h | 5 +-
+ .../media/atomisp/pci/atomisp_gmin_platform.c | 6 +-
+ drivers/staging/media/atomisp/pci/atomisp_helper.h | 1 +
+ .../staging/media/atomisp/pci/atomisp_internal.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 170 +-
+ drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 3 +-
+ drivers/staging/media/atomisp/pci/atomisp_subdev.c | 53 +-
+ drivers/staging/media/atomisp/pci/atomisp_subdev.h | 24 +-
+ drivers/staging/media/atomisp/pci/atomisp_tables.h | 19 +-
+ drivers/staging/media/atomisp/pci/atomisp_tpg.c | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_tpg.h | 1 +
+ .../media/atomisp/pci/atomisp_trace_event.h | 1 +
+ drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 97 +-
+ drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 1 +
+ .../pci/base/circbuf/interface/ia_css_circbuf.h | 1 +
+ .../base/circbuf/interface/ia_css_circbuf_comm.h | 1 +
+ .../base/circbuf/interface/ia_css_circbuf_desc.h | 1 +
+ .../media/atomisp/pci/base/circbuf/src/circbuf.c | 1 +
+ .../pci/base/refcount/interface/ia_css_refcount.h | 18 +-
+ .../media/atomisp/pci/base/refcount/src/refcount.c | 36 +-
+ drivers/staging/media/atomisp/pci/bits.h | 1 +
+ .../camera/pipe/interface/ia_css_pipe_binarydesc.h | 17 +-
+ .../camera/pipe/interface/ia_css_pipe_stagedesc.h | 1 +
+ .../pci/camera/pipe/interface/ia_css_pipe_util.h | 1 +
+ .../atomisp/pci/camera/pipe/src/pipe_binarydesc.c | 29 +-
+ .../atomisp/pci/camera/pipe/src/pipe_stagedesc.c | 1 +
+ .../media/atomisp/pci/camera/pipe/src/pipe_util.c | 1 +
+ .../pci/camera/util/interface/ia_css_util.h | 22 +-
+ .../media/atomisp/pci/camera/util/src/util.c | 68 +-
+ drivers/staging/media/atomisp/pci/cell_params.h | 1 +
+ .../pci/css_2400_system/hive/ia_css_isp_configs.c | 1 +
+ .../pci/css_2400_system/hive/ia_css_isp_params.c | 1 +
+ .../pci/css_2400_system/hive/ia_css_isp_states.c | 3 +-
+ .../hrt/hive_isp_css_irq_types_hrt.h | 1 +
+ .../css_2400_system/hrt/isp2400_mamoiada_params.h | 1 +
+ .../atomisp/pci/css_2401_system/csi_rx_global.h | 1 +
+ .../pci/css_2401_system/hive/ia_css_isp_configs.c | 2 +-
+ .../pci/css_2401_system/hive/ia_css_isp_params.c | 1 +
+ .../pci/css_2401_system/hive/ia_css_isp_states.c | 3 +-
+ .../atomisp/pci/css_2401_system/host/csi_rx.c | 1 +
+ .../pci/css_2401_system/host/csi_rx_local.h | 1 +
+ .../pci/css_2401_system/host/csi_rx_private.h | 5 +-
+ .../atomisp/pci/css_2401_system/host/ibuf_ctrl.c | 1 +
+ .../pci/css_2401_system/host/ibuf_ctrl_local.h | 1 +
+ .../pci/css_2401_system/host/ibuf_ctrl_private.h | 1 +
+ .../atomisp/pci/css_2401_system/host/isys_dma.c | 1 +
+ .../pci/css_2401_system/host/isys_dma_local.h | 1 +
+ .../pci/css_2401_system/host/isys_dma_private.h | 1 +
+ .../atomisp/pci/css_2401_system/host/isys_irq.c | 1 +
+ .../pci/css_2401_system/host/isys_irq_local.h | 1 +
+ .../pci/css_2401_system/host/isys_irq_private.h | 1 +
+ .../pci/css_2401_system/host/isys_stream2mmio.c | 1 +
+ .../css_2401_system/host/isys_stream2mmio_local.h | 1 +
+ .../host/isys_stream2mmio_private.h | 1 +
+ .../pci/css_2401_system/host/pixelgen_local.h | 1 +
+ .../pci/css_2401_system/host/pixelgen_private.h | 5 +-
+ .../css_2401_system/hrt/PixelGen_SysBlock_defs.h | 1 +
+ .../pci/css_2401_system/hrt/ibuf_cntrl_defs.h | 1 +
+ .../css_2401_system/hrt/mipi_backend_common_defs.h | 1 +
+ .../pci/css_2401_system/hrt/mipi_backend_defs.h | 1 +
+ .../atomisp/pci/css_2401_system/hrt/rx_csi_defs.h | 1 +
+ .../pci/css_2401_system/hrt/stream2mmio_defs.h | 1 +
+ .../atomisp/pci/css_2401_system/ibuf_ctrl_global.h | 1 +
+ .../atomisp/pci/css_2401_system/isys_dma_global.h | 2 +
+ .../atomisp/pci/css_2401_system/isys_irq_global.h | 1 +
+ .../pci/css_2401_system/isys_stream2mmio_global.h | 1 +
+ .../atomisp/pci/css_2401_system/pixelgen_global.h | 1 +
+ .../atomisp/pci/css_receiver_2400_common_defs.h | 1 +
+ .../media/atomisp/pci/css_receiver_2400_defs.h | 1 +
+ drivers/staging/media/atomisp/pci/css_trace.h | 2 +-
+ drivers/staging/media/atomisp/pci/defs.h | 1 +
+ drivers/staging/media/atomisp/pci/dma_v2_defs.h | 1 +
+ drivers/staging/media/atomisp/pci/gdc_v2_defs.h | 1 +
+ drivers/staging/media/atomisp/pci/gp_timer_defs.h | 1 +
+ .../staging/media/atomisp/pci/gpio_block_defs.h | 1 +
+ .../atomisp/pci/hive_isp_css_2401_irq_types_hrt.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/debug_global.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/dma_global.h | 1 +
+ .../pci/hive_isp_css_common/event_fifo_global.h | 1 +
+ .../pci/hive_isp_css_common/fifo_monitor_global.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/gdc_global.h | 1 +
+ .../pci/hive_isp_css_common/gp_device_global.h | 1 +
+ .../pci/hive_isp_css_common/gp_timer_global.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/gpio_global.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/hmem_global.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/host/debug.c | 17 +-
+ .../pci/hive_isp_css_common/host/debug_local.h | 1 +
+ .../pci/hive_isp_css_common/host/debug_private.h | 11 +-
+ .../atomisp/pci/hive_isp_css_common/host/dma.c | 1 +
+ .../pci/hive_isp_css_common/host/dma_local.h | 1 +
+ .../pci/hive_isp_css_common/host/dma_private.h | 1 +
+ .../pci/hive_isp_css_common/host/event_fifo.c | 1 +
+ .../hive_isp_css_common/host/event_fifo_local.h | 1 +
+ .../hive_isp_css_common/host/event_fifo_private.h | 1 +
+ .../pci/hive_isp_css_common/host/fifo_monitor.c | 1 +
+ .../hive_isp_css_common/host/fifo_monitor_local.h | 1 +
+ .../host/fifo_monitor_private.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/host/gdc.c | 1 +
+ .../pci/hive_isp_css_common/host/gdc_local.h | 1 +
+ .../pci/hive_isp_css_common/host/gdc_private.h | 1 +
+ .../pci/hive_isp_css_common/host/gp_device.c | 1 +
+ .../pci/hive_isp_css_common/host/gp_device_local.h | 1 +
+ .../hive_isp_css_common/host/gp_device_private.h | 1 +
+ .../pci/hive_isp_css_common/host/gp_timer.c | 1 +
+ .../pci/hive_isp_css_common/host/gp_timer_local.h | 1 +
+ .../hive_isp_css_common/host/gp_timer_private.h | 1 +
+ .../pci/hive_isp_css_common/host/gpio_local.h | 1 +
+ .../pci/hive_isp_css_common/host/gpio_private.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/host/hmem.c | 1 +
+ .../pci/hive_isp_css_common/host/hmem_local.h | 1 +
+ .../pci/hive_isp_css_common/host/hmem_private.h | 1 +
+ .../pci/hive_isp_css_common/host/input_formatter.c | 1 +
+ .../host/input_formatter_local.h | 1 +
+ .../host/input_formatter_private.h | 1 +
+ .../pci/hive_isp_css_common/host/input_system.c | 11 +-
+ .../atomisp/pci/hive_isp_css_common/host/irq.c | 1 +
+ .../pci/hive_isp_css_common/host/irq_local.h | 1 +
+ .../pci/hive_isp_css_common/host/irq_private.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/host/isp.c | 1 +
+ .../pci/hive_isp_css_common/host/isp_local.h | 1 +
+ .../pci/hive_isp_css_common/host/isp_private.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/host/mmu.c | 1 +
+ .../pci/hive_isp_css_common/host/mmu_local.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/host/sp.c | 1 +
+ .../pci/hive_isp_css_common/host/sp_local.h | 1 +
+ .../pci/hive_isp_css_common/host/sp_private.h | 1 +
+ .../pci/hive_isp_css_common/host/timed_ctrl.c | 1 +
+ .../hive_isp_css_common/host/timed_ctrl_local.h | 1 +
+ .../hive_isp_css_common/host/timed_ctrl_private.h | 1 +
+ .../pci/hive_isp_css_common/host/vamem_local.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/host/vmem.c | 1 +
+ .../pci/hive_isp_css_common/host/vmem_local.h | 1 +
+ .../pci/hive_isp_css_common/host/vmem_private.h | 1 +
+ .../hive_isp_css_common/input_formatter_global.h | 3 +-
+ .../atomisp/pci/hive_isp_css_common/irq_global.h | 3 +-
+ .../atomisp/pci/hive_isp_css_common/isp_global.h | 3 +-
+ .../atomisp/pci/hive_isp_css_common/mmu_global.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/sp_global.h | 3 +-
+ .../pci/hive_isp_css_common/timed_ctrl_global.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/vamem_global.h | 1 +
+ .../atomisp/pci/hive_isp_css_common/vmem_global.h | 1 +
+ .../staging/media/atomisp/pci/hive_isp_css_defs.h | 1 +
+ .../pci/hive_isp_css_include/assert_support.h | 1 +
+ .../pci/hive_isp_css_include/bitop_support.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/csi_rx.h | 1 +
+ .../media/atomisp/pci/hive_isp_css_include/debug.h | 1 +
+ .../device_access/device_access.h | 3 +-
+ .../media/atomisp/pci/hive_isp_css_include/dma.h | 1 +
+ .../pci/hive_isp_css_include/error_support.h | 39 -
+ .../atomisp/pci/hive_isp_css_include/event_fifo.h | 1 +
+ .../pci/hive_isp_css_include/fifo_monitor.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/gdc_device.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/gp_device.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/gp_timer.h | 1 +
+ .../media/atomisp/pci/hive_isp_css_include/gpio.h | 1 +
+ .../media/atomisp/pci/hive_isp_css_include/hmem.h | 1 +
+ .../pci/hive_isp_css_include/host/csi_rx_public.h | 1 +
+ .../pci/hive_isp_css_include/host/debug_public.h | 8 +-
+ .../pci/hive_isp_css_include/host/dma_public.h | 3 +-
+ .../hive_isp_css_include/host/event_fifo_public.h | 3 +-
+ .../host/fifo_monitor_public.h | 3 +-
+ .../pci/hive_isp_css_include/host/gdc_public.h | 1 +
+ .../hive_isp_css_include/host/gp_device_public.h | 3 +-
+ .../hive_isp_css_include/host/gp_timer_public.h | 3 +-
+ .../pci/hive_isp_css_include/host/gpio_public.h | 3 +-
+ .../pci/hive_isp_css_include/host/hmem_public.h | 1 +
+ .../hive_isp_css_include/host/ibuf_ctrl_public.h | 1 +
+ .../host/input_formatter_public.h | 3 +-
+ .../pci/hive_isp_css_include/host/irq_public.h | 3 +-
+ .../pci/hive_isp_css_include/host/isp_public.h | 3 +-
+ .../hive_isp_css_include/host/isys_dma_public.h | 3 +-
+ .../hive_isp_css_include/host/isys_irq_public.h | 1 +
+ .../pci/hive_isp_css_include/host/isys_public.h | 1 +
+ .../host/isys_stream2mmio_public.h | 1 +
+ .../pci/hive_isp_css_include/host/mmu_public.h | 3 +-
+ .../hive_isp_css_include/host/pixelgen_public.h | 1 +
+ .../pci/hive_isp_css_include/host/sp_public.h | 3 +-
+ .../pci/hive_isp_css_include/host/tag_public.h | 1 +
+ .../hive_isp_css_include/host/timed_ctrl_public.h | 3 +-
+ .../pci/hive_isp_css_include/host/vamem_public.h | 1 +
+ .../pci/hive_isp_css_include/host/vmem_public.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/ibuf_ctrl.h | 1 +
+ .../pci/hive_isp_css_include/input_formatter.h | 1 +
+ .../pci/hive_isp_css_include/input_system.h | 1 +
+ .../media/atomisp/pci/hive_isp_css_include/irq.h | 1 +
+ .../media/atomisp/pci/hive_isp_css_include/isp.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/isys_dma.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/isys_irq.h | 1 +
+ .../pci/hive_isp_css_include/isys_stream2mmio.h | 1 +
+ .../pci/hive_isp_css_include/math_support.h | 1 +
+ .../memory_access/memory_access.h | 174 --
+ .../pci/hive_isp_css_include/memory_realloc.h | 38 -
+ .../pci/hive_isp_css_include/misc_support.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/mmu_device.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/pixelgen.h | 1 +
+ .../pci/hive_isp_css_include/platform_support.h | 1 +
+ .../pci/hive_isp_css_include/print_support.h | 1 +
+ .../media/atomisp/pci/hive_isp_css_include/queue.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/resource.h | 1 +
+ .../media/atomisp/pci/hive_isp_css_include/sp.h | 1 +
+ .../pci/hive_isp_css_include/string_support.h | 18 +-
+ .../pci/hive_isp_css_include/system_types.h | 24 -
+ .../media/atomisp/pci/hive_isp_css_include/tag.h | 1 +
+ .../atomisp/pci/hive_isp_css_include/timed_ctrl.h | 1 +
+ .../pci/hive_isp_css_include/type_support.h | 1 +
+ .../media/atomisp/pci/hive_isp_css_include/vamem.h | 1 +
+ .../media/atomisp/pci/hive_isp_css_include/vmem.h | 1 +
+ .../pci/hive_isp_css_shared/host/queue_local.h | 1 +
+ .../pci/hive_isp_css_shared/host/queue_private.h | 1 +
+ .../atomisp/pci/hive_isp_css_shared/host/tag.c | 1 +
+ .../pci/hive_isp_css_shared/host/tag_local.h | 1 +
+ .../pci/hive_isp_css_shared/host/tag_private.h | 1 +
+ .../atomisp/pci/hive_isp_css_shared/queue_global.h | 1 +
+ .../pci/hive_isp_css_shared/sw_event_global.h | 1 +
+ .../atomisp/pci/hive_isp_css_shared/tag_global.h | 1 +
+ .../pci/hive_isp_css_streaming_to_mipi_types_hrt.h | 1 +
+ drivers/staging/media/atomisp/pci/hive_types.h | 4 +-
+ drivers/staging/media/atomisp/pci/hmm/hmm.c | 40 +-
+ drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 152 +-
+ .../media/atomisp/pci/hmm/hmm_dynamic_pool.c | 1 +
+ .../media/atomisp/pci/hmm/hmm_reserved_pool.c | 1 +
+ drivers/staging/media/atomisp/pci/hmm/hmm_vm.c | 212 ---
+ .../atomisp/pci/hrt/hive_isp_css_custom_host_hrt.h | 1 +
+ .../media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c | 124 --
+ .../media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h | 57 -
+ drivers/staging/media/atomisp/pci/ia_css.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_3a.h | 3 +-
+ .../staging/media/atomisp/pci/ia_css_acc_types.h | 7 +-
+ drivers/staging/media/atomisp/pci/ia_css_buffer.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_control.h | 17 +-
+ .../media/atomisp/pci/ia_css_device_access.c | 3 +-
+ .../media/atomisp/pci/ia_css_device_access.h | 3 +-
+ drivers/staging/media/atomisp/pci/ia_css_dvs.h | 5 +-
+ drivers/staging/media/atomisp/pci/ia_css_env.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_err.h | 22 +-
+ .../media/atomisp/pci/ia_css_event_public.h | 19 +-
+ .../staging/media/atomisp/pci/ia_css_firmware.h | 7 +-
+ drivers/staging/media/atomisp/pci/ia_css_frac.h | 1 +
+ .../media/atomisp/pci/ia_css_frame_format.h | 1 +
+ .../media/atomisp/pci/ia_css_frame_public.h | 23 +-
+ .../staging/media/atomisp/pci/ia_css_host_data.h | 1 +
+ .../staging/media/atomisp/pci/ia_css_input_port.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_irq.h | 14 +-
+ .../staging/media/atomisp/pci/ia_css_isp_configs.h | 1 +
+ .../staging/media/atomisp/pci/ia_css_isp_params.h | 1 +
+ .../staging/media/atomisp/pci/ia_css_isp_states.h | 3 +-
+ .../media/atomisp/pci/ia_css_memory_access.c | 85 -
+ .../staging/media/atomisp/pci/ia_css_metadata.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_mipi.h | 7 +-
+ drivers/staging/media/atomisp/pci/ia_css_mmu.h | 1 +
+ .../staging/media/atomisp/pci/ia_css_mmu_private.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_morph.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_pipe.h | 22 +-
+ .../staging/media/atomisp/pci/ia_css_pipe_public.h | 79 +-
+ drivers/staging/media/atomisp/pci/ia_css_prbs.h | 1 +
+ .../staging/media/atomisp/pci/ia_css_properties.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_shading.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_stream.h | 3 +-
+ .../media/atomisp/pci/ia_css_stream_format.h | 1 +
+ .../media/atomisp/pci/ia_css_stream_public.h | 71 +-
+ drivers/staging/media/atomisp/pci/ia_css_timer.h | 5 +-
+ drivers/staging/media/atomisp/pci/ia_css_tpg.h | 1 +
+ drivers/staging/media/atomisp/pci/ia_css_types.h | 8 +-
+ drivers/staging/media/atomisp/pci/ia_css_version.h | 3 +-
+ .../media/atomisp/pci/ia_css_version_data.h | 1 +
+ drivers/staging/media/atomisp/pci/if_defs.h | 1 +
+ .../atomisp/pci/input_formatter_subsystem_defs.h | 1 +
+ .../media/atomisp/pci/input_selector_defs.h | 1 +
+ .../media/atomisp/pci/input_switch_2400_defs.h | 1 +
+ .../media/atomisp/pci/input_system_ctrl_defs.h | 1 +
+ .../staging/media/atomisp/pci/input_system_defs.h | 1 +
+ .../media/atomisp/pci/input_system_global.h | 1 +
+ .../staging/media/atomisp/pci/input_system_local.h | 1 +
+ .../media/atomisp/pci/input_system_private.h | 1 +
+ .../media/atomisp/pci/input_system_public.h | 1 +
+ .../media/atomisp/pci/irq_controller_defs.h | 1 +
+ .../pci/isp/kernels/aa/aa_2/ia_css_aa2.host.c | 1 +
+ .../pci/isp/kernels/aa/aa_2/ia_css_aa2.host.h | 1 +
+ .../pci/isp/kernels/aa/aa_2/ia_css_aa2_param.h | 1 +
+ .../pci/isp/kernels/aa/aa_2/ia_css_aa2_types.h | 1 +
+ .../pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.c | 1 +
+ .../pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.h | 1 +
+ .../pci/isp/kernels/anr/anr_1.0/ia_css_anr_param.h | 1 +
+ .../pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 1 +
+ .../pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c | 1 +
+ .../pci/isp/kernels/anr/anr_2/ia_css_anr2.host.h | 1 +
+ .../pci/isp/kernels/anr/anr_2/ia_css_anr2_param.h | 3 +-
+ .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.c | 1 +
+ .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.h | 1 +
+ .../pci/isp/kernels/anr/anr_2/ia_css_anr2_types.h | 1 +
+ .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.c | 2 +-
+ .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.h | 1 +
+ .../pci/isp/kernels/bh/bh_2/ia_css_bh_param.h | 1 +
+ .../pci/isp/kernels/bh/bh_2/ia_css_bh_types.h | 1 +
+ .../pci/isp/kernels/bnlm/ia_css_bnlm.host.c | 3 +-
+ .../pci/isp/kernels/bnlm/ia_css_bnlm.host.h | 1 +
+ .../pci/isp/kernels/bnlm/ia_css_bnlm_param.h | 1 +
+ .../pci/isp/kernels/bnlm/ia_css_bnlm_types.h | 1 +
+ .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c | 1 +
+ .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h | 1 +
+ .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h | 1 +
+ .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h | 1 +
+ .../pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c | 1 +
+ .../pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h | 1 +
+ .../pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h | 1 +
+ .../pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c | 1 +
+ .../pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h | 1 +
+ .../pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h | 1 +
+ .../pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c | 1 +
+ .../pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h | 1 +
+ .../pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h | 1 +
+ .../pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h | 1 +
+ .../conversion_1.0/ia_css_conversion.host.c | 1 +
+ .../conversion_1.0/ia_css_conversion.host.h | 1 +
+ .../conversion_1.0/ia_css_conversion_param.h | 1 +
+ .../conversion_1.0/ia_css_conversion_types.h | 1 +
+ .../copy_output_1.0/ia_css_copy_output.host.c | 1 +
+ .../copy_output_1.0/ia_css_copy_output.host.h | 1 +
+ .../copy_output_1.0/ia_css_copy_output_param.h | 1 +
+ .../isp/kernels/crop/crop_1.0/ia_css_crop.host.c | 1 +
+ .../isp/kernels/crop/crop_1.0/ia_css_crop.host.h | 1 +
+ .../isp/kernels/crop/crop_1.0/ia_css_crop_param.h | 1 +
+ .../isp/kernels/crop/crop_1.0/ia_css_crop_types.h | 1 +
+ .../pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.c | 1 +
+ .../pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.h | 1 +
+ .../pci/isp/kernels/csc/csc_1.0/ia_css_csc_param.h | 1 +
+ .../pci/isp/kernels/csc/csc_1.0/ia_css_csc_types.h | 1 +
+ .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c | 1 +
+ .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h | 1 +
+ .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h | 1 +
+ .../pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c | 1 +
+ .../pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h | 1 +
+ .../pci/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h | 1 +
+ .../pci/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h | 1 +
+ .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c | 1 +
+ .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h | 1 +
+ .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h | 1 +
+ .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c | 1 +
+ .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h | 1 +
+ .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h | 1 +
+ .../pci/isp/kernels/de/de_1.0/ia_css_de.host.c | 1 +
+ .../pci/isp/kernels/de/de_1.0/ia_css_de.host.h | 1 +
+ .../pci/isp/kernels/de/de_1.0/ia_css_de_param.h | 1 +
+ .../pci/isp/kernels/de/de_1.0/ia_css_de_types.h | 1 +
+ .../pci/isp/kernels/de/de_2/ia_css_de2.host.c | 1 +
+ .../pci/isp/kernels/de/de_2/ia_css_de2.host.h | 1 +
+ .../pci/isp/kernels/de/de_2/ia_css_de2_param.h | 1 +
+ .../pci/isp/kernels/de/de_2/ia_css_de2_types.h | 1 +
+ .../pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.c | 1 +
+ .../pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.h | 1 +
+ .../pci/isp/kernels/dp/dp_1.0/ia_css_dp_param.h | 1 +
+ .../pci/isp/kernels/dp/dp_1.0/ia_css_dp_types.h | 1 +
+ .../pci/isp/kernels/dpc2/ia_css_dpc2.host.c | 1 +
+ .../pci/isp/kernels/dpc2/ia_css_dpc2.host.h | 1 +
+ .../pci/isp/kernels/dpc2/ia_css_dpc2_param.h | 1 +
+ .../pci/isp/kernels/dpc2/ia_css_dpc2_types.h | 1 +
+ .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 14 +-
+ .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 5 +-
+ .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h | 1 +
+ .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h | 1 +
+ .../pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c | 1 +
+ .../pci/isp/kernels/eed1_8/ia_css_eed1_8.host.h | 1 +
+ .../pci/isp/kernels/eed1_8/ia_css_eed1_8_param.h | 1 +
+ .../pci/isp/kernels/eed1_8/ia_css_eed1_8_types.h | 1 +
+ .../isp/kernels/fc/fc_1.0/ia_css_formats.host.c | 1 +
+ .../isp/kernels/fc/fc_1.0/ia_css_formats.host.h | 1 +
+ .../isp/kernels/fc/fc_1.0/ia_css_formats_param.h | 1 +
+ .../isp/kernels/fc/fc_1.0/ia_css_formats_types.h | 1 +
+ .../fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h | 1 +
+ .../fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h | 1 +
+ .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 1 +
+ .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h | 1 +
+ .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h | 1 +
+ .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h | 1 +
+ .../pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.c | 1 +
+ .../pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.h | 1 +
+ .../pci/isp/kernels/gc/gc_1.0/ia_css_gc_param.h | 1 +
+ .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c | 1 +
+ .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h | 1 +
+ .../pci/isp/kernels/gc/gc_1.0/ia_css_gc_types.h | 1 +
+ .../pci/isp/kernels/gc/gc_2/ia_css_gc2.host.c | 1 +
+ .../pci/isp/kernels/gc/gc_2/ia_css_gc2.host.h | 1 +
+ .../pci/isp/kernels/gc/gc_2/ia_css_gc2_param.h | 1 +
+ .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.c | 1 +
+ .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.h | 1 +
+ .../pci/isp/kernels/gc/gc_2/ia_css_gc2_types.h | 1 +
+ .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c | 1 +
+ .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h | 1 +
+ .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h | 1 +
+ .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h | 1 +
+ .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 1 +
+ .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 1 +
+ .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 1 +
+ .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 1 +
+ .../ipu2_io_ls/common/ia_css_common_io_param.h | 1 +
+ .../ipu2_io_ls/common/ia_css_common_io_types.h | 1 +
+ .../yuv444_io_ls/ia_css_yuv444_io.host.c | 1 +
+ .../yuv444_io_ls/ia_css_yuv444_io.host.h | 1 +
+ .../yuv444_io_ls/ia_css_yuv444_io_param.h | 1 +
+ .../yuv444_io_ls/ia_css_yuv444_io_types.h | 1 +
+ .../iterator/iterator_1.0/ia_css_iterator.host.c | 5 +-
+ .../iterator/iterator_1.0/ia_css_iterator.host.h | 3 +-
+ .../iterator/iterator_1.0/ia_css_iterator_param.h | 1 +
+ .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c | 1 +
+ .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h | 1 +
+ .../kernels/macc/macc1_5/ia_css_macc1_5_param.h | 3 +-
+ .../macc/macc1_5/ia_css_macc1_5_table.host.c | 1 +
+ .../macc/macc1_5/ia_css_macc1_5_table.host.h | 1 +
+ .../kernels/macc/macc1_5/ia_css_macc1_5_types.h | 1 +
+ .../isp/kernels/macc/macc_1.0/ia_css_macc.host.c | 1 +
+ .../isp/kernels/macc/macc_1.0/ia_css_macc.host.h | 1 +
+ .../isp/kernels/macc/macc_1.0/ia_css_macc_param.h | 1 +
+ .../kernels/macc/macc_1.0/ia_css_macc_table.host.c | 1 +
+ .../kernels/macc/macc_1.0/ia_css_macc_table.host.h | 1 +
+ .../isp/kernels/macc/macc_1.0/ia_css_macc_types.h | 1 +
+ .../isp/kernels/norm/norm_1.0/ia_css_norm.host.c | 1 +
+ .../isp/kernels/norm/norm_1.0/ia_css_norm.host.h | 1 +
+ .../isp/kernels/norm/norm_1.0/ia_css_norm_param.h | 1 +
+ .../pci/isp/kernels/ob/ob2/ia_css_ob2.host.c | 1 +
+ .../pci/isp/kernels/ob/ob2/ia_css_ob2.host.h | 1 +
+ .../pci/isp/kernels/ob/ob2/ia_css_ob2_param.h | 1 +
+ .../pci/isp/kernels/ob/ob2/ia_css_ob2_types.h | 1 +
+ .../pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.c | 1 +
+ .../pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.h | 1 +
+ .../pci/isp/kernels/ob/ob_1.0/ia_css_ob_param.h | 1 +
+ .../pci/isp/kernels/ob/ob_1.0/ia_css_ob_types.h | 1 +
+ .../kernels/output/output_1.0/ia_css_output.host.c | 1 +
+ .../kernels/output/output_1.0/ia_css_output.host.h | 1 +
+ .../output/output_1.0/ia_css_output_param.h | 1 +
+ .../output/output_1.0/ia_css_output_types.h | 1 +
+ .../kernels/qplane/qplane_2/ia_css_qplane.host.c | 1 +
+ .../kernels/qplane/qplane_2/ia_css_qplane.host.h | 1 +
+ .../kernels/qplane/qplane_2/ia_css_qplane_param.h | 1 +
+ .../kernels/qplane/qplane_2/ia_css_qplane_types.h | 1 +
+ .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 1 +
+ .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h | 1 +
+ .../pci/isp/kernels/raw/raw_1.0/ia_css_raw_param.h | 1 +
+ .../pci/isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 1 +
+ .../raw_aa_binning_1.0/ia_css_raa.host.c | 2 +-
+ .../raw_aa_binning_1.0/ia_css_raa.host.h | 1 +
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 16 +-
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h | 3 +-
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref_param.h | 5 +-
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref_state.h | 1 +
+ .../pci/isp/kernels/ref/ref_1.0/ia_css_ref_types.h | 1 +
+ .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 1 +
+ .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h | 1 +
+ .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h | 1 +
+ .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 1 +
+ .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c | 1 +
+ .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 1 +
+ .../pci/isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 1 +
+ .../pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 1 +
+ .../kernels/sdis/common/ia_css_sdis_common.host.h | 5 +-
+ .../kernels/sdis/common/ia_css_sdis_common_types.h | 10 +-
+ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 28 +-
+ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h | 3 +-
+ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h | 1 +
+ .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 18 +-
+ .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h | 3 +-
+ .../isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h | 1 +
+ .../pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 1 +
+ .../pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 1 +
+ .../pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h | 1 +
+ .../pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h | 1 +
+ .../pci/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 1 +
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 3 +-
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h | 3 +-
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 3 +-
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h | 1 +
+ .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h | 1 +
+ .../pci/isp/kernels/uds/uds_1.0/ia_css_uds_param.h | 1 +
+ .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 25 +-
+ .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 5 +-
+ .../pci/isp/kernels/vf/vf_1.0/ia_css_vf_param.h | 1 +
+ .../pci/isp/kernels/vf/vf_1.0/ia_css_vf_types.h | 1 +
+ .../pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.c | 1 +
+ .../pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.h | 1 +
+ .../pci/isp/kernels/wb/wb_1.0/ia_css_wb_param.h | 1 +
+ .../pci/isp/kernels/wb/wb_1.0/ia_css_wb_types.h | 1 +
+ .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c | 1 +
+ .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h | 1 +
+ .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 1 +
+ .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c | 1 +
+ .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h | 1 +
+ .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h | 1 +
+ .../pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c | 3 +-
+ .../pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h | 1 +
+ .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h | 1 +
+ .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 1 +
+ .../pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c | 1 +
+ .../pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h | 1 +
+ .../pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h | 1 +
+ .../pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h | 1 +
+ .../pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c | 1 +
+ .../pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h | 1 +
+ .../pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h | 1 +
+ .../pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h | 1 +
+ .../pci/isp/modes/interface/input_buf.isp.h | 1 +
+ .../atomisp/pci/isp/modes/interface/isp_const.h | 1 +
+ .../atomisp/pci/isp/modes/interface/isp_types.h | 1 +
+ .../atomisp/pci/isp2400_input_system_global.h | 1 +
+ .../media/atomisp/pci/isp2400_input_system_local.h | 1 +
+ .../atomisp/pci/isp2400_input_system_private.h | 1 +
+ .../atomisp/pci/isp2400_input_system_public.h | 1 +
+ .../staging/media/atomisp/pci/isp2400_support.h | 1 +
+ .../media/atomisp/pci/isp2400_system_global.h | 1 +
+ .../media/atomisp/pci/isp2400_system_local.h | 6 +
+ .../atomisp/pci/isp2401_input_system_global.h | 1 +
+ .../media/atomisp/pci/isp2401_input_system_local.h | 1 +
+ .../atomisp/pci/isp2401_input_system_private.h | 1 +
+ .../media/atomisp/pci/isp2401_mamoiada_params.h | 1 +
+ .../media/atomisp/pci/isp2401_system_global.h | 1 +
+ .../media/atomisp/pci/isp2401_system_local.h | 6 +
+ .../media/atomisp/pci/isp_acquisition_defs.h | 1 +
+ .../staging/media/atomisp/pci/isp_capture_defs.h | 1 +
+ drivers/staging/media/atomisp/pci/memory_realloc.c | 81 -
+ drivers/staging/media/atomisp/pci/mmu/isp_mmu.c | 1 +
+ .../staging/media/atomisp/pci/mmu/sh_mmu_mrfld.c | 4 +-
+ drivers/staging/media/atomisp/pci/mmu_defs.h | 1 +
+ .../pci/runtime/binary/interface/ia_css_binary.h | 18 +-
+ .../media/atomisp/pci/runtime/binary/src/binary.c | 137 +-
+ .../pci/runtime/bufq/interface/ia_css_bufq.h | 33 +-
+ .../pci/runtime/bufq/interface/ia_css_bufq_comm.h | 1 +
+ .../media/atomisp/pci/runtime/bufq/src/bufq.c | 92 +-
+ .../pci/runtime/debug/interface/ia_css_debug.h | 10 +-
+ .../debug/interface/ia_css_debug_internal.h | 1 +
+ .../runtime/debug/interface/ia_css_debug_pipe.h | 1 +
+ .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 15 +-
+ .../pci/runtime/event/interface/ia_css_event.h | 1 +
+ .../media/atomisp/pci/runtime/event/src/event.c | 3 +-
+ .../pci/runtime/eventq/interface/ia_css_eventq.h | 9 +-
+ .../media/atomisp/pci/runtime/eventq/src/eventq.c | 5 +-
+ .../pci/runtime/frame/interface/ia_css_frame.h | 11 +-
+ .../runtime/frame/interface/ia_css_frame_comm.h | 5 +-
+ .../media/atomisp/pci/runtime/frame/src/frame.c | 154 +-
+ .../pci/runtime/ifmtr/interface/ia_css_ifmtr.h | 3 +-
+ .../media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 29 +-
+ .../runtime/inputfifo/interface/ia_css_inputfifo.h | 1 +
+ .../atomisp/pci/runtime/inputfifo/src/inputfifo.c | 1 +
+ .../runtime/isp_param/interface/ia_css_isp_param.h | 7 +-
+ .../isp_param/interface/ia_css_isp_param_types.h | 1 +
+ .../atomisp/pci/runtime/isp_param/src/isp_param.c | 32 +-
+ .../pci/runtime/isys/interface/ia_css_isys.h | 13 +-
+ .../pci/runtime/isys/interface/ia_css_isys_comm.h | 1 +
+ .../atomisp/pci/runtime/isys/src/csi_rx_rmgr.c | 13 +-
+ .../atomisp/pci/runtime/isys/src/csi_rx_rmgr.h | 1 +
+ .../atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.c | 1 +
+ .../atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.h | 1 +
+ .../atomisp/pci/runtime/isys/src/isys_dma_rmgr.c | 1 +
+ .../atomisp/pci/runtime/isys/src/isys_dma_rmgr.h | 1 +
+ .../media/atomisp/pci/runtime/isys/src/isys_init.c | 1 +
+ .../pci/runtime/isys/src/isys_stream2mmio_rmgr.c | 1 +
+ .../pci/runtime/isys/src/isys_stream2mmio_rmgr.h | 1 +
+ .../media/atomisp/pci/runtime/isys/src/rx.c | 21 +-
+ .../atomisp/pci/runtime/isys/src/virtual_isys.c | 1 +
+ .../atomisp/pci/runtime/isys/src/virtual_isys.h | 1 +
+ .../runtime/pipeline/interface/ia_css_pipeline.h | 32 +-
+ .../pipeline/interface/ia_css_pipeline_common.h | 1 +
+ .../atomisp/pci/runtime/pipeline/src/pipeline.c | 102 +-
+ .../pci/runtime/queue/interface/ia_css_queue.h | 31 +-
+ .../runtime/queue/interface/ia_css_queue_comm.h | 1 +
+ .../media/atomisp/pci/runtime/queue/src/queue.c | 45 +-
+ .../atomisp/pci/runtime/queue/src/queue_access.c | 28 +-
+ .../atomisp/pci/runtime/queue/src/queue_access.h | 4 +-
+ .../pci/runtime/rmgr/interface/ia_css_rmgr.h | 3 +-
+ .../pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 8 +-
+ .../media/atomisp/pci/runtime/rmgr/src/rmgr.c | 11 +-
+ .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 17 +-
+ .../pci/runtime/spctrl/interface/ia_css_spctrl.h | 11 +-
+ .../runtime/spctrl/interface/ia_css_spctrl_comm.h | 1 +
+ .../media/atomisp/pci/runtime/spctrl/src/spctrl.c | 42 +-
+ .../tagger/interface/ia_css_tagger_common.h | 1 +
+ .../media/atomisp/pci/runtime/timer/src/timer.c | 7 +-
+ .../atomisp/pci/scalar_processor_2400_params.h | 1 +
+ drivers/staging/media/atomisp/pci/sh_css.c | 1797 ++++++++++----------
+ drivers/staging/media/atomisp/pci/sh_css_defs.h | 6 +-
+ .../staging/media/atomisp/pci/sh_css_dvs_info.h | 1 +
+ .../staging/media/atomisp/pci/sh_css_firmware.c | 121 +-
+ .../staging/media/atomisp/pci/sh_css_firmware.h | 10 +-
+ drivers/staging/media/atomisp/pci/sh_css_frac.h | 1 +
+ .../staging/media/atomisp/pci/sh_css_host_data.c | 5 +-
+ drivers/staging/media/atomisp/pci/sh_css_hrt.c | 5 +-
+ drivers/staging/media/atomisp/pci/sh_css_hrt.h | 3 +-
+ .../staging/media/atomisp/pci/sh_css_internal.h | 89 +-
+ drivers/staging/media/atomisp/pci/sh_css_legacy.h | 7 +-
+ .../staging/media/atomisp/pci/sh_css_metadata.c | 1 +
+ drivers/staging/media/atomisp/pci/sh_css_metrics.c | 10 +-
+ drivers/staging/media/atomisp/pci/sh_css_metrics.h | 1 +
+ drivers/staging/media/atomisp/pci/sh_css_mipi.c | 65 +-
+ drivers/staging/media/atomisp/pci/sh_css_mipi.h | 9 +-
+ drivers/staging/media/atomisp/pci/sh_css_mmu.c | 2 +-
+ drivers/staging/media/atomisp/pci/sh_css_morph.c | 1 +
+ .../staging/media/atomisp/pci/sh_css_param_dvs.c | 46 +-
+ .../staging/media/atomisp/pci/sh_css_param_dvs.h | 1 +
+ .../media/atomisp/pci/sh_css_param_shading.c | 8 +-
+ .../media/atomisp/pci/sh_css_param_shading.h | 1 +
+ drivers/staging/media/atomisp/pci/sh_css_params.c | 730 ++++----
+ drivers/staging/media/atomisp/pci/sh_css_params.h | 17 +-
+ .../media/atomisp/pci/sh_css_params_internal.h | 1 +
+ drivers/staging/media/atomisp/pci/sh_css_pipe.c | 16 -
+ .../staging/media/atomisp/pci/sh_css_properties.c | 1 +
+ drivers/staging/media/atomisp/pci/sh_css_shading.c | 1 +
+ drivers/staging/media/atomisp/pci/sh_css_sp.c | 136 +-
+ drivers/staging/media/atomisp/pci/sh_css_sp.h | 1 +
+ drivers/staging/media/atomisp/pci/sh_css_stream.c | 1 +
+ .../media/atomisp/pci/sh_css_stream_format.c | 1 +
+ .../media/atomisp/pci/sh_css_stream_format.h | 1 +
+ drivers/staging/media/atomisp/pci/sh_css_struct.h | 6 +-
+ drivers/staging/media/atomisp/pci/sh_css_uds.h | 1 +
+ drivers/staging/media/atomisp/pci/sh_css_version.c | 7 +-
+ drivers/staging/media/atomisp/pci/str2mem_defs.h | 1 +
+ .../media/atomisp/pci/streaming_to_mipi_defs.h | 1 +
+ drivers/staging/media/atomisp/pci/system_global.h | 1 +
+ drivers/staging/media/atomisp/pci/system_local.h | 1 +
+ .../media/atomisp/pci/timed_controller_defs.h | 1 +
+ drivers/staging/media/atomisp/pci/version.h | 1 +
+ 668 files changed, 4254 insertions(+), 5064 deletions(-)
+ delete mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_vm.h
+ delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/error_support.h
+ delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h
+ delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_realloc.h
+ delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/system_types.h
+ delete mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_vm.c
+ delete mode 100644 drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c
+ delete mode 100644 drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h
+ delete mode 100644 drivers/staging/media/atomisp/pci/ia_css_memory_access.c
+ delete mode 100644 drivers/staging/media/atomisp/pci/memory_realloc.c
+ delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_pipe.c
+Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
+$ git merge fbdev/fbdev-for-next
+Already up to date.
+Merging pm/linux-next (f3448fe9c0bf Merge branch 'pm-cpufreq' into linux-next)
+$ git merge pm/linux-next
+Auto-merging include/linux/mm.h
+Auto-merging drivers/soc/qcom/Kconfig
+Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c
+Auto-merging drivers/cpufreq/Kconfig.arm
+Auto-merging drivers/clk/clk.c
+Auto-merging drivers/acpi/pci_root.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/obsolete/sysfs-cpuidle | 9 +
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 24 +-
+ Documentation/ABI/testing/sysfs-platform-dptf | 62 +-
+ Documentation/admin-guide/pm/cpuidle.rst | 20 +-
+ .../admin-guide/pm/intel-speed-select.rst | 917 +++++++++++++++++++++
+ Documentation/admin-guide/pm/intel_pstate.rst | 32 +-
+ Documentation/admin-guide/pm/working-state.rst | 1 +
+ Documentation/devicetree/bindings/opp/opp.txt | 17 +-
+ .../devicetree/bindings/property-units.txt | 4 +
+ Documentation/driver-api/pm/cpuidle.rst | 5 +-
+ Documentation/driver-api/pm/devices.rst | 199 +++--
+ Documentation/power/pci.rst | 58 +-
+ MAINTAINERS | 1 +
+ arch/arm64/kernel/acpi.c | 25 +
+ arch/arm64/mm/fault.c | 12 +-
+ drivers/acpi/acpi_dbg.c | 4 +-
+ drivers/acpi/acpi_lpit.c | 3 +-
+ drivers/acpi/acpi_lpss.c | 14 +-
+ drivers/acpi/acpi_tad.c | 2 +-
+ drivers/acpi/acpi_watchdog.c | 7 +-
+ drivers/acpi/acpica/acglobal.h | 1 +
+ drivers/acpi/acpica/acpredef.h | 4 +-
+ drivers/acpi/acpica/dbhistry.c | 1 -
+ drivers/acpi/acpica/dsfield.c | 22 +-
+ drivers/acpi/acpica/exfield.c | 2 +-
+ drivers/acpi/apei/bert.c | 6 +-
+ drivers/acpi/apei/einj.c | 5 +-
+ drivers/acpi/apei/erst.c | 4 +-
+ drivers/acpi/apei/ghes.c | 67 +-
+ drivers/acpi/apei/hest.c | 5 +-
+ drivers/acpi/button.c | 1 -
+ drivers/acpi/cppc_acpi.c | 5 +-
+ drivers/acpi/device_pm.c | 31 +-
+ drivers/acpi/dptf/dptf_power.c | 147 +++-
+ drivers/acpi/ec.c | 23 +-
+ drivers/acpi/evged.c | 22 +-
+ drivers/acpi/pci_link.c | 2 -
+ drivers/acpi/pci_root.c | 2 +-
+ drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 1 +
+ drivers/acpi/power.c | 2 -
+ drivers/acpi/processor_idle.c | 9 +-
+ drivers/acpi/sbs.c | 3 -
+ drivers/acpi/scan.c | 15 +-
+ drivers/acpi/sleep.c | 24 +-
+ drivers/acpi/sysfs.c | 4 +-
+ drivers/acpi/utils.c | 25 +
+ drivers/acpi/video_detect.c | 10 +
+ drivers/base/power/main.c | 348 +++-----
+ drivers/base/power/runtime.c | 6 +-
+ drivers/base/power/sysfs.c | 4 +-
+ drivers/clk/clk-qoriq.c | 30 +-
+ drivers/clk/clk.c | 6 +-
+ drivers/cpufreq/Kconfig | 3 +-
+ drivers/cpufreq/Kconfig.arm | 1 +
+ drivers/cpufreq/cpufreq-dt-platdev.c | 2 +
+ drivers/cpufreq/cpufreq-dt.c | 4 +
+ drivers/cpufreq/cpufreq.c | 11 +-
+ drivers/cpufreq/imx-cpufreq-dt.c | 84 +-
+ drivers/cpufreq/intel_pstate.c | 3 +-
+ drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +-
+ drivers/cpufreq/qoriq-cpufreq.c | 76 +-
+ drivers/cpufreq/tegra186-cpufreq.c | 3 +-
+ drivers/cpuidle/Kconfig.arm | 13 +
+ drivers/cpuidle/Makefile | 1 +
+ drivers/cpuidle/cpuidle-psci.c | 8 +-
+ .../{soc/qcom/spm.c => cpuidle/cpuidle-qcom-spm.c} | 138 ++--
+ drivers/cpuidle/sysfs.c | 73 +-
+ drivers/devfreq/Kconfig | 8 +
+ drivers/devfreq/Makefile | 1 +
+ drivers/devfreq/devfreq.c | 19 +-
+ drivers/devfreq/imx-bus.c | 179 ++++
+ drivers/devfreq/tegra30-devfreq.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_kms.c | 2 +-
+ drivers/i2c/busses/i2c-designware-platdrv.c | 4 +-
+ drivers/interconnect/Kconfig | 2 +-
+ drivers/interconnect/core.c | 97 ++-
+ drivers/misc/mei/pci-me.c | 2 +-
+ drivers/misc/mei/pci-txe.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
+ drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
+ drivers/opp/core.c | 119 ++-
+ drivers/opp/debugfs.c | 42 +
+ drivers/opp/of.c | 205 ++++-
+ drivers/opp/opp.h | 10 +
+ drivers/pci/hotplug/acpiphp_glue.c | 13 +-
+ drivers/pci/hotplug/pciehp_core.c | 2 +-
+ drivers/pci/pci-driver.c | 34 +-
+ drivers/pci/pcie/portdrv_pci.c | 2 +-
+ drivers/pnp/pnpbios/pnpbios.h | 2 +-
+ drivers/powercap/intel_rapl_common.c | 4 +-
+ drivers/soc/qcom/Kconfig | 10 -
+ drivers/soc/qcom/Makefile | 1 -
+ fs/block_dev.c | 3 +-
+ include/acpi/acpi_bus.h | 1 +
+ include/acpi/acpixf.h | 2 +-
+ include/acpi/ghes.h | 3 +
+ include/linux/cpufreq.h | 2 +-
+ include/linux/interconnect.h | 12 +
+ include/linux/mm.h | 1 +
+ include/linux/pm.h | 34 +-
+ include/linux/pm_opp.h | 18 +
+ include/linux/pm_runtime.h | 4 +-
+ include/linux/suspend.h | 6 +
+ kernel/power/Kconfig | 12 +
+ kernel/power/Makefile | 3 +-
+ kernel/power/hibernate.c | 20 +-
+ kernel/power/power.h | 4 +-
+ kernel/power/user.c | 22 +-
+ mm/memory-failure.c | 15 +-
+ tools/power/cpupower/utils/cpupower-info.c | 2 +-
+ tools/power/cpupower/utils/cpupower-set.c | 2 +-
+ .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 2 +-
+ .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 6 +-
+ .../cpupower/utils/idle_monitor/hsw_ext_idle.c | 2 +-
+ tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 2 +-
+ tools/power/cpupower/utils/idle_monitor/snb_idle.c | 2 +-
+ 119 files changed, 2746 insertions(+), 886 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/sysfs-cpuidle
+ create mode 100644 Documentation/admin-guide/pm/intel-speed-select.rst
+ rename drivers/{soc/qcom/spm.c => cpuidle/cpuidle-qcom-spm.c} (75%)
+ create mode 100644 drivers/devfreq/imx-bus.c
+Merging cpufreq-arm/cpufreq/arm/linux-next (6cc3d0e9a097 cpufreq: tegra186: add CPUFREQ_NEED_INITIAL_FREQ_CHECK flag)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Already up to date.
+Merging cpupower/cpupower (7b0bf99b9ee4 cpupower: Remove unneeded semicolon)
+$ git merge cpupower/cpupower
+Already up to date.
+Merging opp/opp/linux-next (45679f9b508f opp: Don't parse icc paths unnecessarily)
+$ git merge opp/opp/linux-next
+Already up to date.
+Merging thermal/thermal/linux-next (64488908b523 thermal/int340x_thermal: Don't require IDSP to exist)
+$ git merge thermal/thermal/linux-next
+Auto-merging drivers/thermal/imx_sc_thermal.c
+Merge made by the 'recursive' strategy.
+ .../bindings/thermal/ti,am654-thermal.yaml | 56 +++++
+ drivers/thermal/Kconfig | 10 +
+ drivers/thermal/Makefile | 1 +
+ drivers/thermal/devfreq_cooling.c | 70 ++----
+ drivers/thermal/imx_sc_thermal.c | 4 +
+ .../intel/int340x_thermal/int3400_thermal.c | 223 ++++++++++++++++-
+ drivers/thermal/k3_bandgap.c | 264 +++++++++++++++++++++
+ drivers/thermal/rockchip_thermal.c | 4 +-
+ drivers/thermal/st/st_thermal_memmap.c | 4 +-
+ drivers/thermal/st/stm_thermal.c | 4 +-
+ drivers/thermal/thermal_core.c | 6 -
+ drivers/thermal/thermal_core.h | 52 ++++
+ drivers/thermal/thermal_helpers.c | 13 +-
+ drivers/thermal/ti-soc-thermal/ti-bandgap.c | 5 +-
+ include/linux/thermal.h | 84 +------
+ 15 files changed, 643 insertions(+), 157 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/ti,am654-thermal.yaml
+ create mode 100644 drivers/thermal/k3_bandgap.c
+Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
+$ git merge thermal-rzhang/next
+Already up to date.
+Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
+$ git merge thermal-soc/next
+Already up to date.
+Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
+$ git merge ieee1394/for-next
+Auto-merging drivers/firewire/net.c
+Merge made by the 'recursive' strategy.
+ drivers/firewire/net.c | 2 --
+ 1 file changed, 2 deletions(-)
+Merging dlm/next (fe204591cc94 dlm: remove BUG() before panic())
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/dlm_internal.h | 7 +++----
+ fs/dlm/lockspace.c | 18 ++++--------------
+ fs/dlm/rcom.c | 2 +-
+ fs/dlm/user.c | 2 +-
+ 4 files changed, 9 insertions(+), 20 deletions(-)
+Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
+$ git merge swiotlb/linux-next
+Auto-merging include/linux/page-flags.h
+Auto-merging drivers/xen/swiotlb-xen.c
+Merge made by the 'recursive' strategy.
+Merging rdma/for-next (70ae39555033 RDMA/hns: Uninitialized variable in modify_qp_init_to_rtr())
+$ git merge rdma/for-next
+Removing net/rds/ib_fmr.c
+Auto-merging net/core/dev.c
+Auto-merging include/rdma/uverbs_std_types.h
+Auto-merging include/rdma/rdmavt_qp.h
+Removing include/rdma/ib_fmr_pool.h
+Auto-merging include/linux/mlx5/driver.h
+Removing include/linux/mlx5/cmd.h
+Auto-merging fs/sysfs/file.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
+Auto-merging drivers/infiniband/core/rdma_core.c
+Removing drivers/infiniband/core/fmr_pool.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-block-rnbd | 46 +
+ Documentation/ABI/testing/sysfs-class-rnbd-client | 111 +
+ Documentation/ABI/testing/sysfs-class-rnbd-server | 50 +
+ Documentation/ABI/testing/sysfs-class-rtrs-client | 131 +
+ Documentation/ABI/testing/sysfs-class-rtrs-server | 53 +
+ Documentation/driver-api/infiniband.rst | 3 -
+ Documentation/infiniband/core_locking.rst | 2 -
+ MAINTAINERS | 14 +
+ drivers/block/Kconfig | 2 +
+ drivers/block/Makefile | 1 +
+ drivers/block/rnbd/Kconfig | 28 +
+ drivers/block/rnbd/Makefile | 15 +
+ drivers/block/rnbd/README | 92 +
+ drivers/block/rnbd/rnbd-clt-sysfs.c | 639 +++
+ drivers/block/rnbd/rnbd-clt.c | 1729 ++++++++
+ drivers/block/rnbd/rnbd-clt.h | 156 +
+ drivers/block/rnbd/rnbd-common.c | 23 +
+ drivers/block/rnbd/rnbd-log.h | 41 +
+ drivers/block/rnbd/rnbd-proto.h | 303 ++
+ drivers/block/rnbd/rnbd-srv-dev.c | 134 +
+ drivers/block/rnbd/rnbd-srv-dev.h | 92 +
+ drivers/block/rnbd/rnbd-srv-sysfs.c | 215 +
+ drivers/block/rnbd/rnbd-srv.c | 844 ++++
+ drivers/block/rnbd/rnbd-srv.h | 78 +
+ drivers/infiniband/Kconfig | 1 +
+ drivers/infiniband/core/Makefile | 9 +-
+ drivers/infiniband/core/addr.c | 4 +
+ drivers/infiniband/core/cm.c | 302 +-
+ drivers/infiniband/core/cma.c | 114 +-
+ drivers/infiniband/core/cma_configfs.c | 13 +
+ drivers/infiniband/core/cma_priv.h | 1 +
+ drivers/infiniband/core/cma_trace.h | 20 +-
+ drivers/infiniband/core/core_priv.h | 3 +
+ drivers/infiniband/core/cq.c | 173 +
+ drivers/infiniband/core/device.c | 22 +-
+ drivers/infiniband/core/fmr_pool.c | 494 ---
+ drivers/infiniband/core/lag.c | 138 +
+ drivers/infiniband/core/mad.c | 255 +-
+ drivers/infiniband/core/multicast.c | 12 +-
+ drivers/infiniband/core/rdma_core.c | 25 +-
+ drivers/infiniband/core/rdma_core.h | 7 +-
+ drivers/infiniband/core/rw.c | 2 +-
+ drivers/infiniband/core/sa_query.c | 51 +-
+ drivers/infiniband/core/sysfs.c | 10 +-
+ drivers/infiniband/core/ucma.c | 65 +-
+ drivers/infiniband/core/ud_header.c | 2 +-
+ drivers/infiniband/core/user_mad.c | 22 +-
+ drivers/infiniband/core/uverbs.h | 21 +-
+ drivers/infiniband/core/uverbs_cmd.c | 76 +-
+ drivers/infiniband/core/uverbs_ioctl.c | 24 +-
+ drivers/infiniband/core/uverbs_main.c | 40 +-
+ drivers/infiniband/core/uverbs_std_types.c | 95 -
+ drivers/infiniband/core/uverbs_std_types_cq.c | 17 +-
+ drivers/infiniband/core/uverbs_std_types_mr.c | 12 +-
+ drivers/infiniband/core/uverbs_std_types_qp.c | 401 ++
+ drivers/infiniband/core/uverbs_std_types_srq.c | 234 ++
+ drivers/infiniband/core/uverbs_std_types_wq.c | 194 +
+ drivers/infiniband/core/uverbs_uapi.c | 3 +
+ drivers/infiniband/core/verbs.c | 159 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 76 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.h | 18 +-
+ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 357 +-
+ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 42 +-
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 88 +-
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 91 -
+ drivers/infiniband/hw/bnxt_re/qplib_res.c | 1 +
+ drivers/infiniband/hw/bnxt_re/qplib_res.h | 53 +
+ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 3 -
+ drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 -
+ drivers/infiniband/hw/bnxt_re/roce_hsi.h | 106 +
+ drivers/infiniband/hw/cxgb4/device.c | 1 +
+ drivers/infiniband/hw/efa/efa.h | 6 +-
+ drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 63 +-
+ drivers/infiniband/hw/efa/efa_com.c | 5 +-
+ drivers/infiniband/hw/efa/efa_com.h | 3 +-
+ drivers/infiniband/hw/efa/efa_com_cmd.c | 18 +-
+ drivers/infiniband/hw/efa/efa_com_cmd.h | 11 +-
+ drivers/infiniband/hw/efa/efa_main.c | 52 +-
+ drivers/infiniband/hw/efa/efa_verbs.c | 19 +-
+ drivers/infiniband/hw/hfi1/Makefile | 4 +
+ drivers/infiniband/hw/hfi1/affinity.c | 12 +-
+ drivers/infiniband/hw/hfi1/affinity.h | 3 +-
+ drivers/infiniband/hw/hfi1/chip.c | 303 +-
+ drivers/infiniband/hw/hfi1/chip.h | 5 +-
+ drivers/infiniband/hw/hfi1/common.h | 13 +-
+ drivers/infiniband/hw/hfi1/driver.c | 231 +-
+ drivers/infiniband/hw/hfi1/file_ops.c | 4 +-
+ drivers/infiniband/hw/hfi1/hfi.h | 38 +-
+ drivers/infiniband/hw/hfi1/init.c | 13 +-
+ drivers/infiniband/hw/hfi1/ipoib.h | 171 +
+ drivers/infiniband/hw/hfi1/ipoib_main.c | 309 ++
+ drivers/infiniband/hw/hfi1/ipoib_rx.c | 95 +
+ drivers/infiniband/hw/hfi1/ipoib_tx.c | 828 ++++
+ drivers/infiniband/hw/hfi1/msix.c | 36 +-
+ drivers/infiniband/hw/hfi1/msix.h | 7 +-
+ drivers/infiniband/hw/hfi1/netdev.h | 118 +
+ drivers/infiniband/hw/hfi1/netdev_rx.c | 484 +++
+ drivers/infiniband/hw/hfi1/qp.c | 18 +-
+ drivers/infiniband/hw/hfi1/tid_rdma.c | 4 +-
+ drivers/infiniband/hw/hfi1/trace.c | 42 +-
+ drivers/infiniband/hw/hfi1/trace_ctxts.h | 11 +-
+ drivers/infiniband/hw/hfi1/verbs.c | 14 +-
+ drivers/infiniband/hw/hfi1/vnic.h | 5 +-
+ drivers/infiniband/hw/hfi1/vnic_main.c | 325 +-
+ drivers/infiniband/hw/hns/hns_roce_ah.c | 5 +-
+ drivers/infiniband/hw/hns/hns_roce_alloc.c | 148 +-
+ drivers/infiniband/hw/hns/hns_roce_common.h | 4 -
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 351 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 246 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 114 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 11 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 360 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1713 ++++----
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 15 +-
+ drivers/infiniband/hw/hns/hns_roce_main.c | 71 +-
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 1644 +++-----
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 509 +--
+ drivers/infiniband/hw/hns/hns_roce_srq.c | 378 +-
+ drivers/infiniband/hw/i40iw/i40iw.h | 9 -
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 1 -
+ drivers/infiniband/hw/i40iw/i40iw_verbs.h | 1 -
+ drivers/infiniband/hw/mlx4/ah.c | 11 +-
+ drivers/infiniband/hw/mlx4/main.c | 11 -
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 18 +-
+ drivers/infiniband/hw/mlx4/mr.c | 93 -
+ drivers/infiniband/hw/mlx5/Makefile | 29 +-
+ drivers/infiniband/hw/mlx5/ah.c | 35 +-
+ drivers/infiniband/hw/mlx5/cmd.c | 131 +-
+ drivers/infiniband/hw/mlx5/cmd.h | 6 +-
+ drivers/infiniband/hw/mlx5/cong.c | 4 +-
+ drivers/infiniband/hw/mlx5/cq.c | 11 +-
+ drivers/infiniband/hw/mlx5/devx.c | 27 +-
+ drivers/infiniband/hw/mlx5/flow.c | 156 +-
+ drivers/infiniband/hw/mlx5/gsi.c | 38 +-
+ drivers/infiniband/hw/mlx5/ib_rep.h | 2 +-
+ drivers/infiniband/hw/mlx5/ib_virt.c | 2 +-
+ drivers/infiniband/hw/mlx5/mad.c | 5 +-
+ drivers/infiniband/hw/mlx5/main.c | 216 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 75 +-
+ drivers/infiniband/hw/mlx5/odp.c | 13 +-
+ drivers/infiniband/hw/mlx5/qos.c | 13 +-
+ drivers/infiniband/hw/mlx5/qp.c | 4108 +++++++-------------
+ drivers/infiniband/hw/mlx5/qp.h | 46 +
+ .../mlx5/core/qp.c => infiniband/hw/mlx5/qpc.c} | 338 +-
+ drivers/infiniband/hw/mlx5/srq.c | 10 +-
+ drivers/infiniband/hw/mlx5/srq_cmd.c | 113 +-
+ drivers/infiniband/hw/mlx5/wr.c | 1504 +++++++
+ drivers/infiniband/hw/mlx5/wr.h | 76 +
+ drivers/infiniband/hw/mthca/mthca_dev.h | 10 -
+ drivers/infiniband/hw/mthca/mthca_mr.c | 262 +-
+ drivers/infiniband/hw/mthca/mthca_provider.c | 105 +-
+ drivers/infiniband/hw/mthca/mthca_provider.h | 23 -
+ drivers/infiniband/hw/ocrdma/ocrdma.h | 1 -
+ drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 3 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 1 -
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 -
+ drivers/infiniband/hw/qedr/main.c | 1 -
+ drivers/infiniband/hw/qedr/qedr.h | 1 -
+ drivers/infiniband/hw/qedr/verbs.c | 6 +-
+ drivers/infiniband/hw/qedr/verbs.h | 2 +-
+ drivers/infiniband/hw/qib/qib_iba7322.c | 7 +-
+ drivers/infiniband/hw/qib/qib_verbs.c | 1 -
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 1 -
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 5 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 +-
+ drivers/infiniband/sw/rdmavt/ah.c | 11 +-
+ drivers/infiniband/sw/rdmavt/ah.h | 4 +-
+ drivers/infiniband/sw/rdmavt/mr.c | 155 -
+ drivers/infiniband/sw/rdmavt/mr.h | 15 -
+ drivers/infiniband/sw/rdmavt/qp.c | 24 +-
+ drivers/infiniband/sw/rdmavt/vt.c | 4 -
+ drivers/infiniband/sw/rxe/rxe.c | 1 +
+ drivers/infiniband/sw/rxe/rxe_param.h | 3 +
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 9 +-
+ drivers/infiniband/sw/siw/siw.h | 4 +-
+ drivers/infiniband/sw/siw/siw_main.c | 1 -
+ drivers/infiniband/sw/siw/siw_mem.c | 5 +-
+ drivers/infiniband/sw/siw/siw_verbs.c | 1 -
+ drivers/infiniband/ulp/Makefile | 1 +
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 37 +-
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 23 +-
+ drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +
+ drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 3 +
+ drivers/infiniband/ulp/iser/iscsi_iser.h | 79 +-
+ drivers/infiniband/ulp/iser/iser_initiator.c | 19 +-
+ drivers/infiniband/ulp/iser/iser_memory.c | 188 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 126 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 5 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 12 +-
+ drivers/infiniband/ulp/rtrs/Kconfig | 27 +
+ drivers/infiniband/ulp/rtrs/Makefile | 15 +
+ drivers/infiniband/ulp/rtrs/README | 213 +
+ drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 200 +
+ drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 483 +++
+ drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2992 ++++++++++++++
+ drivers/infiniband/ulp/rtrs/rtrs-clt.h | 252 ++
+ drivers/infiniband/ulp/rtrs/rtrs-log.h | 28 +
+ drivers/infiniband/ulp/rtrs/rtrs-pri.h | 399 ++
+ drivers/infiniband/ulp/rtrs/rtrs-srv-stats.c | 38 +
+ drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 321 ++
+ drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2178 +++++++++++
+ drivers/infiniband/ulp/rtrs/rtrs-srv.h | 148 +
+ drivers/infiniband/ulp/rtrs/rtrs.c | 612 +++
+ drivers/infiniband/ulp/rtrs/rtrs.h | 196 +
+ drivers/infiniband/ulp/srp/ib_srp.c | 265 +-
+ drivers/infiniband/ulp/srp/ib_srp.h | 27 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 67 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.h | 5 -
+ drivers/net/bonding/bond_alb.c | 39 +-
+ drivers/net/bonding/bond_main.c | 268 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 2 -
+ drivers/net/ethernet/mellanox/mlx4/mr.c | 183 -
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 5 +
+ drivers/net/ethernet/mellanox/mlx5/core/cq.c | 23 +-
+ drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 74 +-
+ drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 30 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 +-
+ .../net/ethernet/mellanox/mlx5/core/en/health.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/en/monitor_stats.c | 46 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/en_common.c | 7 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 68 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 50 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 6 +-
+ .../net/ethernet/mellanox/mlx5/core/esw/chains.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 38 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 6 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 22 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c | 29 +-
+ .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 136 +-
+ .../net/ethernet/mellanox/mlx5/core/fpga/conn.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 86 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 122 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 +
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 34 +-
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 1 -
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 150 +-
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 6 +-
+ .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 19 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag.c | 118 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 10 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/port_tun.c | 1 -
+ .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 10 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 149 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mcg.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c | 21 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx5/core/pd.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/rl.c | 22 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 33 +-
+ .../mellanox/mlx5/core/steering/dr_icm_pool.c | 53 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 57 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 1 -
+ .../mellanox/mlx5/core/steering/dr_types.h | 5 +-
+ .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 113 +-
+ drivers/net/ethernet/mellanox/mlx5/core/uar.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx5/core/vport.c | 142 +-
+ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 1 -
+ drivers/net/ethernet/qlogic/qed/qed_rdma.h | 1 -
+ drivers/nvme/host/rdma.c | 75 +-
+ drivers/nvme/target/rdma.c | 18 +-
+ fs/sysfs/file.c | 1 +
+ include/linux/mlx4/device.h | 22 +-
+ include/linux/mlx5/cmd.h | 51 -
+ include/linux/mlx5/cq.h | 2 +-
+ include/linux/mlx5/device.h | 44 +-
+ include/linux/mlx5/driver.h | 33 +-
+ include/linux/mlx5/fs.h | 1 +
+ include/linux/mlx5/mlx5_ifc.h | 226 +-
+ include/linux/mlx5/qp.h | 125 +-
+ include/linux/mlx5/transobj.h | 19 +-
+ include/linux/mlx5/vport.h | 3 +-
+ include/linux/netdevice.h | 12 +
+ include/linux/qed/qed_rdma_if.h | 1 -
+ include/net/bond_alb.h | 4 +
+ include/net/bonding.h | 3 +-
+ include/rdma/ib_cm.h | 9 +-
+ include/rdma/ib_fmr_pool.h | 93 -
+ include/rdma/ib_mad.h | 49 +-
+ include/rdma/ib_verbs.h | 298 +-
+ include/rdma/ibta_vol1_c12.h | 6 +
+ include/rdma/lag.h | 23 +
+ include/rdma/opa_port_info.h | 10 +-
+ include/rdma/opa_vnic.h | 4 +-
+ include/rdma/rdma_cm.h | 17 +-
+ include/rdma/rdmavt_qp.h | 29 +-
+ include/rdma/uverbs_ioctl.h | 18 +-
+ include/rdma/uverbs_std_types.h | 2 +-
+ include/rdma/uverbs_types.h | 3 +-
+ include/uapi/rdma/hfi/hfi1_user.h | 3 +-
+ include/uapi/rdma/ib_user_ioctl_cmds.h | 81 +
+ include/uapi/rdma/ib_user_ioctl_verbs.h | 43 +
+ include/uapi/rdma/mlx5-abi.h | 9 +-
+ include/uapi/rdma/mlx5_user_ioctl_cmds.h | 6 +
+ include/uapi/rdma/rdma_user_cm.h | 15 +-
+ net/core/dev.c | 22 +
+ net/rds/Makefile | 2 +-
+ net/rds/ib.c | 43 +-
+ net/rds/ib.h | 2 -
+ net/rds/ib_cm.c | 8 +-
+ net/rds/ib_fmr.c | 269 --
+ net/rds/ib_frmr.c | 4 +-
+ net/rds/ib_mr.h | 14 +-
+ net/rds/ib_rdma.c | 28 +-
+ net/smc/smc_ib.c | 13 +-
+ 314 files changed, 25651 insertions(+), 12653 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-block-rnbd
+ create mode 100644 Documentation/ABI/testing/sysfs-class-rnbd-client
+ create mode 100644 Documentation/ABI/testing/sysfs-class-rnbd-server
+ create mode 100644 Documentation/ABI/testing/sysfs-class-rtrs-client
+ create mode 100644 Documentation/ABI/testing/sysfs-class-rtrs-server
+ create mode 100644 drivers/block/rnbd/Kconfig
+ create mode 100644 drivers/block/rnbd/Makefile
+ create mode 100644 drivers/block/rnbd/README
+ create mode 100644 drivers/block/rnbd/rnbd-clt-sysfs.c
+ create mode 100644 drivers/block/rnbd/rnbd-clt.c
+ create mode 100644 drivers/block/rnbd/rnbd-clt.h
+ create mode 100644 drivers/block/rnbd/rnbd-common.c
+ create mode 100644 drivers/block/rnbd/rnbd-log.h
+ create mode 100644 drivers/block/rnbd/rnbd-proto.h
+ create mode 100644 drivers/block/rnbd/rnbd-srv-dev.c
+ create mode 100644 drivers/block/rnbd/rnbd-srv-dev.h
+ create mode 100644 drivers/block/rnbd/rnbd-srv-sysfs.c
+ create mode 100644 drivers/block/rnbd/rnbd-srv.c
+ create mode 100644 drivers/block/rnbd/rnbd-srv.h
+ delete mode 100644 drivers/infiniband/core/fmr_pool.c
+ create mode 100644 drivers/infiniband/core/lag.c
+ create mode 100644 drivers/infiniband/core/uverbs_std_types_qp.c
+ create mode 100644 drivers/infiniband/core/uverbs_std_types_srq.c
+ create mode 100644 drivers/infiniband/core/uverbs_std_types_wq.c
+ create mode 100644 drivers/infiniband/hw/hfi1/ipoib.h
+ create mode 100644 drivers/infiniband/hw/hfi1/ipoib_main.c
+ create mode 100644 drivers/infiniband/hw/hfi1/ipoib_rx.c
+ create mode 100644 drivers/infiniband/hw/hfi1/ipoib_tx.c
+ create mode 100644 drivers/infiniband/hw/hfi1/netdev.h
+ create mode 100644 drivers/infiniband/hw/hfi1/netdev_rx.c
+ create mode 100644 drivers/infiniband/hw/mlx5/qp.h
+ rename drivers/{net/ethernet/mellanox/mlx5/core/qp.c => infiniband/hw/mlx5/qpc.c} (55%)
+ create mode 100644 drivers/infiniband/hw/mlx5/wr.c
+ create mode 100644 drivers/infiniband/hw/mlx5/wr.h
+ create mode 100644 drivers/infiniband/ulp/rtrs/Kconfig
+ create mode 100644 drivers/infiniband/ulp/rtrs/Makefile
+ create mode 100644 drivers/infiniband/ulp/rtrs/README
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt.h
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-log.h
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-pri.h
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-stats.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv.h
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs.h
+ delete mode 100644 include/linux/mlx5/cmd.h
+ delete mode 100644 include/rdma/ib_fmr_pool.h
+ create mode 100644 include/rdma/lag.h
+ delete mode 100644 net/rds/ib_fmr.c
+Merging net-next/master (9a25c1df24a6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
+$ git merge net-next/master
+Auto-merging scripts/mod/modpost.c
+Auto-merging net/sunrpc/xprtsock.c
+Auto-merging net/sunrpc/svcsock.c
+CONFLICT (content): Merge conflict in net/sunrpc/svcsock.c
+Auto-merging net/smc/smc_ib.c
+Auto-merging net/ipv6/addrconf.c
+Auto-merging net/bluetooth/smp.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/module.c
+Auto-merging kernel/bpf/syscall.c
+Auto-merging kernel/bpf/core.c
+Auto-merging include/uapi/linux/ethtool_netlink.h
+Auto-merging include/net/tcp.h
+Auto-merging include/linux/regmap.h
+Auto-merging include/linux/qed/qed_rdma_if.h
+Auto-merging include/linux/filter.h
+Auto-merging fs/cifs/transport.c
+Auto-merging fs/cifs/connect.c
+Auto-merging fs/afs/rxrpc.c
+Auto-merging drivers/soc/fsl/dpio/qbman-portal.c
+Auto-merging drivers/s390/net/qeth_l2_main.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+Auto-merging drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
+Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c
+Auto-merging drivers/net/ethernet/smsc/Kconfig
+Auto-merging drivers/net/ethernet/qlogic/qed/qed_rdma.h
+Auto-merging drivers/net/ethernet/qlogic/qed/qed_rdma.c
+Removing drivers/net/ethernet/micrel/ks8851_mll.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
+Auto-merging drivers/net/ethernet/intel/igc/igc_main.c
+Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
+Auto-merging drivers/crypto/chelsio/chcr_ipsec.c
+Auto-merging drivers/crypto/chelsio/chcr_crypto.h
+Auto-merging drivers/crypto/chelsio/chcr_algo.c
+Auto-merging drivers/block/drbd/drbd_int.h
+Auto-merging drivers/base/regmap/regmap.c
+Auto-merging arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+Auto-merging arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sdm845.dtsi
+Auto-merging arch/arm/boot/dts/qcom-ipq4019.dtsi
+Auto-merging arch/arm/boot/dts/imx7s.dtsi
+Auto-merging arch/arm/boot/dts/imx6ul.dtsi
+Auto-merging arch/arm/boot/dts/imx6sx.dtsi
+Auto-merging arch/arm/boot/dts/imx6qdl.dtsi
+Auto-merging MAINTAINERS
+Removing Documentation/networking/vrf.txt
+Removing Documentation/networking/tc-actions-env-rules.txt
+Removing Documentation/networking/seg6-sysctl.txt
+Removing Documentation/networking/packet_mmap.txt
+Removing Documentation/networking/netif-msg.txt
+Removing Documentation/networking/device_drivers/ti/cpsw.txt
+Removing Documentation/networking/device_drivers/smsc/smc9.txt
+Removing Documentation/networking/device_drivers/sb1000.txt
+Removing Documentation/networking/device_drivers/neterion/s2io.txt
+Removing Documentation/networking/cops.txt
+Removing Documentation/networking/caif/spi_porting.txt
+Auto-merging Documentation/hwmon/index.rst
+Removing Documentation/devicetree/bindings/net/ti,dp83867.txt
+Removing Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt
+Removing Documentation/devicetree/bindings/net/qca,ar71xx.txt
+CONFLICT (modify/delete): Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt deleted in net-next/master and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt left in tree.
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'net/sunrpc/svcsock.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt
+rm 'Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt'
+$ git commit --no-edit -v -a
+[master 01068988290c] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-net | 13 +
+ Documentation/admin-guide/kernel-parameters.txt | 12 +-
+ Documentation/admin-guide/serial-console.rst | 2 +-
+ Documentation/admin-guide/sysctl/net.rst | 8 +-
+ Documentation/bpf/bpf_devel_QA.rst | 15 +
+ Documentation/bpf/index.rst | 4 +-
+ Documentation/bpf/ringbuf.rst | 209 +
+ Documentation/dev-tools/kselftest.rst | 3 +-
+ .../bindings/arm/mediatek/mediatek,pericfg.txt | 37 -
+ .../bindings/arm/mediatek/mediatek,pericfg.yaml | 64 +
+ .../bindings/net/amlogic,meson-dwmac.yaml | 23 +-
+ .../devicetree/bindings/net/ethernet-phy.yaml | 3 +-
+ Documentation/devicetree/bindings/net/fsl-fec.txt | 8 +-
+ .../devicetree/bindings/net/imx-dwmac.txt | 56 +
+ Documentation/devicetree/bindings/net/mdio.yaml | 50 +-
+ .../bindings/net/mediatek,star-emac.yaml | 89 +
+ .../devicetree/bindings/net/nxp,tja11xx.yaml | 61 +
+ .../devicetree/bindings/net/qca,ar71xx.txt | 45 -
+ .../devicetree/bindings/net/qca,ar71xx.yaml | 216 +
+ .../devicetree/bindings/net/qcom,ipa.yaml | 10 +-
+ .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 61 +
+ .../devicetree/bindings/net/qualcomm-bluetooth.txt | 6 +
+ .../devicetree/bindings/net/realtek-bluetooth.yaml | 54 +
+ .../bindings/net/socionext,uniphier-ave4.txt | 64 -
+ .../bindings/net/socionext,uniphier-ave4.yaml | 111 +
+ .../devicetree/bindings/net/ti,dp83867.txt | 68 -
+ .../devicetree/bindings/net/ti,dp83867.yaml | 127 +
+ .../devicetree/bindings/net/ti,dp83869.yaml | 2 +-
+ .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 20 +
+ .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 145 +
+ .../bindings/net/wireless/mediatek,mt76.txt | 3 +
+ .../bindings/net/wireless/qcom,ath10k.txt | 14 +
+ Documentation/driver-api/driver-model/devres.rst | 5 +
+ Documentation/filesystems/afs.rst | 2 +-
+ Documentation/hwmon/bcm54140.rst | 45 +
+ Documentation/hwmon/index.rst | 1 +
+ Documentation/networking/{6pack.txt => 6pack.rst} | 46 +-
+ .../networking/{altera_tse.txt => altera_tse.rst} | 89 +-
+ .../{arcnet-hardware.txt => arcnet-hardware.rst} | 2227 +--
+ .../networking/{arcnet.txt => arcnet.rst} | 348 +-
+ Documentation/networking/{atm.txt => atm.rst} | 6 +
+ Documentation/networking/{ax25.txt => ax25.rst} | 6 +
+ .../networking/{baycom.txt => baycom.rst} | 120 +-
+ .../networking/{bonding.txt => bonding.rst} | 1317 +-
+ Documentation/networking/caif/caif.rst | 2 -
+ Documentation/networking/caif/index.rst | 13 +
+ .../caif/{Linux-CAIF.txt => linux_caif.rst} | 54 +-
+ Documentation/networking/caif/spi_porting.rst | 229 +
+ Documentation/networking/caif/spi_porting.txt | 208 -
+ Documentation/networking/can.rst | 2 +-
+ .../networking/{cdc_mbim.txt => cdc_mbim.rst} | 76 +-
+ Documentation/networking/checksum-offloads.rst | 2 +-
+ Documentation/networking/cops.rst | 80 +
+ Documentation/networking/cops.txt | 63 -
+ .../networking/{cxacru.txt => cxacru.rst} | 86 +-
+ Documentation/networking/{dccp.txt => dccp.rst} | 39 +-
+ Documentation/networking/{dctcp.txt => dctcp.rst} | 14 +-
+ .../networking/{decnet.txt => decnet.rst} | 77 +-
+ Documentation/networking/{defza.txt => defza.rst} | 8 +-
+ .../device_drivers/3com/{3c509.txt => 3c509.rst} | 162 +-
+ .../device_drivers/3com/{vortex.txt => vortex.rst} | 227 +-
+ .../device_drivers/amazon/{ena.txt => ena.rst} | 144 +-
+ .../aquantia/{atlantic.txt => atlantic.rst} | 369 +-
+ .../device_drivers/chelsio/{cxgb.txt => cxgb.rst} | 183 +-
+ .../cirrus/{cs89x0.txt => cs89x0.rst} | 559 +-
+ .../davicom/{dm9000.txt => dm9000.rst} | 24 +-
+ .../device_drivers/dec/{de4x5.txt => de4x5.rst} | 105 +-
+ .../device_drivers/dec/{dmfe.txt => dmfe.rst} | 35 +-
+ .../device_drivers/dlink/{dl2k.txt => dl2k.rst} | 228 +-
+ .../freescale/{dpaa.txt => dpaa.rst} | 141 +-
+ .../freescale/{gianfar.txt => gianfar.rst} | 21 +-
+ Documentation/networking/device_drivers/index.rst | 24 +
+ .../networking/device_drivers/intel/e100.rst | 2 +-
+ .../intel/{ipw2100.txt => ipw2100.rst} | 240 +-
+ .../intel/{ipw2200.txt => ipw2200.rst} | 414 +-
+ .../networking/device_drivers/intel/ixgb.rst | 2 +-
+ .../microsoft/{netvsc.txt => netvsc.rst} | 57 +-
+ .../networking/device_drivers/neterion/s2io.rst | 196 +
+ .../networking/device_drivers/neterion/s2io.txt | 141 -
+ .../device_drivers/neterion/{vxge.txt => vxge.rst} | 60 +-
+ .../networking/device_drivers/pensando/ionic.rst | 231 +-
+ .../qualcomm/{rmnet.txt => rmnet.rst} | 43 +-
+ Documentation/networking/device_drivers/sb1000.rst | 222 +
+ Documentation/networking/device_drivers/sb1000.txt | 207 -
+ .../networking/device_drivers/smsc/smc9.rst | 48 +
+ .../networking/device_drivers/smsc/smc9.txt | 42 -
+ .../networking/device_drivers/ti/cpsw.rst | 587 +
+ .../networking/device_drivers/ti/cpsw.txt | 541 -
+ .../ti/{cpsw_switchdev.txt => cpsw_switchdev.rst} | 243 +-
+ .../device_drivers/ti/{tlan.txt => tlan.rst} | 73 +-
+ .../toshiba/{spider_net.txt => spider_net.rst} | 60 +-
+ .../networking/devlink-params-sja1105.txt | 27 +
+ .../networking/devlink/devlink-region.rst | 11 +-
+ Documentation/networking/devlink/devlink-trap.rst | 219 +-
+ Documentation/networking/devlink/ice.rst | 11 +
+ .../{dns_resolver.txt => dns_resolver.rst} | 52 +-
+ .../networking/{driver.txt => driver.rst} | 22 +-
+ Documentation/networking/dsa/sja1105.rst | 327 +-
+ Documentation/networking/{eql.txt => eql.rst} | 443 +-
+ Documentation/networking/ethtool-netlink.rst | 195 +-
+ .../networking/{fib_trie.txt => fib_trie.rst} | 16 +-
+ .../networking/{filter.txt => filter.rst} | 868 +-
+ .../networking/{fore200e.txt => fore200e.rst} | 8 +-
+ .../networking/{framerelay.txt => framerelay.rst} | 21 +-
+ .../networking/{gen_stats.txt => gen_stats.rst} | 98 +-
+ .../{generic-hdlc.txt => generic-hdlc.rst} | 86 +-
+ .../{generic_netlink.txt => generic_netlink.rst} | 6 +
+ Documentation/networking/{gtp.txt => gtp.rst} | 97 +-
+ Documentation/networking/{hinic.txt => hinic.rst} | 5 +-
+ Documentation/networking/{ila.txt => ila.rst} | 89 +-
+ Documentation/networking/index.rst | 87 +
+ .../networking/{ip-sysctl.txt => ip-sysctl.rst} | 855 +-
+ .../networking/{ip_dynaddr.txt => ip_dynaddr.rst} | 29 +-
+ Documentation/networking/{ipddp.txt => ipddp.rst} | 13 +-
+ .../networking/{iphase.txt => iphase.rst} | 187 +-
+ Documentation/networking/{ipsec.txt => ipsec.rst} | 14 +-
+ Documentation/networking/{ipv6.txt => ipv6.rst} | 8 +-
+ .../networking/{ipvlan.txt => ipvlan.rst} | 159 +-
+ .../{ipvs-sysctl.txt => ipvs-sysctl.rst} | 188 +-
+ Documentation/networking/{kcm.txt => kcm.rst} | 85 +-
+ Documentation/networking/{l2tp.txt => l2tp.rst} | 159 +-
+ .../{lapb-module.txt => lapb-module.rst} | 122 +-
+ Documentation/networking/{ltpc.txt => ltpc.rst} | 47 +-
+ ...c80211-injection.txt => mac80211-injection.rst} | 41 +-
+ .../{mpls-sysctl.txt => mpls-sysctl.rst} | 17 +-
+ .../networking/{multiqueue.txt => multiqueue.rst} | 41 +-
+ .../networking/{netconsole.txt => netconsole.rst} | 125 +-
+ .../{netdev-features.txt => netdev-features.rst} | 19 +-
+ .../networking/{netdevices.txt => netdevices.rst} | 21 +-
+ .../{netfilter-sysctl.txt => netfilter-sysctl.rst} | 11 +-
+ Documentation/networking/netif-msg.rst | 95 +
+ Documentation/networking/netif-msg.txt | 79 -
+ ...onntrack-sysctl.txt => nf_conntrack-sysctl.rst} | 51 +-
+ .../{nf_flowtable.txt => nf_flowtable.rst} | 55 +-
+ .../{openvswitch.txt => openvswitch.rst} | 23 +-
+ .../networking/{operstates.txt => operstates.rst} | 45 +-
+ Documentation/networking/packet_mmap.rst | 1084 ++
+ Documentation/networking/packet_mmap.txt | 1061 --
+ .../networking/{phonet.txt => phonet.rst} | 56 +-
+ .../networking/{pktgen.txt => pktgen.rst} | 320 +-
+ Documentation/networking/{PLIP.txt => plip.rst} | 43 +-
+ .../{ppp_generic.txt => ppp_generic.rst} | 52 +-
+ .../{proc_net_tcp.txt => proc_net_tcp.rst} | 23 +-
+ .../{radiotap-headers.txt => radiotap-headers.rst} | 99 +-
+ .../networking/{ray_cs.txt => ray_cs.rst} | 105 +-
+ Documentation/networking/{rds.txt => rds.rst} | 305 +-
+ .../networking/{regulatory.txt => regulatory.rst} | 29 +-
+ Documentation/networking/{rxrpc.txt => rxrpc.rst} | 319 +-
+ Documentation/networking/{sctp.txt => sctp.rst} | 37 +-
+ Documentation/networking/{secid.txt => secid.rst} | 6 +
+ Documentation/networking/seg6-sysctl.rst | 26 +
+ Documentation/networking/seg6-sysctl.txt | 18 -
+ Documentation/networking/{skfp.txt => skfp.rst} | 153 +-
+ Documentation/networking/snmp_counter.rst | 2 +-
+ .../networking/{strparser.txt => strparser.rst} | 85 +-
+ .../networking/{switchdev.txt => switchdev.rst} | 116 +-
+ Documentation/networking/tc-actions-env-rules.rst | 29 +
+ Documentation/networking/tc-actions-env-rules.txt | 24 -
+ .../networking/{tcp-thin.txt => tcp-thin.rst} | 5 +
+ Documentation/networking/{team.txt => team.rst} | 6 +
+ .../{timestamping.txt => timestamping.rst} | 166 +-
+ .../networking/{tproxy.txt => tproxy.rst} | 57 +-
+ .../networking/{tuntap.txt => tuntap.rst} | 200 +-
+ .../networking/{udplite.txt => udplite.rst} | 175 +-
+ Documentation/networking/vrf.rst | 451 +
+ Documentation/networking/vrf.txt | 418 -
+ Documentation/networking/{vxlan.txt => vxlan.rst} | 33 +-
+ .../networking/{x25-iface.txt => x25-iface.rst} | 10 +-
+ Documentation/networking/{x25.txt => x25.rst} | 4 +
+ .../{xfrm_device.txt => xfrm_device.rst} | 33 +-
+ .../networking/{xfrm_proc.txt => xfrm_proc.rst} | 31 +
+ .../networking/{xfrm_sync.txt => xfrm_sync.rst} | 66 +-
+ .../{xfrm_sysctl.txt => xfrm_sysctl.rst} | 7 +
+ .../networking/{z8530drv.txt => z8530drv.rst} | 629 +-
+ Documentation/timers/timers-howto.rst | 3 +
+ MAINTAINERS | 64 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6sx.dtsi | 2 +
+ arch/arm/boot/dts/imx6ul.dtsi | 2 +
+ arch/arm/boot/dts/imx7d.dtsi | 1 +
+ arch/arm/boot/dts/imx7s.dtsi | 1 +
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 28 +
+ arch/arm/net/bpf_jit_32.c | 14 +-
+ arch/arm/net/bpf_jit_32.h | 3 +
+ arch/arm64/boot/dts/mediatek/mt8516.dtsi | 17 +
+ arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 34 +
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 22 +
+ arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 21 +
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 12 +
+ arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 11 +
+ arch/riscv/net/bpf_jit_comp32.c | 103 +-
+ arch/riscv/net/bpf_jit_comp64.c | 64 +-
+ arch/s390/include/asm/ccwgroup.h | 10 -
+ arch/x86/net/bpf_jit_comp32.c | 4 +-
+ drivers/atm/Kconfig | 4 +-
+ drivers/block/drbd/drbd_int.h | 28 -
+ drivers/block/drbd/drbd_main.c | 2 +-
+ drivers/block/drbd/drbd_receiver.c | 13 +-
+ drivers/block/drbd/drbd_worker.c | 6 +-
+ drivers/bluetooth/btbcm.c | 142 +-
+ drivers/bluetooth/btbcm.h | 10 +-
+ drivers/bluetooth/btmtkuart.c | 17 +-
+ drivers/bluetooth/btqca.c | 32 +-
+ drivers/bluetooth/btqca.h | 3 +-
+ drivers/bluetooth/btrtl.c | 10 +-
+ drivers/bluetooth/btusb.c | 205 +-
+ drivers/bluetooth/hci_bcm.c | 35 +-
+ drivers/bluetooth/hci_h5.c | 2 +
+ drivers/bluetooth/hci_qca.c | 178 +-
+ drivers/bluetooth/hci_serdev.c | 4 +-
+ drivers/crypto/chelsio/chcr_algo.c | 100 +-
+ drivers/crypto/chelsio/chcr_core.c | 23 +-
+ drivers/crypto/chelsio/chcr_core.h | 10 +-
+ drivers/crypto/chelsio/chcr_crypto.h | 1 +
+ drivers/crypto/chelsio/chcr_ipsec.c | 5 +-
+ drivers/crypto/chelsio/chcr_ktls.c | 107 +-
+ drivers/crypto/chelsio/chcr_ktls.h | 9 +-
+ drivers/crypto/chelsio/chtls/chtls_cm.c | 195 +-
+ drivers/crypto/chelsio/chtls/chtls_cm.h | 1 +
+ drivers/crypto/chelsio/chtls/chtls_main.c | 14 +-
+ drivers/infiniband/sw/siw/siw_cm.c | 42 +-
+ drivers/media/rc/bpf-lirc.c | 4 +-
+ drivers/net/Kconfig | 12 +-
+ drivers/net/appletalk/Kconfig | 8 +-
+ drivers/net/arcnet/Kconfig | 6 +-
+ drivers/net/bonding/bond_alb.c | 7 +-
+ drivers/net/bonding/bond_main.c | 46 +-
+ drivers/net/bonding/bonding_priv.h | 2 +-
+ drivers/net/caif/Kconfig | 2 +-
+ drivers/net/dsa/b53/b53_common.c | 82 +-
+ drivers/net/dsa/b53/b53_priv.h | 8 +-
+ drivers/net/dsa/b53/b53_srab.c | 2 +-
+ drivers/net/dsa/mt7530.c | 24 +-
+ drivers/net/dsa/mt7530.h | 6 +
+ drivers/net/dsa/mv88e6xxx/chip.c | 16 +-
+ drivers/net/dsa/mv88e6xxx/serdes.c | 55 +-
+ drivers/net/dsa/mv88e6xxx/serdes.h | 7 +-
+ drivers/net/dsa/ocelot/felix.c | 85 +
+ drivers/net/dsa/ocelot/felix.h | 6 +
+ drivers/net/dsa/ocelot/felix_vsc9959.c | 192 +-
+ drivers/net/dsa/sja1105/Kconfig | 9 +
+ drivers/net/dsa/sja1105/Makefile | 4 +
+ drivers/net/dsa/sja1105/sja1105.h | 103 +-
+ drivers/net/dsa/sja1105/sja1105_clocking.c | 58 +-
+ drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 208 +-
+ drivers/net/dsa/sja1105/sja1105_ethtool.c | 144 +-
+ drivers/net/dsa/sja1105/sja1105_flower.c | 215 +-
+ drivers/net/dsa/sja1105/sja1105_main.c | 1235 +-
+ drivers/net/dsa/sja1105/sja1105_ptp.h | 13 +
+ drivers/net/dsa/sja1105/sja1105_spi.c | 16 +
+ drivers/net/dsa/sja1105/sja1105_static_config.c | 274 +-
+ drivers/net/dsa/sja1105/sja1105_static_config.h | 118 +
+ drivers/net/dsa/sja1105/sja1105_tas.c | 127 +-
+ drivers/net/dsa/sja1105/sja1105_tas.h | 36 +
+ drivers/net/dsa/sja1105/sja1105_vl.c | 782 +
+ drivers/net/dsa/sja1105/sja1105_vl.h | 74 +
+ drivers/net/dsa/vitesse-vsc73xx-platform.c | 10 +-
+ drivers/net/ethernet/3com/3c509.c | 1 -
+ drivers/net/ethernet/3com/3c515.c | 1 -
+ drivers/net/ethernet/3com/3c59x.c | 4 +-
+ drivers/net/ethernet/3com/Kconfig | 2 +-
+ drivers/net/ethernet/8390/ne2k-pci.c | 345 +-
+ drivers/net/ethernet/adaptec/starfire.c | 1 -
+ drivers/net/ethernet/agere/et131x.c | 4 +-
+ drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +-
+ drivers/net/ethernet/altera/altera_tse_main.c | 4 +-
+ drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 19 +-
+ drivers/net/ethernet/amazon/ena/ena_com.c | 124 +-
+ drivers/net/ethernet/amazon/ena/ena_com.h | 80 +-
+ drivers/net/ethernet/amazon/ena/ena_common_defs.h | 2 +-
+ drivers/net/ethernet/amazon/ena/ena_eth_com.c | 26 +-
+ drivers/net/ethernet/amazon/ena/ena_eth_com.h | 7 +-
+ drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h | 6 +-
+ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 85 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 55 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.h | 17 +-
+ drivers/net/ethernet/amazon/ena/ena_regs_defs.h | 2 +-
+ drivers/net/ethernet/amd/7990.c | 2 +-
+ drivers/net/ethernet/amd/7990.h | 2 +-
+ drivers/net/ethernet/amd/atarilance.c | 2 +-
+ drivers/net/ethernet/aquantia/atlantic/Makefile | 4 +
+ drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 4 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_common.h | 40 +-
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 79 +-
+ .../net/ethernet/aquantia/atlantic/aq_filters.c | 11 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 42 +-
+ .../net/ethernet/aquantia/atlantic/aq_hw_utils.c | 26 +
+ .../net/ethernet/aquantia/atlantic/aq_hw_utils.h | 2 +
+ drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 6 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_main.c | 72 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 335 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 27 +-
+ .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 42 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 27 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 19 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 72 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_vec.h | 8 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 30 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 348 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 44 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 6 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 83 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 42 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 101 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 60 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 26 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 35 +-
+ .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 841 +
+ .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h | 14 +
+ .../aquantia/atlantic/hw_atl2/hw_atl2_internal.h | 127 +
+ .../aquantia/atlantic/hw_atl2/hw_atl2_llh.c | 234 +
+ .../aquantia/atlantic/hw_atl2/hw_atl2_llh.h | 102 +
+ .../atlantic/hw_atl2/hw_atl2_llh_internal.h | 391 +
+ .../aquantia/atlantic/hw_atl2/hw_atl2_utils.c | 131 +
+ .../aquantia/atlantic/hw_atl2/hw_atl2_utils.h | 606 +
+ .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 320 +
+ .../ethernet/aquantia/atlantic/macsec/macsec_api.c | 6 +-
+ drivers/net/ethernet/atheros/ag71xx.c | 43 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 8 +-
+ drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 7 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 26 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 21 -
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 100 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 25 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 261 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 8 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 216 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 51 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 10 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 8 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 1 +
+ drivers/net/ethernet/broadcom/cnic.c | 1 -
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 790 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 23 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 96 +-
+ drivers/net/ethernet/broadcom/tg3.c | 8 +-
+ drivers/net/ethernet/cavium/liquidio/lio_core.c | 1 -
+ .../net/ethernet/cavium/liquidio/octeon_device.h | 12 -
+ drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 5 +
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 1 +
+ drivers/net/ethernet/chelsio/Kconfig | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 44 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 166 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 96 +-
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c | 17 +
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 204 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 14 +
+ drivers/net/ethernet/chelsio/cxgb4/sched.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 40 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 8 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 10 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +-
+ drivers/net/ethernet/cirrus/Kconfig | 2 +-
+ drivers/net/ethernet/cortina/gemini.c | 3 +-
+ drivers/net/ethernet/dec/tulip/Kconfig | 4 +-
+ drivers/net/ethernet/dec/tulip/de4x5.c | 10 +-
+ drivers/net/ethernet/dlink/dl2k.c | 2 +-
+ drivers/net/ethernet/dnet.c | 3 +-
+ drivers/net/ethernet/faraday/ftmac100.c | 3 -
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
+ drivers/net/ethernet/freescale/dpaa2/Kconfig | 10 +
+ drivers/net/ethernet/freescale/dpaa2/Makefile | 1 +
+ .../net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c | 150 +
+ .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 16 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 491 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 85 +-
+ .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 26 +-
+ drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 59 +
+ drivers/net/ethernet/freescale/dpaa2/dpni.c | 177 +
+ drivers/net/ethernet/freescale/dpaa2/dpni.h | 97 +
+ drivers/net/ethernet/freescale/enetc/enetc.c | 34 +-
+ drivers/net/ethernet/freescale/enetc/enetc.h | 86 +
+ drivers/net/ethernet/freescale/enetc/enetc_hw.h | 159 +
+ drivers/net/ethernet/freescale/enetc/enetc_pf.c | 50 +-
+ drivers/net/ethernet/freescale/enetc/enetc_qos.c | 1103 ++
+ drivers/net/ethernet/freescale/fec.h | 4 +-
+ drivers/net/ethernet/freescale/fec_main.c | 127 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 4 +-
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 7 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 25 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 166 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 53 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 88 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 1 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 5 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 48 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 195 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 1 -
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1758 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 40 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 79 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_trace.h | 87 +
+ .../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 1 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 3 -
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 4 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 388 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 32 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 7 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h | 87 +
+ drivers/net/ethernet/huawei/hinic/Makefile | 2 +-
+ drivers/net/ethernet/huawei/hinic/hinic_dev.h | 5 +
+ drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 498 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 47 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 2 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h | 2 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 205 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 90 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c | 98 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h | 7 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 78 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_if.h | 26 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 53 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_io.h | 26 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c | 1210 ++
+ drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h | 154 +
+ drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 17 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 12 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 8 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h | 7 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 9 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h | 6 +-
+ drivers/net/ethernet/huawei/hinic/hinic_main.c | 140 +-
+ drivers/net/ethernet/huawei/hinic/hinic_port.c | 207 +-
+ drivers/net/ethernet/huawei/hinic/hinic_port.h | 159 +-
+ drivers/net/ethernet/huawei/hinic/hinic_rx.c | 15 +-
+ drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 1294 ++
+ drivers/net/ethernet/huawei/hinic/hinic_sriov.h | 109 +
+ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 17 +-
+ drivers/net/ethernet/intel/e1000/e1000_hw.c | 2 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 22 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 1 -
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 6 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 115 +-
+ drivers/net/ethernet/intel/e1000e/regs.h | 3 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 52 +-
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 166 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 17 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 40 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 5 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 381 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.h | 3 +-
+ drivers/net/ethernet/intel/ice/Makefile | 4 +
+ drivers/net/ethernet/intel/ice/ice.h | 72 +-
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 76 +-
+ drivers/net/ethernet/intel/ice/ice_arfs.c | 663 +
+ drivers/net/ethernet/intel/ice/ice_arfs.h | 82 +
+ drivers/net/ethernet/intel/ice/ice_base.c | 117 +-
+ drivers/net/ethernet/intel/ice/ice_common.c | 146 +-
+ drivers/net/ethernet/intel/ice/ice_common.h | 5 +-
+ drivers/net/ethernet/intel/ice/ice_controlq.c | 180 +-
+ drivers/net/ethernet/intel/ice/ice_controlq.h | 3 +
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 105 +-
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 25 +-
+ drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 11 +-
+ drivers/net/ethernet/intel/ice/ice_devlink.c | 23 +
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 134 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 1697 ++
+ drivers/net/ethernet/intel/ice/ice_fdir.c | 840 +
+ drivers/net/ethernet/intel/ice/ice_fdir.h | 166 +
+ drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 919 +-
+ drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 8 +
+ drivers/net/ethernet/intel/ice/ice_flex_type.h | 41 +-
+ drivers/net/ethernet/intel/ice/ice_flow.c | 355 +-
+ drivers/net/ethernet/intel/ice/ice_flow.h | 47 +-
+ drivers/net/ethernet/intel/ice/ice_fltr.c | 397 +
+ drivers/net/ethernet/intel/ice/ice_fltr.h | 39 +
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 29 +-
+ drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 128 +-
+ drivers/net/ethernet/intel/ice/ice_lib.c | 605 +-
+ drivers/net/ethernet/intel/ice/ice_lib.h | 14 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 733 +-
+ drivers/net/ethernet/intel/ice/ice_nvm.c | 91 +-
+ drivers/net/ethernet/intel/ice/ice_nvm.h | 4 -
+ drivers/net/ethernet/intel/ice/ice_protocol_type.h | 3 +
+ drivers/net/ethernet/intel/ice/ice_sched.c | 14 +-
+ drivers/net/ethernet/intel/ice/ice_status.h | 3 +
+ drivers/net/ethernet/intel/ice/ice_switch.c | 96 +-
+ drivers/net/ethernet/intel/ice/ice_switch.h | 7 +
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 415 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.h | 28 +-
+ drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 38 +-
+ drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 4 +-
+ drivers/net/ethernet/intel/ice/ice_type.h | 80 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 1275 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 15 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 380 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.h | 13 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.c | 9 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 +-
+ drivers/net/ethernet/intel/igc/Makefile | 2 +-
+ drivers/net/ethernet/intel/igc/igc.h | 449 +-
+ drivers/net/ethernet/intel/igc/igc_base.c | 9 +-
+ drivers/net/ethernet/intel/igc/igc_defines.h | 51 +-
+ drivers/net/ethernet/intel/igc/igc_diag.c | 186 +
+ drivers/net/ethernet/intel/igc/igc_diag.h | 30 +
+ drivers/net/ethernet/intel/igc/igc_dump.c | 113 +-
+ drivers/net/ethernet/intel/igc/igc_ethtool.c | 783 +-
+ drivers/net/ethernet/intel/igc/igc_hw.h | 3 +
+ drivers/net/ethernet/intel/igc/igc_mac.c | 9 +-
+ drivers/net/ethernet/intel/igc/igc_mac.h | 4 -
+ drivers/net/ethernet/intel/igc/igc_main.c | 1041 +-
+ drivers/net/ethernet/intel/igc/igc_ptp.c | 24 +-
+ drivers/net/ethernet/intel/igc/igc_regs.h | 44 +-
+ drivers/net/ethernet/intel/igc/igc_tsn.c | 157 +
+ drivers/net/ethernet/intel/igc/igc_tsn.h | 9 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 9 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 5 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 79 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +-
+ .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 309 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 34 +-
+ drivers/net/ethernet/lantiq_xrx200.c | 3 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 5 -
+ drivers/net/ethernet/marvell/mvneta.c | 30 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 52 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h | 17 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 8 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 3 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 4 -
+ drivers/net/ethernet/mediatek/Kconfig | 9 +-
+ drivers/net/ethernet/mediatek/Makefile | 3 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +-
+ drivers/net/ethernet/mediatek/mtk_star_emac.c | 1651 ++
+ drivers/net/ethernet/mellanox/mlx4/crdump.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 20 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 17 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 15 +-
+ .../net/ethernet/mellanox/mlx5/core/accel/accel.h | 1 -
+ .../net/ethernet/mellanox/mlx5/core/accel/ipsec.c | 19 +-
+ .../net/ethernet/mellanox/mlx5/core/accel/ipsec.h | 8 +-
+ .../net/ethernet/mellanox/mlx5/core/accel/tls.c | 4 +-
+ .../net/ethernet/mellanox/mlx5/core/accel/tls.h | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 20 +-
+ drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 14 +-
+ .../mellanox/mlx5/core/diag/fs_tracepoint.c | 85 +-
+ .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 95 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h | 54 +
+ .../net/ethernet/mellanox/mlx5/core/en/params.c | 13 +-
+ .../net/ethernet/mellanox/mlx5/core/en/rep/bond.c | 350 +
+ .../net/ethernet/mellanox/mlx5/core/en/rep/neigh.c | 368 +
+ .../net/ethernet/mellanox/mlx5/core/en/rep/neigh.h | 34 +
+ .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 646 +
+ .../net/ethernet/mellanox/mlx5/core/en/rep/tc.h | 77 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 325 +-
+ .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 31 +-
+ .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 2 +
+ .../mellanox/mlx5/core/en/tc_tun_mplsoudp.c | 134 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 153 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 101 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 37 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 113 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.h | 25 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 9 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.h | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/umem.c | 51 +-
+ .../mellanox/mlx5/core/en_accel/en_accel.h | 50 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 87 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 25 -
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 15 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 6 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 88 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 13 +
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 28 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 81 +-
+ .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 16 +-
+ .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 7 +
+ .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 68 +-
+ .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 13 +-
+ .../net/ethernet/mellanox/mlx5/core/en_common.c | 13 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 30 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 201 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 935 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 39 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 116 +-
+ .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 29 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 2 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 623 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 62 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 66 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 7 +-
+ .../mellanox/mlx5/core/esw/acl/egress_lgcy.c | 170 +
+ .../mellanox/mlx5/core/esw/acl/egress_ofld.c | 235 +
+ .../ethernet/mellanox/mlx5/core/esw/acl/helper.c | 160 +
+ .../ethernet/mellanox/mlx5/core/esw/acl/helper.h | 26 +
+ .../mellanox/mlx5/core/esw/acl/ingress_lgcy.c | 279 +
+ .../mellanox/mlx5/core/esw/acl/ingress_ofld.c | 322 +
+ .../net/ethernet/mellanox/mlx5/core/esw/acl/lgcy.h | 17 +
+ .../net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h | 29 +
+ .../net/ethernet/mellanox/mlx5/core/esw/chains.h | 19 +
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 562 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 44 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 407 +-
+ .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 31 +-
+ .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.h | 18 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 13 +-
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 11 +-
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 18 +-
+ .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 21 +
+ drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 1 -
+ .../net/ethernet/mellanox/mlx5/core/lib/port_tun.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 54 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 -
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 85 +-
+ .../mellanox/mlx5/core/steering/dr_action.c | 2 +-
+ .../mellanox/mlx5/core/steering/dr_domain.c | 14 +-
+ .../mellanox/mlx5/core/steering/dr_matcher.c | 10 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 31 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 13 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 4 +-
+ .../mellanox/mlx5/core/steering/dr_table.c | 12 +-
+ .../mellanox/mlx5/core/steering/dr_types.h | 25 +-
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 4 +-
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 27 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 612 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 185 +-
+ .../ethernet/mellanox/mlxsw/spectrum2_mr_tcam.c | 14 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 220 +-
+ .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 31 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 39 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 3 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 2 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_flow.c | 305 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 84 +-
+ .../ethernet/mellanox/mlxsw/spectrum_matchall.c | 378 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 16 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 621 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 54 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 1324 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_trap.h | 18 +-
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 5 +
+ drivers/net/ethernet/mellanox/mlxsw/trap.h | 7 +-
+ drivers/net/ethernet/micrel/Kconfig | 2 +
+ drivers/net/ethernet/micrel/Makefile | 2 +
+ drivers/net/ethernet/micrel/ks8851.h | 151 +-
+ .../ethernet/micrel/{ks8851.c => ks8851_common.c} | 698 +-
+ drivers/net/ethernet/micrel/ks8851_mll.c | 1393 --
+ drivers/net/ethernet/micrel/ks8851_par.c | 357 +
+ drivers/net/ethernet/micrel/ks8851_spi.c | 485 +
+ drivers/net/ethernet/microchip/encx24j600-regmap.c | 5 -
+ drivers/net/ethernet/microchip/encx24j600.c | 12 +-
+ drivers/net/ethernet/microchip/lan743x_ethtool.c | 4 +-
+ drivers/net/ethernet/microchip/lan743x_main.c | 81 +-
+ drivers/net/ethernet/microchip/lan743x_main.h | 6 +
+ drivers/net/ethernet/microchip/lan743x_ptp.c | 2 +-
+ drivers/net/ethernet/moxa/moxart_ether.c | 5 +-
+ drivers/net/ethernet/mscc/Makefile | 2 +-
+ drivers/net/ethernet/mscc/ocelot.c | 235 +-
+ drivers/net/ethernet/mscc/ocelot.h | 3 +-
+ drivers/net/ethernet/mscc/ocelot_ace.c | 113 +-
+ drivers/net/ethernet/mscc/ocelot_ace.h | 5 +-
+ drivers/net/ethernet/mscc/ocelot_board.c | 30 +-
+ drivers/net/ethernet/mscc/ocelot_flower.c | 29 +-
+ drivers/net/ethernet/mscc/ocelot_ptp.c | 324 +
+ drivers/net/ethernet/mscc/ocelot_regs.c | 2 +
+ drivers/net/ethernet/mscc/ocelot_tc.c | 6 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 12 -
+ drivers/net/ethernet/neterion/Kconfig | 4 +-
+ drivers/net/ethernet/netronome/nfp/flower/action.c | 4 +-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 4 +-
+ drivers/net/ethernet/netronome/nfp/flower/main.c | 125 +-
+ drivers/net/ethernet/netronome/nfp/flower/main.h | 27 +-
+ drivers/net/ethernet/netronome/nfp/flower/match.c | 42 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 35 +-
+ drivers/net/ethernet/netronome/nfp/nfp_main.c | 3 -
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 6 +
+ .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 5 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 16 +
+ drivers/net/ethernet/ni/nixge.c | 3 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 6 +-
+ drivers/net/ethernet/pensando/ionic/ionic_dev.c | 14 +
+ drivers/net/ethernet/pensando/ionic/ionic_dev.h | 17 +-
+ .../net/ethernet/pensando/ionic/ionic_ethtool.c | 20 +-
+ drivers/net/ethernet/pensando/ionic/ionic_if.h | 1089 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 158 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.h | 28 +-
+ drivers/net/ethernet/pensando/ionic/ionic_main.c | 7 +-
+ drivers/net/ethernet/pensando/ionic/ionic_stats.c | 136 +-
+ drivers/net/ethernet/pensando/ionic/ionic_stats.h | 6 +
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 49 +-
+ drivers/net/ethernet/qlogic/qed/qed.h | 16 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 60 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.h | 10 +-
+ drivers/net/ethernet/qlogic/qed/qed_debug.c | 26 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 14 +-
+ drivers/net/ethernet/qlogic/qed/qed_hsi.h | 49 +-
+ drivers/net/ethernet/qlogic/qed/qed_hw.c | 42 +-
+ drivers/net/ethernet/qlogic/qed/qed_hw.h | 15 +
+ drivers/net/ethernet/qlogic/qed/qed_int.c | 40 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.h | 11 +
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_main.c | 43 +
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 253 +
+ drivers/net/ethernet/qlogic/qed/qed_mcp.h | 28 +
+ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 148 +-
+ drivers/net/ethernet/qlogic/qed/qed_rdma.h | 20 +
+ drivers/net/ethernet/qlogic/qed/qed_roce.c | 49 +-
+ drivers/net/ethernet/qlogic/qed/qed_spq.c | 16 +-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.h | 10 +-
+ drivers/net/ethernet/qlogic/qede/qede.h | 17 +-
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 24 +
+ drivers/net/ethernet/qlogic/qede/qede_fp.c | 1 +
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 232 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 6 -
+ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 4 +-
+ drivers/net/ethernet/qualcomm/emac/emac-mac.c | 5 +-
+ drivers/net/ethernet/qualcomm/emac/emac-mac.h | 5 +-
+ drivers/net/ethernet/qualcomm/emac/emac.c | 3 +-
+ drivers/net/ethernet/realtek/8139cp.c | 25 +-
+ drivers/net/ethernet/realtek/8139too.c | 26 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 1001 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 10 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 3 +-
+ drivers/net/ethernet/seeq/ether3.c | 5 +-
+ drivers/net/ethernet/sfc/ef10.c | 217 +-
+ drivers/net/ethernet/sfc/ef10_sriov.c | 27 +-
+ drivers/net/ethernet/sfc/mcdi.c | 25 +-
+ drivers/net/ethernet/sfc/mcdi.h | 12 +
+ drivers/net/ethernet/sfc/mcdi_filters.c | 82 +-
+ drivers/net/ethernet/sfc/mcdi_filters.h | 17 +-
+ drivers/net/ethernet/sfc/mcdi_functions.c | 8 +-
+ drivers/net/ethernet/sfc/mcdi_port.c | 7 +-
+ drivers/net/ethernet/sfc/net_driver.h | 10 +
+ drivers/net/ethernet/sfc/nic.h | 11 -
+ drivers/net/ethernet/sfc/ptp.c | 7 +-
+ drivers/net/ethernet/sfc/rx.c | 3 +-
+ drivers/net/ethernet/sfc/siena.c | 8 +
+ drivers/net/ethernet/smsc/Kconfig | 4 +-
+ drivers/net/ethernet/socionext/netsec.c | 32 +-
+ drivers/net/ethernet/socionext/sni_ave.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 13 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile | 5 +-
+ drivers/net/ethernet/stmicro/stmmac/common.h | 1 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 315 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 160 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 146 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 74 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 67 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 5 -
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +-
+ drivers/net/ethernet/sun/cassini.c | 14 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 12 -
+ drivers/net/ethernet/ti/Kconfig | 25 +-
+ drivers/net/ethernet/ti/Makefile | 3 +-
+ drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 36 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 205 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 13 +-
+ drivers/net/ethernet/ti/am65-cpsw-qos.c | 626 +
+ drivers/net/ethernet/ti/am65-cpsw-qos.h | 29 +
+ drivers/net/ethernet/ti/am65-cpts.c | 1086 ++
+ drivers/net/ethernet/ti/am65-cpts.h | 74 +
+ drivers/net/ethernet/ti/cpmac.c | 2 +-
+ drivers/net/ethernet/ti/cpsw.c | 22 +
+ drivers/net/ethernet/ti/cpsw_new.c | 25 +-
+ drivers/net/ethernet/ti/cpsw_priv.c | 19 +-
+ drivers/net/ethernet/ti/cpsw_priv.h | 2 +
+ drivers/net/ethernet/ti/cpts.c | 422 +-
+ drivers/net/ethernet/ti/cpts.h | 27 +-
+ drivers/net/ethernet/ti/davinci_mdio.c | 2 +
+ drivers/net/ethernet/ti/k3-cppi-desc-pool.c | 4 +-
+ drivers/net/ethernet/ti/netcp_ethss.c | 3 +-
+ drivers/net/ethernet/ti/tlan.c | 2 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +-
+ drivers/net/ethernet/toshiba/spider_net.c | 2 +-
+ drivers/net/ethernet/via/Kconfig | 1 +
+ drivers/net/ethernet/xilinx/ll_temac_main.c | 8 +-
+ drivers/net/fddi/Kconfig | 2 +-
+ drivers/net/hamradio/Kconfig | 14 +-
+ drivers/net/hamradio/bpqether.c | 20 +
+ drivers/net/hamradio/scc.c | 2 +-
+ drivers/net/hyperv/netvsc_bpf.c | 2 +-
+ drivers/net/hyperv/netvsc_drv.c | 4 +-
+ drivers/net/ipa/gsi.c | 127 +-
+ drivers/net/ipa/gsi.h | 15 +-
+ drivers/net/ipa/ipa.h | 10 +
+ drivers/net/ipa/ipa_clock.c | 4 +-
+ drivers/net/ipa/ipa_cmd.c | 59 -
+ drivers/net/ipa/ipa_cmd.h | 11 -
+ drivers/net/ipa/ipa_data-sc7180.c | 14 +-
+ drivers/net/ipa/ipa_data-sdm845.c | 15 +-
+ drivers/net/ipa/ipa_data.h | 29 +-
+ drivers/net/ipa/ipa_endpoint.c | 176 +-
+ drivers/net/ipa/ipa_endpoint.h | 3 -
+ drivers/net/ipa/ipa_main.c | 8 +-
+ drivers/net/ipa/ipa_mem.c | 210 +-
+ drivers/net/ipa/ipa_mem.h | 3 +-
+ drivers/net/ipvlan/ipvlan_main.c | 2 +
+ drivers/net/macsec.c | 2 +
+ drivers/net/macvlan.c | 14 +-
+ drivers/net/netdevsim/dev.c | 10 +-
+ drivers/net/phy/Kconfig | 21 +-
+ drivers/net/phy/Makefile | 2 +
+ drivers/net/phy/at803x.c | 310 +-
+ drivers/net/phy/bcm-phy-lib.c | 337 +-
+ drivers/net/phy/bcm-phy-lib.h | 19 +
+ drivers/net/phy/bcm54140.c | 860 +
+ drivers/net/phy/bcm87xx.c | 2 +-
+ drivers/net/phy/broadcom.c | 64 +-
+ drivers/net/phy/cortina.c | 4 +-
+ drivers/net/phy/dp83867.c | 4 +-
+ drivers/net/phy/dp83869.c | 36 +-
+ drivers/net/phy/marvell.c | 484 +
+ drivers/net/phy/marvell10g.c | 2 -
+ drivers/net/phy/mdio-bcm-iproc.c | 4 +-
+ drivers/net/phy/mdio-ipq4019.c | 160 +
+ drivers/net/phy/mdio-moxart.c | 1 -
+ drivers/net/phy/mdio-mscc-miim.c | 33 +-
+ drivers/net/phy/mdio_bus.c | 25 +-
+ drivers/net/phy/micrel.c | 128 +-
+ drivers/net/phy/mscc/mscc.h | 1 -
+ drivers/net/phy/mscc/mscc_main.c | 110 +-
+ drivers/net/phy/nxp-tja11xx.c | 412 +-
+ drivers/net/phy/phy-c45.c | 1 -
+ drivers/net/phy/phy-core.c | 11 +-
+ drivers/net/phy/phy.c | 188 +-
+ drivers/net/phy/phy_device.c | 280 +-
+ drivers/net/phy/phylink.c | 60 +-
+ drivers/net/phy/realtek.c | 15 +-
+ drivers/net/phy/teranetics.c | 1 -
+ drivers/net/plip/Kconfig | 2 +-
+ drivers/net/ppp/ppp_generic.c | 2 +
+ drivers/net/rionet.c | 3 +-
+ drivers/net/team/team.c | 1 +
+ drivers/net/tun.c | 18 +-
+ drivers/net/usb/ax88179_178a.c | 79 +-
+ drivers/net/usb/huawei_cdc_ncm.c | 2 +-
+ drivers/net/usb/qmi_wwan.c | 2 +-
+ drivers/net/usb/r8152.c | 22 +-
+ drivers/net/usb/sierra_net.c | 5 -
+ drivers/net/veth.c | 34 +-
+ drivers/net/virtio_net.c | 19 +-
+ drivers/net/vmxnet3/Makefile | 2 +-
+ drivers/net/vmxnet3/upt1_defs.h | 5 +-
+ drivers/net/vmxnet3/vmxnet3_defs.h | 31 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 191 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 265 +-
+ drivers/net/vmxnet3/vmxnet3_int.h | 25 +-
+ drivers/net/vrf.c | 1 +
+ drivers/net/vxlan.c | 374 +-
+ drivers/net/wan/Kconfig | 4 +-
+ drivers/net/wireless/Kconfig | 2 +-
+ drivers/net/wireless/ath/ath10k/Kconfig | 7 +-
+ drivers/net/wireless/ath/ath10k/bmi.c | 1 +
+ drivers/net/wireless/ath/ath10k/ce.h | 4 +-
+ drivers/net/wireless/ath/ath10k/core.c | 31 +-
+ drivers/net/wireless/ath/ath10k/core.h | 38 +-
+ drivers/net/wireless/ath/ath10k/coredump.h | 4 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 4 +-
+ drivers/net/wireless/ath/ath10k/debug.h | 10 +-
+ drivers/net/wireless/ath/ath10k/hif.h | 20 +-
+ drivers/net/wireless/ath/ath10k/htc.c | 399 +-
+ drivers/net/wireless/ath/ath10k/htc.h | 40 +-
+ drivers/net/wireless/ath/ath10k/htt.c | 13 +
+ drivers/net/wireless/ath/ath10k/htt.h | 66 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 42 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 51 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 7 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 329 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 71 +-
+ drivers/net/wireless/ath/ath10k/pci.h | 7 +-
+ drivers/net/wireless/ath/ath10k/qmi.c | 74 +-
+ drivers/net/wireless/ath/ath10k/qmi.h | 10 +-
+ drivers/net/wireless/ath/ath10k/sdio.c | 191 +-
+ drivers/net/wireless/ath/ath10k/sdio.h | 19 +-
+ drivers/net/wireless/ath/ath10k/snoc.c | 186 +-
+ drivers/net/wireless/ath/ath10k/snoc.h | 7 +
+ drivers/net/wireless/ath/ath10k/txrx.c | 2 +
+ drivers/net/wireless/ath/ath10k/usb.c | 12 -
+ drivers/net/wireless/ath/ath10k/wmi-ops.h | 40 +
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 142 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 116 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 52 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 61 +-
+ drivers/net/wireless/ath/ath11k/ahb.c | 61 +-
+ drivers/net/wireless/ath/ath11k/ahb.h | 22 -
+ drivers/net/wireless/ath/ath11k/core.c | 47 +-
+ drivers/net/wireless/ath/ath11k/core.h | 25 +-
+ drivers/net/wireless/ath/ath11k/debug.c | 9 +-
+ drivers/net/wireless/ath/ath11k/debug.h | 22 +-
+ drivers/net/wireless/ath/ath11k/debug_htt_stats.c | 48 +-
+ drivers/net/wireless/ath/ath11k/debug_htt_stats.h | 8 +-
+ drivers/net/wireless/ath/ath11k/debugfs_sta.c | 297 +
+ drivers/net/wireless/ath/ath11k/dp.c | 7 +-
+ drivers/net/wireless/ath/ath11k/dp.h | 14 +-
+ drivers/net/wireless/ath/ath11k/dp_rx.c | 60 +-
+ drivers/net/wireless/ath/ath11k/dp_tx.c | 69 +-
+ drivers/net/wireless/ath/ath11k/hal.c | 87 +-
+ drivers/net/wireless/ath/ath11k/hal.h | 2 +-
+ drivers/net/wireless/ath/ath11k/hal_desc.h | 6 +-
+ drivers/net/wireless/ath/ath11k/hal_rx.c | 22 +-
+ drivers/net/wireless/ath/ath11k/hal_rx.h | 2 +-
+ drivers/net/wireless/ath/ath11k/hal_tx.c | 13 +-
+ drivers/net/wireless/ath/ath11k/hal_tx.h | 1 +
+ drivers/net/wireless/ath/ath11k/hif.h | 65 +
+ drivers/net/wireless/ath/ath11k/htc.c | 4 +-
+ drivers/net/wireless/ath/ath11k/hw.h | 7 +-
+ drivers/net/wireless/ath/ath11k/mac.c | 102 +-
+ drivers/net/wireless/ath/ath11k/peer.c | 35 +-
+ drivers/net/wireless/ath/ath11k/peer.h | 1 +
+ drivers/net/wireless/ath/ath11k/thermal.c | 6 +-
+ drivers/net/wireless/ath/ath11k/trace.h | 12 +-
+ drivers/net/wireless/ath/ath11k/wmi.c | 170 +-
+ drivers/net/wireless/ath/ath11k/wmi.h | 88 +-
+ drivers/net/wireless/ath/ath5k/ani.c | 2 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 26 +-
+ drivers/net/wireless/ath/ath6kl/core.h | 4 +-
+ drivers/net/wireless/ath/ath6kl/debug.c | 2 +-
+ drivers/net/wireless/ath/ath6kl/hif.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9002_calib.c | 49 +-
+ drivers/net/wireless/ath/ath9k/calib.c | 16 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 58 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.h | 6 +
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 12 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1 +
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 9 +-
+ drivers/net/wireless/ath/ath9k/htc_hst.c | 6 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 2 +
+ drivers/net/wireless/ath/ath9k/init.c | 2 +
+ drivers/net/wireless/ath/ath9k/main.c | 1 +
+ drivers/net/wireless/ath/ath9k/recv.c | 3 +-
+ drivers/net/wireless/ath/ath9k/wmi.c | 6 +-
+ drivers/net/wireless/ath/ath9k/wmi.h | 3 +-
+ drivers/net/wireless/ath/carl9170/fw.c | 4 +-
+ drivers/net/wireless/ath/carl9170/main.c | 21 +-
+ drivers/net/wireless/ath/wcn36xx/hal.h | 4 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 6 +-
+ drivers/net/wireless/ath/wcn36xx/testmode.h | 2 +-
+ drivers/net/wireless/ath/wil6210/fw.h | 16 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 2 +-
+ drivers/net/wireless/ath/wil6210/wmi.h | 58 +-
+ drivers/net/wireless/atmel/atmel.c | 3 +-
+ drivers/net/wireless/broadcom/b43/main.c | 2 +-
+ drivers/net/wireless/broadcom/b43/phy_n.c | 2 +-
+ drivers/net/wireless/broadcom/b43/pio.c | 2 +-
+ drivers/net/wireless/broadcom/b43/xmit.c | 13 -
+ drivers/net/wireless/broadcom/b43legacy/main.c | 1 +
+ drivers/net/wireless/broadcom/b43legacy/xmit.c | 1 +
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 24 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 301 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 28 +
+ .../wireless/broadcom/brcm80211/brcmfmac/common.h | 4 +
+ .../broadcom/brcm80211/brcmfmac/commonring.c | 8 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 -
+ .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 9 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 12 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +-
+ .../broadcom/brcm80211/brcmfmac/flowring.c | 4 +-
+ .../broadcom/brcm80211/brcmfmac/fwsignal.c | 28 +-
+ .../broadcom/brcm80211/brcmfmac/fwsignal.h | 23 +
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 151 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 9 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 75 +-
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 +
+ .../wireless/broadcom/brcm80211/brcmsmac/main.c | 7 +-
+ .../net/wireless/broadcom/brcm80211/brcmsmac/stf.c | 7 +-
+ .../net/wireless/broadcom/brcm80211/brcmsmac/stf.h | 2 +-
+ drivers/net/wireless/cisco/airo.c | 12 +
+ drivers/net/wireless/intel/ipw2x00/Kconfig | 4 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c | 29 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.h | 12 +-
+ drivers/net/wireless/intel/ipw2x00/libipw.h | 28 +-
+ drivers/net/wireless/intel/iwlegacy/commands.h | 22 +-
+ drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/Makefile | 3 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 173 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 3 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/main.c | 11 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 11 +-
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 175 +-
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 39 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 39 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 39 +-
+ .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 5 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 14 +-
+ .../net/wireless/intel/iwlwifi/fw/api/location.h | 110 +-
+ .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 49 +-