diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-06-08 20:37:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-06-08 20:37:12 +1000 |
| commit | 1713116fa907cc7290020f0d8632ec646d2936f8 (patch) | |
| tree | f88507f6bbcc66a23041d9f7b9b7be0d0324d356 | |
| parent | a0da3ff7f68d3f7cf49ff325518f886aff7e5975 (diff) | |
| download | linux-next-1713116fa907cc7290020f0d8632ec646d2936f8.tar.gz | |
Add linux-next specific files for 20200608next-20200608
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 325 | ||||
| -rw-r--r-- | Next/Trees | 327 | ||||
| -rw-r--r-- | Next/merge.log | 10374 | ||||
| -rw-r--r-- | Next/quilt-import.log | 14 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 11041 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ec134e256c68 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,325 @@ +Name SHA1 +---- ---- +origin 9aa900c8094dba7a60dc805ecec1e9f720744ba1 +fixes df8cb0ea9423054e8b96be288db828d04310effa +kbuild-current b170290c2836c40ab565736ba37681eb3dfd79b8 +arc-current 9d9368e839c217e0788f2ec9cbe7f5db47d1bbf0 +arm-current 3866f217aaa81bf7165c7f27362eee5d7919c496 +arm-soc-fixes 99706d62fb50486eadb4441eaed311491fd7addf +uniphier-fixes 0e698dfa282211e414076f9dc7e83c1c288314fd +arm64-fixes ba051f097fc30b00f6b66044386901141351a557 +m68k-current 3381df0954199458fa3993db72fb427f0ed1e43b +powerpc-fixes 2f26ed1764b42a8c40d9c48441c73a70d805decf +s390-fixes 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +sparc fcdf818d239ee38c258a2ad56f9e49834d23f402 +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net 4e2905adac9f0fdc25154ac83719a986c2367a14 +bpf e7ed83d6fa1a00d0f2ad0327e73d3ea9e7ea8de1 +ipsec a4902d914e508f3691fa7ef885a76d2b7e735805 +netfilter bdc48fa11e46f867ea4d75fa59ee87a7f48be144 +ipvs bdc48fa11e46f867ea4d75fa59ee87a7f48be144 +wireless-drivers f92f26f2ed2c9f92c9270c705bca96310c3cdf5a +mac80211 523f3ec030aa5bf4818ec8dee35b2646abf367fa +rdma-fixes 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +sound-current 91231e525bb654731f60d6699472e1e98379bb01 +sound-asoc-fixes 1dd9cd775ef58ec8fa6e9faa975708483854bf65 +regmap-fixes 323ca2daef47cd5f0c9c5006edf4ed20d2b2ecec +regulator-fixes 5fb565b69dabd5a256fc116702331b54a4621dc9 +spi-fixes 7ce6dc9ef58da449a760d1e12266399cda38b3b5 +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 8dd06ef34b6e2f41b29fbf5fc1663780f2524285 +crypto-current 320bdbd816156f9ca07e5fed7bfb449f2908dda7 +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 636338d7968e47c7f2e0b772a2a825ad932883fb +kvm-fixes 6929f71e46bdddbf1c4d67c2728648176c67c555 +kvms390-fixes 5615e74f48dcc982655543e979b6c3f3f877e6f6 +hwmon-fixes ac11b65c0d26503b91388579f588570c62e49d91 +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 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +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 fb24bed5c035fbdc73c4f0e1b38122f187170d8d +kbuild b170290c2836c40ab565736ba37681eb3dfd79b8 +compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 94d1aed9f477bdb2625b2537c1ef2643963094f1 +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 03c7f5f0b844e9f652e87daf5c51bb93ccf75296 +arm64 5311ebfb612f08ec2a712a86d0af7ee2b423a9fc +arm-perf 10f6cd2af21bb44faab31a50ec3361d7649e5a39 +arm-soc 28107944fb709b04afc82ca626f334a490571e28 +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 cfb3fa6421f69e5d68c38c72f20b6146b170a5b7 +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 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +powerpc 1395375c592770fe5158a592944aaeed67fa94ff +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e9e4ef9116b12951eaee3f8447ba9bbb40ab3620 +risc-v e4bdb161fbb94e741a060e6dc69ab690ab5624da +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 bfa50e1427e4608ce6941d3d0855445fcaa7dbb7 +sh 37744feebc086908fd89760650f458ab19071750 +sparc-next 824c874abc1d99121934364647dd8ed7e71ce08e +uml f6e8c474390be2e6f5bd0b8966e19958214609ff +xtensa 3ead2f97bd44a9a106572d306cb04a878c569cb2 +fscrypt e3b1078bedd323df343894a27eb3b3c34944dfd1 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 8113246479a51f14966daa18c1fb943811000b6c +ceph dc1dad8e1a612650b1e786e992cb0c6e101e226a +cifs 5865985416ebb5a0c198a819a098b5cc300ac8a4 +configfs 8aebfffacfa379ba400da573a5bf9e49634e38cb +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 34f853b849eb6a509eb8f40f2f5946ebb1f62739 +exfat dd6e2b38b86781733291c0fdef693e8772dcb618 +ext3 16ec8bfe257b50d183ba30c6050e28a40372bbe9 +ext4 6b8ed62008a49751fc71fefd2a4f89202a7c2d4d +f2fs adf3d3a53cf13d0998c699ba43d8582c875179e3 +fsverity 9cd6b593cfc9eaa476c9a3fa768b08bca73213d0 +fuse 9b46418c40fe910e6537618f9932a8be78a3dd6c +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +nfs-anna 07e620d607d9ea08f9e94249f3174359e971b449 +nfsd 037e910b52b04fbd41990f643dff97c7e43b0e47 +orangefs 0df556457748d160013e88202c11712c16a83b0c +overlayfs 81e69c8b9e02dd9ddaeab4e48297a9cb397f4187 +ubifs 4b68bf9a69d22dd512d61d5f0ba01b065b01ede6 +v9fs 36f9967531da27ff8cc6f005d93760b578baffb9 +xfs 6dcde60efd946e38fac8d276a6ca47492103e856 +zonefs 568776f992c4cb5e1b5715dc4ab62e6ae906b80d +iomap b75dfde1212991b24b220c3995101c60a7b8ae74 +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks 5ef159681309621aa8fe06d94397b85b51974d55 +vfs b09e728da62fc883a012afe955a9fb9168a7ce65 +printk e35456906bd4a82e26319c722b0058b6679ec50b +pci 2bd81cd04a3f5eb873cc81fa16c469377be3b092 +pstore 78c08247b9d3e03192f8b359aa079024e805a948 +hid 5d7d489e9129000525ae2090e6c9254e56c6a9d6 +i2c 726b03203e45ded63f4479f0b2de7c89d91cf3be +i3c b4203ce0556348dcfe29f897d1dbe65102874d89 +dmi d9d8efd3241b119075b4900cc74ee52e5820604f +hwmon-staging ac11b65c0d26503b91388579f588570c62e49d91 +jc_docs e35b5a4c494a75a683ddf4901a43e0a128d5bfe3 +v4l-dvb 938b29db3aa9c293c7c1366b16e55e308f1a1ddd +v4l-dvb-next be4b9e888184bc10c16b180096ee2592cd42f5f1 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 5947e801f2e11738b9d4cae4be979dee2c9a8bb6 +cpufreq-arm 6cc3d0e9a097981c8a0317c65b8a2278593bd2b0 +cpupower 7b0bf99b9ee497cc0f079472566aff716d033d43 +opp 45679f9b508f10c12a1e93cf2bdccbc1c594aa39 +thermal 64488908b523f91f6396762e2997454b84013be7 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm fe204591cc9480347af7d2d6029b24a62e449486 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma fba97dc7fc76b2c9a909fa0b3786d30a9899f5cf +net-next cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 +bpf-next cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 +ipsec-next 9a25c1df24a6fea9dc79eec950453c4e00f707fd +mlx5-next 6b646a7e4af69814dd1a3340fca0f02d4977420d +netfilter-next 9a25c1df24a6fea9dc79eec950453c4e00f707fd +ipvs-next 9a25c1df24a6fea9dc79eec950453c4e00f707fd +wireless-drivers-next 1806c13dc2532090d742ce03847b22367fb20ad6 +bluetooth 4c07a5d7aeb39f559b29aa58ec9a8a5ab4282cb0 +mac80211-next cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 +gfs2 300e549b6e53025ea69550f009451f7a13bfc3eb +mtd 5788ccf3c84f5587418a80128a3653aa35abf00b +nand 86f2b225adf4ecd2edfdc8541a7342645556ac3b +spi-nor e8aec15dd5842b5b11b0e621a2293348d3574a61 +crypto 58ca0060ec4e51208d2eee12198fc55fd9e4feb3 +drm 9ca1f474cea0edc14a1d7ec933e5472c0ff115d3 +amdgpu 624a498a539a7ea60a57114991389f0280785aec +drm-intel f8665d797b1ce9bd81f7ed7744ef3a18d6b186ea +drm-tegra d1c746f8b59d5b4dce96e4a7bc4f12d410bb66ba +drm-misc 968d81a64a883af2d16dd3f8a6ad6b67db2fde58 +drm-msm 1cb2c4a2c89b2004a36399860c85a1af9b3fcba7 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 2c76b324c7944fedf453abca5003569d9556c6df +etnaviv f232d9ec029ce3e2543b05213e2979e01e503408 +regmap 323ca2daef47cd5f0c9c5006edf4ed20d2b2ecec +sound 91231e525bb654731f60d6699472e1e98379bb01 +sound-asoc 1dd9cd775ef58ec8fa6e9faa975708483854bf65 +modules 5c3a7db0c7ec4bbd5bd3f48af9be859a8fa3e532 +input d0ac7079d5fcaaaf3eb99c197a08ac1b399754f4 +block 5b53c3e1a873d6c91f502587ffb3d5b884746066 +device-mapper 64611a15ca9da91ff532982429c44686f4593b5f +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc ae5c0585dfc2168c589de5878df2e591dfbd4bf0 +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 098c4adf249c198519a4abebe482b1e6b8c50e47 +backlight 479da1f538a2f3547e15f9d5922c611b69ec2fbc +battery 152204dbdcee6df9406f87c81f9591aeaf1ba55b +regulator 5fb565b69dabd5a256fc116702331b54a4621dc9 +security 56f2e3b7d819f4fa44857ba81aa6870f18714ea0 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity 42413b49804b250ced70dac8815388af2d4ad872 +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +selinux fe5a90b8c14914397a3bb0c214d142103c1ba3bf +smack ef26650a201fbbb4ba90b63a82bf7950f2699a82 +tomoyo 039aeb9deb9291f3b19c375a8bc6fa7f768996cc +tpmdd 32a767afb0d8b2598a6064138a0a6bd43fe4bd72 +watchdog 072cb8b628d312f5785ffdf324286a0519aed910 +iommu 431275afdc7155415254aef4bd3816a1b8a2ead0 +vfio 4f085ca2f5a8047845ab2d6bbe97089daed28655 +audit 9d44a121c5a79bc8a9d67c058456bd52a83c79e7 +devicetree 8211d1e83aded34631aa87fa37f97d7bb712e925 +mailbox b7b2796b9b31e3dcbd563bcf8f983a79bb81163d +spi 7ce6dc9ef58da449a760d1e12266399cda38b3b5 +tip 22a1c800c96c83b7f4e3e02fad767502b70124fa +clockevents 809eb4e9bf9d84eb5b703358afd0d564d514f6d2 +edac daeb3bc9a92fdf8d240c728f7c6a7d9f0a5533a3 +irqchip 5a7f796d4f2028bde4c2ac778dfe0456851871b2 +ftrace daceabf1b494c9e40a93fcc323b1258f557f65a1 +rcu 8747b07d19443724745de86964e8818404112220 +kvm 6929f71e46bdddbf1c4d67c2728648176c67c555 +kvm-arm 7ae2f3db6167aa7184529fdacd1de72619baf93b +kvm-ppc 11362b1befeadaae4d159a8cddcdaf6b8afe08f9 +kvms390 0b545fd17f84184f9536bde68c3521e36c488448 +xen-tip 3add7f3042694b7d8b690bd6757d10361b335127 +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 c4100ef2dd424401e51feb1a5b574096a398f458 +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 01e5493c08b9a99221a452ab1da05b649926bd72 +scsi-mkp 06b43f968db58fd582b09b745338eae5af9f9f5e +vhost bdea059ef6824de2320335399e409b81af368ea8 +rpmsg 71f56fef13d43b4f7957f51a6aee3135c5012bb8 +gpio 74910e15ab25f95f162bc4d4a634d029186543ce +gpio-brgl e33a58a29c6ad6f844cdc184210aa1feb5e2fbe0 +gpio-intel 7e73aa90a38c8815acea7af71e285658bf5ab879 +pinctrl 94873f6b46f8c103759c28adc121a58022972d01 +pinctrl-intel 6d649fca349155698ba4b8858b258a62003c5c54 +pinctrl-samsung f354157a7d184db430c1a564c506434e33b1bec5 +pwm f5641d053d46a9a18fe13f2ecb4a7b4a66d9cdf7 +userns d35bec8a57881c840c6fffaacc7b9947555733ca +ktest 1091c8fce8aa9c5abe1a73acab4bcaf58a729005 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 382561a0f11c4995d48ab82670412f8d6c418430 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 8631420cac7db95f362c32eb22c47356575f316e +coresight c9d7e3da1f3c4cf5dddfc5d7ce4d76d013aba1cc +rtc 4601e24a6fb819d38d1156d0f690cbe6a42c6d76 +nvdimm f6d2b802f80d0ca89ee1f51c1781b3f79cdb25d5 +at24 8f3d9f354286745c751374f5f1fcafee6b3f3136 +ntb 2130c0ba69d69bb21f5c52787f2587db00d13d8a +kspp c7527373fe28f97d8a196ab562db5589be0d34b9 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 9b5816b56af6a424619ab51d24de34dfc65102d8 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus f9a478d658a2346c75d364843399d42c37632abd +nvmem be00147a195b73697da8fb742a4889a1b3e6cadc +xarray 27586ca786a729cda6c807621a1494900a56e7bc +hyperv afaa33da08abd10be8978781d7c99a9e67d2bbff +auxdisplay 3f03b64981723b61048ea46642bcaa9b518f3ad3 +kgdb c893de12e1ef17b581eb2cf8fc9018ec0cbd07df +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 d3a8688496cd46e40bf0b585bba7127321caf746 +akpm 1b37e2b4b943bb296cf46deb5270316dc6541120 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a9199fdbdf0b --- /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.libc.org/linux-sh#for-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..412698d63a11 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10374 @@ +$ date -R +Mon, 08 Jun 2020 08:58:05 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 15a2bc4dbb9c Merge branch 'exec-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace +Merging origin/master (9aa900c8094d Merge tag 'char-misc-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge origin/master +Updating 15a2bc4dbb9c..9aa900c8094d +Fast-forward + .gitignore | 1 + + .../ABI/stable/sysfs-driver-firmware-zynqmp | 103 + + .../ABI/testing/debugfs-driver-habanalabs | 17 + + Documentation/ABI/testing/sysfs-block-rnbd | 46 + + .../testing/sysfs-bus-event_source-devices-dfl_fme | 104 + + .../testing/sysfs-bus-event_source-devices-hv_24x7 | 21 + + Documentation/ABI/testing/sysfs-bus-iio-proximity | 10 + + Documentation/ABI/testing/sysfs-bus-iio-sx9310 | 10 + + Documentation/ABI/testing/sysfs-bus-most | 104 +- + .../ABI/testing/sysfs-bus-soundwire-master | 23 + + .../ABI/testing/sysfs-bus-soundwire-slave | 91 + + 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/ABI/testing/sysfs-devices-system-cpu | 39 + + Documentation/ABI/testing/sysfs-driver-habanalabs | 17 + + Documentation/ABI/testing/sysfs-driver-w1_therm | 116 + + Documentation/PCI/endpoint/pci-endpoint.rst | 16 +- + Documentation/admin-guide/README.rst | 11 +- + Documentation/admin-guide/cgroup-v2.rst | 6 +- + Documentation/admin-guide/device-mapper/dm-ebs.rst | 51 + + .../admin-guide/device-mapper/dm-integrity.rst | 8 + + .../admin-guide/device-mapper/dm-zoned.rst | 62 +- + Documentation/admin-guide/gpio/gpio-aggregator.rst | 111 + + Documentation/admin-guide/gpio/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/admin-guide/sysrq.rst | 10 +- + Documentation/arm/microchip.rst | 2 +- + Documentation/dev-tools/kcov.rst | 17 +- + .../devicetree/bindings/{ABI.txt => ABI.rst} | 5 +- + Documentation/devicetree/bindings/Makefile | 14 +- + Documentation/devicetree/bindings/arm/altera.yaml | 6 +- + Documentation/devicetree/bindings/arm/amlogic.yaml | 6 +- + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 2 +- + Documentation/devicetree/bindings/arm/arm,scmi.txt | 3 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 34 +- + .../devicetree/bindings/arm/atmel-at91.yaml | 7 + + Documentation/devicetree/bindings/arm/bitmain.yaml | 2 +- + .../devicetree/bindings/arm/calxeda/hb-sregs.yaml | 49 + + .../devicetree/bindings/arm/calxeda/l2ecc.txt | 15 - + .../devicetree/bindings/arm/calxeda/l2ecc.yaml | 42 + + .../devicetree/bindings/arm/coresight-cti.yaml | 20 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 86 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 4 + + Documentation/devicetree/bindings/arm/l2c2x0.yaml | 87 +- + .../devicetree/bindings/arm/mediatek.yaml | 22 + + .../bindings/arm/mediatek/mediatek,mmsys.txt | 7 +- + .../devicetree/bindings/arm/nxp/lpc32xx.yaml | 9 +- + Documentation/devicetree/bindings/arm/psci.yaml | 16 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 7 + + Documentation/devicetree/bindings/arm/realtek.yaml | 21 + + .../devicetree/bindings/arm/renesas,prr.yaml | 2 +- + Documentation/devicetree/bindings/arm/renesas.yaml | 10 + + .../devicetree/bindings/arm/rockchip.yaml | 5 + + .../bindings/arm/samsung/exynos-chipid.yaml | 5 +- + .../bindings/arm/samsung/samsung-boards.yaml | 1 + + .../bindings/arm/socionext/uniphier.yaml | 27 +- + .../devicetree/bindings/arm/stm32/st,mlahb.yaml | 2 +- + .../bindings/arm/stm32/st,stm32-syscon.yaml | 6 +- + .../devicetree/bindings/arm/stm32/stm32.yaml | 3 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + Documentation/devicetree/bindings/arm/syna.txt | 2 +- + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 2 +- + .../devicetree/bindings/ata/faraday,ftide010.yaml | 4 +- + .../devicetree/bindings/ata/renesas,rcar-sata.yaml | 1 + + .../devicetree/bindings/ata/sata_highbank.txt | 44 - + .../devicetree/bindings/ata/sata_highbank.yaml | 95 + + .../devicetree/bindings/auxdisplay/hit,hd44780.txt | 45 - + .../bindings/auxdisplay/hit,hd44780.yaml | 96 + + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 5 +- + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 4 +- + .../bindings/bus/arm,integrator-ap-lm.yaml | 83 + + .../devicetree/bindings/bus/baikal,bt1-apb.yaml | 90 + + .../devicetree/bindings/bus/baikal,bt1-axi.yaml | 107 + + .../clock/allwinner,sun4i-a10-gates-clk.yaml | 8 +- + .../bindings/clock/bitmain,bm1880-clk.yaml | 2 +- + .../devicetree/bindings/clock/calxeda.txt | 17 - + .../devicetree/bindings/clock/calxeda.yaml | 82 + + .../devicetree/bindings/clock/cirrus,lochnagar.txt | 94 - + .../bindings/clock/cirrus,lochnagar.yaml | 78 + + .../bindings/clock/fixed-factor-clock.yaml | 5 +- + .../devicetree/bindings/clock/fsl,plldig.yaml | 19 +- + .../devicetree/bindings/clock/imx1-clock.txt | 26 - + .../devicetree/bindings/clock/imx1-clock.yaml | 51 + + .../devicetree/bindings/clock/imx21-clock.txt | 27 - + .../devicetree/bindings/clock/imx21-clock.yaml | 51 + + .../devicetree/bindings/clock/imx23-clock.txt | 70 - + .../devicetree/bindings/clock/imx23-clock.yaml | 92 + + .../devicetree/bindings/clock/imx25-clock.txt | 160 - + .../devicetree/bindings/clock/imx25-clock.yaml | 186 + + .../devicetree/bindings/clock/imx27-clock.txt | 27 - + .../devicetree/bindings/clock/imx27-clock.yaml | 55 + + .../devicetree/bindings/clock/imx28-clock.txt | 93 - + .../devicetree/bindings/clock/imx28-clock.yaml | 115 + + .../devicetree/bindings/clock/imx31-clock.txt | 90 - + .../devicetree/bindings/clock/imx31-clock.yaml | 120 + + .../devicetree/bindings/clock/imx35-clock.txt | 114 - + .../devicetree/bindings/clock/imx35-clock.yaml | 139 + + .../devicetree/bindings/clock/imx5-clock.txt | 28 - + .../devicetree/bindings/clock/imx5-clock.yaml | 65 + + .../devicetree/bindings/clock/imx6q-clock.txt | 41 - + .../devicetree/bindings/clock/imx6q-clock.yaml | 72 + + .../devicetree/bindings/clock/imx6sl-clock.txt | 10 - + .../devicetree/bindings/clock/imx6sl-clock.yaml | 48 + + .../devicetree/bindings/clock/imx6sll-clock.txt | 36 - + .../devicetree/bindings/clock/imx6sll-clock.yaml | 66 + + .../devicetree/bindings/clock/imx6sx-clock.txt | 13 - + .../devicetree/bindings/clock/imx6sx-clock.yaml | 70 + + .../devicetree/bindings/clock/imx6ul-clock.txt | 13 - + .../devicetree/bindings/clock/imx6ul-clock.yaml | 66 + + .../devicetree/bindings/clock/imx7d-clock.txt | 13 - + .../devicetree/bindings/clock/imx7d-clock.yaml | 65 + + .../devicetree/bindings/clock/imx8qxp-lpcg.txt | 51 - + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 73 + + .../devicetree/bindings/clock/ingenic,cgu.txt | 57 - + .../devicetree/bindings/clock/ingenic,cgu.yaml | 124 + + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 2 +- + .../devicetree/bindings/clock/qcom,mmcc.yaml | 16 +- + .../bindings/clock/qcom,sc7180-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-gpucc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 2 +- + .../bindings/clock/qcom,sc7180-videocc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-gpucc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-videocc.yaml | 2 +- + .../bindings/clock/sprd,sc9863a-clk.yaml | 29 +- + .../bindings/connector/usb-connector.yaml | 73 +- + .../bindings/cpufreq/nvidia,tegra20-cpufreq.txt | 56 + + .../crypto/allwinner,sun4i-a10-crypto.yaml | 14 +- + .../bindings/crypto/allwinner,sun8i-ce.yaml | 16 +- + .../bindings/crypto/amlogic,gxl-crypto.yaml | 4 +- + .../devicetree/bindings/crypto/st,stm32-hash.yaml | 9 +- + .../allwinner,sun4i-a10-display-engine.yaml | 7 +- + .../bindings/display/allwinner,sun4i-a10-hdmi.yaml | 40 +- + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 63 +- + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 28 +- + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 10 +- + .../bindings/display/bridge/analogix,anx7814.yaml | 119 + + .../devicetree/bindings/display/bridge/anx7814.txt | 42 - + .../bindings/display/bridge/lvds-codec.yaml | 18 +- + .../bindings/display/panel/panel-common.yaml | 11 +- + .../bindings/display/panel/panel-timing.yaml | 120 +- + .../bindings/display/panel/sony,acx424akp.yaml | 2 +- + .../bindings/display/panel/xinpeng,xpp055c272.yaml | 4 +- + .../devicetree/bindings/display/renesas,cmm.yaml | 18 +- + .../display/tegra/nvidia,tegra20-host1x.txt | 73 +- + .../bindings/display/ti/ti,am65x-dss.yaml | 19 +- + .../bindings/display/ti/ti,j721e-dss.yaml | 34 +- + .../devicetree/bindings/dma/dma-common.yaml | 3 +- + .../devicetree/bindings/dma/ingenic,dma.yaml | 80 + + .../devicetree/bindings/dma/jz4780-dma.txt | 64 - + .../devicetree/bindings/dma/mtk-uart-apdma.txt | 3 +- + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 2 +- + .../devicetree/bindings/dma/ti/k3-udma.yaml | 29 +- + Documentation/devicetree/bindings/eeprom/at24.yaml | 13 +- + .../devicetree/bindings/example-schema.yaml | 17 +- + .../devicetree/bindings/extcon/extcon-arizona.txt | 76 - + .../bindings/extcon/extcon-usbc-cros-ec.yaml | 3 +- + .../devicetree/bindings/extcon/wlf,arizona.yaml | 125 + + .../bindings/firmware/intel,stratix10-svc.txt | 2 +- + .../bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 3 +- + .../bindings/gpio/brcm,xgs-iproc-gpio.yaml | 2 +- + .../devicetree/bindings/gpio/fsl-imx-gpio.txt | 35 - + .../devicetree/bindings/gpio/fsl-imx-gpio.yaml | 68 + + .../devicetree/bindings/gpio/gpio-mxs.txt | 88 - + .../devicetree/bindings/gpio/gpio-mxs.yaml | 136 + + .../devicetree/bindings/gpio/renesas,em-gio.yaml | 70 + + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 94 - + .../bindings/gpio/renesas,rcar-gpio.yaml | 144 + + .../devicetree/bindings/gpio/sifive,gpio.yaml | 2 +- + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 134 + + .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 65 - + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 6 + + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 20 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 6 + + .../devicetree/bindings/gpu/vivante,gc.yaml | 2 +- + .../bindings/hwmon/adi,axi-fan-control.yaml | 3 +- + .../devicetree/bindings/hwmon/adi,ltc2947.yaml | 32 +- + .../devicetree/bindings/hwmon/adt7475.yaml | 18 +- + .../devicetree/bindings/hwmon/cirrus,lochnagar.txt | 26 - + .../bindings/hwmon/cirrus,lochnagar.yaml | 35 + + .../devicetree/bindings/hwmon/ti,tmp513.yaml | 21 +- + .../devicetree/bindings/i2c/brcm,bcm2835-i2c.txt | 2 +- + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 58 + + .../devicetree/bindings/i2c/i2c-cadence.txt | 28 - + .../devicetree/bindings/i2c/i2c-jz4780.txt | 33 - + .../devicetree/bindings/i2c/i2c-mt65xx.txt | 1 + + .../devicetree/bindings/i2c/i2c-rk3x.yaml | 10 +- + Documentation/devicetree/bindings/i2c/i2c-xiic.txt | 25 - + .../devicetree/bindings/i2c/ingenic,i2c.yaml | 88 + + .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 6 + + .../devicetree/bindings/i2c/renesas,i2c.txt | 1 + + .../devicetree/bindings/i2c/renesas,iic.txt | 1 + + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 15 +- + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 49 + + .../devicetree/bindings/iio/accel/bma180.txt | 8 +- + .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 9 +- + .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 65 + + .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 62 + + .../devicetree/bindings/iio/adc/lltc,ltc2496.yaml | 9 +- + .../devicetree/bindings/iio/adc/maxim,max1241.yaml | 63 + + .../bindings/iio/adc/microchip,mcp3911.yaml | 7 +- + .../bindings/iio/adc/rockchip-saradc.txt | 37 - + .../bindings/iio/adc/rockchip-saradc.yaml | 80 + + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 35 +- + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 27 +- + .../bindings/iio/chemical/ams,ccs811.yaml | 53 + + .../bindings/iio/chemical/atlas,sensor.yaml | 8 +- + Documentation/devicetree/bindings/iio/common.yaml | 35 + + .../devicetree/bindings/iio/dac/ltc2632.txt | 8 +- + .../devicetree/bindings/iio/dac/st,stm32-dac.txt | 63 - + .../devicetree/bindings/iio/dac/st,stm32-dac.yaml | 110 + + .../devicetree/bindings/iio/gyroscope/bmg160.txt | 2 +- + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 137 + + .../devicetree/bindings/iio/imu/bmi160.txt | 37 - + .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 75 + + .../bindings/iio/light/amstaos,tsl2563.yaml | 49 + + .../devicetree/bindings/iio/light/tsl2563.txt | 19 - + .../devicetree/bindings/iio/light/tsl2772.yaml | 13 +- + .../devicetree/bindings/iio/light/vcnl4000.txt | 24 - + .../bindings/iio/light/vishay,vcnl4000.yaml | 50 + + .../bindings/iio/magnetometer/ak8974.txt | 4 +- + .../bindings/iio/proximity/vishay,vcnl3020.yaml | 62 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + .../bindings/iio/temperature/adi,ltc2983.yaml | 60 +- + Documentation/devicetree/bindings/index.rst | 12 + + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 9 +- + .../devicetree/bindings/input/gpio-keys-polled.txt | 45 - + .../devicetree/bindings/input/gpio-keys.txt | 58 - + .../devicetree/bindings/input/gpio-keys.yaml | 149 + + Documentation/devicetree/bindings/input/input.yaml | 9 +- + .../devicetree/bindings/input/iqs62x-keys.yaml | 7 +- + .../bindings/input/touchscreen/edt-ft5x06.yaml | 30 +- + .../bindings/input/touchscreen/goodix.yaml | 2 +- + .../bindings/interconnect/fsl,imx8m-noc.yaml | 101 + + .../bindings/interconnect/qcom,msm8916.yaml | 4 +- + .../bindings/interconnect/qcom,msm8974.yaml | 4 +- + .../bindings/interconnect/qcom,qcs404.yaml | 4 +- + .../bindings/interconnect/qcom,sc7180.yaml | 6 +- + .../bindings/interconnect/qcom,sdm845.yaml | 4 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 12 +- + .../bindings/interrupt-controller/arm,gic-v3.yaml | 39 +- + .../bindings/interrupt-controller/arm,gic.yaml | 9 + + .../bindings/interrupt-controller/fsl,irqsteer.txt | 35 - + .../interrupt-controller/fsl,irqsteer.yaml | 89 + + .../bindings/interrupt-controller/ingenic,intc.txt | 28 - + .../interrupt-controller/ingenic,intc.yaml | 63 + + .../intel,ixp4xx-interrupt.yaml | 8 +- + .../interrupt-controller/loongson,liointc.yaml | 8 +- + .../interrupt-controller/renesas,intc-irqpin.txt | 62 - + .../interrupt-controller/renesas,intc-irqpin.yaml | 107 + + .../interrupt-controller/renesas,irqc.yaml | 3 +- + .../interrupt-controller/st,stm32-exti.yaml | 12 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 4 +- + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 73 - + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 98 + + .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 10 +- + .../devicetree/bindings/ipmi/ipmi-smic.txt | 25 - + .../devicetree/bindings/ipmi/ipmi-smic.yaml | 63 + + Documentation/devicetree/bindings/leds/common.yaml | 13 +- + .../devicetree/bindings/leds/leds-gpio.yaml | 3 +- + .../bindings/leds/rohm,bd71828-leds.yaml | 9 +- + .../devicetree/bindings/mailbox/fsl,mu.txt | 58 - + .../devicetree/bindings/mailbox/fsl,mu.yaml | 91 + + .../devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 7 +- + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 28 +- + .../devicetree/bindings/media/amlogic,gx-vdec.yaml | 20 +- + .../bindings/media/amlogic,meson-gx-ao-cec.yaml | 5 +- + .../devicetree/bindings/media/i2c/imx219.yaml | 3 +- + .../bindings/media/marvell,mmp2-ccic.txt | 50 - + .../bindings/media/marvell,mmp2-ccic.yaml | 99 + + .../bindings/media/qcom,sc7180-venus.yaml | 2 +- + .../bindings/media/qcom,sdm845-venus-v2.yaml | 2 +- + .../bindings/media/qcom,sdm845-venus.yaml | 2 +- + Documentation/devicetree/bindings/media/rc.yaml | 265 +- + .../devicetree/bindings/media/renesas,ceu.yaml | 39 +- + .../devicetree/bindings/media/renesas,csi2.yaml | 2 +- + .../devicetree/bindings/media/renesas,vin.yaml | 21 +- + .../devicetree/bindings/media/ti,vpe.yaml | 2 +- + .../memory-controllers/baikal,bt1-l2-ctl.yaml | 63 + + .../memory-controllers/calxeda-ddr-ctrlr.txt | 16 - + .../memory-controllers/calxeda-ddr-ctrlr.yaml | 42 + + .../bindings/memory-controllers/exynos-srom.yaml | 13 +- + .../memory-controllers/fsl/imx8m-ddrc.yaml | 6 +- + .../memory-controllers/ingenic,jz4780-nemc.txt | 76 - + .../bindings/memory-controllers/ingenic,nemc.yaml | 126 + + .../memory-controllers/nvidia,tegra124-emc.yaml | 13 +- + .../memory-controllers/nvidia,tegra124-mc.yaml | 5 +- + .../memory-controllers/nvidia,tegra210-emc.yaml | 82 + + .../memory-controllers/nvidia,tegra30-emc.yaml | 9 +- + .../memory-controllers/nvidia,tegra30-mc.yaml | 3 +- + .../bindings/memory-controllers/renesas,dbsc.txt | 44 - + .../bindings/memory-controllers/renesas,dbsc.yaml | 56 + + .../bindings/mfd/allwinner,sun4i-a10-ts.yaml | 20 +- + Documentation/devicetree/bindings/mfd/arizona.txt | 101 - + .../devicetree/bindings/mfd/cirrus,lochnagar.txt | 85 - + .../devicetree/bindings/mfd/cirrus,lochnagar.yaml | 352 + + .../devicetree/bindings/mfd/cirrus,madera.yaml | 299 + + Documentation/devicetree/bindings/mfd/madera.txt | 114 - + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 4 +- + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 37 +- + .../devicetree/bindings/mfd/st,stpmic1.yaml | 9 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 17 +- + .../devicetree/bindings/mfd/wlf,arizona.yaml | 280 + + .../devicetree/bindings/mips/ingenic/devices.yaml | 4 + + .../devicetree/bindings/mmc/aspeed,sdhci.yaml | 4 +- + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 79 +- + .../devicetree/bindings/mmc/ingenic,mmc.yaml | 79 + + Documentation/devicetree/bindings/mmc/jz4740.txt | 41 - + .../devicetree/bindings/mmc/mmc-controller.yaml | 37 +- + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 2 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 24 +- + .../bindings/mmc/socionext,uniphier-sd.yaml | 14 +- + .../bindings/mmc/synopsys-dw-mshc-common.yaml | 14 +- + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 13 +- + .../devicetree/bindings/mtd/denali,nand.yaml | 4 +- + .../bindings/mtd/ingenic,jz4780-nand.txt | 92 - + .../devicetree/bindings/mtd/ingenic,nand.yaml | 132 + + .../devicetree/bindings/mtd/nand-controller.yaml | 27 +- + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 4 +- + .../devicetree/bindings/net/calxeda-xgmac.txt | 18 - + .../devicetree/bindings/net/calxeda-xgmac.yaml | 49 + + .../devicetree/bindings/net/can/bosch,m_can.yaml | 111 +- + .../bindings/net/ethernet-controller.yaml | 34 +- + .../devicetree/bindings/net/qca,ar803x.yaml | 17 +- + .../devicetree/bindings/net/qcom,ipa.yaml | 12 +- + .../devicetree/bindings/net/renesas,ether.yaml | 9 +- + .../devicetree/bindings/net/renesas,ravb.txt | 1 + + .../devicetree/bindings/net/snps,dwmac.yaml | 30 +- + .../devicetree/bindings/net/stm32-dwmac.txt | 44 - + .../devicetree/bindings/net/stm32-dwmac.yaml | 148 + + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 18 +- + .../devicetree/bindings/net/ti,davinci-mdio.yaml | 34 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 98 +- + .../devicetree/bindings/nvmem/imx-iim.txt | 22 - + .../devicetree/bindings/nvmem/imx-iim.yaml | 57 + + .../devicetree/bindings/nvmem/imx-ocotp.txt | 50 - + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 95 + + .../devicetree/bindings/nvmem/mxs-ocotp.txt | 24 - + .../devicetree/bindings/nvmem/mxs-ocotp.yaml | 50 + + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 2 - + .../devicetree/bindings/nvmem/rockchip-efuse.txt | 54 - + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 70 + + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 17 + + .../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 | 13 +- + .../devicetree/bindings/pci/cdns-pcie.yaml | 8 - + .../devicetree/bindings/pci/intel-gw-pcie.yaml | 7 +- + Documentation/devicetree/bindings/pci/pci-ep.yaml | 9 +- + .../devicetree/bindings/pci/pci-rcar-gen2.txt | 3 +- + .../devicetree/bindings/pci/rcar-pci-ep.yaml | 77 + + Documentation/devicetree/bindings/pci/rcar-pci.txt | 3 +- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 92 + + .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 2 +- + .../bindings/phy/amlogic,meson-axg-pcie.yaml | 2 +- + .../bindings/phy/amlogic,meson8b-usb2-phy.yaml | 64 + + .../devicetree/bindings/phy/calxeda-combophy.txt | 17 - + .../devicetree/bindings/phy/calxeda-combophy.yaml | 51 + + .../devicetree/bindings/phy/cdns,salvo-phy.yaml | 52 + + .../devicetree/bindings/phy/intel,combo-phy.yaml | 101 + + .../bindings/phy/intel,lgm-emmc-phy.yaml | 2 +- + .../devicetree/bindings/phy/meson-gxl-usb3-phy.txt | 31 - + .../devicetree/bindings/phy/meson8b-usb2-phy.txt | 28 - + .../bindings/phy/phy-cadence-torrent.yaml | 59 +- + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 313 + + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 136 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 65 +- + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 80 + + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 242 - + .../bindings/phy/qcom-usb-ipq4019-phy.yaml | 50 + + .../devicetree/bindings/phy/rcar-gen2-phy.txt | 3 +- + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 70 - + .../devicetree/bindings/phy/rcar-gen3-phy-usb3.txt | 52 - + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 117 + + .../devicetree/bindings/phy/renesas,usb3-phy.yaml | 79 + + .../bindings/phy/rockchip,px30-dsi-dphy.yaml | 2 +- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 77 + + .../bindings/phy/socionext,uniphier-usb2-phy.yaml | 85 + + .../phy/socionext,uniphier-usb3hs-phy.yaml | 103 + + .../phy/socionext,uniphier-usb3ss-phy.yaml | 96 + + .../devicetree/bindings/phy/uniphier-pcie-phy.txt | 36 - + .../devicetree/bindings/phy/uniphier-usb2-phy.txt | 45 - + .../bindings/phy/uniphier-usb3-hsphy.txt | 69 - + .../bindings/phy/uniphier-usb3-ssphy.txt | 58 - + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 12 +- + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 37 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 46 +- + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 108 +- + .../bindings/pinctrl/cirrus,lochnagar.txt | 141 - + .../bindings/pinctrl/cirrus,lochnagar.yaml | 190 + + .../bindings/pinctrl/cirrus,madera-pinctrl.txt | 99 - + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 122 + + .../bindings/pinctrl/fsl,imx8mm-pinctrl.yaml | 31 +- + .../bindings/pinctrl/fsl,imx8mn-pinctrl.yaml | 31 +- + .../bindings/pinctrl/fsl,imx8mp-pinctrl.yaml | 31 +- + .../bindings/pinctrl/fsl,imx8mq-pinctrl.yaml | 31 +- + .../devicetree/bindings/pinctrl/intel,lgm-io.yaml | 4 +- + .../devicetree/bindings/pinctrl/pinmux-node.yaml | 3 +- + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 3 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 54 +- + .../bindings/power/amlogic,meson-ee-pwrc.yaml | 105 +- + .../devicetree/bindings/power/fsl,imx-gpc.txt | 91 - + .../devicetree/bindings/power/fsl,imx-gpc.yaml | 124 + + .../devicetree/bindings/power/fsl,imx-gpcv2.txt | 77 - + .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 108 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../devicetree/bindings/power/renesas,apmu.yaml | 1 + + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + Documentation/devicetree/bindings/pwm/imx-pwm.txt | 27 - + Documentation/devicetree/bindings/pwm/imx-pwm.yaml | 66 + + .../devicetree/bindings/pwm/imx-tpm-pwm.txt | 22 - + .../devicetree/bindings/pwm/imx-tpm-pwm.yaml | 55 + + Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 17 - + Documentation/devicetree/bindings/pwm/mxs-pwm.yaml | 43 + + .../devicetree/bindings/pwm/pwm-samsung.yaml | 27 +- + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 2 +- + .../bindings/regulator/arizona-regulator.txt | 18 - + .../bindings/regulator/cirrus,lochnagar.txt | 82 - + .../bindings/regulator/gpio-regulator.yaml | 35 +- + .../devicetree/bindings/regulator/mps,mp5416.yaml | 6 +- + .../devicetree/bindings/regulator/mps,mpq7920.yaml | 28 +- + .../devicetree/bindings/regulator/regulator.yaml | 5 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 34 +- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 27 +- + .../bindings/regulator/st,stm32-booster.yaml | 3 +- + .../bindings/regulator/st,stm32mp1-pwr-reg.yaml | 3 +- + .../devicetree/bindings/regulator/wlf,arizona.yaml | 37 + + .../bindings/remoteproc/st,stm32-rproc.yaml | 11 +- + .../bindings/reserved-memory/reserved-memory.txt | 2 + + .../reset/brcm,bcm7216-pcie-sata-rescal.yaml | 4 +- + .../devicetree/bindings/reset/fsl,imx7-src.txt | 6 +- + .../devicetree/bindings/reset/intel,rcu-gw.yaml | 3 +- + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 20 +- + .../devicetree/bindings/rtc/renesas,sh-rtc.yaml | 5 + + Documentation/devicetree/bindings/rtc/rtc-mxc.txt | 26 - + Documentation/devicetree/bindings/rtc/rtc-mxc.yaml | 57 + + .../devicetree/bindings/rtc/rtc-mxc_v2.txt | 17 - + .../devicetree/bindings/rtc/rtc-mxc_v2.yaml | 46 + + .../devicetree/bindings/rtc/st,stm32-rtc.yaml | 47 +- + Documentation/devicetree/bindings/serial/8250.txt | 100 - + Documentation/devicetree/bindings/serial/8250.yaml | 233 + + .../bindings/serial/amlogic,meson-uart.yaml | 16 +- + .../devicetree/bindings/serial/ingenic,uart.txt | 28 - + .../devicetree/bindings/serial/ingenic,uart.yaml | 94 + + .../devicetree/bindings/serial/mrvl-serial.txt | 4 - + .../devicetree/bindings/serial/nxp,sc16is7xx.txt | 4 + + .../devicetree/bindings/serial/pl011.yaml | 10 +- + .../devicetree/bindings/serial/qca,ar9330-uart.txt | 31 - + .../bindings/serial/qca,ar9330-uart.yaml | 50 + + .../bindings/serial/renesas,em-uart.yaml | 49 + + .../devicetree/bindings/serial/renesas,hscif.yaml | 1 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + .../devicetree/bindings/serial/renesas,scifa.yaml | 15 +- + .../devicetree/bindings/serial/renesas,scifb.yaml | 1 + + .../devicetree/bindings/serial/rs485.yaml | 47 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 13 +- + .../devicetree/bindings/serial/serial.yaml | 8 + + .../devicetree/bindings/serial/sifive-serial.yaml | 2 +- + .../devicetree/bindings/serial/st,stm32-uart.yaml | 14 + + .../bindings/soc/amlogic/amlogic,canvas.yaml | 10 +- + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,apr.txt | 20 +- + .../devicetree/bindings/soc/qcom/qcom,geni-se.txt | 94 - + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 225 + + .../devicetree/bindings/soc/ti/k3-socinfo.yaml | 40 + + .../devicetree/bindings/sound/adi,adau7118.yaml | 20 +- + .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 51 +- + .../devicetree/bindings/sound/amlogic,aiu.yaml | 3 +- + .../bindings/sound/amlogic,g12a-toacodec.yaml | 2 +- + .../devicetree/bindings/sound/amlogic,t9015.yaml | 3 +- + .../devicetree/bindings/sound/cirrus,lochnagar.txt | 39 - + .../bindings/sound/cirrus,lochnagar.yaml | 52 + + .../devicetree/bindings/sound/cirrus,madera.yaml | 113 + + Documentation/devicetree/bindings/sound/madera.txt | 67 - + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 3 +- + .../devicetree/bindings/sound/renesas,fsi.yaml | 41 +- + .../devicetree/bindings/sound/rockchip-i2s.yaml | 6 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 10 +- + .../devicetree/bindings/sound/wlf,arizona.txt | 53 - + .../devicetree/bindings/sound/wlf,arizona.yaml | 114 + + .../devicetree/bindings/spi/marvell,mmp2-ssp.yaml | 58 + + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 10 +- + .../devicetree/bindings/spi/renesas,hspi.yaml | 4 +- + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 44 +- + .../devicetree/bindings/spi/spi-controller.yaml | 14 +- + .../devicetree/bindings/spi/spi-pl022.yaml | 57 +- + .../devicetree/bindings/spi/spi-pxa2xx.txt | 27 - + .../devicetree/bindings/spi/spi-sifive.yaml | 25 +- + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 4 +- + .../sram/allwinner,sun4i-a10-system-control.yaml | 64 +- + .../devicetree/bindings/sram/rockchip-pmu-sram.txt | 16 - + Documentation/devicetree/bindings/sram/sram.yaml | 28 +- + ...bmitting-patches.txt => submitting-patches.rst} | 12 +- + .../bindings/thermal/amlogic,thermal.yaml | 10 +- + .../devicetree/bindings/thermal/imx-thermal.txt | 61 - + .../devicetree/bindings/thermal/imx-thermal.yaml | 102 + + .../devicetree/bindings/thermal/imx8mm-thermal.txt | 15 - + .../bindings/thermal/imx8mm-thermal.yaml | 58 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 7 +- + .../bindings/thermal/rcar-gen3-thermal.txt | 60 - + .../bindings/thermal/rcar-gen3-thermal.yaml | 99 + + .../devicetree/bindings/thermal/rcar-thermal.yaml | 7 +- + .../thermal/socionext,uniphier-thermal.yaml | 59 + + .../devicetree/bindings/thermal/sprd-thermal.yaml | 2 +- + .../bindings/thermal/uniphier-thermal.txt | 65 - + .../devicetree/bindings/timer/arm,arch_timer.yaml | 10 +- + .../bindings/timer/arm,arch_timer_mmio.yaml | 11 +- + .../bindings/timer/cadence,ttc-timer.txt | 21 - + .../devicetree/bindings/timer/cdns,ttc.yaml | 48 + + .../devicetree/bindings/timer/fsl,imxgpt.txt | 45 - + .../devicetree/bindings/timer/fsl,imxgpt.yaml | 72 + + .../devicetree/bindings/timer/ingenic,tcu.txt | 138 - + .../devicetree/bindings/timer/ingenic,tcu.yaml | 280 + + .../devicetree/bindings/timer/nxp,sysctr-timer.txt | 25 - + .../bindings/timer/nxp,sysctr-timer.yaml | 54 + + .../devicetree/bindings/timer/nxp,tpm-timer.txt | 28 - + .../devicetree/bindings/timer/nxp,tpm-timer.yaml | 61 + + .../devicetree/bindings/timer/renesas,cmt.txt | 110 - + .../devicetree/bindings/timer/renesas,cmt.yaml | 182 + + .../devicetree/bindings/timer/renesas,mtu2.txt | 42 - + .../devicetree/bindings/timer/renesas,mtu2.yaml | 76 + + .../devicetree/bindings/timer/renesas,ostm.txt | 31 - + .../devicetree/bindings/timer/renesas,ostm.yaml | 59 + + .../devicetree/bindings/ufs/ti,j721e-ufs.yaml | 65 +- + .../devicetree/bindings/usb/amlogic,dwc3.txt | 42 - + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 76 +- + .../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 82 +- + .../devicetree/bindings/usb/atmel-usb.txt | 56 +- + .../devicetree/bindings/usb/brcm,bcm7445-ehci.yaml | 59 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 11 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 2 - + Documentation/devicetree/bindings/usb/ehci-mv.txt | 23 - + .../devicetree/bindings/usb/generic-ehci.yaml | 27 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 6 + + .../devicetree/bindings/usb/ingenic,musb.yaml | 3 + + .../devicetree/bindings/usb/keystone-usb.txt | 56 - + .../bindings/usb/marvell,pxau2o-ehci.yaml | 62 + + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 8 +- + .../devicetree/bindings/usb/qcom,dwc3.txt | 104 - + .../devicetree/bindings/usb/qcom,dwc3.yaml | 174 + + .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 2 +- + .../devicetree/bindings/usb/renesas,usbhs.yaml | 3 +- + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 54 +- + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 77 + + .../devicetree/bindings/usb/ti,tps6598x.yaml | 64 + + .../devicetree/bindings/usb/usb-conn-gpio.txt | 30 - + Documentation/devicetree/bindings/usb/usb-xhci.txt | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 28 + + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 24 - + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 54 + + .../bindings/watchdog/fsl-imx7ulp-wdt.txt | 22 - + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 60 + + .../devicetree/bindings/watchdog/renesas,wdt.txt | 51 - + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 101 + + .../bindings/watchdog/socionext,uniphier-wdt.yaml | 36 + + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 2 +- + .../devicetree/bindings/watchdog/uniphier-wdt.txt | 20 - + .../{writing-bindings.txt => writing-bindings.rst} | 9 +- + Documentation/devicetree/bindings/xilinx.txt | 143 - + .../devicetree/{changesets.txt => changesets.rst} | 24 +- + ...tion-notes.txt => dynamic-resolution-notes.rst} | 5 +- + Documentation/devicetree/index.rst | 17 + + .../{of_unittest.txt => of_unittest.rst} | 192 +- + .../{overlay-notes.txt => overlay-notes.rst} | 119 +- + .../{usage-model.txt => usage-model.rst} | 35 +- + Documentation/dontdiff | 1 + + Documentation/driver-api/driver-model/devres.rst | 8 - + Documentation/driver-api/driver-model/driver.rst | 32 +- + Documentation/driver-api/gpio/board.rst | 15 +- + Documentation/driver-api/iio/triggers.rst | 2 - + Documentation/driver-api/infiniband.rst | 3 - + Documentation/driver-api/soundwire/stream.rst | 89 +- + Documentation/driver-api/soundwire/summary.rst | 7 +- + .../debug/debug-vm-pgtable/arch-support.txt | 34 + + Documentation/filesystems/fiemap.rst | 12 +- + .../firmware-guide/acpi/intel-pmc-mux.rst | 153 + + Documentation/fpga/dfl.rst | 84 + + Documentation/index.rst | 3 + + Documentation/infiniband/core_locking.rst | 2 - + Documentation/kbuild/makefiles.rst | 187 +- + Documentation/kbuild/modules.rst | 12 - + Documentation/powerpc/bootwrapper.rst | 28 +- + Documentation/powerpc/index.rst | 1 + + Documentation/powerpc/transactional_memory.rst | 27 + + Documentation/powerpc/vas-api.rst | 292 + + Documentation/process/submitting-patches.rst | 2 +- + Documentation/trace/coresight/coresight-ect.rst | 5 +- + Documentation/trace/coresight/coresight.rst | 85 + + .../it_IT/process/submitting-patches.rst | 2 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/w1/slaves/w1_therm.rst | 50 +- + Kconfig | 2 - + MAINTAINERS | 122 +- + Makefile | 217 +- + arch/alpha/kernel/setup.c | 13 +- + arch/arc/Kconfig | 1 + + arch/arc/include/asm/highmem.h | 18 - + arch/arc/mm/highmem.c | 28 +- + arch/arm/Kconfig | 4 +- + arch/arm/Kconfig.debug | 10 + + arch/arm/Makefile | 5 +- + arch/arm/boot/deflate_xip_data.sh | 2 +- + arch/arm/boot/dts/Makefile | 19 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 6 +- + arch/arm/boot/dts/am33xx.dtsi | 20 + + 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 | 392 +- + 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/at91sam9rl.dtsi | 54 - + arch/arm/boot/dts/at91sam9x5.dtsi | 54 - + 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-evm.dts | 101 + + arch/arm/boot/dts/keystone-k2g.dtsi | 26 +- + 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/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.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 | 415 +- + arch/arm/boot/dts/sama5d3.dtsi | 537 +- + 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 | 126 +- + 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/include/asm/highmem.h | 9 - + arch/arm/include/asm/pgtable.h | 1 - + arch/arm/kernel/elf.c | 27 +- + arch/arm/kernel/time.c | 2 +- + arch/arm/lib/uaccess_with_memcpy.c | 7 +- + 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 | 577 +- + 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-sa1100/assabet.c | 2 +- + 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/mach-zynq/Kconfig | 1 - + arch/arm/mm/cache-b15-rac.c | 3 +- + arch/arm/mm/dump.c | 29 +- + arch/arm/mm/fault-armv.c | 7 +- + arch/arm/mm/fault.c | 22 +- + arch/arm/mm/highmem.c | 35 +- + arch/arm/mm/idmap.c | 3 +- + arch/arm/mm/init.c | 2 +- + arch/arm/mm/ioremap.c | 12 +- + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmu.c | 35 +- + arch/arm/mm/pgd.c | 40 +- + 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 | 1 + + arch/arm64/Kconfig.platforms | 5 +- + arch/arm64/Makefile | 2 - + .../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/intel/socfpga_agilex.dtsi | 4 +- + 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 | 959 ++- + .../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 | 104 +- + .../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/boot/dts/xilinx/zynqmp.dtsi | 6 +- + arch/arm64/configs/defconfig | 18 +- + arch/arm64/include/asm/elf.h | 23 +- + arch/arm64/include/asm/kvm_mmu.h | 10 +- + arch/arm64/include/asm/pgalloc.h | 10 +- + arch/arm64/include/asm/pgtable-types.h | 5 +- + arch/arm64/include/asm/pgtable.h | 37 +- + arch/arm64/include/asm/stage2_pgtable.h | 48 +- + arch/arm64/kernel/hibernate.c | 44 +- + arch/arm64/kernel/pci.c | 4 +- + arch/arm64/kvm/mmu.c | 209 +- + arch/arm64/mm/fault.c | 9 +- + arch/arm64/mm/hugetlbpage.c | 15 +- + arch/arm64/mm/kasan_init.c | 26 +- + arch/arm64/mm/mmu.c | 52 +- + arch/arm64/mm/pageattr.c | 7 +- + arch/csky/include/asm/highmem.h | 12 +- + arch/csky/mm/highmem.c | 56 +- + arch/h8300/boot/compressed/Makefile | 2 +- + arch/h8300/include/asm/pgtable.h | 1 - + arch/hexagon/Makefile | 2 +- + arch/hexagon/include/asm/fixmap.h | 4 +- + arch/hexagon/include/asm/pgtable.h | 1 - + arch/ia64/Makefile | 2 +- + arch/ia64/include/asm/pgalloc.h | 4 +- + arch/ia64/include/asm/pgtable.h | 17 +- + arch/ia64/mm/fault.c | 7 +- + arch/ia64/mm/hugetlbpage.c | 18 +- + arch/ia64/mm/init.c | 28 +- + arch/m68k/Makefile | 8 +- + arch/microblaze/include/asm/highmem.h | 27 - + arch/microblaze/mm/highmem.c | 21 +- + arch/microblaze/mm/init.c | 3 - + arch/mips/include/asm/highmem.h | 11 +- + arch/mips/kernel/sysrq.c | 2 +- + arch/mips/mm/cache.c | 6 +- + arch/mips/mm/highmem.c | 54 +- + arch/nds32/include/asm/highmem.h | 9 - + arch/nds32/mm/highmem.c | 41 +- + arch/nios2/include/asm/pgtable.h | 3 +- + arch/nios2/mm/fault.c | 9 +- + arch/nios2/mm/ioremap.c | 6 +- + arch/openrisc/include/asm/pgtable.h | 1 - + arch/openrisc/mm/fault.c | 10 +- + arch/openrisc/mm/init.c | 4 +- + arch/parisc/Makefile | 2 +- + arch/parisc/include/asm/cacheflush.h | 30 +- + arch/powerpc/Kconfig | 70 +- + arch/powerpc/Kconfig.debug | 2 +- + arch/powerpc/boot/Makefile | 14 +- + arch/powerpc/boot/dts/Makefile | 1 - + arch/powerpc/boot/dts/ep405.dts | 230 - + arch/powerpc/boot/dts/pcm032.dts | 4 +- + arch/powerpc/boot/dts/virtex440-ml507.dts | 406 - + arch/powerpc/boot/dts/virtex440-ml510.dts | 466 - + arch/powerpc/boot/dts/walnut.dts | 246 - + arch/powerpc/boot/ep405.c | 71 - + arch/powerpc/boot/ops.h | 1 - + arch/powerpc/boot/serial.c | 5 - + arch/powerpc/boot/treeboot-walnut.c | 81 - + arch/powerpc/boot/uartlite.c | 79 - + arch/powerpc/boot/virtex.c | 97 - + arch/powerpc/boot/virtex405-head.S | 31 - + arch/powerpc/boot/wrapper | 26 +- + arch/powerpc/configs/40x/acadia_defconfig | 1 - + arch/powerpc/configs/40x/ep405_defconfig | 62 - + arch/powerpc/configs/40x/kilauea_defconfig | 1 - + arch/powerpc/configs/40x/klondike_defconfig | 1 - + arch/powerpc/configs/40x/makalu_defconfig | 1 - + arch/powerpc/configs/40x/obs600_defconfig | 1 - + arch/powerpc/configs/40x/virtex_defconfig | 75 - + arch/powerpc/configs/44x/virtex5_defconfig | 74 - + arch/powerpc/configs/adder875_defconfig | 1 - + arch/powerpc/configs/ep88xc_defconfig | 1 - + arch/powerpc/configs/mpc866_ads_defconfig | 1 - + arch/powerpc/configs/mpc885_ads_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 1 + + arch/powerpc/configs/ppc40x_defconfig | 9 - + arch/powerpc/configs/ppc44x_defconfig | 8 - + arch/powerpc/configs/ppc64_defconfig | 2 + + arch/powerpc/configs/pseries_defconfig | 1 + + arch/powerpc/configs/tqm8xx_defconfig | 1 - + arch/powerpc/include/asm/asm-405.h | 19 - + arch/powerpc/include/asm/atomic.h | 11 - + arch/powerpc/include/asm/bitops.h | 4 - + arch/powerpc/include/asm/book3s/32/kup.h | 7 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 83 +- + arch/powerpc/include/asm/book3s/64/hash.h | 4 +- + arch/powerpc/include/asm/book3s/64/kup-radix.h | 41 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 5 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 4 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 110 +- + arch/powerpc/include/asm/book3s/64/radix.h | 6 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 3 +- + arch/powerpc/include/asm/cache.h | 2 +- + arch/powerpc/include/asm/cmpxchg.h | 11 - + arch/powerpc/include/asm/code-patching.h | 37 +- + arch/powerpc/include/asm/cputable.h | 22 +- + arch/powerpc/include/asm/debug.h | 2 +- + arch/powerpc/include/asm/drmem.h | 1 + + arch/powerpc/include/asm/fadump-internal.h | 4 +- + arch/powerpc/include/asm/firmware.h | 1 + + arch/powerpc/include/asm/fixmap.h | 4 + + arch/powerpc/include/asm/ftrace.h | 14 + + arch/powerpc/include/asm/futex.h | 3 - + arch/powerpc/include/asm/highmem.h | 28 - + arch/powerpc/include/asm/hugetlb.h | 4 - + arch/powerpc/include/asm/hw_breakpoint.h | 31 +- + arch/powerpc/include/asm/icswx.h | 20 +- + arch/powerpc/include/asm/idle.h | 93 + + arch/powerpc/include/asm/inst.h | 131 + + arch/powerpc/include/asm/iommu.h | 4 +- + arch/powerpc/include/asm/kasan.h | 10 +- + arch/powerpc/include/asm/kprobes.h | 2 +- + arch/powerpc/include/asm/kup.h | 14 +- + arch/powerpc/include/asm/kvm_book3s.h | 2 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 44 +- + arch/powerpc/include/asm/mmu.h | 10 +- + arch/powerpc/include/asm/mmu_context.h | 30 + + arch/powerpc/include/asm/module.h | 3 - + arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 32 +- + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 90 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 121 +- + arch/powerpc/include/asm/nohash/32/pte-40x.h | 23 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 4 +- + arch/powerpc/include/asm/nohash/32/slice.h | 20 - + arch/powerpc/include/asm/nohash/64/pgalloc.h | 2 +- + arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 32 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 34 +- + arch/powerpc/include/asm/nohash/pgtable.h | 4 +- + arch/powerpc/include/asm/paca.h | 2 + + arch/powerpc/include/asm/page.h | 7 - + arch/powerpc/include/asm/pgtable.h | 12 +- + arch/powerpc/include/asm/ppc-opcode.h | 3 + + arch/powerpc/include/asm/processor.h | 11 +- + arch/powerpc/include/asm/prom.h | 1 + + arch/powerpc/include/asm/ptrace.h | 46 +- + arch/powerpc/include/asm/reg.h | 19 +- + arch/powerpc/include/asm/reg_booke.h | 54 - + arch/powerpc/include/asm/rtas-types.h | 124 + + arch/powerpc/include/asm/rtas.h | 125 +- + arch/powerpc/include/asm/slice.h | 2 - + arch/powerpc/include/asm/spinlock.h | 4 - + 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/time.h | 12 - + arch/powerpc/include/asm/uaccess.h | 149 +- + arch/powerpc/include/asm/uprobes.h | 7 +- + arch/powerpc/include/asm/vas.h | 13 +- + arch/powerpc/include/asm/xilinx_intc.h | 16 - + arch/powerpc/include/asm/xilinx_pci.h | 21 - + arch/powerpc/include/asm/xive-regs.h | 8 + + arch/powerpc/include/asm/xive.h | 9 +- + arch/powerpc/include/uapi/asm/cputable.h | 2 + + 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/cpu_setup_6xx.S | 2 + + arch/powerpc/kernel/cpu_setup_power.S | 22 +- + arch/powerpc/kernel/cputable.c | 124 +- + arch/powerpc/kernel/crash_dump.c | 7 +- + arch/powerpc/kernel/dawr.c | 23 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 32 +- + arch/powerpc/kernel/eeh.c | 31 + + arch/powerpc/kernel/entry_32.S | 69 +- + arch/powerpc/kernel/entry_64.S | 8 +- + arch/powerpc/kernel/epapr_paravirt.c | 7 +- + arch/powerpc/kernel/exceptions-64s.S | 51 +- + arch/powerpc/kernel/fadump.c | 155 +- + arch/powerpc/kernel/fpu.S | 1 + + arch/powerpc/kernel/head_32.S | 2 +- + arch/powerpc/kernel/head_40x.S | 316 +- + arch/powerpc/kernel/head_64.S | 9 +- + arch/powerpc/kernel/head_8xx.S | 354 +- + arch/powerpc/kernel/head_booke.h | 2 +- + arch/powerpc/kernel/hw_breakpoint.c | 641 +- + arch/powerpc/kernel/idle_6xx.S | 1 + + arch/powerpc/kernel/idle_e500.S | 1 + + arch/powerpc/kernel/jump_label.c | 5 +- + arch/powerpc/kernel/kgdb.c | 9 +- + arch/powerpc/kernel/kprobes.c | 47 +- + arch/powerpc/kernel/l2cr_6xx.S | 1 + + arch/powerpc/kernel/mce.c | 16 +- + arch/powerpc/kernel/mce_power.c | 19 +- + arch/powerpc/kernel/misc.S | 2 + + arch/powerpc/kernel/misc_32.S | 11 +- + arch/powerpc/kernel/module_32.c | 17 +- + arch/powerpc/kernel/module_64.c | 301 +- + arch/powerpc/kernel/nvram_64.c | 4 +- + arch/powerpc/kernel/optprobes.c | 99 +- + arch/powerpc/kernel/optprobes_head.S | 3 + + arch/powerpc/kernel/paca.c | 32 + + 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 | 38 +- + arch/powerpc/kernel/prom_init.c | 36 +- + 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/rtas.c | 52 + + arch/powerpc/kernel/security.c | 48 +- + arch/powerpc/kernel/setup-common.c | 4 - + arch/powerpc/kernel/setup_32.c | 10 +- + 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/smp.c | 2 +- + arch/powerpc/kernel/swsusp_32.S | 2 + + arch/powerpc/kernel/syscall_64.c | 72 +- + arch/powerpc/kernel/sysfs.c | 82 +- + arch/powerpc/kernel/trace/ftrace.c | 168 +- + arch/powerpc/kernel/traps.c | 49 +- + arch/powerpc/kernel/uprobes.c | 5 +- + arch/powerpc/kernel/vecemu.c | 20 +- + arch/powerpc/kernel/vector.S | 1 + + arch/powerpc/kernel/vmlinux.lds.S | 3 +- + arch/powerpc/kexec/core.c | 8 +- + arch/powerpc/kexec/crash.c | 3 + + arch/powerpc/kvm/book3s_64_mmu_hv.c | 13 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 103 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 66 +- + arch/powerpc/kvm/book3s_hv.c | 15 +- + arch/powerpc/kvm/book3s_hv_nested.c | 39 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 60 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 23 +- + arch/powerpc/kvm/book3s_xive_native.c | 6 + + arch/powerpc/kvm/book3s_xive_template.c | 3 + + arch/powerpc/kvm/emulate_loadstore.c | 2 +- + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/code-patching.c | 314 +- + arch/powerpc/lib/feature-fixups-test.S | 69 + + arch/powerpc/lib/feature-fixups.c | 163 +- + 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/book3s32/hash_low.S | 32 +- + arch/powerpc/mm/book3s32/mmu.c | 12 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 15 +- + arch/powerpc/mm/book3s64/hash_tlb.c | 22 +- + arch/powerpc/mm/book3s64/hash_utils.c | 72 +- + arch/powerpc/mm/book3s64/internal.h | 16 + + arch/powerpc/mm/book3s64/pgtable.c | 37 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 47 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + arch/powerpc/mm/book3s64/slb.c | 166 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 6 +- + arch/powerpc/mm/fault.c | 92 +- + arch/powerpc/mm/highmem.c | 26 +- + arch/powerpc/mm/hugetlbpage.c | 71 +- + arch/powerpc/mm/init_32.c | 12 +- + arch/powerpc/mm/init_64.c | 4 +- + arch/powerpc/mm/kasan/8xx.c | 74 + + arch/powerpc/mm/kasan/Makefile | 2 + + arch/powerpc/mm/kasan/book3s_32.c | 57 + + arch/powerpc/mm/kasan/kasan_init_32.c | 88 +- + arch/powerpc/mm/mem.c | 5 +- + arch/powerpc/mm/mmu_decl.h | 4 + + arch/powerpc/mm/nohash/40x.c | 4 +- + arch/powerpc/mm/nohash/8xx.c | 227 +- + arch/powerpc/mm/nohash/book3e_pgtable.c | 15 +- + arch/powerpc/mm/pgtable.c | 64 +- + arch/powerpc/mm/pgtable_32.c | 22 +- + arch/powerpc/mm/pgtable_64.c | 10 +- + arch/powerpc/mm/ptdump/8xx.c | 5 + + arch/powerpc/mm/ptdump/bats.c | 41 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 20 +- + arch/powerpc/mm/ptdump/ptdump.c | 79 +- + arch/powerpc/mm/ptdump/ptdump.h | 3 + + arch/powerpc/mm/ptdump/shared.c | 5 + + arch/powerpc/mm/slice.c | 2 +- + arch/powerpc/perf/8xx-pmu.c | 19 +- + arch/powerpc/perf/callchain_64.c | 46 +- + arch/powerpc/perf/core-book3s.c | 4 +- + arch/powerpc/perf/hv-24x7.c | 96 +- + arch/powerpc/platforms/40x/Kconfig | 76 - + arch/powerpc/platforms/40x/Makefile | 3 - + arch/powerpc/platforms/40x/ep405.c | 123 - + arch/powerpc/platforms/40x/virtex.c | 54 - + arch/powerpc/platforms/40x/walnut.c | 65 - + arch/powerpc/platforms/44x/Kconfig | 40 +- + arch/powerpc/platforms/44x/Makefile | 2 - + arch/powerpc/platforms/44x/virtex.c | 60 - + arch/powerpc/platforms/44x/virtex_ml510.c | 30 - + arch/powerpc/platforms/4xx/pci.c | 4 +- + arch/powerpc/platforms/52xx/lite5200_sleep.S | 2 + + arch/powerpc/platforms/82xx/pq2.c | 3 + + arch/powerpc/platforms/83xx/suspend-asm.S | 1 + + arch/powerpc/platforms/86xx/mpc86xx_smp.c | 5 +- + arch/powerpc/platforms/8xx/Kconfig | 50 +- + arch/powerpc/platforms/Kconfig | 4 - + arch/powerpc/platforms/Kconfig.cputype | 6 +- + arch/powerpc/platforms/cell/iommu.c | 6 +- + arch/powerpc/platforms/embedded6xx/wii.c | 25 +- + arch/powerpc/platforms/powermac/bootx_init.c | 14 +- + arch/powerpc/platforms/powermac/cache.S | 2 + + arch/powerpc/platforms/powermac/nvram.c | 2 +- + arch/powerpc/platforms/powermac/sleep.S | 5 +- + arch/powerpc/platforms/powermac/smp.c | 5 +- + arch/powerpc/platforms/powernv/Makefile | 2 +- + arch/powerpc/platforms/powernv/idle.c | 2 +- + arch/powerpc/platforms/powernv/npu-dma.c | 117 +- + arch/powerpc/platforms/powernv/opal-fadump.c | 2 +- + arch/powerpc/platforms/powernv/opal.c | 4 + + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 28 + + arch/powerpc/platforms/powernv/pci-ioda.c | 299 +- + arch/powerpc/platforms/powernv/pci.c | 20 - + arch/powerpc/platforms/powernv/pci.h | 28 +- + 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/hotplug-memory.c | 26 +- + arch/powerpc/platforms/pseries/ibmebus.c | 3 +- + arch/powerpc/platforms/pseries/mobility.c | 3 + + arch/powerpc/platforms/pseries/ras.c | 62 +- + arch/powerpc/platforms/pseries/rtas-fadump.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 22 +- + arch/powerpc/platforms/pseries/vio.c | 7 +- + arch/powerpc/sysdev/Makefile | 2 - + arch/powerpc/sysdev/cpm_common.c | 2 + + arch/powerpc/sysdev/xics/ics-rtas.c | 22 +- + arch/powerpc/sysdev/xilinx_intc.c | 88 - + arch/powerpc/sysdev/xilinx_pci.c | 132 - + arch/powerpc/sysdev/xive/common.c | 13 +- + arch/powerpc/sysdev/xive/native.c | 6 +- + arch/powerpc/sysdev/xive/spapr.c | 7 + + arch/powerpc/tools/head_check.sh | 8 +- + arch/powerpc/xmon/Makefile | 2 +- + arch/powerpc/xmon/xmon.c | 258 +- + arch/powerpc/xmon/xmon_bpts.S | 11 + + arch/powerpc/xmon/xmon_bpts.h | 14 + + 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 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/pgtable.h | 4 +- + arch/sh/Kconfig | 62 +- + arch/sh/Kconfig.cpu | 9 - + arch/sh/Kconfig.debug | 13 +- + arch/sh/Makefile | 29 +- + arch/sh/boot/compressed/Makefile | 12 +- + arch/sh/boot/compressed/misc.c | 8 - + arch/sh/boot/compressed/vmlinux.scr | 2 +- + arch/sh/configs/apsh4ad0a_defconfig | 3 +- + arch/sh/configs/kfr2r09_defconfig | 2 - + arch/sh/configs/magicpanelr2_defconfig | 2 - + arch/sh/configs/polaris_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 2 - + arch/sh/configs/r7785rp_defconfig | 2 - + arch/sh/configs/rsk7201_defconfig | 2 - + arch/sh/configs/rsk7203_defconfig | 2 - + arch/sh/configs/rsk7264_defconfig | 2 - + arch/sh/configs/rsk7269_defconfig | 2 - + arch/sh/configs/sdk7786_defconfig | 3 +- + arch/sh/configs/se7206_defconfig | 2 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7619_defconfig | 2 - + arch/sh/configs/se7705_defconfig | 2 - + arch/sh/configs/se7712_defconfig | 2 - + arch/sh/configs/se7721_defconfig | 2 - + arch/sh/configs/se7722_defconfig | 2 - + arch/sh/configs/se7780_defconfig | 1 - + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 2 +- + arch/sh/configs/shmin_defconfig | 2 - + arch/sh/configs/ul2_defconfig | 2 - + arch/sh/drivers/pci/Makefile | 1 - + arch/sh/drivers/pci/ops-sh5.c | 65 - + arch/sh/drivers/pci/pci-sh5.c | 217 - + arch/sh/drivers/pci/pci-sh5.h | 108 - + arch/sh/include/asm/barrier.h | 4 +- + arch/sh/include/asm/bitops.h | 26 - + arch/sh/include/asm/bl_bit.h | 11 +- + arch/sh/include/asm/bl_bit_64.h | 37 - + arch/sh/include/asm/bugs.h | 4 - + arch/sh/include/asm/cache_insns.h | 12 +- + arch/sh/include/asm/cache_insns_64.h | 20 - + arch/sh/include/asm/checksum.h | 6 +- + arch/sh/include/asm/elf.h | 23 - + arch/sh/include/asm/extable.h | 4 - + arch/sh/include/asm/fixmap.h | 4 - + arch/sh/include/asm/io.h | 6 +- + arch/sh/include/asm/io_noioport.h | 34 +- + arch/sh/include/asm/irq.h | 3 - + arch/sh/include/asm/mmu_context.h | 12 - + arch/sh/include/asm/mmu_context_64.h | 75 - + arch/sh/include/asm/page.h | 21 +- + arch/sh/include/asm/pgtable-2level.h | 1 - + arch/sh/include/asm/pgtable-3level.h | 1 - + arch/sh/include/asm/pgtable.h | 17 - + arch/sh/include/asm/pgtable_32.h | 5 +- + arch/sh/include/asm/pgtable_64.h | 307 - + arch/sh/include/asm/posix_types.h | 6 +- + arch/sh/include/asm/processor.h | 14 +- + arch/sh/include/asm/processor_64.h | 212 - + arch/sh/include/asm/ptrace_64.h | 14 - + arch/sh/include/asm/string.h | 6 +- + arch/sh/include/asm/string_64.h | 21 - + arch/sh/include/asm/switch_to.h | 11 +- + arch/sh/include/asm/switch_to_64.h | 32 - + arch/sh/include/asm/syscall.h | 6 +- + arch/sh/include/asm/syscall_64.h | 75 - + arch/sh/include/asm/syscalls.h | 9 +- + arch/sh/include/asm/syscalls_64.h | 18 - + arch/sh/include/asm/thread_info.h | 4 +- + arch/sh/include/asm/tlb.h | 6 +- + arch/sh/include/asm/tlb_64.h | 68 - + arch/sh/include/asm/traps.h | 4 - + arch/sh/include/asm/traps_64.h | 35 - + arch/sh/include/asm/types.h | 5 - + arch/sh/include/asm/uaccess.h | 4 - + arch/sh/include/asm/uaccess_64.h | 85 - + arch/sh/include/asm/unistd.h | 6 +- + arch/sh/include/asm/user.h | 7 - + arch/sh/include/asm/vermagic.h | 4 - + arch/sh/include/asm/vmlinux.lds.h | 8 - + arch/sh/include/cpu-sh5/cpu/addrspace.h | 12 - + arch/sh/include/cpu-sh5/cpu/cache.h | 94 - + arch/sh/include/cpu-sh5/cpu/irq.h | 113 - + arch/sh/include/cpu-sh5/cpu/mmu_context.h | 22 - + arch/sh/include/cpu-sh5/cpu/registers.h | 103 - + arch/sh/include/cpu-sh5/cpu/rtc.h | 9 - + arch/sh/include/uapi/asm/posix_types.h | 8 +- + arch/sh/include/uapi/asm/posix_types_64.h | 29 - + arch/sh/include/uapi/asm/ptrace.h | 5 - + arch/sh/include/uapi/asm/ptrace_64.h | 15 - + arch/sh/include/uapi/asm/sigcontext.h | 13 - + arch/sh/include/uapi/asm/stat.h | 61 - + arch/sh/include/uapi/asm/swab.h | 10 - + arch/sh/include/uapi/asm/unistd.h | 8 +- + arch/sh/include/uapi/asm/unistd_64.h | 423 - + arch/sh/kernel/Makefile | 16 +- + arch/sh/kernel/cpu/Makefile | 1 - + arch/sh/kernel/cpu/init.c | 2 +- + arch/sh/kernel/cpu/irq/Makefile | 3 +- + arch/sh/kernel/cpu/irq/intc-sh5.c | 194 - + arch/sh/kernel/cpu/proc.c | 1 - + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 1 + + arch/sh/kernel/cpu/sh5/Makefile | 16 - + arch/sh/kernel/cpu/sh5/clock-sh5.c | 76 - + arch/sh/kernel/cpu/sh5/entry.S | 2000 ----- + arch/sh/kernel/cpu/sh5/fpu.c | 106 - + arch/sh/kernel/cpu/sh5/probe.c | 72 - + arch/sh/kernel/cpu/sh5/setup-sh5.c | 121 - + arch/sh/kernel/cpu/sh5/switchto.S | 195 - + arch/sh/kernel/cpu/sh5/unwind.c | 342 - + arch/sh/kernel/head_64.S | 346 - + arch/sh/kernel/io_trapped.c | 7 +- + arch/sh/kernel/irq_64.c | 48 - + arch/sh/kernel/module.c | 9 - + arch/sh/kernel/process.c | 2 - + arch/sh/kernel/process_64.c | 461 - + arch/sh/kernel/ptrace_64.c | 576 -- + arch/sh/kernel/reboot.c | 6 - + arch/sh/kernel/sh_ksyms_32.c | 17 + + arch/sh/kernel/sh_ksyms_64.c | 51 - + arch/sh/kernel/signal_64.c | 567 -- + arch/sh/kernel/syscalls_64.S | 419 - + arch/sh/kernel/traps_64.c | 814 -- + arch/sh/kernel/vmlinux.lds.S | 18 +- + arch/sh/lib/delay.c | 1 + + arch/sh/lib64/Makefile | 17 - + arch/sh/lib64/copy_page.S | 89 - + arch/sh/lib64/copy_user_memcpy.S | 218 - + arch/sh/lib64/memcpy.S | 202 - + arch/sh/lib64/memset.S | 92 - + arch/sh/lib64/panic.c | 15 - + arch/sh/lib64/sdivsi3.S | 136 - + arch/sh/lib64/strcpy.S | 98 - + arch/sh/lib64/strlen.S | 34 - + arch/sh/lib64/udelay.c | 49 - + arch/sh/lib64/udivdi3.S | 121 - + arch/sh/lib64/udivsi3.S | 60 - + arch/sh/mm/Kconfig | 16 +- + arch/sh/mm/Makefile | 31 +- + arch/sh/mm/cache-sh4.c | 4 +- + arch/sh/mm/cache-sh5.c | 621 -- + arch/sh/mm/cache.c | 6 - + arch/sh/mm/extable_64.c | 84 - + arch/sh/mm/fault.c | 64 +- + arch/sh/mm/hugetlbpage.c | 28 +- + arch/sh/mm/init.c | 15 +- + arch/sh/mm/kmap.c | 2 +- + arch/sh/mm/tlb-sh5.c | 224 - + arch/sh/mm/tlbex_32.c | 6 +- + arch/sh/mm/tlbex_64.c | 166 - + arch/sh/mm/tlbflush_64.c | 172 - + arch/sparc/include/asm/highmem.h | 25 +- + arch/sparc/kernel/process_64.c | 4 +- + arch/sparc/mm/highmem.c | 25 +- + arch/sparc/mm/io-unit.c | 1 - + arch/sparc/mm/iommu.c | 1 - + arch/um/Makefile | 2 +- + arch/um/drivers/Makefile | 4 +- + arch/unicore32/include/asm/pgtable.h | 1 - + arch/unicore32/kernel/hibernate.c | 4 +- + arch/unicore32/lib/Makefile | 4 +- + arch/x86/Kconfig | 2 + + arch/x86/events/core.c | 11 +- + arch/x86/include/asm/elf.h | 22 +- + arch/x86/include/asm/fixmap.h | 1 - + arch/x86/include/asm/highmem.h | 9 - + arch/x86/include/asm/memtype.h | 3 + + arch/x86/include/asm/mmu_context.h | 88 +- + arch/x86/include/asm/paravirt.h | 12 +- + arch/x86/include/asm/pgtable.h | 1 + + arch/x86/include/asm/pgtable_32.h | 2 +- + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/pgtable_types.h | 44 +- + arch/x86/include/asm/tlbflush.h | 441 +- + arch/x86/include/asm/uv/uv.h | 1 + + arch/x86/kernel/alternative.c | 55 + + arch/x86/kernel/cpu/common.c | 25 +- + arch/x86/kernel/cpu/mtrr/generic.c | 4 +- + arch/x86/kernel/paravirt.c | 21 +- + arch/x86/kernel/process.c | 11 + + arch/x86/mm/highmem_32.c | 50 +- + arch/x86/mm/init.c | 44 +- + arch/x86/mm/init_64.c | 4 +- + arch/x86/mm/ioremap.c | 10 +- + arch/x86/mm/kmmio.c | 2 +- + arch/x86/mm/mem_encrypt.c | 2 +- + arch/x86/mm/pat/set_memory.c | 7 +- + arch/x86/mm/pgtable.c | 16 +- + arch/x86/mm/pgtable_32.c | 2 +- + arch/x86/mm/tlb.c | 384 +- + arch/x86/pci/fixup.c | 4 + + arch/x86/pci/xen.c | 16 +- + arch/x86/platform/uv/tlb_uv.c | 4 +- + arch/xtensa/include/asm/highmem.h | 27 - + arch/xtensa/mm/highmem.c | 22 +- + drivers/acpi/pci_mcfg.c | 8 +- + drivers/acpi/pci_root.c | 11 +- + drivers/amba/bus.c | 14 +- + drivers/android/binderfs.c | 4 +- + drivers/base/base.h | 1 + + drivers/base/core.c | 235 +- + drivers/base/dd.c | 33 +- + drivers/base/firmware_loader/fallback.c | 15 +- + drivers/base/firmware_loader/fallback.h | 8 +- + drivers/base/firmware_loader/fallback_platform.c | 2 +- + drivers/base/firmware_loader/fallback_table.c | 2 +- + drivers/base/firmware_loader/firmware.h | 3 +- + drivers/base/firmware_loader/main.c | 14 +- + drivers/base/platform.c | 46 +- + drivers/base/property.c | 13 +- + drivers/base/soc.c | 2 +- + drivers/base/swnode.c | 27 +- + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/ps3disk.c | 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/block/zram/zcomp.c | 7 +- + 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/mhi/core/boot.c | 75 +- + drivers/bus/mhi/core/init.c | 8 +- + drivers/bus/mhi/core/internal.h | 9 +- + drivers/bus/mhi/core/main.c | 197 +- + drivers/bus/mhi/core/pm.c | 229 +- + drivers/bus/ti-sysc.c | 25 +- + drivers/bus/vexpress-config.c | 354 +- + drivers/char/Kconfig | 2 +- + drivers/char/ipmi/bt-bmc.c | 21 +- + drivers/char/ipmi/ipmi_msghandler.c | 9 +- + drivers/char/ipmi/ipmi_si_platform.c | 2 + + drivers/char/ipmi/ipmi_ssif.c | 24 +- + drivers/char/mem.c | 101 +- + drivers/char/tlclk.c | 17 +- + drivers/clk/Makefile | 4 +- + 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/clk/zynqmp/clk-gate-zynqmp.c | 9 +- + drivers/clk/zynqmp/clk-mux-zynqmp.c | 6 +- + drivers/clk/zynqmp/clkc.c | 17 +- + drivers/clk/zynqmp/divider.c | 12 +- + drivers/clk/zynqmp/pll.c | 29 +- + drivers/cpufreq/Kconfig.arm | 6 +- + drivers/cpufreq/tegra20-cpufreq.c | 217 +- + drivers/cpuidle/cpuidle-pseries.c | 39 +- + drivers/cpuidle/cpuidle-tegra.c | 1 - + drivers/crypto/nx/Makefile | 2 +- + .../nx/{nx-842-powernv.c => nx-common-powernv.c} | 204 +- + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 22 +- + drivers/dax/dax-private.h | 1 + + drivers/dax/kmem.c | 28 +- + drivers/dca/dca-sysfs.c | 4 +- + drivers/extcon/extcon-adc-jack.c | 3 +- + drivers/extcon/extcon-arizona.c | 17 +- + drivers/extcon/extcon-max14577.c | 10 + + drivers/extcon/extcon.c | 2 +- + drivers/firmware/Kconfig | 3 +- + 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/dmi-id.c | 6 + + drivers/firmware/dmi_scan.c | 30 + + drivers/firmware/imx/imx-scu.c | 64 +- + drivers/firmware/qcom_scm-legacy.c | 2 +- + drivers/firmware/qcom_scm.c | 11 +- + drivers/firmware/raspberrypi.c | 61 + + drivers/firmware/stratix10-rsu.c | 10 +- + drivers/firmware/stratix10-svc.c | 62 +- + drivers/firmware/tegra/bpmp-tegra186.c | 4 +- + drivers/firmware/tegra/bpmp.c | 9 +- + drivers/firmware/trusted_foundations.c | 21 +- + drivers/firmware/xilinx/zynqmp-debug.c | 5 +- + drivers/firmware/xilinx/zynqmp.c | 607 +- + drivers/fpga/Kconfig | 2 +- + drivers/fpga/Makefile | 1 + + drivers/fpga/dfl-afu-dma-region.c | 4 +- + drivers/fpga/dfl-afu-main.c | 35 +- + drivers/fpga/dfl-fme-main.c | 23 +- + drivers/fpga/dfl-fme-perf.c | 1020 +++ + drivers/fpga/dfl-fme.h | 2 + + drivers/fpga/dfl.c | 15 +- + drivers/fpga/dfl.h | 39 +- + drivers/fpga/ice40-spi.c | 10 +- + drivers/fpga/machxo2-spi.c | 12 +- + drivers/fpga/stratix10-soc.c | 28 +- + drivers/fpga/zynqmp-fpga.c | 14 +- + drivers/gnss/serial.h | 2 +- + drivers/gnss/sirf.c | 8 +- + drivers/gpio/Kconfig | 24 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/TODO | 4 + + drivers/gpio/gpio-aggregator.c | 568 ++ + drivers/gpio/gpio-dwapb.c | 248 +- + drivers/gpio/gpio-f7188x.c | 33 +- + drivers/gpio/gpio-ftgpio010.c | 2 +- + drivers/gpio/gpio-ich.c | 2 +- + drivers/gpio/gpio-max730x.c | 12 +- + drivers/gpio/gpio-mb86s7x.c | 28 +- + drivers/gpio/gpio-merrifield.c | 10 +- + drivers/gpio/gpio-mlxbf2.c | 5 +- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-pca953x.c | 96 +- + drivers/gpio/gpio-pch.c | 73 +- + drivers/gpio/gpio-pl061.c | 9 +- + drivers/gpio/gpio-rcar.c | 4 +- + drivers/gpio/gpio-regmap.c | 349 + + drivers/gpio/gpio-tegra186.c | 1 + + drivers/gpio/gpio-xgene-sb.c | 14 +- + drivers/gpio/gpiolib-acpi.c | 6 +- + drivers/gpio/gpiolib-devprop.c | 5 +- + drivers/gpio/gpiolib-of.c | 31 + + drivers/gpio/gpiolib.c | 165 +- + drivers/gpio/gpiolib.h | 27 +- + drivers/gpu/drm/drm_fb_helper.c | 4 +- + 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/gpu/drm/ttm/ttm_bo_util.c | 56 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 17 +- + drivers/greybus/Kconfig | 6 +- + drivers/greybus/arpc.h | 2 +- + drivers/hwtracing/coresight/Makefile | 3 +- + .../hwtracing/coresight/coresight-cti-platform.c | 11 +- + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 16 +- + drivers/hwtracing/coresight/coresight-cti.c | 232 +- + drivers/hwtracing/coresight/coresight-cti.h | 8 +- + drivers/hwtracing/coresight/coresight-etb10.c | 2 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 2 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 33 +- + drivers/hwtracing/coresight/coresight-platform.c | 91 +- + drivers/hwtracing/coresight/coresight-priv.h | 21 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 204 + + drivers/hwtracing/coresight/coresight-tmc-etf.c | 16 +- + drivers/hwtracing/coresight/coresight-tmc.c | 2 +- + drivers/hwtracing/coresight/coresight.c | 82 +- + drivers/i2c/busses/i2c-i801.c | 6 +- + drivers/iio/accel/Kconfig | 10 +- + drivers/iio/accel/bma180.c | 208 +- + drivers/iio/accel/dmard06.c | 3 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 18 +- + drivers/iio/accel/kxsd9-i2c.c | 11 +- + drivers/iio/accel/mxc4005.c | 4 +- + drivers/iio/accel/st_accel.h | 2 + + drivers/iio/accel/st_accel_buffer.c | 3 +- + drivers/iio/accel/st_accel_core.c | 83 +- + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/adc/Kconfig | 45 + + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ad7476.c | 59 +- + drivers/iio/adc/ad7780.c | 27 +- + drivers/iio/adc/ad7791.c | 64 +- + drivers/iio/adc/ad7793.c | 144 +- + drivers/iio/adc/ad9467.c | 422 + + drivers/iio/adc/ad_sigma_delta.c | 8 +- + drivers/iio/adc/adi-axi-adc.c | 482 ++ + drivers/iio/adc/at91-sama5d2_adc.c | 233 +- + drivers/iio/adc/at91_adc.c | 5 +- + drivers/iio/adc/exynos_adc.c | 17 +- + drivers/iio/adc/fsl-imx25-gcq.c | 4 +- + drivers/iio/adc/intel_mrfld_adc.c | 6 +- + drivers/iio/adc/max1241.c | 227 + + drivers/iio/adc/max1363.c | 32 +- + drivers/iio/adc/mcp3422.c | 5 +- + drivers/iio/adc/stm32-adc-core.c | 34 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 4 +- + drivers/iio/adc/ti-ads124s08.c | 7 +- + drivers/iio/adc/xilinx-xadc-core.c | 4 +- + drivers/iio/adc/xilinx-xadc-events.c | 2 +- + drivers/iio/adc/xilinx-xadc.h | 2 +- + drivers/iio/buffer/industrialio-buffer-dma.c | 1 - + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 41 +- + drivers/iio/buffer/industrialio-hw-consumer.c | 31 - + drivers/iio/buffer/industrialio-triggered-buffer.c | 11 - + drivers/iio/buffer/kfifo_buf.c | 22 - + drivers/iio/chemical/Kconfig | 11 + + drivers/iio/chemical/Makefile | 1 + + drivers/iio/chemical/atlas-ezo-sensor.c | 177 + + drivers/iio/chemical/atlas-sensor.c | 36 +- + drivers/iio/chemical/bme680_core.c | 36 +- + drivers/iio/chemical/ccs811.c | 112 +- + drivers/iio/chemical/pms7003.c | 17 +- + drivers/iio/chemical/sps30.c | 9 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 18 +- + .../iio/common/hid-sensors/hid-sensor-trigger.h | 3 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 13 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 4 +- + drivers/iio/common/st_sensors/st_sensors_spi.c | 6 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 13 +- + drivers/iio/dac/Kconfig | 6 +- + drivers/iio/dac/ad5360.c | 17 +- + drivers/iio/dac/ad5380.c | 8 +- + drivers/iio/dac/ad5421.c | 21 +- + drivers/iio/dac/ad5446.c | 18 +- + drivers/iio/dac/ad5449.c | 12 +- + drivers/iio/dac/ad5592r-base.c | 30 +- + drivers/iio/dac/ad5592r-base.h | 1 + + drivers/iio/dac/ad5592r.c | 4 +- + drivers/iio/dac/ad5593r.c | 2 +- + drivers/iio/dac/ad5624r_spi.c | 8 +- + drivers/iio/dac/ad5686.c | 10 +- + drivers/iio/dac/ad5686.h | 2 + + drivers/iio/dac/ad5755.c | 22 +- + drivers/iio/dac/ad5761.c | 12 +- + drivers/iio/dac/ad5764.c | 12 +- + drivers/iio/dac/ltc2632.c | 67 +- + drivers/iio/dac/vf610_dac.c | 11 +- + drivers/iio/gyro/Kconfig | 2 +- + drivers/iio/gyro/adis16130.c | 4 +- + drivers/iio/gyro/adis16136.c | 10 +- + drivers/iio/gyro/bmg160_i2c.c | 6 +- + drivers/iio/gyro/bmg160_spi.c | 5 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 18 +- + drivers/iio/gyro/mpu3050-i2c.c | 4 +- + drivers/iio/gyro/st_gyro_buffer.c | 3 +- + drivers/iio/gyro/st_gyro_core.c | 9 +- + drivers/iio/health/afe4403.c | 14 +- + drivers/iio/health/max30100.c | 7 +- + drivers/iio/humidity/hid-sensor-humidity.c | 12 +- + drivers/iio/humidity/hts221_buffer.c | 6 +- + drivers/iio/humidity/hts221_i2c.c | 6 +- + drivers/iio/humidity/hts221_spi.c | 6 +- + drivers/iio/imu/Kconfig | 13 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis.c | 27 +- + drivers/iio/imu/adis16400.c | 21 +- + drivers/iio/imu/adis16460.c | 27 +- + drivers/iio/imu/adis16475.c | 1338 +++ + drivers/iio/imu/adis16480.c | 16 +- + drivers/iio/imu/adis_buffer.c | 58 +- + drivers/iio/imu/adis_trigger.c | 72 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 4 +- + drivers/iio/imu/bmi160/bmi160_spi.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 8 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 23 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 21 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 96 + + drivers/iio/industrialio-buffer.c | 93 +- + drivers/iio/industrialio-core.c | 126 +- + drivers/iio/industrialio-trigger.c | 53 - + drivers/iio/inkern.c | 27 - + drivers/iio/light/Kconfig | 2 + + drivers/iio/light/bh1780.c | 6 +- + drivers/iio/light/cm32181.c | 271 +- + drivers/iio/light/cm3232.c | 3 +- + drivers/iio/light/gp2ap002.c | 19 +- + drivers/iio/light/gp2ap020a00f.c | 6 +- + drivers/iio/light/hid-sensor-als.c | 18 +- + drivers/iio/light/hid-sensor-prox.c | 18 +- + drivers/iio/light/isl29125.c | 28 +- + drivers/iio/light/ltr501.c | 41 +- + drivers/iio/light/opt3001.c | 3 +- + drivers/iio/light/si1133.c | 18 +- + drivers/iio/light/st_uvis25_i2c.c | 7 +- + drivers/iio/light/st_uvis25_spi.c | 7 +- + drivers/iio/light/tsl2563.c | 2 +- + drivers/iio/light/tsl2772.c | 6 +- + drivers/iio/light/vcnl4000.c | 746 +- + drivers/iio/light/vl6180.c | 3 +- + drivers/iio/light/zopt2201.c | 4 +- + drivers/iio/magnetometer/ak8974.c | 201 +- + drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 18 +- + drivers/iio/magnetometer/mmc35240.c | 4 +- + drivers/iio/magnetometer/rm3100-core.c | 5 +- + drivers/iio/magnetometer/st_magn_core.c | 3 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 18 +- + drivers/iio/orientation/hid-sensor-rotation.c | 18 +- + drivers/iio/pressure/bmp280-core.c | 100 +- + drivers/iio/pressure/hid-sensor-press.c | 18 +- + drivers/iio/pressure/hp206c.c | 8 +- + drivers/iio/pressure/ms5611_i2c.c | 4 +- + drivers/iio/pressure/ms5611_spi.c | 4 +- + drivers/iio/pressure/st_pressure_core.c | 7 +- + drivers/iio/pressure/zpa2326.c | 9 +- + drivers/iio/proximity/Kconfig | 24 + + drivers/iio/proximity/Makefile | 2 + + drivers/iio/proximity/ping.c | 7 +- + drivers/iio/proximity/sx9310.c | 1069 +++ + drivers/iio/proximity/vcnl3020.c | 258 + + drivers/iio/temperature/hid-sensor-temperature.c | 12 +- + drivers/iio/temperature/ltc2983.c | 4 +- + drivers/iio/temperature/max31856.c | 5 +- + drivers/iio/trigger/iio-trig-hrtimer.c | 2 +- + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/Makefile | 9 +- + drivers/infiniband/core/addr.c | 4 + + drivers/infiniband/core/cm.c | 306 +- + 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 | 481 ++ + 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 | 3 +- + drivers/infiniband/hw/mlx5/ah.c | 35 +- + drivers/infiniband/hw/mlx5/cmd.c | 114 +- + drivers/infiniband/hw/mlx5/cmd.h | 4 +- + drivers/infiniband/hw/mlx5/cong.c | 4 +- + drivers/infiniband/hw/mlx5/devx.c | 17 +- + drivers/infiniband/hw/mlx5/flow.c | 147 +- + drivers/infiniband/hw/mlx5/gsi.c | 38 +- + drivers/infiniband/hw/mlx5/ib_rep.h | 2 +- + drivers/infiniband/hw/mlx5/main.c | 73 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 72 +- + drivers/infiniband/hw/mlx5/odp.c | 10 +- + drivers/infiniband/hw/mlx5/qos.c | 13 +- + drivers/infiniband/hw/mlx5/qp.c | 4098 ++++----- + drivers/infiniband/hw/mlx5/qp.h | 6 +- + drivers/infiniband/hw/mlx5/qpc.c | 44 +- + drivers/infiniband/hw/mlx5/srq.c | 10 +- + drivers/infiniband/hw/mlx5/srq_cmd.c | 111 +- + 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/input/serio/i8042-ppcio.h | 57 - + drivers/input/serio/i8042.h | 2 - + drivers/interconnect/Kconfig | 3 +- + drivers/interconnect/Makefile | 1 + + drivers/interconnect/core.c | 143 +- + drivers/interconnect/imx/Kconfig | 17 + + drivers/interconnect/imx/Makefile | 9 + + drivers/interconnect/imx/imx.c | 284 + + drivers/interconnect/imx/imx.h | 61 + + drivers/interconnect/imx/imx8mm.c | 105 + + drivers/interconnect/imx/imx8mn.c | 94 + + drivers/interconnect/imx/imx8mq.c | 103 + + drivers/interconnect/internal.h | 2 + + drivers/iommu/dma-iommu.c | 5 +- + drivers/macintosh/Kconfig | 1 - + drivers/macintosh/ams/ams-input.c | 37 +- + drivers/macintosh/ams/ams.h | 4 +- + drivers/macintosh/windfarm_pm112.c | 21 +- + drivers/md/Kconfig | 20 + + drivers/md/Makefile | 3 + + drivers/md/dm-bufio.c | 109 +- + drivers/md/dm-crypt.c | 80 +- + drivers/md/dm-ebs-target.c | 471 + + drivers/md/dm-historical-service-time.c | 561 ++ + drivers/md/dm-integrity.c | 6 +- + drivers/md/dm-log-writes.c | 2 +- + drivers/md/dm-mpath.c | 123 +- + drivers/md/dm-path-selector.h | 2 +- + drivers/md/dm-queue-length.c | 2 +- + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-service-time.c | 2 +- + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm-switch.c | 2 +- + drivers/md/dm-writecache.c | 42 +- + drivers/md/dm-zoned-metadata.c | 1046 ++- + drivers/md/dm-zoned-reclaim.c | 210 +- + drivers/md/dm-zoned-target.c | 463 +- + drivers/md/dm-zoned.h | 113 +- + drivers/md/dm.c | 11 +- + drivers/md/persistent-data/dm-btree-internal.h | 4 +- + drivers/md/persistent-data/dm-btree-spine.c | 6 +- + drivers/memory/Kconfig | 11 + + drivers/memory/Makefile | 1 + + drivers/memory/bt1-l2-ctl.c | 322 + + drivers/memory/samsung/exynos5422-dmc.c | 8 +- + drivers/message/fusion/mptbase.c | 8 +- + drivers/mfd/Kconfig | 5 +- + drivers/mfd/intel_quark_i2c_gpio.c | 1 - + drivers/mfd/sm501.c | 24 +- + drivers/mfd/vexpress-sysreg.c | 99 +- + drivers/misc/Kconfig | 9 - + drivers/misc/Makefile | 1 - + drivers/misc/cardreader/rts5249.c | 29 - + drivers/misc/cardreader/rts5260.c | 26 - + drivers/misc/cardreader/rts5261.c | 47 +- + drivers/misc/cardreader/rtsx_pcr.c | 43 +- + drivers/misc/cardreader/rtsx_pcr.h | 1 - + drivers/misc/cxl/Kconfig | 8 - + drivers/misc/fastrpc.c | 13 +- + drivers/misc/genwqe/card_utils.c | 42 +- + drivers/misc/habanalabs/Makefile | 3 + + drivers/misc/habanalabs/command_buffer.c | 28 +- + drivers/misc/habanalabs/command_submission.c | 385 +- + drivers/misc/habanalabs/context.c | 8 - + drivers/misc/habanalabs/debugfs.c | 116 + + drivers/misc/habanalabs/device.c | 53 +- + drivers/misc/habanalabs/firmware_if.c | 297 +- + drivers/misc/habanalabs/gaudi/Makefile | 5 + + drivers/misc/habanalabs/gaudi/gaudi.c | 6748 +++++++++++++++ + drivers/misc/habanalabs/gaudi/gaudiP.h | 261 + + drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 884 ++ + drivers/misc/habanalabs/gaudi/gaudi_hwmgr.c | 121 + + drivers/misc/habanalabs/gaudi/gaudi_security.c | 9090 ++++++++++++++++++++ + drivers/misc/habanalabs/goya/goya.c | 345 +- + drivers/misc/habanalabs/goya/goyaP.h | 12 +- + drivers/misc/habanalabs/goya/goya_coresight.c | 2 +- + drivers/misc/habanalabs/goya/goya_security.c | 100 +- + drivers/misc/habanalabs/habanalabs.h | 187 +- + drivers/misc/habanalabs/habanalabs_drv.c | 14 +- + drivers/misc/habanalabs/habanalabs_ioctl.c | 21 + + drivers/misc/habanalabs/hw_queue.c | 118 +- + drivers/misc/habanalabs/hwmon.c | 75 + + drivers/misc/habanalabs/include/armcp_if.h | 43 +- + .../include/gaudi/asic_reg/cpu_if_regs.h | 174 + + .../include/gaudi/asic_reg/dma0_core_masks.h | 348 + + .../include/gaudi/asic_reg/dma0_core_regs.h | 156 + + .../include/gaudi/asic_reg/dma0_qm_masks.h | 800 ++ + .../include/gaudi/asic_reg/dma0_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/dma1_core_regs.h | 156 + + .../include/gaudi/asic_reg/dma1_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/dma2_core_regs.h | 156 + + .../include/gaudi/asic_reg/dma2_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/dma3_core_regs.h | 156 + + .../include/gaudi/asic_reg/dma3_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/dma4_core_regs.h | 156 + + .../include/gaudi/asic_reg/dma4_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/dma5_core_regs.h | 156 + + .../include/gaudi/asic_reg/dma5_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/dma6_core_regs.h | 156 + + .../include/gaudi/asic_reg/dma6_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/dma7_core_regs.h | 156 + + .../include/gaudi/asic_reg/dma7_qm_regs.h | 834 ++ + .../gaudi/asic_reg/dma_if_e_n_down_ch0_regs.h | 896 ++ + .../gaudi/asic_reg/dma_if_e_n_down_ch1_regs.h | 896 ++ + .../include/gaudi/asic_reg/dma_if_e_n_regs.h | 860 ++ + .../gaudi/asic_reg/dma_if_e_s_down_ch0_regs.h | 896 ++ + .../gaudi/asic_reg/dma_if_e_s_down_ch1_regs.h | 896 ++ + .../include/gaudi/asic_reg/dma_if_e_s_regs.h | 860 ++ + .../gaudi/asic_reg/dma_if_w_n_down_ch0_regs.h | 896 ++ + .../gaudi/asic_reg/dma_if_w_n_down_ch1_regs.h | 896 ++ + .../include/gaudi/asic_reg/dma_if_w_n_regs.h | 860 ++ + .../gaudi/asic_reg/dma_if_w_s_down_ch0_regs.h | 896 ++ + .../gaudi/asic_reg/dma_if_w_s_down_ch1_regs.h | 896 ++ + .../include/gaudi/asic_reg/dma_if_w_s_regs.h | 860 ++ + .../include/gaudi/asic_reg/gaudi_blocks.h | 4974 +++++++++++ + .../habanalabs/include/gaudi/asic_reg/gaudi_regs.h | 299 + + .../include/gaudi/asic_reg/mme0_ctrl_regs.h | 1456 ++++ + .../include/gaudi/asic_reg/mme0_qm_masks.h | 800 ++ + .../include/gaudi/asic_reg/mme0_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/mme1_ctrl_regs.h | 1456 ++++ + .../include/gaudi/asic_reg/mme2_ctrl_regs.h | 1456 ++++ + .../include/gaudi/asic_reg/mme2_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/mme3_ctrl_regs.h | 1456 ++++ + .../include/gaudi/asic_reg/mmu_up_regs.h | 72 + + .../include/gaudi/asic_reg/nif_rtr_ctrl_0_regs.h | 896 ++ + .../include/gaudi/asic_reg/nif_rtr_ctrl_1_regs.h | 896 ++ + .../include/gaudi/asic_reg/nif_rtr_ctrl_2_regs.h | 896 ++ + .../include/gaudi/asic_reg/nif_rtr_ctrl_3_regs.h | 896 ++ + .../include/gaudi/asic_reg/nif_rtr_ctrl_4_regs.h | 896 ++ + .../include/gaudi/asic_reg/nif_rtr_ctrl_5_regs.h | 896 ++ + .../include/gaudi/asic_reg/nif_rtr_ctrl_6_regs.h | 896 ++ + .../include/gaudi/asic_reg/nif_rtr_ctrl_7_regs.h | 896 ++ + .../include/gaudi/asic_reg/psoc_etr_regs.h | 114 + + .../gaudi/asic_reg/psoc_global_conf_masks.h | 502 ++ + .../include/gaudi/asic_reg/psoc_global_conf_regs.h | 1062 +++ + .../include/gaudi/asic_reg/psoc_hbm_pll_regs.h | 114 + + .../include/gaudi/asic_reg/psoc_pci_pll_regs.h | 114 + + .../include/gaudi/asic_reg/psoc_timestamp_regs.h | 56 + + .../include/gaudi/asic_reg/sif_rtr_ctrl_0_regs.h | 896 ++ + .../include/gaudi/asic_reg/sif_rtr_ctrl_1_regs.h | 896 ++ + .../include/gaudi/asic_reg/sif_rtr_ctrl_2_regs.h | 896 ++ + .../include/gaudi/asic_reg/sif_rtr_ctrl_3_regs.h | 896 ++ + .../include/gaudi/asic_reg/sif_rtr_ctrl_4_regs.h | 896 ++ + .../include/gaudi/asic_reg/sif_rtr_ctrl_5_regs.h | 896 ++ + .../include/gaudi/asic_reg/sif_rtr_ctrl_6_regs.h | 896 ++ + .../include/gaudi/asic_reg/sif_rtr_ctrl_7_regs.h | 896 ++ + .../habanalabs/include/gaudi/asic_reg/stlb_regs.h | 82 + + .../include/gaudi/asic_reg/tpc0_cfg_masks.h | 2578 ++++++ + .../include/gaudi/asic_reg/tpc0_cfg_regs.h | 1226 +++ + .../include/gaudi/asic_reg/tpc0_qm_masks.h | 800 ++ + .../include/gaudi/asic_reg/tpc0_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/tpc1_cfg_regs.h | 1226 +++ + .../include/gaudi/asic_reg/tpc1_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/tpc2_cfg_regs.h | 1226 +++ + .../include/gaudi/asic_reg/tpc2_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/tpc3_cfg_regs.h | 1226 +++ + .../include/gaudi/asic_reg/tpc3_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/tpc4_cfg_regs.h | 1226 +++ + .../include/gaudi/asic_reg/tpc4_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/tpc5_cfg_regs.h | 1226 +++ + .../include/gaudi/asic_reg/tpc5_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/tpc6_cfg_regs.h | 1226 +++ + .../include/gaudi/asic_reg/tpc6_qm_regs.h | 834 ++ + .../include/gaudi/asic_reg/tpc7_cfg_regs.h | 1226 +++ + .../include/gaudi/asic_reg/tpc7_qm_regs.h | 834 ++ + drivers/misc/habanalabs/include/gaudi/gaudi.h | 59 + + .../habanalabs/include/gaudi/gaudi_async_events.h | 310 + + .../include/gaudi/gaudi_async_ids_map_extended.h | 694 ++ + .../habanalabs/include/gaudi/gaudi_coresight.h | 367 + + .../misc/habanalabs/include/gaudi/gaudi_fw_if.h | 36 + + .../misc/habanalabs/include/gaudi/gaudi_masks.h | 458 + + .../misc/habanalabs/include/gaudi/gaudi_packets.h | 212 + + .../misc/habanalabs/include/gaudi/gaudi_reg_map.h | 27 + + .../habanalabs/include/goya/asic_reg/goya_masks.h | 3 +- + .../habanalabs/include/goya/asic_reg/goya_regs.h | 1 + + .../include/goya/asic_reg/psoc_timestamp_regs.h | 56 + + .../misc/habanalabs/include/goya/goya_reg_map.h | 43 +- + drivers/misc/habanalabs/include/hl_boot_if.h | 58 +- + .../habanalabs/include/hw_ip/mmu/mmu_general.h | 2 +- + .../misc/habanalabs/include/hw_ip/mmu/mmu_v1_1.h | 16 + + drivers/misc/habanalabs/memory.c | 37 +- + drivers/misc/habanalabs/pci.c | 63 +- + drivers/misc/habanalabs/sysfs.c | 17 +- + drivers/misc/lkdtm/bugs.c | 2 +- + drivers/misc/mic/scif/scif_nodeqp.c | 2 +- + drivers/misc/mic/scif/scif_rma.c | 26 +- + drivers/misc/ocxl/context.c | 2 +- + drivers/misc/pci_endpoint_test.c | 4 + + drivers/misc/sgi-xp/xpc_main.c | 10 +- + drivers/misc/sgi-xp/xpnet.c | 8 +- + drivers/misc/vexpress-syscfg.c | 280 - + drivers/misc/xilinx_sdfec.c | 61 +- + drivers/mmc/host/sdhci-of-arasan.c | 38 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 2 - + drivers/net/ethernet/mellanox/mlx4/mr.c | 183 - + drivers/net/ethernet/qlogic/qed/qed.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 9 + + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 1 - + drivers/net/ethernet/qlogic/qed/qed_rdma.h | 1 - + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 - + drivers/nvme/target/rdma.c | 4 +- + drivers/nvmem/core.c | 104 +- + drivers/nvmem/imx-ocotp.c | 9 +- + drivers/nvmem/jz4780-efuse.c | 4 +- + drivers/nvmem/qfprom.c | 14 - + drivers/nvmem/zynqmp_nvmem.c | 11 +- + drivers/of/dynamic.c | 3 +- + drivers/of/fdt.c | 8 +- + drivers/of/kobj.c | 3 +- + drivers/of/of_reserved_mem.c | 51 +- + drivers/of/platform.c | 4 +- + drivers/of/property.c | 20 +- + drivers/parport/daisy.c | 29 +- + drivers/parport/ieee1284.c | 94 +- + drivers/parport/ieee1284_ops.c | 70 +- + drivers/parport/parport_amiga.c | 22 +- + drivers/parport/parport_atari.c | 2 +- + drivers/parport/parport_cs.c | 6 +- + drivers/parport/parport_gsc.c | 25 +- + drivers/parport/parport_gsc.h | 21 +- + drivers/parport/parport_ip32.c | 117 +- + drivers/parport/parport_mfc3.c | 21 +- + drivers/parport/parport_pc.c | 263 +- + drivers/parport/parport_sunbpp.c | 2 +- + drivers/parport/probe.c | 34 +- + drivers/parport/procfs.c | 6 +- + drivers/parport/share.c | 292 +- + 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 | 17 +- + 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/phy/amlogic/Kconfig | 15 +- + drivers/phy/amlogic/Makefile | 1 - + drivers/phy/amlogic/phy-meson-gxl-usb3.c | 283 - + drivers/phy/amlogic/phy-meson8b-usb2.c | 149 +- + drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 2 +- + drivers/phy/broadcom/phy-bcm-sr-usb.c | 57 +- + drivers/phy/broadcom/phy-brcm-usb.c | 16 +- + drivers/phy/cadence/Kconfig | 9 + + drivers/phy/cadence/Makefile | 1 + + drivers/phy/cadence/phy-cadence-salvo.c | 325 + + drivers/phy/cadence/phy-cadence-sierra.c | 27 +- + drivers/phy/intel/Kconfig | 15 + + drivers/phy/intel/Makefile | 1 + + drivers/phy/intel/phy-intel-combo.c | 632 ++ + drivers/phy/motorola/phy-cpcap-usb.c | 2 - + drivers/phy/qualcomm/Kconfig | 17 + + drivers/phy/qualcomm/Makefile | 2 + + drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c | 148 + + drivers/phy/qualcomm/phy-qcom-qmp.c | 254 +- + drivers/phy/qualcomm/phy-qcom-qmp.h | 238 +- + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 287 + + drivers/phy/samsung/phy-s5pv210-usb2.c | 4 + + drivers/phy/ti/phy-am654-serdes.c | 104 +- + drivers/phy/ti/phy-j721e-wiz.c | 65 +- + drivers/phy/ti/phy-omap-usb2.c | 60 +- + drivers/power/reset/Kconfig | 2 +- + drivers/power/reset/vexpress-poweroff.c | 8 +- + drivers/ps3/ps3-lpm.c | 8 +- + drivers/ps3/ps3-vuart.c | 5 +- + drivers/rapidio/devices/rio_mport_cdev.c | 27 +- + drivers/reset/hisilicon/hi6220_reset.c | 69 +- + drivers/reset/reset-imx7.c | 101 + + drivers/reset/reset-zynqmp.c | 26 +- + drivers/rtc/Kconfig | 2 +- + drivers/s390/scsi/zfcp_aux.c | 5 +- + drivers/s390/scsi/zfcp_diag.h | 6 +- + drivers/s390/scsi/zfcp_erp.c | 84 +- + drivers/s390/scsi/zfcp_ext.h | 11 + + drivers/s390/scsi/zfcp_fsf.c | 76 +- + drivers/s390/scsi/zfcp_qdio.c | 19 +- + drivers/s390/scsi/zfcp_scsi.c | 131 +- + drivers/s390/scsi/zfcp_sysfs.c | 16 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/aacraid/aachba.c | 1 - + drivers/scsi/aacraid/commctrl.c | 13 +- + drivers/scsi/aacraid/commsup.c | 4 +- + drivers/scsi/aacraid/linit.c | 16 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 18 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 19 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 14 +- + drivers/scsi/bfa/bfa_core.c | 2 +- + drivers/scsi/bfa/bfa_fcpim.c | 4 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 4 +- + drivers/scsi/bfa/bfa_fcs_rport.c | 4 +- + drivers/scsi/bfa/bfa_ioc_ct.c | 4 +- + drivers/scsi/bfa/bfa_svc.c | 7 +- + drivers/scsi/bfa/bfad.c | 2 +- + drivers/scsi/bfa/bfad_attr.c | 4 +- + drivers/scsi/bfa/bfad_bsg.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 1 + + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 18 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 7 +- + drivers/scsi/cxlflash/main.c | 1 + + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/fcoe/fcoe.c | 4 +- + drivers/scsi/fnic/fnic_main.c | 4 +- + drivers/scsi/fnic/fnic_scsi.c | 6 +- + drivers/scsi/fnic/vnic_dev.c | 12 +- + drivers/scsi/fnic/vnic_wq.c | 4 +- + drivers/scsi/gdth.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 5 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 13 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 17 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 26 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 4 +- + drivers/scsi/ipr.c | 5 +- + drivers/scsi/isci/isci.h | 6 +- + drivers/scsi/libiscsi.c | 4 +- + drivers/scsi/libsas/sas_ata.c | 1 + + drivers/scsi/lpfc/lpfc.h | 23 +- + drivers/scsi/lpfc/lpfc_attr.c | 108 +- + drivers/scsi/lpfc/lpfc_ct.c | 1 - + drivers/scsi/lpfc/lpfc_debugfs.c | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 12 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +- + drivers/scsi/lpfc/lpfc_hw4.h | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 82 +- + drivers/scsi/lpfc/lpfc_mbox.c | 3 +- + drivers/scsi/lpfc/lpfc_nvme.c | 37 - + drivers/scsi/lpfc/lpfc_nvmet.c | 8 - + drivers/scsi/lpfc/lpfc_sli.c | 45 +- + drivers/scsi/lpfc/lpfc_sli4.h | 2 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_mbox.c | 6 +- + drivers/scsi/megaraid/megaraid_sas.h | 8 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 10 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 12 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 81 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 6 +- + drivers/scsi/mpt3sas/Makefile | 3 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 266 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 21 +- + drivers/scsi/mpt3sas/mpt3sas_debugfs.c | 157 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 +- + drivers/scsi/mvsas/mv_init.c | 6 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/qedf/qedf.h | 6 +- + drivers/scsi/qedf/qedf_els.c | 10 +- + drivers/scsi/qedf/qedf_io.c | 48 +- + drivers/scsi/qedf/qedf_main.c | 135 +- + drivers/scsi/qedi/qedi_iscsi.c | 21 +- + drivers/scsi/qedi/qedi_main.c | 22 +- + drivers/scsi/qla1280.c | 4 +- + drivers/scsi/qla2xxx/qla_attr.c | 40 +- + drivers/scsi/qla2xxx/qla_bsg.c | 8 +- + drivers/scsi/qla2xxx/qla_dbg.c | 866 +- + drivers/scsi/qla2xxx/qla_dbg.h | 443 +- + drivers/scsi/qla2xxx/qla_def.h | 728 +- + drivers/scsi/qla2xxx/qla_fw.h | 768 +- + drivers/scsi/qla2xxx/qla_gbl.h | 26 +- + drivers/scsi/qla2xxx/qla_init.c | 380 +- + drivers/scsi/qla2xxx/qla_inline.h | 8 +- + drivers/scsi/qla2xxx/qla_iocb.c | 140 +- + drivers/scsi/qla2xxx/qla_isr.c | 287 +- + drivers/scsi/qla2xxx/qla_mbx.c | 123 +- + drivers/scsi/qla2xxx/qla_mid.c | 4 +- + drivers/scsi/qla2xxx/qla_mr.c | 120 +- + drivers/scsi/qla2xxx/qla_mr.h | 32 +- + drivers/scsi/qla2xxx/qla_nvme.c | 16 +- + drivers/scsi/qla2xxx/qla_nvme.h | 64 +- + drivers/scsi/qla2xxx/qla_nx.c | 208 +- + drivers/scsi/qla2xxx/qla_nx.h | 36 +- + drivers/scsi/qla2xxx/qla_nx2.c | 26 +- + drivers/scsi/qla2xxx/qla_os.c | 133 +- + drivers/scsi/qla2xxx/qla_sup.c | 323 +- + drivers/scsi/qla2xxx/qla_target.c | 111 +- + drivers/scsi/qla2xxx/qla_target.h | 232 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 140 +- + drivers/scsi/qla2xxx/qla_tmpl.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 16 + + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/scsi_debug.c | 2072 ++++- + drivers/scsi/scsi_error.c | 2 + + drivers/scsi/scsi_lib.c | 230 +- + drivers/scsi/scsi_transport_iscsi.c | 68 +- + drivers/scsi/sd.c | 19 + + drivers/scsi/sgiwd93.c | 2 +- + drivers/scsi/snic/snic.h | 2 +- + drivers/scsi/snic/snic_ctl.c | 5 +- + drivers/scsi/sr.c | 26 +- + drivers/scsi/st.c | 5 +- + drivers/scsi/ufs/ti-j721e-ufs.c | 13 +- + drivers/scsi/ufs/ufs-mediatek.c | 30 +- + drivers/scsi/ufs/ufs-qcom.c | 10 +- + drivers/scsi/ufs/ufs-sysfs.c | 61 +- + drivers/scsi/ufs/ufs.h | 43 +- + drivers/scsi/ufs/ufs_quirks.h | 7 + + drivers/scsi/ufs/ufshcd.c | 515 +- + drivers/scsi/ufs/ufshcd.h | 45 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/slimbus/core.c | 6 +- + drivers/slimbus/qcom-ngd-ctrl.c | 5 +- + 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/kendryte/k210-sysctl.c | 12 + + 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/sifive/sifive_l2_cache.c | 40 +- + 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/soc/xilinx/zynqmp_pm_domains.c | 26 +- + drivers/soc/xilinx/zynqmp_power.c | 17 +- + drivers/soundwire/Makefile | 8 +- + drivers/soundwire/bus.c | 71 +- + drivers/soundwire/bus.h | 4 + + drivers/soundwire/bus_type.c | 22 +- + drivers/soundwire/cadence_master.c | 8 +- + drivers/soundwire/debugfs.c | 2 +- + drivers/soundwire/intel.c | 9 +- + drivers/soundwire/intel_init.c | 4 +- + drivers/soundwire/master.c | 172 + + drivers/soundwire/mipi_disco.c | 11 +- + drivers/soundwire/qcom.c | 34 +- + drivers/soundwire/slave.c | 10 +- + drivers/soundwire/sysfs_local.h | 14 + + drivers/soundwire/sysfs_slave.c | 214 + + drivers/soundwire/sysfs_slave_dpn.c | 300 + + drivers/spi/spi-zynqmp-gqspi.c | 5 - + drivers/staging/android/ion/ion_page_pool.c | 4 +- + drivers/staging/axis-fifo/axis-fifo.c | 12 +- + drivers/staging/comedi/comedi_internal.h | 4 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 4 +- + drivers/staging/fbtft/fb_st7789v.c | 32 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 +- + drivers/staging/gasket/gasket_page_table.c | 2 +- + drivers/staging/gasket/gasket_sysfs.c | 2 + + drivers/staging/gdm724x/gdm_lte.c | 2 +- + drivers/staging/greybus/hid.c | 3 +- + drivers/staging/greybus/light.c | 3 +- + drivers/staging/greybus/loopback.c | 2 +- + drivers/staging/greybus/uart.c | 19 +- + drivers/staging/iio/Documentation/overview.txt | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 77 +- + 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/staging/most/usb/Kconfig | 2 +- + drivers/staging/most/usb/usb.c | 305 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 9 +- + .../mt7621-pci-phy/mediatek,mt7621-pci-phy.txt | 28 - + .../mt7621-pci-phy/mediatek,mt7621-pci-phy.yaml | 36 + + drivers/staging/mt7621-pci/pci-mt7621.c | 64 +- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 2 +- + drivers/staging/pi433/pi433_if.c | 1 + + drivers/staging/qlge/qlge_dbg.c | 7 +- + drivers/staging/qlge/qlge_main.c | 476 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 99 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 33 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_led.c | 17 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 19 +- + drivers/staging/rtl8188eu/hal/fw.c | 7 +- + drivers/staging/rtl8188eu/hal/odm.c | 54 +- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 2 - + drivers/staging/rtl8188eu/hal/phy.c | 62 +- + drivers/staging/rtl8188eu/hal/rf.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 3 - + drivers/staging/rtl8188eu/include/osdep_service.h | 2 +- + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 116 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 24 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 18 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 126 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 158 +- + drivers/staging/rtl8712/rtl871x_xmit.h | 2 +- + drivers/staging/rtl8712/usb_halinit.c | 2 +- + drivers/staging/rtl8712/wifi.h | 9 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 9 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 - + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 22 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 45 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 8 +- + drivers/staging/rtl8723bs/hal/odm.c | 13 - + drivers/staging/rtl8723bs/hal/odm.h | 2 +- + drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 44 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 - + drivers/staging/rtl8723bs/include/hal_data.h | 8 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 2 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 34 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 6 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 33 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 26 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 8 +- + drivers/staging/sm750fb/sm750.c | 154 +- + drivers/staging/sm750fb/sm750.h | 21 +- + drivers/staging/sm750fb/sm750_hw.c | 2 +- + drivers/staging/speakup/speakup_decext.c | 4 + + drivers/staging/speakup/speakup_decpc.c | 4 + + drivers/staging/speakup/speakup_dectlk.c | 5 +- + drivers/staging/speakup/speakup_dummy.c | 4 + + drivers/staging/speakup/speakup_soft.c | 4 + + drivers/staging/speakup/spk_types.h | 3 +- + drivers/staging/speakup/spkguide.txt | 7 +- + drivers/staging/speakup/sysfs-driver-speakup | 6 + + drivers/staging/speakup/varhandlers.c | 1 + + drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 383 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.h | 62 +- + .../vc04_services/bcm2835-camera/controls.c | 97 +- + .../vc04_services/bcm2835-camera/mmal-common.h | 18 +- + .../vc04_services/bcm2835-camera/mmal-parameters.h | 14 +- + .../staging/vc04_services/interface/vchi/vchi.h | 81 - + .../interface/vchiq_arm/vchiq_2835_arm.c | 7 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 +- + .../interface/vchiq_arm/vchiq_connected.c | 33 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 19 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 7 + + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 166 +- + drivers/staging/vt6655/Makefile | 3 - + drivers/staging/vt6655/baseband.c | 320 +- + drivers/staging/vt6655/baseband.h | 37 +- + drivers/staging/vt6655/card.c | 145 +- + drivers/staging/vt6655/card.h | 4 - + drivers/staging/vt6655/channel.c | 4 +- + drivers/staging/vt6655/device_main.c | 37 +- + drivers/staging/vt6655/rf.c | 4 +- + drivers/staging/vt6655/rxtx.c | 252 +- + drivers/staging/vt6656/Makefile | 6 +- + drivers/staging/vt6656/baseband.c | 620 +- + drivers/staging/vt6656/baseband.h | 17 +- + drivers/staging/vt6656/card.c | 570 +- + drivers/staging/vt6656/card.h | 20 +- + drivers/staging/vt6656/device.h | 20 +- + drivers/staging/vt6656/firmware.c | 106 - + drivers/staging/vt6656/firmware.h | 25 - + drivers/staging/vt6656/key.c | 47 +- + drivers/staging/vt6656/key.h | 13 +- + drivers/staging/vt6656/mac.c | 128 +- + drivers/staging/vt6656/mac.h | 28 +- + drivers/staging/vt6656/main_usb.c | 181 +- + drivers/staging/vt6656/power.c | 34 +- + drivers/staging/vt6656/power.h | 2 +- + drivers/staging/vt6656/rf.c | 463 +- + drivers/staging/vt6656/rf.h | 3 +- + drivers/staging/vt6656/rxtx.c | 674 +- + drivers/staging/vt6656/rxtx.h | 20 +- + drivers/staging/vt6656/usbpipe.c | 70 +- + drivers/staging/vt6656/usbpipe.h | 11 +- + drivers/staging/vt6656/wcmd.c | 3 +- + drivers/staging/wfx/Makefile | 1 + + drivers/staging/wfx/TODO | 51 +- + drivers/staging/wfx/bh.c | 50 +- + drivers/staging/wfx/bh.h | 1 + + drivers/staging/wfx/bus.h | 2 + + drivers/staging/wfx/bus_sdio.c | 86 +- + drivers/staging/wfx/bus_spi.c | 44 +- + drivers/staging/wfx/data_rx.c | 16 +- + drivers/staging/wfx/data_rx.h | 3 +- + drivers/staging/wfx/data_tx.c | 352 +- + drivers/staging/wfx/data_tx.h | 8 +- + drivers/staging/wfx/debug.c | 70 +- + drivers/staging/wfx/fwio.c | 14 +- + drivers/staging/wfx/hif_api_cmd.h | 623 +- + drivers/staging/wfx/hif_api_general.h | 495 +- + drivers/staging/wfx/hif_api_mib.h | 671 +- + drivers/staging/wfx/hif_rx.c | 221 +- + drivers/staging/wfx/hif_tx.c | 119 +- + drivers/staging/wfx/hif_tx.h | 10 +- + drivers/staging/wfx/hif_tx_mib.c | 386 + + drivers/staging/wfx/hif_tx_mib.h | 436 +- + drivers/staging/wfx/hwio.c | 18 +- + drivers/staging/wfx/key.c | 71 +- + drivers/staging/wfx/key.h | 2 - + drivers/staging/wfx/main.c | 78 +- + drivers/staging/wfx/main.h | 4 +- + drivers/staging/wfx/queue.c | 533 +- + drivers/staging/wfx/queue.h | 42 +- + drivers/staging/wfx/scan.c | 13 +- + drivers/staging/wfx/sta.c | 871 +- + drivers/staging/wfx/sta.h | 38 +- + drivers/staging/wfx/traces.h | 31 +- + drivers/staging/wfx/wfx.h | 47 +- + drivers/staging/wilc1000/hif.c | 4 +- + drivers/target/iscsi/iscsi_target_util.c | 30 +- + drivers/target/loopback/tcm_loop.c | 36 +- + drivers/target/target_core_alua.c | 10 +- + drivers/target/target_core_configfs.c | 82 +- + drivers/target/target_core_device.c | 13 +- + drivers/target/target_core_pr.c | 2 +- + drivers/target/target_core_pscsi.c | 6 +- + drivers/target/target_core_tpg.c | 3 +- + drivers/target/target_core_transport.c | 6 +- + drivers/target/target_core_user.c | 177 +- + 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 +- + drivers/thunderbolt/Kconfig | 1 - + drivers/thunderbolt/icm.c | 22 + + drivers/thunderbolt/nhi.c | 5 + + drivers/thunderbolt/nhi.h | 2 + + drivers/thunderbolt/switch.c | 11 +- + drivers/tty/hvc/hvc_console.c | 23 +- + drivers/tty/hvc/hvcs.c | 2 - + drivers/tty/mxser.c | 7 +- + drivers/tty/n_gsm.c | 39 +- + drivers/tty/rocket.c | 10 +- + drivers/tty/serial/8250/8250_core.c | 18 +- + drivers/tty/serial/8250/8250_exar.c | 65 +- + drivers/tty/serial/8250/8250_fintek.c | 13 +- + drivers/tty/serial/8250/8250_pci.c | 6 - + drivers/tty/serial/8250/8250_port.c | 9 +- + drivers/tty/serial/8250/Kconfig | 1 + + drivers/tty/serial/8250/serial_cs.c | 6 +- + drivers/tty/serial/Kconfig | 16 +- + drivers/tty/serial/amba-pl011.c | 1 + + drivers/tty/serial/ar933x_uart.c | 6 +- + drivers/tty/serial/atmel_serial.c | 6 +- + drivers/tty/serial/fsl_lpuart.c | 27 +- + drivers/tty/serial/imx.c | 13 +- + drivers/tty/serial/lantiq.c | 40 +- + drivers/tty/serial/lpc32xx_hs.c | 1 - + drivers/tty/serial/omap-serial.c | 52 +- + drivers/tty/serial/qcom_geni_serial.c | 7 +- + drivers/tty/serial/samsung_tty.c | 84 +- + drivers/tty/serial/sc16is7xx.c | 73 +- + drivers/tty/serial/serial_core.c | 22 +- + drivers/tty/serial/sh-sci.h | 1 - + drivers/tty/serial/stm32-usart.c | 74 +- + drivers/tty/serial/stm32-usart.h | 1 + + drivers/tty/serial/xilinx_uartps.c | 12 +- + drivers/tty/sysrq.c | 68 +- + drivers/tty/vcc.c | 1 + + drivers/tty/vt/keyboard.c | 26 +- + drivers/tty/vt/selection.c | 133 +- + drivers/uio/uio.c | 2 +- + drivers/uio/uio_dmem_genirq.c | 3 +- + drivers/uio/uio_hv_generic.c | 1 + + drivers/usb/cdns3/cdns3-ti.c | 3 +- + drivers/usb/cdns3/core.c | 47 +- + drivers/usb/cdns3/core.h | 2 - + drivers/usb/cdns3/drd.c | 4 +- + drivers/usb/cdns3/ep0.c | 7 - + drivers/usb/cdns3/gadget.c | 15 +- + drivers/usb/chipidea/Kconfig | 37 +- + drivers/usb/chipidea/Makefile | 13 +- + drivers/usb/chipidea/ci.h | 1 + + drivers/usb/chipidea/ci_hdrc_imx.c | 13 +- + drivers/usb/chipidea/ci_hdrc_imx.h | 2 + + drivers/usb/chipidea/ci_hdrc_usb2.c | 30 +- + drivers/usb/chipidea/ci_hdrc_zevio.c | 67 - + drivers/usb/chipidea/core.c | 48 +- + drivers/usb/chipidea/udc.c | 170 +- + drivers/usb/chipidea/udc.h | 6 +- + drivers/usb/chipidea/usbmisc_imx.c | 334 +- + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/class/usblp.c | 5 +- + drivers/usb/core/hcd-pci.c | 7 +- + drivers/usb/core/hcd.c | 3 + + drivers/usb/core/hub.c | 2 +- + drivers/usb/core/hub.h | 2 +- + drivers/usb/core/otg_whitelist.h | 2 +- + drivers/usb/core/sysfs.c | 6 +- + drivers/usb/core/usb.h | 2 +- + drivers/usb/dwc2/core.c | 23 +- + drivers/usb/dwc2/core.h | 6 +- + drivers/usb/dwc2/core_intr.c | 7 +- + drivers/usb/dwc2/debug.h | 2 +- + drivers/usb/dwc2/hcd.h | 2 +- + drivers/usb/dwc2/hw.h | 3 +- + drivers/usb/dwc2/params.c | 19 - + drivers/usb/dwc2/platform.c | 39 + + drivers/usb/dwc3/core.c | 62 +- + drivers/usb/dwc3/core.h | 83 +- + drivers/usb/dwc3/debug.h | 4 +- + drivers/usb/dwc3/debugfs.c | 14 +- + drivers/usb/dwc3/drd.c | 6 +- + drivers/usb/dwc3/dwc3-keystone.c | 41 +- + drivers/usb/dwc3/dwc3-meson-g12a.c | 422 +- + drivers/usb/dwc3/dwc3-of-simple.c | 30 +- + drivers/usb/dwc3/gadget.c | 469 +- + drivers/usb/dwc3/gadget.h | 2 +- + drivers/usb/dwc3/host.c | 2 +- + drivers/usb/dwc3/io.h | 2 +- + drivers/usb/dwc3/trace.h | 2 +- + drivers/usb/early/xhci-dbc.c | 1 - + drivers/usb/early/xhci-dbc.h | 2 +- + drivers/usb/gadget/composite.c | 78 +- + drivers/usb/gadget/configfs.c | 14 +- + drivers/usb/gadget/function/f_acm.c | 16 + + drivers/usb/gadget/function/f_eem.c | 2 - + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/gadget/function/f_serial.c | 16 + + drivers/usb/gadget/function/f_tcm.c | 3 + + drivers/usb/gadget/function/f_uvc.h | 2 +- + drivers/usb/gadget/function/rndis.h | 2 +- + drivers/usb/gadget/function/u_audio.h | 2 +- + drivers/usb/gadget/function/u_ecm.h | 2 +- + drivers/usb/gadget/function/u_eem.h | 2 +- + drivers/usb/gadget/function/u_ether.h | 2 +- + drivers/usb/gadget/function/u_ether_configfs.h | 2 +- + drivers/usb/gadget/function/u_fs.h | 2 +- + drivers/usb/gadget/function/u_gether.h | 2 +- + drivers/usb/gadget/function/u_hid.h | 2 +- + drivers/usb/gadget/function/u_midi.h | 2 +- + drivers/usb/gadget/function/u_ncm.h | 2 +- + drivers/usb/gadget/function/u_phonet.h | 2 +- + drivers/usb/gadget/function/u_printer.h | 2 +- + drivers/usb/gadget/function/u_rndis.h | 2 +- + drivers/usb/gadget/function/u_serial.c | 57 +- + drivers/usb/gadget/function/u_serial.h | 4 +- + drivers/usb/gadget/function/u_tcm.h | 2 +- + drivers/usb/gadget/function/u_uac1.h | 2 +- + drivers/usb/gadget/function/u_uac1_legacy.h | 2 +- + drivers/usb/gadget/function/u_uac2.h | 2 +- + drivers/usb/gadget/function/u_uvc.h | 2 +- + drivers/usb/gadget/function/uvc.h | 4 +- + drivers/usb/gadget/function/uvc_configfs.h | 2 +- + drivers/usb/gadget/function/uvc_v4l2.c | 4 +- + drivers/usb/gadget/function/uvc_v4l2.h | 2 +- + drivers/usb/gadget/function/uvc_video.c | 76 +- + drivers/usb/gadget/function/uvc_video.h | 4 +- + drivers/usb/gadget/legacy/mass_storage.c | 14 +- + drivers/usb/gadget/udc/aspeed-vhub/core.c | 16 +- + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 236 +- + drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 12 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 112 +- + drivers/usb/gadget/udc/atmel_usba_udc.h | 12 + + drivers/usb/gadget/udc/core.c | 2 + + drivers/usb/gadget/udc/dummy_hcd.c | 27 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 4 +- + drivers/usb/gadget/udc/gr_udc.c | 1 - + drivers/usb/gadget/udc/lpc32xx_udc.c | 11 +- + drivers/usb/gadget/udc/m66592-udc.c | 2 +- + drivers/usb/gadget/udc/max3420_udc.c | 2 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 2 +- + drivers/usb/gadget/udc/net2272.c | 2 +- + drivers/usb/gadget/udc/omap_udc.c | 2 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 4 - + drivers/usb/gadget/udc/tegra-xudc.c | 140 + + drivers/usb/gadget/udc/udc-xilinx.c | 1 + + drivers/usb/gadget/usbstring.c | 24 + + drivers/usb/host/Kconfig | 29 + + drivers/usb/host/Makefile | 2 + + drivers/usb/host/ehci-brcm.c | 280 + + drivers/usb/host/ehci-fsl.h | 2 +- + drivers/usb/host/ehci-mv.c | 12 +- + drivers/usb/host/ehci-mxc.c | 15 +- + drivers/usb/host/ehci-pci.c | 6 +- + drivers/usb/host/ehci-platform.c | 4 + + drivers/usb/host/ehci-tegra.c | 1 - + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/fhci.h | 2 +- + drivers/usb/host/imx21-hcd.h | 2 +- + drivers/usb/host/ohci-pci.c | 9 +- + drivers/usb/host/ohci-platform.c | 5 + + drivers/usb/host/ohci-sm501.c | 7 +- + drivers/usb/host/ohci.h | 2 +- + drivers/usb/host/pci-quirks.c | 24 +- + drivers/usb/host/r8a66597.h | 2 +- + drivers/usb/host/u132-hcd.c | 10 - + drivers/usb/host/uhci-pci.c | 8 +- + drivers/usb/host/xhci-debugfs.h | 2 +- + drivers/usb/host/xhci-ext-caps.h | 2 +- + drivers/usb/host/xhci-mtk.h | 2 +- + drivers/usb/host/xhci-mvebu.h | 2 +- + drivers/usb/host/xhci-pci-renesas.c | 645 ++ + drivers/usb/host/xhci-pci.c | 47 +- + drivers/usb/host/xhci-pci.h | 28 + + drivers/usb/host/xhci-plat.c | 20 +- + drivers/usb/host/xhci-plat.h | 2 +- + drivers/usb/host/xhci-rcar.h | 2 +- + drivers/usb/host/xhci-trace.h | 2 +- + drivers/usb/host/xhci.h | 3 +- + drivers/usb/isp1760/isp1760-core.h | 2 +- + drivers/usb/isp1760/isp1760-regs.h | 2 +- + drivers/usb/isp1760/isp1760-udc.h | 2 +- + drivers/usb/misc/sisusbvga/sisusb.h | 2 +- + drivers/usb/misc/sisusbvga/sisusb_init.h | 2 +- + drivers/usb/misc/sisusbvga/sisusb_struct.h | 2 +- + drivers/usb/misc/usb_u132.h | 2 +- + drivers/usb/mtu3/mtu3.h | 2 +- + drivers/usb/mtu3/mtu3_debug.h | 2 +- + drivers/usb/mtu3/mtu3_dr.h | 2 +- + drivers/usb/mtu3/mtu3_hw_regs.h | 2 +- + drivers/usb/mtu3/mtu3_qmu.h | 2 +- + drivers/usb/mtu3/mtu3_trace.h | 2 +- + drivers/usb/musb/davinci.h | 2 +- + drivers/usb/musb/jz4740.c | 4 +- + drivers/usb/musb/mediatek.c | 6 + + drivers/usb/musb/musb_core.c | 9 +- + drivers/usb/musb/musb_core.h | 2 +- + drivers/usb/musb/musb_debug.h | 2 +- + drivers/usb/musb/musb_debugfs.c | 10 +- + drivers/usb/musb/musb_dma.h | 2 +- + drivers/usb/musb/musb_gadget.h | 2 +- + drivers/usb/musb/musb_host.c | 10 +- + drivers/usb/musb/musb_host.h | 2 +- + drivers/usb/musb/musb_io.h | 2 +- + drivers/usb/musb/musb_regs.h | 2 +- + drivers/usb/musb/musb_trace.h | 2 +- + drivers/usb/musb/omap2430.h | 2 +- + drivers/usb/musb/tusb6010.h | 2 +- + drivers/usb/phy/phy-fsl-usb.h | 2 +- + drivers/usb/phy/phy-jz4770.c | 12 +- + drivers/usb/phy/phy-mv-usb.h | 2 +- + drivers/usb/renesas_usbhs/common.h | 2 +- + drivers/usb/renesas_usbhs/fifo.h | 2 +- + drivers/usb/renesas_usbhs/mod.h | 2 +- + drivers/usb/renesas_usbhs/pipe.h | 2 +- + drivers/usb/renesas_usbhs/rcar2.h | 2 +- + drivers/usb/renesas_usbhs/rcar3.h | 2 +- + drivers/usb/renesas_usbhs/rza.h | 2 +- + drivers/usb/roles/class.c | 4 +- + drivers/usb/serial/belkin_sa.h | 2 +- + drivers/usb/serial/ch341.c | 68 +- + drivers/usb/serial/io_16654.h | 2 +- + drivers/usb/serial/io_edgeport.h | 2 +- + drivers/usb/serial/io_ionsp.h | 2 +- + drivers/usb/serial/io_ti.h | 2 +- + drivers/usb/serial/io_usbvend.h | 2 +- + drivers/usb/serial/iuu_phoenix.h | 2 +- + drivers/usb/serial/mct_u232.h | 2 +- + drivers/usb/serial/option.c | 4 + + drivers/usb/serial/oti6858.h | 2 +- + drivers/usb/serial/pl2303.h | 2 +- + drivers/usb/serial/qcserial.c | 1 + + drivers/usb/serial/usb_wwan.c | 4 + + drivers/usb/serial/visor.h | 2 +- + drivers/usb/serial/whiteheat.h | 2 +- + drivers/usb/storage/debug.h | 2 +- + drivers/usb/storage/initializers.h | 2 +- + drivers/usb/storage/protocol.h | 2 +- + drivers/usb/storage/scsiglue.h | 2 +- + drivers/usb/storage/sierra_ms.c | 4 - + drivers/usb/storage/transport.h | 2 +- + drivers/usb/storage/unusual_alauda.h | 2 +- + drivers/usb/storage/unusual_cypress.h | 2 +- + drivers/usb/storage/unusual_datafab.h | 2 +- + drivers/usb/storage/unusual_devs.h | 2 +- + drivers/usb/storage/unusual_ene_ub6250.h | 2 +- + drivers/usb/storage/unusual_freecom.h | 2 +- + drivers/usb/storage/unusual_isd200.h | 2 +- + drivers/usb/storage/unusual_jumpshot.h | 2 +- + drivers/usb/storage/unusual_karma.h | 2 +- + drivers/usb/storage/unusual_onetouch.h | 2 +- + drivers/usb/storage/unusual_realtek.h | 2 +- + drivers/usb/storage/unusual_sddr09.h | 2 +- + drivers/usb/storage/unusual_sddr55.h | 2 +- + drivers/usb/storage/unusual_uas.h | 2 +- + drivers/usb/storage/unusual_usbat.h | 2 +- + drivers/usb/storage/usb.h | 2 +- + drivers/usb/typec/Kconfig | 3 +- + drivers/usb/typec/class.c | 36 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 42 +- + drivers/usb/typec/tcpm/fusb302.c | 32 +- + drivers/usb/typec/tcpm/fusb302_reg.h | 2 +- + drivers/usb/typec/tps6598x.c | 64 +- + drivers/usb/typec/ucsi/Makefile | 4 + + drivers/usb/typec/ucsi/psy.c | 241 + + drivers/usb/typec/ucsi/trace.c | 10 +- + drivers/usb/typec/ucsi/ucsi.c | 41 +- + drivers/usb/typec/ucsi/ucsi.h | 26 +- + drivers/vfio/mdev/mdev_sysfs.c | 2 +- + drivers/vfio/pci/vfio_pci.c | 353 +- + drivers/vfio/pci/vfio_pci_config.c | 50 +- + drivers/vfio/pci/vfio_pci_intrs.c | 14 + + drivers/vfio/pci/vfio_pci_nvlink2.c | 2 +- + drivers/vfio/pci/vfio_pci_private.h | 15 + + drivers/vfio/pci/vfio_pci_rdwr.c | 24 +- + drivers/vfio/vfio.c | 13 +- + drivers/vfio/vfio_iommu_type1.c | 609 +- + drivers/vhost/scsi.c | 1 + + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/ps3fb.c | 4 +- + drivers/visorbus/controlvmchannel.h | 2 +- + drivers/visorbus/vbuschannel.h | 2 +- + drivers/visorbus/visorbus_private.h | 2 +- + drivers/w1/masters/omap_hdq.c | 82 +- + drivers/w1/slaves/w1_ds2430.c | 2 +- + drivers/w1/slaves/w1_therm.c | 1668 +++- + drivers/xen/privcmd.c | 1 - + fs/Kconfig.binfmt | 2 +- + 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 | 447 +- + 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 | 382 + + 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/bad_inode.c | 1 + + fs/binfmt_elf.c | 4 - + fs/binfmt_em86.c | 6 +- + fs/binfmt_misc.c | 4 +- + fs/binfmt_script.c | 6 +- + fs/btrfs/extent_io.h | 1 + + fs/btrfs/inode.c | 4 +- + fs/cifs/cifs_debug.c | 6 + + fs/cifs/cifs_debug.h | 145 +- + fs/cifs/cifsencrypt.c | 8 +- + fs/cifs/cifsfs.c | 2 + + fs/cifs/cifsfs.h | 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 | 130 +- + fs/cifs/dfs_cache.c | 14 +- + fs/cifs/file.c | 60 +- + fs/cifs/inode.c | 18 +- + fs/cifs/link.c | 8 +- + 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 | 174 +- + fs/cifs/smb2pdu.c | 499 +- + fs/cifs/smb2pdu.h | 13 +- + fs/cifs/smb2proto.h | 25 +- + fs/cifs/smbdirect.c | 165 +- + fs/cifs/transport.c | 75 +- + fs/compat_binfmt_elf.c | 5 + + fs/debugfs/internal.h | 2 +- + fs/dlm/dlm_internal.h | 7 +- + fs/dlm/lockspace.c | 18 +- + fs/dlm/rcom.c | 2 +- + fs/dlm/user.c | 2 +- + fs/exec.c | 52 +- + fs/ext2/inode.c | 1 + + fs/ext4/Kconfig | 3 +- + fs/ext4/acl.c | 5 +- + fs/ext4/balloc.c | 5 +- + fs/ext4/ext4.h | 40 +- + 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 | 1 + + fs/ext4/indirect.c | 4 +- + fs/ext4/inline.c | 6 +- + fs/ext4/inode.c | 152 +- + fs/ext4/ioctl.c | 8 - + fs/ext4/mballoc.c | 512 +- + fs/ext4/mballoc.h | 16 +- + fs/ext4/migrate.c | 12 +- + fs/ext4/namei.c | 76 +- + fs/ext4/super.c | 27 +- + fs/ext4/xattr.c | 13 +- + fs/f2fs/data.c | 3 +- + fs/f2fs/inline.c | 1 + + fs/fat/fatent.c | 103 +- + fs/fat/inode.c | 6 + + fs/fs-writeback.c | 1 + + fs/gfs2/inode.c | 1 + + fs/hpfs/buffer.c | 2 +- + fs/hpfs/file.c | 1 + + fs/inode.c | 112 +- + fs/internal.h | 2 - + fs/ioctl.c | 82 +- + fs/iomap/fiemap.c | 11 +- + fs/jbd2/transaction.c | 14 +- + fs/kernfs/file.c | 2 +- + fs/nilfs2/inode.c | 3 +- + fs/ocfs2/extent_map.c | 4 +- + fs/orangefs/orangefs-bufmap.c | 9 +- + fs/orangefs/orangefs-mod.c | 2 +- + fs/overlayfs/inode.c | 5 +- + fs/proc/array.c | 8 +- + fs/seq_file.c | 7 +- + fs/sysfs/file.c | 1 + + fs/xfs/xfs_iops.c | 1 + + include/asm-generic/5level-fixup.h | 59 - + include/asm-generic/io.h | 64 +- + include/asm-generic/pgtable-nop4d-hack.h | 64 - + include/asm-generic/pgtable-nopud.h | 4 - + include/asm-generic/pgtable.h | 4 +- + include/drm/ttm/ttm_bo_api.h | 4 - + 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/interconnect/imx8mm.h | 50 + + include/dt-bindings/interconnect/imx8mn.h | 41 + + include/dt-bindings/interconnect/imx8mq.h | 48 + + include/dt-bindings/phy/phy.h | 1 + + 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/binfmts.h | 3 +- + include/linux/bitops.h | 2 +- + include/linux/coresight.h | 32 +- + include/linux/cpuhotplug.h | 1 + + include/linux/device-mapper.h | 9 +- + include/linux/dm-bufio.h | 12 + + include/linux/dma-direct.h | 2 + + include/linux/dma-mapping.h | 86 +- + include/linux/elfnote.h | 2 +- + include/linux/fiemap.h | 25 + + include/linux/firmware.h | 1 - + include/linux/firmware/imx/sci.h | 1 - + include/linux/firmware/imx/types.h | 65 - + include/linux/firmware/intel/stratix10-smc.h | 49 +- + .../linux/firmware/intel/stratix10-svc-client.h | 71 +- + include/linux/firmware/trusted_foundations.h | 1 + + include/linux/firmware/xlnx-zynqmp.h | 237 +- + include/linux/fpga/adi-axi-common.h | 6 +- + include/linux/fs.h | 26 +- + include/linux/fsl/bestcomm/bestcomm.h | 2 +- + include/linux/fwnode.h | 2 + + include/linux/gpio/driver.h | 48 +- + include/linux/gpio/machine.h | 17 +- + include/linux/gpio/regmap.h | 86 + + include/linux/greybus/greybus_protocols.h | 44 +- + include/linux/highmem.h | 81 +- + include/linux/hw_breakpoint.h | 4 + + include/linux/iio/adc/ad_sigma_delta.h | 58 - + include/linux/iio/adc/adi-axi-adc.h | 64 + + include/linux/iio/buffer-dma.h | 2 +- + include/linux/iio/buffer-dmaengine.h | 3 + + include/linux/iio/buffer_impl.h | 9 - + include/linux/iio/consumer.h | 18 - + include/linux/iio/hw-consumer.h | 1 - + include/linux/iio/iio.h | 10 +- + include/linux/iio/imu/adis.h | 87 +- + include/linux/iio/kfifo_buf.h | 1 - + include/linux/iio/trigger.h | 3 - + include/linux/iio/triggered_buffer.h | 2 - + include/linux/ima.h | 7 + + include/linux/interconnect.h | 25 + + include/linux/iomap.h | 2 +- + include/linux/iommu.h | 16 + + include/linux/ioport.h | 7 + + include/linux/kconfig.h | 2 + + include/linux/memory_hotplug.h | 9 +- + include/linux/mfd/core.h | 2 +- + include/linux/mhi.h | 23 +- + include/linux/mlx4/device.h | 22 +- + include/linux/mlx5/mlx5_ifc.h | 9 +- + include/linux/mlx5/qp.h | 68 +- + include/linux/mm.h | 12 +- + include/linux/mod_devicetable.h | 2 + + include/linux/of_reserved_mem.h | 12 + + include/linux/parport.h | 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/linux/phy/omap_usb.h | 69 +- + include/linux/platform_data/clk-integrator.h | 2 - + include/linux/platform_data/gpio-dwapb.h | 1 - + include/linux/property.h | 1 + + include/linux/qed/qed_if.h | 1 + + include/linux/qed/qed_rdma_if.h | 1 - + include/linux/rtsx_pci.h | 25 - + include/linux/scatterlist.h | 50 +- + include/linux/sched.h | 3 + + include/linux/scmi_protocol.h | 6 + + include/linux/scpi_protocol.h | 6 + + include/linux/seq_file.h | 19 + + include/linux/serial_core.h | 4 +- + include/linux/soc/mediatek/mtk-mmsys.h | 20 + + include/linux/soundwire/sdw.h | 32 +- + include/linux/soundwire/sdw_type.h | 9 +- + include/linux/sysrq.h | 18 +- + include/linux/tee_drv.h | 17 + + include/linux/thunderbolt.h | 2 +- + include/linux/usb/chipidea.h | 1 + + include/linux/usb/composite.h | 3 + + include/linux/usb/gadget.h | 8 + + include/linux/usb/hcd.h | 3 +- + include/linux/usb/typec.h | 1 + + include/linux/vexpress.h | 30 - + include/linux/vfio.h | 4 +- + include/linux/workqueue.h | 2 +- + include/linux/writeback.h | 1 + + 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 | 31 +- + include/rdma/uverbs_ioctl.h | 18 +- + include/rdma/uverbs_std_types.h | 2 +- + include/rdma/uverbs_types.h | 3 +- + include/scsi/sas.h | 8 +- + include/scsi/scsi_cmnd.h | 1 - + include/soc/bcm2835/raspberrypi-firmware.h | 9 +- + include/soc/fsl/qe/qe.h | 2 +- + include/soc/imx/cpu.h | 36 + + include/soc/qcom/cmd-db.h | 1 + + include/target/iscsi/iscsi_target_core.h | 10 - + include/target/target_core_backend.h | 4 +- + include/target/target_core_base.h | 1 + + include/trace/events/afs.h | 111 +- + include/trace/events/ext4.h | 9 +- + include/trace/events/qla.h | 7 + + include/uapi/linux/fiemap.h | 6 +- + include/uapi/linux/magic.h | 1 + + include/uapi/linux/tee.h | 9 + + include/uapi/linux/vfio.h | 319 + + include/uapi/misc/habanalabs.h | 245 +- + 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 +- + init/Kconfig | 44 +- + init/Makefile | 2 +- + init/main.c | 10 + + kernel/cgroup/cgroup.c | 10 +- + kernel/cgroup/rstat.c | 60 +- + kernel/cpu_pm.c | 4 +- + kernel/debug/debug_core.c | 14 +- + 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 +- + kernel/events/hw_breakpoint.c | 16 + + kernel/gen_kheaders.sh | 2 +- + kernel/kcov.c | 266 +- + kernel/kexec_file.c | 5 + + kernel/kprobes.c | 34 +- + kernel/module.c | 50 +- + kernel/power/poweroff.c | 2 +- + kernel/rcu/tree_stall.h | 2 +- + kernel/relay.c | 22 +- + kernel/resource.c | 5 + + kernel/user.c | 2 +- + kernel/workqueue.c | 207 +- + lib/Kconfig.debug | 61 + + lib/Makefile | 2 + + lib/flex_proportions.c | 7 +- + lib/kobject.c | 14 +- + lib/logic_pio.c | 22 +- + lib/math/prime_numbers.c | 10 +- + lib/percpu-refcount.c | 6 +- + lib/strncpy_from_user.c | 1 + + lib/test_bitops.c | 60 + + lib/test_firmware.c | 26 +- + lib/test_lockup.c | 2 +- + lib/test_printf.c | 4 +- + lib/ubsan.c | 33 +- + lib/zlib_inflate/inffast.c | 91 +- + mm/Kconfig | 4 + + mm/Makefile | 1 + + mm/compaction.c | 2 +- + mm/debug_vm_pgtable.c | 382 + + mm/filemap.c | 2 +- + mm/frontswap.c | 6 +- + mm/huge_memory.c | 6 +- + mm/hugetlb.c | 16 +- + mm/internal.h | 2 +- + mm/kasan/init.c | 11 - + mm/ksm.c | 10 +- + mm/list_lru.c | 2 +- + mm/memblock.c | 2 +- + mm/memcontrol.c | 4 +- + mm/memory.c | 10 +- + mm/memory_hotplug.c | 159 +- + mm/mmap.c | 2 +- + mm/mremap.c | 4 +- + mm/page-writeback.c | 2 +- + mm/slub.c | 2 +- + mm/sparse.c | 2 +- + mm/util.c | 22 +- + mm/vmalloc.c | 2 +- + mm/vmscan.c | 6 +- + mm/vmstat.c | 32 +- + mm/zbud.c | 2 +- + net/bpfilter/Kconfig | 6 +- + net/bpfilter/Makefile | 11 +- + 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/rxrpc/peer_event.c | 3 + + net/rxrpc/proc.c | 6 +- + net/smc/smc_ib.c | 13 +- + 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 | 67 +- + scripts/Makefile.clean | 2 +- + scripts/Makefile.host | 4 +- + scripts/Makefile.lib | 79 +- + scripts/Makefile.modpost | 75 +- + scripts/Makefile.package | 8 +- + scripts/Makefile.userprogs | 45 + + scripts/basic/fixdep.c | 2 +- + scripts/checkpatch.pl | 64 +- + scripts/checkstack.pl | 87 +- + scripts/gcc-plugins/Makefile | 2 +- + scripts/get_maintainer.pl | 46 +- + scripts/headers_install.sh | 14 +- + 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/mksysmap | 2 +- + scripts/mod/file2alias.c | 2 + + scripts/mod/modpost.c | 386 +- + scripts/mod/modpost.h | 19 +- + scripts/mod/sumversion.c | 117 +- + scripts/modules-check.sh | 16 +- + scripts/package/buildtar | 6 +- + scripts/xz_wrap.sh | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima.h | 20 +- + security/integrity/ima/ima_api.c | 23 +- + security/integrity/ima/ima_crypto.c | 252 +- + security/integrity/ima/ima_fs.c | 4 +- + security/integrity/ima/ima_init.c | 24 +- + security/integrity/ima/ima_main.c | 54 + + security/integrity/ima/ima_policy.c | 12 +- + security/integrity/ima/ima_queue.c | 36 +- + security/integrity/ima/ima_template.c | 25 +- + security/integrity/ima/ima_template_lib.c | 18 + + security/keys/internal.h | 11 - + security/keys/keyctl.c | 16 +- + security/security.c | 7 +- + sound/drivers/Kconfig | 12 - + sound/drivers/Makefile | 2 - + sound/drivers/ml403-ac97cr.c | 1298 --- + sound/drivers/pcm-indirect2.c | 560 -- + sound/drivers/pcm-indirect2.h | 127 - + sound/ppc/snd_ps3.c | 2 +- + tools/arch/sh/include/asm/barrier.h | 2 +- + tools/gpio/lsgpio.c | 12 + + tools/testing/selftests/lib/config | 1 + + 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 + + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 73 + + tools/testing/selftests/vm/mremap_dontunmap.c | 1 - + tools/testing/selftests/vm/pkey-helpers.h | 225 + + tools/testing/selftests/vm/pkey-powerpc.h | 133 + + tools/testing/selftests/vm/pkey-x86.h | 181 + + .../selftests/{x86 => vm}/protection_keys.c | 696 +- + tools/testing/selftests/x86/.gitignore | 1 - + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/pkey-helpers.h | 219 - + usr/include/Makefile | 6 +- + 3738 files changed, 231431 insertions(+), 82339 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-firmware-zynqmp + create mode 100644 Documentation/ABI/testing/sysfs-block-rnbd + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-dfl_fme + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-proximity + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-sx9310 + create mode 100644 Documentation/ABI/testing/sysfs-bus-soundwire-master + create mode 100644 Documentation/ABI/testing/sysfs-bus-soundwire-slave + 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 Documentation/ABI/testing/sysfs-driver-w1_therm + create mode 100644 Documentation/admin-guide/device-mapper/dm-ebs.rst + create mode 100644 Documentation/admin-guide/gpio/gpio-aggregator.rst + rename Documentation/devicetree/bindings/{ABI.txt => ABI.rst} (94%) + create mode 100644 Documentation/devicetree/bindings/arm/calxeda/hb-sregs.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt + create mode 100644 Documentation/devicetree/bindings/arm/calxeda/l2ecc.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/sata_highbank.txt + create mode 100644 Documentation/devicetree/bindings/ata/sata_highbank.yaml + delete mode 100644 Documentation/devicetree/bindings/auxdisplay/hit,hd44780.txt + create mode 100644 Documentation/devicetree/bindings/auxdisplay/hit,hd44780.yaml + 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 + delete mode 100644 Documentation/devicetree/bindings/clock/calxeda.txt + create mode 100644 Documentation/devicetree/bindings/clock/calxeda.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/clock/cirrus,lochnagar.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx1-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx1-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx21-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx21-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx23-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx23-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx25-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx25-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx27-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx27-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx28-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx28-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx31-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx31-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx35-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx35-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx5-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx5-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx6q-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx6q-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx6sl-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx6sl-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx6sll-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx6sll-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx6sx-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx6sx-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx6ul-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx6ul-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx7d-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx7d-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx8qxp-lpcg.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ingenic,cgu.txt + create mode 100644 Documentation/devicetree/bindings/clock/ingenic,cgu.yaml + create mode 100644 Documentation/devicetree/bindings/cpufreq/nvidia,tegra20-cpufreq.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/anx7814.txt + create mode 100644 Documentation/devicetree/bindings/dma/ingenic,dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/jz4780-dma.txt + delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-arizona.txt + create mode 100644 Documentation/devicetree/bindings/extcon/wlf,arizona.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-mxs.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mxs.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt + create mode 100644 Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-cadence.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-jz4780.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-xiic.txt + create mode 100644 Documentation/devicetree/bindings/i2c/ingenic,i2c.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad9467.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max1241.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/chemical/ams,ccs811.yaml + create mode 100644 Documentation/devicetree/bindings/iio/common.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/st,stm32-dac.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/st,stm32-dac.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/imu/bmi160.txt + create mode 100644 Documentation/devicetree/bindings/iio/imu/bosch,bmi160.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/amstaos,tsl2563.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/tsl2563.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4000.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/vishay,vcnl4000.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/vishay,vcnl3020.yaml + create mode 100644 Documentation/devicetree/bindings/index.rst + delete mode 100644 Documentation/devicetree/bindings/input/gpio-keys-polled.txt + delete mode 100644 Documentation/devicetree/bindings/input/gpio-keys.txt + create mode 100644 Documentation/devicetree/bindings/input/gpio-keys.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.yaml + delete mode 100644 Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt + create mode 100644 Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml + delete mode 100644 Documentation/devicetree/bindings/ipmi/ipmi-smic.txt + create mode 100644 Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/fsl,mu.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/fsl,mu.yaml + delete mode 100644 Documentation/devicetree/bindings/media/marvell,mmp2-ccic.txt + create mode 100644 Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/baikal,bt1-l2-ctl.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/calxeda-ddr-ctrlr.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/calxeda-ddr-ctrlr.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ingenic,jz4780-nemc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ingenic,nemc.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra210-emc.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,dbsc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,dbsc.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/arizona.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/cirrus,madera.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/madera.txt + create mode 100644 Documentation/devicetree/bindings/mfd/wlf,arizona.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/ingenic,mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/jz4740.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/ingenic,jz4780-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/ingenic,nand.yaml + delete mode 100644 Documentation/devicetree/bindings/net/calxeda-xgmac.txt + create mode 100644 Documentation/devicetree/bindings/net/calxeda-xgmac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/stm32-dwmac.txt + create mode 100644 Documentation/devicetree/bindings/net/stm32-dwmac.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/imx-iim.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/imx-iim.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/imx-ocotp.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/mxs-ocotp.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml + 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 Documentation/devicetree/bindings/phy/amlogic,meson8b-usb2-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/calxeda-combophy.txt + create mode 100644 Documentation/devicetree/bindings/phy/calxeda-combophy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/intel,combo-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/meson-gxl-usb3-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom-usb-ipq4019-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt + delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt + create mode 100644 Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/renesas,usb3-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/uniphier-pcie-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/uniphier-usb2-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/uniphier-usb3-hsphy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/uniphier-usb3-ssphy.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml + delete mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpc.txt + create mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpc.yaml + delete mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt + create mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/imx-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/imx-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/imx-tpm-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/imx-tpm-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/mxs-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/mxs-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/arizona-regulator.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/regulator/wlf,arizona.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-mxc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mxc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-mxc_v2.txt + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mxc_v2.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/8250.txt + create mode 100644 Documentation/devicetree/bindings/serial/8250.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/ingenic,uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/ingenic,uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/mrvl-serial.txt + delete mode 100644 Documentation/devicetree/bindings/serial/qca,ar9330-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/qca,ar9330-uart.yaml + create mode 100644 Documentation/devicetree/bindings/serial/renesas,em-uart.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml + create mode 100644 Documentation/devicetree/bindings/soc/ti/k3-socinfo.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,lochnagar.yaml + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,madera.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/madera.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,arizona.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,arizona.yaml + create mode 100644 Documentation/devicetree/bindings/spi/marvell,mmp2-ssp.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-pxa2xx.txt + delete mode 100644 Documentation/devicetree/bindings/sram/rockchip-pmu-sram.txt + rename Documentation/devicetree/bindings/{submitting-patches.txt => submitting-patches.rst} (92%) + delete mode 100644 Documentation/devicetree/bindings/thermal/imx-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/imx-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/imx8mm-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/imx8mm-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml + create mode 100644 Documentation/devicetree/bindings/thermal/socionext,uniphier-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt + delete mode 100644 Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/cdns,ttc.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/fsl,imxgpt.txt + create mode 100644 Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/ingenic,tcu.txt + create mode 100644 Documentation/devicetree/bindings/timer/ingenic,tcu.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/nxp,sysctr-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/nxp,sysctr-timer.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/nxp,tpm-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/nxp,tpm-timer.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/renesas,cmt.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,cmt.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/renesas,mtu2.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,mtu2.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/renesas,ostm.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,ostm.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/amlogic,dwc3.txt + create mode 100644 Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/ehci-mv.txt + delete mode 100644 Documentation/devicetree/bindings/usb/keystone-usb.txt + create mode 100644 Documentation/devicetree/bindings/usb/marvell,pxau2o-ehci.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/qcom,dwc3.txt + create mode 100644 Documentation/devicetree/bindings/usb/qcom,dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,keystone-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,tps6598x.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb-conn-gpio.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/renesas,wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/socionext,uniphier-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt + rename Documentation/devicetree/bindings/{writing-bindings.txt => writing-bindings.rst} (89%) + rename Documentation/devicetree/{changesets.txt => changesets.rst} (59%) + rename Documentation/devicetree/{dynamic-resolution-notes.txt => dynamic-resolution-notes.rst} (90%) + create mode 100644 Documentation/devicetree/index.rst + rename Documentation/devicetree/{of_unittest.txt => of_unittest.rst} (54%) + rename Documentation/devicetree/{overlay-notes.txt => overlay-notes.rst} (50%) + rename Documentation/devicetree/{usage-model.txt => usage-model.rst} (97%) + create mode 100644 Documentation/features/debug/debug-vm-pgtable/arch-support.txt + create mode 100644 Documentation/firmware-guide/acpi/intel-pmc-mux.rst + create mode 100644 Documentation/powerpc/vas-api.rst + 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 + delete mode 100644 arch/powerpc/boot/dts/ep405.dts + delete mode 100644 arch/powerpc/boot/dts/virtex440-ml507.dts + delete mode 100644 arch/powerpc/boot/dts/virtex440-ml510.dts + delete mode 100644 arch/powerpc/boot/dts/walnut.dts + delete mode 100644 arch/powerpc/boot/ep405.c + delete mode 100644 arch/powerpc/boot/treeboot-walnut.c + delete mode 100644 arch/powerpc/boot/uartlite.c + delete mode 100644 arch/powerpc/boot/virtex.c + delete mode 100644 arch/powerpc/boot/virtex405-head.S + delete mode 100644 arch/powerpc/configs/40x/ep405_defconfig + delete mode 100644 arch/powerpc/configs/40x/virtex_defconfig + delete mode 100644 arch/powerpc/configs/44x/virtex5_defconfig + delete mode 100644 arch/powerpc/include/asm/asm-405.h + create mode 100644 arch/powerpc/include/asm/idle.h + create mode 100644 arch/powerpc/include/asm/inst.h + delete mode 100644 arch/powerpc/include/asm/nohash/32/slice.h + create mode 100644 arch/powerpc/include/asm/rtas-types.h + delete mode 100644 arch/powerpc/include/asm/xilinx_intc.h + delete mode 100644 arch/powerpc/include/asm/xilinx_pci.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/mm/book3s64/internal.h + create mode 100644 arch/powerpc/mm/kasan/8xx.c + create mode 100644 arch/powerpc/mm/kasan/book3s_32.c + delete mode 100644 arch/powerpc/platforms/40x/ep405.c + delete mode 100644 arch/powerpc/platforms/40x/virtex.c + delete mode 100644 arch/powerpc/platforms/40x/walnut.c + delete mode 100644 arch/powerpc/platforms/44x/virtex.c + delete mode 100644 arch/powerpc/platforms/44x/virtex_ml510.c + create mode 100644 arch/powerpc/platforms/powernv/vas-api.c + create mode 100644 arch/powerpc/platforms/powernv/vas-fault.c + delete mode 100644 arch/powerpc/sysdev/xilinx_intc.c + delete mode 100644 arch/powerpc/sysdev/xilinx_pci.c + create mode 100644 arch/powerpc/xmon/xmon_bpts.S + create mode 100644 arch/powerpc/xmon/xmon_bpts.h + 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 + delete mode 100644 arch/sh/drivers/pci/ops-sh5.c + delete mode 100644 arch/sh/drivers/pci/pci-sh5.c + delete mode 100644 arch/sh/drivers/pci/pci-sh5.h + delete mode 100644 arch/sh/include/asm/bl_bit_64.h + delete mode 100644 arch/sh/include/asm/cache_insns_64.h + delete mode 100644 arch/sh/include/asm/mmu_context_64.h + delete mode 100644 arch/sh/include/asm/pgtable_64.h + delete mode 100644 arch/sh/include/asm/processor_64.h + delete mode 100644 arch/sh/include/asm/ptrace_64.h + delete mode 100644 arch/sh/include/asm/string_64.h + delete mode 100644 arch/sh/include/asm/switch_to_64.h + delete mode 100644 arch/sh/include/asm/syscall_64.h + delete mode 100644 arch/sh/include/asm/syscalls_64.h + delete mode 100644 arch/sh/include/asm/tlb_64.h + delete mode 100644 arch/sh/include/asm/traps_64.h + delete mode 100644 arch/sh/include/asm/uaccess_64.h + delete mode 100644 arch/sh/include/cpu-sh5/cpu/addrspace.h + delete mode 100644 arch/sh/include/cpu-sh5/cpu/cache.h + delete mode 100644 arch/sh/include/cpu-sh5/cpu/irq.h + delete mode 100644 arch/sh/include/cpu-sh5/cpu/mmu_context.h + delete mode 100644 arch/sh/include/cpu-sh5/cpu/registers.h + delete mode 100644 arch/sh/include/cpu-sh5/cpu/rtc.h + delete mode 100644 arch/sh/include/uapi/asm/posix_types_64.h + delete mode 100644 arch/sh/include/uapi/asm/ptrace_64.h + delete mode 100644 arch/sh/include/uapi/asm/unistd_64.h + delete mode 100644 arch/sh/kernel/cpu/irq/intc-sh5.c + delete mode 100644 arch/sh/kernel/cpu/sh5/Makefile + delete mode 100644 arch/sh/kernel/cpu/sh5/clock-sh5.c + delete mode 100644 arch/sh/kernel/cpu/sh5/entry.S + delete mode 100644 arch/sh/kernel/cpu/sh5/fpu.c + delete mode 100644 arch/sh/kernel/cpu/sh5/probe.c + delete mode 100644 arch/sh/kernel/cpu/sh5/setup-sh5.c + delete mode 100644 arch/sh/kernel/cpu/sh5/switchto.S + delete mode 100644 arch/sh/kernel/cpu/sh5/unwind.c + delete mode 100644 arch/sh/kernel/head_64.S + delete mode 100644 arch/sh/kernel/irq_64.c + delete mode 100644 arch/sh/kernel/process_64.c + delete mode 100644 arch/sh/kernel/ptrace_64.c + delete mode 100644 arch/sh/kernel/sh_ksyms_64.c + delete mode 100644 arch/sh/kernel/signal_64.c + delete mode 100644 arch/sh/kernel/syscalls_64.S + delete mode 100644 arch/sh/kernel/traps_64.c + delete mode 100644 arch/sh/lib64/Makefile + delete mode 100644 arch/sh/lib64/copy_page.S + delete mode 100644 arch/sh/lib64/copy_user_memcpy.S + delete mode 100644 arch/sh/lib64/memcpy.S + delete mode 100644 arch/sh/lib64/memset.S + delete mode 100644 arch/sh/lib64/panic.c + delete mode 100644 arch/sh/lib64/sdivsi3.S + delete mode 100644 arch/sh/lib64/strcpy.S + delete mode 100644 arch/sh/lib64/strlen.S + delete mode 100644 arch/sh/lib64/udelay.c + delete mode 100644 arch/sh/lib64/udivdi3.S + delete mode 100644 arch/sh/lib64/udivsi3.S + delete mode 100644 arch/sh/mm/cache-sh5.c + delete mode 100644 arch/sh/mm/extable_64.c + delete mode 100644 arch/sh/mm/tlb-sh5.c + delete mode 100644 arch/sh/mm/tlbex_64.c + delete mode 100644 arch/sh/mm/tlbflush_64.c + 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 + 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 + rename drivers/crypto/nx/{nx-842-powernv.c => nx-common-powernv.c} (87%) + create mode 100644 drivers/firmware/arm_scmi/smc.c + create mode 100644 drivers/fpga/dfl-fme-perf.c + create mode 100644 drivers/gpio/gpio-aggregator.c + create mode 100644 drivers/gpio/gpio-regmap.c + create mode 100644 drivers/hwtracing/coresight/coresight-sysfs.c + create mode 100644 drivers/iio/adc/ad9467.c + create mode 100644 drivers/iio/adc/adi-axi-adc.c + create mode 100644 drivers/iio/adc/max1241.c + create mode 100644 drivers/iio/chemical/atlas-ezo-sensor.c + create mode 100644 drivers/iio/imu/adis16475.c + create mode 100644 drivers/iio/proximity/sx9310.c + create mode 100644 drivers/iio/proximity/vcnl3020.c + 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/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 drivers/input/serio/i8042-ppcio.h + create mode 100644 drivers/interconnect/imx/Kconfig + create mode 100644 drivers/interconnect/imx/Makefile + create mode 100644 drivers/interconnect/imx/imx.c + create mode 100644 drivers/interconnect/imx/imx.h + create mode 100644 drivers/interconnect/imx/imx8mm.c + create mode 100644 drivers/interconnect/imx/imx8mn.c + create mode 100644 drivers/interconnect/imx/imx8mq.c + create mode 100644 drivers/md/dm-ebs-target.c + create mode 100644 drivers/md/dm-historical-service-time.c + create mode 100644 drivers/memory/bt1-l2-ctl.c + create mode 100644 drivers/misc/habanalabs/gaudi/Makefile + create mode 100644 drivers/misc/habanalabs/gaudi/gaudi.c + create mode 100644 drivers/misc/habanalabs/gaudi/gaudiP.h + create mode 100644 drivers/misc/habanalabs/gaudi/gaudi_coresight.c + create mode 100644 drivers/misc/habanalabs/gaudi/gaudi_hwmgr.c + create mode 100644 drivers/misc/habanalabs/gaudi/gaudi_security.c + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/cpu_if_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma0_core_masks.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma0_core_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma0_qm_masks.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma0_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma1_core_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma1_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma2_core_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma2_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma3_core_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma3_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma4_core_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma4_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma5_core_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma5_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma6_core_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma6_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma7_core_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma7_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch0_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch1_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_e_n_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch0_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch1_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_e_s_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch0_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch1_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_w_n_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch0_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch1_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/dma_if_w_s_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/gaudi_blocks.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/gaudi_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/mme0_ctrl_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/mme0_qm_masks.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/mme0_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/mme1_ctrl_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/mme2_ctrl_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/mme2_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/mme3_ctrl_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/mmu_up_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_0_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_1_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_2_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_3_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_4_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_5_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_6_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_7_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/psoc_etr_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/psoc_global_conf_masks.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/psoc_global_conf_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/psoc_hbm_pll_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/psoc_pci_pll_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/psoc_timestamp_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_0_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_1_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_2_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_3_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_4_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_5_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_6_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_7_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/stlb_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc0_cfg_masks.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc0_cfg_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc0_qm_masks.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc0_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc1_cfg_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc1_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc2_cfg_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc2_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc3_cfg_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc3_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc4_cfg_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc4_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc5_cfg_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc5_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc6_cfg_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc6_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc7_cfg_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/tpc7_qm_regs.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/gaudi.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/gaudi_async_events.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/gaudi_async_ids_map_extended.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/gaudi_coresight.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/gaudi_fw_if.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/gaudi_masks.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/gaudi_packets.h + create mode 100644 drivers/misc/habanalabs/include/gaudi/gaudi_reg_map.h + create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_timestamp_regs.h + create mode 100644 drivers/misc/habanalabs/include/hw_ip/mmu/mmu_v1_1.h + delete mode 100644 drivers/misc/vexpress-syscfg.c + 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 + delete mode 100644 drivers/phy/amlogic/phy-meson-gxl-usb3.c + create mode 100644 drivers/phy/cadence/phy-cadence-salvo.c + create mode 100644 drivers/phy/intel/phy-intel-combo.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c + create mode 100644 drivers/scsi/mpt3sas/mpt3sas_debugfs.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/soundwire/master.c + create mode 100644 drivers/soundwire/sysfs_local.h + create mode 100644 drivers/soundwire/sysfs_slave.c + create mode 100644 drivers/soundwire/sysfs_slave_dpn.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 + delete mode 100644 drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt + create mode 100644 drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.yaml + delete mode 100644 drivers/staging/vt6656/firmware.c + delete mode 100644 drivers/staging/vt6656/firmware.h + create mode 100644 drivers/staging/wfx/hif_tx_mib.c + delete mode 100644 drivers/usb/chipidea/ci_hdrc_zevio.c + create mode 100644 drivers/usb/host/ehci-brcm.c + create mode 100644 drivers/usb/host/xhci-pci-renesas.c + create mode 100644 drivers/usb/host/xhci-pci.h + create mode 100644 drivers/usb/typec/ucsi/psy.c + create mode 100644 fs/afs/fs_operation.c + create mode 100644 fs/afs/vl_alias.c + delete mode 100644 include/asm-generic/5level-fixup.h + delete mode 100644 include/asm-generic/pgtable-nop4d-hack.h + create mode 100644 include/dt-bindings/clock/r8a7742-cpg-mssr.h + create mode 100644 include/dt-bindings/interconnect/imx8mm.h + create mode 100644 include/dt-bindings/interconnect/imx8mn.h + create mode 100644 include/dt-bindings/interconnect/imx8mq.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 + create mode 100644 include/linux/fiemap.h + delete mode 100644 include/linux/firmware/imx/types.h + create mode 100644 include/linux/gpio/regmap.h + create mode 100644 include/linux/iio/adc/adi-axi-adc.h + delete mode 100644 include/linux/platform_data/clk-integrator.h + create mode 100644 include/linux/soc/mediatek/mtk-mmsys.h + delete mode 100644 include/rdma/ib_fmr_pool.h + create mode 100644 include/rdma/lag.h + create mode 100644 include/soc/imx/cpu.h + create mode 100644 kernel/dma/pool.c + create mode 100644 lib/test_bitops.c + create mode 100644 mm/debug_vm_pgtable.c + delete mode 100644 net/rds/ib_fmr.c + 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 + delete mode 100644 sound/drivers/ml403-ac97cr.c + delete mode 100644 sound/drivers/pcm-indirect2.c + delete mode 100644 sound/drivers/pcm-indirect2.h + 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 + create mode 100644 tools/testing/selftests/vm/pkey-helpers.h + create mode 100644 tools/testing/selftests/vm/pkey-powerpc.h + create mode 100644 tools/testing/selftests/vm/pkey-x86.h + rename tools/testing/selftests/{x86 => vm}/protection_keys.c (74%) + delete mode 100644 tools/testing/selftests/x86/pkey-helpers.h +Merging fixes/master (df8cb0ea9423 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 (b170290c2836 Merge tag 'kconfig-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ 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 +Already up to date. +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 (3d77e6a8804a Linux 5.7) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (fcdf818d239e Merge branch 'sparc-scnprintf') +$ git merge sparc/master +Auto-merging arch/sparc/mm/init_64.c +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 +++++----- + 5 files changed, 12 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 (4e2905adac9f net: dp83869: Reset return variable if PHY strap is read) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/crypto/chelsio/chcr_algo.h | 4 - + drivers/crypto/chelsio/chtls/chtls_cm.c | 46 ++++++++--- + drivers/crypto/chelsio/chtls/chtls_main.c | 2 + + drivers/net/dsa/qca8k.c | 3 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 +-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 1 - + drivers/net/ethernet/marvell/mvneta.c | 2 +- + drivers/net/ethernet/microchip/lan743x_main.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 4 + + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 10 +-- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 13 +-- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 2 +- + drivers/net/geneve.c | 7 +- + drivers/net/hamradio/yam.c | 1 + + drivers/net/phy/dp83867.c | 2 +- + drivers/net/phy/dp83869.c | 5 +- + drivers/net/phy/fixed_phy.c | 28 +++---- + drivers/net/phy/marvell.c | 2 +- + drivers/net/phy/mdio_bus.c | 2 + + drivers/net/phy/mscc/mscc.h | 2 +- + drivers/net/phy/mscc/mscc_main.c | 8 +- + include/linux/ethtool_netlink.h | 2 +- + include/linux/u64_stats_sync.h | 43 +++++----- + include/net/inet_connection_sock.h | 1 - + include/net/seg6.h | 2 +- + lib/rhashtable.c | 17 +++- + net/core/dev.c | 40 +++++---- + net/core/filter.c | 2 +- + net/ethtool/linkinfo.c | 3 +- + net/ipv4/inet_connection_sock.c | 1 + + net/ipv6/ipv6_sockglue.c | 2 +- + net/ipv6/seg6.c | 16 ++-- + net/ipv6/seg6_iptunnel.c | 2 +- + net/ipv6/seg6_local.c | 6 +- + net/netlink/genetlink.c | 94 +++++++++++++--------- + net/tipc/msg.c | 4 +- + net/vmw_vsock/vmci_transport.c | 2 +- + net/xdp/xdp_umem.c | 2 +- + 41 files changed, 229 insertions(+), 176 deletions(-) +Merging bpf/master (e7ed83d6fa1a bpf: Fix an error code in check_btf_func()) +$ git merge bpf/master +Auto-merging net/core/filter.c +Merge made by the 'recursive' strategy. + kernel/bpf/verifier.c | 2 +- + net/core/filter.c | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) +Merging ipsec/master (a4902d914e50 xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo") +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 1 + + net/xfrm/xfrm_device.c | 4 +++- + net/xfrm/xfrm_output.c | 4 ---- + 3 files changed, 4 insertions(+), 5 deletions(-) +Merging netfilter/master (bdc48fa11e46 checkpatch/coding-style: deprecate 80-column warning) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (bdc48fa11e46 checkpatch/coding-style: deprecate 80-column warning) +$ 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 (523f3ec030aa mac80211: initialize return flags in HE 6 GHz operation parsing) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + include/net/cfg80211.h | 5 +++-- + net/mac80211/mlme.c | 2 ++ + net/wireless/core.c | 6 +++--- + net/wireless/core.h | 2 ++ + net/wireless/mlme.c | 26 +++++++++++++++++++++----- + 5 files changed, 31 insertions(+), 10 deletions(-) +Merging rdma-fixes/for-rc (3d77e6a8804a Linux 5.7) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (91231e525bb6 ALSA: emu10k1: delete an unnecessary condition) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/emu10k1/emu10k1x.c | 2 +- + sound/usb/card.c | 19 ++++++++++++------- + sound/usb/usbaudio.h | 2 +- + 3 files changed, 14 insertions(+), 9 deletions(-) +Merging sound-asoc-fixes/for-linus (1dd9cd775ef5 Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/max98390.c | 26 +++++++++++++++++++++----- + sound/soc/codecs/max98390.h | 3 ++- + sound/soc/codecs/rl6231.c | 4 ++-- + sound/soc/fsl/fsl-asoc-card.c | 2 +- + 4 files changed, 26 insertions(+), 9 deletions(-) +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 (7ce6dc9ef58d Merge remote-tracking branch 'spi/for-5.8' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-sprd-adi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 +Already up to date. +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 (8dd06ef34b6e Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Removing include/linux/input/gp2ap002a00f.h +Removing drivers/input/misc/msm-vibrator.c +Removing drivers/input/misc/gp2ap002a00f.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/hid/hid-multitouch.c +Auto-merging drivers/hid/hid-alps.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/input/msm-vibrator.txt +Removing Documentation/devicetree/bindings/input/elants_i2c.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/elants_i2c.txt | 34 - + .../devicetree/bindings/input/iqs269a.yaml | 581 +++++++ + .../devicetree/bindings/input/msm-vibrator.txt | 36 - + .../input/touchscreen/cypress,cy8ctma140.yaml | 72 + + .../input/touchscreen/elan,elants_i2c.yaml | 69 + + .../bindings/input/touchscreen/mms114.txt | 3 +- + MAINTAINERS | 6 + + drivers/hid/hid-alps.c | 3 +- + drivers/hid/hid-multitouch.c | 6 +- + drivers/input/evdev.c | 7 +- + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/atkbd.c | 97 +- + drivers/input/keyboard/imx_sc_key.c | 33 +- + drivers/input/keyboard/tca6416-keypad.c | 2 +- + drivers/input/misc/Kconfig | 32 +- + drivers/input/misc/Makefile | 3 +- + drivers/input/misc/gp2ap002a00f.c | 281 --- + drivers/input/misc/iqs269a.c | 1833 ++++++++++++++++++++ + drivers/input/misc/msm-vibrator.c | 281 --- + drivers/input/misc/xen-kbdfront.c | 2 +- + drivers/input/mouse/elan_i2c_core.c | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 1 + + drivers/input/serio/i8042.c | 3 + + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/atmel_mxt_ts.c | 7 +- + drivers/input/touchscreen/cy8ctma140.c | 353 ++++ + drivers/input/touchscreen/cyttsp4_core.c | 5 +- + drivers/input/touchscreen/cyttsp_core.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 198 ++- + drivers/input/touchscreen/elants_i2c.c | 247 +-- + drivers/input/touchscreen/melfas_mip4.c | 4 +- + drivers/input/touchscreen/mms114.c | 19 +- + drivers/input/touchscreen/raspberrypi-ts.c | 2 +- + drivers/input/touchscreen/stmfts.c | 2 +- + include/linux/input/gp2ap002a00f.h | 23 - + include/linux/input/mt.h | 5 + + 37 files changed, 3396 insertions(+), 873 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/elants_i2c.txt + create mode 100644 Documentation/devicetree/bindings/input/iqs269a.yaml + delete mode 100644 Documentation/devicetree/bindings/input/msm-vibrator.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma140.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml + delete mode 100644 drivers/input/misc/gp2ap002a00f.c + create mode 100644 drivers/input/misc/iqs269a.c + delete mode 100644 drivers/input/misc/msm-vibrator.c + create mode 100644 drivers/input/touchscreen/cy8ctma140.c + delete mode 100644 include/linux/input/gp2ap002a00f.h +Merging crypto-current/master (320bdbd81615 crypto: cavium/nitrox - Fix 'nitrox_get_first_device()' when ndevlist is fully iterated) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/cavium/nitrox/nitrox_main.c | 4 +- + drivers/crypto/omap-aes-gcm.c | 1 - + drivers/crypto/omap-aes.c | 8 ++- + drivers/crypto/omap-crypto.c | 10 ++- + drivers/crypto/omap-sham.c | 101 +++++++++++++++++------------ + 5 files changed, 74 insertions(+), 50 deletions(-) +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 (636338d7968e bus: ti-sysc: Increase max softreset wait) +$ git merge omap-fixes/fixes +Auto-merging drivers/bus/ti-sysc.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 4 +- + arch/arm/mach-omap2/omap_hwmod.c | 2 +- + drivers/bus/ti-sysc.c | 100 ++++++++++++++++++------- + drivers/soc/ti/omap_prm.c | 8 +- + 4 files changed, 83 insertions(+), 31 deletions(-) +Merging kvm-fixes/master (6929f71e46bd atomisp: avoid warning about unused function) +$ git merge kvm-fixes/master +Already up to date. +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 (ac11b65c0d26 hwmon: (bt1-pvt) Define Temp- and Volt-to-N poly as maybe-unused) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/bt1-pvt.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (3d77e6a8804a Linux 5.7) +$ 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 +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c +Resolved 'drivers/gpu/drm/i915/gt/intel_lrc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 78108b093bb2] Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes' +$ git diff -M --stat --summary HEAD^.. + 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 +Auto-merging drivers/fpga/Kconfig +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 (fb24bed5c035 w1: Replace zero-length array with flexible-array) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging sound/soc/sof/probe.h +Auto-merging security/integrity/ima/ima.h +Auto-merging include/rdma/rdmavt_qp.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/libata.h +Auto-merging include/linux/kvm_host.h +Auto-merging include/linux/kprobes.h +Auto-merging include/linux/fscache-cache.h +Auto-merging include/drm/drm_displayid.h +Auto-merging fs/aio.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/fpga/dfl.h +Auto-merging drivers/firewire/core-cdev.c +Auto-merging drivers/crypto/chelsio/chcr_crypto.h +Auto-merging drivers/block/drbd/drbd_int.h +Merge made by the 'recursive' strategy. + arch/ia64/kernel/unwind_i.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/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/hwtracing/stm/policy.c | 2 +- + drivers/hwtracing/stm/stm.h | 4 +-- + drivers/media/usb/pwc/pwc.h | 2 +- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 4 +-- + 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/jffs2/nodelist.h | 2 +- + fs/jffs2/summary.h | 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/dmaengine.h | 4 +-- + 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/mtd/cfi.h | 6 ++-- + include/linux/mtd/qinfo.h | 2 +- + include/linux/sctp.h | 36 +++++++++++----------- + include/linux/tifm.h | 2 +- + kernel/trace/trace_probe.h | 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 ++-- + 64 files changed, 114 insertions(+), 114 deletions(-) +Merging kbuild/for-next (b170290c2836 Merge tag 'kconfig-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge kbuild/for-next +Already up to date. +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 +Already up to date! +Merge made by the 'recursive' strategy. +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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (5311ebfb612f arm64: debug: mark a function as __init to save some memory) +$ git merge arm64/for-next/core +Merge made by the 'recursive' strategy. + arch/arm64/kernel/debug-monitors.c | 2 +- + kernel/scs.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +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 (28107944fb70 soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 246 +++++++++++++++++++++++++++++++++ + 1 file changed, 246 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +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 (cfb3fa6421f6 Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 146 ++++++++++++++++---------------- + 1 file changed, 73 insertions(+), 73 deletions(-) +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/mmc/host/Kconfig +Auto-merging drivers/clk/zynqmp/divider.c +Auto-merging drivers/clk/zynqmp/clkc.c +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/mips/loongson2ef/Kconfig +CONFLICT (content): Merge conflict in arch/mips/loongson2ef/Kconfig +Auto-merging arch/mips/Kconfig +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 +Auto-merging Documentation/devicetree/bindings/clock/sprd,sc9863a-clk.yaml +Removing Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt +Removing Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt +Auto-merging Documentation/devicetree/bindings/clock/qcom,mmcc.yaml +Removing Documentation/devicetree/bindings/clock/qcom,a53pll.txt +CONFLICT (modify/delete): Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt deleted in HEAD and modified in clk/clk-next. Version clk/clk-next of Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt left in tree. +Auto-merging Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt +Resolved 'arch/mips/loongson2ef/Kconfig' 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 cae154f7ce4c] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../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,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/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 + + 174 files changed, 14168 insertions(+), 1045 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 +$ git am -3 ../patches/0001-dt-bindings-fix-up-for-dt-bindings-clock-mediatek-do.patch +Applying: dt-bindings: fix up for "dt-bindings: clock: mediatek: document clk bindings for Mediatek MT6765 SoC" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml +$ git add -A . +$ git commit -v -a --amend +[master e104597643b9] Merge remote-tracking branch 'clk/clk-next' + Date: Mon Jun 8 09:32:28 2020 +1000 +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 +Auto-merging drivers/net/ethernet/smsc/Kconfig +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 +Already up to date. +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 (3d77e6a8804a Linux 5.7) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (1395375c5927 Merge branch 'topic/ppc-kvm' into next) +$ git merge powerpc/next +Already up to date. +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 (e4bdb161fbb9 riscv: fix build warning of missing prototypes) +$ git merge risc-v/for-next +Auto-merging include/linux/cpuhotplug.h +Removing arch/riscv/kernel/vdso/gettimeofday.S +Removing arch/riscv/kernel/vdso/clock_gettime.S +Removing arch/riscv/kernel/vdso/clock_getres.S +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 71 ++++++++------- + arch/riscv/include/asm/clocksource.h | 7 ++ + arch/riscv/include/asm/irq.h | 5 -- + arch/riscv/include/asm/processor.h | 13 +-- + arch/riscv/include/asm/smp.h | 3 + + arch/riscv/include/asm/vdso.h | 2 + + arch/riscv/include/asm/vdso/clocksource.h | 8 ++ + arch/riscv/include/asm/vdso/gettimeofday.h | 79 +++++++++++++++++ + arch/riscv/include/asm/vdso/processor.h | 19 ++++ + arch/riscv/include/asm/vdso/vsyscall.h | 27 ++++++ + arch/riscv/kernel/cpu.c | 16 ++++ + arch/riscv/kernel/entry.S | 4 +- + arch/riscv/kernel/irq.c | 33 +------ + arch/riscv/kernel/patch.c | 1 + + arch/riscv/kernel/smp.c | 11 ++- + arch/riscv/kernel/time.c | 9 ++ + arch/riscv/kernel/traps.c | 2 - + arch/riscv/kernel/vdso.c | 24 ++++- + arch/riscv/kernel/vdso/Makefile | 12 ++- + arch/riscv/kernel/vdso/clock_getres.S | 18 ---- + arch/riscv/kernel/vdso/clock_gettime.S | 18 ---- + arch/riscv/kernel/vdso/gettimeofday.S | 18 ---- + arch/riscv/kernel/vdso/vdso.lds.S | 2 + + arch/riscv/kernel/vdso/vgettimeofday.c | 25 ++++++ + arch/riscv/mm/init.c | 11 --- + drivers/clocksource/timer-riscv.c | 43 ++++++++- + drivers/irqchip/Kconfig | 13 +++ + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-riscv-intc.c | 138 +++++++++++++++++++++++++++++ + drivers/irqchip/irq-sifive-plic.c | 44 ++++----- + include/linux/cpuhotplug.h | 1 + + 31 files changed, 497 insertions(+), 181 deletions(-) + create mode 100644 arch/riscv/include/asm/clocksource.h + create mode 100644 arch/riscv/include/asm/vdso/clocksource.h + create mode 100644 arch/riscv/include/asm/vdso/gettimeofday.h + create mode 100644 arch/riscv/include/asm/vdso/processor.h + create mode 100644 arch/riscv/include/asm/vdso/vsyscall.h + delete mode 100644 arch/riscv/kernel/vdso/clock_getres.S + delete mode 100644 arch/riscv/kernel/vdso/clock_gettime.S + delete mode 100644 arch/riscv/kernel/vdso/gettimeofday.S + create mode 100644 arch/riscv/kernel/vdso/vgettimeofday.c + create mode 100644 drivers/irqchip/irq-riscv-intc.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 (bfa50e1427e4 vfio-ccw: make vfio_ccw_regops variables declarations static) +$ git merge s390/features +Auto-merging include/uapi/linux/vfio.h +Auto-merging include/linux/pci.h +Auto-merging drivers/s390/net/qeth_l2_main.c +Auto-merging arch/s390/kvm/vsie.c +CONFLICT (content): Merge conflict in arch/s390/kvm/vsie.c +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 arch/s390/kernel/setup.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/s390/kernel/smp.c' using previous resolution. +Resolved 'arch/s390/kvm/vsie.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7829cc5adc06] 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/vfio-ccw.rst | 100 ++++- + 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 | 3 - + 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/Makefile | 2 +- + 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/cio/vfio_ccw_chp.c | 148 ++++++++ + drivers/s390/cio/vfio_ccw_cp.c | 19 +- + drivers/s390/cio/vfio_ccw_drv.c | 165 ++++++++- + drivers/s390/cio/vfio_ccw_ops.c | 65 +++- + drivers/s390/cio/vfio_ccw_private.h | 16 + + drivers/s390/cio/vfio_ccw_trace.c | 1 + + drivers/s390/cio/vfio_ccw_trace.h | 30 ++ + 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 + + include/uapi/linux/vfio.h | 3 + + include/uapi/linux/vfio_ccw.h | 19 + + 66 files changed, 2131 insertions(+), 1249 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 + create mode 100644 drivers/s390/cio/vfio_ccw_chp.c +Merging sh/for-next (37744feebc08 sh: remove sh5 support) +$ git merge sh/for-next +Already up to date. +Merging sparc-next/master (824c874abc1d Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge sparc-next/master +Auto-merging mm/Kconfig +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/kernel/ptrace_32.c | 228 ++++++++++++++++-------------------- + arch/sparc/kernel/ptrace_64.c | 17 +-- + arch/sparc/kernel/sys_sparc32.c | 1 - + arch/sparc/mm/hypersparc.S | 3 +- + arch/sparc/mm/srmmu.c | 106 +++++++---------- + arch/sparc/mm/viking.S | 5 +- + drivers/sbus/char/oradax.c | 8 +- + mm/Kconfig | 4 + + 14 files changed, 202 insertions(+), 282 deletions(-) +Merging uml/linux-next (f6e8c474390b um: virtio: Replace zero-length array with flexible-array) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/drivers/vector_kern.h | 2 +- + arch/um/drivers/vector_user.c | 59 +++++++++++++++++++++++++++++++++++++++++++ + arch/um/drivers/vhost_user.h | 2 +- + arch/um/drivers/virtio_uml.c | 2 +- + arch/um/os-Linux/file.c | 3 ++- + 5 files changed, 64 insertions(+), 4 deletions(-) +Merging xtensa/xtensa-for-next (3ead2f97bd44 xtensa: Fix spelling/grammar in comment) +$ git merge xtensa/xtensa-for-next +Already up to date. +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 (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (8113246479a5 Merge branch 'for-next-next-v5.7-20200528' into for-next-20200528) +$ git merge btrfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (dc1dad8e1a61 rbd: compression_hint option) +$ git merge ceph/master +Auto-merging net/ceph/ceph_common.c +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 44 ++++- + drivers/block/rbd_types.h | 2 +- + 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/mon_client.h | 2 +- + include/linux/ceph/osd_client.h | 8 +- + include/linux/ceph/osdmap.h | 19 +- + include/linux/ceph/rados.h | 14 ++ + include/linux/crush/crush.h | 14 +- + 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 +++++++++++++++++++++++++++++----- + 29 files changed, 1405 insertions(+), 252 deletions(-) + create mode 100644 fs/ceph/metric.c + create mode 100644 fs/ceph/metric.h +Merging cifs/for-next (5865985416eb smb3: extend fscache mount volume coherency check) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cache.c | 9 ++------- + fs/cifs/fscache.c | 17 +++++++++++++++-- + fs/cifs/fscache.h | 9 +++++++++ + 3 files changed, 26 insertions(+), 9 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 +Already up to date. +Merging exfat/dev (dd6e2b38b867 exfat: fix range validation error in alloc and free cluster) +$ git merge exfat/dev +Auto-merging fs/exfat/inode.c +Merge made by the 'recursive' strategy. + fs/exfat/Kconfig | 7 +- + fs/exfat/balloc.c | 8 +- + fs/exfat/dir.c | 222 +++++++++++++++++-------------------------- + fs/exfat/exfat_fs.h | 48 +++++----- + fs/exfat/exfat_raw.h | 85 +++++++---------- + fs/exfat/fatent.c | 17 ++-- + fs/exfat/file.c | 25 +++-- + fs/exfat/inode.c | 57 +++++------ + fs/exfat/misc.c | 46 +++++---- + fs/exfat/namei.c | 63 +++++-------- + fs/exfat/nls.c | 52 +++------- + fs/exfat/super.c | 262 +++++++++++++++++++++++++++++++-------------------- + 12 files changed, 423 insertions(+), 469 deletions(-) +Merging ext3/for_next (16ec8bfe257b Pull ext2 xattr cleanups.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (6b8ed62008a4 ext4: avoid unnecessary transaction starts during writeback) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (adf3d3a53cf1 f2fs: don't return vmalloc() memory from f2fs_kmalloc()) +$ git merge f2fs/dev +Auto-merging include/trace/events/f2fs.h +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 519e7d453082] Merge remote-tracking branch 'f2fs/dev' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 24 ++ + Documentation/filesystems/f2fs.rst | 2 +- + fs/f2fs/Kconfig | 10 + + fs/f2fs/acl.h | 2 +- + fs/f2fs/checkpoint.c | 37 +-- + fs/f2fs/compress.c | 175 +++++++++++--- + fs/f2fs/data.c | 174 ++++++++++++-- + fs/f2fs/dir.c | 364 ++++++++++++++++------------- + fs/f2fs/f2fs.h | 171 ++++++++++---- + 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 | 101 ++++++-- + fs/f2fs/node.h | 5 +- + fs/f2fs/recovery.c | 51 ++++- + fs/f2fs/segment.c | 40 +++- + fs/f2fs/segment.h | 2 +- + fs/f2fs/super.c | 88 ++++--- + fs/f2fs/sysfs.c | 97 ++++++-- + fs/f2fs/trace.h | 2 +- + fs/f2fs/xattr.h | 8 +- + include/trace/events/f2fs.h | 83 ++++++- + 25 files changed, 1567 insertions(+), 532 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 +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/dev.c +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 +Already up to date. +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/xprtsock.c +Auto-merging net/sunrpc/svcsock.c +CONFLICT (content): Merge conflict in net/sunrpc/svcsock.c +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 +Auto-merging fs/locks.c +Auto-merging Documentation/filesystems/locking.rst +Resolved 'include/trace/events/sunrpc.h' using previous resolution. +Resolved 'net/sunrpc/svc_xprt.c' using previous resolution. +Resolved 'net/sunrpc/svcsock.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cc715da60424] 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 | 400 +++++++++++++-------------- + 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, 1497 insertions(+), 629 deletions(-) +Merging orangefs/for-next (0df556457748 orangefs: convert get_user_pages() --> pin_user_pages()) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (81e69c8b9e02 ovl: add nosync mount option) +$ git merge overlayfs/overlayfs-next +Auto-merging security/security.c +Auto-merging include/linux/mount.h +Auto-merging include/linux/fs.h +Auto-merging fs/sync.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 25 +++- + Documentation/filesystems/porting.rst | 7 + + fs/namespace.c | 16 +++ + fs/overlayfs/copy_up.c | 20 +-- + fs/overlayfs/dir.c | 51 +++++-- + fs/overlayfs/export.c | 24 ++-- + fs/overlayfs/file.c | 37 ++++- + fs/overlayfs/inode.c | 17 +-- + fs/overlayfs/namei.c | 138 ++++++++++-------- + fs/overlayfs/overlayfs.h | 11 +- + fs/overlayfs/ovl_entry.h | 11 +- + fs/overlayfs/readdir.c | 60 ++++++-- + fs/overlayfs/super.c | 248 ++++++++++++++++++++++---------- + fs/overlayfs/util.c | 36 ++++- + fs/sync.c | 3 +- + include/linux/fs.h | 2 + + include/linux/mount.h | 2 + + security/security.c | 1 + + 18 files changed, 489 insertions(+), 220 deletions(-) +Merging ubifs/linux-next (4b68bf9a69d2 ubi: Select fastmap anchor PEBs considering wear level rules) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/fastmap-wl.c | 39 ++++++++++++++++++++++++--------------- + drivers/mtd/ubi/fastmap.c | 11 +++++++++++ + drivers/mtd/ubi/ubi.h | 4 +++- + drivers/mtd/ubi/wl.c | 28 +++++++++++++++++++--------- + 4 files changed, 57 insertions(+), 25 deletions(-) +Merging v9fs/9p-next (36f9967531da 9p/xen: increase XEN_9PFS_RING_ORDER) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + net/9p/trans_xen.c | 61 ++++++++++++++++++++++++++++++------------------------ + 1 file changed, 34 insertions(+), 27 deletions(-) +Merging xfs/for-next (6dcde60efd94 xfs: more lockdep whackamole with kmem_alloc*) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (568776f992c4 zonefs: Replace uuid_copy() with import_uuid()) +$ git merge zonefs/for-next +Already up to date. +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 (5ef159681309 locks: add locks_move_blocks in posix_lock_inode) +$ git merge file-locks/locks-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 1 + + 1 file changed, 1 insertion(+) +Merging vfs/for-next (b09e728da62f Merge branches 'work.misc', 'work.epoll', 'uaccess.misc', 'uaccess.hpsa' and 'uaccess.i915' into for-next) +$ git merge vfs/for-next +Auto-merging kernel/bpf/syscall.c +Auto-merging fs/super.c +Auto-merging fs/namespace.c +Auto-merging fs/binfmt_flat.c +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging arch/x86/kvm/hyperv.c +Auto-merging arch/x86/include/asm/pgtable_32.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/pgtable_32.h | 7 - + arch/x86/kernel/sys_ia32.c | 40 +++--- + arch/x86/kvm/hyperv.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 5 - + drivers/gpu/drm/i915/i915_ioc32.c | 14 +- + drivers/gpu/drm/i915/i915_perf.c | 3 - + drivers/gpu/drm/i915/i915_query.c | 62 +++------ + drivers/gpu/drm/i915/i915_reg.h | 2 +- + drivers/scsi/hpsa.c | 199 +++++++++++++--------------- + fs/binfmt_elf.c | 16 +-- + fs/binfmt_elf_fdpic.c | 31 +++-- + fs/binfmt_flat.c | 22 +-- + fs/eventfd.c | 64 +++++---- + fs/namespace.c | 5 +- + fs/select.c | 112 +++++++++------- + fs/super.c | 2 +- + include/linux/regset.h | 2 +- + kernel/bpf/syscall.c | 25 +--- + 18 files changed, 293 insertions(+), 320 deletions(-) +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 (2bd81cd04a3f Merge branch 'remotes/lorenzo/pci/vmd') +$ git merge pci/next +Already up to date. +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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (726b03203e45 Merge branch 'i2c/for-5.8' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/busses/i2c-i801.c +Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c +Auto-merging Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml +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/nuvoton,npcm7xx-i2c.yaml | 62 + + .../bindings/i2c/snps,designware-i2c.yaml | 156 ++ + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 8 +- + drivers/i2c/busses/Kconfig | 60 +- + drivers/i2c/busses/Makefile | 19 +- + 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 | 6 + + drivers/i2c/busses/i2c-icy.c | 1 + + 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-npcm7xx.c | 2342 ++++++++++++++++++++ + 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 | 870 +++++--- + 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 - + 77 files changed, 5718 insertions(+), 1353 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/nuvoton,npcm7xx-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml + create mode 100644 drivers/i2c/busses/i2c-npcm7xx.c + 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 (d9d8efd3241b firmware/dmi: Report DMI Bios & EC firmware release) +$ git merge dmi/master +Auto-merging include/linux/mod_devicetable.h +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (ac11b65c0d26 hwmon: (bt1-pvt) Define Temp- and Volt-to-N poly as maybe-unused) +$ 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 +Already up to date. +Merging v4l-dvb/master (938b29db3aa9 media: Documentation: media: Refer to mbus format documentation from CSI-2 docs) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (be4b9e888184 media: atomisp: get rid of a string_support.h abstraction layer) +$ git merge v4l-dvb-next/master +Removing drivers/staging/media/atomisp/pci/sh_css_pipe.c +Removing drivers/staging/media/atomisp/pci/memory_realloc.c +Removing drivers/staging/media/atomisp/pci/isp2401_mamoiada_params.h +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 +Removing drivers/staging/media/atomisp/pci/hive_isp_css_include/system_types.h +Removing drivers/staging/media/atomisp/pci/hive_isp_css_include/string_support.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 +Removing drivers/staging/media/atomisp/pci/hive_isp_css_2401_irq_types_hrt.h +Auto-merging drivers/staging/media/atomisp/pci/atomisp_v4l2.c +CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp_v4l2.c +Removing drivers/staging/media/atomisp/include/hmm/hmm_vm.h +Resolved 'drivers/staging/media/atomisp/pci/atomisp_v4l2.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dcace2da71a0] 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 | 8 +- + .../atomisp/include/linux/atomisp_gmin_platform.h | 1 + + .../media/atomisp/include/linux/atomisp_platform.h | 22 +- + .../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 | 785 +++++---- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 13 +- + drivers/staging/media/atomisp/pci/atomisp_common.h | 7 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 280 +-- + .../media/atomisp/pci/atomisp_compat_css20.c | 779 +++------ + .../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 | 10 +- + 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 | 8 +- + 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 | 216 +-- + drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 3 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 55 +- + 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 | 3 +- + drivers/staging/media/atomisp/pci/atomisp_tpg.h | 1 + + .../media/atomisp/pci/atomisp_trace_event.h | 7 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 189 +- + 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 | 33 +- + .../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 +- + .../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 | 68 - + .../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 | 30 +- + .../pci/hive_isp_css_common/host/irq_local.h | 18 +- + .../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 | 13 +- + .../atomisp/pci/hive_isp_css_common/isp_global.h | 15 +- + .../atomisp/pci/hive_isp_css_common/mmu_global.h | 1 + + .../atomisp/pci/hive_isp_css_common/sp_global.h | 13 +- + .../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 | 19 +- + .../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 | 165 -- + .../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 + + ...ive_isp_css_irq_types_hrt.h => irq_types_hrt.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 | 4 +- + .../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 | 4 +- + .../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 | 4 +- + .../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 | 4 +- + .../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 | 16 +- + .../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 | 32 +- + .../media/atomisp/pci/isp2400_system_local.h | 14 +- + .../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 | 228 --- + .../media/atomisp/pci/isp2401_system_global.h | 32 +- + .../media/atomisp/pci/isp2401_system_local.h | 14 +- + .../media/atomisp/pci/isp_acquisition_defs.h | 1 + + .../staging/media/atomisp/pci/isp_capture_defs.h | 1 + + ...isp2400_mamoiada_params.h => mamoiada_params.h} | 21 +- + 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 | 141 +- + .../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 | 80 +- + .../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 | 30 +- + .../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 | 5 +- + .../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 | 1847 ++++++++++---------- + 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 | 127 +- + .../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 | 99 +- + 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 | 73 +- + 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 | 752 ++++---- + 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 | 141 +- + 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 | 12 +- + 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, 4477 insertions(+), 5968 deletions(-) + delete mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_vm.h + delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_2401_irq_types_hrt.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/string_support.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 + rename drivers/staging/media/atomisp/pci/{css_2400_system/hrt/hive_isp_css_irq_types_hrt.h => irq_types_hrt.h} (98%) + delete mode 100644 drivers/staging/media/atomisp/pci/isp2401_mamoiada_params.h + rename drivers/staging/media/atomisp/pci/{css_2400_system/hrt/isp2400_mamoiada_params.h => mamoiada_params.h} (91%) + 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 (5947e801f2e1 Merge branches 'pm-opp' and 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/interconnect.h +Auto-merging drivers/interconnect/core.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/opp/opp.txt | 17 +- + .../devicetree/bindings/property-units.txt | 4 + + drivers/cpufreq/cpufreq-dt.c | 4 + + drivers/cpufreq/tegra186-cpufreq.c | 3 +- + drivers/interconnect/core.c | 18 ++ + drivers/opp/core.c | 119 ++++++++++-- + drivers/opp/debugfs.c | 42 +++++ + drivers/opp/of.c | 205 +++++++++++++++++++-- + drivers/opp/opp.h | 10 + + include/linux/interconnect.h | 6 + + include/linux/pm_opp.h | 18 ++ + 11 files changed, 413 insertions(+), 33 deletions(-) +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 +Already up to date. +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 (fba97dc7fc76 RDMA/cm: Spurious WARNING triggered in cm_destroy_id()) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (9a25c1df24a6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (6b646a7e4af6 net/mlx5: Add ability to read and write ECE options) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (9a25c1df24a6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (9a25c1df24a6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (1806c13dc253 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (4c07a5d7aeb3 Bluetooth: hci_qca: Fix an error pointer dereference) +$ git merge bluetooth/master +Auto-merging drivers/bluetooth/btmrvl_sdio.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_sdio.c | 8 ++++---- + drivers/bluetooth/hci_qca.c | 18 +++++++++--------- + drivers/net/wireless/marvell/mwifiex/sdio.h | 4 ++-- + net/bluetooth/af_bluetooth.c | 2 -- + net/bluetooth/hci_request.c | 10 ++++++---- + 5 files changed, 21 insertions(+), 21 deletions(-) +Merging mac80211-next/master (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (300e549b6e53 Merge branch 'gfs2-iopen' into for-next) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/inode.c +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +Merge made by the 'recursive' strategy. + .../{gfs2-glocks.txt => gfs2-glocks.rst} | 149 ++++++++------- + Documentation/filesystems/index.rst | 1 + + MAINTAINERS | 2 +- + fs/gfs2/export.c | 4 +- + fs/gfs2/glock.c | 208 ++++++++++++++++++--- + fs/gfs2/glock.h | 16 ++ + fs/gfs2/glops.c | 21 ++- + fs/gfs2/incore.h | 9 +- + fs/gfs2/inode.c | 47 +++-- + fs/gfs2/inode.h | 2 +- + fs/gfs2/log.c | 56 ++++-- + fs/gfs2/main.c | 9 + + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 72 ++++++- + fs/gfs2/trans.c | 21 ++- + fs/gfs2/trans.h | 1 + + fs/gfs2/util.c | 1 + + fs/gfs2/util.h | 1 + + include/uapi/linux/gfs2_ondisk.h | 6 + + 20 files changed, 489 insertions(+), 141 deletions(-) + rename Documentation/filesystems/{gfs2-glocks.txt => gfs2-glocks.rst} (63%) +Merging mtd/mtd/next (5788ccf3c84f mtd: clear cache_state to avoid writing to bad blocks repeatedly) +$ git merge mtd/mtd/next +Removing drivers/mtd/nand/raw/cmx270_nand.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/mtd/arasan,nand-controller.yaml | 63 + + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 2 + + .../devicetree/bindings/mtd/partition.txt | 3 + + Documentation/driver-api/mtdnand.rst | 6 +- + MAINTAINERS | 13 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 13 +- + drivers/mtd/devices/docg3.c | 10 +- + drivers/mtd/maps/physmap-gemini.c | 5 - + drivers/mtd/mtdblock.c | 11 +- + drivers/mtd/mtdcore.c | 191 ++- + drivers/mtd/mtdpart.c | 54 +- + drivers/mtd/nand/raw/Kconfig | 12 +- + drivers/mtd/nand/raw/Makefile | 2 +- + drivers/mtd/nand/raw/ams-delta.c | 5 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 1297 ++++++++++++++++++++ + drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +- + drivers/mtd/nand/raw/au1550nd.c | 403 ++---- + drivers/mtd/nand/raw/bcm47xxnflash/main.c | 6 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 164 ++- + drivers/mtd/nand/raw/cadence-nand-controller.c | 17 +- + drivers/mtd/nand/raw/cafe_nand.c | 16 +- + drivers/mtd/nand/raw/cmx270_nand.c | 236 ---- + drivers/mtd/nand/raw/cs553x_nand.c | 199 ++- + drivers/mtd/nand/raw/davinci_nand.c | 312 +++-- + drivers/mtd/nand/raw/denali.c | 60 +- + drivers/mtd/nand/raw/diskonchip.c | 487 +++----- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 7 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 7 +- + drivers/mtd/nand/raw/fsl_upm.c | 9 +- + drivers/mtd/nand/raw/fsmc_nand.c | 19 +- + drivers/mtd/nand/raw/gpio.c | 6 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 189 +-- + drivers/mtd/nand/raw/hisi504_nand.c | 6 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 170 ++- + drivers/mtd/nand/raw/internals.h | 12 + + drivers/mtd/nand/raw/lpc32xx_mlc.c | 7 +- + drivers/mtd/nand/raw/lpc32xx_slc.c | 6 +- + drivers/mtd/nand/raw/marvell_nand.c | 68 +- + drivers/mtd/nand/raw/meson_nand.c | 5 +- + drivers/mtd/nand/raw/mpc5121_nfc.c | 5 +- + drivers/mtd/nand/raw/mtk_nand.c | 19 +- + drivers/mtd/nand/raw/mxc_nand.c | 6 +- + drivers/mtd/nand/raw/mxic_nand.c | 10 +- + drivers/mtd/nand/raw/nand_base.c | 445 ++++--- + drivers/mtd/nand/raw/nand_bch.c | 10 +- + drivers/mtd/nand/raw/nand_jedec.c | 32 +- + drivers/mtd/nand/raw/nand_legacy.c | 8 +- + drivers/mtd/nand/raw/nand_micron.c | 65 +- + drivers/mtd/nand/raw/nand_onfi.c | 71 +- + drivers/mtd/nand/raw/nand_timings.c | 11 +- + drivers/mtd/nand/raw/nand_toshiba.c | 14 + + drivers/mtd/nand/raw/nandsim.c | 438 ++++--- + drivers/mtd/nand/raw/ndfc.c | 8 +- + drivers/mtd/nand/raw/omap2.c | 8 +- + drivers/mtd/nand/raw/omap_elm.c | 1 + + drivers/mtd/nand/raw/orion_nand.c | 8 +- + drivers/mtd/nand/raw/oxnas_nand.c | 33 +- + drivers/mtd/nand/raw/pasemi_nand.c | 9 +- + drivers/mtd/nand/raw/plat_nand.c | 8 +- + drivers/mtd/nand/raw/qcom_nandc.c | 13 +- + drivers/mtd/nand/raw/r852.c | 6 +- + drivers/mtd/nand/raw/s3c2410.c | 3 +- + drivers/mtd/nand/raw/sh_flctl.c | 6 +- + drivers/mtd/nand/raw/sharpsl.c | 14 +- + drivers/mtd/nand/raw/socrates_nand.c | 8 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 1067 ++++++++-------- + drivers/mtd/nand/raw/sunxi_nand.c | 16 +- + drivers/mtd/nand/raw/tango_nand.c | 13 +- + drivers/mtd/nand/raw/tegra_nand.c | 6 +- + drivers/mtd/nand/raw/tmio_nand.c | 8 +- + drivers/mtd/nand/raw/txx9ndfmc.c | 6 +- + drivers/mtd/nand/raw/vf610_nfc.c | 10 +- + drivers/mtd/nand/raw/xway_nand.c | 8 +- + drivers/mtd/parsers/cmdlinepart.c | 35 +- + drivers/mtd/parsers/ofpart.c | 3 + + drivers/mtd/spi-nor/Kconfig | 4 +- + drivers/mtd/spi-nor/controllers/Kconfig | 4 +- + drivers/mtd/spi-nor/controllers/aspeed-smc.c | 2 +- + drivers/mtd/spi-nor/controllers/hisi-sfc.c | 2 +- + drivers/mtd/spi-nor/controllers/nxp-spifi.c | 2 +- + drivers/mtd/spi-nor/core.c | 22 +- + drivers/mtd/spi-nor/macronix.c | 6 + + drivers/mtd/spi-nor/micron-st.c | 6 +- + drivers/mtd/spi-nor/sfdp.c | 34 +- + drivers/mtd/spi-nor/sfdp.h | 11 +- + drivers/mtd/spi-nor/spansion.c | 44 +- + drivers/mtd/spi-nor/winbond.c | 29 +- + drivers/mtd/ubi/build.c | 5 +- + include/linux/bch.h | 11 +- + include/linux/mtd/bbm.h | 2 +- + include/linux/mtd/mtd.h | 7 +- + include/linux/mtd/partitions.h | 2 + + include/linux/mtd/rawnand.h | 131 +- + include/linux/mtd/spi-nor.h | 24 +- + include/linux/platform_data/mtd-davinci.h | 2 +- + include/linux/platform_data/mtd-nand-s3c2410.h | 2 +- + include/uapi/mtd/mtd-abi.h | 1 + + lib/bch.c | 152 ++- + 98 files changed, 4427 insertions(+), 2609 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml + create mode 100644 drivers/mtd/nand/raw/arasan-nand-controller.c + delete mode 100644 drivers/mtd/nand/raw/cmx270_nand.c +Merging nand/nand/next (86f2b225adf4 mtd: rawnand: Add an invalid ECC mode to discriminate with valid ones) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (e8aec15dd584 mtd: spi-nor: winbond: Fix 4-byte opcode support for w25q256) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (58ca0060ec4e crypto: hisilicon - fix driver compatibility issue with different versions of devices) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (9ca1f474cea0 Merge tag 'amd-drm-next-5.8-2020-05-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (624a498a539a drm/amdgpu: add another raven1 gfxoff quirk) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.h +Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.c +Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h +Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 73 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 834 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 79 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 108 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 243 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 113 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 100 + + drivers/gpu/drm/amd/amdgpu/athub_v2_1.h | 30 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 521 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 375 + + .../dmub/inc/dmub_types.h => amdgpu/gfxhub_v2_1.h} | 60 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 81 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 613 + + .../dmub/inc/dmub_fw_meta.h => amdgpu/jpeg_v3_0.h} | 42 +- + drivers/gpu/drm/amd/amdgpu/mes_api_def.h | 443 + + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 664 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 76 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 21 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 14 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 103 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 92 +- + .../inc/dmub_cmd_dal.h => amdgpu/sdma_common.h} | 42 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h | 15 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 1753 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h | 30 + + drivers/gpu/drm/amd/amdgpu/si_dpm.h | 2 +- + .../gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 13 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 96 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 86 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 94 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 1689 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h | 29 + + drivers/gpu/drm/amd/amdkfd/Makefile | 1 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 2 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 877 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 301 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 18 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 32 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 58 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 20 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 138 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 226 + + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 29 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 275 +- + drivers/gpu/drm/amd/display/Kconfig | 8 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 42 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 20 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 25 - + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 101 + + .../amd/display/dc/bios/command_table_helper2.c | 5 + + .../dc/bios/dce112/command_table_helper2_dce112.c | 40 + + .../dc/bios/dce112/command_table_helper2_dce112.h | 3 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 7 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 22 + + .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h | 60 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 543 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h | 38 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 255 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h | 108 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 125 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 25 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 85 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 36 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 37 + + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 3 - + drivers/gpu/drm/amd/display/dc/dc.h | 64 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 75 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 15 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 34 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 20 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 153 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 42 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 46 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 92 - + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 13 + + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 12 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 12 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 62 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 42 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 22 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 17 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 12 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 9 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 20 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 41 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 112 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 7 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 53 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 121 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 89 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 5 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 54 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 206 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 230 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 640 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h | 78 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c | 100 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h | 66 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 205 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.h | 76 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 851 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 269 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 1414 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 608 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 410 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c | 264 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 923 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 354 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 417 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 119 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 532 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 292 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 714 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 70 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 148 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h | 33 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 239 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h | 463 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 1409 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 665 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h | 36 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 365 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 333 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2671 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 82 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c | 194 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h | 133 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 23 + + drivers/gpu/drm/amd/display/dc/dm_services.h | 69 - + drivers/gpu/drm/amd/display/dc/dml/Makefile | 7 + + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 33 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 33 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 36 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6860 ++ + .../amd/display/dc/dml/dcn30/display_mode_vba_30.h | 43 + + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 1868 + + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.h | 69 + + .../drm/amd/display/dc/dml/display_mode_enums.h | 6 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 181 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 11 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 14 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 63 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 230 +- + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 18 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 10 + + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 257 + + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.h | 33 + + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 387 + + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.h | 35 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 9 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 8 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 25 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 69 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 14 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 83 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 9 + + drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 8 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 108 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 19 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 384 + + .../amd/display/dc/irq/dcn30/irq_service_dcn30.h | 37 + + drivers/gpu/drm/amd/display/dc/os_types.h | 10 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 18 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 401 +- + .../gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h | 75 - + drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 152 - + drivers/gpu/drm/amd/display/dmub/src/Makefile | 3 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 28 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 184 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h | 50 + + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 29 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 4 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../gpu/drm/amd/display/modules/inc/mod_stats.h | 8 +- + .../drm/amd/display/modules/power/power_helpers.c | 95 +- + .../include/asic_reg/athub/athub_2_1_0_offset.h | 523 + + .../include/asic_reg/athub/athub_2_1_0_sh_mask.h | 2378 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 17880 +++++ + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 70929 +++++++++++++++++++ + .../amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h | 573 + + .../amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h | 3565 + + .../amd/include/asic_reg/gc/gc_10_3_0_default.h | 7272 ++ + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 13469 ++++ + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 47692 +++++++++++++ + .../amd/include/asic_reg/vcn/vcn_3_0_0_offset.h | 1542 + + .../amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h | 5496 ++ + drivers/gpu/drm/amd/include/atomfirmware.h | 283 + + .../amd/include/ivsrcid/sdma2/irqsrcs_sdma2_5_0.h | 45 + + .../amd/include/ivsrcid/sdma3/irqsrcs_sdma3_5_0.h | 45 + + .../gpu/drm/amd/include/sienna_cichlid_ip_offset.h | 1168 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 1 + + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 482 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 239 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 9 +- + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 + + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 12 +- + .../powerplay/inc/smu11_driver_if_sienna_cichlid.h | 1209 + + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 4 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 14 +- + .../gpu/drm/amd/powerplay/inc/smu_v11_0_7_ppsmc.h | 139 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 159 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 - + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 2506 + + .../sienna_cichlid_ppt.h} | 26 +- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 20 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 142 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 22 - + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 3288 - + drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 179 - + drivers/gpu/drm/radeon/ni_dpm.c | 7 +- + drivers/gpu/drm/radeon/radeon_drv.c | 5 - + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + include/drm/amd_asic_type.h | 1 + + include/uapi/drm/amdgpu_drm.h | 10 +- + include/uapi/linux/kfd_ioctl.h | 22 +- + sound/pci/hda/hda_intel.c | 3 + + 278 files changed, 216811 insertions(+), 6187 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c + rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_types.h => amdgpu/gfxhub_v2_1.h} (55%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c + rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_fw_meta.h => amdgpu/jpeg_v3_0.h} (53%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_api_def.h + rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_cmd_dal.h => amdgpu/sdma_common.h} (62%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.h + delete mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h + delete mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_sh_mask.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma2/irqsrcs_sdma2_5_0.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma3/irqsrcs_sdma3_5_0.h + create mode 100644 drivers/gpu/drm/amd/include/sienna_cichlid_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_sienna_cichlid.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_7_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c + rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_cmd_vbios.h => powerplay/sienna_cichlid_ppt.h} (74%) + delete mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.h +Merging drm-intel/for-linux-next (f8665d797b1c Merge tag 'gvt-next-fixes-2020-05-28' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_global_state.c | 45 ++- + drivers/gpu/drm/i915/display/intel_global_state.h | 3 + + drivers/gpu/drm/i915/gem/i915_gem_context.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 15 +- + drivers/gpu/drm/i915/gt/intel_context.c | 2 - + drivers/gpu/drm/i915/gvt/vgpu.c | 2 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 4 + + drivers/gpu/drm/i915/i915_params.c | 2 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_request.c | 359 ++++++++++++++-------- + drivers/gpu/drm/i915/i915_scheduler.c | 16 +- + 11 files changed, 295 insertions(+), 159 deletions(-) +Merging drm-tegra/drm/tegra/for-next (d1c746f8b59d drm/tegra: hub: Do not enable orphaned window group) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/sor.c +Auto-merging drivers/gpu/drm/tegra/hdmi.c +Auto-merging drivers/gpu/drm/tegra/drm.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/hub.c | 8 ++++++-- + drivers/gpu/host1x/dev.c | 5 +++-- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging drm-misc/for-linux-next (968d81a64a88 drm/connector: notify userspace on hotplug after register complete) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_connector.c | 5 +++++ + drivers/gpu/drm/drm_sysfs.c | 3 --- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging drm-msm/msm-next (1cb2c4a2c89b Revert "drm/msm/dpu: add support for clk and bw scaling for display") +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_gpu.h +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 16 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 1 + + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 83 ++++- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 7 + + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 14 + + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 418 +++++++++++++++++++------ + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 37 ++- + drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 48 +-- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 70 ++++- + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 123 +++++++- + drivers/gpu/drm/msm/adreno/a6xx_hfi.h | 50 ++- + drivers/gpu/drm/msm/adreno/adreno_device.c | 35 +++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 27 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 23 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 23 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 95 ++++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 48 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 39 +++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 26 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 129 ++++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h | 100 ++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 58 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 18 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 80 ++++- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 21 +- + drivers/gpu/drm/msm/msm_drv.c | 6 +- + drivers/gpu/drm/msm/msm_drv.h | 15 +- + drivers/gpu/drm/msm/msm_gem.c | 31 +- + drivers/gpu/drm/msm/msm_gem.h | 1 + + drivers/gpu/drm/msm/msm_gem_submit.c | 232 +++++++++++++- + drivers/gpu/drm/msm/msm_gem_vma.c | 42 +-- + drivers/gpu/drm/msm/msm_gpu.c | 49 +-- + drivers/gpu/drm/msm/msm_gpu.h | 4 +- + drivers/gpu/drm/msm/msm_gpummu.c | 10 +- + drivers/gpu/drm/msm/msm_iommu.c | 22 +- + drivers/gpu/drm/msm/msm_mmu.h | 5 +- + drivers/gpu/drm/msm/msm_rd.c | 4 +- + include/uapi/drm/msm_drm.h | 24 +- + 47 files changed, 1697 insertions(+), 382 deletions(-) + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (2c76b324c794 drm/imx: parallel-display: Adjust bus_flags handling) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/parallel-display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/parallel-display.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging etnaviv/etnaviv/next (f232d9ec029c drm/etnaviv: fix TS cache flushing on GPUs with BLT engine) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (323ca2daef47 Merge remote-tracking branch 'regmap/for-5.8' into regmap-linus) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (91231e525bb6 ALSA: emu10k1: delete an unnecessary condition) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (1dd9cd775ef5 Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (5c3a7db0c7ec module: Harden STRICT_MODULE_RWX) +$ git merge modules/modules-next +Already up to date. +Merging input/next (d0ac7079d5fc Input: iqs269a - add missing I2C dependency) +$ git merge input/next +Already up to date. +Merging block/for-next (5b53c3e1a873 Merge branch 'block-5.8' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/bio-integrity.c | 1 - + block/bio.c | 3 +- + block/blk-core.c | 6 + + block/blk-mq-tag.c | 39 ++++++- + block/blk-mq-tag.h | 8 ++ + block/blk-mq.c | 29 ----- + block/blk-mq.h | 1 - + block/blk.h | 2 + + drivers/ata/libata-scsi.c | 9 +- + drivers/ata/sata_rcar.c | 11 +- + drivers/block/loop.c | 2 +- + drivers/nvme/host/nvme.h | 3 +- + fs/io_uring.c | 261 ++++++++++++++++++++++++++++++------------- + include/linux/blkdev.h | 2 + + include/trace/events/block.h | 6 +- + kernel/trace/blktrace.c | 36 +++--- + 16 files changed, 273 insertions(+), 146 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-merge-conflict-with-rdma-tree.patch +Applying: fix up for merge conflict with rdma tree +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/nvme/host/rdma.c +$ git add -A . +$ git commit -v -a --amend +[master 2bf8f4a9107a] Merge remote-tracking branch 'block/for-next' + Date: Mon Jun 8 10:44:32 2020 +1000 +Merging device-mapper/for-next (64611a15ca9d dm crypt: avoid truncating the logical block size) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (ae5c0585dfc2 dt-bindings: mmc: Convert sdhci-pxa to json-schema) +$ git merge mmc/next +Already up to date. +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (098c4adf249c mfd: mt6360: Remove duplicate REGMAP_IRQ_REG_LINE() entry) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (479da1f538a2 backlight: Add backlight_device_get_by_name()) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (152204dbdcee power: supply: cw2015: Attach OF ID table to the driver) +$ git merge battery/for-next +Auto-merging include/linux/kobject.h +Auto-merging drivers/power/reset/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/power/supply/sbs_sbs-battery.txt +Removing Documentation/devicetree/bindings/power/supply/bq27xxx.txt +Removing Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 45 +- + .../bindings/power/reset/syscon-reboot-mode.txt | 35 - + .../bindings/power/reset/syscon-reboot-mode.yaml | 55 + + .../bindings/power/reset/syscon-reboot.yaml | 15 +- + .../devicetree/bindings/power/supply/battery.txt | 6 + + .../devicetree/bindings/power/supply/bq27xxx.txt | 56 - + .../devicetree/bindings/power/supply/bq27xxx.yaml | 91 ++ + .../bindings/power/supply/cw2015_battery.yaml | 82 ++ + .../bindings/power/supply/power-supply.yaml | 40 + + .../bindings/power/supply/power_supply.txt | 25 +- + .../bindings/power/supply/rohm,bd99954.yaml | 155 +++ + .../bindings/power/supply/sbs,sbs-battery.yaml | 83 ++ + .../bindings/power/supply/sbs_sbs-battery.txt | 27 - + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 7 + + arch/x86/platform/olpc/olpc-xo1-sci.c | 4 +- + arch/x86/platform/olpc/olpc-xo15-sci.c | 4 +- + drivers/platform/olpc/olpc-xo175-ec.c | 4 +- + drivers/power/reset/Kconfig | 7 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/gpio-poweroff.c | 2 +- + drivers/power/reset/ltc2952-poweroff.c | 3 +- + drivers/power/reset/oxnas-restart.c | 233 ++++ + drivers/power/reset/qcom-pon.c | 3 +- + drivers/power/reset/syscon-reboot.c | 7 +- + drivers/power/supply/88pm860x_battery.c | 8 +- + drivers/power/supply/Kconfig | 49 +- + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500_fg.c | 2 +- + drivers/power/supply/axp288_charger.c | 5 +- + drivers/power/supply/axp288_fuel_gauge.c | 6 + + drivers/power/supply/bd70528-charger.c | 144 +-- + drivers/power/supply/bd99954-charger.c | 1142 ++++++++++++++++++++ + drivers/power/supply/bd99954-charger.h | 1075 ++++++++++++++++++ + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq25890_charger.c | 200 ++-- + drivers/power/supply/charger-manager.c | 40 +- + drivers/power/supply/cw2015_battery.c | 750 +++++++++++++ + drivers/power/supply/generic-adc-battery.c | 22 +- + drivers/power/supply/lp8788-charger.c | 18 +- + drivers/power/supply/max14577_charger.c | 10 + + drivers/power/supply/max14656_charger_detector.c | 5 +- + drivers/power/supply/max17040_battery.c | 2 +- + drivers/power/supply/max17042_battery.c | 8 + + drivers/power/supply/olpc_battery.c | 4 +- + drivers/power/supply/power_supply_core.c | 8 + + drivers/power/supply/power_supply_hwmon.c | 64 +- + drivers/power/supply/power_supply_sysfs.c | 484 +++++---- + drivers/power/supply/sbs-battery.c | 232 +++- + drivers/power/supply/sc27xx_fuel_gauge.c | 77 +- + drivers/power/supply/smb347-charger.c | 5 + + include/linux/kobject.h | 2 +- + include/linux/power_supply.h | 13 +- + 53 files changed, 4693 insertions(+), 678 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/bq27xxx.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/bq27xxx.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/power-supply.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/rohm,bd99954.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-battery.txt + create mode 100644 drivers/power/reset/oxnas-restart.c + create mode 100644 drivers/power/supply/bd99954-charger.c + create mode 100644 drivers/power/supply/bd99954-charger.h + create mode 100644 drivers/power/supply/cw2015_battery.c +Merging regulator/for-next (5fb565b69dab Merge remote-tracking branch 'regulator/for-5.8' into regulator-linus) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (56f2e3b7d819 capabilities: add description for CAP_SETFCAP) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/domain.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging fs/proc/base.c +Merge made by the 'recursive' strategy. + fs/proc/base.c | 13 +++++++++ + security/apparmor/apparmorfs.c | 56 +++++++++---------------------------- + security/apparmor/domain.c | 39 ++++++++++---------------- + security/apparmor/file.c | 12 ++++---- + security/apparmor/include/label.h | 1 + + security/apparmor/include/match.h | 11 ++++++++ + security/apparmor/label.c | 43 +++++++++++++++++++++++------ + security/apparmor/match.c | 58 ++++++++++++++++++++++++++++++++++++++- + security/apparmor/path.c | 2 +- + security/apparmor/policy_unpack.c | 58 +++++++++++++++++++++------------------ + 10 files changed, 182 insertions(+), 111 deletions(-) +Merging integrity/next-integrity (42413b49804b ima: Directly free *entry in ima_alloc_init_template() if digests is NULL) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (fe5a90b8c149 selinux: netlabel: Remove unused inline function) +$ git merge selinux/next +Already up to date. +Merging smack/next (ef26650a201f Smack: Remove unused inline function smk_ad_setfield_u_fs_path_mnt) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (039aeb9deb92 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (32a767afb0d8 tpm: Fix TIS locality timeout problems) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-dev-common.c | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) +Merging watchdog/master (072cb8b628d3 watchdog: m54xx: Add missing include) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (431275afdc71 iommu: Check for deferred attach in iommu_group_do_dma_attach()) +$ git merge iommu/next +Auto-merging include/linux/iommu.h +Auto-merging drivers/iommu/s390-iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/s390-iommu.c +Removing drivers/iommu/amd_iommu_proto.h +Auto-merging arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +Auto-merging Documentation/devicetree/bindings/iommu/arm,smmu.yaml +Resolved 'drivers/iommu/s390-iommu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7dd599fe003d] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 61 ++ + .../devicetree/bindings/iommu/arm,smmu.yaml | 4 +- + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 3 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 5 + + drivers/iommu/Kconfig | 9 + + drivers/iommu/Makefile | 1 + + drivers/iommu/amd_iommu.c | 369 +++---- + drivers/iommu/amd_iommu.h | 96 +- + drivers/iommu/amd_iommu_debugfs.c | 5 +- + drivers/iommu/amd_iommu_init.c | 4 +- + drivers/iommu/amd_iommu_proto.h | 96 -- + drivers/iommu/amd_iommu_types.h | 9 +- + drivers/iommu/amd_iommu_v2.c | 14 +- + drivers/iommu/arm-smmu-impl.c | 8 +- + drivers/iommu/arm-smmu-qcom.c | 37 +- + drivers/iommu/arm-smmu-v3.c | 122 +-- + drivers/iommu/arm-smmu.c | 53 +- + drivers/iommu/arm-smmu.h | 1 + + drivers/iommu/dmar.c | 99 +- + drivers/iommu/exynos-iommu.c | 24 +- + drivers/iommu/fsl_pamu_domain.c | 22 +- + drivers/iommu/hyperv-iommu.c | 2 +- + drivers/iommu/intel-iommu-debugfs.c | 62 ++ + drivers/iommu/intel-iommu.c | 952 ++++++++---------- + drivers/iommu/intel-pasid.c | 309 +++++- + drivers/iommu/intel-pasid.h | 27 +- + drivers/iommu/intel-svm.c | 448 +++++++-- + drivers/iommu/intel_irq_remapping.c | 2 +- + drivers/iommu/iommu.c | 470 ++++++--- + drivers/iommu/iova.c | 6 +- + drivers/iommu/ipmmu-vmsa.c | 59 +- + drivers/iommu/msm_iommu.c | 36 +- + drivers/iommu/mtk_iommu.c | 24 +- + drivers/iommu/mtk_iommu_v1.c | 68 +- + drivers/iommu/omap-iommu.c | 103 +- + drivers/iommu/qcom_iommu.c | 24 +- + drivers/iommu/rockchip-iommu.c | 26 +- + drivers/iommu/s390-iommu.c | 22 +- + drivers/iommu/sun50i-iommu.c | 1023 ++++++++++++++++++++ + drivers/iommu/tegra-gart.c | 24 +- + drivers/iommu/tegra-smmu.c | 31 +- + drivers/iommu/virtio-iommu.c | 41 +- + drivers/misc/uacce/uacce.c | 172 +--- + drivers/pci/ats.c | 18 +- + include/linux/intel-iommu.h | 82 +- + include/linux/intel-svm.h | 94 +- + include/linux/iommu.h | 63 +- + include/linux/pci-ats.h | 3 + + include/linux/uacce.h | 34 +- + include/uapi/linux/iommu.h | 5 + + 50 files changed, 3345 insertions(+), 1927 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/allwinner,sun50i-h6-iommu.yaml + delete mode 100644 drivers/iommu/amd_iommu_proto.h + create mode 100644 drivers/iommu/sun50i-iommu.c +Merging vfio/next (4f085ca2f5a8 Merge branch 'v5.8/vfio/kirti-migration-fixes' into v5.8/vfio/next) +$ git merge vfio/next +Already up to date. +Merging audit/next (9d44a121c5a7 audit: add subj creds to NETFILTER_CFG record to) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (8211d1e83ade dt-bindings: clock: Add documentation for X1830 bindings.) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (b7b2796b9b31 mailbox: imx: ONLY IPC MU needs IRQF_NO_SUSPEND flag) +$ git merge mailbox/mailbox-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 80 +++++ + .../devicetree/bindings/mailbox/sprd-mailbox.yaml | 60 ++++ + MAINTAINERS | 8 + + drivers/mailbox/Kconfig | 18 + + drivers/mailbox/Makefile | 4 + + drivers/mailbox/imx-mailbox.c | 117 ++++++- + drivers/mailbox/pcc.c | 2 +- + drivers/mailbox/qcom-ipcc.c | 286 ++++++++++++++++ + drivers/mailbox/sprd-mailbox.c | 361 +++++++++++++++++++++ + drivers/mailbox/zynqmp-ipi-mailbox.c | 25 +- + include/dt-bindings/mailbox/qcom-ipcc.h | 33 ++ + 11 files changed, 968 insertions(+), 26 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml + create mode 100644 Documentation/devicetree/bindings/mailbox/sprd-mailbox.yaml + create mode 100644 drivers/mailbox/qcom-ipcc.c + create mode 100644 drivers/mailbox/sprd-mailbox.c + create mode 100644 include/dt-bindings/mailbox/qcom-ipcc.h +Merging spi/for-next (7ce6dc9ef58d Merge remote-tracking branch 'spi/for-5.8' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (22a1c800c96c Merge branch 'WIP.core/headers') +$ git merge tip/auto-latest +Removing kernel/gcov/gcc_3_4.c +Removing drivers/xen/preempt.c +Removing arch/x86/include/asm/irq_regs.h +Removing arch/x86/include/asm/entry_arch.h +Removing arch/x86/include/asm/acrn.h +Auto-merging arch/sparc/mm/srmmu.c +CONFLICT (content): Merge conflict in arch/sparc/mm/srmmu.c +Auto-merging MAINTAINERS +Resolved 'arch/sparc/mm/srmmu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 502a9d92c90e] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/hw-vuln/index.rst | 1 + + Documentation/admin-guide/hw-vuln/l1d_flush.rst | 51 + + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 321 +++ + Documentation/process/changes.rst | 2 +- + Documentation/userspace-api/spec_ctrl.rst | 7 + + MAINTAINERS | 11 + + Makefile | 3 +- + arch/arm/crypto/Kconfig | 12 +- + arch/arm64/include/asm/atomic.h | 6 +- + arch/arm64/include/asm/barrier.h | 16 +- + arch/arm64/lib/csum.c | 20 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/Makefile | 2 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/entry/Makefile | 8 +- + arch/x86/entry/calling.h | 25 +- + arch/x86/entry/common.c | 415 +++- + arch/x86/entry/entry_32.S | 476 +--- + arch/x86/entry/entry_64.S | 835 ++----- + arch/x86/entry/entry_64_compat.S | 55 +- + arch/x86/entry/thunk_64.S | 14 +- + arch/x86/entry/vdso/Makefile | 6 + + arch/x86/events/Makefile | 2 +- + arch/x86/hyperv/hv_init.c | 9 +- + arch/x86/include/asm/acrn.h | 11 - + arch/x86/include/asm/amd_nb.h | 1 + + arch/x86/include/asm/apic.h | 33 - + arch/x86/include/asm/atomic.h | 31 +- + arch/x86/include/asm/atomic64_32.h | 9 + + arch/x86/include/asm/atomic64_64.h | 15 +- + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/include/asm/bug.h | 4 + + arch/x86/include/asm/cacheflush.h | 8 + + arch/x86/include/asm/cpu_entry_area.h | 12 +- + arch/x86/include/asm/debugreg.h | 48 +- + arch/x86/include/asm/desc.h | 52 +- + arch/x86/include/asm/entry_arch.h | 56 - + arch/x86/include/asm/hw_irq.h | 22 - + arch/x86/include/asm/idtentry.h | 652 ++++++ + arch/x86/include/asm/intel-family.h | 2 + + arch/x86/include/asm/irq.h | 8 +- + arch/x86/include/asm/irq_regs.h | 32 - + arch/x86/include/asm/irq_stack.h | 53 + + arch/x86/include/asm/irq_work.h | 1 - + arch/x86/include/asm/irqflags.h | 54 +- + arch/x86/include/asm/kvm_para.h | 2 +- + arch/x86/include/asm/mce.h | 30 +- + arch/x86/include/asm/mshyperv.h | 13 - + arch/x86/include/asm/nospec-branch.h | 4 +- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/include/asm/ptrace.h | 2 +- + arch/x86/include/asm/set_memory.h | 19 +- + arch/x86/include/asm/special_insns.h | 22 +- + arch/x86/include/asm/text-patching.h | 11 +- + arch/x86/include/asm/thread_info.h | 9 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/include/asm/trace/common.h | 4 - + arch/x86/include/asm/trace/irq_vectors.h | 17 +- + arch/x86/include/asm/trapnr.h | 31 + + arch/x86/include/asm/traps.h | 118 +- + arch/x86/include/asm/uv/uv_bau.h | 8 +- + arch/x86/include/uapi/asm/mce.h | 1 + + arch/x86/kernel/Makefile | 5 + + arch/x86/kernel/alternative.c | 25 +- + arch/x86/kernel/amd_nb.c | 5 + + arch/x86/kernel/apic/apic.c | 41 +- + arch/x86/kernel/apic/msi.c | 3 +- + arch/x86/kernel/apic/vector.c | 5 +- + arch/x86/kernel/asm-offsets_64.c | 3 - + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/cpu/acrn.c | 9 +- + arch/x86/kernel/cpu/bugs.c | 28 + + arch/x86/kernel/cpu/common.c | 19 - + arch/x86/kernel/cpu/intel.c | 3 + + arch/x86/kernel/cpu/mce/amd.c | 238 +- + arch/x86/kernel/cpu/mce/core.c | 206 +- + arch/x86/kernel/cpu/mce/dev-mcelog.c | 8 +- + arch/x86/kernel/cpu/mce/inject.c | 4 +- + arch/x86/kernel/cpu/mce/internal.h | 12 +- + arch/x86/kernel/cpu/mce/p5.c | 8 +- + arch/x86/kernel/cpu/mce/severity.c | 6 +- + arch/x86/kernel/cpu/mce/therm_throt.c | 5 +- + arch/x86/kernel/cpu/mce/threshold.c | 5 +- + arch/x86/kernel/cpu/mce/winchip.c | 8 +- + arch/x86/kernel/cpu/mshyperv.c | 22 +- + arch/x86/kernel/doublefault_32.c | 10 +- + arch/x86/kernel/dumpstack_64.c | 7 +- + arch/x86/kernel/e820.c | 10 +- + arch/x86/kernel/ftrace_64.S | 2 +- + arch/x86/kernel/head_64.S | 7 +- + arch/x86/kernel/hw_breakpoint.c | 100 +- + arch/x86/kernel/idt.c | 226 +- + arch/x86/kernel/irq.c | 66 +- + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/irq_64.c | 6 + + arch/x86/kernel/irq_work.c | 6 +- + arch/x86/kernel/kvm.c | 15 +- + arch/x86/kernel/l1d_flush.c | 120 + + arch/x86/kernel/nmi.c | 75 +- + arch/x86/kernel/reboot.c | 8 + + arch/x86/kernel/smp.c | 37 +- + arch/x86/kernel/tracepoint.c | 17 - + arch/x86/kernel/traps.c | 486 +++-- + arch/x86/kvm/svm/svm.c | 2 +- + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/kvm/vmx/vmx.c | 64 +- + arch/x86/lib/Makefile | 9 + + arch/x86/mm/Makefile | 4 + + arch/x86/mm/cpu_entry_area.c | 1 - + arch/x86/mm/fault.c | 78 +- + arch/x86/mm/tlb.c | 87 +- + arch/x86/platform/uv/tlb_uv.c | 2 +- + arch/x86/purgatory/.gitignore | 1 + + arch/x86/purgatory/Makefile | 21 +- + arch/x86/realmode/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 3 + + arch/x86/xen/enlighten_hvm.c | 12 + + arch/x86/xen/enlighten_pv.c | 52 +- + arch/x86/xen/setup.c | 4 +- + arch/x86/xen/smp_pv.c | 3 +- + arch/x86/xen/suspend_hvm.c | 3 +- + arch/x86/xen/xen-asm_32.S | 14 +- + arch/x86/xen/xen-asm_64.S | 44 +- + arch/x86/xen/xen-ops.h | 2 - + crypto/Kconfig | 1 - + drivers/acpi/acpi_extlog.c | 19 +- + drivers/acpi/nfit/mce.c | 1 + + drivers/edac/amd64_edac.c | 22 +- + drivers/edac/amd64_edac.h | 3 + + drivers/edac/edac_mc.c | 61 - + drivers/edac/i7core_edac.c | 5 +- + drivers/edac/mce_amd.c | 28 +- + drivers/edac/mce_amd.h | 2 - + drivers/edac/pnd2_edac.c | 8 +- + drivers/edac/sb_edac.c | 7 +- + drivers/edac/skx_common.c | 3 +- + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/hwmon/k10temp.c | 1 + + drivers/ras/cec.c | 33 +- + drivers/xen/Makefile | 2 +- + drivers/xen/events/events_base.c | 32 +- + drivers/xen/preempt.c | 42 - + drivers/xen/time.c | 2 +- + include/asm-generic/atomic-instrumented.h | 711 +++--- + include/asm-generic/atomic-long.h | 331 +-- + include/asm-generic/barrier.h | 16 +- + include/asm-generic/bitops/instrumented-atomic.h | 14 +- + include/asm-generic/bitops/instrumented-lock.h | 10 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 16 +- + include/asm-generic/bug.h | 10 +- + include/linux/atomic-arch-fallback.h | 2291 ++++++++++++++++++++ + include/linux/atomic-fallback.h | 346 ++- + include/linux/atomic.h | 11 + + include/linux/bsearch.h | 26 +- + include/linux/compiler-clang.h | 11 +- + include/linux/compiler-gcc.h | 11 +- + include/linux/compiler.h | 210 +- + include/linux/compiler_types.h | 78 + + include/linux/context_tracking.h | 8 +- + include/linux/context_tracking_state.h | 6 +- + include/linux/debug_locks.h | 2 +- + include/linux/edac.h | 8 - + include/linux/hardirq.h | 41 +- + include/linux/instrumentation.h | 57 + + include/linux/instrumented.h | 109 + + include/linux/irqflags.h | 4 +- + include/linux/kcsan-checks.h | 430 ++++ + include/linux/kcsan.h | 59 + + include/linux/pci_ids.h | 1 + + include/linux/ras.h | 5 - + include/linux/sched.h | 8 +- + include/linux/seqlock.h | 51 +- + include/linux/set_memory.h | 2 +- + include/linux/uaccess.h | 14 +- + include/uapi/linux/prctl.h | 1 + + include/xen/events.h | 7 - + include/xen/hvm.h | 2 + + include/xen/interface/hvm/hvm_op.h | 2 + + include/xen/xen-ops.h | 19 +- + init/Kconfig | 1 - + init/init_task.c | 10 + + init/main.c | 2 + + kernel/Makefile | 6 + + kernel/context_tracking.c | 14 +- + kernel/gcov/Kconfig | 24 - + kernel/gcov/Makefile | 3 +- + kernel/gcov/gcc_3_4.c | 573 ----- + kernel/kcsan/Makefile | 14 + + kernel/kcsan/atomic.h | 20 + + kernel/kcsan/core.c | 850 ++++++++ + kernel/kcsan/debugfs.c | 349 +++ + kernel/kcsan/encoding.h | 95 + + kernel/kcsan/kcsan.h | 142 ++ + kernel/kcsan/report.c | 634 ++++++ + kernel/kcsan/test.c | 131 ++ + kernel/locking/Makefile | 3 + + kernel/locking/lockdep.c | 4 +- + kernel/panic.c | 4 +- + kernel/rcu/rcuperf.c | 2 +- + kernel/sched/Makefile | 6 + + kernel/softirq.c | 44 +- + kernel/time/timekeeping.c | 2 +- + kernel/trace/Makefile | 3 + + kernel/trace/trace_preemptirq.c | 10 +- + lib/Kconfig.debug | 2 + + lib/Kconfig.kcsan | 199 ++ + lib/Kconfig.ubsan | 11 + + lib/Makefile | 4 + + lib/bsearch.c | 22 +- + lib/fault-inject.c | 4 +- + lib/iov_iter.c | 7 +- + lib/smp_processor_id.c | 10 +- + lib/usercopy.c | 7 +- + lib/vdso/gettimeofday.c | 2 +- + mm/Makefile | 8 + + net/netfilter/core.c | 2 +- + net/tls/tls_main.c | 2 +- + scripts/Makefile.kcsan | 19 + + scripts/Makefile.lib | 10 + + scripts/atomic/fallbacks/acquire | 6 +- + scripts/atomic/fallbacks/add_negative | 8 +- + scripts/atomic/fallbacks/add_unless | 8 +- + scripts/atomic/fallbacks/andnot | 6 +- + scripts/atomic/fallbacks/dec | 6 +- + scripts/atomic/fallbacks/dec_and_test | 8 +- + scripts/atomic/fallbacks/dec_if_positive | 8 +- + scripts/atomic/fallbacks/dec_unless_positive | 8 +- + scripts/atomic/fallbacks/fence | 6 +- + scripts/atomic/fallbacks/fetch_add_unless | 10 +- + scripts/atomic/fallbacks/inc | 6 +- + scripts/atomic/fallbacks/inc_and_test | 8 +- + scripts/atomic/fallbacks/inc_not_zero | 8 +- + scripts/atomic/fallbacks/inc_unless_negative | 8 +- + scripts/atomic/fallbacks/read_acquire | 4 +- + scripts/atomic/fallbacks/release | 6 +- + scripts/atomic/fallbacks/set_release | 4 +- + scripts/atomic/fallbacks/sub_and_test | 8 +- + scripts/atomic/fallbacks/try_cmpxchg | 6 +- + scripts/atomic/gen-atomic-fallback.sh | 31 +- + scripts/atomic/gen-atomic-instrumented.sh | 9 +- + scripts/atomic/gen-atomic-long.sh | 3 +- + scripts/atomic/gen-atomics.sh | 5 +- + scripts/checkpatch.pl | 8 + + scripts/gcc-plugins/Kconfig | 2 +- + tools/objtool/check.c | 22 + + 246 files changed, 10271 insertions(+), 4386 deletions(-) + create mode 100644 Documentation/admin-guide/hw-vuln/l1d_flush.rst + create mode 100644 Documentation/dev-tools/kcsan.rst + delete mode 100644 arch/x86/include/asm/acrn.h + delete mode 100644 arch/x86/include/asm/entry_arch.h + create mode 100644 arch/x86/include/asm/idtentry.h + delete mode 100644 arch/x86/include/asm/irq_regs.h + create mode 100644 arch/x86/include/asm/irq_stack.h + create mode 100644 arch/x86/include/asm/trapnr.h + create mode 100644 arch/x86/kernel/l1d_flush.c + create mode 100644 arch/x86/purgatory/.gitignore + delete mode 100644 drivers/xen/preempt.c + create mode 100644 include/linux/atomic-arch-fallback.h + create mode 100644 include/linux/instrumentation.h + create mode 100644 include/linux/instrumented.h + create mode 100644 include/linux/kcsan-checks.h + create mode 100644 include/linux/kcsan.h + delete mode 100644 kernel/gcov/gcc_3_4.c + create mode 100644 kernel/kcsan/Makefile + create mode 100644 kernel/kcsan/atomic.h + create mode 100644 kernel/kcsan/core.c + create mode 100644 kernel/kcsan/debugfs.c + create mode 100644 kernel/kcsan/encoding.h + create mode 100644 kernel/kcsan/kcsan.h + create mode 100644 kernel/kcsan/report.c + create mode 100644 kernel/kcsan/test.c + create mode 100644 lib/Kconfig.kcsan + create mode 100644 scripts/Makefile.kcsan +$ git am -3 ../patches/0001-KVM-SVM-fix-up-for-do_machine_check-API-change.patch +Applying: KVM: SVM: fix up for do_machine_check() API change +Using index info to reconstruct a base tree... +M arch/x86/kvm/svm/svm.c +Falling back to patching base and 3-way merge... +Auto-merging arch/x86/kvm/svm/svm.c +No changes -- Patch already applied. +Merging clockevents/timers/drivers/next (809eb4e9bf9d dt-bindings: timer: Add renesas,em-sti bindings) +$ git merge clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (daeb3bc9a92f Merge branch 'edac-misc' into edac-for-next) +$ git merge edac/edac-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (5a7f796d4f20 irqchip/loongson-pci-msi: Fix a typo in Kconfig) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/Kconfig +CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig +Resolved 'drivers/irqchip/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master abe6ce09fa9e] Merge remote-tracking branch 'irqchip/irq/irqchip-next' +$ git diff -M --stat --summary HEAD^.. + drivers/irqchip/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging ftrace/for-next (daceabf1b494 tracing/doc: Fix ascii-art in histogram-design.rst) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/Makefile +Auto-merging kernel/trace/Kconfig +Merge made by the 'recursive' strategy. + Documentation/trace/histogram-design.rst | 2115 +++++++++++++++++++ + kernel/trace/Kconfig | 43 +- + kernel/trace/Makefile | 1 + + kernel/trace/ftrace.c | 8 +- + kernel/trace/trace.c | 5 +- + kernel/trace/trace.h | 1 + + kernel/trace/trace_events.c | 4 + + kernel/trace/trace_events_hist.c | 2193 +++----------------- + kernel/trace/trace_events_synth.c | 1789 ++++++++++++++++ + kernel/trace/trace_probe.c | 2 +- + kernel/trace/trace_synth.h | 36 + + lib/bug.c | 3 + + tools/bootconfig/test-bootconfig.sh | 7 + + .../inter-event/trigger-field-variable-support.tc | 5 + + .../trigger-inter-event-combined-hist.tc | 5 + + .../inter-event/trigger-multi-actions-accept.tc | 5 + + .../inter-event/trigger-onmatch-action-hist.tc | 5 + + .../trigger-onmatch-onmax-action-hist.tc | 5 + + .../inter-event/trigger-onmax-action-hist.tc | 5 + + .../inter-event/trigger-snapshot-action-hist.tc | 5 + + .../inter-event/trigger-trace-action-hist.tc | 5 + + 21 files changed, 4382 insertions(+), 1865 deletions(-) + create mode 100644 Documentation/trace/histogram-design.rst + create mode 100644 kernel/trace/trace_events_synth.c + create mode 100644 kernel/trace/trace_synth.h +Merging rcu/rcu/next (8747b07d1944 Merge branch 'kcsan-dev.2020.04.13c' into HEAD) +$ git merge rcu/rcu/next +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging kvm/linux-next (6929f71e46bd atomisp: avoid warning about unused function) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (7ae2f3db6167 KVM: arm64: Flush the instruction cache if not unmapping the VM on reboot) +$ git merge kvm-arm/next +Auto-merging arch/arm64/kvm/arm.c +Merge made by the 'recursive' strategy. + arch/arm64/kvm/arm.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) +Merging kvm-ppc/kvm-ppc-next (11362b1befea KVM: PPC: Book3S HV: Close race with page faults around memslot flushes) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/emulate_loadstore.c +Auto-merging arch/powerpc/kvm/book3s_hv_nested.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_radix.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c +Auto-merging arch/powerpc/include/asm/kvm_book3s.h +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/kvm_book3s.h | 16 +++---- + arch/powerpc/include/asm/kvm_host.h | 1 - + arch/powerpc/include/asm/kvm_ppc.h | 27 ++++++------ + arch/powerpc/kvm/book3s.c | 4 +- + arch/powerpc/kvm/book3s.h | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 12 ++--- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 36 +++++++++++---- + arch/powerpc/kvm/book3s_64_vio.c | 18 ++++++-- + arch/powerpc/kvm/book3s_emulate.c | 10 ++--- + arch/powerpc/kvm/book3s_hv.c | 75 +++++++++++++++++--------------- + arch/powerpc/kvm/book3s_hv_nested.c | 15 +++---- + arch/powerpc/kvm/book3s_hv_uvmem.c | 14 ++++++ + arch/powerpc/kvm/book3s_paired_singles.c | 72 +++++++++++++++--------------- + arch/powerpc/kvm/book3s_pr.c | 30 ++++++------- + arch/powerpc/kvm/booke.c | 36 +++++++-------- + arch/powerpc/kvm/booke.h | 8 +--- + arch/powerpc/kvm/booke_emulate.c | 2 +- + arch/powerpc/kvm/e500_emulate.c | 15 +++---- + arch/powerpc/kvm/emulate.c | 10 ++--- + arch/powerpc/kvm/emulate_loadstore.c | 32 +++++++------- + arch/powerpc/kvm/powerpc.c | 72 +++++++++++++++--------------- + arch/powerpc/kvm/trace_hv.h | 6 +-- + 22 files changed, 276 insertions(+), 237 deletions(-) +Merging kvms390/next (0b545fd17f84 KVM: s390: remove unneeded semicolon in gisa_vcpu_kicker()) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (3add7f304269 xen/arm: call dma_to_phys on the dma_addr_t parameter of dma_cache_maint) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/arm/xen/mm.c | 32 +++++++------ + drivers/pci/xen-pcifront.c | 27 ++++------- + drivers/xen/Kconfig | 4 ++ + drivers/xen/cpu_hotplug.c | 8 ++-- + drivers/xen/platform-pci.c | 2 +- + drivers/xen/pvcalls-back.c | 5 +- + drivers/xen/swiotlb-xen.c | 72 +++++++++++++++-------------- + drivers/xen/xen-pciback/conf_space.c | 16 +++---- + drivers/xen/xen-pciback/conf_space_header.c | 44 ++++++------------ + drivers/xen/xen-pciback/conf_space_quirks.c | 6 ++- + drivers/xen/xen-pciback/pci_stub.c | 38 +++++++-------- + drivers/xen/xen-pciback/pciback.h | 2 - + drivers/xen/xen-pciback/pciback_ops.c | 55 +++++++--------------- + drivers/xen/xen-pciback/vpci.c | 10 ++-- + drivers/xen/xenbus/xenbus_probe.c | 11 ++--- + include/xen/swiotlb-xen.h | 10 ++-- + 16 files changed, 150 insertions(+), 192 deletions(-) +Merging percpu/for-next (dedac37ea96b Merge branch 'for-5.7' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON()) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (47a94c551a74 platform/x86: dcdbas: Check SMBIOS for protected buffer address) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (bbb7ad49b835 platform/chrome: cros_usbpd_logger: Add __printf annotation to append_str()) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (59ea3c9faf32 leds: add aw2013 driver) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (2a556ce779e3 ipmi:ssif: Remove dynamic platform device handing) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (8c3e315d4296 driver core: Update device link status correctly for SYNC_STATE_ONLY links) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (347052e3bf1b usb: dwc3: meson-g12a: fix USB2 PHY initialization on G12A and A1 SoCs) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (1c11e74e9079 usb: dwc3: keystone: Turn on USB3 PHY before controller) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (c432df155919 USB: serial: ch341: fix lockup of devices with limited prescaler) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (c4100ef2dd42 Documentation: ABI: usb: chipidea: Update Li Jun's e-mail) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging phy-next/next (ac0a95a3ea78 phy: intel: Add driver support for ComboPhy) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (a1b44ea340b2 tty: serial: qcom_geni_serial: Add 51.2MHz frequency support) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (05c8a4fc44a9 habanalabs: correctly cast u64 to void*) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (b2e5575a8d04 extcon: arizona: Fix runtime PM imbalance on error) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (fcbcf1f7b568 soundwire: intel: use a single module) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (4caf2511ec49 thunderbolt: Add trivial .shutdown) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (77f55d1305c1 staging: rtl8723bs: Use common packet header constants) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + drivers/mux/adgs1408.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging icc/icc-next (b35da2e86f25 Merge branch 'icc-get-by-index' into icc-next) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (be4cf718cd99 dmaengine: imx-sdma: initialize all script addresses) +$ git merge slave-dma/next +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/dma/moxart-dma.c +Auto-merging drivers/dma/mmp_tdma.c +Auto-merging drivers/dma/dmatest.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/Kconfig +Removing Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt +Removing Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 6 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 117 ---------------- + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 150 +++++++++++++++++++++ + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 55 -------- + .../devicetree/bindings/dma/renesas,usb-dmac.yaml | 102 ++++++++++++++ + .../devicetree/bindings/dma/st,stm32-dma.yaml | 5 + + drivers/dma/Kconfig | 4 +- + drivers/dma/at_hdmac_regs.h | 2 +- + drivers/dma/at_xdmac.c | 2 +- + drivers/dma/dmaengine.c | 98 +++++++------- + drivers/dma/dmatest.c | 24 ++-- + drivers/dma/dw-edma/dw-edma-core.c | 65 ++++++--- + drivers/dma/dw-edma/dw-edma-core.h | 4 + + drivers/dma/dw-edma/dw-edma-pcie.c | 10 ++ + drivers/dma/idxd/sysfs.c | 11 ++ + drivers/dma/imx-sdma.c | 2 +- + drivers/dma/ioat/dma.c | 85 +++++++----- + drivers/dma/ioat/dma.h | 10 +- + drivers/dma/ioat/init.c | 2 +- + drivers/dma/mmp_tdma.c | 26 +++- + drivers/dma/moxart-dma.c | 2 +- + drivers/dma/qcom/bam_dma.c | 2 +- + drivers/dma/qcom/hidma.c | 3 +- + drivers/dma/sf-pdma/sf-pdma.c | 25 +--- + drivers/dma/stm32-dma.c | 41 ++++-- + drivers/dma/ti/Kconfig | 4 +- + drivers/dma/ti/k3-udma.c | 34 ++--- + 27 files changed, 535 insertions(+), 356 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt + create mode 100644 Documentation/devicetree/bindings/dma/renesas,rcar-dmac.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt + create mode 100644 Documentation/devicetree/bindings/dma/renesas,usb-dmac.yaml +Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (01e5493c08b9 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/iscsi_boot_sysfs.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 5 +---- + drivers/scsi/qedf/qedf_fip.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 6 +----- + drivers/target/target_core_user.c | 4 ++-- + 5 files changed, 6 insertions(+), 13 deletions(-) +Merging scsi-mkp/for-next (06b43f968db5 scsi: hpsa: hpsa_ioctl(): Tidy up a bit) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (bdea059ef682 vhost: drop head based APIs) +$ git merge vhost/linux-next +Auto-merging mm/page_alloc.c +Auto-merging mm/memory_hotplug.c +Auto-merging include/linux/memory_hotplug.h +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/net/caif/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 18 +- + drivers/acpi/numa/srat.c | 1 + + drivers/crypto/virtio/virtio_crypto_algs.c | 21 +- + drivers/misc/mic/Kconfig | 2 +- + drivers/net/caif/Kconfig | 2 +- + drivers/vdpa/Kconfig | 2 +- + drivers/vdpa/ifcvf/ifcvf_base.c | 3 + + drivers/vdpa/ifcvf/ifcvf_base.h | 4 + + drivers/vdpa/ifcvf/ifcvf_main.c | 146 ++- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 +- + drivers/vhost/Kconfig | 17 +- + drivers/vhost/net.c | 176 +-- + drivers/vhost/scsi.c | 75 +- + drivers/vhost/test.c | 22 +- + drivers/vhost/vdpa.c | 112 +- + drivers/vhost/vhost.c | 476 ++++--- + drivers/vhost/vhost.h | 52 +- + drivers/vhost/vringh.c | 6 +- + drivers/vhost/vsock.c | 32 +- + drivers/virtio/Kconfig | 17 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio_balloon.c | 9 +- + drivers/virtio/virtio_mem.c | 1965 ++++++++++++++++++++++++++++ + drivers/virtio/virtio_mmio.c | 4 +- + drivers/virtio/virtio_pci_modern.c | 1 + + include/linux/memory_hotplug.h | 1 + + include/linux/page-flags.h | 10 + + include/linux/vdpa.h | 16 + + include/linux/vringh.h | 6 +- + include/uapi/linux/vhost.h | 4 + + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_mem.h | 211 +++ + include/uapi/linux/virtio_ring.h | 48 +- + mm/memory_hotplug.c | 81 +- + mm/page_alloc.c | 26 + + mm/page_isolation.c | 9 + + 36 files changed, 3161 insertions(+), 423 deletions(-) + create mode 100644 drivers/virtio/virtio_mem.c + create mode 100644 include/uapi/linux/virtio_mem.h +Merging rpmsg/for-next (71f56fef13d4 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/soc/qcom/Makefile +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging drivers/remoteproc/stm32_rproc.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt +Merge made by the 'recursive' strategy. + .../bindings/remoteproc/ingenic,vpu.yaml | 77 ++++++ + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 12 + + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 22 +- + MAINTAINERS | 1 + + drivers/hwspinlock/Kconfig | 10 +- + drivers/remoteproc/Kconfig | 9 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/ingenic_rproc.c | 280 +++++++++++++++++++++ + drivers/remoteproc/mtk_scp.c | 4 +- + drivers/remoteproc/qcom_common.c | 17 +- + drivers/remoteproc/qcom_common.h | 5 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 3 +- + drivers/remoteproc/qcom_q6v5_mss.c | 173 +++++-------- + drivers/remoteproc/qcom_q6v5_pas.c | 68 ++++- + drivers/remoteproc/qcom_q6v5_wcss.c | 6 + + drivers/remoteproc/qcom_sysmon.c | 116 +++++++-- + drivers/remoteproc/qcom_wcnss.c | 1 + + drivers/remoteproc/remoteproc_core.c | 243 ++++++++++++++---- + drivers/remoteproc/remoteproc_debugfs.c | 28 +-- + drivers/remoteproc/remoteproc_elf_loader.c | 24 -- + drivers/remoteproc/remoteproc_internal.h | 17 +- + drivers/remoteproc/remoteproc_virtio.c | 15 +- + drivers/remoteproc/st_remoteproc.c | 2 +- + drivers/remoteproc/st_slim_rproc.c | 2 +- + drivers/remoteproc/stm32_rproc.c | 3 +- + drivers/rpmsg/Kconfig | 6 +- + drivers/rpmsg/Makefile | 3 +- + .../qcom/glink_ssr.c => rpmsg/qcom_glink_ssr.c} | 28 ++- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + drivers/soc/qcom/Kconfig | 9 - + drivers/soc/qcom/Makefile | 1 - + include/linux/remoteproc.h | 19 +- + include/linux/rpmsg/qcom_glink.h | 3 +- + 34 files changed, 927 insertions(+), 285 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/ingenic,vpu.yaml + create mode 100644 drivers/remoteproc/ingenic_rproc.c + rename drivers/{soc/qcom/glink_ssr.c => rpmsg/qcom_glink_ssr.c} (83%) +Merging gpio/for-next (74910e15ab25 gpio: pca953x: Drop unneeded ACPI_PTR()) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (e33a58a29c6a gpio: pca935x: Allow IRQ support for driver built as a module) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (7e73aa90a38c gpio: merrifield: Better show how GPIO and IRQ bases are derived from hardware) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (94873f6b46f8 pinctrl: sprd: Fix the incorrect pull-up definition) +$ git merge pinctrl/for-next +Removing include/linux/spi/mcp23s08.h +Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c +Auto-merging drivers/pinctrl/mediatek/pinctrl-paris.c +Auto-merging drivers/pinctrl/intel/pinctrl-cherryview.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 6 +- + .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 5 +- + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 4 +- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 147 +++ + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 + + .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 3 + + MAINTAINERS | 3 +- + drivers/pinctrl/Kconfig | 17 +- + drivers/pinctrl/Makefile | 2 + + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 80 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx.c | 26 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 193 +++ + drivers/pinctrl/intel/Kconfig | 8 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 9 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 58 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 278 ++-- + drivers/pinctrl/intel/pinctrl-icelake.c | 30 +- + drivers/pinctrl/intel/pinctrl-intel.c | 22 +- + drivers/pinctrl/intel/pinctrl-intel.h | 27 +- + drivers/pinctrl/intel/pinctrl-jasperlake.c | 344 +++++ + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 10 +- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 32 +- + drivers/pinctrl/mediatek/Kconfig | 13 +- + drivers/pinctrl/mediatek/Makefile | 5 +- + drivers/pinctrl/mediatek/mtk-eint.c | 9 + + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 28 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 6 + + drivers/pinctrl/meson/pinctrl-meson.c | 14 + + drivers/pinctrl/nomadik/pinctrl-ab8505.c | 1 + + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 6 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 2 +- + drivers/pinctrl/pinctrl-bm1880.c | 1 + + drivers/pinctrl/pinctrl-ingenic.c | 21 + + drivers/pinctrl/pinctrl-lantiq.c | 2 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 514 +------- + drivers/pinctrl/pinctrl-mcp23s08.h | 52 + + drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 124 ++ + drivers/pinctrl/pinctrl-mcp23s08_spi.c | 262 ++++ + drivers/pinctrl/pinctrl-ocelot.c | 127 +- + drivers/pinctrl/pinctrl-rk805.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 11 +- + drivers/pinctrl/pinctrl-rza1.c | 4 +- + drivers/pinctrl/pinctrl-stmfx.c | 6 +- + drivers/pinctrl/pinctrl-sx150x.c | 2 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 9 - + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 1 - + drivers/pinctrl/qcom/pinctrl-sm8250.c | 1361 ++++++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-exynos.c | 82 +- + drivers/pinctrl/sh-pfc/Kconfig | 4 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 6 + + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 744 ++++++----- + drivers/pinctrl/sh-pfc/pfc-sh7269.c | 5 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 1 + + drivers/pinctrl/sirf/pinctrl-sirf.c | 20 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 2 +- + drivers/pinctrl/zte/pinctrl-zx.c | 2 +- + include/dt-bindings/pinctrl/pads-imx8dxl.h | 639 +++++++++ + include/linux/spi/mcp23s08.h | 18 - + 71 files changed, 4147 insertions(+), 1314 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yaml + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8dxl.c + create mode 100644 drivers/pinctrl/intel/pinctrl-jasperlake.c + create mode 100644 drivers/pinctrl/pinctrl-mcp23s08.h + create mode 100644 drivers/pinctrl/pinctrl-mcp23s08_i2c.c + create mode 100644 drivers/pinctrl/pinctrl-mcp23s08_spi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8250.c + create mode 100644 include/dt-bindings/pinctrl/pads-imx8dxl.h + delete mode 100644 include/linux/spi/mcp23s08.h +Merging pinctrl-intel/for-next (6d649fca3491 pinctrl: intel: Move npins closer to pin_base in struct intel_community) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (f354157a7d18 pinctrl: samsung: Save/restore eint_mask over suspend for EINT_TYPE GPIOs) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (f5641d053d46 pwm: Add missing "CONFIG_" prefix) +$ git merge pwm/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 1 + + MAINTAINERS | 1 + + drivers/pwm/Kconfig | 12 +- + drivers/pwm/Makefile | 1 + + drivers/pwm/core.c | 4 +- + drivers/pwm/pwm-img.c | 8 +- + drivers/pwm/pwm-imx27.c | 20 +- + drivers/pwm/pwm-iqs620a.c | 270 +++++++++++++++++++++ + drivers/pwm/pwm-jz4740.c | 55 +++-- + drivers/pwm/pwm-lpss.c | 15 +- + drivers/pwm/pwm-rockchip.c | 7 +- + drivers/pwm/pwm-sun4i.c | 9 + + drivers/pwm/pwm-tegra.c | 80 +++++- + 13 files changed, 438 insertions(+), 45 deletions(-) + create mode 100644 drivers/pwm/pwm-iqs620a.c +Merging userns/for-next (d35bec8a5788 Merge proc-next and exec-next for testing in linux-next) +$ git merge userns/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ktest/for-next (1091c8fce8aa ktest: Fix typos in ktest.pl) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (382561a0f11c selftests/sysctl: Make sysctl test driver as a module) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/exec/Makefile +Auto-merging Documentation/dev-tools/kselftest.rst +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kselftest.rst | 23 +++++++++ + lib/math/Kconfig | 7 ++- + lib/test_sysctl.c | 2 +- + tools/testing/selftests/Makefile | 9 +++- + tools/testing/selftests/exec/.gitignore | 1 + + tools/testing/selftests/exec/Makefile | 2 +- + tools/testing/selftests/exec/execveat.c | 8 ++++ + .../ftrace/test.d/ftrace/tracing-error-log.tc | 2 + + tools/testing/selftests/ftrace/test.d/functions | 8 ++-- + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 4 +- + tools/testing/selftests/gen_kselftest_tar.sh | 5 ++ + tools/testing/selftests/sysctl/config | 2 +- + tools/testing/selftests/sysctl/sysctl.sh | 13 +----- + tools/testing/selftests/timens/clock_nanosleep.c | 2 +- + tools/testing/selftests/timens/timens.c | 2 +- + tools/testing/selftests/timens/timens.h | 13 +++++- + tools/testing/selftests/timens/timer.c | 5 ++ + tools/testing/selftests/timens/timerfd.c | 5 ++ + tools/testing/selftests/tpm2/test_smoke.sh | 5 ++ + tools/testing/selftests/tpm2/test_space.sh | 5 ++ + tools/testing/selftests/vDSO/.gitignore | 2 + + tools/testing/selftests/vDSO/Makefile | 5 +- + tools/testing/selftests/vDSO/parse_vdso.c | 24 +--------- + tools/testing/selftests/vDSO/parse_vdso.h | 31 +++++++++++++ + .../selftests/vDSO/vdso_standalone_test_x86.c | 4 +- + tools/testing/selftests/vDSO/vdso_test_getcpu.c | 54 ++++++++++++++++++++++ + .../vDSO/{vdso_test.c => vdso_test_gettimeofday.c} | 10 ++-- + 27 files changed, 196 insertions(+), 57 deletions(-) + create mode 100644 tools/testing/selftests/vDSO/parse_vdso.h + create mode 100644 tools/testing/selftests/vDSO/vdso_test_getcpu.c + rename tools/testing/selftests/vDSO/{vdso_test.c => vdso_test_gettimeofday.c} (84%) +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (8631420cac7d Merge branch 'for-5.8/klp-module-fixups' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (c9d7e3da1f3c fpga: dfl: afu: Corrected error handling levels) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (4601e24a6fb8 rtc: pcf2127: watchdog: handle nowayout feature) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 1 + + drivers/rtc/rtc-88pm860x.c | 6 -- + drivers/rtc/rtc-abx80x.c | 66 +++++++++++++-- + drivers/rtc/rtc-fsl-ftm-alarm.c | 10 ++- + drivers/rtc/rtc-goldfish.c | 2 +- + drivers/rtc/rtc-jz4740.c | 173 +++++++++++++++++++--------------------- + drivers/rtc/rtc-lpc24xx.c | 4 +- + drivers/rtc/rtc-max77686.c | 22 +++-- + drivers/rtc/rtc-mc13xxx.c | 4 +- + drivers/rtc/rtc-mpc5121.c | 2 +- + drivers/rtc/rtc-mt2712.c | 16 +--- + drivers/rtc/rtc-pcf2127.c | 31 ++++--- + drivers/rtc/rtc-rc5t619.c | 4 +- + drivers/rtc/rtc-rv3028.c | 2 + + drivers/rtc/rtc-snvs.c | 59 +++++++++++++- + drivers/rtc/rtc-stmp3xxx.c | 2 +- + include/uapi/linux/rtc.h | 1 + + 17 files changed, 256 insertions(+), 149 deletions(-) +Merging nvdimm/libnvdimm-for-next (f6d2b802f80d Merge branch 'for-5.7/libnvdimm' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (8f3d9f354286 Linux 5.7-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (2130c0ba69d6 NTB: ntb_test: Fix bug when counting remote files) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/ntb/core.c | 9 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 - + drivers/ntb/hw/idt/ntb_hw_idt.c | 6 - + drivers/ntb/hw/intel/Makefile | 2 +- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 49 +-- + drivers/ntb/hw/intel/ntb_hw_gen1.h | 1 + + drivers/ntb/hw/intel/ntb_hw_gen3.c | 13 +- + drivers/ntb/hw/intel/ntb_hw_gen3.h | 8 + + drivers/ntb/hw/intel/ntb_hw_gen4.c | 552 ++++++++++++++++++++++++++++++++ + drivers/ntb/hw/intel/ntb_hw_gen4.h | 100 ++++++ + drivers/ntb/hw/intel/ntb_hw_intel.h | 12 + + drivers/ntb/test/ntb_perf.c | 49 +-- + drivers/ntb/test/ntb_pingpong.c | 14 +- + drivers/ntb/test/ntb_tool.c | 9 +- + include/linux/ntb.h | 6 +- + tools/testing/selftests/ntb/ntb_test.sh | 2 +- + 16 files changed, 751 insertions(+), 85 deletions(-) + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen4.c + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen4.h +Merging kspp/for-next/kspp (c7527373fe28 gcc-common.h: Update for GCC 10) +$ git merge kspp/for-next/kspp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (9b5816b56af6 gnss: replace zero-length array with flexible-array) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Auto-merging drivers/fsi/Kconfig +CONFLICT (content): Merge conflict in drivers/fsi/Kconfig +Resolved 'drivers/fsi/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 61e4cb8df676] Merge remote-tracking branch 'fsi/next' +$ git diff -M --stat --summary HEAD^.. +Merging slimbus/for-next (f9a478d658a2 slimbus: core: Fix mismatch in of_node_get/put) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (be00147a195b MAINTAINERS: Add git tree for NVMEM FRAMEWORK) +$ git merge nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/nvmem/sprd-efuse.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked) +$ git merge xarray/xarray +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 13 +++++++------ + drivers/infiniband/core/device.c | 6 +----- + include/linux/xarray.h | 23 +++++++++++++++++++++- + lib/idr.c | 1 + + lib/test_xarray.c | 20 +++++++++++++++++++ + lib/xarray.c | 39 +++++++++++++++++++++++++++++++------ + tools/testing/radix-tree/idr-test.c | 29 +++++++++++++++++++++++++++ + 7 files changed, 113 insertions(+), 18 deletions(-) +Merging hyperv/hyperv-next (afaa33da08ab Drivers: hv: vmbus: Resolve more races involving init_vp_index()) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (3f03b6498172 auxdisplay: charlcd: Reuse hex_to_bin() instead of custom code) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + drivers/auxdisplay/charlcd.c | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) +Merging kgdb/kgdb/for-next (c893de12e1ef kdb: Remove the misfeature 'KDBFLAGS') +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (2b40c5db73e2 selftests/pidfd: add pidfd setns tests) +$ git merge pidfd/for-next +Already up to date. +Merging devfreq/devfreq-next (8fc0e48e0fae PM / devfreq: Use lockdep asserts instead of manual checks for locked mutex) +$ git merge devfreq/devfreq-next +Already up to date. +Merging hmm/hmm (f07e2f6be37a MAINTAINERS: add HMM selftests) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (2d80c057efda fpga: dfl: afu: convert get_user_pages() --> pin_user_pages()) +$ git merge fpga/for-next +Auto-merging drivers/fpga/dfl-afu-dma-region.c +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-afu-dma-region.c | 19 +++++-------------- + 1 file changed, 5 insertions(+), 14 deletions(-) +Merging kunit/test (0e698dfa2822 Linux 5.7-rc4) +$ git merge kunit/test +Already up to date. +Merging cel/cel-next (0a8e7b7d0846 SUNRPC: Revert 241b1f419f0e ("SUNRPC: Remove xdr_buf_trim()")) +$ git merge cel/cel-next +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (11399346ac39 mtd: Replace zero-length array with flexible-array) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (6d6861d45e38 security: apparmor: default KUNIT_* fragments to KUNIT_ALL_TESTS) +$ git merge kunit-next/kunit +Auto-merging lib/Kconfig.debug +Auto-merging fs/ext4/Kconfig +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/start.rst | 13 +- + Documentation/dev-tools/kunit/usage.rst | 4 +- + drivers/base/Kconfig | 3 +- + drivers/base/test/Kconfig | 3 +- + fs/ext4/Kconfig | 3 +- + include/kunit/test.h | 12 +- + lib/Kconfig.debug | 6 +- + lib/kunit/Kconfig | 23 ++- + security/apparmor/Kconfig | 3 +- + tools/testing/kunit/kunit.py | 307 +++++++++++++++++++++++++------- + tools/testing/kunit/kunit_tool_test.py | 63 ++++++- + 11 files changed, 351 insertions(+), 89 deletions(-) +Merging trivial/for-next (c1a371cf80fb printk: fix global comment) +$ git merge trivial/for-next +Auto-merging lib/bitmap.c +Auto-merging kernel/printk/printk_safe.c +Merge made by the 'recursive' strategy. + fs/vboxsf/dir.c | 2 +- + kernel/printk/printk_safe.c | 2 +- + lib/bitmap.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (3781a7a11294 bus: mhi: core: Handle syserr during power_up) +$ git merge mhi/mhi-next +Auto-merging include/linux/mhi.h +Auto-merging drivers/bus/mhi/core/pm.c +CONFLICT (content): Merge conflict in drivers/bus/mhi/core/pm.c +Auto-merging drivers/bus/mhi/core/main.c +Auto-merging drivers/bus/mhi/core/init.c +Resolved 'drivers/bus/mhi/core/pm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 98231af6c9d1] Merge remote-tracking branch 'mhi/mhi-next' +$ git diff -M --stat --summary HEAD^.. +Merging notifications/notifications-pipe-core (87a10a4bdb88 watch_queue: sample: Display superblock notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/keys/keyctl.c +Auto-merging security/keys/internal.h +Auto-merging security/keys/Kconfig +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/pipe_fs_i.h +CONFLICT (content): Merge conflict in include/linux/pipe_fs_i.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/super.c +Auto-merging fs/splice.c +Auto-merging fs/pipe.c +Auto-merging fs/namespace.c +Auto-merging fs/mount.h +CONFLICT (content): Merge conflict in fs/mount.h +Auto-merging fs/internal.h +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/security/keys/core.rst +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'fs/mount.h' using previous resolution. +Resolved 'include/linux/pipe_fs_i.h' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Resolved 'samples/Kconfig' using previous resolution. +Resolved 'samples/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f8a25c66a39c] Merge remote-tracking branch 'notifications/notifications-pipe-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 57 ++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 361 +++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 2 + + arch/arm/tools/syscall.tbl | 2 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 4 + + arch/ia64/kernel/syscalls/syscall.tbl | 2 + + arch/m68k/kernel/syscalls/syscall.tbl | 2 + + arch/microblaze/kernel/syscalls/syscall.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 2 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 2 + + arch/parisc/kernel/syscalls/syscall.tbl | 2 + + arch/powerpc/kernel/syscalls/syscall.tbl | 2 + + arch/s390/kernel/syscalls/syscall.tbl | 2 + + arch/sh/kernel/syscalls/syscall.tbl | 2 + + arch/sparc/kernel/syscalls/syscall.tbl | 2 + + arch/x86/entry/syscalls/syscall_32.tbl | 2 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/xtensa/kernel/syscalls/syscall.tbl | 2 + + fs/Kconfig | 21 + + fs/Makefile | 1 + + fs/internal.h | 1 + + fs/mount.h | 21 + + fs/mount_notify.c | 228 +++++++ + fs/namespace.c | 22 + + fs/pipe.c | 242 +++++--- + fs/splice.c | 12 +- + fs/super.c | 205 +++++++ + include/linux/dcache.h | 1 + + include/linux/fs.h | 62 ++ + include/linux/key.h | 33 +- + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hook_defs.h | 15 + + include/linux/lsm_hooks.h | 26 + + include/linux/pipe_fs_i.h | 27 +- + include/linux/security.h | 46 +- + include/linux/syscalls.h | 4 + + include/linux/watch_queue.h | 127 ++++ + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/keyctl.h | 2 + + include/uapi/linux/watch_queue.h | 167 ++++++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/sys_ni.c | 6 + + kernel/watch_queue.c | 659 +++++++++++++++++++++ + samples/Kconfig | 7 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 267 +++++++++ + security/keys/Kconfig | 9 + + security/keys/compat.c | 3 + + security/keys/gc.c | 5 + + security/keys/internal.h | 38 +- + security/keys/key.c | 38 +- + security/keys/keyctl.c | 115 +++- + security/keys/keyring.c | 20 +- + security/keys/permission.c | 31 +- + security/keys/process_keys.c | 46 +- + security/keys/request_key.c | 4 +- + security/security.c | 36 +- + security/selinux/hooks.c | 51 +- + security/smack/smack_lsm.c | 112 +++- + 64 files changed, 3014 insertions(+), 181 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 fs/mount_notify.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 kernel/watch_queue.c + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +$ git am -3 ../patches/0001-pipe-update-for-pipe_buf_operations-changes.patch +Applying: pipe: update for pipe_buf_operations changes +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/watch_queue.c +$ git add -A . +$ git commit -v -a --amend +[master 1c3e32a58659] Merge remote-tracking branch 'notifications/notifications-pipe-core' + Date: Mon Jun 8 12:14:17 2020 +1000 +Merging fsinfo/fsinfo-core (93737ccf05ec fsinfo: Add an attribute that lists all the visible mounts in a namespace) +$ git merge fsinfo/fsinfo-core +Auto-merging samples/vfs/Makefile +CONFLICT (content): Merge conflict in samples/vfs/Makefile +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +Auto-merging fs/namespace.c +Auto-merging fs/mount.h +Auto-merging fs/internal.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/afs/super.c +Auto-merging fs/afs/internal.h +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'samples/vfs/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ed0b3c05c0de] Merge remote-tracking branch 'fsinfo/fsinfo-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/fsinfo.rst | 574 +++++++++++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + 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/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 7 + + fs/Makefile | 1 + + fs/afs/internal.h | 1 + + fs/afs/super.c | 216 ++++++- + fs/d_path.c | 2 +- + fs/ext4/Makefile | 1 + + fs/ext4/ext4.h | 6 + + fs/ext4/fsinfo.c | 97 ++++ + fs/ext4/super.c | 3 + + fs/fsinfo.c | 737 ++++++++++++++++++++++++ + fs/internal.h | 15 + + fs/mount.h | 3 + + fs/mount_notify.c | 2 + + fs/namespace.c | 438 +++++++++++++- + include/linux/fs.h | 4 + + include/linux/fsinfo.h | 112 ++++ + include/linux/syscalls.h | 4 + + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/fsinfo.h | 335 +++++++++++ + include/uapi/linux/mount.h | 10 +- + kernel/sys_ni.c | 1 + + samples/vfs/Makefile | 2 +- + samples/vfs/test-fsinfo.c | 854 ++++++++++++++++++++++++++++ + samples/vfs/test-mntinfo.c | 279 +++++++++ + 42 files changed, 3716 insertions(+), 8 deletions(-) + create mode 100644 Documentation/filesystems/fsinfo.rst + create mode 100644 fs/ext4/fsinfo.c + create mode 100644 fs/fsinfo.c + create mode 100644 include/linux/fsinfo.h + create mode 100644 include/uapi/linux/fsinfo.h + create mode 100644 samples/vfs/test-fsinfo.c + create mode 100644 samples/vfs/test-mntinfo.c +$ git am -3 ../patches/0001-extra-syscall-updates.patch +Applying: extra syscall updates +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/include/asm/unistd.h +M arch/arm64/include/asm/unistd32.h +M include/uapi/asm-generic/unistd.h +$ git add -A . +$ git commit -v -a --amend +[master f147419d9899] Merge remote-tracking branch 'fsinfo/fsinfo-core' + Date: Mon Jun 8 12:26:39 2020 +1000 +Merging akpm-current/current (d3a8688496cd linux-next-pre) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/checkpatch.pl +Auto-merging mm/page_alloc.c +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/sched.h +Auto-merging include/linux/fs.h +Auto-merging fs/exec.c +Auto-merging fs/aio.c +Auto-merging drivers/tty/serial/sh-sci.c +Merge made by the 'recursive' strategy. + Documentation/lzo.txt | 8 +- + drivers/tty/serial/sh-sci.c | 2 +- + fs/aio.c | 9 +-- + fs/buffer.c | 56 +++++++++++++- + fs/exec.c | 27 +++++-- + fs/namei.c | 5 ++ + fs/ocfs2/namei.c | 17 +++- + fs/open.c | 6 -- + fs/proc/page.c | 40 +++++----- + fs/ramfs/inode.c | 12 +++ + include/linux/bitops.h | 13 +--- + include/linux/fs.h | 3 +- + include/linux/fsnotify.h | 4 +- + include/linux/ipc_namespace.h | 12 +-- + include/linux/memremap.h | 6 ++ + include/linux/mmzone.h | 14 +++- + include/linux/nmi.h | 1 + + include/linux/sched.h | 8 ++ + include/linux/vm_event_item.h | 4 + + include/linux/wait.h | 4 +- + ipc/ipc_sysctl.c | 14 ++-- + ipc/msg.c | 3 +- + ipc/namespace.c | 37 ++++++--- + ipc/sem.c | 1 - + ipc/shm.c | 60 ++++++--------- + ipc/util.c | 175 ++++++++++++++++++++---------------------- + ipc/util.h | 4 +- + kernel/hung_task.c | 44 +++++++++++ + kernel/sysctl.c | 3 +- + kernel/watchdog.c | 22 ++++++ + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 16 ++-- + lib/cpumask.c | 102 +++++++++++++++++++++--- + lib/lzo/lzo1x_compress.c | 13 ++++ + lib/test_bitops.c | 42 +++++++++- + mm/memremap.c | 20 +++++ + mm/migrate.c | 23 ++++++ + mm/mmap.c | 45 +++++++---- + mm/page_alloc.c | 12 +++ + mm/vmstat.c | 4 + + scripts/checkpatch.pl | 12 +-- + 41 files changed, 644 insertions(+), 260 deletions(-) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/241)
Rebasing (2/241)
Rebasing (3/241)
Rebasing (4/241)
Rebasing (5/241)
Rebasing (6/241)
Rebasing (7/241)
Rebasing (8/241)
Rebasing (9/241)
Rebasing (10/241)
Rebasing (11/241)
Rebasing (12/241)
Rebasing (13/241)
Rebasing (14/241)
Rebasing (15/241)
Rebasing (16/241)
Rebasing (17/241)
Rebasing (18/241)
Rebasing (19/241)
Rebasing (20/241)
Rebasing (21/241)
Rebasing (22/241)
Rebasing (23/241)
Rebasing (24/241)
Rebasing (25/241)
Rebasing (26/241)
Rebasing (27/241)
Rebasing (28/241)
Rebasing (29/241)
Rebasing (30/241)
Rebasing (31/241)
Rebasing (32/241)
Rebasing (33/241)
Rebasing (34/241)
Rebasing (35/241)
Rebasing (36/241)
Rebasing (37/241)
Rebasing (38/241)
Rebasing (39/241)
Rebasing (40/241)
Rebasing (41/241)
Rebasing (42/241)
Rebasing (43/241)
Rebasing (44/241)
Rebasing (45/241)
Rebasing (46/241)
Rebasing (47/241)
Rebasing (48/241)
Rebasing (49/241)
Rebasing (50/241)
Rebasing (51/241)
Rebasing (52/241)
Rebasing (53/241)
Rebasing (54/241)
Rebasing (55/241)
Rebasing (56/241)
Rebasing (57/241)
+error: could not apply 75e26a4e4b6f... sh: add loglvl to printk_address() +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 75e26a4e4b6f... sh: add loglvl to printk_address() +Auto-merging arch/sh/mm/fault.c +CONFLICT (content): Merge conflict in arch/sh/mm/fault.c +Rebasing (58/241)
Rebasing (59/241)
Rebasing (60/241)
Rebasing (61/241)
Rebasing (62/241)
Rebasing (63/241)
Rebasing (64/241)
Rebasing (65/241)
Rebasing (66/241)
Rebasing (67/241)
Rebasing (68/241)
Rebasing (69/241)
Rebasing (70/241)
Rebasing (71/241)
Rebasing (72/241)
Rebasing (73/241)
Rebasing (74/241)
Rebasing (75/241)
Rebasing (76/241)
Rebasing (77/241)
Rebasing (78/241)
Rebasing (79/241)
Rebasing (80/241)
Rebasing (81/241)
Rebasing (82/241)
Rebasing (83/241)
Rebasing (84/241)
Rebasing (85/241)
Rebasing (86/241)
Rebasing (87/241)
Rebasing (88/241)
Rebasing (89/241)
+error: could not apply ec561d5e2dfd... mm/util.c: annotate an data race at vm_committed_as +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply ec561d5e2dfd... mm/util.c: annotate an data race at vm_committed_as +Auto-merging mm/util.c +CONFLICT (content): Merge conflict in mm/util.c +Rebasing (90/241)
Rebasing (91/241)
Rebasing (92/241)
Rebasing (93/241)
Rebasing (94/241)
Rebasing (95/241)
Rebasing (96/241)
Rebasing (97/241)
Rebasing (98/241)
Rebasing (99/241)
Rebasing (100/241)
Rebasing (101/241)
dropping 97ec4b1a3a4abf406bc06c2b595bca599d290504 h8300: remove usage of __ARCH_USE_5LEVEL_HACK -- patch contents already upstream +Rebasing (102/241)
error: could not apply 81125740bc7e... arm: add support for folded p4d page tables +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 81125740bc7e... arm: add support for folded p4d page tables +Auto-merging arch/arm/mm/init.c +CONFLICT (content): Merge conflict in arch/arm/mm/init.c +Rebasing (103/241)
dropping e87d76cf51e1f00a8e258589060b9015ec93393d arm-add-support-for-folded-p4d-page-tables-fix -- patch contents already upstream +Rebasing (104/241)
error: could not apply 78f5aa8e0ac2... arm64: add support for folded p4d page tables +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 78f5aa8e0ac2... arm64: add support for folded p4d page tables +Auto-merging arch/arm64/kvm/mmu.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/mmu.c +Rebasing (105/241)
dropping 47f5a844c89562a7c4c65c6142a128dedf84735c arm64: kvm: fix gcc-10 shift warning -- patch contents already upstream +Rebasing (106/241)
dropping 1468951aa6ca4834b68a986e53e9c3b1c95feaac hexagon: remove __ARCH_USE_5LEVEL_HACK -- patch contents already upstream +Rebasing (107/241)
dropping 7767fd03e792714a10834a9be6da40f48cdf4bdd ia64: add support for folded p4d page tables -- patch contents already upstream +Rebasing (108/241)
dropping f4ff3fd3cd65bcda476f052e3c2881c7bf2abc22 nios2: add support for folded p4d page tables -- patch contents already upstream +Rebasing (109/241)
dropping 1cc815fde7d5ab3b4d533fce8b12dc9e636e94ca openrisc: add support for folded p4d page tables -- patch contents already upstream +Rebasing (110/241)
error: could not apply c8e3823b14c2... powerpc: add support for folded p4d page tables +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply c8e3823b14c2... powerpc: add support for folded p4d page tables +Auto-merging arch/powerpc/xmon/xmon.c +CONFLICT (content): Merge conflict in arch/powerpc/xmon/xmon.c +Auto-merging arch/powerpc/mm/ptdump/ptdump.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/ptdump/ptdump.c +Auto-merging arch/powerpc/include/asm/nohash/32/pgtable.h +Rebasing (111/241)
dropping 97239d9bbe9e55175a5a6bd7afae5dbf4f5447de fixup for powerpc ptdump.c -- patch contents already upstream +Rebasing (112/241)
dropping 5319f65de9e4db65559a8f188cd60bff06f0e601 powerpc/xmon: drop unused pgdir varialble in show_pte() function -- patch contents already upstream +Rebasing (113/241)
dropping 0bf77d759b73b7319e81d4c578b26d390041369e sh: fault: Modernize printing of kernel messages -- patch contents already upstream +Rebasing (114/241)
dropping 27d4bfa01b33fcc3946ccd44a951f4cb2ae42c16 sh: drop __pXd_offset() macros that duplicate pXd_index() ones -- patch contents already upstream +Rebasing (115/241)
dropping 277c3d7a2da3574fa5582b24251676ba14a2104b sh: add support for folded p4d page tables -- patch contents already upstream +Rebasing (116/241)
dropping f8e871025f83eff062faebdc1eb2542b3a395ef3 unicore32: remove __ARCH_USE_5LEVEL_HACK -- patch contents already upstream +Rebasing (117/241)
dropping 7c96cf58837b78af3bd96c209cdce05cc3aa3739 asm-generic: remove pgtable-nop4d-hack.h -- patch contents already upstream +Rebasing (118/241)
dropping e9a866156497d55cc0bb0b4227672855ca90a538 mm: remove __ARCH_HAS_5LEVEL_HACK and include/asm-generic/5level-fixup.h -- patch contents already upstream +Rebasing (119/241)
Rebasing (120/241)
Rebasing (121/241)
Rebasing (122/241)
Rebasing (123/241)
Rebasing (124/241)
Rebasing (125/241)
Rebasing (126/241)
Rebasing (127/241)
Rebasing (128/241)
Rebasing (129/241)
Rebasing (130/241)
Rebasing (131/241)
Rebasing (132/241)
Rebasing (133/241)
Rebasing (134/241)
Rebasing (135/241)
Rebasing (136/241)
Rebasing (137/241)
Rebasing (138/241)
Rebasing (139/241)
Rebasing (140/241)
Rebasing (141/241)
Rebasing (142/241)
Rebasing (143/241)
Rebasing (144/241)
Rebasing (145/241)
Rebasing (146/241)
Rebasing (147/241)
Rebasing (148/241)
Rebasing (149/241)
Rebasing (150/241)
Rebasing (151/241)
Rebasing (152/241)
Rebasing (153/241)
Rebasing (154/241)
Rebasing (155/241)
Rebasing (156/241)
Rebasing (157/241)
Rebasing (158/241)
Rebasing (159/241)
Rebasing (160/241)
Rebasing (161/241)
Rebasing (162/241)
Rebasing (163/241)
Rebasing (164/241)
Rebasing (165/241)
Rebasing (166/241)
Rebasing (167/241)
Rebasing (168/241)
Rebasing (169/241)
Rebasing (170/241)
Rebasing (171/241)
Rebasing (172/241)
Rebasing (173/241)
Rebasing (174/241)
Rebasing (175/241)
Rebasing (176/241)
Rebasing (177/241)
Rebasing (178/241)
Rebasing (179/241)
Rebasing (180/241)
Rebasing (181/241)
Rebasing (182/241)
Rebasing (183/241)
Rebasing (184/241)
Rebasing (185/241)
Rebasing (186/241)
Rebasing (187/241)
Rebasing (188/241)
Rebasing (189/241)
Rebasing (190/241)
Rebasing (191/241)
Rebasing (192/241)
Rebasing (193/241)
Rebasing (194/241)
Rebasing (195/241)
Rebasing (196/241)
Rebasing (197/241)
Rebasing (198/241)
Rebasing (199/241)
Rebasing (200/241)
Rebasing (201/241)
Rebasing (202/241)
Rebasing (203/241)
Rebasing (204/241)
Rebasing (205/241)
Rebasing (206/241)
Rebasing (207/241)
Rebasing (208/241)
Rebasing (209/241)
Rebasing (210/241)
Rebasing (211/241)
Rebasing (212/241)
Rebasing (213/241)
Rebasing (214/241)
Rebasing (215/241)
Rebasing (216/241)
Rebasing (217/241)
Rebasing (218/241)
Rebasing (219/241)
Rebasing (220/241)
Rebasing (221/241)
Rebasing (222/241)
Rebasing (223/241)
Rebasing (224/241)
Rebasing (225/241)
Rebasing (226/241)
Rebasing (227/241)
Rebasing (228/241)
Rebasing (229/241)
Rebasing (230/241)
Rebasing (231/241)
Rebasing (232/241)
Rebasing (233/241)
Rebasing (234/241)
Rebasing (235/241)
Rebasing (236/241)
Rebasing (237/241)
Rebasing (238/241)
Rebasing (239/241)
Rebasing (240/241)
Rebasing (241/241)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 3d88da36f0a3...1b37e2b4b943 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (1b37e2b4b943 sh: add missing EXPORT_SYMBOL() for __delay) +$ git merge --no-ff akpm/master +Removing mm/mmu_context.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 17 +- + Documentation/admin-guide/dynamic-debug-howto.rst | 5 + + Documentation/admin-guide/kdump/kdump.rst | 8 + + Documentation/admin-guide/kernel-parameters.txt | 34 ++- + .../admin-guide/mm/numa_memory_policy.rst | 10 +- + Documentation/admin-guide/mm/userfaultfd.rst | 2 +- + Documentation/admin-guide/sysctl/kernel.rst | 37 +++ + Documentation/core-api/pin_user_pages.rst | 53 ++-- + Documentation/filesystems/locking.rst | 2 +- + Documentation/vm/hmm.rst | 6 +- + Documentation/vm/transhuge.rst | 4 +- + arch/alpha/boot/bootp.c | 1 - + arch/alpha/boot/bootpz.c | 1 - + arch/alpha/boot/main.c | 1 - + arch/alpha/include/asm/cacheflush.h | 32 +-- + arch/alpha/include/asm/io.h | 1 - + arch/alpha/include/asm/pgtable.h | 16 +- + arch/alpha/kernel/process.c | 1 - + arch/alpha/kernel/proto.h | 2 - + arch/alpha/kernel/ptrace.c | 1 - + arch/alpha/kernel/setup.c | 1 - + arch/alpha/kernel/smp.c | 3 +- + arch/alpha/kernel/sys_alcor.c | 1 - + arch/alpha/kernel/sys_cabriolet.c | 1 - + arch/alpha/kernel/sys_dp264.c | 1 - + arch/alpha/kernel/sys_eb64p.c | 1 - + arch/alpha/kernel/sys_eiger.c | 1 - + arch/alpha/kernel/sys_jensen.c | 1 - + arch/alpha/kernel/sys_marvel.c | 1 - + arch/alpha/kernel/sys_miata.c | 1 - + arch/alpha/kernel/sys_mikasa.c | 1 - + arch/alpha/kernel/sys_nautilus.c | 1 - + arch/alpha/kernel/sys_noritake.c | 1 - + arch/alpha/kernel/sys_rawhide.c | 1 - + arch/alpha/kernel/sys_ruffian.c | 1 - + arch/alpha/kernel/sys_rx164.c | 1 - + arch/alpha/kernel/sys_sable.c | 1 - + arch/alpha/kernel/sys_sio.c | 1 - + arch/alpha/kernel/sys_sx164.c | 1 - + arch/alpha/kernel/sys_takara.c | 1 - + arch/alpha/kernel/sys_titan.c | 1 - + arch/alpha/kernel/sys_wildfire.c | 1 - + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/alpha/kernel/traps.c | 26 +- + arch/alpha/mm/fault.c | 12 +- + arch/alpha/mm/init.c | 1 - + arch/arc/include/asm/bug.h | 3 +- + arch/arc/include/asm/pgtable.h | 24 -- + arch/arc/kernel/process.c | 4 +- + arch/arc/kernel/stacktrace.c | 17 +- + arch/arc/kernel/troubleshoot.c | 6 +- + arch/arc/mm/fault.c | 6 +- + arch/arc/mm/highmem.c | 12 +- + arch/arc/mm/tlbex.S | 2 +- + arch/arm/include/asm/bug.h | 3 +- + arch/arm/include/asm/cacheflush.h | 7 +- + arch/arm/include/asm/efi.h | 1 - + arch/arm/include/asm/fixmap.h | 2 +- + arch/arm/include/asm/idmap.h | 2 +- + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 7 - + arch/arm/include/asm/pgtable-nommu.h | 3 - + arch/arm/include/asm/pgtable.h | 25 -- + arch/arm/include/asm/traps.h | 3 +- + arch/arm/include/asm/unwind.h | 3 +- + arch/arm/kernel/fiq.c | 4 +- + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/machine_kexec.c | 1 - + arch/arm/kernel/module.c | 1 - + arch/arm/kernel/process.c | 4 +- + arch/arm/kernel/ptrace.c | 1 - + arch/arm/kernel/smp.c | 1 - + arch/arm/kernel/suspend.c | 2 +- + arch/arm/kernel/swp_emulate.c | 4 +- + arch/arm/kernel/traps.c | 41 +-- + arch/arm/kernel/unwind.c | 5 +- + arch/arm/kernel/vdso.c | 2 +- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/arm/lib/backtrace-clang.S | 9 +- + arch/arm/lib/backtrace.S | 14 +- + arch/arm/lib/uaccess_with_memcpy.c | 16 +- + arch/arm/mach-ebsa110/core.c | 1 - + arch/arm/mach-footbridge/common.c | 1 - + arch/arm/mach-imx/mm-imx21.c | 1 - + arch/arm/mach-imx/mm-imx27.c | 1 - + arch/arm/mach-imx/mm-imx3.c | 1 - + arch/arm/mach-integrator/core.c | 2 +- + arch/arm/mach-iop32x/i2c.c | 1 - + arch/arm/mach-iop32x/iq31244.c | 1 - + arch/arm/mach-iop32x/iq80321.c | 1 - + arch/arm/mach-iop32x/n2100.c | 1 - + arch/arm/mach-ixp4xx/common.c | 1 - + arch/arm/mach-keystone/platsmp.c | 2 +- + arch/arm/mach-sa1100/assabet.c | 3 +- + arch/arm/mach-sa1100/hackkit.c | 2 +- + arch/arm/mach-tegra/iomap.h | 2 +- + arch/arm/mach-zynq/common.c | 2 +- + arch/arm/mm/copypage-v4mc.c | 1 - + arch/arm/mm/copypage-v6.c | 1 - + arch/arm/mm/copypage-xscale.c | 1 - + arch/arm/mm/dump.c | 1 - + arch/arm/mm/fault-armv.c | 1 - + arch/arm/mm/fault.c | 9 +- + arch/arm/mm/highmem.c | 4 +- + arch/arm/mm/idmap.c | 2 +- + arch/arm/mm/ioremap.c | 31 +-- + arch/arm/mm/mm.h | 8 +- + arch/arm/mm/mmu.c | 7 +- + arch/arm/mm/pageattr.c | 1 - + arch/arm/mm/proc-arm1020.S | 2 +- + arch/arm/mm/proc-arm1020e.S | 2 +- + arch/arm/mm/proc-arm1022.S | 2 +- + arch/arm/mm/proc-arm1026.S | 2 +- + arch/arm/mm/proc-arm720.S | 2 +- + arch/arm/mm/proc-arm740.S | 2 +- + arch/arm/mm/proc-arm7tdmi.S | 2 +- + arch/arm/mm/proc-arm920.S | 2 +- + arch/arm/mm/proc-arm922.S | 2 +- + arch/arm/mm/proc-arm925.S | 2 +- + arch/arm/mm/proc-arm926.S | 2 +- + arch/arm/mm/proc-arm940.S | 2 +- + arch/arm/mm/proc-arm946.S | 2 +- + arch/arm/mm/proc-arm9tdmi.S | 2 +- + arch/arm/mm/proc-fa526.S | 2 +- + arch/arm/mm/proc-feroceon.S | 2 +- + arch/arm/mm/proc-mohawk.S | 2 +- + arch/arm/mm/proc-sa110.S | 2 +- + arch/arm/mm/proc-sa1100.S | 2 +- + arch/arm/mm/proc-v6.S | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/mm/proc-xsc3.S | 2 +- + arch/arm/mm/proc-xscale.S | 2 +- + arch/arm/mm/pv-fixup-asm.S | 2 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/cacheflush.h | 46 +--- + arch/arm64/include/asm/io.h | 2 +- + arch/arm64/include/asm/kernel-pgtable.h | 2 +- + arch/arm64/include/asm/kvm_mmu.h | 2 +- + arch/arm64/include/asm/mmu_context.h | 2 +- + arch/arm64/include/asm/pgtable.h | 40 ++- + arch/arm64/include/asm/stacktrace.h | 3 +- + arch/arm64/include/asm/stage2_pgtable.h | 2 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/include/asm/vmap_stack.h | 2 +- + arch/arm64/kernel/acpi.c | 2 +- + arch/arm64/kernel/head.S | 2 +- + arch/arm64/kernel/hibernate.c | 5 +- + arch/arm64/kernel/kaslr.c | 2 +- + arch/arm64/kernel/process.c | 2 +- + arch/arm64/kernel/ptrace.c | 1 - + arch/arm64/kernel/smp.c | 1 - + arch/arm64/kernel/suspend.c | 2 +- + arch/arm64/kernel/traps.c | 21 +- + arch/arm64/kernel/vdso.c | 8 +- + arch/arm64/kernel/vmlinux.lds.S | 1 - + arch/arm64/kvm/mmu.c | 14 +- + arch/arm64/mm/dump.c | 1 - + arch/arm64/mm/fault.c | 9 +- + arch/arm64/mm/kasan_init.c | 3 +- + arch/arm64/mm/mmu.c | 8 +- + arch/arm64/mm/pageattr.c | 1 - + arch/arm64/mm/proc.S | 2 +- + arch/c6x/include/asm/cacheflush.h | 19 +- + arch/c6x/include/asm/pgtable.h | 3 - + arch/c6x/kernel/traps.c | 16 +- + arch/csky/include/asm/io.h | 2 +- + arch/csky/include/asm/pgtable.h | 33 --- + arch/csky/kernel/module.c | 1 - + arch/csky/kernel/ptrace.c | 5 +- + arch/csky/kernel/stacktrace.c | 6 +- + arch/csky/kernel/vdso.c | 4 +- + arch/csky/mm/fault.c | 10 +- + arch/csky/mm/highmem.c | 2 +- + arch/csky/mm/init.c | 7 +- + arch/csky/mm/tlb.c | 1 - + arch/h8300/include/asm/pgtable.h | 1 - + arch/h8300/kernel/process.c | 1 - + arch/h8300/kernel/setup.c | 1 - + arch/h8300/kernel/signal.c | 1 - + arch/h8300/kernel/traps.c | 12 +- + arch/h8300/mm/fault.c | 1 - + arch/h8300/mm/init.c | 1 - + arch/h8300/mm/memory.c | 1 - + arch/hexagon/include/asm/cacheflush.h | 19 +- + arch/hexagon/include/asm/fixmap.h | 4 - + arch/hexagon/include/asm/pgtable.h | 55 +--- + arch/hexagon/kernel/traps.c | 25 +- + arch/hexagon/kernel/vdso.c | 4 +- + arch/hexagon/mm/uaccess.c | 2 +- + arch/hexagon/mm/vm_fault.c | 9 +- + arch/ia64/include/asm/cacheflush.h | 30 +-- + arch/ia64/include/asm/pgtable.h | 34 +-- + arch/ia64/include/asm/ptrace.h | 1 - + arch/ia64/include/asm/uaccess.h | 2 +- + arch/ia64/kernel/efi.c | 1 - + arch/ia64/kernel/entry.S | 2 +- + arch/ia64/kernel/head.S | 3 +- + arch/ia64/kernel/irq_ia64.c | 2 +- + arch/ia64/kernel/ivt.S | 2 +- + arch/ia64/kernel/kprobes.c | 2 +- + arch/ia64/kernel/mca.c | 2 +- + arch/ia64/kernel/mca_asm.S | 2 +- + arch/ia64/kernel/perfmon.c | 8 +- + arch/ia64/kernel/process.c | 17 +- + arch/ia64/kernel/ptrace.c | 1 - + arch/ia64/kernel/relocate_kernel.S | 4 +- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/kernel/smp.c | 1 - + arch/ia64/kernel/smpboot.c | 1 - + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/ia64/kernel/uncached.c | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 2 +- + arch/ia64/mm/contig.c | 1 - + arch/ia64/mm/fault.c | 17 +- + arch/ia64/mm/init.c | 12 +- + arch/m68k/68000/m68EZ328.c | 2 +- + arch/m68k/68000/m68VZ328.c | 2 +- + arch/m68k/68000/timers.c | 1 - + arch/m68k/amiga/config.c | 1 - + arch/m68k/apollo/config.c | 1 - + arch/m68k/atari/atasound.c | 1 - + arch/m68k/atari/stram.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/include/asm/cacheflush_mm.h | 6 +- + arch/m68k/include/asm/cacheflush_no.h | 19 +- + arch/m68k/include/asm/mcf_pgtable.h | 63 +---- + arch/m68k/include/asm/motorola_pgalloc.h | 8 +- + arch/m68k/include/asm/motorola_pgtable.h | 84 +------ + arch/m68k/include/asm/pgtable_mm.h | 1 - + arch/m68k/include/asm/pgtable_no.h | 2 - + arch/m68k/include/asm/sun3_pgtable.h | 24 +- + arch/m68k/include/asm/sun3xflop.h | 2 +- + arch/m68k/kernel/head.S | 2 +- + arch/m68k/kernel/process.c | 1 - + arch/m68k/kernel/ptrace.c | 1 - + arch/m68k/kernel/setup_no.c | 1 - + arch/m68k/kernel/signal.c | 1 - + arch/m68k/kernel/sys_m68k.c | 14 +- + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/traps.c | 13 +- + arch/m68k/kernel/uboot.c | 1 - + arch/m68k/mac/config.c | 1 - + arch/m68k/mm/cache.c | 13 +- + arch/m68k/mm/fault.c | 10 +- + arch/m68k/mm/init.c | 2 +- + arch/m68k/mm/mcfmmu.c | 1 - + arch/m68k/mm/motorola.c | 25 ++ + arch/m68k/mm/sun3kmap.c | 1 - + arch/m68k/mm/sun3mmu.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 1 - + arch/m68k/sun3/config.c | 1 - + arch/m68k/sun3/dvma.c | 1 - + arch/m68k/sun3/mmu_emu.c | 1 - + arch/m68k/sun3/sun3dvma.c | 1 - + arch/m68k/sun3x/dvma.c | 1 - + arch/m68k/sun3x/prom.c | 1 - + arch/microblaze/include/asm/cacheflush.h | 29 +-- + arch/microblaze/include/asm/pgalloc.h | 2 +- + arch/microblaze/include/asm/pgtable.h | 23 +- + arch/microblaze/include/asm/uaccess.h | 2 +- + arch/microblaze/include/asm/unwind.h | 3 +- + arch/microblaze/kernel/hw_exception_handler.S | 2 +- + arch/microblaze/kernel/module.c | 2 +- + arch/microblaze/kernel/setup.c | 2 +- + arch/microblaze/kernel/signal.c | 9 +- + arch/microblaze/kernel/stacktrace.c | 4 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/traps.c | 12 +- + arch/microblaze/kernel/unwind.c | 40 +-- + arch/microblaze/mm/fault.c | 17 +- + arch/microblaze/mm/init.c | 9 - + arch/microblaze/mm/pgtable.c | 2 +- + arch/mips/fw/arc/memory.c | 1 - + arch/mips/include/asm/fixmap.h | 3 - + arch/mips/include/asm/mach-generic/floppy.h | 1 - + arch/mips/include/asm/mach-jazz/floppy.h | 1 - + arch/mips/include/asm/pgtable-32.h | 22 -- + arch/mips/include/asm/pgtable-64.h | 32 --- + arch/mips/include/asm/pgtable.h | 2 - + arch/mips/jazz/irq.c | 2 +- + arch/mips/jazz/jazzdma.c | 1 - + arch/mips/jazz/setup.c | 2 +- + arch/mips/kernel/module.c | 1 - + arch/mips/kernel/process.c | 1 - + arch/mips/kernel/ptrace.c | 1 - + arch/mips/kernel/ptrace32.c | 1 - + arch/mips/kernel/smp-bmips.c | 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/mips/kernel/traps.c | 40 +-- + arch/mips/kernel/vdso.c | 4 +- + arch/mips/kvm/mips.c | 2 +- + arch/mips/kvm/mmu.c | 20 +- + arch/mips/kvm/tlb.c | 1 - + arch/mips/kvm/trap_emul.c | 2 +- + arch/mips/lib/dump_tlb.c | 1 - + arch/mips/lib/r3k_dump_tlb.c | 1 - + arch/mips/mm/c-octeon.c | 1 - + arch/mips/mm/c-r3k.c | 11 +- + arch/mips/mm/c-r4k.c | 11 +- + arch/mips/mm/c-tx39.c | 11 +- + arch/mips/mm/fault.c | 12 +- + arch/mips/mm/highmem.c | 2 +- + arch/mips/mm/init.c | 1 - + arch/mips/mm/page.c | 1 - + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/mips/mm/sc-ip22.c | 1 - + arch/mips/mm/sc-mips.c | 1 - + arch/mips/mm/sc-r5k.c | 1 - + arch/mips/mm/tlb-r3k.c | 1 - + arch/mips/mm/tlb-r4k.c | 1 - + arch/mips/mm/tlbex.c | 2 +- + arch/mips/sgi-ip27/ip27-init.c | 1 - + arch/mips/sgi-ip27/ip27-timer.c | 1 - + arch/mips/sgi-ip32/ip32-memory.c | 1 - + arch/nds32/include/asm/cacheflush.h | 4 +- + arch/nds32/include/asm/highmem.h | 1 - + arch/nds32/include/asm/pgtable.h | 22 +- + arch/nds32/kernel/head.S | 2 +- + arch/nds32/kernel/module.c | 2 +- + arch/nds32/kernel/traps.c | 15 +- + arch/nds32/kernel/vdso.c | 6 +- + arch/nds32/mm/cacheflush.c | 3 +- + arch/nds32/mm/fault.c | 17 +- + arch/nds32/mm/init.c | 13 +- + arch/nds32/mm/proc.c | 7 +- + arch/nios2/include/asm/pgtable.h | 24 +- + arch/nios2/kernel/module.c | 1 - + arch/nios2/kernel/nios2_ksyms.c | 2 +- + arch/nios2/kernel/traps.c | 17 +- + arch/nios2/mm/fault.c | 14 +- + arch/nios2/mm/init.c | 5 +- + arch/nios2/mm/pgtable.c | 1 - + arch/nios2/mm/tlb.c | 1 - + arch/openrisc/include/asm/cacheflush.h | 31 +-- + arch/openrisc/include/asm/io.h | 1 - + arch/openrisc/include/asm/pgtable.h | 33 +-- + arch/openrisc/include/asm/tlbflush.h | 1 - + arch/openrisc/kernel/asm-offsets.c | 1 - + arch/openrisc/kernel/entry.S | 2 +- + arch/openrisc/kernel/head.S | 2 +- + arch/openrisc/kernel/or32_ksyms.c | 2 +- + arch/openrisc/kernel/process.c | 1 - + arch/openrisc/kernel/ptrace.c | 1 - + arch/openrisc/kernel/setup.c | 1 - + arch/openrisc/kernel/traps.c | 13 +- + arch/openrisc/mm/fault.c | 12 +- + arch/openrisc/mm/init.c | 1 - + arch/openrisc/mm/ioremap.c | 2 +- + arch/openrisc/mm/tlb.c | 1 - + arch/parisc/include/asm/io.h | 2 +- + arch/parisc/include/asm/mmu_context.h | 1 - + arch/parisc/include/asm/pgtable.h | 33 +-- + arch/parisc/kernel/asm-offsets.c | 2 +- + arch/parisc/kernel/entry.S | 2 +- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/module.c | 1 - + arch/parisc/kernel/pacache.S | 2 +- + arch/parisc/kernel/pci-dma.c | 2 +- + arch/parisc/kernel/pdt.c | 2 +- + arch/parisc/kernel/ptrace.c | 1 - + arch/parisc/kernel/smp.c | 1 - + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/parisc/kernel/traps.c | 30 +-- + arch/parisc/lib/memcpy.c | 12 +- + arch/parisc/mm/fault.c | 10 +- + arch/parisc/mm/fixmap.c | 6 +- + arch/parisc/mm/init.c | 1 - + arch/powerpc/include/asm/book3s/32/pgtable.h | 20 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 39 +-- + arch/powerpc/include/asm/cacheflush.h | 42 +--- + arch/powerpc/include/asm/fixmap.h | 2 +- + arch/powerpc/include/asm/io.h | 1 - + arch/powerpc/include/asm/kup.h | 2 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 13 +- + arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 4 - + arch/powerpc/include/asm/nohash/64/pgtable.h | 22 -- + arch/powerpc/include/asm/nohash/pgtable.h | 2 +- + arch/powerpc/include/asm/pgtable.h | 28 +-- + arch/powerpc/include/asm/pkeys.h | 2 +- + arch/powerpc/include/asm/tlb.h | 2 +- + arch/powerpc/kernel/asm-offsets.c | 1 - + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/fpu.S | 1 - + arch/powerpc/kernel/head_32.S | 2 +- + arch/powerpc/kernel/head_40x.S | 2 +- + arch/powerpc/kernel/head_44x.S | 2 +- + arch/powerpc/kernel/head_8xx.S | 2 +- + arch/powerpc/kernel/head_fsl_booke.S | 2 +- + arch/powerpc/kernel/io-workarounds.c | 2 +- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/mce_power.c | 2 +- + arch/powerpc/kernel/paca.c | 2 +- + arch/powerpc/kernel/process.c | 16 +- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/rtas_pci.c | 2 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/signal_32.c | 1 - + arch/powerpc/kernel/signal_64.c | 1 - + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/stacktrace.c | 2 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/traps.c | 1 - + arch/powerpc/kernel/vdso.c | 7 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 6 +- + arch/powerpc/kvm/book3s_hv_nested.c | 2 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/powerpc/kvm/book3s_hv_rm_xive.c | 2 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 18 +- + arch/powerpc/kvm/e500_mmu_host.c | 4 +- + arch/powerpc/kvm/fpu.S | 2 +- + arch/powerpc/lib/code-patching.c | 1 - + arch/powerpc/mm/book3s32/hash_low.S | 2 +- + arch/powerpc/mm/book3s32/mmu.c | 2 +- + arch/powerpc/mm/book3s32/tlb.c | 6 +- + arch/powerpc/mm/book3s64/hash_hugetlbpage.c | 1 - + arch/powerpc/mm/book3s64/hash_native.c | 2 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 5 +- + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 4 +- + arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 1 - + arch/powerpc/mm/book3s64/radix_pgtable.c | 1 - + arch/powerpc/mm/book3s64/slb.c | 2 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 16 +- + arch/powerpc/mm/copro_fault.c | 4 +- + arch/powerpc/mm/fault.c | 23 +- + arch/powerpc/mm/hugetlbpage.c | 1 - + arch/powerpc/mm/init-common.c | 2 +- + arch/powerpc/mm/init_32.c | 1 - + arch/powerpc/mm/init_64.c | 1 - + arch/powerpc/mm/kasan/8xx.c | 4 +- + arch/powerpc/mm/kasan/book3s_32.c | 2 +- + arch/powerpc/mm/kasan/kasan_init_32.c | 8 +- + arch/powerpc/mm/mem.c | 4 +- + arch/powerpc/mm/nohash/40x.c | 5 +- + arch/powerpc/mm/nohash/8xx.c | 2 +- + arch/powerpc/mm/nohash/fsl_booke.c | 1 - + arch/powerpc/mm/nohash/tlb_low_64e.S | 2 +- + arch/powerpc/mm/pgtable.c | 4 +- + arch/powerpc/mm/pgtable_32.c | 5 +- + arch/powerpc/mm/pgtable_64.c | 1 - + arch/powerpc/mm/ptdump/8xx.c | 2 +- + arch/powerpc/mm/ptdump/bats.c | 2 +- + arch/powerpc/mm/ptdump/book3s64.c | 2 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 1 - + arch/powerpc/mm/ptdump/ptdump.c | 1 - + arch/powerpc/mm/ptdump/shared.c | 2 +- + arch/powerpc/oprofile/cell/spu_task_sync.c | 6 +- + arch/powerpc/perf/callchain.c | 1 - + arch/powerpc/perf/callchain_32.c | 1 - + arch/powerpc/perf/callchain_64.c | 5 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 2 +- + arch/powerpc/platforms/85xx/qemu_e500.c | 2 +- + arch/powerpc/platforms/85xx/sbc8548.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 2 +- + arch/powerpc/platforms/86xx/mpc86xx_smp.c | 2 +- + arch/powerpc/platforms/8xx/cpm1.c | 1 - + arch/powerpc/platforms/8xx/micropatch.c | 1 - + arch/powerpc/platforms/cell/cbe_regs.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 2 +- + arch/powerpc/platforms/cell/pervasive.c | 2 +- + arch/powerpc/platforms/cell/setup.c | 1 - + arch/powerpc/platforms/cell/smp.c | 2 +- + arch/powerpc/platforms/cell/spider-pic.c | 2 +- + arch/powerpc/platforms/cell/spufs/file.c | 10 +- + arch/powerpc/platforms/chrp/pci.c | 2 +- + arch/powerpc/platforms/chrp/setup.c | 1 - + arch/powerpc/platforms/chrp/smp.c | 2 +- + arch/powerpc/platforms/maple/setup.c | 1 - + arch/powerpc/platforms/maple/time.c | 1 - + arch/powerpc/platforms/powermac/setup.c | 1 - + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/powermac/time.c | 1 - + arch/powerpc/platforms/powernv/vas-fault.c | 4 +- + arch/powerpc/platforms/pseries/lpar.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 1 - + arch/powerpc/platforms/pseries/smp.c | 2 +- + arch/powerpc/sysdev/cpm2.c | 1 - + arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 2 +- + arch/powerpc/sysdev/mpic.c | 2 +- + arch/powerpc/xmon/xmon.c | 1 - + arch/riscv/include/asm/cacheflush.h | 65 +---- + arch/riscv/include/asm/fixmap.h | 2 +- + arch/riscv/include/asm/io.h | 2 +- + arch/riscv/include/asm/kasan.h | 2 - + arch/riscv/include/asm/pgtable-64.h | 7 - + arch/riscv/include/asm/pgtable.h | 22 -- + arch/riscv/kernel/module.c | 2 +- + arch/riscv/kernel/setup.c | 1 - + arch/riscv/kernel/soc.c | 2 +- + arch/riscv/kernel/stacktrace.c | 9 +- + arch/riscv/kernel/vdso.c | 4 +- + arch/riscv/mm/cacheflush.c | 1 - + arch/riscv/mm/fault.c | 14 +- + arch/riscv/mm/init.c | 31 ++- + arch/riscv/mm/kasan_init.c | 2 +- + arch/riscv/mm/pageattr.c | 6 +- + arch/riscv/mm/ptdump.c | 2 +- + arch/s390/boot/ipl_parm.c | 2 +- + arch/s390/boot/kaslr.c | 2 +- + arch/s390/include/asm/hugetlb.h | 2 +- + arch/s390/include/asm/kasan.h | 2 - + arch/s390/include/asm/pgtable.h | 15 +- + arch/s390/include/asm/tlbflush.h | 1 - + arch/s390/kernel/asm-offsets.c | 2 +- + arch/s390/kernel/dumpstack.c | 13 +- + arch/s390/kernel/machine_kexec.c | 1 - + arch/s390/kernel/ptrace.c | 1 - + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/uv.c | 4 +- + arch/s390/kernel/vdso.c | 5 +- + arch/s390/kvm/gaccess.c | 6 +- + arch/s390/kvm/interrupt.c | 4 +- + arch/s390/kvm/kvm-s390.c | 30 +-- + arch/s390/kvm/priv.c | 36 +-- + arch/s390/mm/dump_pagetables.c | 1 - + arch/s390/mm/extmem.c | 2 +- + arch/s390/mm/fault.c | 17 +- + arch/s390/mm/gmap.c | 78 +++--- + arch/s390/mm/init.c | 1 - + arch/s390/mm/kasan_init.c | 2 +- + arch/s390/mm/pageattr.c | 13 +- + arch/s390/mm/pgalloc.c | 2 +- + arch/s390/mm/pgtable.c | 1 - + arch/s390/mm/vmem.c | 1 - + arch/s390/pci/pci_mmio.c | 4 +- + arch/sh/include/asm/cacheflush.h | 1 + + arch/sh/include/asm/io.h | 2 +- + arch/sh/include/asm/kdebug.h | 6 +- + arch/sh/include/asm/pgtable-3level.h | 7 - + arch/sh/include/asm/pgtable.h | 2 - + arch/sh/include/asm/pgtable_32.h | 25 +- + arch/sh/include/asm/processor_32.h | 2 +- + arch/sh/include/asm/string_32.h | 26 -- + arch/sh/kernel/dumpstack.c | 36 +-- + arch/sh/kernel/machine_kexec.c | 1 - + arch/sh/kernel/process_32.c | 2 +- + arch/sh/kernel/ptrace_32.c | 1 - + arch/sh/kernel/signal_32.c | 1 - + arch/sh/kernel/sys_sh.c | 6 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/traps.c | 4 +- + arch/sh/kernel/vsyscall/vsyscall.c | 4 +- + arch/sh/lib/delay.c | 1 + + arch/sh/mm/cache-sh3.c | 1 - + arch/sh/mm/cache-sh4.c | 11 +- + arch/sh/mm/cache-sh7705.c | 1 - + arch/sh/mm/consistent.c | 2 - + arch/sh/mm/fault.c | 16 +- + arch/sh/mm/kmap.c | 5 +- + arch/sh/mm/nommu.c | 1 - + arch/sh/mm/pmb.c | 2 +- + arch/sparc/include/asm/cacheflush_32.h | 2 - + arch/sparc/include/asm/cacheflush_64.h | 1 - + arch/sparc/include/asm/floppy_32.h | 2 +- + arch/sparc/include/asm/highmem.h | 2 +- + arch/sparc/include/asm/ide.h | 2 +- + arch/sparc/include/asm/io-unit.h | 2 +- + arch/sparc/include/asm/pgalloc_32.h | 2 +- + arch/sparc/include/asm/pgalloc_64.h | 2 +- + arch/sparc/include/asm/pgtable_32.h | 34 +-- + arch/sparc/include/asm/pgtable_64.h | 32 +-- + arch/sparc/kernel/cpu.c | 2 +- + arch/sparc/kernel/entry.S | 2 +- + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/ktlb.S | 2 +- + arch/sparc/kernel/leon_smp.c | 1 - + arch/sparc/kernel/pci.c | 2 +- + arch/sparc/kernel/process_32.c | 11 +- + arch/sparc/kernel/process_64.c | 3 +- + arch/sparc/kernel/ptrace_32.c | 1 - + arch/sparc/kernel/ptrace_64.c | 1 - + arch/sparc/kernel/setup_32.c | 1 - + arch/sparc/kernel/setup_64.c | 1 - + arch/sparc/kernel/signal32.c | 1 - + arch/sparc/kernel/signal_32.c | 1 - + arch/sparc/kernel/signal_64.c | 1 - + arch/sparc/kernel/smp_32.c | 1 - + arch/sparc/kernel/smp_64.c | 1 - + arch/sparc/kernel/sun4m_irq.c | 2 +- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/trampoline_64.S | 2 +- + arch/sparc/kernel/traps_32.c | 2 +- + arch/sparc/kernel/traps_64.c | 10 +- + arch/sparc/lib/clear_page.S | 2 +- + arch/sparc/lib/copy_page.S | 2 +- + arch/sparc/mm/fault_32.c | 21 +- + arch/sparc/mm/fault_64.c | 17 +- + arch/sparc/mm/highmem.c | 12 +- + arch/sparc/mm/hugetlbpage.c | 1 - + arch/sparc/mm/init_32.c | 1 - + arch/sparc/mm/init_64.c | 7 +- + arch/sparc/mm/io-unit.c | 11 +- + arch/sparc/mm/iommu.c | 9 +- + arch/sparc/mm/srmmu.c | 45 +--- + arch/sparc/mm/tlb.c | 1 - + arch/sparc/mm/tsb.c | 2 +- + arch/sparc/mm/ultra.S | 2 +- + arch/sparc/vdso/vma.c | 4 +- + arch/um/drivers/mconsole_kern.c | 2 +- + arch/um/include/asm/mmu_context.h | 5 +- + arch/um/include/asm/pgtable-3level.h | 4 - + arch/um/include/asm/pgtable.h | 69 ++--- + arch/um/include/asm/tlb.h | 2 + + arch/um/kernel/maccess.c | 10 +- + arch/um/kernel/mem.c | 10 +- + arch/um/kernel/process.c | 1 - + arch/um/kernel/skas/mmu.c | 3 +- + arch/um/kernel/skas/uaccess.c | 1 - + arch/um/kernel/sysrq.c | 23 +- + arch/um/kernel/tlb.c | 5 +- + arch/um/kernel/trap.c | 15 +- + arch/um/kernel/um_arch.c | 1 - + arch/unicore32/include/asm/cacheflush.h | 11 - + arch/unicore32/include/asm/pgtable.h | 19 -- + arch/unicore32/kernel/hibernate.c | 2 +- + arch/unicore32/kernel/hibernate_asm.S | 2 +- + arch/unicore32/kernel/module.c | 1 - + arch/unicore32/kernel/setup.h | 2 +- + arch/unicore32/kernel/traps.c | 34 ++- + arch/unicore32/lib/backtrace.S | 24 +- + arch/unicore32/mm/alignment.c | 2 +- + arch/unicore32/mm/fault.c | 9 +- + arch/unicore32/mm/mm.h | 10 - + arch/unicore32/mm/proc-ucv2.S | 2 +- + arch/x86/boot/compressed/kaslr_64.c | 2 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/x86/entry/vdso/vma.c | 14 +- + arch/x86/events/core.c | 4 +- + arch/x86/include/asm/agp.h | 2 +- + arch/x86/include/asm/asm-prototypes.h | 2 +- + arch/x86/include/asm/cacheflush.h | 2 + + arch/x86/include/asm/efi.h | 2 +- + arch/x86/include/asm/iomap.h | 1 - + arch/x86/include/asm/kaslr.h | 2 + + arch/x86/include/asm/mmu.h | 2 +- + arch/x86/include/asm/pgtable-3level.h | 8 +- + arch/x86/include/asm/pgtable.h | 89 +------ + arch/x86/include/asm/pgtable_32.h | 11 - + arch/x86/include/asm/pgtable_64.h | 4 - + arch/x86/include/asm/setup.h | 12 +- + arch/x86/include/asm/stacktrace.h | 2 +- + arch/x86/include/asm/uaccess.h | 16 ++ + arch/x86/include/asm/xen/hypercall.h | 2 +- + arch/x86/include/asm/xen/page.h | 1 - + arch/x86/kernel/acpi/boot.c | 2 +- + arch/x86/kernel/acpi/sleep.c | 2 +- + arch/x86/kernel/alternative.c | 1 - + arch/x86/kernel/amd_gart_64.c | 3 +- + arch/x86/kernel/apic/apic_numachip.c | 2 +- + arch/x86/kernel/cpu/bugs.c | 2 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/intel.c | 2 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 6 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +- + arch/x86/kernel/crash_core_32.c | 2 +- + arch/x86/kernel/crash_core_64.c | 2 +- + arch/x86/kernel/doublefault_32.c | 1 - + arch/x86/kernel/dumpstack.c | 9 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/espfix_64.c | 2 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/i8259.c | 2 +- + arch/x86/kernel/irqinit.c | 2 +- + arch/x86/kernel/kprobes/core.c | 2 +- + arch/x86/kernel/kprobes/opt.c | 2 +- + arch/x86/kernel/ldt.c | 2 +- + arch/x86/kernel/machine_kexec_32.c | 1 - + arch/x86/kernel/machine_kexec_64.c | 1 - + arch/x86/kernel/module.c | 1 - + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/process_32.c | 1 - + arch/x86/kernel/process_64.c | 1 - + arch/x86/kernel/ptrace.c | 1 - + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/tboot.c | 3 +- + arch/x86/kernel/vm86_32.c | 4 +- + arch/x86/kvm/mmu/paging_tmpl.h | 8 +- + arch/x86/mm/cpu_entry_area.c | 2 +- + arch/x86/mm/debug_pagetables.c | 2 +- + arch/x86/mm/dump_pagetables.c | 1 - + arch/x86/mm/fault.c | 22 +- + arch/x86/mm/init.c | 22 ++ + arch/x86/mm/init_32.c | 27 +- + arch/x86/mm/init_64.c | 1 - + arch/x86/mm/ioremap.c | 2 +- + arch/x86/mm/kasan_init_64.c | 1 - + arch/x86/mm/kaslr.c | 35 +-- + arch/x86/mm/maccess.c | 28 +-- + arch/x86/mm/mem_encrypt_boot.S | 2 +- + arch/x86/mm/mmio-mod.c | 2 +- + arch/x86/mm/pat/cpa-test.c | 1 - + arch/x86/mm/pat/memtype.c | 1 - + arch/x86/mm/pat/memtype_interval.c | 2 +- + arch/x86/mm/pgtable.c | 1 - + arch/x86/mm/pgtable_32.c | 1 - + arch/x86/mm/pti.c | 1 - + arch/x86/mm/setup_nx.c | 2 +- + arch/x86/platform/efi/efi_32.c | 2 +- + arch/x86/platform/efi/efi_64.c | 1 - + arch/x86/platform/olpc/olpc_ofw.c | 2 +- + arch/x86/power/cpu.c | 2 +- + arch/x86/power/hibernate.c | 2 +- + arch/x86/power/hibernate_32.c | 2 +- + arch/x86/power/hibernate_64.c | 2 +- + arch/x86/realmode/init.c | 2 +- + arch/x86/um/vdso/vma.c | 4 +- + arch/x86/xen/enlighten_pv.c | 1 - + arch/x86/xen/grant-table.c | 1 - + arch/x86/xen/mmu_pv.c | 2 +- + arch/x86/xen/smp_pv.c | 2 +- + arch/xtensa/include/asm/cacheflush.h | 2 + + arch/xtensa/include/asm/fixmap.h | 10 +- + arch/xtensa/include/asm/highmem.h | 2 +- + arch/xtensa/include/asm/initialize_mmu.h | 2 +- + arch/xtensa/include/asm/mmu_context.h | 2 +- + arch/xtensa/include/asm/pgtable.h | 20 +- + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/process.c | 1 - + arch/xtensa/kernel/ptrace.c | 1 - + arch/xtensa/kernel/setup.c | 1 - + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + arch/xtensa/kernel/traps.c | 24 +- + arch/xtensa/kernel/vectors.S | 2 +- + arch/xtensa/mm/cache.c | 2 +- + arch/xtensa/mm/fault.c | 12 +- + arch/xtensa/mm/highmem.c | 2 +- + arch/xtensa/mm/ioremap.c | 2 +- + arch/xtensa/mm/kasan_init.c | 10 +- + arch/xtensa/mm/misc.S | 2 +- + arch/xtensa/mm/mmu.c | 5 +- + drivers/acpi/scan.c | 3 +- + drivers/android/binder_alloc.c | 14 +- + drivers/atm/fore200e.c | 2 +- + drivers/base/power/main.c | 2 +- + drivers/block/z2ram.c | 2 +- + drivers/char/agp/frontend.c | 1 - + drivers/char/agp/generic.c | 1 - + drivers/char/bsr.c | 1 - + drivers/char/mspec.c | 3 +- + drivers/dma-buf/dma-resv.c | 5 +- + drivers/firmware/efi/arm-runtime.c | 2 +- + drivers/firmware/efi/efi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 9 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- + drivers/gpu/drm/drm_vm.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/i915_mm.c | 1 - + drivers/gpu/drm/i915/i915_perf.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 22 +- + drivers/gpu/drm/radeon/radeon_cs.c | 4 +- + drivers/gpu/drm/radeon/radeon_gem.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 10 +- + drivers/infiniband/core/umem_odp.c | 4 +- + drivers/infiniband/core/uverbs_main.c | 6 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 2 +- + drivers/infiniband/hw/mlx4/mr.c | 4 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 6 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 4 +- + drivers/infiniband/sw/rdmavt/mmap.c | 1 - + drivers/infiniband/sw/rxe/rxe_mmap.c | 1 - + drivers/infiniband/sw/siw/siw_mem.c | 4 +- + drivers/iommu/amd_iommu_v2.c | 4 +- + drivers/iommu/intel-svm.c | 4 +- + drivers/macintosh/macio-adb.c | 2 +- + drivers/macintosh/mediabay.c | 2 +- + drivers/macintosh/via-pmu.c | 2 +- + drivers/media/pci/bt8xx/bt878.c | 2 +- + drivers/media/pci/bt8xx/btcx-risc.c | 2 +- + drivers/media/pci/bt8xx/bttv-risc.c | 2 +- + drivers/media/platform/davinci/vpbe_display.c | 1 - + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/v4l2-core/v4l2-common.c | 1 - + drivers/media/v4l2-core/videobuf-core.c | 4 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 4 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 8 +- + drivers/media/v4l2-core/videobuf-vmalloc.c | 2 +- + drivers/misc/cxl/cxllib.c | 9 +- + drivers/misc/cxl/fault.c | 4 +- + drivers/misc/genwqe/card_utils.c | 2 +- + drivers/misc/sgi-gru/grufault.c | 25 +- + drivers/misc/sgi-gru/grufile.c | 4 +- + drivers/mtd/ubi/ubi.h | 2 +- + drivers/net/ethernet/amd/7990.c | 2 +- + drivers/net/ethernet/amd/hplance.c | 2 +- + drivers/net/ethernet/amd/mvme147.c | 2 +- + drivers/net/ethernet/amd/sun3lance.c | 2 +- + drivers/net/ethernet/amd/sunlance.c | 2 +- + drivers/net/ethernet/apple/bmac.c | 2 +- + drivers/net/ethernet/apple/mace.c | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 2 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 2 +- + drivers/net/ethernet/i825xx/82596.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/natsemi/jazzsonic.c | 2 +- + drivers/net/ethernet/natsemi/macsonic.c | 2 +- + drivers/net/ethernet/natsemi/xtsonic.c | 2 +- + drivers/net/ethernet/sun/sunbmac.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 1 - + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/nvdimm/pmem.c | 3 +- + drivers/oprofile/buffer_sync.c | 12 +- + drivers/sbus/char/flash.c | 1 - + drivers/sbus/char/uctrl.c | 1 - + drivers/scsi/53c700.c | 2 +- + drivers/scsi/a2091.c | 1 - + drivers/scsi/a3000.c | 1 - + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/gvp11.c | 1 - + drivers/scsi/lasi700.c | 1 - + drivers/scsi/mac53c94.c | 2 +- + drivers/scsi/mesh.c | 2 +- + drivers/scsi/mvme147.c | 1 - + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/sni_53c710.c | 1 - + drivers/scsi/zorro_esp.c | 2 +- + drivers/sh/clk/cpg.c | 23 +- + drivers/staging/android/ashmem.c | 4 +- + drivers/staging/comedi/comedi_fops.c | 2 +- + drivers/staging/kpc2000/kpc_dma/fileops.c | 4 +- + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 4 +- + drivers/tee/optee/call.c | 4 +- + drivers/tty/sysrq.c | 2 +- + drivers/tty/vt/consolemap.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 10 +- + drivers/usb/gadget/legacy/inode.c | 6 +- + drivers/vfio/pci/vfio_pci.c | 22 +- + drivers/vfio/vfio_iommu_type1.c | 14 +- + drivers/vhost/vdpa.c | 4 +- + drivers/vhost/vhost.c | 13 +- + drivers/video/console/newport_con.c | 1 - + drivers/video/fbdev/acornfb.c | 1 - + drivers/video/fbdev/atafb.c | 1 - + drivers/video/fbdev/cirrusfb.c | 1 - + drivers/video/fbdev/cyber2000fb.c | 1 - + drivers/video/fbdev/fb-puv3.c | 1 - + drivers/video/fbdev/hitfb.c | 1 - + drivers/video/fbdev/neofb.c | 1 - + drivers/video/fbdev/q40fb.c | 1 - + drivers/video/fbdev/savage/savagefb_driver.c | 1 - + drivers/xen/balloon.c | 1 - + drivers/xen/gntdev.c | 6 +- + drivers/xen/grant-table.c | 1 - + drivers/xen/privcmd.c | 15 +- + drivers/xen/xenbus/xenbus_probe.c | 1 - + drivers/xen/xenbus/xenbus_probe_backend.c | 1 - + drivers/xen/xenbus/xenbus_probe_frontend.c | 1 - + fs/aio.c | 5 +- + fs/binfmt_flat.c | 2 +- + fs/coredump.c | 8 +- + fs/exec.c | 23 +- + fs/ext2/file.c | 2 +- + fs/ext4/super.c | 6 +- + fs/hugetlbfs/inode.c | 2 +- + fs/io-wq.c | 15 +- + fs/io_uring.c | 15 +- + fs/kernfs/file.c | 4 +- + fs/proc/array.c | 1 - + fs/proc/base.c | 24 +- + fs/proc/meminfo.c | 1 - + fs/proc/nommu.c | 1 - + fs/proc/proc_sysctl.c | 145 +++++++++++ + fs/proc/task_mmu.c | 34 +-- + fs/proc/task_nommu.c | 18 +- + fs/proc/vmcore.c | 1 - + fs/userfaultfd.c | 46 ++-- + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_inode.c | 14 +- + fs/xfs/xfs_iops.c | 4 +- + include/asm-generic/cacheflush.h | 25 +- + include/asm-generic/io.h | 2 +- + include/asm-generic/pgtable-nopmd.h | 1 + + include/asm-generic/pgtable-nopud.h | 1 + + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/cache.h | 10 +- + include/linux/compat.h | 4 + + include/linux/crash_dump.h | 3 +- + include/linux/dax.h | 1 - + include/linux/dev_printk.h | 6 +- + include/linux/dma-noncoherent.h | 2 +- + include/linux/dynamic_debug.h | 2 +- + include/linux/fs.h | 4 +- + include/linux/hmm.h | 2 +- + include/linux/huge_mm.h | 2 +- + include/linux/hugetlb.h | 2 +- + include/linux/io-mapping.h | 2 +- + include/linux/kallsyms.h | 4 +- + include/linux/kasan.h | 2 +- + include/linux/kernel.h | 9 + + include/linux/kthread.h | 5 + + include/linux/memcontrol.h | 2 +- + include/linux/mempolicy.h | 2 +- + include/linux/mm.h | 29 ++- + include/linux/mm_types.h | 4 +- + include/linux/mmap_lock.h | 90 +++++++ + include/linux/mmu_context.h | 5 - + include/linux/mmu_notifier.h | 13 +- + include/linux/net.h | 3 +- + include/linux/netdevice.h | 6 +- + include/linux/pagemap.h | 2 +- + include/{asm-generic => linux}/pgtable.h | 128 +++++++++- + include/linux/pid.h | 1 + + include/linux/printk.h | 9 +- + include/linux/rmap.h | 2 +- + include/linux/sched/debug.h | 3 +- + include/linux/sched/mm.h | 10 +- + include/linux/sched/sysctl.h | 7 + + include/linux/stacktrace.h | 2 +- + include/linux/syscalls.h | 2 + + include/linux/sysctl.h | 4 + + include/linux/uaccess.h | 60 +---- + include/linux/xarray.h | 4 +- + include/rdma/ib_verbs.h | 6 +- + include/uapi/asm-generic/unistd.h | 5 +- + include/xen/arm/page.h | 2 +- + init/init_task.c | 1 - + init/main.c | 2 + + ipc/shm.c | 8 +- + kernel/acct.c | 6 +- + kernel/bpf/stackmap.c | 17 +- + kernel/bpf/syscall.c | 2 +- + kernel/cgroup/cpuset.c | 4 +- + kernel/debug/kdb/kdb_bt.c | 15 +- + kernel/events/core.c | 14 +- + kernel/events/uprobes.c | 22 +- + kernel/exit.c | 28 +-- + kernel/fork.c | 15 +- + kernel/futex.c | 4 +- + kernel/hung_task.c | 30 ++- + kernel/kthread.c | 61 +++++ + kernel/locking/lockdep.c | 4 +- + kernel/locking/rtmutex-debug.c | 2 +- + kernel/module.c | 8 - + kernel/panic.c | 45 ++++ + kernel/pid.c | 17 ++ + kernel/power/snapshot.c | 1 - + kernel/relay.c | 2 +- + kernel/sched/core.c | 8 +- + kernel/sched/fair.c | 4 +- + kernel/sys.c | 22 +- + kernel/sys_ni.c | 2 + + kernel/sysctl.c | 41 ++- + kernel/trace/bpf_trace.c | 162 +++++++----- + kernel/trace/ftrace.c | 8 +- + kernel/trace/trace_kprobe.c | 70 +++--- + kernel/trace/trace_output.c | 4 +- + kernel/watchdog.c | 38 +-- + lib/Kconfig.debug | 12 + + lib/Makefile | 2 +- + lib/dump_stack.c | 2 +- + lib/dynamic_debug.c | 9 +- + lib/ioremap.c | 1 - + lib/test_hmm.c | 14 +- + lib/test_lockup.c | 16 +- + lib/test_sysctl.c | 13 + + mm/Makefile | 2 +- + mm/debug.c | 10 +- + mm/debug_vm_pgtable.c | 1 - + mm/filemap.c | 66 ++--- + mm/frame_vector.c | 13 +- + mm/frontswap.c | 8 +- + mm/gup.c | 147 ++++++----- + mm/hmm.c | 2 +- + mm/huge_memory.c | 8 +- + mm/hugetlb.c | 3 +- + mm/init-mm.c | 4 +- + mm/internal.h | 6 +- + mm/khugepaged.c | 72 +++--- + mm/kmemleak.c | 2 + + mm/ksm.c | 48 ++-- + mm/list_lru.c | 2 +- + mm/maccess.c | 278 ++++++++++++--------- + mm/madvise.c | 215 +++++++++++++--- + mm/memcontrol.c | 10 +- + mm/memory.c | 65 +++-- + mm/mempolicy.c | 36 +-- + mm/mempool.c | 2 +- + mm/migrate.c | 16 +- + mm/mincore.c | 6 +- + mm/mlock.c | 22 +- + mm/mmap.c | 102 ++++---- + mm/mmu_context.c | 64 ----- + mm/mmu_gather.c | 2 +- + mm/mmu_notifier.c | 22 +- + mm/mprotect.c | 22 +- + mm/mremap.c | 14 +- + mm/msync.c | 8 +- + mm/nommu.c | 26 +- + mm/oom_kill.c | 20 +- + mm/page_alloc.c | 9 - + mm/page_counter.c | 13 +- + mm/page_io.c | 9 +- + mm/page_reporting.h | 2 +- + mm/pagewalk.c | 12 +- + mm/pgtable-generic.c | 6 +- + mm/process_vm_access.c | 4 +- + mm/ptdump.c | 4 +- + mm/rmap.c | 14 +- + mm/shmem.c | 5 +- + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 1 - + mm/swap.c | 5 +- + mm/swap_state.c | 9 +- + mm/swapfile.c | 36 +-- + mm/userfaultfd.c | 26 +- + mm/util.c | 12 +- + mm/vmacache.c | 5 +- + mm/zsmalloc.c | 2 +- + net/ipv4/tcp.c | 78 +++++- + net/xdp/xdp_umem.c | 4 +- + security/keys/keyctl.c | 2 +- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/sgbuf.c | 1 - + sound/pci/hda/hda_intel.c | 2 +- + sound/soc/intel/common/sst-firmware.c | 2 +- + sound/soc/intel/haswell/sst-haswell-pcm.c | 2 +- + tools/include/linux/kallsyms.h | 2 +- + tools/testing/selftests/sysctl/sysctl.sh | 44 +++- + virt/kvm/async_pf.c | 4 +- + virt/kvm/kvm_main.c | 17 +- + 1051 files changed, 3755 insertions(+), 4493 deletions(-) + create mode 100644 include/linux/mmap_lock.h + rename include/{asm-generic => linux}/pgtable.h (91%) + delete mode 100644 mm/mmu_context.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..30f4300917e1 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,14 @@ +Importing dmi based on 5.7 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +Updating files: 24% (16846/67976)
Updating files: 25% (16994/67976)
Updating files: 26% (17674/67976)
Updating files: 27% (18354/67976)
Updating files: 28% (19034/67976)
Updating files: 29% (19714/67976)
Updating files: 30% (20393/67976)
Updating files: 31% (21073/67976)
Updating files: 32% (21753/67976)
Updating files: 33% (22433/67976)
Updating files: 34% (23112/67976)
Updating files: 35% (23792/67976)
Updating files: 36% (24472/67976)
Updating files: 37% (25152/67976)
Updating files: 38% (25831/67976)
Updating files: 39% (26511/67976)
Updating files: 40% (27191/67976)
Updating files: 40% (27790/67976)
Updating files: 41% (27871/67976)
Updating files: 42% (28550/67976)
Updating files: 43% (29230/67976)
Updating files: 44% (29910/67976)
Updating files: 45% (30590/67976)
Updating files: 46% (31269/67976)
Updating files: 47% (31949/67976)
Updating files: 48% (32629/67976)
Updating files: 49% (33309/67976)
Updating files: 50% (33988/67976)
Updating files: 51% (34668/67976)
Updating files: 51% (35003/67976)
Updating files: 52% (35348/67976)
Updating files: 53% (36028/67976)
Updating files: 54% (36708/67976)
Updating files: 55% (37387/67976)
Updating files: 56% (38067/67976)
Updating files: 57% (38747/67976)
Updating files: 58% (39427/67976)
Updating files: 59% (40106/67976)
Updating files: 60% (40786/67976)
Updating files: 61% (41466/67976)
Updating files: 62% (42146/67976)
Updating files: 62% (42781/67976)
Updating files: 63% (42825/67976)
Updating files: 64% (43505/67976)
Updating files: 65% (44185/67976)
Updating files: 66% (44865/67976)
Updating files: 67% (45544/67976)
Updating files: 68% (46224/67976)
Updating files: 69% (46904/67976)
Updating files: 70% (47584/67976)
Updating files: 71% (48263/67976)
Updating files: 72% (48943/67976)
Updating files: 73% (49623/67976)
Updating files: 74% (50303/67976)
Updating files: 74% (50746/67976)
Updating files: 75% (50982/67976)
Updating files: 76% (51662/67976)
Updating files: 77% (52342/67976)
Updating files: 78% (53022/67976)
Updating files: 79% (53702/67976)
Updating files: 80% (54381/67976)
Updating files: 81% (55061/67976)
Updating files: 82% (55741/67976)
Updating files: 83% (56421/67976)
Updating files: 84% (57100/67976)
Updating files: 85% (57780/67976)
Updating files: 86% (58460/67976)
Updating files: 87% (59140/67976)
Updating files: 88% (59819/67976)
Updating files: 89% (60499/67976)
Updating files: 90% (61179/67976)
Updating files: 91% (61859/67976)
Updating files: 91% (61870/67976)
Updating files: 92% (62538/67976)
Updating files: 93% (63218/67976)
Updating files: 94% (63898/67976)
Updating files: 95% (64578/67976)
Updating files: 96% (65257/67976)
Updating files: 97% (65937/67976)
Updating files: 98% (66617/67976)
Updating files: 99% (67297/67976)
Updating files: 100% (67976/67976)
Updating files: 100% (67976/67976), done. +HEAD is now at 3d77e6a8804a Linux 5.7 +$ git am -s --patch-format=mbox ../quilt/dmi/firmware-dmi-report-dmi-bios-ec-firmware-release.patch +Applying: firmware/dmi: Report DMI Bios & EC firmware release +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:dmi/master +From ../quilt-tmp + + 8cf87c744696...d9d8efd3241b master -> dmi/master (forced update) +Importing dmi based on 5.7 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..3ab3e2d70756 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200608 |