diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-06-10 19:51:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-06-10 19:51:10 +1000 |
| commit | 976c320052ff22a7f9b8be0d56aefacb3a40f466 (patch) | |
| tree | 4c36c9d4e342356585cc79c08920fe391ce8ea82 | |
| parent | 453cbf0c39a970509022384ba2220aa97ba33906 (diff) | |
| download | linux-next-next-20200610.tar.gz | |
Add linux-next specific files for 20200610next-20200610
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 | 5562 | ||||
| -rw-r--r-- | Next/quilt-import.log | 0 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6215 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b9517df16084 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,325 @@ +Name SHA1 +---- ---- +origin 5b14671be58d0084e7e2d1cc9c2c36a94467f6e0 +fixes df8cb0ea9423054e8b96be288db828d04310effa +kbuild-current 57755ccdf246da87a720982687746888ac1c499c +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 af7b4801030c07637840191c69eb666917e4135d +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net 89dc68533b190117e1a2fb4298d88b96b3580abf +bpf 8ca8d4a841730c02e77bf3c87bf658cc44f364b9 +ipsec a4902d914e508f3691fa7ef885a76d2b7e735805 +netfilter c3829285b2e6a0d5461078d7f6cbb2c2b4bf8c4e +ipvs bdc48fa11e46f867ea4d75fa59ee87a7f48be144 +wireless-drivers f92f26f2ed2c9f92c9270c705bca96310c3cdf5a +mac80211 59d4bfc1e2c09435d91c980b03f7b72ce6e9f24e +rdma-fixes 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +sound-current 951e2736f4b11b58dc44d41964fa17c3527d882a +sound-asoc-fixes 9d8b6b4586605b04d6e612d00dd59f1356a8cc6f +regmap-fixes 7e295e6576af82ff02c04ad7eba7168fb5b6f398 +regulator-fixes 5fb565b69dabd5a256fc116702331b54a4621dc9 +spi-fixes fdc967a9657df1ebe913cc22791793d7b8ea808a +pci-current 42612e7763315cf5d43c4422781e75f9ee57597a +driver-core.current abfbb29297c27e3f101f348dc9e467b0fe70f919 +tty.current af7b4801030c07637840191c69eb666917e4135d +usb.current af7b4801030c07637840191c69eb666917e4135d +usb-gadget-fixes 172b14b48ca10b280482b164506892ea09edb946 +usb-serial-fixes 399ad9477c523f721f8e51d4f824bdf7267f120c +usb-chipidea-fixes b3f3736ac305dd0affe6570d3f3c86ab598fb584 +phy 820eeb9de62f1f479c04fc6575d874611b1e2095 +staging.current af7b4801030c07637840191c69eb666917e4135d +char-misc.current af7b4801030c07637840191c69eb666917e4135d +soundwire-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136 +thunderbolt-fixes 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +input-current 751ad34fbad74c3ed4a9ede24764b4253d4faa84 +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 e711da8e63065bd0ea041cae185886182c455424 +kvm-fixes 6929f71e46bdddbf1c4d67c2728648176c67c555 +kvms390-fixes 5615e74f48dcc982655543e979b6c3f3f877e6f6 +hwmon-fixes 0f4ad4030eaf60db78b6b1e80f9eb38b98d7d017 +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 f8d8b46cd20e3a262c17ba1061640d9c190ad769 +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 6a47d6efc6931b02d10163de2fb85ec9953c4f5e +spdx 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +gpio-intel-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136 +pinctrl-intel-fixes 69388e15f5078c961b9e5319e22baea4c57deff1 +erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +drm-misc-fixes abf56fadf0e208abfb13ad1ac0094416058da0ad +kspp-gustavo ee07f8442ecdc5450f2a10dd86443b822e4d96ec +kbuild b170290c2836c40ab565736ba37681eb3dfd79b8 +compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 3ee06a6d532f75f20528ff4d2c473cda36c484fe +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 03c7f5f0b844e9f652e87daf5c51bb93ccf75296 +arm64 961abd78adcb4c72c343fcd9f9dc5e2ebbe9b448 +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 2f6ecd2028c6295d08fcfd10a67ff3d3a43a2905 +sunxi 243cd8fba48d3d79dd715b8884877b63861dcf93 +tegra cd049d898ab8de59cdb645e89a8038299adeadd9 +ti-k3 cae809434da10402b0fdbd395c6eb924d7aa46f4 +uniphier 0e698dfa282211e414076f9dc7e83c1c288314fd +clk 9ac1eafa885a9b2d3becd4f2e622829b1f5b9b86 +clk-samsung 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +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 5cc38fa6fc7448d40ff214d5c087f508355e8446 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 bfa50e1427e4608ce6941d3d0855445fcaa7dbb7 +sh 37744feebc086908fd89760650f458ab19071750 +sparc-next af7b4801030c07637840191c69eb666917e4135d +uml f6e8c474390be2e6f5bd0b8966e19958214609ff +xtensa 3ead2f97bd44a9a106572d306cb04a878c569cb2 +fscrypt e3b1078bedd323df343894a27eb3b3c34944dfd1 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 8113246479a51f14966daa18c1fb943811000b6c +ceph dc1dad8e1a612650b1e786e992cb0c6e101e226a +cifs 0b0430c6a10a22813e3d40c5658ae644acda4303 +configfs 8aebfffacfa379ba400da573a5bf9e49634e38cb +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 34f853b849eb6a509eb8f40f2f5946ebb1f62739 +exfat 315a419d5af7c07b5248e9f6cafce73c51801311 +ext3 16ec8bfe257b50d183ba30c6050e28a40372bbe9 +ext4 6b8ed62008a49751fc71fefd2a4f89202a7c2d4d +f2fs b7b911d59dacb47511a1e604bbfa901beb108305 +fsverity 9cd6b593cfc9eaa476c9a3fa768b08bca73213d0 +fuse 9b46418c40fe910e6537618f9932a8be78a3dd6c +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +nfs-anna 07e620d607d9ea08f9e94249f3174359e971b449 +nfsd 037e910b52b04fbd41990f643dff97c7e43b0e47 +orangefs 0df556457748d160013e88202c11712c16a83b0c +overlayfs 2068cf7dfbc69c4097c95af3a0bd943ced155a76 +ubifs 4b68bf9a69d22dd512d61d5f0ba01b065b01ede6 +v9fs 36f9967531da27ff8cc6f005d93760b578baffb9 +xfs 8cc0072469723459dc6bd7beff81b2b3149f4cf4 +zonefs 568776f992c4cb5e1b5715dc4ab62e6ae906b80d +iomap d4ff3b2ef901cd451fb8a9ff4623d060a79502cd +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks 5ef159681309621aa8fe06d94397b85b51974d55 +vfs b09e728da62fc883a012afe955a9fb9168a7ce65 +printk e35456906bd4a82e26319c722b0058b6679ec50b +pci 42612e7763315cf5d43c4422781e75f9ee57597a +pstore 78c08247b9d3e03192f8b359aa079024e805a948 +hid 5d7d489e9129000525ae2090e6c9254e56c6a9d6 +i2c 62afeaf0881639cba548e238774671351fc452d6 +i3c b4203ce0556348dcfe29f897d1dbe65102874d89 +dmi d9d8efd3241b119075b4900cc74ee52e5820604f +hwmon-staging 82bd3acaeaa4cd53a684a19bfe1902bc4d121031 +jc_docs 146f5cdeda153a1c7866cd240d2f464543d368c0 +v4l-dvb 938b29db3aa9c293c7c1366b16e55e308f1a1ddd +v4l-dvb-next be4b9e888184bc10c16b180096ee2592cd42f5f1 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 30bbd465a449eca0e6e03ba006af1899aa8dafff +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 af7b4801030c07637840191c69eb666917e4135d +bpf-next cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 +ipsec-next 9a25c1df24a6fea9dc79eec950453c4e00f707fd +mlx5-next 6b646a7e4af69814dd1a3340fca0f02d4977420d +netfilter-next cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 +ipvs-next 9a25c1df24a6fea9dc79eec950453c4e00f707fd +wireless-drivers-next 1806c13dc2532090d742ce03847b22367fb20ad6 +bluetooth a9ec8423134a54c9f0ae8d4ef59e1e833ca917c2 +mac80211-next cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 +gfs2 d054cf6bf879bf00dbbd424d74332074b471cf69 +mtd 5788ccf3c84f5587418a80128a3653aa35abf00b +nand 86f2b225adf4ecd2edfdc8541a7342645556ac3b +spi-nor e8aec15dd5842b5b11b0e621a2293348d3574a61 +crypto 58ca0060ec4e51208d2eee12198fc55fd9e4feb3 +drm 8d286e2ff4400d313955b4203fc640ca6fd9228b +amdgpu 624a498a539a7ea60a57114991389f0280785aec +drm-intel 3680c2e9f4254d1f033bf00f540e47a51f8f996b +drm-tegra d1c746f8b59d5b4dce96e4a7bc4f12d410bb66ba +drm-misc 968d81a64a883af2d16dd3f8a6ad6b67db2fde58 +drm-msm 1cb2c4a2c89b2004a36399860c85a1af9b3fcba7 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 2c76b324c7944fedf453abca5003569d9556c6df +etnaviv f232d9ec029ce3e2543b05213e2979e01e503408 +regmap 7e295e6576af82ff02c04ad7eba7168fb5b6f398 +sound 951e2736f4b11b58dc44d41964fa17c3527d882a +sound-asoc 9d8b6b4586605b04d6e612d00dd59f1356a8cc6f +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 e3bb3d2377e7283709f9446284c1afcb7ee26531 +spi fdc967a9657df1ebe913cc22791793d7b8ea808a +tip 22a1c800c96c83b7f4e3e02fad767502b70124fa +clockevents 809eb4e9bf9d84eb5b703358afd0d564d514f6d2 +edac daeb3bc9a92fdf8d240c728f7c6a7d9f0a5533a3 +irqchip 5a7f796d4f2028bde4c2ac778dfe0456851871b2 +ftrace 388d8bdb87e01bcea6d0b2bf797b5f6d7b2401fb +rcu 8747b07d19443724745de86964e8818404112220 +kvm 6929f71e46bdddbf1c4d67c2728648176c67c555 +kvm-arm 7ae2f3db6167aa7184529fdacd1de72619baf93b +kvm-ppc 11362b1befeadaae4d159a8cddcdaf6b8afe08f9 +kvms390 0b545fd17f84184f9536bde68c3521e36c488448 +xen-tip a952f64d14e5f8461f04cd9d729037db9099ddb0 +percpu dedac37ea96b23c23b72d6e90f01d060d5287e4e +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 47a94c551a7401a196cba881470dc9cb92573e82 +chrome-platform bbb7ad49b8350b79261ce087c8e101d92f15533d +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 59ea3c9faf3235b66bc31ca883d59ce58b8b2b27 +ipmi 2a556ce779e39b15cbb74e896ca640e86baeb1a1 +driver-core abfbb29297c27e3f101f348dc9e467b0fe70f919 +usb af7b4801030c07637840191c69eb666917e4135d +usb-gadget 1c11e74e9079289d8aaccc34b74cbf6463c0b791 +usb-serial c432df155919582a3cefa35a8f86256c830fa9a4 +usb-chipidea-next c4100ef2dd424401e51feb1a5b574096a398f458 +phy-next ac0a95a3ea7811f5cc4489924ddb54f0ea0f3007 +tty af7b4801030c07637840191c69eb666917e4135d +char-misc af7b4801030c07637840191c69eb666917e4135d +extcon b2e5575a8d04028d17f6c914eea31036589bc79a +soundwire fcbcf1f7b56855ffe1cec768cb1013c5a4c854c3 +thunderbolt 4caf2511ec498277333d229f8a7ad1fa9331df65 +staging af7b4801030c07637840191c69eb666917e4135d +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc b35da2e86f256a3a4be7c3b31507016100b00847 +slave-dma be4cf718cd9929e867ed1ff06d23fb4d08cc2d36 +cgroup 936f2a70f2077f64fab1dcb3eca71879e82ecd3f +scsi 01e5493c08b9a99221a452ab1da05b649926bd72 +scsi-mkp f47c24033a1ac3a08e745f50a28c3dd2c5cceda2 +vhost 044e4b09223039e571e6ec540e25552054208765 +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 8c9469aae3c6758b063bef76e42e2b1681a85f03 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching e1aef3a1dfdd6b785d9ff51da800c00fccd387f9 +coresight c9d7e3da1f3c4cf5dddfc5d7ce4d76d013aba1cc +rtc 4601e24a6fb819d38d1156d0f690cbe6a42c6d76 +nvdimm 6ec26b8b2d70b41d7c2affd8660d94ce78b3823c +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 5c70ab7c2945922262be04c397b7ddf5427ab7b3 +trivial c1a371cf80fbc06280cc0064ca99a39d0428ded3 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 3781a7a11294872693c48169e2af05d700f6455b +notifications 87a10a4bdb88d53a3e4c2f04cc3d542cefa11e0b +fsinfo 93737ccf05ec69f46260bea65464a9c0fd3a03d4 +akpm-current 6f82c8c5a02294057cabece78ba45fdf2ed1d44b +akpm 6a45805d803e941007addd2c57c8d2da1dfb0687 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..025ac5dd6acd --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5562 @@ +$ date -R +Wed, 10 Jun 2020 09:11:16 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at abfbb29297c2 Merge tag 'rproc-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc +Merging origin/master (5b14671be58d Merge tag 'fuse-update-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse) +$ git merge origin/master +Updating abfbb29297c2..5b14671be58d +Fast-forward + Documentation/ABI/testing/sysfs-devices-system-cpu | 1 + + Documentation/ABI/testing/sysfs-fs-f2fs | 24 + + Documentation/admin-guide/hw-vuln/index.rst | 1 + + .../special-register-buffer-data-sampling.rst | 149 ++ + Documentation/admin-guide/kernel-parameters.txt | 20 + + .../admin-guide/mm/numa_memory_policy.rst | 10 +- + Documentation/admin-guide/mm/userfaultfd.rst | 2 +- + Documentation/dev-tools/kselftest.rst | 23 + + Documentation/dev-tools/kunit/start.rst | 13 +- + Documentation/dev-tools/kunit/usage.rst | 4 +- + Documentation/filesystems/f2fs.rst | 2 +- + Documentation/filesystems/locking.rst | 2 +- + Documentation/filesystems/overlayfs.rst | 7 +- + Documentation/filesystems/porting.rst | 7 + + Documentation/filesystems/virtiofs.rst | 14 + + Documentation/trace/histogram-design.rst | 2115 +++++++++++++++++++ + 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/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 | 1 - + 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/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/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/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 | 39 +- + 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/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/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/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/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/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/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/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/traps.c | 13 +- + arch/m68k/kernel/uboot.c | 1 - + arch/m68k/mac/config.c | 1 - + 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/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/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/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/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/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/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/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 | 43 - + 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 | 17 +- + 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/traps.c | 1 - + arch/powerpc/kernel/vdso.c | 7 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + 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 | 1 - + 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 | 2 +- + 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 | 1 - + 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/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/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/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/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/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/traps.c | 4 +- + arch/sh/kernel/vsyscall/vsyscall.c | 4 +- + arch/sh/mm/cache-sh3.c | 1 - + arch/sh/mm/cache-sh4.c | 11 +- + arch/sh/mm/cache-sh7705.c | 1 - + 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/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/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/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/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/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/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/cpufeatures.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/msr-index.h | 4 + + 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 | 28 +- + 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 | 108 +- + arch/x86/kernel/cpu/common.c | 58 +- + arch/x86/kernel/cpu/cpu.h | 1 + + 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/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/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/Kconfig | 3 +- + drivers/base/cpu.c | 8 + + drivers/base/power/main.c | 2 +- + drivers/base/test/Kconfig | 3 +- + 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 | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.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/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/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/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/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/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/vfio/pci/vfio_pci.c | 22 +- + drivers/vfio/vfio_iommu_type1.c | 8 +- + drivers/vhost/vdpa.c | 4 +- + 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/afs/dir.c | 2 +- + fs/afs/flock.c | 2 +- + fs/afs/inode.c | 2 +- + fs/afs/internal.h | 2 - + fs/afs/proc.c | 1 + + fs/afs/vl_alias.c | 5 +- + fs/afs/yfsclient.c | 2 - + fs/aio.c | 4 +- + fs/coredump.c | 8 +- + fs/exec.c | 18 +- + 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 ++- + fs/ext2/file.c | 2 +- + fs/ext4/Kconfig | 3 +- + fs/ext4/super.c | 6 +- + fs/f2fs/Kconfig | 10 + + fs/f2fs/acl.h | 2 +- + fs/f2fs/checkpoint.c | 37 +- + fs/f2fs/compress.c | 182 +- + fs/f2fs/data.c | 163 +- + fs/f2fs/dir.c | 374 ++-- + fs/f2fs/f2fs.h | 171 +- + fs/f2fs/file.c | 401 +++- + 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 +- + 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 +- + fs/hugetlbfs/inode.c | 2 +- + fs/io_uring.c | 4 +- + fs/kernfs/file.c | 4 +- + fs/namespace.c | 16 + + fs/overlayfs/copy_up.c | 9 +- + fs/overlayfs/dir.c | 51 +- + fs/overlayfs/export.c | 24 +- + fs/overlayfs/file.c | 28 +- + fs/overlayfs/inode.c | 17 +- + fs/overlayfs/namei.c | 138 +- + fs/overlayfs/overlayfs.h | 11 +- + fs/overlayfs/ovl_entry.h | 10 +- + fs/overlayfs/readdir.c | 57 +- + fs/overlayfs/super.c | 243 ++- + fs/overlayfs/util.c | 36 +- + fs/proc/array.c | 1 - + fs/proc/base.c | 24 +- + fs/proc/meminfo.c | 1 - + fs/proc/nommu.c | 1 - + fs/proc/task_mmu.c | 34 +- + fs/proc/task_nommu.c | 18 +- + fs/proc/vmcore.c | 1 - + fs/sync.c | 3 +- + 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/io.h | 2 +- + include/asm-generic/pgtable-nopmd.h | 1 + + include/asm-generic/pgtable-nopud.h | 1 + + include/kunit/test.h | 12 +- + include/linux/cache.h | 10 +- + include/linux/crash_dump.h | 3 +- + include/linux/dax.h | 1 - + include/linux/dma-noncoherent.h | 2 +- + include/linux/fs.h | 6 +- + 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/mempolicy.h | 2 +- + include/linux/mm.h | 13 +- + include/linux/mm_types.h | 4 +- + include/linux/mmap_lock.h | 90 + + include/linux/mmu_notifier.h | 13 +- + include/linux/mount.h | 2 + + include/linux/pagemap.h | 2 +- + include/{asm-generic => linux}/pgtable.h | 128 +- + include/linux/rmap.h | 2 +- + include/linux/sched/debug.h | 3 +- + include/linux/sched/mm.h | 10 +- + include/linux/uaccess.h | 60 +- + include/trace/events/f2fs.h | 83 +- + include/xen/arm/page.h | 2 +- + init/init_task.c | 1 - + 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 | 10 +- + kernel/events/uprobes.c | 36 +- + kernel/exit.c | 11 +- + kernel/fork.c | 15 +- + kernel/futex.c | 4 +- + kernel/locking/lockdep.c | 4 +- + kernel/locking/rtmutex-debug.c | 2 +- + kernel/power/snapshot.c | 1 - + kernel/relay.c | 2 +- + kernel/sched/core.c | 8 +- + kernel/sched/fair.c | 4 +- + kernel/sys.c | 22 +- + kernel/trace/Kconfig | 52 +- + kernel/trace/Makefile | 1 + + kernel/trace/bpf_trace.c | 162 +- + kernel/trace/ftrace.c | 16 +- + 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_kprobe.c | 70 +- + kernel/trace/trace_output.c | 4 +- + kernel/trace/trace_probe.c | 2 +- + kernel/trace/trace_synth.h | 36 + + lib/Kconfig.debug | 6 +- + lib/bug.c | 3 + + lib/dump_stack.c | 2 +- + lib/ioremap.c | 1 - + lib/kunit/Kconfig | 23 +- + lib/math/Kconfig | 7 +- + lib/test_hmm.c | 14 +- + lib/test_lockup.c | 16 +- + lib/test_sysctl.c | 2 +- + mm/debug.c | 10 +- + mm/debug_vm_pgtable.c | 1 - + mm/filemap.c | 46 +- + mm/frame_vector.c | 6 +- + mm/gup.c | 73 +- + 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/ksm.c | 48 +- + mm/maccess.c | 278 +-- + mm/madvise.c | 40 +- + mm/memcontrol.c | 10 +- + mm/memory.c | 61 +- + mm/mempolicy.c | 36 +- + mm/migrate.c | 16 +- + mm/mincore.c | 6 +- + mm/mlock.c | 22 +- + mm/mmap.c | 74 +- + 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 | 22 +- + mm/oom_kill.c | 14 +- + mm/page_io.c | 1 - + 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 | 12 +- + mm/shmem.c | 5 +- + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 1 - + mm/swap_state.c | 5 +- + mm/swapfile.c | 5 +- + mm/userfaultfd.c | 26 +- + mm/util.c | 12 +- + mm/vmacache.c | 1 - + mm/zsmalloc.c | 2 +- + net/ipv4/tcp.c | 8 +- + net/xdp/xdp_umem.c | 4 +- + security/apparmor/Kconfig | 3 +- + security/keys/keyctl.c | 2 +- + security/security.c | 1 + + 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/bootconfig/test-bootconfig.sh | 7 + + tools/include/linux/kallsyms.h | 2 +- + tools/testing/kunit/kunit.py | 307 ++- + tools/testing/kunit/kunit_tool_test.py | 63 +- + 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 +- + .../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 + + 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 +- + virt/kvm/async_pf.c | 4 +- + virt/kvm/kvm_main.c | 9 +- + 1075 files changed, 10567 insertions(+), 7056 deletions(-) + create mode 100644 Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst + create mode 100644 Documentation/trace/histogram-design.rst + create mode 100644 include/linux/mmap_lock.h + rename include/{asm-generic => linux}/pgtable.h (91%) + create mode 100644 kernel/trace/trace_events_synth.c + create mode 100644 kernel/trace/trace_synth.h + 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 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 (57755ccdf246 kbuild: make module name conflict a warning again) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Makefile | 24 +++++------------------- + arch/arm/boot/deflate_xip_data.sh | 2 +- + arch/ia64/Makefile | 2 +- + arch/m68k/Makefile | 8 ++++---- + arch/parisc/Makefile | 2 +- + samples/Kconfig | 2 +- + samples/Makefile | 2 +- + samples/binderfs/Makefile | 9 ++++----- + samples/binderfs/binderfs_example.c | 1 - + scripts/Makefile.lib | 6 +++--- + scripts/Makefile.package | 6 +++--- + scripts/modules-check.sh | 5 +++-- + scripts/package/buildtar | 4 ++-- + 13 files changed, 29 insertions(+), 44 deletions(-) +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 (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge sparc/master +Already up to date. +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 (89dc68533b19 net: flow_offload: remove indirect flow_block declarations leftover) +$ git merge net/master +Auto-merging net/ipv4/tcp.c +CONFLICT (content): Merge conflict in net/ipv4/tcp.c +Auto-merging include/linux/netdevice.h +Recorded preimage for 'net/ipv4/tcp.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'net/ipv4/tcp.c'. +[master 89e17b1df1d0] Merge remote-tracking branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/networking/mac80211-injection.rst | 2 +- + Documentation/networking/regulatory.rst | 6 +- + drivers/net/bonding/bond_main.c | 2 - + drivers/net/bonding/bond_options.c | 2 - + drivers/net/ethernet/marvell/mvneta.c | 13 +++ + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- + drivers/net/hamradio/bpqether.c | 2 + + drivers/net/macsec.c | 5 + + drivers/net/macvlan.c | 13 ++- + drivers/net/vxlan.c | 4 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 3 + + include/linux/netdevice.h | 12 ++- + include/net/cfg80211.h | 5 +- + include/net/flow_offload.h | 24 ----- + include/net/inet_hashtables.h | 6 ++ + include/uapi/linux/nl80211.h | 2 +- + net/8021q/vlan_dev.c | 8 +- + net/batman-adv/soft-interface.c | 2 + + net/bridge/br_device.c | 8 ++ + net/core/dev.c | 30 +++--- + net/core/dev_addr_lists.c | 12 +-- + net/core/rtnetlink.c | 1 - + net/dccp/proto.c | 7 +- + net/dsa/master.c | 4 + + net/ipv4/tcp.c | 70 +++++++++++-- + net/mac80211/mlme.c | 2 + + net/mac80211/rx.c | 2 +- + net/mptcp/options.c | 2 + + net/netrom/af_netrom.c | 2 + + net/rose/af_rose.c | 2 + + net/rxrpc/ar-internal.h | 119 +++++------------------ + net/rxrpc/call_event.c | 1 - + net/rxrpc/conn_event.c | 7 +- + net/rxrpc/input.c | 7 +- + net/rxrpc/peer_event.c | 4 +- + net/rxrpc/recvmsg.c | 79 +++++++++++++++ + net/rxrpc/sendmsg.c | 4 +- + net/sched/sch_generic.c | 1 + + net/wireless/Kconfig | 2 +- + net/wireless/core.c | 6 +- + net/wireless/core.h | 2 + + net/wireless/mlme.c | 26 ++++- + tools/testing/selftests/net/rxtimestamp.c | 1 + + tools/testing/selftests/net/timestamping.c | 10 +- + tools/testing/selftests/net/tls.c | 58 +++++++++++ + 45 files changed, 384 insertions(+), 200 deletions(-) +Merging bpf/master (8ca8d4a84173 libbpf: Define __WORDSIZE if not available) +$ git merge bpf/master +Auto-merging scripts/link-vmlinux.sh +Auto-merging net/core/filter.c +Auto-merging kernel/trace/trace_kprobe.c +Merge made by the 'recursive' strategy. + include/uapi/linux/bpf.h | 13 +++++++ + kernel/bpf/cgroup.c | 2 +- + kernel/bpf/devmap.c | 18 +++------- + kernel/bpf/verifier.c | 2 +- + kernel/trace/trace_kprobe.c | 2 +- + kernel/trace/trace_uprobe.c | 2 +- + net/core/filter.c | 3 -- + net/core/sock_map.c | 24 +++++++++++-- + net/ipv4/tcp_bpf.c | 3 ++ + scripts/link-vmlinux.sh | 4 +-- + tools/include/uapi/linux/bpf.h | 13 +++++++ + tools/lib/bpf/hashmap.h | 7 ++-- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 7 ++++ + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 42 ++++++++++++++++++---- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 8 ----- + .../selftests/bpf/progs/test_xdp_devmap_helpers.c | 2 +- + .../bpf/progs/test_xdp_with_devmap_helpers.c | 3 +- + 17 files changed, 109 insertions(+), 46 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 (c3829285b2e6 netfilter: nft_set_pipapo: Disable preemption before getting per-CPU pointer) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nft_set_pipapo.c | 6 +++++- + net/netfilter/nft_set_rbtree.c | 21 ++++++++++++++------- + 2 files changed, 19 insertions(+), 8 deletions(-) +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 (59d4bfc1e2c0 net: fix wiki website url mac80211 and wireless files) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (3d77e6a8804a Linux 5.7) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (951e2736f4b1 ALSA: pcm: disallow linking stream to itself) +$ git merge sound-current/for-linus +Auto-merging sound/core/pcm_native.c +Merge made by the 'recursive' strategy. + sound/core/pcm_native.c | 20 ++++++++++++++-- + sound/pci/emu10k1/emu10k1x.c | 2 +- + sound/pci/hda/patch_realtek.c | 6 +++++ + sound/usb/card.c | 54 +++++++++++++++++++++++++++++++++---------- + sound/usb/quirks-table.h | 12 ++++++++++ + sound/usb/usbaudio.h | 6 +++-- + 6 files changed, 83 insertions(+), 17 deletions(-) +Merging sound-asoc-fixes/for-linus (9d8b6b458660 Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/tdm-slot.txt | 4 +- + sound/soc/codecs/max98390.c | 26 ++++++++++--- + sound/soc/codecs/max98390.h | 3 +- + sound/soc/codecs/rl6231.c | 4 +- + sound/soc/codecs/rt5645.c | 14 +++++++ + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++ + sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 4 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- + sound/soc/meson/axg-fifo.c | 10 ++++- + sound/soc/meson/meson-card-utils.c | 17 ++++++--- + sound/soc/soc-core.c | 22 +++++++++-- + sound/soc/soc-pcm.c | 44 +++++++++++++++++----- + sound/soc/sof/nocodec.c | 6 ++- + 16 files changed, 136 insertions(+), 38 deletions(-) +Merging regmap-fixes/for-linus (7e295e6576af 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 | 105 ++++++++++++++++++++----------------------- + 1 file changed, 49 insertions(+), 56 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 (fdc967a9657d 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-rspi.c | 28 +++++++++++++++++++++------- + drivers/spi/spi-sprd-adi.c | 2 +- + tools/spi/spidev_test.c | 4 ++-- + 3 files changed, 24 insertions(+), 10 deletions(-) +Merging pci-current/for-linus (42612e776331 Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (abfbb29297c2 Merge tag 'rproc-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (751ad34fbad7 Input: adi - work around module name confict) +$ 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/joystick/Kconfig | 1 + + 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 + + 38 files changed, 3397 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 (e711da8e6306 ARM: dts: am437x-epos-evm: remove lcd timings) +$ git merge omap-fixes/fixes +Auto-merging drivers/bus/ti-sysc.c +Auto-merging arch/arm/boot/dts/dra7-l4.dtsi +Auto-merging arch/arm/boot/dts/dra7-evm-common.dtsi +Auto-merging arch/arm/boot/dts/am33xx.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am33xx.dtsi | 4 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 16 ---- + arch/arm/boot/dts/am437x-sk-evm.dts | 16 ---- + arch/arm/boot/dts/am43x-epos-evm.dts | 16 ---- + arch/arm/boot/dts/dra7-evm-common.dtsi | 20 ----- + arch/arm/boot/dts/dra7-l4.dtsi | 34 ++++----- + 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 +- + 10 files changed, 101 insertions(+), 119 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 (0f4ad4030eaf hwmon: (bt1-pvt) Mark is_visible functions static) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/bt1-pvt.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 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 (f8d8b46cd20e scripts/dtc: use pkg-config to include <yaml.h> in non-standard path) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + scripts/dtc/Makefile | 3 +++ + 1 file changed, 3 insertions(+) +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 b7a40409b760] 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 (6a47d6efc693 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 (ee07f8442ecd 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. + 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 ++-- + 63 files changed, 113 insertions(+), 113 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 (3ee06a6d532f dma-pool: fix too large DMA pools on medium memory size systems) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + kernel/dma/pool.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +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 (961abd78adcb drivers/perf: hisi: Fix wrong value for all counters enable) +$ git merge arm64/for-next/core +Merge made by the 'recursive' strategy. + arch/arm64/kernel/debug-monitors.c | 2 +- + arch/arm64/kernel/ftrace.c | 3 ++- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 +- + kernel/scs.c | 2 +- + 4 files changed, 5 insertions(+), 4 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 +Auto-merging arch/arm/boot/dts/am437x-sk-evm.dts +Auto-merging arch/arm/boot/dts/am437x-gp-evm.dts +Auto-merging arch/arm/boot/dts/am33xx.dtsi +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 (2f6ecd2028c6 Merge tag 'juno-fix-5.8' 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 (9ac1eafa885a clk: mediatek: Remove ifr{0,1}_cfg_regs structures) +$ 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 425ff4a936fa] 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 | 75 + + .../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 | 922 +++++ + 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, 14139 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 66dca3889930] Merge remote-tracking branch 'clk/clk-next' + Date: Wed Jun 10 09:52:56 2020 +1000 +Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7) +$ 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 +Auto-merging arch/openrisc/kernel/entry.S +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 (5cc38fa6fc74 riscv: fix build warning of missing prototypes) +$ git merge risc-v/for-next +Auto-merging include/linux/cpuhotplug.h +Auto-merging arch/riscv/mm/init.c +Removing arch/riscv/kernel/vdso/gettimeofday.S +Removing arch/riscv/kernel/vdso/clock_gettime.S +Removing arch/riscv/kernel/vdso/clock_getres.S +Auto-merging arch/riscv/kernel/vdso.c +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 74 +++++++++------- + 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, 500 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 +Already up to date. +Merging sh/for-next (37744feebc08 sh: remove sh5 support) +$ git merge sh/for-next +Already up to date. +Merging sparc-next/master (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge sparc-next/master +Already up to date. +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 +Already up to date. +Merging cifs/for-next (0b0430c6a10a cifs: Add get_security_type_str function to return sec type.) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cache.c | 9 ++------- + fs/cifs/cifs_debug.c | 4 +--- + fs/cifs/cifsglob.h | 18 ++++++++++++++++++ + fs/cifs/fscache.c | 17 +++++++++++++++-- + fs/cifs/fscache.h | 9 +++++++++ + 5 files changed, 45 insertions(+), 12 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 (315a419d5af7 exfat: Set the unused characters of FileName field to the value 0000h) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/dir.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 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 (b7b911d59dac f2fs: attach IO flags to the missing cases) +$ git merge f2fs/dev +Already up to date. +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 +Already up to date. +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 96c2f493f2fd] 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 (2068cf7dfbc6 ovl: remove unnecessary lock check) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (4b68bf9a69d2 ubi: Select fastmap anchor PEBs considering wear level rules) +$ git merge ubifs/linux-next +Auto-merging drivers/mtd/ubi/ubi.h +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 (8cc007246972 xfs: Add the missed xfs_perag_put() for xfs_ifree_cluster()) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_inode.c +Merge made by the 'recursive' strategy. + fs/xfs/xfs_inode.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +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 (d4ff3b2ef901 iomap: Fix unsharing of an extent >2GB on a 32-bit machine) +$ git merge iomap/iomap-for-next +Auto-merging fs/iomap/buffered-io.c +Merge made by the 'recursive' strategy. + fs/iomap/buffered-io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (42612e776331 Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ 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 (62afeaf08816 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 (82bd3acaeaa4 hwmon: (bt1-pvt) Mark is_visible functions static) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. +Merging jc_docs/docs-next (146f5cdeda15 docs/memory-barriers.txt/kokr: smp_mb__{before,after}_atomic(): update Documentation) +$ git merge jc_docs/docs-next +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging Documentation/doc-guide/parse-headers.rst +Merge made by the 'recursive' strategy. + Documentation/COPYING-logo | 2 +- + Documentation/admin-guide/LSM/tomoyo.rst | 16 ++++++++-------- + Documentation/admin-guide/acpi/initrd_table_override.rst | 2 +- + Documentation/admin-guide/bcache.rst | 4 ++-- + Documentation/admin-guide/devices.rst | 2 +- + Documentation/admin-guide/initrd.rst | 2 +- + Documentation/admin-guide/md.rst | 2 +- + Documentation/admin-guide/mono.rst | 4 ++-- + Documentation/admin-guide/reporting-bugs.rst | 2 +- + Documentation/admin-guide/unicode.rst | 4 ++-- + Documentation/conf.py | 2 +- + Documentation/core-api/rbtree.rst | 4 ++-- + Documentation/dev-tools/coccinelle.rst | 8 ++++---- + Documentation/dev-tools/gdb-kernel-debugging.rst | 2 +- + Documentation/doc-guide/parse-headers.rst | 2 +- + Documentation/driver-api/acpi/linuxized-acpica.rst | 6 +++--- + Documentation/driver-api/driver-model/devres.rst | 1 + + Documentation/driver-api/usb/bulk-streams.rst | 4 ++-- + Documentation/driver-api/usb/writing_musb_glue_layer.rst | 6 +++--- + Documentation/filesystems/path-lookup.txt | 2 +- + Documentation/filesystems/seq_file.rst | 4 ++-- + Documentation/misc-devices/c2port.txt | 6 +++--- + Documentation/process/3.Early-stage.rst | 4 ++-- + Documentation/process/7.AdvancedTopics.rst | 8 ++++---- + Documentation/process/8.Conclusion.rst | 14 +++++++------- + Documentation/process/adding-syscalls.rst | 4 ++-- + Documentation/process/applying-patches.rst | 4 ++-- + Documentation/process/volatile-considered-harmful.rst | 4 ++-- + Documentation/security/SCTP.rst | 2 +- + Documentation/sphinx/kfigure.py | 6 +++--- + Documentation/static-keys.txt | 2 +- + Documentation/trace/events-msr.rst | 2 +- + Documentation/trace/mmiotrace.rst | 2 +- + .../translations/it_IT/kernel-hacking/hacking.rst | 4 ++-- + .../translations/it_IT/process/email-clients.rst | 2 ++ + .../translations/it_IT/process/management-style.rst | 2 ++ + Documentation/translations/ko_KR/memory-barriers.txt | 15 +++++++++------ + Documentation/translations/zh_CN/filesystems/debugfs.rst | 2 +- + Documentation/vm/ksm.rst | 2 +- + Documentation/xz.txt | 6 +++--- + scripts/kernel-doc | 2 +- + 41 files changed, 91 insertions(+), 83 deletions(-) +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 +Auto-merging drivers/staging/media/atomisp/pci/hmm/hmm_bo.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 8e05b69708de] 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 (30bbd465a449 Merge branches 'pm-acpi', 'pm-sleep' and 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/interconnect.h +Auto-merging drivers/interconnect/core.c +Auto-merging drivers/acpi/scan.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/opp/opp.txt | 17 +- + .../devicetree/bindings/property-units.txt | 4 + + drivers/acpi/acpica/dbdisply.c | 2 + + drivers/acpi/acpica/utdecode.c | 3 +- + drivers/acpi/device_pm.c | 2 +- + drivers/acpi/scan.c | 28 ++- + drivers/cpufreq/acpi-cpufreq.c | 14 +- + drivers/cpufreq/cppc_cpufreq.c | 39 +++- + drivers/cpufreq/cpufreq-dt.c | 4 + + drivers/cpufreq/cpufreq.c | 57 +++--- + 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/acpi/acpixf.h | 2 +- + include/acpi/actypes.h | 3 +- + include/linux/cpufreq.h | 2 +- + include/linux/interconnect.h | 6 + + include/linux/pm_opp.h | 18 ++ + kernel/power/swap.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 11 +- + 23 files changed, 524 insertions(+), 87 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 (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-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 (a9ec8423134a Bluetooth: Allow suspend even when preparation has failed) +$ 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 | 46 ++++++++++++++--------------- + drivers/net/wireless/marvell/mwifiex/sdio.h | 4 +-- + net/bluetooth/af_bluetooth.c | 2 -- + net/bluetooth/hci_core.c | 17 ++++++----- + net/bluetooth/hci_request.c | 10 ++++--- + 6 files changed, 45 insertions(+), 42 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 (d054cf6bf879 gfs2: Don't return NULL from gfs2_inode_lookup) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/inode.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +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 (8d286e2ff440 Merge tag 'drm-intel-next-fixes-2020-06-04' of git://anongit.freedesktop.org/drm/drm-intel 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 +Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.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/dc/core/dc.c +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_pm.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 | 72 +- + 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 | 31 +- + .../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 | 95 +- + 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 | 136 +- + 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, 216604 insertions(+), 6176 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 (3680c2e9f425 drm/i915/display: Only query DP state of a DDI encoder) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_dp.c | 3 ++ + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 56 ++++++++++++++++++++++---- + drivers/gpu/drm/i915/i915_params.c | 2 +- + 3 files changed, 52 insertions(+), 9 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 +Already up to date. +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 (7e295e6576af Merge remote-tracking branch 'regmap/for-5.8' into regmap-linus) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (951e2736f4b1 ALSA: pcm: disallow linking stream to itself) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (9d8b6b458660 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 +Auto-merging fs/io_uring.c +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 4f513430826d] Merge remote-tracking branch 'block/for-next' + Date: Wed Jun 10 10:50:39 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 +Already up to date. +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 +Already up to date. +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 (e3bb3d2377e7 mailbox: qcom: Add ipq6018 apcs compatible) +$ git merge mailbox/mailbox-for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt +Merge made by the 'recursive' strategy. + .../bindings/mailbox/qcom,apcs-kpss-global.txt | 88 ----- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 99 ++++++ + .../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-apcs-ipc-mailbox.c | 61 +++- + 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 ++ + 14 files changed, 1110 insertions(+), 132 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml + 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 (fdc967a9657d 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 +Auto-merging scripts/Makefile.lib +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/Makefile +Auto-merging kernel/panic.c +Auto-merging kernel/locking/lockdep.c +Removing kernel/gcov/gcc_3_4.c +Auto-merging init/main.c +Auto-merging init/init_task.c +Auto-merging include/linux/uaccess.h +Removing drivers/xen/preempt.c +Auto-merging arch/x86/xen/smp_pv.c +CONFLICT (content): Merge conflict in arch/x86/xen/smp_pv.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging arch/x86/mm/fault.c +CONFLICT (content): Merge conflict in arch/x86/mm/fault.c +Auto-merging arch/x86/mm/cpu_entry_area.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging arch/x86/kernel/head_64.S +Auto-merging arch/x86/kernel/doublefault_32.c +Auto-merging arch/x86/kernel/cpu/intel.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/cpu/bugs.c +Auto-merging arch/x86/kernel/alternative.c +Removing arch/x86/include/asm/irq_regs.h +Removing arch/x86/include/asm/entry_arch.h +Auto-merging arch/x86/include/asm/cacheflush.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 arch/sparc/include/asm/pgtable_32.h +CONFLICT (content): Merge conflict in arch/sparc/include/asm/pgtable_32.h +Auto-merging arch/sparc/include/asm/pgalloc_32.h +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/hw-vuln/index.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/hw-vuln/index.rst +Recorded preimage for 'Documentation/admin-guide/hw-vuln/index.rst' +Recorded preimage for 'arch/sparc/include/asm/pgtable_32.h' +Resolved 'arch/sparc/mm/srmmu.c' using previous resolution. +Resolved 'arch/x86/mm/fault.c' using previous resolution. +Resolved 'arch/x86/xen/smp_pv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/admin-guide/hw-vuln/index.rst'. +Recorded resolution for 'arch/sparc/include/asm/pgtable_32.h'. +[master 2201e3dd0138] 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 +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 ab9f049d673c] 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 (388d8bdb87e0 tracing: Remove obsolete PREEMPTIRQ_EVENTS kconfig option) +$ git merge ftrace/for-next +Already up to date. +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_uvmem.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 (a952f64d14e5 MAINTAINERS: Update PARAVIRT_OPS_INTERFACE and VMWARE_HYPERVISOR_INTERFACE) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/xenbus/xenbus_probe.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +-- + 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/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 +++--- + 14 files changed, 90 insertions(+), 142 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 (abfbb29297c2 Merge tag 'rproc-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (af7b4801030c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (f47c24033a1a scsi: storvsc: Remove memset before memory freeing in storvsc_suspend()) +$ git merge scsi-mkp/for-next +Auto-merging drivers/usb/gadget/function/f_tcm.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/scsi/sr.c +CONFLICT (content): Merge conflict in drivers/scsi/sr.c +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c +Recorded preimage for 'drivers/scsi/sr.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/scsi/sr.c'. +[master 7faff7a681b3] Merge remote-tracking branch 'scsi-mkp/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/scsi/cxlflash/main.c | 3 -- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 ++ + drivers/scsi/sr.c | 7 ++++- + drivers/scsi/st.c | 20 ++++--------- + drivers/scsi/storvsc_drv.c | 3 -- + drivers/target/iscsi/iscsi_target.c | 29 ++++++++++-------- + drivers/target/target_core_device.c | 19 +++++------- + drivers/target/target_core_tmr.c | 4 +-- + drivers/target/target_core_transport.c | 55 ++++++++++++++++++++++++++-------- + drivers/target/target_core_xcopy.c | 9 ++++-- + drivers/usb/gadget/function/f_tcm.c | 6 ++-- + include/target/target_core_fabric.h | 9 +++--- + 12 files changed, 96 insertions(+), 70 deletions(-) +Merging vhost/linux-next (044e4b092230 vhost/test: fix up after API change) +$ 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/vhost.c +Auto-merging drivers/vhost/vdpa.c +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 | 2 +- + drivers/vhost/scsi.c | 2 +- + drivers/vhost/test.c | 2 +- + drivers/vhost/vdpa.c | 112 +- + drivers/vhost/vhost.c | 98 +- + drivers/vhost/vhost.h | 8 +- + drivers/vhost/vringh.c | 6 +- + drivers/vhost/vsock.c | 2 +- + 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, 2722 insertions(+), 143 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 +Merge made by the 'recursive' strategy. + drivers/hwspinlock/Kconfig | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) +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 +Already up to date. +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 (8c9469aae3c6 tools: testing: ftrace: trigger: fix spelling mistake) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc | 2 +- + tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc | 2 +- + .../selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc | 2 +- + .../selftests/ftrace/test.d/trigger/trigger-trace-marker-snapshot.tc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +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 (e1aef3a1dfdd Merge branch 'for-5.9/selftests-cleanup' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + lib/livepatch/test_klp_callbacks_busy.c | 37 +++- + lib/livepatch/test_klp_shadow_vars.c | 240 +++++++++++---------- + .../testing/selftests/livepatch/test-callbacks.sh | 29 ++- + .../selftests/livepatch/test-shadow-vars.sh | 81 ++++--- + 4 files changed, 225 insertions(+), 162 deletions(-) +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 +Already up to date. +Merging nvdimm/libnvdimm-for-next (6ec26b8b2d70 nvdimm/pmem: stop using ->queuedata) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/btt.c +Auto-merging drivers/nvdimm/blk.c +Merge made by the 'recursive' strategy. + drivers/acpi/nfit/core.c | 2 +- + drivers/nvdimm/blk.c | 5 ++--- + drivers/nvdimm/btt.c | 3 +-- + drivers/nvdimm/pmem.c | 6 +++--- + 4 files changed, 7 insertions(+), 9 deletions(-) +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 +Already up to date. +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 6fdbaaa3c6dd] 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 include/linux/xarray.h +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 (5c70ab7c2945 kunit: add support for named resources) +$ git merge kunit-next/kunit +Merge made by the 'recursive' strategy. + include/kunit/test.h | 210 +++++++++++++++++++++++++++++++++++++++------- + lib/kunit/kunit-test.c | 111 +++++++++++++++++++----- + lib/kunit/string-stream.c | 14 ++-- + lib/kunit/test.c | 171 ++++++++++++++++++++++--------------- + 4 files changed, 380 insertions(+), 126 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 39620033d117] 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 b389846ba0bb] 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 71e12cc80863] Merge remote-tracking branch 'notifications/notifications-pipe-core' + Date: Wed Jun 10 12:53:37 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 60678702e152] 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 e9215f42e858] Merge remote-tracking branch 'fsinfo/fsinfo-core' + Date: Wed Jun 10 13:05:58 2020 +1000 +$ git am -3 ../patches/0001-update-sparc32-for-mm-consolidate-pte_index-and-pte_.patch +Applying: update sparc32 for "mm: consolidate pte_index() and pte_offset_*() definitions" +Merging akpm-current/current (6f82c8c5a022 ipc-convert-ipcs_idr-to-xarray-update-fix) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/checkpatch.pl +Auto-merging mm/page_alloc.c +Auto-merging lib/bitmap.c +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/sched.h +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 | 37 ++++--- + fs/namei.c | 10 +- + fs/nilfs2/segment.c | 2 + + fs/ocfs2/Kconfig | 2 +- + fs/ocfs2/mmap.c | 2 +- + fs/ocfs2/namei.c | 17 +++- + fs/open.c | 6 -- + fs/proc/page.c | 40 ++++---- + fs/ramfs/inode.c | 12 +++ + include/linux/ipc_namespace.h | 10 +- + 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 | 1 - + ipc/namespace.c | 13 +-- + ipc/sem.c | 1 - + ipc/shm.c | 60 +++++------ + ipc/util.c | 175 +++++++++++++++----------------- + ipc/util.h | 4 +- + kernel/hung_task.c | 44 ++++++++ + kernel/kcov.c | 26 +++-- + kernel/watchdog.c | 21 ++++ + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 16 ++- + lib/bitmap.c | 8 +- + lib/cpumask.c | 102 ++++++++++++++++--- + lib/lz4/lz4_decompress.c | 3 + + lib/lzo/lzo1x_compress.c | 13 +++ + lib/test_bitops.c | 53 +++++++++- + mm/debug_vm_pgtable.c | 6 ++ + mm/memory-failure.c | 43 ++++---- + mm/memremap.c | 20 ++++ + mm/migrate.c | 23 +++++ + mm/mmap.c | 43 +++++--- + mm/page_alloc.c | 12 +++ + mm/vmstat.c | 4 + + scripts/checkpatch.pl | 22 ++-- + scripts/spelling.txt | 9 ++ + tools/testing/selftests/vm/khugepaged.c | 2 +- + 47 files changed, 708 insertions(+), 281 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/48)
Rebasing (2/48)
Rebasing (3/48)
Rebasing (4/48)
Rebasing (5/48)
Rebasing (6/48)
Rebasing (7/48)
Rebasing (8/48)
Rebasing (9/48)
Rebasing (10/48)
Rebasing (11/48)
Rebasing (12/48)
Rebasing (13/48)
Rebasing (14/48)
Rebasing (15/48)
Rebasing (16/48)
Rebasing (17/48)
Rebasing (18/48)
Rebasing (19/48)
Rebasing (20/48)
Rebasing (21/48)
Rebasing (22/48)
Rebasing (23/48)
Rebasing (24/48)
Rebasing (25/48)
dropping 1f19d54bedfff2221bf048e4b747262c4d936ff9 net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy -- patch contents already upstream +Rebasing (26/48)
Rebasing (27/48)
Rebasing (28/48)
Rebasing (29/48)
Rebasing (30/48)
Rebasing (31/48)
Rebasing (32/48)
Rebasing (33/48)
Rebasing (34/48)
Rebasing (35/48)
Rebasing (36/48)
Rebasing (37/48)
Rebasing (38/48)
Rebasing (39/48)
Rebasing (40/48)
Rebasing (41/48)
Rebasing (42/48)
Rebasing (43/48)
Rebasing (44/48)
Rebasing (45/48)
Rebasing (46/48)
Rebasing (47/48)
Rebasing (48/48)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 1b50c1c6f7ef...6a45805d803e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (6a45805d803e sh: add missing EXPORT_SYMBOL() for __delay) +$ git merge --no-ff akpm/master +Removing mm/mmu_context.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + 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/powerpc/platforms/powernv/vas-fault.c | 4 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/include/asm/string_32.h | 26 --- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sh/lib/delay.c | 1 + + arch/sh/mm/consistent.c | 2 - + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 +- + .../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 | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 - + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/sh/clk/cpg.c | 23 +-- + drivers/usb/gadget/function/f_fs.c | 10 +- + drivers/usb/gadget/legacy/inode.c | 6 +- + drivers/vfio/vfio_iommu_type1.c | 6 +- + drivers/vhost/vhost.c | 8 +- + fs/aio.c | 1 - + fs/io-wq.c | 15 +- + fs/io_uring.c | 11 +- + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/compat.h | 4 + + include/linux/kthread.h | 5 + + include/linux/memcontrol.h | 2 +- + include/linux/mm.h | 4 +- + include/linux/mmu_context.h | 5 - + include/linux/pid.h | 1 + + include/linux/stacktrace.h | 2 +- + include/linux/syscalls.h | 2 + + include/uapi/asm-generic/unistd.h | 5 +- + kernel/exit.c | 17 -- + kernel/kthread.c | 61 +++++++ + kernel/pid.c | 17 ++ + kernel/sys_ni.c | 2 + + mm/Makefile | 2 +- + mm/filemap.c | 20 ++- + mm/frontswap.c | 8 +- + mm/kmemleak.c | 2 + + mm/list_lru.c | 2 +- + mm/madvise.c | 195 ++++++++++++++++++--- + mm/memory.c | 4 +- + mm/mempool.c | 2 +- + mm/mmu_context.c | 64 ------- + mm/oom_kill.c | 6 +- + mm/page_counter.c | 13 +- + mm/page_io.c | 8 +- + mm/rmap.c | 2 +- + mm/swap.c | 5 +- + mm/swap_state.c | 4 +- + mm/swapfile.c | 31 ++-- + mm/vmacache.c | 4 +- + 69 files changed, 388 insertions(+), 267 deletions(-) + 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..e69de29bb2d1 --- /dev/null +++ b/Next/quilt-import.log diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c770adac9b71 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200610 |