diff options
| -rw-r--r-- | Next/SHA1s | 326 | ||||
| -rw-r--r-- | Next/Trees | 328 | ||||
| -rw-r--r-- | Next/merge.log | 14456 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 15111 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..8558bad9f20d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,326 @@ +Name SHA1 +---- ---- +origin 92188b41f1394d5e4399fcb28c13a2933f255255 +fixes dbf24e30ce2e85e501ddaba0e00db48b4716f04b +kbuild-current 20b1be59528295e5c2a8812059b8560753dd8e68 +arc-current 11ba468877bb23f28956a35e896356252d63c983 +arm-current 3866f217aaa81bf7165c7f27362eee5d7919c496 +arm-soc-fixes 2648298a06ba7e902c4489a15c0db26032813c7b +uniphier-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +arm64-fixes f32ed8eb0e3f0d0ef4ddb854554d60ca5863a9f9 +m68k-current 3381df0954199458fa3993db72fb427f0ed1e43b +powerpc-fixes f0479c4bcbd92d1a457d4a43bcab79f29d11334a +s390-fixes dd9ce2d6eeaebbdd342cbe095b7a195d569f18d3 +sparc 37719576046b553092d5a88de90459306dfdec6b +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net 2ccb0161a0e9eb06f538557d38987e436fc39b8d +bpf 5b801dfb7feb2738975d80223efc2fc193e55573 +ipsec 17175d1a27c618e214555b91eca8a0be4cf07f45 +netfilter 1e9451cbda456a170518b2bfd643e2cb980880bf +ipvs eadede5f936276e93e62834ffbe1550d305e0921 +wireless-drivers dc7bd30b97aac8a97eccef0ffe31f6cefb6e2c3e +mac80211 8ff41cc21714704ef0158a546c3c4d07fae2c952 +rdma-fixes 87c4c774cbef5c68b3df96827c2fb07f1aa80152 +sound-current 568e4e82128aac2c62c2c359ebebb6007fd794f9 +sound-asoc-fixes 6da0f19f6b6a7ec4f6f5aa5949c197ed3d4800f0 +regmap-fixes 2b0f61e27f75f0f53d51dcbf334aaba21eb27109 +regulator-fixes cb4a3eacd2f7a06cd063c7fce52e1e1d23d4f0fd +spi-fixes 91b93f94a192e7dbc4b85f9444304356e7e60350 +pci-current 91593041482847090228b5d6203da9d1ed17c511 +driver-core.current 50ad1c2155a32dc68e0da8efcc6d95429869076e +tty.current 7531ee3147ed2fad5d5bbbd22880eea969dfc291 +usb.current c7300cdf8f683ae00cf74616b5fd14ffac327979 +usb-gadget-fixes 8778eb0927ddcd3f431805c37b78fa56481aeed9 +usb-serial-fixes e7b931bee739e8a77ae216e613d3b99342b6dec0 +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy 38b1927e5bf9bcad4a2e33189ef1c5569f9599ba +staging.current 6a058f0be518bbb10aadd3c5d18516f91b1a4a04 +char-misc.current b279b1fe5799cf653de3822ca253f5d21639d90a +soundwire-fixes bf6d6e68d2028a2d82f4c106f50ec75cc1e6ef89 +thunderbolt-fixes 8b94a4b92327d061327117e127d7d44a4a43e639 +input-current a50ca29523b18baea548bdf5df9b4b923c2bb4f6 +crypto-current e04ec0de61c1eb9693179093e83ab8ca68a30d08 +ide b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +vfio-fixes b872d0640840018669032b20b6375a478ed1f923 +kselftest-fixes 3c01655ac82eb6d1cc2cfe9507031f1b5e0a6df1 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 87730ccbddcb48478b1b88e88b14e73424130764 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes 880bc529bae2257d05a767f7f5c24fd61a47b605 +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 5868347a192afb99b189d72946ab6a321b6115ac +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 2a4117df9b436a0e4c79d211284ab2097bcd00dc +kvm-fixes 3d9fdc252b52023260de1d12399cb3157ed28c07 +kvms390-fixes 774911290c589e98e3638e73b24b0a4d4530e97c +hwmon-fixes c66ef39eb27fe123ee05082b90eb2985c33c7715 +nvdimm-fixes 543094e19c82b5d171e139d09a1a3ea0a7361117 +btrfs-fixes 23e44faaf8e20e89e4658ca2b9f145a5478d3364 +vfs-fixes 8d95867c8610c515ffab2913b2cb19b2c7f7f6c1 +dma-mapping-fixes d9765e41d8e9ea2251bf73735a2895c8bad546fc +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes f8456690ba8eb18ea4714e68554e242a04f65cff +samsung-krzk-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pinctrl-samsung-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +devicetree-fixes 0115e6c98c22f3fc7ff7da2a41480483abe95b37 +scsi-fixes 07d3f04550023395bbf34b99ec7e00fc50d9859f +drm-fixes adbe8a3cae94a63e9f416795c750237a9b789124 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 92e0575b99835b5b3aaab2132dd551e0e04eb96a +mmc-fixes ebd4050c6144b38098d8eed34df461e5e3fa82a9 +rtc-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes 77b48bea2fee47c15a835f6725dd8df0bc38375a +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 38b7c2a3ffb1fce8358ddc6006cfe5c038ff9963 +pidfd-fixes c17d1a3a8ee4dac7539d5c976b45d9300f6f10bc +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +gpio-intel-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pinctrl-intel-fixes 45c11a927606c612e4898a9484867b71318699f6 +erofs-fixes 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes c63d2dd7e134ebddce4745c51f9572b3f0d92b26 +drm-misc-fixes baa1841eb797eadce6c907bdaed7cd6f01815404 +kspp-gustavo 48778464bb7d346b47157d21ffde2af6b2d39110 +kbuild 0816600a3111ba384e1bdda31b8136606d1971ce +compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b +dma-mapping 23efed6fa7519e29a01f12723b0cfa8118dc87cb +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 03c7f5f0b844e9f652e87daf5c51bb93ccf75296 +arm64 5fef5dc17f097794288acb098ccc80eb91142bf4 +arm-perf f011856ce7b600fdc2d1102d56873b787ff6d1bb +arm-soc fe6031092b43e8cbe223c8665d35f0f9e47e8fd9 +amlogic 921856df453b221008049e2096ead107894f021f +aspeed 33f466eef90694b812c79a26f560502784971d0f +at91 ec539e70d882af33660bcab178a59b1251588a22 +imx-mxs 3c6ec3e310c002252f9ff291f5e63154e11c1ab8 +keystone a158c2b7ec23cb32b1aace55938486c8de16d217 +mediatek 647a84d1e4dcc43369a968d6d2215de17b1c30d0 +mvebu 869da228bd454b8b451ba0d1a04c3f3f2a8d275d +omap a5b4d0a1b174b2675d7740b92a84e23e5dfe8148 +qcom d09eb6a1b495c9b78654cb444a69609b259cc8ef +raspberrypi 25c6f3960764b266a609281341f889a06d045039 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 344cb4f80fba071550975e18b7b6975c8addbbcf +reset 3b9164c0f173127c8eee98e0e0b969908e3237d5 +rockchip e4a879a43feecccf38b3132afc9ec259a1f80703 +samsung-krzk 30f16ea45902c9c133c0b364d241246d52d83ab0 +scmi 11ba468877bb23f28956a35e896356252d63c983 +sunxi 193762b7740b611d3d44c0c0a988c13832ff25cc +tegra 2ffcb962f693a3a2ce452a571f20d10653bc6155 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +uniphier 4f8fb65af5299d138f57e6d62f88d2d5964d40eb +clk 5c09ea8bf3a04a4e1a812b2f913739e37af6af72 +clk-samsung 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +csky f4dd2edafba0c00285c16da24fdc1a029b2685a2 +h8300 9d48776fc609e434736e5cb114830d7e0b843739 +ia64 172e7890406d6183b9b39271ffb434ff0a97ce72 +m68k 382f429bb559fe991b1ece2e5e58c812e28b3ad8 +m68knommu 3b554410a6177538c21cd0997bbefe6d57bbe1b3 +microblaze b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +mips 67d0662ce9116eb6a5aa62ffd3cf61fce452d4be +nds32 548cbab5e7bc1972207d8838ca6c6a1e547956be +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 6bd140e14d9aaa734ec37985b8b20a96c0ece948 +parisc-hd fb775a8805ed8b0d0af0a0a73bfd6f4b6b214631 +powerpc 61f879d97ce4510dd29d676a20d67692e3b34806 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e9e4ef9116b12951eaee3f8447ba9bbb40ab3620 +risc-v 375e2bad2f8c6b7292f5ebf3d43dd4fdfc5baf34 +s390 6589c93f99894e007a1260f009018effc958ab69 +sh 79eec5f23d34f206eac2c6d97c4a8eb133a9068c +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f6e8c474390be2e6f5bd0b8966e19958214609ff +xtensa ee769ebbe9e5fc7219e979fb7c5ed5bb5722649e +fscrypt 4f74d15fe40833d4fb4f5ead7437aa73840596a5 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs c0e7348a211da9e1924ec861a9dfe93d30c33e81 +ceph 7ed286f3e061ee394782bd9fb4ed96bff0b5a021 +cifs e9225f19dfd0eef9f0e892b13b883035ca022491 +configfs 8aebfffacfa379ba400da573a5bf9e49634e38cb +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +exfat 3d30fdf76680af14a85863c41ab4dfba3777ee77 +ext3 0abc0d5654d480bea96698abc8c29f99221ba91e +ext4 7b97d868b7ab2448859668de9222b8af43f76e78 +f2fs fa95c1f6f9c807efe01a282f7644600d6fd13e5e +fsverity 9cd6b593cfc9eaa476c9a3fa768b08bca73213d0 +fuse 31070f6ccec09f3bd4f1e28cd1e592fa4f3ba0b6 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 11ba468877bb23f28956a35e896356252d63c983 +nfs-anna 65caafd0d2145d1dd02072c4ced540624daeab40 +nfsd c428aa8ef0cc7a46eb7344a5b9198c04edae1442 +orangefs 0df556457748d160013e88202c11712c16a83b0c +overlayfs 4518dfcf761e3c44632855abcf433236cf7ab6c6 +ubifs 4b68bf9a69d22dd512d61d5f0ba01b065b01ede6 +v9fs aab6c873cf9b7afa9ca1ad82e48734178080f534 +xfs c3f2375b90d0d26f257b926a0d236371df483ca1 +zonefs 568776f992c4cb5e1b5715dc4ab62e6ae906b80d +iomap d1b4f507d71defdbd6bd698bf375eebb60159f11 +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks 5ef159681309621aa8fe06d94397b85b51974d55 +vfs 7999096fa9cfd0253497c8d2ed9a5a1537521d25 +printk d0557f79447304f1d71621b70eaf12d6581db4fe +pci 8a445afd710b1e707934568b9ead421d7bf0d9d2 +pstore fd49e03280e596e54edb93a91bc96170f8e97e4a +hid 4324aef0ec6508dd27ea46d6883d756e9b17ab25 +i2c 52399f62196e534328df3a16cfe7e78da3e2abc4 +i3c b4203ce0556348dcfe29f897d1dbe65102874d89 +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging c2cb4b5777e1464b5bfbc24f86e787e5a29d0cce +jc_docs f33d4075e512274c0c6edcd7602da2cf1d5a0341 +v4l-dvb 8f2a4a9d5ff5202d0b3e3a144ebb9b67aabadd29 +v4l-dvb-next 0d6db85131e014c128e57649793aff5aa96e065f +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm e1f8d84fc3fe27530af068400101f20b67c33664 +cpufreq-arm 887d5fc82cb4a532d9b6f3e7d9def08a98569386 +cpupower fa0866a1d1be8ffa6979bf2127272b7e3d511fcd +opp 52d82df42eeffa2a762415bccc74c949925a4d10 +thermal 77f47251bae13e926fd0ba6dc0c7ec4161c3a9db +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm b9f24a697ce0d69d70b1081a49fa160009efd8d4 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 5f0b2a6093a4d9aab093964c65083fe801ef1e58 +net-next 7dce80c2a526a199ae1447e7a58d4135bb18ff8a +bpf-next e57892f50a07953053dcb1e0c9431197e569c258 +ipsec-next 0a82f3f083617150cebacab57f9293b15e9917e0 +mlx5-next 4c2573e1f6c79525df9094f6ba085fcc35c18c45 +netfilter-next 73eb67515545ec2e9d0327a4da7d0a9d65184e2c +ipvs-next 66846b7d058bbb6e2954b8b84d6480024e72a777 +wireless-drivers-next 0e20c3e10333326fc63646fa40b159eb88b7e8c8 +bluetooth 339ddaa626995bc6218972ca241471f3717cc5f4 +mac80211-next 29a720c1042f469c8fea317cb5e7f496b116e07d +gfs2 0d7853ebbba3b12f7a06109dfad52f72a6b6817f +mtd fbd9b5437b668900f6d8c8e29c8aabf4955189ff +nand da151e3458c825fa9d57c2db6e37748166e4d129 +spi-nor fb249e1007e0270e305ea674012dcc4f95f1304e +crypto 1b3eeb8761f053422a4b3bcb024fc3bf41e12304 +drm 1cc4af412f40bfe33f4b7e2b014a8d4b140bd8d3 +amdgpu d7373aaf738393f38f40b0570bfa1403584eb982 +drm-intel 111822b21be995a3a4a731066db3d820523c57f7 +drm-tegra 4fba6d22ca9ad28b8871d763b35a4da2e1ca272e +drm-misc 40a55dc13e9dfa3a9575fd95633733554f4cde67 +drm-msm 6e9c6874fb5011ab67e1ae25940b36c286680854 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 2c76b324c7944fedf453abca5003569d9556c6df +etnaviv c5d5a32ead1e3a61a07a1e59eb52a53e4a6b2a7f +regmap c9fadf212afd4f924a3502e3904917ee280854c0 +sound 6779ec13ca639929459976a691e17a64ed7e0712 +sound-asoc 5f2224a2c3f8e6526dc56d1e7a8178546ff5d2bd +modules b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +input 606e7022078410ce4456e760e80f5e4b68c63476 +block 656707e1d0fc21e56f88540ec602cad28bd05ab5 +device-mapper 02622abba2dad8357ea94d174c62de67a2a35bea +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc c624b49a40ae82076c72bf498560e55554a6b508 +mfd c61f4d58eefcb057ee7d04d43e72022d0367e7ef +backlight c847e429db9de0a214401477c7292066e599a7c9 +battery 5d809cb28056221e1b13459f7a2ddfa28305b74f +regulator f8369b5d78ded8c91876bbced9d76015ade148fb +security 8ca4a830cefa75ef1f5ec7bc828a0b84b71b714f +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity 34e980bb83a07b533d175221436d698c1312c4a3 +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 4d63f7c2e382d3251964ca677fd0e85775c5f82a +selinux 54b27f9287a7b3dfc85549f01fc9d292c92c68b9 +smack ef26650a201fbbb4ba90b63a82bf7950f2699a82 +tomoyo ba47d845d715a010f7b51f6f89bae32845e6acb7 +tpmdd 786a2aa281f4c4ba424ea8b8ea1e85ab62c4a57c +watchdog 92188b41f1394d5e4399fcb28c13a2933f255255 +iommu 8da45cf05a9fa7525271aca6ccb2dc7af9290ec6 +vfio 4f085ca2f5a8047845ab2d6bbe97089daed28655 +audit d7481b24b816b8c3955a9eaf01b97e2bd7f61a37 +devicetree c46ed28dbe95844c1d15addd26ff05499057c4d5 +mailbox e9f901dc05c09c4f89183cadcb2d93177f3100cb +spi e3c1bb248f15cb1a9b860d89416921dcc22f9e53 +tip 8b68f1cda59dc238dc67989c8ac3fa95873f89ed +clockevents 809eb4e9bf9d84eb5b703358afd0d564d514f6d2 +edac 399cd3b33cef95c1db070e14e137cdce5a7ddd5b +irqchip 005c34ae4b44f085120d7f371121ec7ded677761 +ftrace 29ce24519c0692ca7d998d7444a9e016a4c44fa7 +rcu 5707b0d017244e614219b84f814afea8caa506a8 +kvm c34b26b98caca48ec9ee981d4a89ac4f73376a3a +kvm-arm b72eb1f681373d52d8aadcf1a4207fc41058c516 +kvm-ppc 11362b1befeadaae4d159a8cddcdaf6b8afe08f9 +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip ba8c423488974f02b538e9dc1730f0334f9b85aa +percpu dedac37ea96b23c23b72d6e90f01d060d5287e4e +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 69ce97f2329ffdda850f9eabc3dba2c4f88a0848 +chrome-platform e48bc01ed5adec203676c735365373b31c3c7600 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 10d3e0d815879129e916cd83e1034438e06efdaa +ipmi 29a54910152adf9bba4eefbe5e4cd071291775a4 +driver-core da6d647598a6d182eb6a0344a7b14ae005244399 +usb 313da01ad524771046beddb18faffc5b3caf930f +usb-gadget 1c11e74e9079289d8aaccc34b74cbf6463c0b791 +usb-serial e0439cd97573f1c7c6bf98e7a6d63de34daeaf8a +usb-chipidea-next c71d13f9a868e2ea4d31284bc7975c7ec145167f +phy-next bca21e930451416f92c0c4c679feb9d8fa33c08f +tty ea1be1e59b19017e61aa357d524b743ba5602d3c +char-misc fadbfc38dde26d31e901c3c85cf01332cb6a2224 +extcon b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +soundwire 3b71c69024a7d9700e33fd1f914d689151f7992d +thunderbolt ef7e12078ab832c72315adcfa05e7a9498a5e109 +staging 9d5d041eebe3dcf7591ff7004896c329eb841ca6 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 0d64189c361786643845c360682ffe838230f805 +dmaengine 9c5ba900e5111308f7680471dc743e9cb10c66d8 +cgroup 936f2a70f2077f64fab1dcb3eca71879e82ecd3f +scsi bca2c579a5e994deb764d8696e70dc309ac4eb8d +scsi-mkp 42b840bcfc16520f44b1ff51132ea720f86cb7ab +vhost cb91909e48a4809261ef4e967464e2009b214f06 +rpmsg bb949a8b3fe67da80fb3ddde6620919725d81d6f +gpio 70d7cd6c82a906bfc45e5043fed5456d46a92662 +gpio-brgl df51f402e3b15b00284309bd3016bb4536d2260c +gpio-intel 532e762d51d06291e3c40d5f7be8e42dce3b3d05 +pinctrl 8d93caaf4f6b7de4a1df082aec932c959ce0b63c +pinctrl-intel 653d96455e1e30811f4b9ec44d3b9df9bd7a55a3 +pinctrl-samsung 7efece8a057f62d7febbfcb4c5724530c0e033db +pwm b8fb642afa0277a0a9072fe119c1fce18437de0d +userns f06b71fe4d4cd0a4ad7e183b777564f696f6bb36 +ktest 3ff6685579ae0a122009e304bdefa4041c44fe8f +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 850d0cc64c8e2e0895acf735ac0a53c78b80dbe5 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching bf14b015bf516fc769a47ea56303e014c76a7ce1 +coresight 2b09498124205f976e414e722024adcf839eaee4 +rtc a5e6f964bb2c613933de58a35ddfa306128ba004 +nvdimm b86153077d5c704b62f9c866bc3fcdea65e701af +at24 8f3d9f354286745c751374f5f1fcafee6b3f3136 +ntb b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +seccomp c97aedc52dce4c87d4c44de4e6af941cd102600c +kspp 36f78758dca53bd4ee396ecf130aefa96b2a3016 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +nvmem 79e491b6b406cbeaa2e2b4731b4cf6d4691f26f6 +xarray 27586ca786a729cda6c807621a1494900a56e7bc +hyperv 11478f56f20e3be6d11043b501f3090375af4492 +auxdisplay 3f03b64981723b61048ea46642bcaa9b518f3ad3 +kgdb 2c308ef41351372a5c23a1047d71db3015ed7a9c +pidfd b2763dd39a789da5c628cc3aaf09680533b81f42 +devfreq 3aa66b690fdced8ac77528b54d3cd87a0f4b9c6b +hmm b223555dc4ed6efc321d23e78e55197cf0080ef3 +fpga eacfbf589c904bf8362cbd2d6cac123b0230e272 +kunit 48778464bb7d346b47157d21ffde2af6b2d39110 +cel 0a8e7b7d08466b5fc52f8e96070acc116d82a8bb +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 11399346ac39a26ade2a90303d38ad318163c665 +kunit-next d43c7fb05765152d4d4a39a8ef957c4ea14d8847 +trivial c1a371cf80fbc06280cc0064ca99a39d0428ded3 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 8613fc59031ea6fd7599fc266f2de6f8959f9266 +notifications 54e552c96d307cfa0099dd6adc6ea52d4d63a9a0 +fsinfo dbc87e74d022b3dfc687f6f7368b15a60ef3b04c +memblock 3346dd99fb4cd174fdbfb68dc62cd109e4323f0f +set_fs 2750e3608b796cd913564387ffd40f276e50ad21 +init d12bd437760b26638d610f4b58b933115c069927 +akpm-current 794cc0150f1229ff4c7d5db3f8776d53e445852e +akpm d3a0b365954e5e4728b6a92b171e4659199c6db5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e7f8d369ade1 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,328 @@ +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 +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.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 +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-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 +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 +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 +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 git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +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 +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 +safesetid git https://github.com/micah-morton/linux.git#safesetid-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 +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.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 +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +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 +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git#for-next +set_fs git git://git.infradead.org/users/hch/misc.git#set_fs-rw +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +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..89a452ac85f3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,14456 @@ +$ date -R +Mon, 20 Jul 2020 08:00:53 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 68% (6062/8869)
Updating files: 69% (6120/8869)
Updating files: 70% (6209/8869)
Updating files: 71% (6297/8869)
Updating files: 72% (6386/8869)
Updating files: 73% (6475/8869)
Updating files: 74% (6564/8869)
Updating files: 75% (6652/8869)
Updating files: 76% (6741/8869)
Updating files: 77% (6830/8869)
Updating files: 78% (6918/8869)
Updating files: 79% (7007/8869)
Updating files: 80% (7096/8869)
Updating files: 81% (7184/8869)
Updating files: 82% (7273/8869)
Updating files: 83% (7362/8869)
Updating files: 84% (7450/8869)
Updating files: 85% (7539/8869)
Updating files: 86% (7628/8869)
Updating files: 87% (7717/8869)
Updating files: 88% (7805/8869)
Updating files: 89% (7894/8869)
Updating files: 90% (7983/8869)
Updating files: 91% (8071/8869)
Updating files: 92% (8160/8869)
Updating files: 93% (8249/8869)
Updating files: 94% (8337/8869)
Updating files: 95% (8426/8869)
Updating files: 96% (8515/8869)
Updating files: 97% (8603/8869)
Updating files: 98% (8692/8869)
Updating files: 99% (8781/8869)
Updating files: 100% (8869/8869)
Updating files: 100% (8869/8869), done. +HEAD is now at 07a56bb875af Merge tag 'pm-5.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into master +Merging origin/master (92188b41f139 Merge tag 'perf-tools-fixes-2020-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into master) +$ git merge origin/master +Updating 07a56bb875af..92188b41f139 +Fast-forward + Documentation/filesystems/overlayfs.rst | 4 +- + Documentation/powerpc/vas-api.rst | 2 +- + MAINTAINERS | 5 +- + arch/arm/boot/dts/am437x-l4.dtsi | 14 ++- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 2 +- + arch/arm/boot/dts/meson.dtsi | 2 +- + arch/arm/boot/dts/socfpga.dtsi | 2 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +- + arch/arm/mach-imx/devices/devices-common.h | 2 +- + arch/arm/mach-imx/devices/platform-gpio-mxc.c | 5 +- + arch/arm/mach-imx/devices/platform-imx-dma.c | 6 +- + arch/arm/mach-imx/mm-imx21.c | 3 +- + arch/arm/mach-imx/mm-imx27.c | 3 +- + arch/arm/mach-omap2/omap_hwmod.c | 14 ++- + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 +- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 1 + + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 7 +- + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxl-s805x.dtsi | 24 ++++ + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 5 + + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 1 + + arch/arm64/configs/defconfig | 2 +- + arch/arm64/include/asm/debug-monitors.h | 2 + + arch/arm64/include/asm/syscall.h | 12 +- + arch/arm64/include/asm/thread_info.h | 1 + + arch/arm64/kernel/debug-monitors.c | 24 +++- + arch/arm64/kernel/ptrace.c | 49 ++++++-- + arch/arm64/kernel/signal.c | 11 +- + arch/arm64/kernel/syscall.c | 21 +++- + arch/mips/pci/pci-xtalk-bridge.c | 5 +- + arch/powerpc/include/asm/icswx.h | 2 + + arch/powerpc/kernel/paca.c | 2 +- + arch/powerpc/mm/book3s64/pkeys.c | 12 +- + arch/powerpc/platforms/powernv/vas-fault.c | 2 +- + arch/riscv/include/asm/barrier.h | 10 +- + arch/riscv/include/asm/thread_info.h | 4 + + arch/x86/boot/compressed/Makefile | 4 +- + arch/x86/entry/Makefile | 14 ++- + arch/x86/entry/common.c | 4 +- + arch/x86/include/asm/idtentry.h | 22 ++-- + arch/x86/include/asm/io_bitmap.h | 16 +++ + arch/x86/include/asm/paravirt.h | 5 + + arch/x86/include/asm/paravirt_types.h | 1 + + arch/x86/kernel/apic/io_apic.c | 10 +- + arch/x86/kernel/apic/msi.c | 18 ++- + arch/x86/kernel/apic/vector.c | 23 +--- + arch/x86/kernel/paravirt.c | 3 +- + arch/x86/kernel/process.c | 18 +-- + arch/x86/kernel/traps.c | 2 + + arch/x86/math-emu/wm_sqrt.S | 2 +- + arch/x86/platform/uv/uv_irq.c | 3 +- + arch/x86/xen/enlighten_pv.c | 12 ++ + drivers/base/regmap/Kconfig | 2 +- + drivers/base/regmap/regmap-debugfs.c | 52 ++++---- + drivers/base/regmap/regmap.c | 2 +- + drivers/bus/ti-sysc.c | 23 ++-- + drivers/dma-buf/dma-buf.c | 11 +- + drivers/firmware/efi/libstub/arm64-stub.c | 25 ++-- + drivers/firmware/efi/libstub/efi-stub-helper.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 20 +++- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 26 ++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +++ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 11 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 53 ++++----- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 19 ++- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 33 ++++-- + drivers/gpu/drm/i915/display/intel_hdmi.c | 10 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 19 +-- + drivers/gpu/drm/i915/gt/selftest_rps.c | 8 +- + drivers/gpu/drm/i915/i915_drv.h | 1 + + drivers/gpu/drm/i915/i915_perf.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 8 +- + drivers/hid/hid-alps.c | 2 + + drivers/hid/hid-apple.c | 18 +++ + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-logitech-dj.c | 6 +- + drivers/hid/hid-logitech-hidpp.c | 2 +- + drivers/hid/hid-magicmouse.c | 6 + + drivers/hid/hid-quirks.c | 2 + + drivers/hid/hid-steam.c | 6 +- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++ + drivers/hwmon/amd_energy.c | 2 +- + drivers/hwmon/aspeed-pwm-tacho.c | 2 + + drivers/hwmon/drivetemp.c | 43 +++++++ + drivers/hwmon/emc2103.c | 2 +- + drivers/hwmon/nct6775.c | 6 +- + drivers/hwmon/pmbus/adm1275.c | 10 +- + drivers/hwmon/scmi-hwmon.c | 2 +- + drivers/iommu/amd/iommu.c | 5 +- + drivers/iommu/hyperv-iommu.c | 5 +- + drivers/iommu/intel/irq_remapping.c | 2 +- + drivers/mfd/ioc3.c | 5 +- + drivers/nvme/host/core.c | 1 + + drivers/nvme/host/nvme.h | 13 ++ + drivers/pci/controller/vmd.c | 5 +- + drivers/perf/arm-cci.c | 1 + + drivers/perf/arm-ccn.c | 1 + + drivers/perf/arm_dsu_pmu.c | 1 + + drivers/perf/arm_smmuv3_pmu.c | 2 + + drivers/perf/arm_spe_pmu.c | 1 + + drivers/perf/fsl_imx8_ddr_perf.c | 2 + + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 2 + + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 2 + + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 + + drivers/perf/qcom_l2_pmu.c | 1 + + drivers/perf/qcom_l3_pmu.c | 1 + + drivers/perf/thunderx2_pmu.c | 1 + + drivers/perf/xgene_pmu.c | 1 + + drivers/regulator/Makefile | 2 +- + drivers/regulator/{da903x.c => da903x-regulator.c} | 0 + drivers/regulator/qcom_smd-regulator.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 - + drivers/soc/amlogic/meson-gx-socinfo.c | 8 +- + drivers/soc/imx/soc-imx.c | 3 + + drivers/spi/spi-mt65xx.c | 15 +-- + drivers/spi/spi-sun6i.c | 14 +-- + drivers/thunderbolt/tunnel.c | 12 +- + drivers/usb/c67x00/c67x00-sched.c | 2 +- + drivers/usb/cdns3/ep0.c | 30 ++--- + drivers/usb/cdns3/trace.h | 6 +- + drivers/usb/chipidea/core.c | 24 ++++ + drivers/usb/dwc2/platform.c | 3 +- + drivers/usb/dwc3/dwc3-pci.c | 8 ++ + drivers/usb/gadget/function/f_uac1_legacy.c | 2 + + drivers/usb/gadget/udc/atmel_usba_udc.c | 10 +- + drivers/usb/gadget/udc/gr_udc.c | 7 +- + drivers/usb/gadget/usbstring.c | 2 +- + drivers/usb/serial/ch341.c | 1 + + drivers/usb/serial/cypress_m8.c | 2 + + drivers/usb/serial/cypress_m8.h | 3 + + drivers/usb/serial/iuu_phoenix.c | 8 +- + drivers/usb/serial/option.c | 6 + + fs/fuse/file.c | 132 ++++++++++++--------- + fs/fuse/inode.c | 19 ++- + fs/io_uring.c | 10 +- + fs/namespace.c | 1 + + fs/nfs/direct.c | 13 +- + fs/nfs/file.c | 1 - + fs/nfs/nfs4proc.c | 20 +++- + fs/overlayfs/copy_up.c | 2 +- + fs/overlayfs/export.c | 2 +- + fs/overlayfs/file.c | 10 +- + fs/overlayfs/namei.c | 15 +-- + fs/overlayfs/overlayfs.h | 1 - + fs/overlayfs/super.c | 73 ++++++++---- + include/asm-generic/mmiowb.h | 6 +- + include/linux/dma-buf.h | 1 + + include/linux/dma-direct.h | 1 + + include/linux/fs_context.h | 1 + + include/linux/sched.h | 4 - + kernel/dma/direct.c | 2 +- + kernel/dma/pool.c | 91 ++++++++------ + kernel/irq/manage.c | 37 +++++- + kernel/sched/core.c | 69 ++++++++--- + kernel/sched/fair.c | 15 ++- + kernel/time/timer.c | 21 +++- + net/sunrpc/xprtrdma/rpc_rdma.c | 4 +- + net/sunrpc/xprtrdma/transport.c | 5 + + net/sunrpc/xprtrdma/verbs.c | 35 +++--- + sound/pci/hda/patch_realtek.c | 28 ++++- + sound/usb/line6/capture.c | 2 + + sound/usb/line6/driver.c | 2 +- + sound/usb/line6/playback.c | 2 + + sound/usb/midi.c | 17 ++- + tools/arch/x86/include/uapi/asm/kvm.h | 5 +- + tools/lib/subcmd/parse-options.c | 3 + + tools/perf/util/hashmap.h | 12 +- + .../testing/selftests/powerpc/nx-gzip/gunz_test.c | 4 +- + .../testing/selftests/powerpc/nx-gzip/gzfht_test.c | 4 +- + 174 files changed, 1211 insertions(+), 594 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s805x.dtsi + rename drivers/regulator/{da903x.c => da903x-regulator.c} (100%) +Merging fixes/master (dbf24e30ce2e 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 (20b1be595282 kbuild: fix single target builds for external modules) +$ git merge kbuild-current/fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 +- + scripts/mod/modpost.c | 12 ++++++++++-- + 2 files changed, 11 insertions(+), 3 deletions(-) +Merging arc-current/for-curr (11ba468877bb Linux 5.8-rc5) +$ git merge arc-current/for-curr +Already up to date. +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 (2648298a06ba Merge tag 'socfpga_fixes_for_v5.8_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2) +$ git merge uniphier-fixes/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (f32ed8eb0e3f drivers/perf: Prevent forced unbinding of PMU drivers) +$ 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 (f0479c4bcbd9 selftests/powerpc: Use proper error code to check fault address) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (dd9ce2d6eeae MAINTAINERS: update email address for Gerald Schaefer) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (37719576046b arch/sparc: Replace HTTP links with HTTPS ones) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/kernel/viohs.c | 6 ++---- + 3 files changed, 7 insertions(+), 5 deletions(-) +Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (2ccb0161a0e9 net: macb: use phy_interface_mode_is_rgmii everywhere) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/driver-api/ptp.rst | 12 ++ + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 1 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 9 ++ + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 + + drivers/net/ethernet/aquantia/atlantic/aq_phy.c | 29 ++++- + drivers/net/ethernet/aquantia/atlantic/aq_phy.h | 8 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 19 +++ + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 22 ++-- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 5 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 138 +++++++++------------ + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 - + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 22 ++-- + drivers/net/ethernet/cadence/macb_main.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- + drivers/net/ethernet/freescale/fec.h | 1 + + drivers/net/ethernet/freescale/fec_main.c | 23 +++- + drivers/net/ethernet/freescale/fec_ptp.c | 12 ++ + drivers/net/ethernet/freescale/gianfar.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 3 +- + drivers/net/ethernet/smsc/smc91x.c | 4 +- + drivers/net/hippi/rrunner.c | 2 +- + drivers/net/phy/dp83640.c | 4 + + drivers/net/usb/ax88172a.c | 1 + + drivers/net/usb/hso.c | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 16 ++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 1 + + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 2 + + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 20 ++- + drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 15 --- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 4 + + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 30 +++++ + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 13 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 3 + + drivers/net/wireless/mediatek/mt76/tx.c | 7 ++ + drivers/net/wireless/mediatek/mt76/usb.c | 39 ++++-- + net/core/rtnetlink.c | 3 +- + net/ipv6/ip6_gre.c | 11 +- + net/nfc/nci/core.c | 5 +- + net/vmw_vsock/virtio_transport.c | 2 +- + .../selftests/net/fib_nexthop_multiprefix.sh | 2 +- + tools/testing/selftests/net/ip_defrag.sh | 2 + + 49 files changed, 362 insertions(+), 194 deletions(-) +Merging bpf/master (5b801dfb7feb bpf: Fix NULL pointer dereference in __btf_resolve_helper_id()) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/btf.c | 5 +++++ + tools/testing/selftests/bpf/verifier/event_output.c | 1 + + 2 files changed, 6 insertions(+) +Merging ipsec/master (17175d1a27c6 xfrm: esp6: fix encapsulation header offset computation) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 11 +++++++---- + net/ipv6/esp6.c | 12 +++++++++--- + net/key/af_key.c | 4 ++-- + net/xfrm/xfrm_policy.c | 39 ++++++++++++++++----------------------- + net/xfrm/xfrm_user.c | 18 +++++++++++------- + 5 files changed, 45 insertions(+), 39 deletions(-) +Merging netfilter/master (1e9451cbda45 netfilter: nf_tables: fix nat hook table deletion) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nf_tables_api.c | 41 ++++++++++++++--------------------------- + 1 file changed, 14 insertions(+), 27 deletions(-) +Merging ipvs/master (eadede5f9362 Merge branch 'hns3-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (dc7bd30b97aa mt76: mt7615: fix EEPROM buffer size) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (8ff41cc21714 net: qrtr: Fix an out of bounds read qrtr_endpoint_post()) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (87c4c774cbef RDMA/cm: Protect access to remote_sidr_table) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cm.c | 2 ++ + drivers/infiniband/core/rdma_core.c | 6 +++--- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 34 +++++++++++++++++++----------- + drivers/infiniband/hw/hns/hns_roce_mr.c | 2 +- + drivers/infiniband/hw/mlx5/srq_cmd.c | 4 ++-- + 5 files changed, 30 insertions(+), 18 deletions(-) +Merging sound-current/for-linus (568e4e82128a ALSA: hda/realtek: Fixed ALC298 sound bug by adding quirk for Samsung Notebook Pen S) +$ git merge sound-current/for-linus +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/sound/simple-card.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/simple-card.yaml | 17 +++-- + MAINTAINERS | 7 +- + include/sound/rt5670.h | 1 + + include/sound/soc-dai.h | 1 + + include/sound/soc.h | 2 + + sound/core/info.c | 4 +- + sound/pci/hda/patch_realtek.c | 1 + + sound/soc/amd/raven/pci-acp3x.c | 4 +- + sound/soc/codecs/max98373.c | 8 --- + sound/soc/codecs/rt286.c | 8 +-- + sound/soc/codecs/rt5670.c | 75 +++++++++++++++++----- + sound/soc/codecs/rt5670.h | 2 +- + sound/soc/codecs/rt5682.c | 46 ++++++++----- + sound/soc/codecs/wm8974.c | 6 +- + sound/soc/generic/audio-graph-card.c | 4 +- + sound/soc/generic/simple-card.c | 4 +- + sound/soc/intel/boards/bdw-rt5677.c | 1 + + sound/soc/intel/boards/bytcht_es8316.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 23 ++++--- + sound/soc/qcom/Kconfig | 2 +- + sound/soc/rockchip/rk3399_gru_sound.c | 13 ++++ + sound/soc/soc-core.c | 27 ++++++++ + sound/soc/soc-dai.c | 38 +++++++++++ + sound/soc/soc-devres.c | 8 ++- + sound/soc/soc-generic-dmaengine-pcm.c | 2 +- + sound/soc/soc-topology.c | 24 +++++-- + sound/soc/sof/core.c | 10 +-- + sound/soc/sof/imx/imx8.c | 8 +++ + sound/soc/sof/imx/imx8m.c | 8 +++ + 29 files changed, 266 insertions(+), 92 deletions(-) +Merging sound-asoc-fixes/for-linus (6da0f19f6b6a Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/meson/axg-card.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging regmap-fixes/for-linus (2b0f61e27f75 Merge remote-tracking branch 'regmap/for-5.8' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (cb4a3eacd2f7 Merge remote-tracking branch 'regulator/for-5.8' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging spi-fixes/for-linus (91b93f94a192 Merge remote-tracking branch 'spi/for-5.8' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (915930414828 Revert "PCI/PM: Assume ports without DLL Link Active train links in 100 ms") +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/pci.c | 30 +++++++++--------------------- + 1 file changed, 9 insertions(+), 21 deletions(-) +Merging driver-core.current/driver-core-linus (50ad1c2155a3 Merge tag 'driver-core-5.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into master) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (7531ee3147ed Merge tag 'tty-5.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into master) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (c7300cdf8f68 Merge tag 'usb-serial-5.8-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (8778eb0927dd usb: gadget: function: fix missing spinlock in f_uac1_legacy) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (e7b931bee739 USB: serial: iuu_phoenix: fix memory corruption) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (38b1927e5bf9 phy: sun4i-usb: fix dereference of pointer phy0 before it is null checked) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (6a058f0be518 Merge tag 'staging-5.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging into master) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (b279b1fe5799 Merge tag 'misc-habanalabs-fixes-2020-07-10' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + .../ABI/testing/debugfs-driver-habanalabs | 11 +- + drivers/misc/habanalabs/debugfs.c | 23 ++-- + drivers/misc/habanalabs/device.c | 2 +- + drivers/misc/habanalabs/firmware_if.c | 10 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 123 ++++++++++++++------- + drivers/misc/habanalabs/goya/goya.c | 20 ++-- + drivers/misc/habanalabs/habanalabs.h | 19 +++- + drivers/misc/habanalabs/habanalabs_drv.c | 2 +- + drivers/misc/habanalabs/hwmon.c | 19 ++-- + drivers/misc/habanalabs/sysfs.c | 11 +- + 10 files changed, 147 insertions(+), 93 deletions(-) +Merging soundwire-fixes/fixes (bf6d6e68d202 soundwire: intel: fix memory leak with devm_kasprintf) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (8b94a4b92327 thunderbolt: Fix path indices used in USB3 tunnel discovery) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (a50ca29523b1 Input: elan_i2c - add more hardware ID for Lenovo laptops) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (e04ec0de61c1 padata: upgrade smp_mb__after_atomic to smp_mb in padata_do_serial) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (b3a9e3b9622a Linux 5.8-rc1) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (b872d0640840 vfio/pci: fix racy on error and request eventfd ctx) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 5 +++++ + 1 file changed, 5 insertions(+) +Merging kselftest-fixes/fixes (3c01655ac82e kselftest: ksft_test_num return type should be unsigned) +$ 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 dmaengine-fixes/fixes (87730ccbddcb dmaengine: ioat setting ioat timeout as module parameter) +$ git merge dmaengine-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 (880bc529bae2 mtd: rawnand: xway: Fix build issue) +$ 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 (5868347a192a MIPS: Do not use smp_processor_id() in preemptible code) +$ 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 (2a4117df9b43 ARM: dts: Fix dcan driver probe failed on am437x platform) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (3d9fdc252b52 KVM: MIPS: Fix build errors for 32bit kernel) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (c66ef39eb27f hwmon: (drivetemp) Avoid SCT usage on Toshiba DT01ACA family drives) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (543094e19c82 nvdimm/region: always show the 'align' attribute) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (23e44faaf8e2 Merge branch 'misc-5.8' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (8d95867c8610 copy_xstate_to_kernel: Fix typo which caused GDB regression) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + arch/x86/kernel/fpu/xstate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dma-mapping-fixes/for-linus (d9765e41d8e9 dma-pool: do not allocate pool memory from CMA) +$ 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 (f8456690ba8e Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux into master) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (0115e6c98c22 dt-bindings: clock: imx: Fix e-mail address) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (07d3f0455002 scsi: megaraid_sas: Remove undefined ENABLE_IRQ_POLL macro) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (adbe8a3cae94 Merge tag 'amd-drm-fixes-5.8-2020-07-15' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (92e0575b9983 drm/i915: Recalculate FBC w/a stride when needed) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (ebd4050c6144 mmc: sdhci-of-aspeed: Fix clock divider calculation) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci-of-aspeed.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (77b48bea2fee Drivers: hv: Change flag to write log level in panic msg to false) +$ 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 (38b7c2a3ffb1 RISC-V: Upgrade smp_mb__after_spinlock() to iorw,iorw) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (c17d1a3a8ee4 fork: annotate data race in copy_process()) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) +$ git merge fpga-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-afu-main.c | 3 ++- + drivers/fpga/dfl-pci.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging spdx/spdx-linus (3d77e6a8804a Linux 5.7) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (45c11a927606 pinctrl: baytrail: Fix pin being driven low for a while on gpiod_get(..., GPIOD_OUT_HIGH)) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3) +$ 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 kunit-fixes/kunit-fixes (c63d2dd7e134 Documentation: kunit: Add some troubleshooting tips to the FAQ) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (baa1841eb797 drm: sun4i: hdmi: Fix inverted HPD result) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kspp-gustavo/for-next/kspp (48778464bb7d Linux 5.8-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (0816600a3111 Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging arch/x86/boot/compressed/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig-language.rst | 4 ++-- + Makefile | 5 ++--- + arch/Kconfig | 3 --- + arch/arm/boot/compressed/Makefile | 3 +-- + arch/mips/vdso/Makefile | 3 +-- + arch/powerpc/boot/Makefile | 2 ++ + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/platforms/powermac/Makefile | 2 +- + arch/s390/Makefile | 2 +- + arch/sparc/vdso/Makefile | 4 ++-- + arch/um/Makefile | 3 +-- + arch/x86/Makefile | 4 ++-- + arch/x86/boot/compressed/Makefile | 4 ++-- + arch/x86/entry/vdso/Makefile | 4 ++-- + arch/x86/kernel/cpu/Makefile | 3 +-- + arch/x86/lib/Makefile | 2 +- + arch/x86/mm/Makefile | 7 +++---- + arch/x86/power/Makefile | 3 +-- + arch/x86/purgatory/Makefile | 2 +- + arch/x86/um/vdso/Makefile | 2 +- + arch/x86/xen/Makefile | 5 ++--- + arch/xtensa/boot/boot-elf/Makefile | 2 +- + drivers/firmware/efi/libstub/Makefile | 4 ++-- + drivers/xen/Makefile | 3 +-- + lib/Makefile | 4 ++-- + mm/kasan/Makefile | 2 +- + scripts/Makefile.build | 8 +++----- + scripts/Makefile.lib | 3 +-- + scripts/checkkconfigsymbols.py | 2 +- + scripts/checkpatch.pl | 6 +----- + scripts/kconfig/lexer.l | 2 +- + scripts/kconfig/qconf.cc | 12 ++++++++++-- + scripts/kconfig/qconf.h | 4 ++++ + scripts/link-vmlinux.sh | 4 ++++ + scripts/package/buildtar | 12 ++++++++++++ + 35 files changed, 74 insertions(+), 63 deletions(-) +Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (23efed6fa751 dma-debug: use named initializers for dir2name) +$ git merge dma-mapping/for-next +Auto-merging include/linux/device.h +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/Kconfig | 1 + + arch/arm/Kconfig | 1 + + arch/ia64/Kconfig | 1 + + arch/mips/Kconfig | 1 + + arch/parisc/Kconfig | 1 + + arch/powerpc/Kconfig | 2 + + arch/powerpc/include/asm/device.h | 5 - + arch/powerpc/kernel/dma-iommu.c | 90 ++------------ + arch/s390/Kconfig | 1 + + arch/sparc/Kconfig | 1 + + arch/x86/Kconfig | 1 + + drivers/infiniband/core/device.c | 6 +- + drivers/iommu/Kconfig | 2 + + drivers/macintosh/macio_asic.c | 4 +- + drivers/misc/mic/Kconfig | 4 + + drivers/vdpa/Kconfig | 1 + + drivers/xen/Kconfig | 1 + + include/linux/device.h | 11 +- + include/linux/dma-direct.h | 104 ++++++++++++++++ + include/linux/dma-mapping.h | 251 +++++--------------------------------- + kernel/dma/Kconfig | 12 ++ + kernel/dma/Makefile | 3 +- + kernel/dma/debug.c | 8 +- + kernel/dma/direct.c | 74 ----------- + kernel/dma/mapping.c | 214 ++++++++++++++++++++++++++++++-- + 25 files changed, 401 insertions(+), 399 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 (5fef5dc17f09 Merge branch 'for-next/mte' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging fs/namespace.c +Auto-merging arch/arm64/kernel/syscall.c +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging arch/arm64/kernel/entry.S +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm64/include/asm/pgtable-prot.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging Documentation/arm64/cpu-feature-registers.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kdump/vmcoreinfo.rst | 16 ++ + Documentation/arm64/cpu-feature-registers.rst | 2 + + Documentation/arm64/elf_hwcaps.rst | 4 + + Documentation/arm64/index.rst | 1 + + Documentation/arm64/memory-tagging-extension.rst | 305 ++++++++++++++++++++ + arch/arm64/Kconfig | 53 +++- + arch/arm64/Makefile | 7 + + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/acpi.h | 15 +- + arch/arm64/include/asm/cpucaps.h | 8 +- + arch/arm64/include/asm/cpufeature.h | 13 + + arch/arm64/include/asm/hugetlb.h | 2 + + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/kvm_arm.h | 3 +- + arch/arm64/include/asm/memory.h | 18 +- + arch/arm64/include/asm/mman.h | 56 +++- + arch/arm64/include/asm/mte.h | 86 ++++++ + arch/arm64/include/asm/page.h | 19 +- + arch/arm64/include/asm/pgtable-hwdef.h | 19 +- + arch/arm64/include/asm/pgtable-prot.h | 2 + + arch/arm64/include/asm/pgtable.h | 56 +++- + arch/arm64/include/asm/processor.h | 12 +- + arch/arm64/include/asm/stage2_pgtable.h | 9 + + arch/arm64/include/asm/sysreg.h | 106 +++++++ + arch/arm64/include/asm/thread_info.h | 4 +- + arch/arm64/include/asm/tlb.h | 29 +- + arch/arm64/include/asm/tlbflush.h | 177 +++++++++++- + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/include/uapi/asm/mman.h | 1 + + arch/arm64/include/uapi/asm/ptrace.h | 4 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/acpi.c | 75 +++++ + arch/arm64/kernel/cpufeature.c | 216 ++++++++++++--- + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/crash_core.c | 10 + + arch/arm64/kernel/entry.S | 37 +++ + arch/arm64/kernel/hibernate.c | 118 ++++++++ + arch/arm64/kernel/module-plts.c | 46 +++- + arch/arm64/kernel/mte.c | 337 +++++++++++++++++++++++ + arch/arm64/kernel/process.c | 45 ++- + arch/arm64/kernel/ptrace.c | 53 +++- + arch/arm64/kernel/setup.c | 24 +- + arch/arm64/kernel/signal.c | 9 + + arch/arm64/kernel/stacktrace.c | 2 +- + arch/arm64/kernel/suspend.c | 4 + + arch/arm64/kernel/syscall.c | 10 + + arch/arm64/kvm/sys_regs.c | 2 + + arch/arm64/lib/Makefile | 2 + + arch/arm64/lib/mte.S | 151 ++++++++++ + arch/arm64/mm/Makefile | 1 + + arch/arm64/mm/copypage.c | 25 +- + arch/arm64/mm/dump.c | 4 + + arch/arm64/mm/fault.c | 9 +- + arch/arm64/mm/hugetlbpage.c | 42 ++- + arch/arm64/mm/init.c | 22 +- + arch/arm64/mm/mmu.c | 22 +- + arch/arm64/mm/mteswap.c | 83 ++++++ + arch/arm64/mm/proc.S | 8 +- + arch/x86/kernel/signal_compat.c | 2 +- + fs/namespace.c | 25 +- + fs/proc/page.c | 3 + + fs/proc/task_mmu.c | 4 + + include/asm-generic/tlb.h | 55 +++- + include/linux/arm-smccc.h | 44 +-- + include/linux/kernel-page-flags.h | 1 + + include/linux/mm.h | 8 + + include/linux/mman.h | 23 +- + include/linux/page-flags.h | 3 + + include/linux/pgtable.h | 28 ++ + include/trace/events/mmflags.h | 9 +- + include/uapi/asm-generic/siginfo.h | 4 +- + include/uapi/linux/elf.h | 1 + + include/uapi/linux/prctl.h | 9 + + kernel/crash_core.c | 1 + + mm/huge_memory.c | 3 + + mm/mmap.c | 9 + + mm/mprotect.c | 6 + + mm/page_io.c | 10 + + mm/shmem.c | 9 + + mm/swapfile.c | 2 + + mm/util.c | 2 +- + tools/vm/page-types.c | 2 + + 82 files changed, 2437 insertions(+), 215 deletions(-) + create mode 100644 Documentation/arm64/memory-tagging-extension.rst + create mode 100644 arch/arm64/include/asm/mte.h + create mode 100644 arch/arm64/kernel/mte.c + create mode 100644 arch/arm64/lib/mte.S + create mode 100644 arch/arm64/mm/mteswap.c +Merging arm-perf/for-next/perf (f011856ce7b6 perf/smmuv3: To simplify code for ioremap page in pmcg) +$ git merge arm-perf/for-next/perf +Auto-merging drivers/perf/arm_smmuv3_pmu.c +Merge made by the 'recursive' strategy. + drivers/perf/arm_smmuv3_pmu.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging arm-soc/for-next (fe6031092b43 soc: document merges) +$ git merge arm-soc/for-next +Auto-merging include/linux/arm-smccc.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/omap3-n900.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-optee-devices | 8 + + Documentation/ABI/testing/sysfs-devices-soc | 30 + + .../devicetree/bindings/arm/intel,keembay.yaml | 19 + + .../devicetree/bindings/arm/mediatek.yaml | 5 + + Documentation/devicetree/bindings/arm/renesas.yaml | 13 + + Documentation/devicetree/bindings/arm/tegra.yaml | 18 + + .../bindings/fuse/nvidia,tegra20-fuse.txt | 5 +- + .../devicetree/bindings/gpu/nvidia,gk20a.txt | 25 + + .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 19 +- + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 9 + + arch/arm/boot/dts/Makefile | 5 + + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-leds.dtsi | 2 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-bone.dts | 2 +- + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +- + arch/arm/boot/dts/am335x-boneblack.dts | 146 +- + arch/arm/boot/dts/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/am335x-bonegreen-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 2 +- + arch/arm/boot/dts/am335x-bonegreen.dts | 2 +- + arch/arm/boot/dts/am335x-chiliboard.dts | 2 +- + arch/arm/boot/dts/am335x-chilisom.dtsi | 2 +- + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-guardian.dts | 2 +- + arch/arm/boot/dts/am335x-icev2.dts | 2 +- + arch/arm/boot/dts/am335x-lxm.dts | 2 +- + arch/arm/boot/dts/am335x-netcan-plus-1xx.dts | 2 +- + arch/arm/boot/dts/am335x-netcom-plus-2xx.dts | 2 +- + arch/arm/boot/dts/am335x-netcom-plus-8xx.dts | 2 +- + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 4 +- + arch/arm/boot/dts/am335x-osd335x-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-pdu001.dts | 2 +- + arch/arm/boot/dts/am335x-pocketbeagle.dts | 271 ++- + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 2 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 24 + + arch/arm/boot/dts/am33xx.dtsi | 2 +- + arch/arm/boot/dts/am3517-craneboard.dts | 2 +- + arch/arm/boot/dts/am3517-evm-ui.dtsi | 2 +- + arch/arm/boot/dts/am3517-evm.dts | 2 +- + arch/arm/boot/dts/am3517.dtsi | 6 +- + arch/arm/boot/dts/am3874-iceboard.dts | 4 +- + arch/arm/boot/dts/am4372.dtsi | 4 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 2 +- + arch/arm/boot/dts/am437x-l4.dtsi | 2 - + arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am57-pruss.dtsi | 2 +- + arch/arm/boot/dts/am5718.dtsi | 2 +- + arch/arm/boot/dts/am571x-idk.dts | 2 +- + arch/arm/boot/dts/am5728.dtsi | 2 +- + arch/arm/boot/dts/am5729-beagleboneai.dts | 73 +- + arch/arm/boot/dts/am572x-idk-common.dtsi | 2 +- + arch/arm/boot/dts/am572x-idk.dts | 2 +- + arch/arm/boot/dts/am5748.dtsi | 2 +- + arch/arm/boot/dts/am574x-idk.dts | 2 +- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +- + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +- + arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 2 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 2 +- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 2 +- + arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +- + arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- + arch/arm/boot/dts/bcm21664.dtsi | 2 +- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 5 + + arch/arm/boot/dts/bcm2711.dtsi | 15 + + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 25 + + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 20 + + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 20 + + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 40 + + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 25 + + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 20 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 40 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 40 + + arch/arm/boot/dts/dra7-dspeve-thermal.dtsi | 2 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 2 +- + arch/arm/boot/dts/dra7-evm.dts | 2 +- + arch/arm/boot/dts/dra7-iva-thermal.dtsi | 2 +- + arch/arm/boot/dts/dra7-l4.dtsi | 4 - + arch/arm/boot/dts/dra7.dtsi | 2 +- + arch/arm/boot/dts/dra71-evm.dts | 2 +- + arch/arm/boot/dts/dra71x.dtsi | 2 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +- + arch/arm/boot/dts/dra72-evm-revc.dts | 2 +- + arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 4 +- + arch/arm/boot/dts/dra72-evm.dts | 2 +- + arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 2 +- + arch/arm/boot/dts/dra72x.dtsi | 2 +- + arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 2 +- + arch/arm/boot/dts/dra74x.dtsi | 60 +- + arch/arm/boot/dts/dra76-evm.dts | 2 +- + arch/arm/boot/dts/dra76x.dtsi | 2 +- + arch/arm/boot/dts/meson.dtsi | 7 + + arch/arm/boot/dts/meson8.dtsi | 32 + + arch/arm/boot/dts/meson8b-ec100.dts | 25 + + arch/arm/boot/dts/meson8b-odroidc1.dts | 26 + + arch/arm/boot/dts/meson8b.dtsi | 47 + + arch/arm/boot/dts/meson8m2.dtsi | 23 + + arch/arm/boot/dts/omap2.dtsi | 2 +- + arch/arm/boot/dts/omap2420-h4.dts | 2 +- + arch/arm/boot/dts/omap2420.dtsi | 2 +- + arch/arm/boot/dts/omap2430-sdp.dts | 2 +- + arch/arm/boot/dts/omap2430.dtsi | 2 +- + arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 2 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +- + arch/arm/boot/dts/omap3-beagle.dts | 2 +- + arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 2 +- + arch/arm/boot/dts/omap3-evm-37xx.dts | 2 +- + arch/arm/boot/dts/omap3-evm.dts | 2 +- + arch/arm/boot/dts/omap3-ha-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-ha-lcd.dts | 2 +- + arch/arm/boot/dts/omap3-ha.dts | 2 +- + arch/arm/boot/dts/omap3-ldp.dts | 2 +- + arch/arm/boot/dts/omap3-n900.dts | 6 +- + arch/arm/boot/dts/omap3-tao3530.dtsi | 8 +- + arch/arm/boot/dts/omap3-thunder.dts | 2 +- + arch/arm/boot/dts/omap3-zoom3.dts | 2 +- + arch/arm/boot/dts/omap3.dtsi | 59 +- + arch/arm/boot/dts/omap3430-sdp.dts | 2 +- + arch/arm/boot/dts/omap34xx.dtsi | 2 +- + arch/arm/boot/dts/omap36xx.dtsi | 2 +- + arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 2 +- + arch/arm/boot/dts/omap4-l4-abe.dtsi | 20 +- + arch/arm/boot/dts/omap4-l4.dtsi | 37 +- + arch/arm/boot/dts/omap4-panda-a4.dts | 2 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 36 +- + arch/arm/boot/dts/omap4-panda-es.dts | 2 +- + arch/arm/boot/dts/omap4-panda.dts | 2 +- + arch/arm/boot/dts/omap4-sdp-es23plus.dts | 2 +- + arch/arm/boot/dts/omap4-sdp.dts | 6 +- + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +- + arch/arm/boot/dts/omap4.dtsi | 33 +- + arch/arm/boot/dts/omap443x.dtsi | 2 +- + arch/arm/boot/dts/omap4460.dtsi | 2 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- + arch/arm/boot/dts/omap5-core-thermal.dtsi | 2 +- + arch/arm/boot/dts/omap5-gpu-thermal.dtsi | 2 +- + arch/arm/boot/dts/omap5-l4-abe.dtsi | 20 +- + arch/arm/boot/dts/omap5-l4.dtsi | 38 +- + arch/arm/boot/dts/omap5-uevm.dts | 36 +- + arch/arm/boot/dts/omap5.dtsi | 27 +- + arch/arm/boot/dts/r7s72100.dtsi | 4 +- + arch/arm/boot/dts/r7s9210.dtsi | 4 +- + arch/arm/boot/dts/r8a73a4.dtsi | 6 +- + arch/arm/boot/dts/r8a7740.dtsi | 6 +- + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 97 + + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 187 ++ + arch/arm/boot/dts/r8a7742.dtsi | 854 ++++++++ + arch/arm/boot/dts/r8a7743.dtsi | 6 +- + arch/arm/boot/dts/r8a7744.dtsi | 6 +- + arch/arm/boot/dts/r8a7745.dtsi | 6 +- + arch/arm/boot/dts/r8a77470.dtsi | 6 +- + arch/arm/boot/dts/r8a7778.dtsi | 9 +- + arch/arm/boot/dts/r8a7779.dtsi | 8 +- + arch/arm/boot/dts/r8a7790-lager.dts | 1 - + arch/arm/boot/dts/r8a7790.dtsi | 8 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 1 - + arch/arm/boot/dts/r8a7791-porter.dts | 1 - + arch/arm/boot/dts/r8a7791.dtsi | 6 +- + arch/arm/boot/dts/r8a7792.dtsi | 2 +- + arch/arm/boot/dts/r8a7793-gose.dts | 5 +- + arch/arm/boot/dts/r8a7793.dtsi | 6 +- + arch/arm/boot/dts/r8a7794-alt.dts | 1 - + arch/arm/boot/dts/r8a7794-silk.dts | 1 - + arch/arm/boot/dts/r8a7794.dtsi | 6 +- + arch/arm/boot/dts/r9a06g032.dtsi | 2 +- + arch/arm/boot/dts/sh73a0.dtsi | 7 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 149 +- + arch/arm/boot/dts/tegra114-roth.dts | 141 +- + arch/arm/boot/dts/tegra114-tn7.dts | 84 +- + arch/arm/boot/dts/tegra114.dtsi | 48 +- + arch/arm/boot/dts/tegra124-apalis-eval.dts | 4 +- + arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 4 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 5 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 5 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 263 ++- + arch/arm/boot/dts/tegra124-nyan-big.dts | 3 +- + arch/arm/boot/dts/tegra124-nyan-blaze.dts | 1 + + arch/arm/boot/dts/tegra124-nyan.dtsi | 283 ++- + arch/arm/boot/dts/tegra124-venice2.dts | 284 ++- + arch/arm/boot/dts/tegra124.dtsi | 59 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 1438 ++++++++++++++ + arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra20-colibri-iris.dts | 2 +- + arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi | 98 +- + arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 98 +- + arch/arm/boot/dts/tegra20-harmony.dts | 140 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 68 +- + arch/arm/boot/dts/tegra20-paz00.dts | 61 +- + arch/arm/boot/dts/tegra20-plutux.dts | 66 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 152 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 39 +- + arch/arm/boot/dts/tegra20-tec.dts | 66 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 104 +- + arch/arm/boot/dts/tegra20-ventana.dts | 106 +- + arch/arm/boot/dts/tegra20.dtsi | 91 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 4 +- + arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 8 +- + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 5 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 5 +- + .../boot/dts/tegra30-asus-nexus7-grouper-E1565.dts | 9 + + .../boot/dts/tegra30-asus-nexus7-grouper-PM269.dts | 9 + + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 1232 ++++++++++++ + .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 185 ++ + ...tegra30-asus-nexus7-grouper-memory-timings.dtsi | 1565 +++++++++++++++ + .../dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 149 ++ + arch/arm/boot/dts/tegra30-asus-nexus7-grouper.dtsi | 149 ++ + .../boot/dts/tegra30-asus-nexus7-tilapia-E1565.dts | 9 + + ...tegra30-asus-nexus7-tilapia-memory-timings.dtsi | 325 +++ + arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi | 235 +++ + arch/arm/boot/dts/tegra30-beaver.dts | 212 +- + arch/arm/boot/dts/tegra30-cardhu-a02.dts | 128 +- + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 149 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 280 ++- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 5 +- + arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi | 398 ++-- + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 398 ++-- + arch/arm/boot/dts/tegra30.dtsi | 117 +- + arch/arm/boot/dts/twl6030_omap4.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ld4-ref.dts | 6 +- + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 7 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 5 + + arch/arm/boot/dts/uniphier-pro4-ace.dts | 2 +- + arch/arm/boot/dts/uniphier-pro4-ref.dts | 8 +- + arch/arm/boot/dts/uniphier-pro4-sanji.dts | 2 +- + arch/arm/boot/dts/uniphier-pro5.dtsi | 30 + + arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 2 +- + arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 2 +- + arch/arm/boot/dts/uniphier-sld8-ref.dts | 6 +- + arch/arm/boot/dts/uniphier-support-card.dtsi | 31 +- + arch/arm/configs/exynos_defconfig | 4 +- + arch/arm/configs/multi_v7_defconfig | 11 +- + arch/arm/configs/pxa_defconfig | 4 +- + arch/arm/configs/shmobile_defconfig | 13 +- + arch/arm/configs/tegra_defconfig | 2 +- + arch/arm/mach-omap1/Kconfig | 2 +- + arch/arm/mach-omap1/dma.c | 2 +- + arch/arm/mach-omap1/gpio15xx.c | 2 +- + arch/arm/mach-omap1/gpio16xx.c | 2 +- + arch/arm/mach-omap1/gpio7xx.c | 2 +- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/id.c | 20 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 61 - + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 59 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 193 -- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 179 -- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 155 +- + arch/arm/mach-rpc/ecard.c | 18 +- + arch/arm/plat-omap/dma.c | 2 +- + arch/arm/soc-for-next-contents.txt | 89 + + arch/arm64/Kconfig.platforms | 5 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 18 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 12 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 12 +- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 23 + + arch/arm64/boot/dts/intel/Makefile | 1 + + arch/arm64/boot/dts/intel/keembay-evm.dts | 37 + + arch/arm64/boot/dts/intel/keembay-soc.dtsi | 123 ++ + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt6358.dtsi | 2 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 4 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 4 +- + .../dts/mediatek/mt8183-kukui-krane-sku176.dts | 18 + + .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 343 ++++ + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 788 ++++++++ + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 68 +- + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 399 ++-- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 205 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 111 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 80 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 124 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 125 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 16 +- + .../dts/nvidia/tegra194-p3509-0000+p3668-0000.dts | 331 +++ + .../arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 290 +++ + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 280 ++- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 46 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 6 +- + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 19 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 330 +-- + arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 414 ++-- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 277 +-- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 171 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 72 +- + arch/arm64/boot/dts/renesas/Makefile | 56 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 758 +++++++ + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 312 +++ + arch/arm64/boot/dts/renesas/cat875.dtsi | 1 - + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 71 +- + arch/arm64/boot/dts/renesas/hihope-rev2.dtsi | 86 + + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 124 ++ + .../boot/dts/renesas/hihope-rzg2-ex-lvds.dtsi | 52 + + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 39 +- + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 29 + + .../r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts | 43 +- + .../boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts | 6 +- + .../r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts | 15 + + .../dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dts | 20 + + .../dts/renesas/r8a774a1-hihope-rzg2m-rev2.dts | 37 + + .../boot/dts/renesas/r8a774a1-hihope-rzg2m.dts | 6 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 10 +- + .../r8a774b1-hihope-rzg2n-ex-idk-1110wr.dts | 15 + + .../boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts | 5 +- + .../r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dts | 15 + + .../dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex.dts | 15 + + .../dts/renesas/r8a774b1-hihope-rzg2n-rev2.dts | 41 + + .../boot/dts/renesas/r8a774b1-hihope-rzg2n.dts | 6 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 10 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 6 +- + .../boot/dts/renesas/r8a774e1-hihope-rzg2h-ex.dts | 15 + + .../boot/dts/renesas/r8a774e1-hihope-rzg2h.dts | 26 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1664 ++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 97 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 67 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 67 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 67 + + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 67 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 1 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 + + .../boot/dts/socionext/uniphier-ld11-global.dts | 2 +- + .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 8 +- + .../boot/dts/socionext/uniphier-ld20-akebi96.dts | 2 +- + .../boot/dts/socionext/uniphier-ld20-global.dts | 2 +- + .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 8 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 + + .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 10 +- + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 2 + + arch/arm64/configs/defconfig | 23 +- + drivers/bus/ti-sysc.c | 6 +- + drivers/char/tpm/tpm_ftpm_tee.c | 70 +- + drivers/clk/clk-scmi.c | 22 +- + drivers/cpufreq/scmi-cpufreq.c | 3 +- + drivers/firmware/arm_scmi/Makefile | 4 +- + drivers/firmware/arm_scmi/base.c | 108 +- + drivers/firmware/arm_scmi/clock.c | 20 +- + drivers/firmware/arm_scmi/common.h | 4 + + drivers/firmware/arm_scmi/driver.c | 15 +- + drivers/firmware/arm_scmi/notify.c | 1526 ++++++++++++++ + drivers/firmware/arm_scmi/notify.h | 68 + + drivers/firmware/arm_scmi/perf.c | 151 +- + drivers/firmware/arm_scmi/power.c | 92 +- + drivers/firmware/arm_scmi/reset.c | 96 +- + drivers/firmware/arm_scmi/scmi_pm_domain.c | 12 +- + drivers/firmware/arm_scmi/sensors.c | 69 +- + drivers/firmware/arm_scmi/smc.c | 1 + + drivers/firmware/smccc/Kconfig | 9 + + drivers/firmware/smccc/Makefile | 1 + + drivers/firmware/smccc/soc_id.c | 114 ++ + drivers/firmware/tegra/bpmp-debugfs.c | 436 +++- + drivers/firmware/tegra/bpmp.c | 6 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 + + drivers/memory/tegra/Kconfig | 14 + + drivers/memory/tegra/Makefile | 4 + + drivers/memory/tegra/mc.h | 1 + + drivers/memory/tegra/tegra124-emc.c | 7 +- + drivers/memory/tegra/tegra186-emc.c | 25 +- + 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 +- + drivers/soc/mediatek/mtk-cmdq-helper.c | 46 +- + drivers/soc/renesas/Kconfig | 11 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a774e1-sysc.c | 43 + + drivers/soc/renesas/rcar-rst.c | 1 + + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + drivers/soc/renesas/renesas-soc.c | 8 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 +- + drivers/soc/ux500/ux500-soc-id.c | 22 +- + drivers/soc/versatile/soc-integrator.c | 48 +- + drivers/soc/versatile/soc-realview.c | 48 +- + drivers/tee/optee/core.c | 27 +- + drivers/tee/optee/device.c | 38 +- + drivers/tee/optee/optee_private.h | 10 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 4 +- + include/dt-bindings/clock/r8a774e1-cpg-mssr.h | 59 + + include/dt-bindings/power/r8a774e1-sysc.h | 36 + + include/linux/arm-smccc.h | 5 + + include/linux/mailbox/mtk-cmdq-mailbox.h | 2 + + include/linux/scmi_protocol.h | 110 +- + include/linux/soc/mediatek/mtk-cmdq.h | 31 + + include/soc/tegra/bpmp-abi.h | 913 ++++++--- + include/soc/tegra/fuse.h | 2 + + include/trace/events/scmi.h | 6 +- + 410 files changed, 26366 insertions(+), 5235 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-optee-devices + create mode 100644 Documentation/devicetree/bindings/arm/intel,keembay.yaml + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts + create mode 100644 arch/arm/boot/dts/tegra20-acer-a500-picasso.dts + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-E1565.dts + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-PM269.dts + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-maxim-pmic.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-memory-timings.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-grouper.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-tilapia-E1565.dts + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-tilapia-memory-timings.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi + create mode 100644 arch/arm/soc-for-next-contents.txt + create mode 100644 arch/arm64/boot/dts/intel/keembay-evm.dts + create mode 100644 arch/arm64/boot/dts/intel/keembay-soc.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-krane-sku176.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rev2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rev4.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rzg2-ex-lvds.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-idk-1110wr.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1.dtsi + create mode 100644 drivers/firmware/arm_scmi/notify.c + create mode 100644 drivers/firmware/arm_scmi/notify.h + create mode 100644 drivers/firmware/smccc/soc_id.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 + create mode 100644 drivers/soc/renesas/r8a774e1-sysc.c + create mode 100644 include/dt-bindings/clock/r8a774e1-cpg-mssr.h + create mode 100644 include/dt-bindings/power/r8a774e1-sysc.h +Merging amlogic/for-next (921856df453b Merge branch 'v5.9/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (33f466eef906 ARM: dts: aspeed: mihawk: Add 8 tmp401 thermal sensors) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 7 -- + arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 152 +++++++++++++++++++++++++++ + 2 files changed, 152 insertions(+), 7 deletions(-) +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 (3c6ec3e310c0 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 5 + + arch/arm/boot/dts/Makefile | 6 + + arch/arm/boot/dts/imx1.dtsi | 2 +- + arch/arm/boot/dts/imx23.dtsi | 2 +- + arch/arm/boot/dts/imx25.dtsi | 14 +- + arch/arm/boot/dts/imx27.dtsi | 10 +- + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/imx31.dtsi | 8 +- + arch/arm/boot/dts/imx35.dtsi | 10 +- + arch/arm/boot/dts/imx50.dtsi | 12 +- + arch/arm/boot/dts/imx51-ts4800.dts | 1 + + arch/arm/boot/dts/imx51.dtsi | 14 +- + arch/arm/boot/dts/imx53-kp.dtsi | 8 + + arch/arm/boot/dts/imx53-m53evk.dts | 1 + + arch/arm/boot/dts/imx53-ppd.dts | 51 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 8 + + arch/arm/boot/dts/imx53-tx53.dtsi | 1 - + arch/arm/boot/dts/imx53.dtsi | 14 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 1 + + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 1 + + arch/arm/boot/dts/imx6dl-mamoj.dts | 1 + + arch/arm/boot/dts/imx6dl-prtrvt.dts | 184 +++++++ + arch/arm/boot/dts/imx6dl-prtvt7.dts | 411 ++++++++++++++++ + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 1 - + arch/arm/boot/dts/imx6q-ba16.dtsi | 1 + + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 1 - + arch/arm/boot/dts/imx6q-display5.dtsi | 1 - + arch/arm/boot/dts/imx6q-kp.dtsi | 2 + + arch/arm/boot/dts/imx6q-mccmon6.dts | 1 - + arch/arm/boot/dts/imx6q-novena.dts | 1 + + arch/arm/boot/dts/imx6q-pistachio.dts | 1 + + arch/arm/boot/dts/imx6q-prti6q.dts | 543 +++++++++++++++++++++ + arch/arm/boot/dts/imx6q-prtwd2.dts | 188 +++++++ + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 1 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-emcon.dtsi | 3 + + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-icore.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 + + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 3 + + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 + + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 + + arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-prti6q.dtsi | 163 +++++++ + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 3 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-savageboard.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 2 + + arch/arm/boot/dts/imx6qdl.dtsi | 45 +- + arch/arm/boot/dts/imx6qp-sabreauto.dts | 4 + + arch/arm/boot/dts/imx6qp-sabresd.dts | 4 + + arch/arm/boot/dts/imx6sl-evk.dts | 1 + + arch/arm/boot/dts/imx6sl.dtsi | 40 +- + arch/arm/boot/dts/imx6sll-evk.dts | 1 + + arch/arm/boot/dts/imx6sll.dtsi | 38 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 1 + + arch/arm/boot/dts/imx6sx-sabreauto.dts | 96 ++++ + arch/arm/boot/dts/imx6sx-sdb-mqs.dts | 48 ++ + arch/arm/boot/dts/imx6sx-sdb.dtsi | 31 ++ + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 3 + + arch/arm/boot/dts/imx6sx.dtsi | 80 +-- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 1 + + arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 1 + + arch/arm/boot/dts/imx6ul-geam.dts | 1 + + arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi | 1 + + arch/arm/boot/dts/imx6ul-isiot.dtsi | 1 + + arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts | 1 + + arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 1 + + arch/arm/boot/dts/imx6ul-pico.dtsi | 1 + + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 - + arch/arm/boot/dts/imx6ul.dtsi | 67 ++- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 4 - + arch/arm/boot/dts/imx6ull-myir-mys-6ulx-eval.dts | 18 + + arch/arm/boot/dts/imx6ull-myir-mys-6ulx.dtsi | 238 +++++++++ + arch/arm/boot/dts/imx7s.dtsi | 28 +- + arch/arm/boot/dts/imx7ulp.dtsi | 2 +- + arch/arm/boot/dts/ls1021a.dtsi | 17 +- + arch/arm/boot/dts/vf610-zii-cfu1.dts | 2 + + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev.dtsi | 2 + + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 20 +- + arch/arm/boot/dts/vf610-zii-spb4.dts | 21 + + arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 2 + + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 2 + + arch/arm/boot/dts/vf610.dtsi | 2 +- + arch/arm/boot/dts/vfxxx.dtsi | 22 + + arch/arm/configs/imx_v6_v7_defconfig | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 85 ++++ + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 8 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 105 +++- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 103 +++- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 14 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 14 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 36 ++ + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 71 ++- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 26 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 96 ++++ + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 6 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 24 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 40 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 10 + + arch/arm64/configs/defconfig | 6 +- + drivers/clk/clk-composite.c | 1 + + drivers/clk/imx/Kconfig | 94 +++- + drivers/clk/imx/Makefile | 79 ++- + drivers/clk/imx/clk-composite-8m.c | 2 + + drivers/clk/imx/clk-cpu.c | 2 + + drivers/clk/imx/clk-frac-pll.c | 2 + + drivers/clk/imx/clk-gate2.c | 2 + + drivers/clk/imx/clk-imx6sl.c | 15 +- + drivers/clk/imx/clk-imx8mm.c | 4 + + drivers/clk/imx/clk-imx8mn.c | 4 + + drivers/clk/imx/clk-imx8mp.c | 5 + + drivers/clk/imx/clk-imx8mq.c | 4 + + drivers/clk/imx/clk-imx8qxp-lpcg.c | 4 + + drivers/clk/imx/clk-imx8qxp.c | 4 + + drivers/clk/imx/clk-pll14xx.c | 5 + + drivers/clk/imx/clk-sscg-pll.c | 2 + + drivers/clk/imx/clk-vf610.c | 1 + + drivers/clk/imx/clk.c | 17 +- + drivers/clk/imx/clk.h | 6 + + drivers/firmware/imx/Makefile | 2 +- + drivers/firmware/imx/imx-scu-irq.c | 2 + + .../soc-imx-scu.c => firmware/imx/imx-scu-soc.c} | 83 +--- + drivers/firmware/imx/imx-scu.c | 4 + + drivers/firmware/imx/rm.c | 45 ++ + drivers/firmware/imx/scu-pd.c | 14 +- + drivers/soc/imx/Kconfig | 10 +- + drivers/soc/imx/Makefile | 1 - + include/dt-bindings/clock/vf610-clock.h | 3 +- + include/linux/firmware/imx/sci.h | 2 + + include/linux/firmware/imx/svc/rm.h | 69 +++ + 148 files changed, 3380 insertions(+), 382 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-prtrvt.dts + create mode 100644 arch/arm/boot/dts/imx6dl-prtvt7.dts + create mode 100644 arch/arm/boot/dts/imx6q-prti6q.dts + create mode 100644 arch/arm/boot/dts/imx6q-prtwd2.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-prti6q.dtsi + create mode 100644 arch/arm/boot/dts/imx6sx-sdb-mqs.dts + create mode 100644 arch/arm/boot/dts/imx6ull-myir-mys-6ulx-eval.dts + create mode 100644 arch/arm/boot/dts/imx6ull-myir-mys-6ulx.dtsi + rename drivers/{soc/imx/soc-imx-scu.c => firmware/imx/imx-scu-soc.c} (57%) + create mode 100644 drivers/firmware/imx/rm.c + create mode 100644 include/linux/firmware/imx/svc/rm.h +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 (647a84d1e4dc Merge branch 'v5.8-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 (a5b4d0a1b174 Merge branch 'omap-for-v5.9/ti-sysc-drop-pdata-take2' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (d09eb6a1b495 Merge branches 'arm64-defconfig-for-5.9', 'arm64-for-5.9', 'drivers-for-5.9' and 'dts-for-5.9' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/qcom/msm8994-pins.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 2 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 2 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 2 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 308 ++++ + arch/arm/boot/dts/qcom-ipq8064.dtsi | 115 ++ + arch/arm64/boot/dts/qcom/Makefile | 5 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 262 ++-- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 28 + + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 189 +++ + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 42 +- + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 861 ++++------- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 150 +- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 20 +- + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 20 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 31 + + .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 2 + + arch/arm64/boot/dts/qcom/msm8994-pins.dtsi | 30 - + arch/arm64/boot/dts/qcom/msm8994.dtsi | 595 +++++++- + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 2 +- + .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 5 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm660.dtsi | 50 + + arch/arm64/boot/dts/qcom/pm660l.dtsi | 36 + + arch/arm64/boot/dts/qcom/pm8009.dtsi | 37 + + arch/arm64/boot/dts/qcom/pm8150.dtsi | 42 +- + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 44 +- + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 44 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 12 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 15 + + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 15 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 573 +++++++- + .../dts/qcom/sdm630-sony-xperia-ganges-kirin.dts | 13 + + .../boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi | 40 + + .../dts/qcom/sdm630-sony-xperia-nile-discovery.dts | 13 + + .../dts/qcom/sdm630-sony-xperia-nile-pioneer.dts | 13 + + .../dts/qcom/sdm630-sony-xperia-nile-voyager.dts | 20 + + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 136 ++ + arch/arm64/boot/dts/qcom/sdm630.dtsi | 1174 +++++++++++++++ + .../dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts | 20 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 507 ++++++- + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 21 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 903 ++++++++++++ + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 30 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 1525 +++++++++++++++++++- + arch/arm64/configs/defconfig | 5 + + drivers/firmware/qcom_scm.c | 8 +- + drivers/i2c/busses/i2c-qcom-geni.c | 26 +- + drivers/interconnect/qcom/bcm-voter.c | 6 +- + drivers/soc/qcom/Kconfig | 2 +- + drivers/soc/qcom/qcom-geni-se.c | 159 ++ + drivers/soc/qcom/rpmh-rsc.c | 19 +- + drivers/soc/qcom/rpmh.c | 4 +- + drivers/soc/qcom/smd-rpm.c | 2 + + drivers/soc/qcom/socinfo.c | 65 +- + drivers/spi/spi-geni-qcom.c | 193 ++- + drivers/spi/spi-qcom-qspi.c | 117 +- + drivers/tty/serial/qcom_geni_serial.c | 210 ++- + include/linux/of.h | 5 + + include/linux/qcom-geni-se.h | 45 + + include/soc/qcom/rpmh.h | 7 +- + 62 files changed, 7625 insertions(+), 1207 deletions(-) + create mode 100644 arch/arm/boot/dts/qcom-ipq8064-rb3011.dts + delete mode 100644 arch/arm64/boot/dts/qcom/msm8994-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm660.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm660l.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8009.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm630.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts +Merging raspberrypi/for-next (25c6f3960764 ARM: dts: bcm2711: Add HDMI DVP) +$ git merge raspberrypi/for-next +Already up to date. +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 (344cb4f80fba Merge branch 'renesas-arm-dt-for-v5.9' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. +Merging reset/reset/next (3b9164c0f173 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 (e4a879a43fee Merge branch 'v5.9-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 6 + + .../bindings/clock/rockchip,rk3288-cru.txt | 8 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/rk3036.dtsi | 1 + + arch/arm/boot/dts/rk322x.dtsi | 7 +- + arch/arm/boot/dts/rk3288-rock-pi-n8.dts | 17 ++ + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 17 +- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-mighty.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 2 +- + arch/arm/boot/dts/rk3288-vmarc-som.dtsi | 270 +++++++++++++++++++++ + arch/arm/boot/dts/rk3288-vyasa.dts | 3 +- + arch/arm/boot/dts/rk3288.dtsi | 9 +- + arch/arm/boot/dts/rk3xxx.dtsi | 3 + + .../boot/dts/rockchip-radxa-dalang-carrier.dtsi | 67 +++-- + arch/arm/boot/dts/rv1108.dtsi | 13 +- + arch/arm64/boot/dts/rockchip/px30-evb.dts | 3 - + arch/arm64/boot/dts/rockchip/px30.dtsi | 7 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 8 +- + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 25 +- + .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 8 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 4 +- + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 8 +- + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 6 +- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 99 +++++--- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 22 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 20 +- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 19 +- + .../boot/dts/rockchip/rk3399pro-rock-pi-n10.dts | 6 +- + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 92 ++++--- + drivers/clk/rockchip/clk-pll.c | 70 +++--- + drivers/clk/rockchip/clk-rk3288.c | 39 ++- + drivers/clk/rockchip/clk-rk3328.c | 8 +- + 51 files changed, 687 insertions(+), 280 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-rock-pi-n8.dts + create mode 100644 arch/arm/boot/dts/rk3288-vmarc-som.dtsi +Merging samsung-krzk/for-next (30f16ea45902 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-artik5.dtsi | 41 +++++ + arch/arm/boot/dts/exynos3250.dtsi | 47 +++-- + arch/arm/boot/dts/exynos4.dtsi | 70 ++++---- + arch/arm/boot/dts/exynos4210-trats.dts | 98 +++++------ + arch/arm/boot/dts/exynos4210-universal_c210.dts | 28 +-- + arch/arm/boot/dts/exynos4210.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-origen.dts | 21 +-- + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 86 ++++----- + arch/arm/boot/dts/exynos5250.dtsi | 92 +++++----- + arch/arm/boot/dts/exynos5410.dtsi | 46 ++--- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 53 +++--- + arch/arm/boot/dts/exynos5420.dtsi | 130 +++++++------- + arch/arm/boot/dts/exynos5800.dtsi | 6 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 90 ++++++++-- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 17 ++ + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 2 + + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-exynos/exynos.c | 2 +- + arch/arm/mach-exynos/mcpm-exynos.c | 10 +- + arch/arm/mach-s3c24xx/common-smdk.c | 67 ++++--- + arch/arm/mach-s3c24xx/mach-mini2440.c | 63 ++++++- + arch/arm/mach-s3c24xx/mach-n30.c | 54 +++++- + arch/arm/mach-s3c24xx/mach-qt2410.c | 12 +- + arch/arm/mach-s3c24xx/mach-vr1000.c | 38 +++- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 53 +++--- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 6 + + arch/arm64/boot/dts/exynos/exynos7.dtsi | 111 ++++++++---- + drivers/leds/leds-s3c24xx.c | 36 +--- + drivers/soc/samsung/Kconfig | 3 + + drivers/soc/samsung/Makefile | 1 + + drivers/soc/samsung/exynos-regulator-coupler.c | 221 ++++++++++++++++++++++++ + include/linux/platform_data/leds-s3c24xx.h | 6 - + 33 files changed, 980 insertions(+), 535 deletions(-) + create mode 100644 drivers/soc/samsung/exynos-regulator-coupler.c +Merging scmi/for-linux-next (11ba468877bb Linux 5.8-rc5) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (193762b7740b Merge branches 'sunxi/config-for-5.9' and 'sunxi/fixes-for-5.8' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 ++ + .../media/allwinner,sun4i-a10-video-engine.yaml | 3 ++ + arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- + arch/arm/boot/dts/sun5i.dtsi | 2 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- + arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts | 38 +++++++++++++++ + arch/arm/configs/sunxi_defconfig | 48 +++++++++++++------ + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../dts/allwinner/sun50i-a64-pinephone-1.1.dts | 19 ++++++++ + .../dts/allwinner/sun50i-a64-pinephone-1.2.dts | 40 ++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 54 +++++++++++++++++++++- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 38 +++++++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 1 + + 13 files changed, 233 insertions(+), 20 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts +Merging tegra/for-next (2ffcb962f693 Merge branch for-5.9/arm64/dt into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm/configs/tegra_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/tegra_defconfig +Recorded preimage for 'arch/arm/configs/tegra_defconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm/configs/tegra_defconfig'. +[master 0d3b17fcb16e] Merge remote-tracking branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/tegra_defconfig | 43 ++++++++++++++++++++++++++++++++++++ + drivers/clk/tegra/clk-pll.c | 27 +++++++++++++--------- + drivers/clk/tegra/clk-tegra210-emc.c | 2 ++ + 3 files changed, 62 insertions(+), 10 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + .../bindings/mfd/ti,j721e-system-controller.yaml | 74 ++++++ + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/ti/Makefile | 2 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 38 ++- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 7 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 27 +- + arch/arm64/boot/dts/ti/k3-am654.dtsi | 2 +- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 171 ++++++++++++- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 281 ++++++++++++++++++++- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 7 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +- + arch/arm64/configs/defconfig | 1 + + include/dt-bindings/mux/mux-j721e-wiz.h | 53 ++++ + include/dt-bindings/pinctrl/k3.h | 2 +- + 17 files changed, 653 insertions(+), 21 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml + create mode 100644 include/dt-bindings/mux/mux-j721e-wiz.h +Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next) +$ git merge uniphier/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (5c09ea8bf3a0 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging drivers/perf/qcom_l2_pmu.c +Auto-merging drivers/firmware/raspberrypi.c +Removing Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt +Removing Documentation/devicetree/bindings/clock/renesas,rz-cpg-clocks.txt +Removing Documentation/devicetree/bindings/clock/renesas,r8a7779-cpg-clocks.txt +Removing Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt +Removing Documentation/devicetree/bindings/clock/renesas,r8a7740-cpg-clocks.txt +Removing Documentation/devicetree/bindings/clock/renesas,r8a73a4-cpg-clocks.txt +Removing Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt +Merge made by the 'recursive' strategy. + .../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 - + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 59 +++ + .../bindings/clock/brcm,bcm2711-dvp.yaml | 47 ++ + .../bindings/clock/brcm,bcm63xx-clocks.txt | 2 + + .../devicetree/bindings/clock/clock-bindings.txt | 2 +- + .../devicetree/bindings/clock/idt,versaclock5.txt | 33 ++ + .../devicetree/bindings/clock/qcom,a53pll.yaml | 21 +- + .../bindings/clock/qcom,msm8996-apcc.yaml | 56 +++ + .../devicetree/bindings/clock/qcom,rpmcc.txt | 4 + + .../bindings/clock/renesas,cpg-clocks.yaml | 241 +++++++++ + .../bindings/clock/renesas,r8a73a4-cpg-clocks.txt | 33 -- + .../bindings/clock/renesas,r8a7740-cpg-clocks.txt | 41 -- + .../bindings/clock/renesas,r8a7778-cpg-clocks.txt | 47 -- + .../bindings/clock/renesas,r8a7779-cpg-clocks.txt | 49 -- + .../bindings/clock/renesas,rz-cpg-clocks.txt | 53 -- + .../bindings/clock/renesas,sh73a0-cpg-clocks.txt | 35 -- + .../devicetree/bindings/clock/silabs,si514.txt | 2 +- + .../devicetree/bindings/clock/silabs,si5351.txt | 2 +- + .../devicetree/bindings/clock/silabs,si570.txt | 4 +- + .../devicetree/bindings/clock/ti,cdce706.txt | 2 +- + .../devicetree/bindings/clock/ti,cdce925.txt | 8 +- + drivers/clk/Kconfig | 2 - + drivers/clk/bcm/Kconfig | 11 + + drivers/clk/bcm/Makefile | 1 + + drivers/clk/bcm/clk-bcm2711-dvp.c | 124 +++++ + drivers/clk/bcm/clk-bcm2835.c | 34 +- + drivers/clk/bcm/clk-bcm63xx-gate.c | 553 +++++++++++++++++---- + drivers/clk/bcm/clk-raspberrypi.c | 311 +++++++----- + drivers/clk/clk-cdce706.c | 2 +- + drivers/clk/clk-gpio.c | 2 +- + drivers/clk/clk-si5351.c | 4 +- + drivers/clk/clk-versaclock5.c | 240 +++++++-- + drivers/clk/clk.c | 15 + + drivers/clk/keystone/sci-clk.c | 2 +- + drivers/clk/keystone/syscon-clk.c | 2 +- + drivers/clk/meson/meson8b.h | 2 +- + drivers/clk/qcom/Kconfig | 28 ++ + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/apss-ipq-pll.c | 95 ++++ + drivers/clk/qcom/apss-ipq6018.c | 106 ++++ + drivers/clk/qcom/clk-alpha-pll.h | 6 + + drivers/clk/qcom/clk-cpu-8996.c | 538 ++++++++++++++++++++ + drivers/clk/qcom/clk-smd-rpm.c | 297 +++++++++++ + drivers/clk/qcom/gcc-ipq8074.c | 60 +++ + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77970-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a77980-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 17 +- + drivers/clk/socfpga/clk-agilex.c | 8 +- + drivers/clk/versatile/icst.c | 2 +- + drivers/clk/versatile/icst.h | 2 +- + drivers/firmware/raspberrypi.c | 14 + + drivers/perf/Kconfig | 1 + + drivers/perf/qcom_l2_pmu.c | 90 +--- + drivers/soc/qcom/Kconfig | 4 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/kryo-l2-accessors.c | 57 +++ + include/dt-bindings/clk/versaclock.h | 13 + + include/dt-bindings/clock/agilex-clock.h | 4 +- + include/dt-bindings/clock/bcm3368-clock.h | 24 + + include/dt-bindings/clock/bcm6318-clock.h | 42 ++ + include/dt-bindings/clock/bcm63268-clock.h | 30 ++ + include/dt-bindings/clock/bcm6328-clock.h | 19 + + include/dt-bindings/clock/bcm6358-clock.h | 18 + + include/dt-bindings/clock/bcm6362-clock.h | 26 + + include/dt-bindings/clock/bcm6368-clock.h | 24 + + include/dt-bindings/clock/qcom,apss-ipq.h | 12 + + include/dt-bindings/clock/qcom,gcc-ipq8074.h | 4 + + include/dt-bindings/clock/qcom,rpmcc.h | 16 + + include/soc/qcom/kryo-l2-accessors.h | 12 + + 77 files changed, 2991 insertions(+), 657 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt + create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm2711-dvp.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-clocks.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a73a4-cpg-clocks.txt + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7740-cpg-clocks.txt + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7779-cpg-clocks.txt + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,rz-cpg-clocks.txt + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt + create mode 100644 drivers/clk/bcm/clk-bcm2711-dvp.c + create mode 100644 drivers/clk/qcom/apss-ipq-pll.c + create mode 100644 drivers/clk/qcom/apss-ipq6018.c + create mode 100644 drivers/clk/qcom/clk-cpu-8996.c + create mode 100644 drivers/soc/qcom/kryo-l2-accessors.c + create mode 100644 include/dt-bindings/clk/versaclock.h + create mode 100644 include/dt-bindings/clock/bcm3368-clock.h + create mode 100644 include/dt-bindings/clock/bcm6318-clock.h + create mode 100644 include/dt-bindings/clock/bcm63268-clock.h + create mode 100644 include/dt-bindings/clock/bcm6328-clock.h + create mode 100644 include/dt-bindings/clock/bcm6358-clock.h + create mode 100644 include/dt-bindings/clock/bcm6362-clock.h + create mode 100644 include/dt-bindings/clock/bcm6368-clock.h + create mode 100644 include/dt-bindings/clock/qcom,apss-ipq.h + create mode 100644 include/soc/qcom/kryo-l2-accessors.h +Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (f4dd2edafba0 csky: add support for SECCOMP and SECCOMP_FILTER) +$ git merge csky/linux-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 14 ++++++++++++++ + arch/csky/include/asm/Kbuild | 1 + + arch/csky/include/asm/processor.h | 6 ------ + arch/csky/include/asm/syscall.h | 7 ------- + arch/csky/include/asm/thread_info.h | 2 +- + arch/csky/kernel/entry.S | 3 +++ + arch/csky/kernel/process.c | 10 ---------- + arch/csky/kernel/ptrace.c | 10 ++++++++-- + tools/testing/selftests/seccomp/seccomp_bpf.c | 13 ++++++++++++- + 9 files changed, 39 insertions(+), 27 deletions(-) +Merging h8300/h8300-next (9d48776fc609 Merge remote-tracking branch 'origin/master' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 12 files changed, 120 insertions(+), 59 deletions(-) +Merging ia64/next (172e7890406d tty/serial: cleanup after ioc*_serial driver removal) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kbuild | 19 ++++++++++ + arch/m68k/Makefile | 73 ++++++++++++++---------------------- + arch/m68k/configs/amiga_defconfig | 3 ++ + arch/m68k/configs/apollo_defconfig | 3 ++ + arch/m68k/configs/atari_defconfig | 3 ++ + arch/m68k/configs/bvme6000_defconfig | 3 ++ + arch/m68k/configs/hp300_defconfig | 3 ++ + arch/m68k/configs/mac_defconfig | 3 ++ + arch/m68k/configs/multi_defconfig | 3 ++ + arch/m68k/configs/mvme147_defconfig | 3 ++ + arch/m68k/configs/mvme16x_defconfig | 3 ++ + arch/m68k/configs/q40_defconfig | 3 ++ + arch/m68k/configs/sun3_defconfig | 3 ++ + arch/m68k/configs/sun3x_defconfig | 3 ++ + arch/m68k/include/asm/raw_io.h | 6 +-- + arch/m68k/kernel/signal.c | 32 ++++++++-------- + arch/m68k/mac/iop.c | 60 +++++++++++++---------------- + arch/m68k/sun3/Makefile | 2 +- + 18 files changed, 129 insertions(+), 99 deletions(-) + create mode 100644 arch/m68k/Kbuild +Merging m68knommu/for-next (3b554410a617 m68k: stmark2: enable edma support for dspi) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/stmark2.c | 5 ++++ + arch/m68k/configs/stmark2_defconfig | 47 +++++++++++++++++++++---------------- + arch/m68k/include/asm/cmpxchg.h | 8 ------- + arch/m68k/include/asm/io_no.h | 20 ++++++++-------- + arch/m68k/include/asm/m53xxacr.h | 6 ++--- + arch/m68k/mm/mcfmmu.c | 6 ----- + 6 files changed, 45 insertions(+), 47 deletions(-) +Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (67d0662ce911 MIPS: Prevent READ_IMPLIES_EXEC propagation) +$ git merge mips/mips-next +Auto-merging arch/mips/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mips/ingenic/devices.yaml | 17 +- + .../bindings/mips/ingenic/ingenic,cpu.yaml | 67 ++++ + .../devicetree/bindings/mips/loongson/devices.yaml | 16 +- + .../devicetree/bindings/timer/ingenic,tcu.yaml | 5 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/mips/Kconfig | 2 +- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 33 +- + arch/mips/boot/dts/ingenic/Makefile | 2 + + arch/mips/boot/dts/ingenic/cu1000-neo.dts | 114 ++++--- + arch/mips/boot/dts/ingenic/cu1830-neo.dts | 168 ++++++++++ + arch/mips/boot/dts/ingenic/jz4725b.dtsi | 334 +++++++++++++++++++ + arch/mips/boot/dts/ingenic/rs90.dts | 311 +++++++++++++++++ + arch/mips/boot/dts/ingenic/x1000.dtsi | 126 ++++--- + arch/mips/boot/dts/ingenic/x1830.dtsi | 300 +++++++++++++++++ + arch/mips/boot/dts/loongson/Makefile | 5 +- + ...gson3-package.dtsi => loongson64c-package.dtsi} | 0 + .../boot/dts/loongson/loongson64c_4core_ls7a.dts | 37 ++ + ...ore_rs780e.dts => loongson64c_4core_rs780e.dts} | 4 +- + ...ore_rs780e.dts => loongson64c_8core_rs780e.dts} | 4 +- + .../boot/dts/loongson/loongson64g-package.dtsi | 61 ++++ + .../boot/dts/loongson/loongson64g_4core_ls7a.dts | 37 ++ + arch/mips/boot/dts/loongson/ls7a-pch.dtsi | 371 +++++++++++++++++++++ + arch/mips/boot/dts/loongson/rs780e-pch.dtsi | 4 +- + arch/mips/configs/cu1000-neo_defconfig | 4 + + arch/mips/configs/cu1830-neo_defconfig | 123 +++++++ + arch/mips/configs/rs90_defconfig | 182 ++++++++++ + arch/mips/include/asm/bootinfo.h | 22 +- + arch/mips/include/asm/checksum.h | 4 +- + arch/mips/include/asm/elf.h | 1 + + .../include/asm/mach-cavium-octeon/mangle-port.h | 12 +- + arch/mips/include/asm/mach-generic/mangle-port.h | 12 +- + arch/mips/include/asm/mach-ip27/mangle-port.h | 6 +- + arch/mips/include/asm/mach-ip30/mangle-port.h | 6 +- + arch/mips/include/asm/mach-ip32/mangle-port.h | 6 +- + .../include/asm/mach-loongson64/builtin_dtbs.h | 6 +- + arch/mips/include/asm/mach-loongson64/irq.h | 6 +- + arch/mips/include/asm/mach-tx39xx/mangle-port.h | 6 +- + arch/mips/include/asm/mach-tx49xx/mangle-port.h | 6 +- + arch/mips/include/asm/mipsregs.h | 28 +- + arch/mips/include/asm/war.h | 2 +- + arch/mips/jz4740/Kconfig | 18 + + arch/mips/jz4740/setup.c | 4 + + arch/mips/kernel/cpu-probe.c | 12 +- + arch/mips/kvm/vz.c | 4 +- + arch/mips/loongson2ef/Platform | 22 ++ + arch/mips/loongson64/cpucfg-emul.c | 6 +- + arch/mips/loongson64/env.c | 56 ++-- + arch/mips/mm/c-r4k.c | 4 +- + arch/mips/vdso/genvdso.c | 12 +- + drivers/platform/mips/cpu_hwmon.c | 66 ++-- + drivers/platform/mips/rs780e-acpi.c | 2 +- + 51 files changed, 2374 insertions(+), 284 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/ingenic/ingenic,cpu.yaml + create mode 100644 arch/mips/boot/dts/ingenic/cu1830-neo.dts + create mode 100644 arch/mips/boot/dts/ingenic/jz4725b.dtsi + create mode 100644 arch/mips/boot/dts/ingenic/rs90.dts + create mode 100644 arch/mips/boot/dts/ingenic/x1830.dtsi + rename arch/mips/boot/dts/loongson/{loongson3-package.dtsi => loongson64c-package.dtsi} (100%) + create mode 100644 arch/mips/boot/dts/loongson/loongson64c_4core_ls7a.dts + rename arch/mips/boot/dts/loongson/{loongson3_4core_rs780e.dts => loongson64c_4core_rs780e.dts} (83%) + rename arch/mips/boot/dts/loongson/{loongson3_8core_rs780e.dts => loongson64c_8core_rs780e.dts} (83%) + create mode 100644 arch/mips/boot/dts/loongson/loongson64g-package.dtsi + create mode 100644 arch/mips/boot/dts/loongson/loongson64g_4core_ls7a.dts + create mode 100644 arch/mips/boot/dts/loongson/ls7a-pch.dtsi + create mode 100644 arch/mips/configs/cu1830-neo_defconfig + create mode 100644 arch/mips/configs/rs90_defconfig +Merging nds32/next (548cbab5e7bc 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 (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ 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 +Already up to date. +Merging parisc-hd/for-next (fb775a8805ed parisc: Whitespace cleanups in atomic.h) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/mm/init.c +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/atomic.h | 76 +++++++++++++++++++++------------------ + arch/parisc/include/asm/bitops.h | 41 +++++++-------------- + arch/parisc/include/asm/cmpxchg.h | 6 ++-- + arch/parisc/include/asm/futex.h | 26 +++++++------- + arch/parisc/lib/bitops.c | 6 ++-- + arch/parisc/mm/init.c | 12 +++---- + 6 files changed, 81 insertions(+), 86 deletions(-) +Merging powerpc/next (61f879d97ce4 powerpc/pseries: Detect secure and trusted boot state of the system.) +$ git merge powerpc/next +Auto-merging drivers/md/dm-writecache.c +Removing arch/powerpc/platforms/pseries/offline_states.h +Auto-merging arch/powerpc/kernel/paca.c +Auto-merging arch/powerpc/boot/Makefile +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../testing/sysfs-bus-event_source-devices-hv_24x7 | 7 + + Documentation/ABI/testing/sysfs-class-ocxl | 11 + + Documentation/core-api/cpu_hotplug.rst | 7 - + Documentation/memory-barriers.txt | 14 + + Documentation/powerpc/cpu_families.rst | 10 +- + MAINTAINERS | 1 - + arch/powerpc/Kconfig | 6 +- + arch/powerpc/Makefile | 3 +- + arch/powerpc/boot/Makefile | 6 +- + arch/powerpc/boot/dts/akebono.dts | 8 +- + arch/powerpc/boot/dts/bluestone.dts | 2 +- + arch/powerpc/boot/dts/canyonlands.dts | 4 +- + arch/powerpc/boot/dts/currituck.dts | 6 +- + arch/powerpc/boot/dts/glacier.dts | 4 +- + arch/powerpc/boot/dts/haleakala.dts | 2 +- + arch/powerpc/boot/dts/icon.dts | 4 +- + arch/powerpc/boot/dts/katmai.dts | 6 +- + arch/powerpc/boot/dts/kilauea.dts | 4 +- + arch/powerpc/boot/dts/makalu.dts | 4 +- + arch/powerpc/boot/dts/redwood.dts | 6 +- + arch/powerpc/boot/main.c | 4 +- + arch/powerpc/boot/ps3.c | 2 +- + arch/powerpc/configs/44x/akebono_defconfig | 2 - + arch/powerpc/configs/44x/arches_defconfig | 2 - + arch/powerpc/configs/44x/bamboo_defconfig | 2 - + arch/powerpc/configs/44x/bluestone_defconfig | 2 - + arch/powerpc/configs/44x/canyonlands_defconfig | 2 - + arch/powerpc/configs/44x/currituck_defconfig | 2 - + arch/powerpc/configs/44x/eiger_defconfig | 2 - + arch/powerpc/configs/44x/fsp2_defconfig | 1 - + arch/powerpc/configs/44x/icon_defconfig | 2 - + arch/powerpc/configs/44x/iss476-smp_defconfig | 1 - + arch/powerpc/configs/44x/katmai_defconfig | 2 - + arch/powerpc/configs/44x/rainier_defconfig | 2 - + arch/powerpc/configs/44x/redwood_defconfig | 2 - + arch/powerpc/configs/44x/sam440ep_defconfig | 2 - + arch/powerpc/configs/44x/sequoia_defconfig | 2 - + arch/powerpc/configs/44x/taishan_defconfig | 2 - + arch/powerpc/configs/44x/warp_defconfig | 1 - + arch/powerpc/configs/85xx-hw.config | 1 - + arch/powerpc/configs/holly_defconfig | 1 - + arch/powerpc/configs/mvme5100_defconfig | 3 +- + arch/powerpc/configs/ps3_defconfig | 2 - + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/powerpc/configs/storcenter_defconfig | 1 - + arch/powerpc/include/asm/asm-prototypes.h | 4 +- + arch/powerpc/include/asm/barrier.h | 13 + + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 15 + + arch/powerpc/include/asm/cacheflush.h | 1 + + arch/powerpc/include/asm/cputime.h | 2 + + arch/powerpc/include/asm/fixmap.h | 2 +- + arch/powerpc/include/asm/hvcall.h | 34 +- + arch/powerpc/include/asm/imc-pmu.h | 5 + + arch/powerpc/include/asm/kasan.h | 2 + + arch/powerpc/include/asm/mmu.h | 4 + + arch/powerpc/include/asm/nohash/32/pgtable.h | 22 +- + arch/powerpc/include/asm/plpar_wrappers.h | 52 ++ + arch/powerpc/include/asm/ppc-opcode.h | 552 ++++++++++----------- + arch/powerpc/include/asm/rtas.h | 3 - + arch/powerpc/include/asm/security_features.h | 2 + + arch/powerpc/include/asm/topology.h | 27 - + arch/powerpc/include/asm/xive.h | 1 - + arch/powerpc/kernel/cacheinfo.c | 25 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 6 +- + arch/powerpc/kernel/entry_64.S | 17 +- + arch/powerpc/kernel/fadump.c | 24 + + arch/powerpc/kernel/fpu.S | 4 +- + arch/powerpc/kernel/paca.c | 13 +- + arch/powerpc/kernel/process.c | 101 ++-- + arch/powerpc/kernel/prom_init.c | 13 +- + arch/powerpc/kernel/rtas.c | 122 +---- + arch/powerpc/kernel/rtasd.c | 28 +- + arch/powerpc/kernel/secure_boot.c | 18 +- + arch/powerpc/kernel/security.c | 139 +++--- + arch/powerpc/kernel/signal_32.c | 20 +- + arch/powerpc/kernel/signal_64.c | 29 +- + arch/powerpc/kernel/syscall_64.c | 8 + + arch/powerpc/kernel/vdso.c | 2 +- + arch/powerpc/kernel/vdso64/cacheflush.S | 9 +- + arch/powerpc/kernel/vdso64/datapage.S | 28 +- + arch/powerpc/kernel/vdso64/gettimeofday.S | 9 +- + arch/powerpc/kernel/vdso64/sigtramp.S | 13 +- + arch/powerpc/kernel/vector.S | 4 +- + arch/powerpc/lib/pmem.c | 44 +- + arch/powerpc/lib/test_emulate_step.c | 155 +++--- + arch/powerpc/mm/book3s64/hash_utils.c | 7 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 82 ++- + arch/powerpc/mm/init_32.c | 2 + + arch/powerpc/mm/init_64.c | 5 +- + arch/powerpc/mm/kasan/kasan_init_32.c | 29 +- + arch/powerpc/mm/numa.c | 486 ------------------ + arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- + arch/powerpc/net/bpf_jit.h | 184 +------ + arch/powerpc/net/bpf_jit32.h | 34 +- + arch/powerpc/net/bpf_jit64.h | 16 +- + arch/powerpc/net/bpf_jit_comp.c | 134 ++--- + arch/powerpc/net/bpf_jit_comp64.c | 298 +++++------ + arch/powerpc/perf/hv-24x7.c | 54 ++ + arch/powerpc/perf/imc-pmu.c | 29 +- + arch/powerpc/platforms/85xx/Kconfig | 2 +- + arch/powerpc/platforms/cell/Kconfig | 1 + + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 34 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 189 +------ + arch/powerpc/platforms/pseries/hotplug-memory.c | 109 +--- + arch/powerpc/platforms/pseries/lpar.c | 8 +- + arch/powerpc/platforms/pseries/mobility.c | 31 -- + arch/powerpc/platforms/pseries/offline_states.h | 38 -- + arch/powerpc/platforms/pseries/papr_scm.c | 1 + + arch/powerpc/platforms/pseries/pmem.c | 7 +- + arch/powerpc/platforms/pseries/smp.c | 28 +- + arch/powerpc/platforms/pseries/suspend.c | 27 +- + arch/powerpc/sysdev/xive/native.c | 2 + + arch/powerpc/xmon/xmon.c | 9 +- + drivers/cpuidle/cpuidle-powernv.c | 14 - + drivers/cpuidle/cpuidle-pseries.c | 2 +- + drivers/md/dm-writecache.c | 2 +- + drivers/misc/ocxl/Kconfig | 2 +- + drivers/misc/ocxl/config.c | 81 ++- + drivers/misc/ocxl/ocxl_internal.h | 6 + + drivers/misc/ocxl/sysfs.c | 35 ++ + drivers/nvdimm/of_pmem.c | 1 + + drivers/nvdimm/region_devs.c | 8 +- + include/asm-generic/barrier.h | 10 + + include/linux/cpuhotplug.h | 1 + + include/misc/ocxl-config.h | 1 + + .../powerpc/alignment/alignment_handler.c | 150 +++++- + .../selftests/powerpc/include/instructions.h | 77 +++ + tools/testing/selftests/powerpc/include/reg.h | 6 + + tools/testing/selftests/powerpc/include/utils.h | 6 + + tools/testing/selftests/powerpc/math/.gitignore | 1 + + tools/testing/selftests/powerpc/math/Makefile | 2 +- + .../testing/selftests/powerpc/math/fpu_denormal.c | 38 ++ + tools/testing/selftests/powerpc/mm/.gitignore | 1 + + tools/testing/selftests/powerpc/mm/Makefile | 5 +- + tools/testing/selftests/powerpc/mm/bad_accesses.c | 28 -- + .../testing/selftests/powerpc/mm/pkey_exec_prot.c | 388 +++++++++++++++ + .../powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 - + .../selftests/powerpc/pmu/ebb/cycles_test.c | 2 - + .../powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 - + .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 - + tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 2 - + .../powerpc/pmu/ebb/ebb_on_willing_child_test.c | 2 - + .../powerpc/pmu/ebb/lost_exception_test.c | 1 - + .../selftests/powerpc/pmu/ebb/multi_counter_test.c | 7 - + .../powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 - + .../selftests/powerpc/pmu/ebb/pmae_handling_test.c | 2 - + .../powerpc/pmu/ebb/pmc56_overflow_test.c | 2 - + tools/testing/selftests/powerpc/ptrace/core-pkey.c | 2 +- + .../testing/selftests/powerpc/ptrace/ptrace-pkey.c | 2 +- + tools/testing/selftests/powerpc/utils.c | 28 ++ + 151 files changed, 2171 insertions(+), 2335 deletions(-) + delete mode 100644 arch/powerpc/platforms/pseries/offline_states.h + create mode 100644 tools/testing/selftests/powerpc/math/fpu_denormal.c + create mode 100644 tools/testing/selftests/powerpc/mm/pkey_exec_prot.c +$ git am -3 ../patches/0001-Revert-powerpc-mm-book3s64-radix-Off-load-TLB-invali.patch +Applying: Revert "powerpc/mm/book3s64/radix: Off-load TLB invalidations to host when !GTSE" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/book3s/64/tlbflush-radix.h +M arch/powerpc/include/asm/hvcall.h +M arch/powerpc/include/asm/plpar_wrappers.h +M arch/powerpc/mm/book3s64/radix_tlb.c +$ git add -A . +$ git commit -v -a --amend +[master 256611f58248] Merge remote-tracking branch 'powerpc/next' + Date: Mon Jul 20 09:14:16 2020 +1000 +$ git am -3 ../patches/0002-Revert-powerpc-pseries-H_REGISTER_PROC_TBL-should-as.patch +Applying: Revert "powerpc/pseries: H_REGISTER_PROC_TBL should ask for GTSE only if enabled" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/platforms/pseries/lpar.c +$ git add -A . +$ git commit -v -a --amend +[master 76cef4a01585] Merge remote-tracking branch 'powerpc/next' + Date: Mon Jul 20 09:14:16 2020 +1000 +$ git am -3 ../patches/0003-Revert-powerpc-mm-Enable-radix-GTSE-only-if-supporte.patch +Applying: Revert "powerpc/mm: Enable radix GTSE only if supported." +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/mmu.h +M arch/powerpc/kernel/dt_cpu_ftrs.c +M arch/powerpc/kernel/prom_init.c +M arch/powerpc/mm/init_64.c +$ git add -A . +$ git commit -v -a --amend +[master 9aed311695ab] Merge remote-tracking branch 'powerpc/next' + Date: Mon Jul 20 09:14:16 2020 +1000 +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 (375e2bad2f8c riscv: Add STACKPROTECTOR supported) +$ git merge risc-v/for-next +Auto-merging lib/Makefile +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 10 +++++++ + arch/riscv/boot/Makefile | 2 ++ + arch/riscv/include/asm/irq_work.h | 10 +++++++ + arch/riscv/include/asm/stackprotector.h | 33 +++++++++++++++++++++++ + arch/riscv/include/uapi/asm/hwcap.h | 2 +- + arch/riscv/kernel/entry.S | 48 ++++++++++++++++++++++++++++++++- + arch/riscv/kernel/process.c | 6 +++++ + arch/riscv/kernel/smp.c | 15 +++++++++++ + arch/riscv/kernel/smpboot.c | 8 +++--- + arch/riscv/kernel/vdso/Makefile | 1 + + arch/riscv/kernel/vmlinux.lds.S | 2 +- + arch/riscv/mm/Makefile | 2 ++ + arch/riscv/mm/init.c | 27 +++++++++++++++++++ + include/asm-generic/io.h | 4 +++ + lib/Kconfig | 3 +++ + lib/Kconfig.debug | 2 +- + lib/Makefile | 2 ++ + lib/devmem_is_allowed.c | 27 +++++++++++++++++++ + 18 files changed, 196 insertions(+), 8 deletions(-) + create mode 100644 arch/riscv/include/asm/irq_work.h + create mode 100644 arch/riscv/include/asm/stackprotector.h + create mode 100644 lib/devmem_is_allowed.c +Merging s390/features (6589c93f9989 s390: add trace events for idle enter/exit) +$ git merge s390/features +Removing arch/s390/include/uapi/asm/debug.h +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + Documentation/s390/s390dbf.rst | 17 +- + arch/s390/Kconfig | 1 - + arch/s390/appldata/appldata_os.c | 6 +- + arch/s390/include/asm/debug.h | 18 +- + arch/s390/include/asm/pci_dma.h | 11 -- + arch/s390/include/asm/pgtable.h | 2 +- + arch/s390/include/asm/smp.h | 4 + + arch/s390/include/asm/timex.h | 5 - + arch/s390/include/uapi/asm/debug.h | 35 ---- + arch/s390/include/uapi/asm/zcrypt.h | 140 +++++++-------- + arch/s390/kernel/crash_dump.c | 6 +- + arch/s390/kernel/debug.c | 42 ----- + arch/s390/kernel/entry.S | 2 +- + arch/s390/kernel/idle.c | 4 +- + arch/s390/kernel/lgr.c | 2 +- + arch/s390/kernel/smp.c | 5 +- + arch/s390/kernel/time.c | 51 +++--- + arch/s390/kernel/topology.c | 4 +- + arch/s390/mm/cmm.c | 2 +- + arch/s390/mm/extmem.c | 32 ++-- + arch/s390/mm/vmem.c | 115 +----------- + drivers/s390/char/tty3270.c | 12 +- + drivers/s390/char/zcore.c | 57 +----- + drivers/s390/crypto/ap_bus.c | 317 +++++++++++++++++---------------- + drivers/s390/crypto/ap_bus.h | 69 +++---- + drivers/s390/crypto/ap_queue.c | 209 +++++++++++----------- + drivers/s390/crypto/pkey_api.c | 4 +- + drivers/s390/crypto/zcrypt_api.c | 176 ++++++++++-------- + drivers/s390/crypto/zcrypt_ccamisc.c | 69 +++---- + drivers/s390/crypto/zcrypt_cex2c.c | 129 +++++++++++++- + drivers/s390/crypto/zcrypt_cex4.c | 30 ++-- + drivers/s390/crypto/zcrypt_error.h | 4 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 64 +++---- + drivers/s390/crypto/zcrypt_msgtype6.c | 112 ++++++------ + drivers/s390/crypto/zcrypt_msgtype6.h | 4 +- + drivers/s390/crypto/zcrypt_queue.c | 8 +- + include/linux/memblock.h | 28 ++- + mm/memblock.c | 57 +++--- + 38 files changed, 884 insertions(+), 969 deletions(-) + delete mode 100644 arch/s390/include/uapi/asm/debug.h +Merging sh/for-next (79eec5f23d34 sh: Implement __get_user_u64() required for 64-bit get_user()) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/include/asm/uaccess_32.h | 53 ++++++++++++++++++++++++++++++++++++++++ + arch/sh/mm/consistent.c | 2 -- + arch/sh/mm/pgtable.c | 7 +++--- + 3 files changed, 56 insertions(+), 6 deletions(-) +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ 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 +Already up to date. +Merging xtensa/xtensa-for-next (ee769ebbe9e5 xtensa: simplify xtensa_pmu_irq_handler) +$ git merge xtensa/xtensa-for-next +Already up to date. +Merging fscrypt/master (4f74d15fe408 ext4: add inline encryption support) +$ git merge fscrypt/master +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/ext4.rst | 7 + + Documentation/filesystems/f2fs.rst | 7 + + Documentation/filesystems/fscrypt.rst | 3 + + fs/buffer.c | 7 +- + fs/crypto/Kconfig | 6 + + fs/crypto/Makefile | 1 + + fs/crypto/bio.c | 51 +++++ + fs/crypto/crypto.c | 2 +- + fs/crypto/fname.c | 4 +- + fs/crypto/fscrypt_private.h | 115 ++++++++++- + fs/crypto/inline_crypt.c | 364 ++++++++++++++++++++++++++++++++++ + fs/crypto/keyring.c | 6 +- + fs/crypto/keysetup.c | 70 +++++-- + fs/crypto/keysetup_v1.c | 16 +- + fs/ext4/inode.c | 4 +- + fs/ext4/page-io.c | 6 +- + fs/ext4/readpage.c | 11 +- + fs/ext4/super.c | 12 ++ + fs/f2fs/compress.c | 2 +- + fs/f2fs/data.c | 79 ++++++-- + fs/f2fs/super.c | 35 ++++ + include/linux/fs.h | 1 + + include/linux/fscrypt.h | 82 ++++++++ + 23 files changed, 820 insertions(+), 71 deletions(-) + create mode 100644 fs/crypto/inline_crypt.c +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 (c0e7348a211d Merge branch 'for-next-next-v5.8-20200715' into for-next-20200715) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/backref.c | 1 + + fs/btrfs/block-group.c | 209 ++++---- + fs/btrfs/block-group.h | 3 +- + fs/btrfs/check-integrity.c | 27 +- + fs/btrfs/compression.c | 30 +- + fs/btrfs/compression.h | 4 +- + fs/btrfs/ctree.c | 17 + + fs/btrfs/ctree.h | 134 +++++- + fs/btrfs/delalloc-space.c | 159 +----- + fs/btrfs/delalloc-space.h | 10 +- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/disk-io.c | 124 ++++- + fs/btrfs/disk-io.h | 2 + + fs/btrfs/extent-io-tree.h | 5 +- + fs/btrfs/extent-tree.c | 20 +- + fs/btrfs/extent_io.c | 180 ++++--- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 164 ++++--- + fs/btrfs/free-space-cache.c | 23 +- + fs/btrfs/free-space-cache.h | 2 +- + fs/btrfs/inode-map.c | 3 +- + fs/btrfs/inode.c | 855 +++++++++++++++++---------------- + fs/btrfs/ioctl.c | 88 +++- + fs/btrfs/ordered-data.c | 63 ++- + fs/btrfs/ordered-data.h | 19 +- + fs/btrfs/qgroup.c | 359 ++++++++++---- + fs/btrfs/qgroup.h | 24 +- + fs/btrfs/raid56.c | 61 +-- + fs/btrfs/ref-verify.c | 2 + + fs/btrfs/reflink.c | 11 +- + fs/btrfs/relocation.c | 72 +-- + fs/btrfs/scrub.c | 151 ++---- + fs/btrfs/space-info.c | 299 ++++++++---- + fs/btrfs/space-info.h | 2 + + fs/btrfs/super.c | 147 ++++-- + fs/btrfs/sysfs.c | 160 +++++- + fs/btrfs/sysfs.h | 7 + + fs/btrfs/tests/free-space-tree-tests.c | 2 - + fs/btrfs/tests/inode-tests.c | 14 +- + fs/btrfs/transaction.c | 3 +- + fs/btrfs/transaction.h | 28 +- + fs/btrfs/tree-defrag.c | 5 +- + fs/btrfs/tree-log.c | 37 +- + fs/btrfs/volumes.c | 112 +++-- + fs/btrfs/volumes.h | 2 +- + fs/ext4/file.c | 11 +- + fs/gfs2/file.c | 14 +- + fs/iomap/direct-io.c | 11 +- + fs/xfs/xfs_file.c | 15 +- + fs/zonefs/super.c | 16 +- + include/linux/iomap.h | 25 +- + include/trace/events/btrfs.h | 137 +++--- + include/uapi/linux/btrfs.h | 22 +- + include/uapi/linux/btrfs_tree.h | 4 +- + 56 files changed, 2364 insertions(+), 1542 deletions(-) +Merging ceph/master (7ed286f3e061 libceph: don't omit used_replica in target_copy()) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (e9225f19dfd0 cifs: Remove the superfluous break) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsproto.h | 3 ++- + fs/cifs/cifssmb.c | 39 +++++++++++++++++++++++++++- + fs/cifs/inode.c | 2 -- + fs/cifs/netmisc.c | 27 ++++++++++++++++++++ + fs/cifs/sess.c | 1 - + fs/cifs/smb1ops.c | 4 +-- + fs/cifs/smb2misc.c | 73 ++++++++++++++++++++++++++++++++++++++--------------- + fs/cifs/transport.c | 2 +- + 8 files changed, 122 insertions(+), 29 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 (b3a9e3b9622a Linux 5.8-rc1) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (3d30fdf76680 exfat: fix name_hash computation on big endian systems) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 4 ++-- + fs/exfat/dir.c | 34 +++++++++++++++++-------------- + fs/exfat/exfat_fs.h | 10 ++++----- + fs/exfat/fatent.c | 58 ++++++++++------------------------------------------- + fs/exfat/file.c | 7 +++++-- + fs/exfat/inode.c | 9 +++++---- + fs/exfat/misc.c | 22 ++++++++++++++++++-- + fs/exfat/namei.c | 12 +++++------ + fs/exfat/nls.c | 8 ++++---- + fs/exfat/super.c | 14 ++++++------- + 10 files changed, 82 insertions(+), 96 deletions(-) +Merging ext3/for_next (0abc0d5654d4 Pull fsnotify and fanotify cleanups from Amir) +$ git merge ext3/for_next +Auto-merging include/linux/fs.h +Auto-merging fs/ext4/inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/quota.rst | 12 +-- + Documentation/filesystems/udf.rst | 2 +- + fs/ext2/dir.c | 55 +++++------ + fs/ext2/ext2.h | 4 +- + fs/ext2/ialloc.c | 3 +- + fs/ext2/inode.c | 7 +- + fs/ext2/namei.c | 39 +++++--- + fs/ext2/super.c | 10 +- + fs/ext2/xattr.c | 6 +- + fs/ext4/inode.c | 2 +- + fs/fs-writeback.c | 103 +++++++++---------- + fs/kernfs/file.c | 2 +- + fs/nfsd/filecache.c | 8 +- + fs/notify/dnotify/dnotify.c | 8 +- + fs/notify/fanotify/fanotify.c | 187 +++++++++++++++++++---------------- + fs/notify/fanotify/fanotify.h | 15 +-- + fs/notify/fanotify/fanotify_user.c | 26 ++++- + fs/notify/fsnotify.c | 82 ++++++++------- + fs/notify/inotify/inotify.h | 6 +- + fs/notify/inotify/inotify_fsnotify.c | 11 +-- + fs/notify/inotify/inotify_user.c | 4 +- + fs/quota/Kconfig | 2 +- + fs/udf/ecma_167.h | 2 +- + fs/udf/super.c | 4 +- + fs/xfs/libxfs/xfs_trans_inode.c | 4 +- + include/linux/fs.h | 7 +- + include/linux/fsnotify.h | 43 ++++---- + include/linux/fsnotify_backend.h | 31 +++--- + include/trace/events/writeback.h | 14 ++- + include/uapi/linux/fanotify.h | 1 - + kernel/audit_fsnotify.c | 10 +- + kernel/audit_tree.c | 6 +- + kernel/audit_watch.c | 6 +- + 33 files changed, 388 insertions(+), 334 deletions(-) +Merging ext4/dev (7b97d868b7ab ext4, jbd2: ensure panic by fix a race between jbd2 abort and ext4 error handlers) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (fa95c1f6f9c8 f2fs: use generic names for generic ioctls) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/compress.c +Auto-merging Documentation/filesystems/f2fs.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/f2fs.rst +Resolved 'Documentation/filesystems/f2fs.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3eebb7e03395] Merge remote-tracking branch 'f2fs/dev' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 4 +- + Documentation/filesystems/f2fs.rst | 6 +- + fs/f2fs/checkpoint.c | 5 +- + fs/f2fs/compress.c | 50 ++++++++++--- + fs/f2fs/data.c | 81 +++++++++++++++----- + fs/f2fs/debug.c | 64 +++++++++++++--- + fs/f2fs/dir.c | 2 +- + fs/f2fs/extent_cache.c | 18 ++--- + fs/f2fs/f2fs.h | 62 ++++++++-------- + fs/f2fs/file.c | 67 +++++++++-------- + fs/f2fs/gc.c | 75 +++++++++++-------- + fs/f2fs/inline.c | 21 ++++-- + fs/f2fs/inode.c | 4 +- + fs/f2fs/namei.c | 10 ++- + fs/f2fs/node.c | 20 ++--- + fs/f2fs/recovery.c | 12 ++- + fs/f2fs/segment.c | 127 ++++++++++++++++++++++---------- + fs/f2fs/segment.h | 8 +- + fs/f2fs/super.c | 48 ++++++------ + fs/f2fs/sysfs.c | 19 ++++- + include/trace/events/f2fs.h | 63 ++++++++++++++++ + 21 files changed, 527 insertions(+), 239 deletions(-) +Merging fsverity/fsverity (9cd6b593cfc9 fs-verity: remove unnecessary extern keywords) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (31070f6ccec0 fuse: Fix parameter for FS_IOC_{GET,SET}FLAGS) +$ 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 (11ba468877bb Linux 5.8-rc5) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion")) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (c428aa8ef0cc SUNRPC: Add missing definition of ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. +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 (4518dfcf761e ovl: fix lookup of indexed hardlinks with metacopy) +$ 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 +Already up to date. +Merging v9fs/9p-next (aab6c873cf9b 9p: remove unused code in 9p) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + fs/9p/v9fs.c | 5 ++-- + fs/9p/vfs_inode.c | 62 ++++++-------------------------------------------- + fs/9p/vfs_inode_dotl.c | 9 ++++++-- + net/9p/trans_fd.c | 41 +++++++++++++++++++++++++-------- + 4 files changed, 47 insertions(+), 70 deletions(-) +Merging xfs/for-next (c3f2375b90d0 xfs: Fix false positive lockdep warning with sb_internal & fs_reclaim) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/libxfs/xfs_trans_inode.c +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_bmap.h | 15 +- + fs/xfs/libxfs/xfs_inode_buf.c | 33 +- + fs/xfs/libxfs/xfs_inode_buf.h | 6 - + fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- + fs/xfs/libxfs/xfs_shared.h | 1 + + fs/xfs/libxfs/xfs_trans_inode.c | 110 +++++-- + fs/xfs/scrub/bmap.c | 22 +- + fs/xfs/scrub/rtbitmap.c | 47 +++ + fs/xfs/xfs_bmap_util.c | 18 +- + fs/xfs/xfs_buf.c | 40 ++- + fs/xfs/xfs_buf.h | 48 +-- + fs/xfs/xfs_buf_item.c | 419 ++++++++++++------------- + fs/xfs/xfs_buf_item.h | 8 +- + fs/xfs/xfs_buf_item_recover.c | 5 +- + fs/xfs/xfs_dquot.c | 29 +- + fs/xfs/xfs_dquot_item.c | 18 -- + fs/xfs/xfs_dquot_item_recover.c | 2 +- + fs/xfs/xfs_file.c | 28 +- + fs/xfs/xfs_icache.c | 362 +++++++--------------- + fs/xfs/xfs_icache.h | 2 +- + fs/xfs/xfs_inode.c | 660 +++++++++++++++++++--------------------- + fs/xfs/xfs_inode.h | 5 +- + fs/xfs/xfs_inode_item.c | 305 +++++++++---------- + fs/xfs/xfs_inode_item.h | 24 +- + fs/xfs/xfs_inode_item_recover.c | 2 +- + fs/xfs/xfs_linux.h | 4 - + fs/xfs/xfs_log_recover.c | 5 +- + fs/xfs/xfs_mount.c | 15 +- + fs/xfs/xfs_mount.h | 1 - + fs/xfs/xfs_quota.h | 9 + + fs/xfs/xfs_reflink.c | 355 ++++++++++----------- + fs/xfs/xfs_reflink.h | 2 - + fs/xfs/xfs_super.c | 15 +- + fs/xfs/xfs_trace.h | 52 +--- + fs/xfs/xfs_trans.c | 19 +- + fs/xfs/xfs_trans.h | 5 - + fs/xfs/xfs_trans_ail.c | 10 +- + fs/xfs/xfs_trans_buf.c | 15 +- + 38 files changed, 1299 insertions(+), 1419 deletions(-) +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 (d1b4f507d71d iomap: Make sure iomap_end is called after iomap_begin) +$ git merge iomap/iomap-for-next +Merge made by the 'recursive' strategy. + fs/iomap/apply.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) +Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate()) +$ git merge djw-vfs/vfs-for-next +Already up to date. +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 (7999096fa9cf iov_iter: Move unnecessary inclusion of crypto/hash.h) +$ git merge vfs/for-next +Auto-merging fs/btrfs/inode.c +Merge made by the 'recursive' strategy. + arch/s390/lib/test_unwind.c | 1 + + drivers/dma/sf-pdma/sf-pdma.c | 1 + + drivers/dma/st_fdma.c | 1 + + drivers/dma/uniphier-xdmac.c | 1 + + drivers/misc/uacce/uacce.c | 1 + + drivers/mtd/mtdpstore.c | 1 + + drivers/mtd/nand/raw/cadence-nand-controller.c | 1 + + drivers/remoteproc/qcom_q6v5_mss.c | 1 + + drivers/soc/qcom/pdr_interface.c | 1 + + fs/btrfs/inode.c | 1 + + fs/ocfs2/dlmfs/dlmfs.c | 52 ++++---------------------- + fs/ocfs2/dlmfs/userdlm.c | 12 ++---- + fs/ocfs2/dlmfs/userdlm.h | 4 +- + include/linux/skbuff.h | 1 + + include/linux/socket.h | 1 + + include/linux/uio.h | 1 - + lib/iov_iter.c | 3 +- + 17 files changed, 27 insertions(+), 57 deletions(-) +Merging printk/for-next (d0557f794473 Merge branch 'printk-rework' into for-next) +$ git merge printk/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/dev-kmsg | 11 + + Documentation/core-api/printk-formats.rst | 4 +- + MAINTAINERS | 1 + + arch/mips/fw/arc/arc_con.c | 4 +- + drivers/tty/hvc/hvc_xen.c | 4 +- + drivers/tty/hvc/hvsi.c | 2 +- + drivers/tty/serial/sunsab.c | 2 +- + drivers/tty/serial/sunzilog.c | 2 +- + include/linux/crash_core.h | 3 + + kernel/printk/Makefile | 1 + + kernel/printk/printk.c | 966 +++++++++-------- + kernel/printk/printk_ringbuffer.c | 1687 +++++++++++++++++++++++++++++ + kernel/printk/printk_ringbuffer.h | 399 +++++++ + lib/vsprintf.c | 2 +- + 14 files changed, 2621 insertions(+), 467 deletions(-) + create mode 100644 kernel/printk/printk_ringbuffer.c + create mode 100644 kernel/printk/printk_ringbuffer.h +Merging pci/next (8a445afd710b Merge branch 'remotes/lorenzo/pci/vmd') +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/controller/vmd.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Merge made by the 'recursive' strategy. + Documentation/PCI/pci-error-recovery.rst | 8 +- + Documentation/PCI/pci.rst | 9 +- + Documentation/devicetree/bindings/pci/pci.txt | 4 +- + .../devicetree/bindings/pci/qcom,pcie.txt | 15 +- + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/x86/pci/fixup.c | 4 +- + drivers/block/rsxx/core.c | 2 +- + drivers/dma/ioat/init.c | 6 +- + drivers/media/pci/ngene/ngene-cards.c | 2 +- + drivers/misc/genwqe/card_base.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/pci/access.c | 16 +- + drivers/pci/bus.c | 6 +- + drivers/pci/controller/cadence/pcie-cadence-ep.c | 3 +- + drivers/pci/controller/cadence/pcie-cadence-host.c | 29 +--- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 3 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 5 +- + drivers/pci/controller/dwc/pci-exynos.c | 2 +- + drivers/pci/controller/dwc/pci-imx6.c | 2 +- + drivers/pci/controller/dwc/pci-keystone.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 2 +- + drivers/pci/controller/dwc/pcie-designware.c | 2 +- + drivers/pci/controller/dwc/pcie-designware.h | 2 +- + drivers/pci/controller/dwc/pcie-kirin.c | 2 +- + drivers/pci/controller/dwc/pcie-qcom.c | 192 +++++++++++++-------- + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 16 +- + drivers/pci/controller/pci-aardvark.c | 4 +- + drivers/pci/controller/pci-host-common.c | 36 ++-- + drivers/pci/controller/pci-mvebu.c | 13 +- + drivers/pci/controller/pci-tegra.c | 19 +- + drivers/pci/controller/pci-v3-semi.c | 13 +- + drivers/pci/controller/pci-versatile.c | 14 +- + drivers/pci/controller/pci-xgene.c | 16 +- + drivers/pci/controller/pcie-altera-msi.c | 3 +- + drivers/pci/controller/pcie-altera.c | 26 +-- + drivers/pci/controller/pcie-brcmstb.c | 20 +-- + drivers/pci/controller/pcie-iproc.c | 18 +- + drivers/pci/controller/pcie-iproc.h | 2 - + drivers/pci/controller/pcie-mediatek.c | 4 +- + drivers/pci/controller/pcie-rcar-host.c | 18 +- + drivers/pci/controller/pcie-rockchip-host.c | 18 +- + drivers/pci/controller/pcie-rockchip.c | 5 +- + drivers/pci/controller/pcie-rockchip.h | 1 - + drivers/pci/controller/pcie-xilinx-nwl.c | 14 +- + drivers/pci/controller/pcie-xilinx.c | 13 +- + drivers/pci/controller/vmd.c | 44 ++++- + drivers/pci/msi.c | 22 +-- + drivers/pci/pci-label.c | 2 +- + drivers/pci/pci.c | 10 +- + drivers/pci/pci.h | 2 +- + drivers/pci/pcie/Kconfig | 2 +- + drivers/pci/pcie/aer.c | 76 +++++--- + drivers/pci/pcie/aer_inject.c | 2 +- + drivers/pci/pcie/err.c | 4 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/quirks.c | 18 +- + drivers/pci/setup-res.c | 3 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 6 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/staging/qlge/qlge_main.c | 2 +- + include/linux/pci.h | 4 +- + 66 files changed, 369 insertions(+), 441 deletions(-) +Merging pstore/for-next/pstore (fd49e03280e5 pstore: Fix linking when crypto API disabled) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/platform.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging hid/for-next (4324aef0ec65 Merge branch 'for-5.9/core-v2' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 36 ++-- + drivers/hid/hid-lenovo.c | 360 +++++++++++++++++++++++++------- + drivers/hid/hid-wiimote-core.c | 5 + + drivers/hid/hid-wiimote-modules.c | 67 +++--- + drivers/hid/hid-wiimote.h | 2 + + drivers/hid/i2c-hid/i2c-hid-core.c | 12 ++ + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 16 +- + drivers/hid/usbhid/hid-core.c | 55 ++--- + drivers/hid/usbhid/usbhid.h | 2 + + 10 files changed, 410 insertions(+), 146 deletions(-) +Merging i2c/i2c/for-next (52399f62196e Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/algos/i2c-algo-pca.c | 4 ++-- + drivers/i2c/busses/i2c-ali1535.c | 8 ++++---- + drivers/i2c/busses/i2c-ali15x3.c | 6 +++--- + drivers/i2c/busses/i2c-emev2.c | 3 ++- + drivers/i2c/busses/i2c-i801.c | 3 ++- + drivers/i2c/busses/i2c-nomadik.c | 3 ++- + drivers/i2c/busses/i2c-piix4.c | 4 ++-- + drivers/i2c/busses/i2c-pnx.c | 3 ++- + drivers/i2c/busses/i2c-rk3x.c | 39 ++++++++++++++++++++++++++++++++++---- + drivers/i2c/busses/i2c-sh_mobile.c | 3 ++- + drivers/i2c/busses/i2c-sibyte.c | 3 ++- + drivers/i2c/busses/i2c-sirf.c | 4 ++-- + drivers/i2c/busses/i2c-viapro.c | 6 +++--- + drivers/i2c/i2c-dev.c | 4 ++-- + 14 files changed, 65 insertions(+), 28 deletions(-) +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/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT) +$ git merge dmi/dmi-for-next +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (c2cb4b5777e1 hwmon: sparx5: Add Sparx5 SoC temperature driver) +$ git merge hwmon-staging/hwmon-next +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/hwmon/microchip,sparx5-temp.yaml | 44 ++ + .../devicetree/bindings/hwmon/ti,tmp513.yaml | 4 +- + Documentation/hwmon/adc128d818.rst | 2 +- + Documentation/hwmon/adm1026.rst | 2 +- + Documentation/hwmon/adm1031.rst | 4 +- + Documentation/hwmon/adm1275.rst | 2 +- + Documentation/hwmon/adt7410.rst | 8 +- + Documentation/hwmon/corsair-cpro.rst | 42 ++ + Documentation/hwmon/emc1403.rst | 6 +- + Documentation/hwmon/f71882fg.rst | 2 +- + Documentation/hwmon/ina209.rst | 2 +- + Documentation/hwmon/ina2xx.rst | 10 +- + Documentation/hwmon/ina3221.rst | 2 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/jc42.rst | 26 +- + Documentation/hwmon/k8temp.rst | 2 +- + Documentation/hwmon/lm25066.rst | 6 +- + Documentation/hwmon/lm63.rst | 2 +- + Documentation/hwmon/lm70.rst | 6 +- + Documentation/hwmon/lm73.rst | 2 +- + Documentation/hwmon/lm75.rst | 26 +- + Documentation/hwmon/lm85.rst | 8 +- + Documentation/hwmon/lm87.rst | 2 +- + Documentation/hwmon/lm90.rst | 10 +- + Documentation/hwmon/lm93.rst | 2 +- + Documentation/hwmon/lm95234.rst | 4 +- + Documentation/hwmon/lm95245.rst | 4 +- + Documentation/hwmon/ltc2978.rst | 6 +- + Documentation/hwmon/max20730.rst | 10 +- + Documentation/hwmon/max20751.rst | 4 +- + Documentation/hwmon/max31790.rst | 2 +- + Documentation/hwmon/max34440.rst | 12 +- + Documentation/hwmon/nct6775.rst | 2 +- + Documentation/hwmon/pmbus.rst | 16 +- + Documentation/hwmon/sht21.rst | 4 +- + Documentation/hwmon/shtc1.rst | 6 +- + Documentation/hwmon/sparx5-temp.rst | 33 ++ + Documentation/hwmon/thmc50.rst | 2 +- + Documentation/hwmon/tmp103.rst | 2 +- + Documentation/hwmon/tmp108.rst | 2 +- + Documentation/hwmon/tmp401.rst | 2 +- + Documentation/hwmon/tmp421.rst | 4 +- + Documentation/hwmon/tmp513.rst | 4 +- + Documentation/hwmon/tps40422.rst | 2 +- + Documentation/hwmon/tps53679.rst | 8 +- + Documentation/hwmon/w83627ehf.rst | 2 +- + Documentation/hwmon/w83781d.rst | 2 +- + Documentation/hwmon/w83l786ng.rst | 2 +- + MAINTAINERS | 6 + + Makefile | 2 +- + drivers/hwmon/Kconfig | 20 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm1025.c | 2 +- + drivers/hwmon/adm1026.c | 2 +- + drivers/hwmon/corsair-cpro.c | 558 +++++++++++++++++++++ + drivers/hwmon/dell-smm-hwmon.c | 8 + + drivers/hwmon/gsc-hwmon.c | 8 +- + drivers/hwmon/hwmon-vid.c | 6 +- + drivers/hwmon/i5k_amb.c | 2 +- + drivers/hwmon/ina209.c | 2 +- + drivers/hwmon/ina2xx.c | 10 +- + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/lm87.c | 2 +- + drivers/hwmon/max6697.c | 96 +++- + drivers/hwmon/nct6683.c | 8 +- + drivers/hwmon/pmbus/Kconfig | 4 +- + drivers/hwmon/pmbus/adm1275.c | 13 +- + drivers/hwmon/pmbus/max20730.c | 57 ++- + drivers/hwmon/pmbus/pmbus_core.c | 66 ++- + drivers/hwmon/powr1220.c | 2 +- + drivers/hwmon/sht21.c | 2 +- + drivers/hwmon/sparx5-temp.c | 168 +++++++ + drivers/hwmon/tmp513.c | 4 +- + include/linux/platform_data/gsc_hwmon.h | 3 +- + 74 files changed, 1217 insertions(+), 196 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml + create mode 100644 Documentation/hwmon/corsair-cpro.rst + create mode 100644 Documentation/hwmon/sparx5-temp.rst + create mode 100644 drivers/hwmon/corsair-cpro.c + create mode 100644 drivers/hwmon/sparx5-temp.c +Merging jc_docs/docs-next (f33d4075e512 docs: openrisc: Replace HTTP links with HTTPS ones) +$ git merge jc_docs/docs-next +Auto-merging net/core/dev.c +Auto-merging mm/nommu.c +Auto-merging kernel/dma/debug.c +Auto-merging init/Kconfig +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dma-mapping.h +Auto-merging crypto/asymmetric_keys/public_key.c +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging Documentation/sh/index.rst +Auto-merging Documentation/process/coding-style.rst +Auto-merging Documentation/process/changes.rst +Auto-merging Documentation/powerpc/vas-api.rst +Removing Documentation/misc-devices/spear-pcie-gadget.txt +Removing Documentation/misc-devices/pci-endpoint-test.txt +Auto-merging Documentation/mips/ingenic-tcu.rst +Auto-merging Documentation/kbuild/kconfig-language.rst +Auto-merging Documentation/filesystems/overlayfs.rst +Auto-merging Documentation/filesystems/f2fs.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/f2fs.rst +Auto-merging Documentation/core-api/dma-api.rst +Auto-merging Documentation/arm64/sve.rst +Auto-merging Documentation/arm64/index.rst +CONFLICT (content): Merge conflict in Documentation/arm64/index.rst +Auto-merging Documentation/admin-guide/ext4.rst +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/PCI/pci.rst +Auto-merging Documentation/PCI/pci-error-recovery.rst +Removing Documentation/PCI/endpoint/function/binding/pci-test.txt +Auto-merging .mailmap +Resolved 'Documentation/arm64/index.rst' using previous resolution. +Resolved 'Documentation/filesystems/f2fs.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ff281b2b00b0] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 8 + + Documentation/ABI/testing/sysfs-driver-w1_therm | 2 +- + .../PCI/endpoint/function/binding/pci-test.rst | 26 + + .../PCI/endpoint/function/binding/pci-test.txt | 19 - + Documentation/PCI/endpoint/index.rst | 2 + + Documentation/PCI/endpoint/pci-endpoint-cfs.rst | 2 +- + Documentation/PCI/endpoint/pci-endpoint.rst | 2 +- + Documentation/PCI/pci-error-recovery.rst | 2 +- + Documentation/PCI/pci.rst | 8 +- + Documentation/admin-guide/LSM/Yama.rst | 7 +- + Documentation/admin-guide/blockdev/drbd/index.rst | 2 +- + Documentation/admin-guide/blockdev/floppy.rst | 6 +- + Documentation/admin-guide/cgroup-v1/rdma.rst | 2 +- + Documentation/admin-guide/cgroup-v2.rst | 8 +- + Documentation/admin-guide/cifs/todo.rst | 2 +- + Documentation/admin-guide/cifs/usage.rst | 7 +- + Documentation/admin-guide/cifs/winucase_convert.pl | 2 +- + Documentation/admin-guide/dell_rbu.rst | 2 +- + .../admin-guide/device-mapper/dm-integrity.rst | 4 +- + .../admin-guide/device-mapper/dm-raid.rst | 2 +- + .../admin-guide/device-mapper/dm-zoned.rst | 2 +- + Documentation/admin-guide/devices.txt | 6 +- + Documentation/admin-guide/ext4.rst | 4 +- + .../special-register-buffer-data-sampling.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 20 +- + .../admin-guide/laptops/disk-shock-protection.rst | 2 +- + Documentation/admin-guide/laptops/sonypi.rst | 2 +- + .../admin-guide/laptops/thinkpad-acpi.rst | 6 +- + Documentation/admin-guide/media/building.rst | 4 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 23 +- + Documentation/admin-guide/mm/index.rst | 1 + + Documentation/admin-guide/mm/ksm.rst | 4 +- + .../mm/nommu-mmap.rst} | 0 + Documentation/admin-guide/mm/numaperf.rst | 2 +- + Documentation/admin-guide/nfs/nfs-client.rst | 4 +- + Documentation/admin-guide/nfs/nfs-rdma.rst | 2 +- + Documentation/admin-guide/nfs/nfsroot.rst | 6 +- + .../admin-guide/nfs/pnfs-block-server.rst | 2 +- + Documentation/admin-guide/nfs/pnfs-scsi-server.rst | 2 +- + Documentation/admin-guide/perf/arm-ccn.rst | 2 +- + .../admin-guide/pm/intel-speed-select.rst | 4 +- + Documentation/admin-guide/pm/intel_pstate.rst | 2 +- + Documentation/admin-guide/security-bugs.rst | 9 +- + Documentation/admin-guide/sysctl/fs.rst | 2 +- + Documentation/admin-guide/sysctl/kernel.rst | 42 +- + Documentation/admin-guide/sysctl/vm.rst | 2 +- + Documentation/admin-guide/tainted-kernels.rst | 2 +- + Documentation/admin-guide/xfs.rst | 2 +- + Documentation/arm/booting.rst | 2 +- + Documentation/arm64/acpi_object_usage.rst | 2 +- + Documentation/arm64/arm-acpi.rst | 2 +- + Documentation/arm64/index.rst | 1 + + Documentation/arm64/{perf.txt => perf.rst} | 7 +- + Documentation/arm64/sve.rst | 2 +- + Documentation/block/biodoc.rst | 2 +- + Documentation/block/blk-mq.rst | 153 ++++ + Documentation/block/index.rst | 1 + + Documentation/block/pr.rst | 2 +- + .../bus-virt-phys-mapping.rst} | 2 +- + Documentation/core-api/dma-api.rst | 6 +- + Documentation/core-api/dma-isa-lpc.rst | 2 +- + Documentation/core-api/index.rst | 3 + + Documentation/core-api/kobject.rst | 2 +- + Documentation/core-api/printk-basics.rst | 2 +- + .../this_cpu_ops.rst} | 0 + .../unaligned-memory-access.rst | 0 + .../crypto/{api-intro.txt => api-intro.rst} | 186 ++--- + .../{asymmetric-keys.txt => asymmetric-keys.rst} | 91 ++- + .../crypto/{async-tx-api.txt => async-tx-api.rst} | 255 ++++--- + .../{descore-readme.txt => descore-readme.rst} | 152 ++-- + Documentation/crypto/index.rst | 5 + + Documentation/dev-tools/coccinelle.rst | 40 +- + Documentation/dev-tools/gcov.rst | 4 +- + Documentation/dev-tools/kgdb.rst | 2 +- + Documentation/dev-tools/kmemleak.rst | 2 - + Documentation/dev-tools/sparse.rst | 6 +- + ...oting-without-of.txt => booting-without-of.rst} | 302 ++++---- + Documentation/devicetree/index.rst | 1 + + Documentation/driver-api/device-io.rst | 22 +- + Documentation/driver-api/dmaengine/client.rst | 2 +- + Documentation/driver-api/dmaengine/provider.rst | 2 +- + Documentation/driver-api/driver-model/driver.rst | 2 - + .../early-userspace/early_userspace_support.rst | 4 +- + Documentation/driver-api/i3c/protocol.rst | 2 +- + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/ipmi.rst | 2 +- + .../{mailbox.txt => driver-api/mailbox.rst} | 0 + .../driver-api/memory-devices/ti-gpmc.rst | 2 +- + Documentation/driver-api/mmc/mmc-tools.rst | 2 +- + Documentation/driver-api/ntb.rst | 2 +- + Documentation/driver-api/nvdimm/nvdimm.rst | 14 +- + Documentation/driver-api/nvdimm/security.rst | 2 +- + Documentation/driver-api/rapidio/rapidio.rst | 4 +- + .../driver-api/thermal/cpu-idle-cooling.rst | 14 +- + .../driver-api/thermal/nouveau_thermal.rst | 2 +- + Documentation/driver-api/usb/dma.rst | 6 +- + .../driver-api/usb/writing_usb_driver.rst | 4 +- + Documentation/features/debug/kcov/arch-support.txt | 33 + + Documentation/features/debug/kgdb/arch-support.txt | 2 +- + .../features/debug/kmemleak/arch-support.txt | 33 + + Documentation/filesystems/9p.rst | 2 +- + Documentation/filesystems/afs.rst | 2 +- + Documentation/filesystems/autofs-mount-control.rst | 6 +- + Documentation/filesystems/caching/cachefiles.rst | 2 +- + Documentation/filesystems/caching/operations.rst | 2 +- + Documentation/filesystems/coda.rst | 4 +- + Documentation/filesystems/configfs.rst | 2 +- + Documentation/filesystems/directory-locking.rst | 4 +- + Documentation/filesystems/f2fs.rst | 328 ++++---- + Documentation/filesystems/fsverity.rst | 2 +- + Documentation/filesystems/hfs.rst | 2 +- + Documentation/filesystems/hpfs.rst | 2 +- + Documentation/filesystems/locking.rst | 12 +- + Documentation/filesystems/mount_api.rst | 4 +- + Documentation/filesystems/nfs/rpc-server-gss.rst | 6 +- + Documentation/filesystems/omfs.rst | 2 +- + Documentation/filesystems/overlayfs.rst | 2 +- + Documentation/filesystems/path-lookup.rst | 8 +- + Documentation/filesystems/proc.rst | 155 ++-- + .../filesystems/ramfs-rootfs-initramfs.rst | 8 +- + Documentation/filesystems/sysfs-tagging.rst | 2 +- + Documentation/filesystems/ubifs-authentication.rst | 4 +- + Documentation/filesystems/vfs.rst | 10 +- + Documentation/fpga/dfl.rst | 2 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/gpu/drm-uapi.rst | 2 +- + Documentation/gpu/komeda-kms.rst | 2 +- + Documentation/hid/hiddev.rst | 2 +- + Documentation/hid/intel-ish-hid.rst | 2 +- + Documentation/i2c/upgrading-clients.rst | 2 +- + Documentation/index.rst | 13 + + Documentation/kbuild/kconfig-language.rst | 2 +- + Documentation/leds/ledtrig-transient.rst | 2 +- + Documentation/locking/mutex-design.rst | 4 +- + Documentation/locking/ww-mutex-design.rst | 2 +- + .../maintainer/maintainer-entry-profile.rst | 2 +- + Documentation/mips/ingenic-tcu.rst | 2 +- + .../{ad525x_dpot.txt => ad525x_dpot.rst} | 24 +- + .../misc-devices/{apds990x.txt => apds990x.rst} | 31 +- + .../misc-devices/{bh1770glc.txt => bh1770glc.rst} | 45 +- + .../misc-devices/{c2port.txt => c2port.rst} | 56 +- + Documentation/misc-devices/index.rst | 6 + + Documentation/misc-devices/pci-endpoint-test.rst | 56 ++ + Documentation/misc-devices/pci-endpoint-test.txt | 41 - + Documentation/misc-devices/spear-pcie-gadget.rst | 170 +++++ + Documentation/misc-devices/spear-pcie-gadget.txt | 130 ---- + Documentation/misc-devices/xilinx_sdfec.rst | 2 +- + Documentation/openrisc/openrisc_port.rst | 2 +- + Documentation/powerpc/index.rst | 1 + + Documentation/powerpc/vas-api.rst | 25 +- + ...pudispatch_stats.txt => vcpudispatch_stats.rst} | 17 +- + Documentation/process/2.Process.rst | 12 +- + Documentation/process/4.Coding.rst | 4 +- + Documentation/process/botching-up-ioctls.rst | 2 +- + Documentation/process/changes.rst | 6 +- + Documentation/process/clang-format.rst | 2 +- + Documentation/process/coding-style.rst | 2 +- + Documentation/process/deprecated.rst | 118 +++ + Documentation/process/howto.rst | 2 +- + Documentation/process/kernel-docs.rst | 28 +- + Documentation/process/maintainer-pgp-guide.rst | 2 +- + Documentation/process/submitting-drivers.rst | 22 +- + Documentation/process/submitting-patches.rst | 4 +- + Documentation/s390/monreader.rst | 2 +- + Documentation/s390/vfio-ap.rst | 2 +- + Documentation/security/credentials.rst | 10 +- + Documentation/security/keys/core.rst | 2 +- + Documentation/security/keys/trusted-encrypted.rst | 2 +- + Documentation/sh/index.rst | 6 + + .../sh/{new-machine.txt => new-machine.rst} | 199 ++--- + .../sh/{register-banks.txt => register-banks.rst} | 13 +- + Documentation/sphinx/parse-headers.pl | 2 +- + Documentation/{crc32.txt => staging/crc32.rst} | 0 + Documentation/staging/index.rst | 59 ++ + Documentation/{kprobes.txt => staging/kprobes.rst} | 0 + Documentation/{lzo.txt => staging/lzo.rst} | 0 + .../{remoteproc.txt => staging/remoteproc.rst} | 2 +- + Documentation/{rpmsg.txt => staging/rpmsg.rst} | 0 + .../{speculation.txt => staging/speculation.rst} | 8 +- + .../{static-keys.txt => staging/static-keys.rst} | 0 + Documentation/{tee.txt => staging/tee.rst} | 69 ++ + Documentation/{xz.txt => staging/xz.rst} | 0 + Documentation/trace/ftrace.rst | 18 +- + Documentation/trace/histogram-design.rst | 4 +- + Documentation/trace/index.rst | 1 + + Documentation/trace/kprobetrace.rst | 2 +- + ...ng-buffer-design.txt => ring-buffer-design.rst} | 836 +++++++++++---------- + Documentation/trace/stm.rst | 4 +- + .../translations/it_IT/core-api/index.rst | 18 + + .../it_IT/core-api/symbol-namespaces.rst | 166 ++++ + Documentation/translations/it_IT/index.rst | 5 +- + .../translations/it_IT/kernel-hacking/hacking.rst | 4 +- + .../translations/ko_KR/memory-barriers.txt | 6 +- + Documentation/translations/zh_CN/arm/Booting | 2 +- + .../translations/zh_CN/filesystems/sysfs.txt | 6 +- + .../translations/zh_CN/process/2.Process.rst | 8 +- + .../translations/zh_CN/process/4.Coding.rst | 2 +- + .../zh_CN/process/7.AdvancedTopics.rst | 6 +- + .../translations/zh_CN/process/8.Conclusion.rst | 10 +- + .../translations/zh_CN/process/coding-style.rst | 2 +- + Documentation/translations/zh_CN/process/howto.rst | 12 +- + .../zh_CN/process/submitting-drivers.rst | 18 +- + .../zh_CN/process/submitting-patches.rst | 4 +- + .../zh_CN/process/volatile-considered-harmful.rst | 4 +- + Documentation/virt/kvm/amd-memory-encryption.rst | 6 +- + Documentation/virt/kvm/api.rst | 18 +- + Documentation/virt/kvm/mmu.rst | 2 +- + Documentation/virt/kvm/nested-vmx.rst | 2 +- + Documentation/virt/kvm/s390-pv.rst | 2 +- + Documentation/vm/memory-model.rst | 2 +- + Documentation/x86/earlyprintk.rst | 2 +- + Documentation/x86/x86_64/machinecheck.rst | 2 +- + MAINTAINERS | 20 +- + arch/Kconfig | 2 +- + arch/ia64/hp/common/sba_iommu.c | 12 +- + arch/parisc/kernel/pci-dma.c | 2 +- + arch/sh/Kconfig.cpu | 2 +- + arch/x86/include/asm/dma-mapping.h | 4 +- + arch/x86/kernel/amd_gart_64.c | 2 +- + crypto/asymmetric_keys/asymmetric_type.c | 2 +- + crypto/asymmetric_keys/public_key.c | 2 +- + crypto/asymmetric_keys/signature.c | 2 +- + drivers/block/drbd/Kconfig | 2 +- + drivers/md/Kconfig | 8 +- + drivers/md/dm-crypt.c | 2 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/ad525x_dpot.c | 2 +- + drivers/parisc/sba_iommu.c | 14 +- + fs/cifs/cifsacl.c | 4 +- + fs/cifs/cifsglob.h | 2 +- + fs/cifs/winucase.c | 2 +- + include/crypto/public_key.h | 2 +- + include/keys/asymmetric-parser.h | 2 +- + include/keys/asymmetric-subtype.h | 2 +- + include/keys/asymmetric-type.h | 2 +- + include/linux/dma-mapping.h | 2 +- + include/linux/fs.h | 2 +- + include/linux/jump_label.h | 2 +- + include/linux/kcsan-checks.h | 10 +- + include/linux/netdevice.h | 2 + + include/linux/phylink.h | 4 + + include/media/videobuf-dma-sg.h | 2 +- + init/Kconfig | 2 +- + kernel/dma/debug.c | 2 +- + lib/crc32.c | 2 +- + lib/lzo/lzo1x_decompress_safe.c | 2 +- + lib/xz/Kconfig | 2 +- + mm/Kconfig | 2 +- + mm/nommu.c | 2 +- + net/core/dev.c | 1 + + samples/kprobes/kprobe_example.c | 2 +- + samples/kprobes/kretprobe_example.c | 2 +- + scripts/kernel-doc | 7 + + scripts/sphinx-pre-install | 4 - + tools/testing/selftests/vm/protection_keys.c | 2 +- + 255 files changed, 2952 insertions(+), 1846 deletions(-) + create mode 100644 Documentation/PCI/endpoint/function/binding/pci-test.rst + delete mode 100644 Documentation/PCI/endpoint/function/binding/pci-test.txt + rename Documentation/{nommu-mmap.txt => admin-guide/mm/nommu-mmap.rst} (100%) + rename Documentation/arm64/{perf.txt => perf.rst} (95%) + create mode 100644 Documentation/block/blk-mq.rst + rename Documentation/{bus-virt-phys-mapping.txt => core-api/bus-virt-phys-mapping.rst} (99%) + rename Documentation/{this_cpu_ops.txt => core-api/this_cpu_ops.rst} (100%) + rename Documentation/{process => core-api}/unaligned-memory-access.rst (100%) + rename Documentation/crypto/{api-intro.txt => api-intro.rst} (70%) + rename Documentation/crypto/{asymmetric-keys.txt => asymmetric-keys.rst} (91%) + rename Documentation/crypto/{async-tx-api.txt => async-tx-api.rst} (55%) + rename Documentation/crypto/{descore-readme.txt => descore-readme.rst} (81%) + rename Documentation/devicetree/{booting-without-of.txt => booting-without-of.rst} (90%) + rename Documentation/{mailbox.txt => driver-api/mailbox.rst} (100%) + create mode 100644 Documentation/features/debug/kcov/arch-support.txt + create mode 100644 Documentation/features/debug/kmemleak/arch-support.txt + rename Documentation/misc-devices/{ad525x_dpot.txt => ad525x_dpot.rst} (85%) + rename Documentation/misc-devices/{apds990x.txt => apds990x.rst} (86%) + rename Documentation/misc-devices/{bh1770glc.txt => bh1770glc.rst} (83%) + rename Documentation/misc-devices/{c2port.txt => c2port.rst} (61%) + create mode 100644 Documentation/misc-devices/pci-endpoint-test.rst + delete mode 100644 Documentation/misc-devices/pci-endpoint-test.txt + create mode 100644 Documentation/misc-devices/spear-pcie-gadget.rst + delete mode 100644 Documentation/misc-devices/spear-pcie-gadget.txt + rename Documentation/powerpc/{vcpudispatch_stats.txt => vcpudispatch_stats.rst} (94%) + rename Documentation/sh/{new-machine.txt => new-machine.rst} (73%) + rename Documentation/sh/{register-banks.txt => register-banks.rst} (88%) + rename Documentation/{crc32.txt => staging/crc32.rst} (100%) + create mode 100644 Documentation/staging/index.rst + rename Documentation/{kprobes.txt => staging/kprobes.rst} (100%) + rename Documentation/{lzo.txt => staging/lzo.rst} (100%) + rename Documentation/{remoteproc.txt => staging/remoteproc.rst} (99%) + rename Documentation/{rpmsg.txt => staging/rpmsg.rst} (100%) + rename Documentation/{speculation.txt => staging/speculation.rst} (97%) + rename Documentation/{static-keys.txt => staging/static-keys.rst} (100%) + rename Documentation/{tee.txt => staging/tee.rst} (80%) + rename Documentation/{xz.txt => staging/xz.rst} (100%) + rename Documentation/trace/{ring-buffer-design.txt => ring-buffer-design.rst} (55%) + create mode 100644 Documentation/translations/it_IT/core-api/index.rst + create mode 100644 Documentation/translations/it_IT/core-api/symbol-namespaces.rst +Merging v4l-dvb/master (8f2a4a9d5ff5 media: dvbdev.h: keep * together with the type) +$ git merge v4l-dvb/master +Removing include/media/soc_camera.h +Removing include/media/drv-intf/soc_mediabus.h +Removing include/linux/platform_data/media/omap1_camera.h +Auto-merging drivers/usb/class/cdc-acm.c +Removing drivers/staging/media/soc_camera/soc_ov9740.c +Removing drivers/staging/media/soc_camera/soc_ov5642.c +Removing drivers/staging/media/soc_camera/soc_mt9v022.c +Removing drivers/staging/media/soc_camera/soc_mediabus.c +Removing drivers/staging/media/soc_camera/soc_camera.c +Removing drivers/staging/media/soc_camera/soc-camera.rst +Removing drivers/staging/media/soc_camera/mt9t031.c +Removing drivers/staging/media/soc_camera/imx074.c +Removing drivers/staging/media/soc_camera/TODO +Removing drivers/staging/media/soc_camera/Makefile +Removing drivers/staging/media/soc_camera/Kconfig +Removing arch/arm/mach-omap1/camera.h +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/media/renesas,vsp1.txt +Removing Documentation/devicetree/bindings/media/renesas,fdp1.txt +Removing Documentation/devicetree/bindings/media/renesas,fcp.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/media/fimc.rst | 6 +- + Documentation/admin-guide/media/vivid.rst | 9 + + .../bindings/media/i2c/chrontel,ch7322.yaml | 67 + + .../bindings/media/i2c/dongwoon,dw9768.yaml | 100 + + .../bindings/media/i2c/imi,rdacm2x-gmsl.yaml | 159 ++ + .../bindings/media/i2c/maxim,max9286.yaml | 366 +++ + .../devicetree/bindings/media/renesas,fcp.txt | 34 - + .../devicetree/bindings/media/renesas,fcp.yaml | 66 + + .../devicetree/bindings/media/renesas,fdp1.txt | 37 - + .../devicetree/bindings/media/renesas,fdp1.yaml | 69 + + .../devicetree/bindings/media/renesas,vsp1.txt | 30 - + .../devicetree/bindings/media/renesas,vsp1.yaml | 97 + + .../bindings/media/xilinx/xlnx,csi2rxss.yaml | 237 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/media/drivers/pvrusb2.rst | 2 +- + Documentation/driver-api/media/drivers/tuners.rst | 2 +- + .../media/cec/cec-ioc-adap-g-caps.rst | 3 + + .../userspace-api/media/dvb/fe-get-info.rst | 3 +- + Documentation/userspace-api/media/v4l/buffer.rst | 44 +- + .../media/v4l/colorspaces-details.rst | 4 +- + .../userspace-api/media/v4l/dev-decoder.rst | 10 +- + .../userspace-api/media/v4l/dev-encoder.rst | 753 ++++++ + .../userspace-api/media/v4l/dev-mem2mem.rst | 1 + + Documentation/userspace-api/media/v4l/dev-osd.rst | 2 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 2 +- + .../userspace-api/media/v4l/hist-v4l2.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 28 +- + .../userspace-api/media/v4l/pixfmt-v4l2.rst | 5 + + Documentation/userspace-api/media/v4l/v4l2.rst | 2 + + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 7 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 2 +- + .../userspace-api/media/v4l/vidioc-encoder-cmd.rst | 51 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 30 +- + .../userspace-api/media/v4l/vidioc-g-parm.rst | 51 +- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 21 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 1 + + MAINTAINERS | 64 +- + arch/arm/configs/ezx_defconfig | 2 - + arch/arm/configs/imote2_defconfig | 2 - + arch/arm/configs/imx_v4_v5_defconfig | 1 - + arch/arm/configs/imx_v6_v7_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 3 - + arch/arm/configs/sama5_defconfig | 2 - + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 31 - + arch/arm/mach-omap1/board-ams-delta.c | 32 - + arch/arm/mach-omap1/camera.h | 14 - + arch/arm/mach-omap1/devices.c | 43 - + arch/arm/mach-pxa/palmz72.c | 112 - + arch/arm/mach-pxa/pcm990-baseboard.c | 157 -- + arch/sh/configs/ap325rxa_defconfig | 3 - + arch/sh/configs/ecovec24_defconfig | 3 - + arch/sh/configs/migor_defconfig | 3 - + arch/sh/configs/se7724_defconfig | 2 - + drivers/media/cec/Kconfig | 1 + + drivers/media/cec/Makefile | 2 +- + drivers/media/cec/core/cec-adap.c | 4 - + drivers/media/cec/core/cec-api.c | 8 +- + drivers/media/cec/core/cec-core.c | 1 - + drivers/media/cec/core/cec-notifier.c | 11 +- + drivers/media/cec/i2c/Kconfig | 14 + + drivers/media/cec/i2c/Makefile | 5 + + drivers/media/cec/i2c/ch7322.c | 604 +++++ + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 6 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 40 +- + drivers/media/common/videobuf2/videobuf2-core.c | 367 +-- + .../media/common/videobuf2/videobuf2-dma-contig.c | 44 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 38 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 147 +- + drivers/media/dvb-core/dvb_vb2.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 11 - + drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +- + drivers/media/firewire/firedtv-fw.c | 2 + + drivers/media/i2c/Kconfig | 39 + + drivers/media/i2c/Makefile | 4 + + drivers/media/i2c/dw9768.c | 554 +++++ + drivers/media/i2c/imx290.c | 404 +++- + drivers/media/i2c/max9271.c | 341 +++ + drivers/media/i2c/max9271.h | 224 ++ + drivers/media/i2c/max9286.c | 1320 ++++++++++ + drivers/media/i2c/ov2740.c | 149 +- + drivers/media/i2c/ov9640.c | 2 +- + drivers/media/i2c/rdacm20.c | 667 ++++++ + drivers/media/i2c/s5k6a3.c | 2 +- + drivers/media/i2c/smiapp/smiapp-core.c | 5 +- + drivers/media/i2c/tvp5150.c | 8 +- + drivers/media/mc/mc-request.c | 31 +- + drivers/media/pci/cx18/cx18-cards.c | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 3 - + drivers/media/pci/cx23885/cx23888-ir.c | 20 - + drivers/media/pci/cx25821/cx25821-core.c | 3 - + drivers/media/pci/cx88/cx88-video.c | 60 +- + drivers/media/pci/dt3155/dt3155.c | 2 +- + drivers/media/pci/dt3155/dt3155.h | 2 +- + drivers/media/pci/ivtv/ivtv-cards.c | 2 +- + drivers/media/pci/meye/meye.c | 15 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-disp.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-eeprom.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-enc.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-gpio.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-i2c.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-jpeg.h | 2 +- + drivers/media/pci/solo6x10/solo6x10-offsets.h | 2 +- + drivers/media/pci/solo6x10/solo6x10-p2m.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-regs.h | 2 +- + drivers/media/pci/solo6x10/solo6x10-tw28.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-tw28.h | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +- + drivers/media/pci/solo6x10/solo6x10.h | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 63 +- + drivers/media/pci/ttpci/av7110.c | 5 +- + drivers/media/pci/ttpci/budget-core.c | 11 +- + drivers/media/pci/tw5864/tw5864-core.c | 2 +- + drivers/media/pci/tw68/tw68-core.c | 32 +- + drivers/media/platform/am437x/am437x-vpfe.c | 19 +- + drivers/media/platform/atmel/atmel-isc-base.c | 60 +- + drivers/media/platform/atmel/atmel-isc-regs.h | 2 - + drivers/media/platform/atmel/atmel-isc.h | 2 +- + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 2 + + drivers/media/platform/coda/coda-common.c | 5 +- + drivers/media/platform/coda/coda-jpeg.c | 5 +- + drivers/media/platform/davinci/vpbe_display.c | 2 +- + drivers/media/platform/davinci/vpif.c | 3 +- + drivers/media/platform/davinci/vpif.h | 2 +- + drivers/media/platform/davinci/vpif_display.c | 2 +- + drivers/media/platform/davinci/vpif_display.h | 2 +- + drivers/media/platform/davinci/vpss.c | 20 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 22 +- + drivers/media/platform/exynos4-is/fimc-is.c | 1 + + drivers/media/platform/exynos4-is/fimc-isp-video.c | 1 + + drivers/media/platform/exynos4-is/fimc-lite.c | 18 +- + drivers/media/platform/exynos4-is/media-dev.c | 5 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 + + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 2 +- + drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 60 +- + drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 23 +- + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 69 +- + drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 12 +- + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 97 +- + drivers/media/platform/omap3isp/isppreview.c | 4 +- + drivers/media/platform/pxa_camera.c | 21 +- + drivers/media/platform/qcom/camss/camss-csid.c | 6 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 2 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 6 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 10 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 4 + + drivers/media/platform/qcom/venus/venc.c | 3 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 15 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 21 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 15 +- + drivers/media/platform/rcar_jpu.c | 2 +- + drivers/media/platform/rockchip/rga/rga-hw.c | 29 +- + drivers/media/platform/rockchip/rga/rga-hw.h | 5 + + drivers/media/platform/s3c-camif/camif-core.c | 2 +- + drivers/media/platform/s5p-g2d/g2d.c | 28 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 16 +- + drivers/media/platform/sti/hva/hva-v4l2.c | 2 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 2 + + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 2 +- + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 5 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 2 + + drivers/media/platform/ti-vpe/Makefile | 2 +- + drivers/media/platform/ti-vpe/cal-camerarx.c | 649 +++++ + drivers/media/platform/ti-vpe/cal-video.c | 886 +++++++ + drivers/media/platform/ti-vpe/cal.c | 2523 ++++---------------- + drivers/media/platform/ti-vpe/cal.h | 267 +++ + drivers/media/platform/ti-vpe/cal_regs.h | 74 +- + drivers/media/platform/ti-vpe/vpe.c | 2 +- + drivers/media/platform/vsp1/vsp1_dl.c | 2 + + drivers/media/platform/xilinx/Kconfig | 7 + + drivers/media/platform/xilinx/Makefile | 1 + + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 1111 +++++++++ + drivers/media/rc/Kconfig | 11 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/fintek-cir.c | 7 - + drivers/media/rc/imon.c | 2 +- + drivers/media/rc/ir_toy.c | 509 ++++ + drivers/media/rc/nuvoton-cir.c | 32 - + drivers/media/rc/rc-main.c | 2 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 6 +- + drivers/media/test-drivers/vimc/Kconfig | 2 + + drivers/media/test-drivers/vimc/vimc-common.h | 1 + + drivers/media/test-drivers/vimc/vimc-core.c | 10 + + drivers/media/test-drivers/vimc/vimc-sensor.c | 71 + + drivers/media/test-drivers/vivid/vivid-core.c | 13 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 8 +- + drivers/media/usb/dvb-usb/Kconfig | 1 + + drivers/media/usb/go7007/go7007-usb.c | 11 +- + drivers/media/usb/gspca/gspca.c | 2 +- + drivers/media/usb/gspca/jl2005bcd.c | 2 +- + drivers/media/usb/gspca/ov534.c | 2 +- + drivers/media/usb/gspca/sn9c2028.c | 2 +- + drivers/media/v4l2-core/v4l2-async.c | 83 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 10 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 19 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 6 +- + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/allegro-dvt/allegro-core.c | 391 +-- + drivers/staging/media/allegro-dvt/allegro-mail.c | 507 ++++ + drivers/staging/media/allegro-dvt/allegro-mail.h | 111 +- + drivers/staging/media/hantro/hantro.h | 13 +- + drivers/staging/media/hantro/hantro_drv.c | 94 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 17 + + drivers/staging/media/hantro/hantro_h264.c | 6 +- + drivers/staging/media/hantro/hantro_hw.h | 5 +- + drivers/staging/media/hantro/hantro_v4l2.c | 30 +- + drivers/staging/media/hantro/imx8m_vpu_hw.c | 2 +- + drivers/staging/media/hantro/rk3288_vpu_hw.c | 8 +- + drivers/staging/media/hantro/rk3399_vpu_hw.c | 7 +- + drivers/staging/media/imx/imx-ic-prp.c | 4 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 4 +- + drivers/staging/media/imx/imx-media-csi.c | 4 +- + drivers/staging/media/imx/imx-media-vdic.c | 4 +- + drivers/staging/media/rkisp1/TODO | 1 - + drivers/staging/media/rkisp1/rkisp1-capture.c | 56 +- + drivers/staging/media/rkisp1/rkisp1-common.h | 26 +- + drivers/staging/media/rkisp1/rkisp1-dev.c | 11 +- + drivers/staging/media/rkisp1/rkisp1-isp.c | 75 +- + drivers/staging/media/rkisp1/rkisp1-params.c | 2 +- + drivers/staging/media/rkisp1/rkisp1-regs.h | 1 - + drivers/staging/media/rkisp1/rkisp1-resizer.c | 18 +- + drivers/staging/media/rkisp1/rkisp1-stats.c | 126 +- + drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 4 +- + drivers/staging/media/rkvdec/rkvdec.c | 29 +- + drivers/staging/media/soc_camera/Kconfig | 51 - + drivers/staging/media/soc_camera/Makefile | 7 - + drivers/staging/media/soc_camera/TODO | 4 - + drivers/staging/media/soc_camera/imx074.c | 492 ---- + drivers/staging/media/soc_camera/mt9t031.c | 853 ------- + drivers/staging/media/soc_camera/soc-camera.rst | 171 -- + drivers/staging/media/soc_camera/soc_camera.c | 2164 ----------------- + drivers/staging/media/soc_camera/soc_mediabus.c | 529 ---- + drivers/staging/media/soc_camera/soc_mt9v022.c | 1008 -------- + drivers/staging/media/soc_camera/soc_ov5642.c | 1085 --------- + drivers/staging/media/soc_camera/soc_ov9740.c | 992 -------- + drivers/staging/media/tegra-vde/vde.c | 45 +- + drivers/usb/class/cdc-acm.c | 6 + + include/linux/platform_data/media/omap1_camera.h | 32 - + include/linux/property.h | 5 + + include/media/cec.h | 57 +- + include/media/davinci/vpbe_display.h | 2 +- + include/media/drv-intf/soc_mediabus.h | 107 - + include/media/dvbdev.h | 6 +- + include/media/media-device.h | 2 +- + include/media/media-devnode.h | 2 +- + include/media/media-entity.h | 2 +- + include/media/soc_camera.h | 397 --- + include/media/tpg/v4l2-tpg.h | 3 +- + include/media/v4l2-rect.h | 20 + + include/media/v4l2-subdev.h | 35 +- + include/media/videobuf2-core.h | 51 +- + include/media/videobuf2-v4l2.h | 13 + + include/uapi/linux/videodev2.h | 17 +- + 259 files changed, 12738 insertions(+), 12057 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml + delete mode 100644 Documentation/devicetree/bindings/media/renesas,fcp.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,fcp.yaml + delete mode 100644 Documentation/devicetree/bindings/media/renesas,fdp1.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,fdp1.yaml + delete mode 100644 Documentation/devicetree/bindings/media/renesas,vsp1.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,vsp1.yaml + create mode 100644 Documentation/devicetree/bindings/media/xilinx/xlnx,csi2rxss.yaml + create mode 100644 Documentation/userspace-api/media/v4l/dev-encoder.rst + delete mode 100644 arch/arm/mach-omap1/camera.h + create mode 100644 drivers/media/cec/i2c/Kconfig + create mode 100644 drivers/media/cec/i2c/Makefile + create mode 100644 drivers/media/cec/i2c/ch7322.c + create mode 100644 drivers/media/i2c/dw9768.c + create mode 100644 drivers/media/i2c/max9271.c + create mode 100644 drivers/media/i2c/max9271.h + create mode 100644 drivers/media/i2c/max9286.c + create mode 100644 drivers/media/i2c/rdacm20.c + create mode 100644 drivers/media/platform/ti-vpe/cal-camerarx.c + create mode 100644 drivers/media/platform/ti-vpe/cal-video.c + create mode 100644 drivers/media/platform/ti-vpe/cal.h + create mode 100644 drivers/media/platform/xilinx/xilinx-csi2rxss.c + create mode 100644 drivers/media/rc/ir_toy.c + delete mode 100644 drivers/staging/media/soc_camera/Kconfig + delete mode 100644 drivers/staging/media/soc_camera/Makefile + delete mode 100644 drivers/staging/media/soc_camera/TODO + delete mode 100644 drivers/staging/media/soc_camera/imx074.c + delete mode 100644 drivers/staging/media/soc_camera/mt9t031.c + delete mode 100644 drivers/staging/media/soc_camera/soc-camera.rst + delete mode 100644 drivers/staging/media/soc_camera/soc_camera.c + delete mode 100644 drivers/staging/media/soc_camera/soc_mediabus.c + delete mode 100644 drivers/staging/media/soc_camera/soc_mt9v022.c + delete mode 100644 drivers/staging/media/soc_camera/soc_ov5642.c + delete mode 100644 drivers/staging/media/soc_camera/soc_ov9740.c + delete mode 100644 include/linux/platform_data/media/omap1_camera.h + delete mode 100644 include/media/drv-intf/soc_mediabus.h + delete mode 100644 include/media/soc_camera.h +Merging v4l-dvb-next/master (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it") +$ git merge v4l-dvb-next/master +Removing drivers/staging/media/atomisp/pci/isp2401_system_local.h +Removing drivers/staging/media/atomisp/pci/isp2400_system_local.h +Auto-merging drivers/staging/media/atomisp/pci/atomisp_v4l2.c +CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp_v4l2.c +Auto-merging drivers/staging/media/atomisp/Kconfig +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 d189d79b0f57] Merge remote-tracking branch 'v4l-dvb-next/master' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/iosf_mbi.h | 1 + + drivers/staging/media/atomisp/Kconfig | 2 +- + drivers/staging/media/atomisp/Makefile | 6 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 6 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 6 +- + .../media/atomisp/include/linux/atomisp_platform.h | 1 + + drivers/staging/media/atomisp/pci/atomisp-regs.h | 3 - + drivers/staging/media/atomisp/pci/atomisp_acc.c | 4 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 59 +-- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 4 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 2 - + .../media/atomisp/pci/atomisp_compat_css20.c | 70 ++- + .../media/atomisp/pci/atomisp_compat_css20.h | 2 +- + drivers/staging/media/atomisp/pci/atomisp_drvfs.c | 14 +- + drivers/staging/media/atomisp/pci/atomisp_drvfs.h | 2 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 537 ++++++++++++++------- + .../staging/media/atomisp/pci/atomisp_internal.h | 2 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 19 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 285 +++++------ + .../media/atomisp/pci/base/refcount/src/refcount.c | 28 +- + drivers/staging/media/atomisp/pci/hive_types.h | 24 +- + drivers/staging/media/atomisp/pci/hmm/hmm.c | 10 +- + .../media/atomisp/pci/isp2400_system_global.h | 302 ------------ + .../media/atomisp/pci/isp2400_system_local.h | 321 ------------ + .../media/atomisp/pci/isp2401_system_global.h | 410 +--------------- + .../media/atomisp/pci/isp2401_system_local.h | 402 --------------- + drivers/staging/media/atomisp/pci/sh_css.c | 9 +- + drivers/staging/media/atomisp/pci/system_global.h | 395 +++++++++++++++ + drivers/staging/media/atomisp/pci/system_local.c | 179 +++++++ + drivers/staging/media/atomisp/pci/system_local.h | 104 +++- + 30 files changed, 1280 insertions(+), 1929 deletions(-) + delete mode 100644 drivers/staging/media/atomisp/pci/isp2400_system_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/isp2401_system_local.h + create mode 100644 drivers/staging/media/atomisp/pci/system_local.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 (e1f8d84fc3fe Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Auto-merging kernel/sched/fair.c +Auto-merging include/linux/device.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging drivers/cpufreq/scmi-cpufreq.c +Removing drivers/acpi/cm_sbs.c +Auto-merging Documentation/admin-guide/pm/intel_pstate.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/admin-guide/pm/cpufreq.rst | 6 +- + Documentation/admin-guide/pm/intel_pstate.rst | 17 +- + Documentation/power/energy-model.rst | 135 ++++++----- + arch/powerpc/platforms/cell/cpufreq_spudemand.c | 26 +-- + arch/x86/include/asm/msr-index.h | 6 +- + drivers/acpi/Kconfig | 17 -- + drivers/acpi/Makefile | 1 - + drivers/acpi/ac.c | 108 +-------- + drivers/acpi/acpi_pad.c | 2 +- + drivers/acpi/acpi_processor.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 14 +- + drivers/acpi/acpica/exregion.c | 64 ++++-- + drivers/acpi/battery.c | 255 --------------------- + drivers/acpi/button.c | 2 +- + drivers/acpi/cm_sbs.c | 87 ------- + drivers/acpi/dock.c | 2 +- + drivers/acpi/ec.c | 8 +- + drivers/acpi/evged.c | 2 +- + drivers/acpi/osl.c | 63 ++--- + drivers/acpi/processor_idle.c | 3 +- + drivers/acpi/property.c | 14 +- + drivers/acpi/resource.c | 2 +- + drivers/acpi/spcr.c | 4 +- + drivers/acpi/sysfs.c | 12 +- + drivers/acpi/tables.c | 8 +- + drivers/base/power/domain.c | 194 ++++++++-------- + drivers/base/power/domain_governor.c | 12 +- + drivers/base/power/sysfs.c | 9 +- + drivers/cpufreq/acpi-cpufreq.c | 10 +- + drivers/cpufreq/amd_freq_sensitivity.c | 2 +- + drivers/cpufreq/cpufreq-dt.c | 2 +- + drivers/cpufreq/cpufreq.c | 122 +++++----- + drivers/cpufreq/cpufreq_conservative.c | 22 +- + drivers/cpufreq/cpufreq_governor.c | 2 +- + drivers/cpufreq/cpufreq_ondemand.c | 24 +- + drivers/cpufreq/cpufreq_performance.c | 14 +- + drivers/cpufreq/cpufreq_powersave.c | 18 +- + drivers/cpufreq/cpufreq_userspace.c | 18 +- + drivers/cpufreq/davinci-cpufreq.c | 2 +- + drivers/cpufreq/freq_table.c | 6 +- + drivers/cpufreq/imx6q-cpufreq.c | 2 +- + drivers/cpufreq/intel_pstate.c | 148 +++++++++--- + drivers/cpufreq/mediatek-cpufreq.c | 2 +- + drivers/cpufreq/omap-cpufreq.c | 2 +- + drivers/cpufreq/pasemi-cpufreq.c | 2 + + drivers/cpufreq/pcc-cpufreq.c | 2 +- + drivers/cpufreq/powernow-k8.c | 4 +- + drivers/cpufreq/powernv-cpufreq.c | 19 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 11 +- + drivers/cpufreq/scpi-cpufreq.c | 2 +- + drivers/cpufreq/vexpress-spc-cpufreq.c | 2 +- + drivers/idle/intel_idle.c | 47 +++- + drivers/opp/of.c | 76 ++++--- + drivers/pci/hotplug/acpiphp_glue.c | 14 +- + drivers/pci/pci-acpi.c | 6 +- + drivers/powercap/idle_inject.c | 10 +- + drivers/powercap/intel_rapl_common.c | 23 +- + drivers/thermal/cpufreq_cooling.c | 12 +- + fs/nfs/nfs4proc.c | 2 +- + include/acpi/actypes.h | 12 +- + include/linux/cpufreq.h | 14 ++ + include/linux/device.h | 5 + + include/linux/energy_model.h | 149 +++++++----- + include/linux/freezer.h | 14 ++ + include/linux/pm_domain.h | 12 +- + include/linux/pm_opp.h | 15 +- + kernel/power/energy_model.c | 290 ++++++++++++++++-------- + kernel/power/hibernate.c | 6 +- + kernel/power/power.h | 2 +- + kernel/power/snapshot.c | 4 +- + kernel/sched/cpufreq_schedutil.c | 6 +- + kernel/sched/fair.c | 2 +- + kernel/sched/topology.c | 20 +- + scripts/gdb/linux/genpd.py | 12 +- + 76 files changed, 1070 insertions(+), 1203 deletions(-) + delete mode 100644 drivers/acpi/cm_sbs.c +Merging cpufreq-arm/cpufreq/arm/linux-next (887d5fc82cb4 cpufreq: Add Tegra194 cpufreq driver) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging include/linux/pm_opp.h +Auto-merging drivers/cpufreq/qcom-cpufreq-hw.c +Merge made by the 'recursive' strategy. + .../bindings/arm/nvidia,tegra194-ccplex.yaml | 69 ++++ + drivers/cpufreq/Kconfig.arm | 9 + + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/armada-37xx-cpufreq.c | 1 + + drivers/cpufreq/brcmstb-avs-cpufreq.c | 89 +++-- + drivers/cpufreq/cppc_cpufreq.c | 95 +++-- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 + + drivers/cpufreq/qcom-cpufreq-hw.c | 86 ++++- + drivers/cpufreq/sti-cpufreq.c | 8 +- + drivers/cpufreq/tegra186-cpufreq.c | 6 - + drivers/cpufreq/tegra194-cpufreq.c | 390 +++++++++++++++++++++ + drivers/opp/core.c | 31 ++ + include/linux/pm_opp.h | 6 + + 13 files changed, 698 insertions(+), 95 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/nvidia,tegra194-ccplex.yaml + create mode 100644 drivers/cpufreq/tegra194-cpufreq.c +Merging cpupower/cpupower (fa0866a1d1be cpupower: Replace HTTP links with HTTPS ones) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/lib/cpufreq.c | 10 +++++----- + tools/power/cpupower/man/cpupower-monitor.1 | 4 ++-- + tools/power/cpupower/utils/helpers/bitmask.c | 6 +++--- + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging opp/opp/linux-next (52d82df42eef opp: ti-opp-supply: Replace HTTP links with HTTPS ones) +$ git merge opp/opp/linux-next +Auto-merging include/linux/pm_opp.h +Auto-merging drivers/opp/core.c +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 1 + + drivers/opp/ti-opp-supply.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging thermal/thermal/linux-next (77f47251bae1 thermal: core: Move initialization after core initcall) +$ git merge thermal/thermal/linux-next +Auto-merging net/netlink/genetlink.c +Removing include/linux/clock_cooling.h +Auto-merging drivers/thermal/sprd_thermal.c +Auto-merging drivers/thermal/rcar_gen3_thermal.c +Auto-merging drivers/thermal/intel/int340x_thermal/int3400_thermal.c +Auto-merging drivers/thermal/imx_thermal.c +Removing drivers/thermal/clock_cooling.c +Merge made by the 'recursive' strategy. + drivers/acpi/thermal.c | 76 +-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 8 + + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 91 +-- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 9 +- + drivers/platform/x86/acerhdf.c | 33 +- + drivers/platform/x86/intel_mid_thermal.c | 6 + + drivers/power/supply/power_supply_core.c | 9 +- + drivers/thermal/Kconfig | 20 +- + drivers/thermal/Makefile | 6 +- + drivers/thermal/armada_thermal.c | 6 + + drivers/thermal/clock_cooling.c | 445 -------------- + drivers/thermal/da9062-thermal.c | 16 +- + drivers/thermal/dove_thermal.c | 6 + + drivers/thermal/hisi_thermal.c | 6 +- + drivers/thermal/imx_thermal.c | 60 +- + .../intel/int340x_thermal/int3400_thermal.c | 38 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 5 + + drivers/thermal/intel/intel_pch_thermal.c | 5 + + drivers/thermal/intel/intel_quark_dts_thermal.c | 34 +- + drivers/thermal/intel/intel_soc_dts_iosf.c | 3 + + drivers/thermal/intel/x86_pkg_temp_thermal.c | 6 + + drivers/thermal/kirkwood_thermal.c | 7 + + drivers/thermal/rcar_gen3_thermal.c | 4 + + drivers/thermal/rcar_thermal.c | 9 +- + drivers/thermal/rockchip_thermal.c | 6 +- + drivers/thermal/spear_thermal.c | 7 + + drivers/thermal/sprd_thermal.c | 6 +- + drivers/thermal/st/st_thermal.c | 5 + + drivers/thermal/thermal_core.c | 167 +++++- + drivers/thermal/thermal_core.h | 15 + + drivers/thermal/thermal_helpers.c | 13 +- + drivers/thermal/thermal_netlink.c | 647 +++++++++++++++++++++ + drivers/thermal/thermal_netlink.h | 104 ++++ + drivers/thermal/thermal_of.c | 41 +- + drivers/thermal/thermal_sysfs.c | 52 +- + include/linux/clock_cooling.h | 57 -- + include/linux/thermal.h | 31 +- + include/uapi/linux/thermal.h | 89 ++- + net/netlink/genetlink.c | 2 +- + 39 files changed, 1242 insertions(+), 908 deletions(-) + delete mode 100644 drivers/thermal/clock_cooling.c + create mode 100644 drivers/thermal/thermal_netlink.c + create mode 100644 drivers/thermal/thermal_netlink.h + delete mode 100644 include/linux/clock_cooling.h +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 (b9f24a697ce0 fs: dlm: set skb mark per peer socket) +$ git merge dlm/next +Auto-merging net/core/sock.c +Auto-merging include/net/sock.h +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/dlm/config.h | 3 +++ + fs/dlm/dlm_internal.h | 1 + + fs/dlm/lockspace.c | 7 ++++--- + fs/dlm/lowcomms.c | 19 +++++++++++++++++++ + fs/dlm/plock.c | 20 ++++++++++++++++++++ + fs/dlm/recoverd.c | 1 + + include/net/sock.h | 1 + + net/core/sock.c | 8 ++++++++ + 9 files changed, 107 insertions(+), 3 deletions(-) +Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (5f0b2a6093a4 RDMA/rxe: Prevent access to wr->next ptr afrer wr is posted to send queue) +$ git merge rdma/for-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Removing drivers/infiniband/hw/mlx5/flow.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_mr.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_device.h +Auto-merging drivers/infiniband/core/mad.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/counters.c +Merge made by the 'recursive' strategy. + drivers/infiniband/Kconfig | 8 - + drivers/infiniband/core/counters.c | 24 +- + drivers/infiniband/core/device.c | 24 +- + drivers/infiniband/core/mad.c | 30 +- + drivers/infiniband/core/mad_priv.h | 2 +- + drivers/infiniband/core/mad_rmpp.c | 27 +- + drivers/infiniband/core/nldev.c | 220 +- + drivers/infiniband/core/trace.c | 2 - + drivers/infiniband/core/umem_odp.c | 2 + + drivers/infiniband/core/uverbs_cmd.c | 16 +- + drivers/infiniband/core/uverbs_ioctl.c | 1 + + .../infiniband/core/uverbs_std_types_counters.c | 17 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 3 - + drivers/infiniband/core/uverbs_std_types_device.c | 41 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 52 +- + drivers/infiniband/core/verbs.c | 180 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 9 +- + drivers/infiniband/hw/cxgb4/mem.c | 3 +- + drivers/infiniband/hw/cxgb4/provider.c | 11 +- + drivers/infiniband/hw/cxgb4/restrack.c | 24 +- + drivers/infiniband/hw/hfi1/chip.c | 27 +- + drivers/infiniband/hw/hfi1/pcie.c | 22 +- + drivers/infiniband/hw/hfi1/qp.h | 14 - + drivers/infiniband/hw/hns/hns_roce_device.h | 26 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 7 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 44 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 210 +- + drivers/infiniband/hw/hns/hns_roce_restrack.c | 14 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 3 +- + drivers/infiniband/hw/mlx4/main.c | 37 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 +- + drivers/infiniband/hw/mlx4/mr.c | 3 +- + drivers/infiniband/hw/mlx5/Makefile | 6 +- + drivers/infiniband/hw/mlx5/cmd.c | 12 - + drivers/infiniband/hw/mlx5/cmd.h | 1 - + drivers/infiniband/hw/mlx5/counters.c | 709 ++++ + drivers/infiniband/hw/mlx5/counters.h | 17 + + drivers/infiniband/hw/mlx5/devx.c | 102 +- + drivers/infiniband/hw/mlx5/devx.h | 45 + + drivers/infiniband/hw/mlx5/flow.c | 765 ---- + drivers/infiniband/hw/mlx5/fs.c | 2514 +++++++++++ + drivers/infiniband/hw/mlx5/fs.h | 29 + + drivers/infiniband/hw/mlx5/main.c | 4373 +++++--------------- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 91 +- + drivers/infiniband/hw/mlx5/mr.c | 2 +- + drivers/infiniband/hw/mlx5/odp.c | 19 +- + drivers/infiniband/hw/mlx5/qp.c | 43 +- + drivers/infiniband/hw/mlx5/qp.h | 1 + + drivers/infiniband/hw/mlx5/restrack.c | 121 +- + drivers/infiniband/hw/mlx5/restrack.h | 13 + + drivers/infiniband/hw/mlx5/srq.c | 4 +- + drivers/infiniband/hw/mlx5/std_types.c | 45 + + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 2 +- + drivers/infiniband/hw/qedr/qedr.h | 5 +- + drivers/infiniband/hw/qedr/verbs.c | 44 +- + drivers/infiniband/hw/qedr/verbs.h | 2 +- + drivers/infiniband/hw/usnic/usnic_fwd.c | 4 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 +- + drivers/infiniband/sw/rdmavt/ah.c | 3 +- + drivers/infiniband/sw/rdmavt/mr.c | 2 +- + drivers/infiniband/sw/rdmavt/mr.h | 2 +- + drivers/infiniband/sw/rxe/rxe.c | 7 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 8 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 50 +- + drivers/infiniband/sw/rxe/rxe_net.c | 5 - + drivers/infiniband/sw/rxe/rxe_recv.c | 6 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 31 +- + drivers/infiniband/sw/siw/siw_verbs.c | 2 +- + drivers/infiniband/sw/siw/siw_verbs.h | 2 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 67 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 13 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 2 + + drivers/infiniband/ulp/isert/ib_isert.c | 6 +- + drivers/infiniband/ulp/isert/ib_isert.h | 3 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 23 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 3 - + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.c | 6 + + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.h | 33 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 14 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 10 - + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 10 + + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 7 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 + + include/linux/mlx5/cq.h | 1 - + include/linux/mlx5/device.h | 9 + + include/linux/mlx5/mlx5_ifc.h | 14 +- + include/linux/mlx5/qp.h | 2 +- + include/linux/mlx5/rsc_dump.h | 51 + + include/rdma/ib_verbs.h | 69 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 15 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 14 + + include/uapi/rdma/qedr-abi.h | 10 +- + include/uapi/rdma/rdma_netlink.h | 9 + + 104 files changed, 5374 insertions(+), 5239 deletions(-) + create mode 100644 drivers/infiniband/hw/mlx5/counters.c + create mode 100644 drivers/infiniband/hw/mlx5/counters.h + create mode 100644 drivers/infiniband/hw/mlx5/devx.h + delete mode 100644 drivers/infiniband/hw/mlx5/flow.c + create mode 100644 drivers/infiniband/hw/mlx5/fs.c + create mode 100644 drivers/infiniband/hw/mlx5/fs.h + create mode 100644 drivers/infiniband/hw/mlx5/restrack.h + create mode 100644 drivers/infiniband/hw/mlx5/std_types.c + create mode 100644 include/linux/mlx5/rsc_dump.h +Merging net-next/master (7dce80c2a526 net: phy: at803x: add mdix configuration support for AR9331 and AR8035) +$ git merge net-next/master +Removing tools/build/feature/test-clang-bpf-global-var.c +Removing tools/bpf/bpftool/skeleton/profiler.h +Auto-merging scripts/link-vmlinux.sh +Auto-merging net/nfc/nci/core.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/core/sock.c +Auto-merging net/core/dev.c +Auto-merging kernel/bpf/btf.c +CONFLICT (content): Merge conflict in kernel/bpf/btf.c +Auto-merging include/net/xfrm.h +Auto-merging include/net/sock.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/phylink.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/net/phy/dp83640.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/net/ethernet/sfc/efx.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_int.c +Removing drivers/net/ethernet/mscc/ocelot_tc.h +Removing drivers/net/ethernet/mscc/ocelot_tc.c +Removing drivers/net/ethernet/mscc/ocelot_regs.c +Removing drivers/net/ethernet/mscc/ocelot_board.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/freescale/fec_ptp.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +Auto-merging drivers/net/ethernet/cadence/macb_main.c +Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h +Auto-merging drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +Auto-merging drivers/net/ethernet/aquantia/atlantic/aq_nic.h +Auto-merging drivers/net/ethernet/aquantia/atlantic/aq_nic.c +Auto-merging drivers/net/ethernet/aquantia/atlantic/aq_hw.h +Auto-merging Makefile +Auto-merging MAINTAINERS +Resolved 'drivers/net/ethernet/sfc/efx.c' using previous resolution. +Resolved 'kernel/bpf/btf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master df398956cea6] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/btf.rst | 36 + + .../devicetree/bindings/misc/fsl,qoriq-mc.txt | 2 +- + .../bindings/net/amlogic,meson-dwmac.yaml | 3 + + .../devicetree/bindings/net/dsa/ocelot.txt | 105 +- + .../devicetree/bindings/net/ethernet-phy.yaml | 12 + + .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 3 + + .../devicetree/bindings/net/ti,dp83867.yaml | 2 +- + .../devicetree/bindings/net/ti,dp83869.yaml | 18 +- + Documentation/driver-api/driver-model/devres.rst | 3 +- + Documentation/filesystems/debugfs.rst | 12 +- + Documentation/networking/bareudp.rst | 6 +- + Documentation/networking/batman-adv.rst | 8 +- + .../{ => device_drivers/appletalk}/cops.rst | 0 + .../networking/device_drivers/appletalk/index.rst | 19 + + .../{ => device_drivers/appletalk}/ltpc.rst | 0 + .../{ => device_drivers/atm}/cxacru-cf.py | 0 + .../networking/{ => device_drivers/atm}/cxacru.rst | 0 + .../{ => device_drivers/atm}/fore200e.rst | 0 + .../networking/device_drivers/atm/index.rst | 20 + + .../networking/{ => device_drivers/atm}/iphase.rst | 0 + .../networking/device_drivers/cable/index.rst | 18 + + .../device_drivers/{ => cable}/sb1000.rst | 0 + .../networking/device_drivers/cellular/index.rst | 18 + + .../{ => cellular}/qualcomm/rmnet.rst | 0 + .../device_drivers/{ => ethernet}/3com/3c509.rst | 0 + .../device_drivers/{ => ethernet}/3com/vortex.rst | 2 - + .../ethernet/altera}/altera_tse.rst | 0 + .../device_drivers/{ => ethernet}/amazon/ena.rst | 0 + .../{ => ethernet}/aquantia/atlantic.rst | 0 + .../device_drivers/{ => ethernet}/chelsio/cxgb.rst | 0 + .../{ => ethernet}/cirrus/cs89x0.rst | 0 + .../{ => ethernet}/davicom/dm9000.rst | 0 + .../device_drivers/{ => ethernet}/dec/de4x5.rst | 0 + .../device_drivers/{ => ethernet}/dec/dmfe.rst | 0 + .../device_drivers/{ => ethernet}/dlink/dl2k.rst | 0 + .../{ => ethernet}/freescale/dpaa.rst | 0 + .../{ => ethernet}/freescale/dpaa2/dpio-driver.rst | 6 +- + .../freescale/dpaa2/ethernet-driver.rst | 3 +- + .../{ => ethernet}/freescale/dpaa2/index.rst | 0 + .../freescale/dpaa2/mac-phy-support.rst | 0 + .../{ => ethernet}/freescale/dpaa2/overview.rst | 0 + .../{ => ethernet}/freescale/gianfar.rst | 0 + .../device_drivers/{ => ethernet}/google/gve.rst | 0 + .../{ => device_drivers/ethernet/huawei}/hinic.rst | 0 + .../networking/device_drivers/ethernet/index.rst | 60 + + .../device_drivers/{ => ethernet}/intel/e100.rst | 0 + .../device_drivers/{ => ethernet}/intel/e1000.rst | 0 + .../device_drivers/{ => ethernet}/intel/e1000e.rst | 0 + .../device_drivers/{ => ethernet}/intel/fm10k.rst | 0 + .../device_drivers/{ => ethernet}/intel/i40e.rst | 0 + .../device_drivers/{ => ethernet}/intel/iavf.rst | 0 + .../device_drivers/{ => ethernet}/intel/ice.rst | 0 + .../device_drivers/{ => ethernet}/intel/igb.rst | 0 + .../device_drivers/{ => ethernet}/intel/igbvf.rst | 0 + .../device_drivers/{ => ethernet}/intel/ixgb.rst | 0 + .../device_drivers/{ => ethernet}/intel/ixgbe.rst | 0 + .../{ => ethernet}/intel/ixgbevf.rst | 0 + .../{ => ethernet}/marvell/octeontx2.rst | 0 + .../{ => ethernet}/mellanox/mlx5.rst | 0 + .../{ => ethernet}/microsoft/netvsc.rst | 0 + .../{ => ethernet}/neterion/s2io.rst | 0 + .../{ => ethernet}/neterion/vxge.rst | 0 + .../{ => ethernet}/netronome/nfp.rst | 0 + .../{ => ethernet}/pensando/ionic.rst | 0 + .../device_drivers/{ => ethernet}/smsc/smc9.rst | 0 + .../{ => ethernet}/stmicro/stmmac.rst | 0 + .../device_drivers/{ => ethernet}/ti/cpsw.rst | 0 + .../{ => ethernet}/ti/cpsw_switchdev.rst | 0 + .../device_drivers/{ => ethernet}/ti/tlan.rst | 0 + .../{ => ethernet}/toshiba/spider_net.rst | 0 + .../networking/{ => device_drivers/fddi}/defza.rst | 0 + .../networking/device_drivers/fddi/index.rst | 19 + + .../networking/{ => device_drivers/fddi}/skfp.rst | 0 + .../{ => device_drivers/hamradio}/baycom.rst | 0 + .../networking/device_drivers/hamradio/index.rst | 19 + + .../{ => device_drivers/hamradio}/z8530drv.rst | 0 + Documentation/networking/device_drivers/index.rst | 56 +- + .../networking/device_drivers/wan/index.rst | 18 + + .../{ => device_drivers/wan}/z8530book.rst | 0 + .../networking/device_drivers/wifi/index.rst | 20 + + .../device_drivers/{ => wifi}/intel/ipw2100.rst | 0 + .../device_drivers/{ => wifi}/intel/ipw2200.rst | 0 + .../{ => device_drivers/wifi}/ray_cs.rst | 0 + Documentation/networking/devlink/devlink-info.rst | 12 +- + Documentation/networking/devlink/ice.rst | 55 +- + Documentation/networking/ethtool-netlink.rst | 161 +- + Documentation/networking/index.rst | 13 - + Documentation/networking/timestamping.rst | 165 + + Documentation/networking/tls-offload.rst | 18 + + MAINTAINERS | 59 +- + Makefile | 25 +- + arch/mips/boot/dts/mscc/ocelot_pcb120.dts | 12 +- + drivers/atm/Kconfig | 8 +- + drivers/atm/solos-pci.c | 2 +- + drivers/infiniband/hw/i40iw/Makefile | 1 - + drivers/infiniband/hw/i40iw/i40iw.h | 2 +- + drivers/isdn/capi/Kconfig | 2 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 3 +- + drivers/net/Kconfig | 3 +- + drivers/net/appletalk/Kconfig | 3 +- + drivers/net/bareudp.c | 23 +- + drivers/net/bonding/bond_main.c | 139 +- + drivers/net/bonding/bond_options.c | 8 + + drivers/net/caif/caif_hsi.c | 6 +- + drivers/net/caif/caif_serial.c | 2 +- + drivers/net/caif/caif_spi.c | 4 +- + drivers/net/caif/caif_virtio.c | 2 +- + drivers/net/dsa/Kconfig | 1 + + drivers/net/dsa/b53/b53_common.c | 31 +- + drivers/net/dsa/b53/b53_spi.c | 26 +- + drivers/net/dsa/bcm_sf2.c | 89 +- + drivers/net/dsa/bcm_sf2_cfp.c | 8 +- + drivers/net/dsa/dsa_loop.c | 11 +- + drivers/net/dsa/lan9303-core.c | 7 +- + drivers/net/dsa/microchip/ksz8795.c | 19 +- + drivers/net/dsa/microchip/ksz9477.c | 24 +- + drivers/net/dsa/microchip/ksz_common.c | 35 +- + drivers/net/dsa/microchip/ksz_common.h | 9 +- + drivers/net/dsa/mv88e6xxx/chip.c | 29 +- + drivers/net/dsa/mv88e6xxx/chip.h | 4 +- + drivers/net/dsa/mv88e6xxx/global2.c | 5 +- + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 9 +- + drivers/net/dsa/ocelot/Kconfig | 15 +- + drivers/net/dsa/ocelot/Makefile | 3 +- + drivers/net/dsa/ocelot/felix.c | 364 +- + drivers/net/dsa/ocelot/felix.h | 39 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 626 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 1104 ++++ + drivers/net/dsa/qca/ar9331.c | 60 +- + drivers/net/dsa/qca8k.c | 341 +- + drivers/net/dsa/qca8k.h | 13 + + drivers/net/dsa/rtl8366.c | 2 +- + drivers/net/dsa/rtl8366rb.c | 31 +- + drivers/net/dsa/sja1105/sja1105.h | 12 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 25 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.h | 4 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 16 +- + drivers/net/dsa/sja1105/sja1105_main.c | 4 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 17 +- + drivers/net/dsa/sja1105/sja1105_static_config.c | 36 +- + drivers/net/dsa/sja1105/sja1105_static_config.h | 12 +- + drivers/net/dsa/sja1105/sja1105_tas.c | 3 +- + drivers/net/dsa/sja1105/sja1105_vl.c | 2 +- + drivers/net/dsa/vitesse-vsc73xx-platform.c | 2 +- + drivers/net/dsa/vitesse-vsc73xx-spi.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/3com/Kconfig | 4 +- + drivers/net/ethernet/3com/typhoon.c | 53 +- + drivers/net/ethernet/8390/8390.h | 61 +- + drivers/net/ethernet/8390/ne2k-pci.c | 38 +- + drivers/net/ethernet/adaptec/starfire.c | 23 +- + drivers/net/ethernet/aeroflex/greth.c | 2 +- + drivers/net/ethernet/agere/et131x.c | 7 - + drivers/net/ethernet/alteon/acenic.c | 119 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 22 +- + drivers/net/ethernet/amd/amd8111e.c | 111 +- + drivers/net/ethernet/amd/au1000_eth.c | 5 - + drivers/net/ethernet/amd/pcnet32.c | 203 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 275 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 12 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 19 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 13 +- + drivers/net/ethernet/aquantia/atlantic/aq_common.h | 18 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 30 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 10 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 22 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 111 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 9 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 9 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.h | 8 +- + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 9 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 11 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 3 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 17 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 10 +- + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 11 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 61 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 2 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 1 + + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 9 +- + .../aquantia/atlantic/hw_atl2/hw_atl2_utils.c | 3 +- + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 206 +- + drivers/net/ethernet/arc/emac_main.c | 2 +- + drivers/net/ethernet/aurora/nb8800.c | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 36 +- + drivers/net/ethernet/broadcom/bnx2x/Makefile | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 18 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 15 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 12 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 155 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 78 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_self_test.c | 3183 +++++++++ + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 2 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 388 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 32 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 15 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 52 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 18 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 + + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 3 +- + drivers/net/ethernet/cadence/macb_main.c | 19 +- + drivers/net/ethernet/cadence/macb_pci.c | 2 +- + drivers/net/ethernet/cadence/macb_ptp.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 90 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 59 +- + .../net/ethernet/cavium/liquidio/octeon_network.h | 2 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 10 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 7 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 5 +- + drivers/net/ethernet/chelsio/Kconfig | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 161 - + drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 443 ++ + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h | 4 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 110 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 260 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 66 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 573 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 5 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 598 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 153 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h | 8 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 59 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 334 +- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 10 + + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 47 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 6 +- + drivers/net/ethernet/cirrus/Kconfig | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 105 +- + drivers/net/ethernet/cortina/Kconfig | 2 +- + drivers/net/ethernet/dec/tulip/Kconfig | 4 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 25 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 49 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 51 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 48 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 26 +- + drivers/net/ethernet/dlink/dl2k.c | 10 +- + drivers/net/ethernet/dlink/sundance.c | 29 +- + drivers/net/ethernet/emulex/benet/be.h | 5 - + drivers/net/ethernet/emulex/benet/be_main.c | 220 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 8 +- + .../net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h | 1 - + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 185 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 12 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 3 +- + drivers/net/ethernet/freescale/dpaa2/dpni.c | 8 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 27 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 188 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.h | 5 + + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 205 +- + drivers/net/ethernet/freescale/fec_main.c | 7 +- + drivers/net/ethernet/freescale/fec_ptp.c | 13 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 33 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 41 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +- + drivers/net/ethernet/huawei/hinic/Makefile | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_dev.h | 19 + + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 328 + + drivers/net/ethernet/huawei/hinic/hinic_devlink.h | 115 + + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 582 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 94 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 65 + + drivers/net/ethernet/huawei/hinic/hinic_hw_io.h | 10 + + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 11 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 156 +- + drivers/net/ethernet/huawei/hinic/hinic_port.c | 194 + + drivers/net/ethernet/huawei/hinic/hinic_port.h | 119 + + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 58 +- + drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 6 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 80 + + drivers/net/ethernet/huawei/hinic/hinic_tx.h | 2 + + drivers/net/ethernet/intel/Kconfig | 24 +- + drivers/net/ethernet/intel/e100.c | 6 +- + drivers/net/ethernet/intel/e1000/e1000.h | 1 - + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 - + drivers/net/ethernet/intel/e1000/e1000_hw.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000_param.c | 2 +- + drivers/net/ethernet/intel/e1000e/82571.c | 4 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 - + drivers/net/ethernet/intel/e1000e/ethtool.c | 13 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 14 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 38 +- + drivers/net/ethernet/intel/e1000e/param.c | 2 +- + drivers/net/ethernet/intel/e1000e/phy.c | 2 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 3 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 11 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 18 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 166 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 - + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e.h | 49 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 496 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.h | 5 - + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 101 +- + drivers/net/ethernet/intel/i40e/i40e_devids.h | 7 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 13 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 279 +- + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_register.h | 4658 +------------ + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 23 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 82 - + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 234 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 61 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.h | 3 +- + drivers/net/ethernet/intel/iavf/iavf.h | 1 - + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 1 - + drivers/net/ethernet/intel/iavf/iavf_main.c | 23 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_type.h | 8 - + drivers/net/ethernet/intel/ice/ice.h | 2 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 62 +- + drivers/net/ethernet/intel/ice/ice_base.c | 2 +- + drivers/net/ethernet/intel/ice/ice_common.c | 167 +- + drivers/net/ethernet/intel/ice/ice_common.h | 5 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 4 +- + drivers/net/ethernet/intel/ice/ice_dcb.h | 4 +- + drivers/net/ethernet/intel/ice/ice_devlink.c | 65 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 1 - + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 35 +- + drivers/net/ethernet/intel/ice/ice_flex_type.h | 39 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 2 +- + drivers/net/ethernet/intel/ice/ice_main.c | 22 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 65 +- + drivers/net/ethernet/intel/ice/ice_sched.h | 2 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 50 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 6 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 4 +- + drivers/net/ethernet/intel/igb/e1000_nvm.c | 2 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 4 +- + drivers/net/ethernet/intel/igb/igb.h | 1 - + drivers/net/ethernet/intel/igb/igb_ethtool.c | 9 +- + drivers/net/ethernet/intel/igb/igb_main.c | 37 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 2 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 2 - + drivers/net/ethernet/intel/igbvf/igbvf.h | 1 - + drivers/net/ethernet/intel/igbvf/netdev.c | 9 +- + drivers/net/ethernet/intel/igc/igc.h | 8 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 39 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 112 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 1 + + drivers/net/ethernet/intel/igc/igc_i225.c | 156 + + drivers/net/ethernet/intel/igc/igc_i225.h | 3 + + drivers/net/ethernet/intel/igc/igc_mac.c | 16 +- + drivers/net/ethernet/intel/igc/igc_main.c | 60 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 256 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 16 +- + drivers/net/ethernet/intel/ixgb/ixgb.h | 1 - + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 2 - + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 - + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 279 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 252 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 4 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 2 - + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 1 - + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 17 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 6 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/jme.h | 2 +- + drivers/net/ethernet/marvell/Kconfig | 1 + + drivers/net/ethernet/marvell/mv643xx_eth.c | 5 +- + drivers/net/ethernet/marvell/mvneta.c | 16 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 57 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 908 ++- + drivers/net/ethernet/marvell/octeontx2/af/common.h | 2 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 6 +- + drivers/net/ethernet/marvell/skge.c | 76 +- + drivers/net/ethernet/marvell/sky2.c | 87 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 45 +- + drivers/net/ethernet/mediatek/mtk_star_emac.c | 13 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 107 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 11 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 - + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 27 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 8 +- + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.c | 108 +- + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.h | 45 +- + .../mellanox/mlx5/core/accel/ipsec_offload.c | 385 ++ + .../mellanox/mlx5/core/accel/ipsec_offload.h | 38 + + .../net/ethernet/mellanox/mlx5/core/accel/tls.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/accel/tls.h | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 2 + + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 43 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 34 +- + .../net/ethernet/mellanox/mlx5/core/en/health.c | 58 +- + .../net/ethernet/mellanox/mlx5/core/en/health.h | 16 +- + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.c | 157 + + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.h | 31 + + .../net/ethernet/mellanox/mlx5/core/en/params.h | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 3 + + .../net/ethernet/mellanox/mlx5/core/en/rep/neigh.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 17 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 154 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 93 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 481 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 61 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 27 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 13 + + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 53 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/umem.c | 13 - + .../net/ethernet/mellanox/mlx5/core/en/xsk/umem.h | 2 - + .../mellanox/mlx5/core/en_accel/en_accel.h | 10 + + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 400 ++ + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h | 27 + + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 51 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 10 + + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 544 ++ + .../mellanox/mlx5/core/en_accel/ipsec_fs.h | 26 + + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 56 + + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 22 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 123 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 114 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 680 ++ + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 204 +- + .../mellanox/mlx5/core/en_accel/ktls_txrx.c | 119 + + .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 42 + + .../mellanox/mlx5/core/en_accel/ktls_utils.h | 86 + + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 28 +- + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 14 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 32 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 36 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 84 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 102 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 60 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 39 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 25 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 279 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 33 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 161 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 36 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 80 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 51 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.h | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/lib/crypto.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 8 +- + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 64 +- + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 15 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 24 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 6 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 355 +- + .../mellanox/mlxsw/core_acl_flex_actions.h | 10 + + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 7 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 191 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1941 +----- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 137 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 108 +- + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 31 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 8 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 1644 +++++ + .../net/ethernet/mellanox/mlxsw/spectrum_flow.c | 18 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 30 +- + .../ethernet/mellanox/mlxsw/spectrum_matchall.c | 29 +- + .../net/ethernet/mellanox/mlxsw/spectrum_policer.c | 468 ++ + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 475 ++ + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 654 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 33 +- + drivers/net/ethernet/mellanox/mlxsw/switchib.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 10 +- + drivers/net/ethernet/micrel/ksz884x.c | 93 +- + drivers/net/ethernet/microchip/lan743x_main.c | 90 +- + drivers/net/ethernet/mscc/Kconfig | 22 +- + drivers/net/ethernet/mscc/Makefile | 16 +- + drivers/net/ethernet/mscc/ocelot.c | 1093 +-- + drivers/net/ethernet/mscc/ocelot.h | 51 +- + drivers/net/ethernet/mscc/ocelot_board.c | 626 -- + drivers/net/ethernet/mscc/ocelot_flower.c | 148 +- + drivers/net/ethernet/mscc/ocelot_io.c | 18 +- + drivers/net/ethernet/mscc/ocelot_net.c | 1050 +++ + drivers/net/ethernet/mscc/ocelot_police.c | 49 +- + drivers/net/ethernet/mscc/ocelot_police.h | 25 +- + drivers/net/ethernet/mscc/ocelot_regs.c | 450 -- + drivers/net/ethernet/mscc/ocelot_tc.c | 179 - + drivers/net/ethernet/mscc/ocelot_tc.h | 22 - + .../ethernet/mscc/{ocelot_ace.c => ocelot_vcap.c} | 336 +- + .../ethernet/mscc/{ocelot_ace.h => ocelot_vcap.h} | 88 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 1138 ++++ + drivers/net/ethernet/natsemi/natsemi.c | 26 +- + drivers/net/ethernet/neterion/Kconfig | 4 +- + drivers/net/ethernet/neterion/s2io.c | 191 +- + drivers/net/ethernet/neterion/vxge/vxge-config.c | 42 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 78 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 2 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 10 +- + .../net/ethernet/netronome/nfp/flower/qos_conf.c | 8 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 17 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 5 - + .../net/ethernet/netronome/nfp/nfp_net_common.c | 128 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/pensando/Kconfig | 2 +- + .../net/ethernet/pensando/ionic/ionic_devlink.c | 5 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 59 +- + drivers/net/ethernet/qlogic/qed/Makefile | 4 +- + drivers/net/ethernet/qlogic/qed/qed.h | 30 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 44 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 30 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 57 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 55 +- + drivers/net/ethernet/qlogic/qed/qed_debug.h | 3 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 30 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 30 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 84 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.h | 35 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 297 +- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 35 +- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 37 +- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 158 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 103 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.h | 30 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 153 +- + drivers/net/ethernet/qlogic/qed/qed_int.h | 30 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 78 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.h | 34 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 181 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.h | 31 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 111 +- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 31 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 39 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 46 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 30 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 30 +- + drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.c | 30 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.h | 30 +- + drivers/net/ethernet/qlogic/qed/qed_ptp.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_ptp.h | 9 + + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 83 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.h | 33 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 30 +- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 234 +- + drivers/net/ethernet/qlogic/qed/qed_roce.h | 31 +- + drivers/net/ethernet/qlogic/qed/qed_selftest.c | 30 +- + drivers/net/ethernet/qlogic/qed/qed_selftest.h | 4 +- + drivers/net/ethernet/qlogic/qed/qed_sp.h | 39 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 54 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 46 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 57 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 30 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 29 +- + drivers/net/ethernet/qlogic/qede/Makefile | 4 +- + drivers/net/ethernet/qlogic/qede/qede.h | 32 +- + drivers/net/ethernet/qlogic/qede/qede_dcbnl.c | 7 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 31 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 181 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 31 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 49 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 41 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.h | 31 +- + drivers/net/ethernet/qlogic/qede/qede_rdma.c | 31 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 7 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 31 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 11 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 97 +- + drivers/net/ethernet/realtek/r8169.h | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 388 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 81 +- + drivers/net/ethernet/sfc/bitfield.h | 34 +- + drivers/net/ethernet/sfc/ef10.c | 177 +- + drivers/net/ethernet/sfc/efx.c | 237 +- + drivers/net/ethernet/sfc/efx.h | 34 - + drivers/net/ethernet/sfc/efx_channels.c | 76 +- + drivers/net/ethernet/sfc/efx_channels.h | 3 + + drivers/net/ethernet/sfc/efx_common.c | 252 +- + drivers/net/ethernet/sfc/efx_common.h | 44 +- + drivers/net/ethernet/sfc/ethtool.c | 913 +-- + drivers/net/ethernet/sfc/ethtool_common.c | 920 ++- + drivers/net/ethernet/sfc/ethtool_common.h | 38 +- + drivers/net/ethernet/sfc/farch.c | 6 +- + drivers/net/ethernet/sfc/mcdi.c | 72 +- + drivers/net/ethernet/sfc/mcdi.h | 10 +- + drivers/net/ethernet/sfc/mcdi_filters.c | 77 +- + drivers/net/ethernet/sfc/mcdi_filters.h | 3 + + drivers/net/ethernet/sfc/mcdi_functions.c | 57 +- + drivers/net/ethernet/sfc/mcdi_functions.h | 1 + + drivers/net/ethernet/sfc/mcdi_pcol.h | 6933 +++++++++++++++++++- + drivers/net/ethernet/sfc/mcdi_port.c | 105 +- + drivers/net/ethernet/sfc/mcdi_port.h | 18 + + drivers/net/ethernet/sfc/mcdi_port_common.c | 141 +- + drivers/net/ethernet/sfc/mcdi_port_common.h | 5 +- + drivers/net/ethernet/sfc/net_driver.h | 48 +- + drivers/net/ethernet/sfc/nic.c | 44 + + drivers/net/ethernet/sfc/nic.h | 301 +- + drivers/net/ethernet/sfc/nic_common.h | 280 + + drivers/net/ethernet/sfc/ptp.c | 5 +- + drivers/net/ethernet/sfc/ptp.h | 45 + + drivers/net/ethernet/sfc/rx.c | 244 +- + drivers/net/ethernet/sfc/rx_common.c | 245 +- + drivers/net/ethernet/sfc/rx_common.h | 15 +- + drivers/net/ethernet/sfc/selftest.c | 18 +- + drivers/net/ethernet/sfc/siena.c | 6 +- + drivers/net/ethernet/sfc/tx.c | 78 +- + drivers/net/ethernet/sfc/tx.h | 3 - + drivers/net/ethernet/sfc/tx_common.c | 52 +- + drivers/net/ethernet/sfc/tx_common.h | 3 +- + drivers/net/ethernet/smsc/Kconfig | 4 +- + drivers/net/ethernet/smsc/epic100.c | 19 +- + drivers/net/ethernet/smsc/smsc9420.c | 40 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 53 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 121 +- + drivers/net/ethernet/sun/niu.c | 17 +- + drivers/net/ethernet/sun/sungem.c | 129 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/ti/Kconfig | 2 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 6 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 77 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 +- + drivers/net/ethernet/ti/am65-cpsw-qos.c | 8 +- + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/fddi/Kconfig | 4 +- + drivers/net/fddi/skfp/ess.c | 10 +- + drivers/net/fddi/skfp/h/cmtdef.h | 1 - + drivers/net/fddi/skfp/smt.c | 60 +- + drivers/net/geneve.c | 191 +- + drivers/net/hamradio/Kconfig | 16 +- + drivers/net/hamradio/scc.c | 2 +- + drivers/net/ipa/gsi.c | 117 +- + drivers/net/ipa/gsi.h | 12 +- + drivers/net/ipa/gsi_private.h | 6 +- + drivers/net/ipa/gsi_trans.h | 12 +- + drivers/net/ipa/ipa_clock.c | 8 +- + drivers/net/ipa/ipa_clock.h | 10 +- + drivers/net/ipa/ipa_cmd.h | 10 +- + drivers/net/ipa/ipa_endpoint.c | 304 +- + drivers/net/ipa/ipa_gsi.h | 13 +- + drivers/net/ipa/ipa_interrupt.h | 2 +- + drivers/net/ipa/ipa_main.c | 13 +- + drivers/net/ipa/ipa_mem.c | 7 +- + drivers/net/ipa/ipa_reg.h | 60 +- + drivers/net/ipa/ipa_smp2p.h | 2 +- + drivers/net/ipa/ipa_table.c | 3 +- + drivers/net/ipa/ipa_table.h | 4 +- + drivers/net/ipa/ipa_uc.c | 15 +- + drivers/net/netdevsim/Makefile | 2 +- + drivers/net/netdevsim/dev.c | 11 +- + drivers/net/netdevsim/netdev.c | 12 +- + drivers/net/netdevsim/netdevsim.h | 19 + + drivers/net/netdevsim/udp_tunnels.c | 192 + + drivers/net/phy/Kconfig | 5 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/adin.c | 12 +- + drivers/net/phy/at803x.c | 85 +- + drivers/net/phy/dp83640.c | 5 +- + drivers/net/phy/dp83822.c | 79 +- + drivers/net/phy/dp83869.c | 53 +- + drivers/net/phy/marvell.c | 268 +- + drivers/net/phy/marvell10g.c | 22 + + drivers/net/phy/mdio-boardinfo.c | 3 +- + drivers/net/phy/mdio-cavium.h | 14 +- + drivers/net/phy/mdio-octeon.c | 11 +- + drivers/net/phy/mdio-thunder.c | 2 +- + drivers/net/phy/mdio_bus.c | 123 +- + drivers/net/phy/mdio_device.c | 17 +- + drivers/net/phy/mdio_devres.c | 133 + + drivers/net/phy/mscc/Makefile | 4 + + drivers/net/phy/mscc/mscc.h | 63 + + drivers/net/phy/mscc/mscc_fc_buffer.h | 2 +- + drivers/net/phy/mscc/mscc_mac.h | 2 +- + drivers/net/phy/mscc/mscc_macsec.c | 22 +- + drivers/net/phy/mscc/mscc_macsec.h | 2 +- + drivers/net/phy/mscc/mscc_main.c | 111 +- + drivers/net/phy/mscc/mscc_ptp.c | 1590 +++++ + drivers/net/phy/mscc/mscc_ptp.h | 477 ++ + drivers/net/phy/phy-c45.c | 4 +- + drivers/net/phy/phy-core.c | 17 +- + drivers/net/phy/phy.c | 48 + + drivers/net/phy/phy_device.c | 324 +- + drivers/net/phy/phylink.c | 59 +- + drivers/net/phy/realtek.c | 12 + + drivers/net/phy/sfp.c | 54 +- + drivers/net/plip/plip.c | 4 +- + drivers/net/thunderbolt.c | 4 + + drivers/net/usb/cdc_ether.c | 7 +- + drivers/net/usb/cdc_ncm.c | 4 + + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/usbnet.c | 3 +- + drivers/net/vrf.c | 450 +- + drivers/net/vxlan.c | 6 +- + drivers/net/wan/c101.c | 2 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wan/farsync.c | 2 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wan/n2.c | 2 +- + drivers/net/wan/pc300too.c | 2 +- + drivers/net/wan/pci200syn.c | 2 +- + drivers/net/wireless/Kconfig | 3 +- + drivers/net/wireless/intel/ipw2x00/Kconfig | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/net/xen-netback/common.h | 4 + + drivers/net/xen-netback/interface.c | 2 + + drivers/net/xen-netback/netback.c | 7 + + drivers/net/xen-netback/rx.c | 15 +- + drivers/net/xen-netback/xenbus.c | 34 + + drivers/net/xen-netfront.c | 340 +- + drivers/of/of_mdio.c | 2 +- + drivers/ptp/ptp_pch.c | 37 +- + drivers/s390/net/qeth_core.h | 8 +- + drivers/s390/net/qeth_core_main.c | 193 +- + drivers/s390/net/qeth_core_mpc.c | 16 +- + drivers/s390/net/qeth_core_mpc.h | 17 +- + drivers/s390/net/qeth_core_sys.c | 20 +- + drivers/s390/net/qeth_l2_main.c | 9 +- + drivers/s390/net/qeth_l3_main.c | 19 +- + drivers/staging/octeon/ethernet-mdio.c | 2 +- + drivers/staging/octeon/ethernet-mdio.h | 2 - + drivers/staging/octeon/ethernet.c | 3 +- + fs/debugfs/file.c | 27 +- + fs/exec.c | 38 +- + include/asm-generic/vmlinux.lds.h | 4 + + include/linux/binfmts.h | 1 - + include/linux/bpf-cgroup.h | 4 + + include/linux/bpf.h | 26 + + include/linux/bpf_verifier.h | 1 + + include/linux/bpfilter.h | 7 +- + include/linux/btf_ids.h | 96 + + include/linux/debugfs.h | 12 +- + include/linux/ethtool.h | 55 + + include/linux/fsl/enetc_mdio.h | 1 + + include/linux/icmpv6.h | 22 +- + include/linux/if_bridge.h | 1 + + include/linux/indirect_call_wrapper.h | 12 + + include/linux/ipv6.h | 2 +- + include/linux/marvell_phy.h | 2 + + include/linux/mdio.h | 1 + + include/linux/mlx5/accel.h | 6 +- + include/linux/mlx5/driver.h | 3 + + include/linux/mlx5/fs.h | 5 +- + include/linux/mlx5/mlx5_ifc.h | 12 +- + include/linux/mlx5/port.h | 3 + + include/linux/mlx5/vport.h | 2 +- + .../i40e => include/linux/net/intel}/i40e_client.h | 9 - + include/linux/netdevice.h | 8 + + include/linux/netpoll.h | 3 - + include/linux/of_mdio.h | 40 +- + include/linux/perf_event.h | 2 + + include/linux/phy.h | 111 +- + include/linux/phylink.h | 2 + + include/linux/qed/common_hsi.h | 30 +- + include/linux/qed/eth_common.h | 30 +- + include/linux/qed/fcoe_common.h | 3 +- + include/linux/qed/iscsi_common.h | 30 +- + include/linux/qed/iwarp_common.h | 30 +- + include/linux/qed/qed_chain.h | 32 +- + include/linux/qed/qed_eth_if.h | 30 +- + include/linux/qed/qed_fcoe_if.h | 4 +- + include/linux/qed/qed_if.h | 47 +- + include/linux/qed/qed_iov_if.h | 30 +- + include/linux/qed/qed_iscsi_if.h | 30 +- + include/linux/qed/qed_ll2_if.h | 30 +- + include/linux/qed/qed_rdma_if.h | 31 +- + include/linux/qed/qede_rdma.h | 31 +- + include/linux/qed/rdma_common.h | 30 +- + include/linux/qed/roce_common.h | 30 +- + include/linux/qed/storage_common.h | 30 +- + include/linux/qed/tcp_common.h | 30 +- + include/linux/sched.h | 9 - + include/linux/sched/signal.h | 2 + + include/linux/skbuff.h | 4 +- + include/linux/tcp.h | 1 + + include/linux/umh.h | 15 - + include/linux/usb/usbnet.h | 2 + + include/linux/usermode_driver.h | 18 + + include/linux/wimax/debug.h | 4 +- + include/net/9p/transport.h | 2 +- + include/net/act_api.h | 11 +- + include/net/bareudp.h | 1 + + include/net/bonding.h | 8 + + include/net/busy_poll.h | 6 +- + include/net/caif/caif_layer.h | 4 +- + include/net/cipso_ipv4.h | 12 - + include/net/devlink.h | 65 +- + include/net/dsa.h | 6 +- + include/net/flow.h | 18 - + include/net/flow_offload.h | 20 +- + include/net/ip.h | 6 +- + include/net/ip6_checksum.h | 9 - + include/net/ip6_fib.h | 38 +- + include/net/ip_vs.h | 15 +- + include/net/l3mdev.h | 39 + + include/net/mptcp.h | 4 - + include/net/netfilter/nf_tables.h | 23 +- + include/net/pkt_cls.h | 54 +- + include/net/rpl.h | 6 - + include/net/sctp/sctp.h | 4 +- + include/net/sctp/structs.h | 6 +- + include/net/sock.h | 9 + + include/net/switchdev.h | 38 + + include/net/tc_act/tc_police.h | 42 +- + include/net/tcp.h | 15 + + include/net/tls.h | 34 +- + include/net/transp_v6.h | 3 - + include/net/tso.h | 23 +- + include/net/udp.h | 8 + + include/net/udp_tunnel.h | 164 +- + include/net/wimax.h | 2 +- + include/net/xdp_sock.h | 4 + + include/net/xfrm.h | 1 + + include/soc/mscc/ocelot.h | 91 +- + include/soc/mscc/ocelot_dev.h | 78 - + include/soc/mscc/ocelot_qsys.h | 13 - + include/soc/mscc/ocelot_sys.h | 23 - + include/uapi/linux/atmioc.h | 2 +- + include/uapi/linux/batadv_packet.h | 50 +- + include/uapi/linux/batman_adv.h | 7 +- + include/uapi/linux/bpf.h | 272 +- + include/uapi/linux/caif/caif_socket.h | 2 +- + include/uapi/linux/devlink.h | 15 + + include/uapi/linux/ethtool.h | 87 + + include/uapi/linux/ethtool_netlink.h | 57 + + include/uapi/linux/if_bridge.h | 75 + + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/if_xdp.h | 5 +- + include/uapi/linux/inet_diag.h | 1 + + include/uapi/linux/mdio.h | 26 + + include/uapi/linux/mptcp.h | 17 + + include/uapi/linux/mrp_bridge.h | 38 + + include/uapi/linux/neighbour.h | 24 + + include/uapi/linux/netfilter/nf_tables.h | 14 + + include/uapi/linux/pkt_sched.h | 2 + + include/uapi/linux/rtnetlink.h | 46 +- + include/uapi/linux/snmp.h | 1 + + include/uapi/linux/xdp_diag.h | 11 + + include/xen/interface/io/netif.h | 20 +- + kernel/Makefile | 1 + + kernel/bpf/arraymap.c | 27 +- + kernel/bpf/bpf_struct_ops.c | 3 + + kernel/bpf/btf.c | 158 +- + kernel/bpf/cpumap.c | 3 + + kernel/bpf/devmap.c | 6 + + kernel/bpf/hashtab.c | 23 +- + kernel/bpf/local_storage.c | 3 + + kernel/bpf/lpm_trie.c | 8 +- + kernel/bpf/queue_stack_maps.c | 13 +- + kernel/bpf/reuseport_array.c | 5 +- + kernel/bpf/ringbuf.c | 10 +- + kernel/bpf/stackmap.c | 90 +- + kernel/bpf/syscall.c | 3 + + kernel/bpf/verifier.c | 134 +- + kernel/events/callchain.c | 13 +- + kernel/exit.c | 25 +- + kernel/fork.c | 6 +- + kernel/trace/Makefile | 2 + + kernel/trace/bpf_trace.c | 78 +- + kernel/trace/bpf_trace.h | 34 + + kernel/umh.c | 171 +- + kernel/usermode_driver.c | 182 + + mm/cma.h | 3 + + mm/cma_debug.c | 7 +- + net/9p/client.c | 2 +- + net/9p/trans_rdma.c | 7 +- + net/Kconfig | 1 - + net/ax25/Kconfig | 10 +- + net/batman-adv/bat_iv_ogm.c | 25 +- + net/batman-adv/bat_v_elp.c | 10 +- + net/batman-adv/bat_v_ogm.c | 27 +- + net/batman-adv/bridge_loop_avoidance.c | 6 +- + net/batman-adv/distributed-arp-table.c | 2 +- + net/batman-adv/fragmentation.c | 6 +- + net/batman-adv/hard-interface.c | 16 +- + net/batman-adv/log.h | 6 +- + net/batman-adv/main.c | 2 +- + net/batman-adv/main.h | 8 +- + net/batman-adv/multicast.c | 21 +- + net/batman-adv/netlink.c | 14 +- + net/batman-adv/network-coding.c | 14 +- + net/batman-adv/originator.c | 8 +- + net/batman-adv/routing.c | 4 +- + net/batman-adv/send.c | 4 +- + net/batman-adv/soft-interface.c | 2 +- + net/batman-adv/tp_meter.c | 12 +- + net/batman-adv/translation-table.c | 10 +- + net/batman-adv/tvlv.c | 4 +- + net/batman-adv/types.h | 18 +- + net/bpfilter/Kconfig | 10 +- + net/bpfilter/Makefile | 2 + + net/bpfilter/bpfilter_kern.c | 39 +- + net/bpfilter/bpfilter_umh_blob.S | 2 +- + net/bridge/br_fdb.c | 127 +- + net/bridge/br_mrp.c | 576 +- + net/bridge/br_mrp_netlink.c | 246 +- + net/bridge/br_mrp_switchdev.c | 62 + + net/bridge/br_netlink.c | 28 +- + net/bridge/br_netlink_tunnel.c | 49 +- + net/bridge/br_private.h | 17 + + net/bridge/br_private_mrp.h | 27 +- + net/can/af_can.c | 2 + + net/core/bpf_sk_storage.c | 44 +- + net/core/dev.c | 16 +- + net/core/devlink.c | 486 +- + net/core/filter.c | 216 +- + net/core/flow_offload.c | 12 +- + net/core/neighbour.c | 1 + + net/core/sock.c | 10 +- + net/core/sock_map.c | 88 +- + net/core/tso.c | 44 +- + net/dcb/dcbnl.c | 2 +- + net/dccp/Kconfig | 2 +- + net/dccp/ccids/Kconfig | 4 +- + net/dccp/ccids/ccid3.c | 2 +- + net/dccp/ccids/ccid3.h | 2 +- + net/dccp/ccids/lib/packet_history.c | 4 +- + net/dccp/ccids/lib/packet_history.h | 2 +- + net/dccp/feat.c | 6 + + net/dccp/input.c | 1 + + net/dccp/ipv4.c | 2 + + net/dccp/options.c | 4 + + net/dccp/timer.c | 2 + + net/decnet/af_decnet.c | 13 +- + net/decnet/dn_dev.c | 8 +- + net/decnet/dn_route.c | 4 +- + net/devres.c | 4 +- + net/dsa/Kconfig | 7 + + net/dsa/Makefile | 1 + + net/dsa/dsa2.c | 17 +- + net/dsa/dsa_priv.h | 2 +- + net/dsa/slave.c | 3 +- + net/dsa/tag_ksz.c | 9 +- + net/dsa/tag_lan9303.c | 17 +- + net/dsa/tag_mtk.c | 3 +- + net/dsa/tag_ocelot.c | 21 +- + net/dsa/tag_qca.c | 8 +- + net/dsa/tag_rtl4_a.c | 130 + + net/ethtool/Makefile | 3 +- + net/ethtool/cabletest.c | 18 +- + net/ethtool/common.c | 35 + + net/ethtool/common.h | 3 + + net/ethtool/ioctl.c | 27 +- + net/ethtool/linkmodes.c | 15 + + net/ethtool/linkstate.c | 52 +- + net/ethtool/netlink.c | 12 + + net/ethtool/netlink.h | 4 + + net/ethtool/strset.c | 16 +- + net/ethtool/tunnels.c | 259 + + net/hsr/hsr_device.c | 2 +- + net/ipv4/Kconfig | 8 +- + net/ipv4/Makefile | 3 +- + net/ipv4/af_inet.c | 9 +- + net/ipv4/bpfilter/sockopt.c | 20 +- + net/ipv4/cipso_ipv4.c | 10 +- + net/ipv4/fib_trie.c | 2 +- + net/ipv4/inet_connection_sock.c | 33 +- + net/ipv4/inet_diag.c | 65 +- + net/ipv4/ip_output.c | 6 + + net/ipv4/ipmr.c | 3 + + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 21 + + net/ipv4/proc.c | 1 + + net/ipv4/tcp.c | 6 +- + net/ipv4/tcp_highspeed.c | 2 +- + net/ipv4/tcp_htcp.c | 2 +- + net/ipv4/tcp_input.c | 144 +- + net/ipv4/tcp_ipv4.c | 153 +- + net/ipv4/tcp_output.c | 14 +- + net/ipv4/tcp_timer.c | 2 +- + net/ipv4/tcp_veno.c | 2 +- + net/ipv4/udp.c | 150 +- + net/ipv4/{udp_tunnel.c => udp_tunnel_core.c} | 0 + net/ipv4/udp_tunnel_nic.c | 890 +++ + net/ipv4/udp_tunnel_stub.c | 7 + + net/ipv6/Kconfig | 2 +- + net/ipv6/exthdrs.c | 3 +- + net/ipv6/fib6_rules.c | 9 +- + net/ipv6/icmp.c | 5 +- + net/ipv6/ip6_fib.c | 3 +- + net/ipv6/ip6_icmp.c | 10 +- + net/ipv6/ip6_offload.c | 8 +- + net/ipv6/ip6_output.c | 6 +- + net/ipv6/ip6_tunnel.c | 10 +- + net/ipv6/netfilter/nf_reject_ipv6.c | 26 + + net/ipv6/ping.c | 1 + + net/ipv6/route.c | 8 +- + net/ipv6/rpl_iptunnel.c | 3 +- + net/ipv6/tcp_ipv6.c | 7 + + net/ipv6/udp.c | 3 + + net/l2tp/l2tp_eth.c | 2 +- + net/l3mdev/l3mdev.c | 93 + + net/llc/af_llc.c | 1 - + net/llc/llc_conn.c | 7 +- + net/llc/llc_input.c | 1 + + net/llc/llc_pdu.c | 2 +- + net/llc/llc_sap.c | 3 + + net/mac80211/mesh_pathtbl.c | 4 +- + net/mptcp/Kconfig | 24 +- + net/mptcp/Makefile | 6 + + net/mptcp/crypto.c | 63 +- + net/mptcp/crypto_test.c | 72 + + net/mptcp/mptcp_diag.c | 169 + + net/mptcp/options.c | 9 +- + net/mptcp/pm.c | 46 +- + net/mptcp/pm_netlink.c | 2 +- + net/mptcp/protocol.c | 526 +- + net/mptcp/protocol.h | 84 +- + net/mptcp/subflow.c | 132 +- + net/mptcp/token.c | 339 +- + net/mptcp/token_test.c | 140 + + net/netfilter/ipvs/ip_vs_conn.c | 53 +- + net/netfilter/ipvs/ip_vs_core.c | 92 +- + net/netfilter/ipvs/ip_vs_ctl.c | 29 +- + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_flow_table_offload.c | 2 +- + net/netfilter/nf_tables_api.c | 196 +- + net/netfilter/nf_tables_offload.c | 2 +- + net/netfilter/nft_immediate.c | 51 + + net/netfilter/nft_reject.c | 3 +- + net/netfilter/nft_set_pipapo.c | 10 +- + net/netlabel/netlabel_domainhash.c | 2 +- + net/nfc/core.c | 3 +- + net/nfc/nci/core.c | 4 +- + net/openvswitch/datapath.c | 22 + + net/openvswitch/datapath.h | 8 +- + net/openvswitch/flow_netlink.c | 6 +- + net/openvswitch/flow_table.c | 173 +- + net/openvswitch/flow_table.h | 11 + + net/openvswitch/vport.c | 3 +- + net/packet/af_packet.c | 22 +- + net/packet/internal.h | 2 +- + net/rxrpc/af_rxrpc.c | 2 +- + net/sched/Kconfig | 4 + + net/sched/act_api.c | 12 +- + net/sched/act_csum.c | 3 +- + net/sched/act_ct.c | 8 +- + net/sched/act_gact.c | 7 +- + net/sched/act_gate.c | 6 +- + net/sched/act_mirred.c | 6 +- + net/sched/act_pedit.c | 6 +- + net/sched/act_police.c | 4 +- + net/sched/act_skbedit.c | 5 +- + net/sched/act_vlan.c | 6 +- + net/sched/cls_api.c | 133 +- + net/sched/cls_flower.c | 1 + + net/sched/cls_matchall.c | 3 +- + net/sched/cls_tcindex.c | 2 +- + net/sched/cls_u32.c | 4 +- + net/sched/em_canid.c | 1 + + net/sched/ematch.c | 3 +- + net/sched/sch_api.c | 3 +- + net/sched/sch_cake.c | 8 +- + net/sched/sch_cbq.c | 2 +- + net/sched/sch_drr.c | 2 +- + net/sched/sch_ets.c | 2 +- + net/sched/sch_fq_codel.c | 2 +- + net/sched/sch_fq_pie.c | 2 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_htb.c | 2 +- + net/sched/sch_multiq.c | 2 +- + net/sched/sch_prio.c | 2 +- + net/sched/sch_qfq.c | 2 +- + net/sched/sch_red.c | 98 +- + net/sched/sch_sfb.c | 2 +- + net/sched/sch_sfq.c | 2 +- + net/sched/sch_taprio.c | 5 +- + net/socket.c | 30 +- + net/switchdev/switchdev.c | 3 +- + net/tipc/bcast.c | 6 +- + net/tipc/bcast.h | 4 +- + net/tipc/bearer.c | 2 +- + net/tipc/discover.c | 5 +- + net/tipc/link.c | 16 +- + net/tipc/msg.c | 2 +- + net/tipc/msg.h | 46 +- + net/tipc/name_distr.c | 116 +- + net/tipc/name_distr.h | 9 +- + net/tipc/name_table.c | 9 +- + net/tipc/name_table.h | 2 + + net/tipc/node.c | 33 +- + net/tipc/node.h | 8 +- + net/tipc/socket.c | 8 +- + net/tipc/udp_media.c | 2 +- + net/tls/tls_device.c | 60 +- + net/wireless/reg.c | 4 +- + net/wireless/wext-compat.c | 1 - + net/x25/Kconfig | 2 +- + net/x25/x25_link.c | 2 +- + net/x25/x25_route.c | 2 +- + net/xdp/xsk.c | 36 +- + net/xdp/xsk_buff_pool.c | 1 + + net/xdp/xsk_diag.c | 17 + + net/xdp/xsk_queue.h | 6 + + net/xdp/xskmap.c | 3 + + net/xfrm/xfrm_device.c | 35 +- + samples/bpf/Makefile | 2 +- + samples/bpf/fds_example.c | 3 +- + samples/bpf/map_perf_test_kern.c | 188 +- + samples/bpf/map_perf_test_user.c | 164 +- + samples/bpf/test_map_in_map_kern.c | 94 +- + samples/bpf/test_map_in_map_user.c | 53 +- + samples/bpf/test_probe_write_user_kern.c | 9 +- + samples/bpf/xdpsock_user.c | 87 +- + scripts/bpf_helpers_doc.py | 12 + + scripts/link-vmlinux.sh | 6 + + tools/Makefile | 3 + + tools/bpf/Makefile | 9 +- + tools/bpf/bpftool/.gitignore | 5 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 5 + + tools/bpf/bpftool/Documentation/bpftool-link.rst | 13 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 11 + + tools/bpf/bpftool/Makefile | 66 +- + tools/bpf/bpftool/btf.c | 6 + + tools/bpf/bpftool/common.c | 345 + + tools/bpf/bpftool/feature.c | 4 +- + tools/bpf/bpftool/gen.c | 23 +- + tools/bpf/bpftool/link.c | 11 +- + tools/bpf/bpftool/main.c | 12 +- + tools/bpf/bpftool/main.h | 125 +- + tools/bpf/bpftool/map.c | 167 +- + tools/bpf/bpftool/pids.c | 231 + + tools/bpf/bpftool/prog.c | 193 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 80 + + tools/bpf/bpftool/skeleton/pid_iter.h | 12 + + tools/bpf/bpftool/skeleton/profiler.bpf.c | 7 +- + tools/bpf/bpftool/skeleton/profiler.h | 46 - + tools/bpf/resolve_btfids/Build | 10 + + tools/bpf/resolve_btfids/Makefile | 91 + + tools/bpf/resolve_btfids/main.c | 721 ++ + tools/build/feature/Makefile | 4 +- + tools/build/feature/test-clang-bpf-co-re.c | 9 + + tools/build/feature/test-clang-bpf-global-var.c | 4 - + tools/include/linux/btf_ids.h | 87 + + tools/include/linux/compiler.h | 4 + + tools/include/uapi/linux/bpf.h | 272 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/include/uapi/linux/if_xdp.h | 5 +- + tools/lib/bpf/bpf_core_read.h | 8 +- + tools/lib/bpf/bpf_endian.h | 43 +- + tools/lib/bpf/bpf_helpers.h | 1 + + tools/lib/bpf/btf.c | 9 +- + tools/lib/bpf/btf.h | 12 +- + tools/lib/bpf/btf_dump.c | 10 +- + tools/lib/bpf/libbpf.c | 812 ++- + tools/lib/bpf/libbpf.h | 32 +- + tools/lib/bpf/libbpf.map | 20 + + tools/testing/selftests/bpf/Makefile | 24 +- + tools/testing/selftests/bpf/bpf_legacy.h | 14 - + tools/testing/selftests/bpf/network_helpers.c | 157 +- + tools/testing/selftests/bpf/network_helpers.h | 9 +- + tools/testing/selftests/bpf/prog_tests/autoload.c | 41 + + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 85 + + .../bpf/prog_tests/cgroup_skb_sk_lookup.c | 12 +- + .../selftests/bpf/prog_tests/connect_force_port.c | 10 +- + .../testing/selftests/bpf/prog_tests/core_retro.c | 33 + + tools/testing/selftests/bpf/prog_tests/endian.c | 53 + + tools/testing/selftests/bpf/prog_tests/ksyms.c | 71 + + .../selftests/bpf/prog_tests/load_bytes_relative.c | 4 +- + tools/testing/selftests/bpf/prog_tests/map_ptr.c | 32 + + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 42 +- + .../selftests/bpf/prog_tests/resolve_btfids.c | 111 + + tools/testing/selftests/bpf/prog_tests/skeleton.c | 6 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 4 +- + .../selftests/bpf/prog_tests/trace_printk.c | 75 + + tools/testing/selftests/bpf/prog_tests/udp_limit.c | 75 + + tools/testing/selftests/bpf/prog_tests/varlen.c | 68 + + tools/testing/selftests/bpf/progs/bpf_iter.h | 80 + + .../testing/selftests/bpf/progs/bpf_iter_bpf_map.c | 18 +- + .../selftests/bpf/progs/bpf_iter_ipv6_route.c | 25 +- + .../testing/selftests/bpf/progs/bpf_iter_netlink.c | 22 +- + tools/testing/selftests/bpf/progs/bpf_iter_task.c | 18 +- + .../selftests/bpf/progs/bpf_iter_task_file.c | 20 +- + .../selftests/bpf/progs/bpf_iter_task_stack.c | 37 + + tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c | 234 + + tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c | 250 + + .../selftests/bpf/progs/bpf_iter_test_kern3.c | 17 +- + .../selftests/bpf/progs/bpf_iter_test_kern4.c | 17 +- + .../bpf/progs/bpf_iter_test_kern_common.h | 18 +- + tools/testing/selftests/bpf/progs/bpf_iter_udp4.c | 71 + + tools/testing/selftests/bpf/progs/bpf_iter_udp6.c | 79 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 51 + + tools/testing/selftests/bpf/progs/btf_data.c | 50 + + tools/testing/selftests/bpf/progs/connect4_prog.c | 27 + + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 686 ++ + tools/testing/selftests/bpf/progs/test_autoload.c | 40 + + .../testing/selftests/bpf/progs/test_core_retro.c | 30 + + tools/testing/selftests/bpf/progs/test_endian.c | 37 + + .../selftests/bpf/progs/test_get_stack_rawtp.c | 3 +- + tools/testing/selftests/bpf/progs/test_ksyms.c | 32 + + .../testing/selftests/bpf/progs/test_perf_buffer.c | 4 +- + tools/testing/selftests/bpf/progs/test_skeleton.c | 6 +- + tools/testing/selftests/bpf/progs/test_varlen.c | 158 + + tools/testing/selftests/bpf/progs/test_vmlinux.c | 16 +- + tools/testing/selftests/bpf/progs/trace_printk.c | 21 + + tools/testing/selftests/bpf/progs/udp_limit.c | 42 + + tools/testing/selftests/bpf/test_progs.c | 66 +- + tools/testing/selftests/bpf/test_progs.h | 4 + + tools/testing/selftests/bpf/verifier/map_ptr.c | 62 + + .../selftests/bpf/verifier/map_ptr_mixing.c | 2 +- + .../selftests/bpf/verifier/value_ptr_arith.c | 38 + + .../selftests/drivers/net/mlxsw/sch_red_core.sh | 106 +- + .../selftests/drivers/net/mlxsw/sch_red_ets.sh | 11 + + .../selftests/drivers/net/mlxsw/sch_red_root.sh | 8 + + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 2 +- + .../net/mlxsw/spectrum-2/tc_police_scale.sh | 16 + + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 2 +- + .../drivers/net/mlxsw/spectrum/tc_police_scale.sh | 16 + + .../selftests/drivers/net/mlxsw/tc_police_occ.sh | 108 + + .../selftests/drivers/net/mlxsw/tc_police_scale.sh | 92 + + .../selftests/drivers/net/mlxsw/tc_restrictions.sh | 76 + + .../drivers/net/netdevsim/udp_tunnel_nic.sh | 786 +++ + tools/testing/selftests/net/Makefile | 2 + + tools/testing/selftests/net/devlink_port_split.py | 277 + + .../selftests/net/forwarding/devlink_lib.sh | 5 + + tools/testing/selftests/net/forwarding/ethtool.sh | 17 - + .../net/forwarding/ethtool_extended_state.sh | 102 + + .../selftests/net/forwarding/ethtool_lib.sh | 17 + + .../net/forwarding/forwarding.config.sample | 3 + + .../selftests/net/forwarding/pedit_l4port.sh | 198 + + tools/testing/selftests/net/forwarding/sch_red.sh | 492 ++ + .../testing/selftests/net/forwarding/tc_police.sh | 333 + + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/net/mptcp/diag.sh | 121 + + tools/testing/selftests/net/mptcp/mptcp_connect.c | 22 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 65 +- + tools/testing/selftests/net/rxtimestamp.c | 122 +- + tools/testing/selftests/net/rxtimestamp.sh | 4 + + .../testing/selftests/net/vrf_strict_mode_test.sh | 390 ++ + 1267 files changed, 61178 insertions(+), 26951 deletions(-) + rename Documentation/networking/{ => device_drivers/appletalk}/cops.rst (100%) + create mode 100644 Documentation/networking/device_drivers/appletalk/index.rst + rename Documentation/networking/{ => device_drivers/appletalk}/ltpc.rst (100%) + rename Documentation/networking/{ => device_drivers/atm}/cxacru-cf.py (100%) + rename Documentation/networking/{ => device_drivers/atm}/cxacru.rst (100%) + rename Documentation/networking/{ => device_drivers/atm}/fore200e.rst (100%) + create mode 100644 Documentation/networking/device_drivers/atm/index.rst + rename Documentation/networking/{ => device_drivers/atm}/iphase.rst (100%) + create mode 100644 Documentation/networking/device_drivers/cable/index.rst + rename Documentation/networking/device_drivers/{ => cable}/sb1000.rst (100%) + create mode 100644 Documentation/networking/device_drivers/cellular/index.rst + rename Documentation/networking/device_drivers/{ => cellular}/qualcomm/rmnet.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/3com/3c509.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/3com/vortex.rst (99%) + rename Documentation/networking/{ => device_drivers/ethernet/altera}/altera_tse.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/amazon/ena.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/aquantia/atlantic.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/chelsio/cxgb.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/cirrus/cs89x0.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/davicom/dm9000.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/dec/de4x5.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/dec/dmfe.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/dlink/dl2k.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/dpio-driver.rst (97%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/ethernet-driver.rst (98%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/index.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/mac-phy-support.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/overview.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/gianfar.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/google/gve.rst (100%) + rename Documentation/networking/{ => device_drivers/ethernet/huawei}/hinic.rst (100%) + create mode 100644 Documentation/networking/device_drivers/ethernet/index.rst + rename Documentation/networking/device_drivers/{ => ethernet}/intel/e100.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/e1000.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/e1000e.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/fm10k.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/i40e.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/iavf.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ice.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/igb.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/igbvf.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ixgb.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ixgbe.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ixgbevf.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/marvell/octeontx2.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/mellanox/mlx5.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/microsoft/netvsc.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/neterion/s2io.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/neterion/vxge.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/netronome/nfp.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/pensando/ionic.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/smsc/smc9.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/stmicro/stmmac.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/ti/cpsw.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/ti/cpsw_switchdev.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/ti/tlan.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/toshiba/spider_net.rst (100%) + rename Documentation/networking/{ => device_drivers/fddi}/defza.rst (100%) + create mode 100644 Documentation/networking/device_drivers/fddi/index.rst + rename Documentation/networking/{ => device_drivers/fddi}/skfp.rst (100%) + rename Documentation/networking/{ => device_drivers/hamradio}/baycom.rst (100%) + create mode 100644 Documentation/networking/device_drivers/hamradio/index.rst + rename Documentation/networking/{ => device_drivers/hamradio}/z8530drv.rst (100%) + create mode 100644 Documentation/networking/device_drivers/wan/index.rst + rename Documentation/networking/{ => device_drivers/wan}/z8530book.rst (100%) + create mode 100644 Documentation/networking/device_drivers/wifi/index.rst + rename Documentation/networking/device_drivers/{ => wifi}/intel/ipw2100.rst (100%) + rename Documentation/networking/device_drivers/{ => wifi}/intel/ipw2200.rst (100%) + rename Documentation/networking/{ => device_drivers/wifi}/ray_cs.rst (100%) + create mode 100644 drivers/net/dsa/ocelot/seville_vsc9953.c + create mode 100644 drivers/net/ethernet/broadcom/bnx2x/bnx2x_self_test.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_devlink.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_devlink.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec_offload.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec_offload.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/mod_hdr.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/mod_hdr.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_utils.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_policer.c + delete mode 100644 drivers/net/ethernet/mscc/ocelot_board.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_net.c + delete mode 100644 drivers/net/ethernet/mscc/ocelot_regs.c + delete mode 100644 drivers/net/ethernet/mscc/ocelot_tc.c + delete mode 100644 drivers/net/ethernet/mscc/ocelot_tc.h + rename drivers/net/ethernet/mscc/{ocelot_ace.c => ocelot_vcap.c} (77%) + rename drivers/net/ethernet/mscc/{ocelot_ace.h => ocelot_vcap.h} (75%) + create mode 100644 drivers/net/ethernet/mscc/ocelot_vsc7514.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_ptp.h + create mode 100644 drivers/net/ethernet/sfc/mcdi_port.h + create mode 100644 drivers/net/ethernet/sfc/nic_common.h + create mode 100644 drivers/net/ethernet/sfc/ptp.h + create mode 100644 drivers/net/netdevsim/udp_tunnels.c + create mode 100644 drivers/net/phy/mdio_devres.c + create mode 100644 drivers/net/phy/mscc/mscc_ptp.c + create mode 100644 drivers/net/phy/mscc/mscc_ptp.h + create mode 100644 include/linux/btf_ids.h + rename {drivers/net/ethernet/intel/i40e => include/linux/net/intel}/i40e_client.h (93%) + create mode 100644 include/linux/usermode_driver.h + create mode 100644 kernel/trace/bpf_trace.h + create mode 100644 kernel/usermode_driver.c + create mode 100644 net/dsa/tag_rtl4_a.c + create mode 100644 net/ethtool/tunnels.c + rename net/ipv4/{udp_tunnel.c => udp_tunnel_core.c} (100%) + create mode 100644 net/ipv4/udp_tunnel_nic.c + create mode 100644 net/ipv4/udp_tunnel_stub.c + create mode 100644 net/mptcp/crypto_test.c + create mode 100644 net/mptcp/mptcp_diag.c + create mode 100644 net/mptcp/token_test.c + create mode 100644 tools/bpf/bpftool/pids.c + create mode 100644 tools/bpf/bpftool/skeleton/pid_iter.bpf.c + create mode 100644 tools/bpf/bpftool/skeleton/pid_iter.h + delete mode 100644 tools/bpf/bpftool/skeleton/profiler.h + create mode 100644 tools/bpf/resolve_btfids/Build + create mode 100644 tools/bpf/resolve_btfids/Makefile + create mode 100644 tools/bpf/resolve_btfids/main.c + create mode 100644 tools/build/feature/test-clang-bpf-co-re.c + delete mode 100644 tools/build/feature/test-clang-bpf-global-var.c + create mode 100644 tools/include/linux/btf_ids.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/autoload.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_retro.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/endian.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksyms.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/map_ptr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/resolve_btfids.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/trace_printk.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/udp_limit.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/varlen.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter.h + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_task_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_udp4.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_udp6.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_tracing_net.h + create mode 100644 tools/testing/selftests/bpf/progs/btf_data.c + create mode 100644 tools/testing/selftests/bpf/progs/map_ptr_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/test_autoload.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_retro.c + create mode 100644 tools/testing/selftests/bpf/progs/test_endian.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms.c + create mode 100644 tools/testing/selftests/bpf/progs/test_varlen.c + create mode 100644 tools/testing/selftests/bpf/progs/trace_printk.c + create mode 100644 tools/testing/selftests/bpf/progs/udp_limit.c + create mode 100644 tools/testing/selftests/bpf/verifier/map_ptr.c + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_police_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/tc_police_scale.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/tc_police_occ.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/tc_police_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh + create mode 100755 tools/testing/selftests/net/devlink_port_split.py + create mode 100755 tools/testing/selftests/net/forwarding/ethtool_extended_state.sh + create mode 100755 tools/testing/selftests/net/forwarding/pedit_l4port.sh + create mode 100755 tools/testing/selftests/net/forwarding/sch_red.sh + create mode 100755 tools/testing/selftests/net/forwarding/tc_police.sh + create mode 100755 tools/testing/selftests/net/mptcp/diag.sh + create mode 100755 tools/testing/selftests/net/rxtimestamp.sh + create mode 100755 tools/testing/selftests/net/vrf_strict_mode_test.sh +$ git am -3 ../patches/0001-fix-up-for-enum-pci_channel_state-to-pci_channel_sta.patch +Applying: fix up for "enum pci_channel_state" to "pci_channel_state_t" change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/sfc/efx_common.c +$ git add -A . +$ git commit -v -a --amend +[master be7cee5d4d69] Merge remote-tracking branch 'net-next/master' + Date: Mon Jul 20 11:20:54 2020 +1000 +Merging bpf-next/master (e57892f50a07 Merge branch 'bpf-socket-lookup') +$ git merge bpf-next/master +Auto-merging net/core/dev.c +Merge made by the 'recursive' strategy. + include/linux/bpf-netns.h | 3 + + include/linux/bpf.h | 10 + + include/linux/bpf_types.h | 2 + + include/linux/filter.h | 147 +++ + include/net/xdp.h | 41 +- + include/trace/events/xdp.h | 16 +- + include/uapi/linux/bpf.h | 97 +- + kernel/bpf/core.c | 55 + + kernel/bpf/cpumap.c | 162 ++- + kernel/bpf/net_namespace.c | 127 +- + kernel/bpf/syscall.c | 9 + + kernel/bpf/verifier.c | 13 +- + lib/test_bpf.c | 20 - + net/core/dev.c | 9 + + net/core/filter.c | 183 +++ + net/ipv4/inet_hashtables.c | 60 +- + net/ipv4/udp.c | 93 +- + net/ipv6/inet6_hashtables.c | 66 +- + net/ipv6/udp.c | 97 +- + samples/bpf/xdp_redirect_cpu_kern.c | 25 +- + samples/bpf/xdp_redirect_cpu_user.c | 209 +++- + scripts/bpf_helpers_doc.py | 9 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 2 +- + tools/bpf/bpftool/bash-completion/bpftool | 2 +- + tools/bpf/bpftool/common.c | 1 + + tools/bpf/bpftool/prog.c | 3 +- + tools/include/uapi/linux/bpf.h | 97 +- + tools/lib/bpf/libbpf.c | 5 + + tools/lib/bpf/libbpf.h | 2 + + tools/lib/bpf/libbpf.map | 2 + + tools/lib/bpf/libbpf_probes.c | 3 + + tools/testing/selftests/bpf/network_helpers.c | 58 +- + tools/testing/selftests/bpf/network_helpers.h | 2 + + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 1282 ++++++++++++++++++++ + .../selftests/bpf/prog_tests/sockopt_inherit.c | 3 +- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 70 ++ + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 641 ++++++++++ + .../bpf/progs/test_xdp_with_cpumap_helpers.c | 36 + + .../testing/selftests/bpf/verifier/ctx_sk_lookup.c | 492 ++++++++ + 39 files changed, 3956 insertions(+), 198 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/sk_lookup.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sk_lookup.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.c + create mode 100644 tools/testing/selftests/bpf/verifier/ctx_sk_lookup.c +Merging ipsec-next/master (0a82f3f08361 Merge remote-tracking branch 'origin/testing') +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_interface.c +Auto-merging net/ipv6/ip6_vti.c +Auto-merging net/ipv4/ip_vti.c +Auto-merging include/net/xfrm.h +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 5 +- + include/uapi/linux/xfrm.h | 1 + + net/ipv4/ip_vti.c | 74 ++++++++++++++----------- + net/ipv4/ipcomp.c | 1 + + net/ipv4/tunnel4.c | 43 +++++++++++++++ + net/ipv6/ip6_vti.c | 46 ++++++++++++++++ + net/ipv6/ipcomp6.c | 1 + + net/ipv6/tunnel6.c | 41 ++++++++++++++ + net/xfrm/xfrm_input.c | 24 ++++---- + net/xfrm/xfrm_interface.c | 136 +++++++++++++++++++++++++++++++++++++++------- + net/xfrm/xfrm_replay.c | 12 ++-- + 11 files changed, 317 insertions(+), 67 deletions(-) +Merging mlx5-next/mlx5-next (4c2573e1f6c7 net/mlx5: Enable count action for rules with allow action) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 1 + + include/linux/mlx5/device.h | 4 +- + include/linux/mlx5/driver.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 118 +++++++++++++++++++--- + 5 files changed, 118 insertions(+), 18 deletions(-) +Merging netfilter-next/master (73eb67515545 ipvs: ensure RCU read unlock when connection flushing and ipvs is disabled) +$ git merge netfilter-next/master +Auto-merging net/netfilter/nf_tables_api.c +Merge made by the 'recursive' strategy. + include/net/ip_vs.h | 29 ++++++++++++++++++++ + net/bridge/netfilter/ebtables.c | 2 +- + net/netfilter/ipset/ip_set_core.c | 2 +- + net/netfilter/ipvs/ip_vs_conn.c | 39 +++++++++++++++++++++++++++ + net/netfilter/ipvs/ip_vs_core.c | 47 ++++++++++++++------------------- + net/netfilter/ipvs/ip_vs_ctl.c | 22 +++++++++++++++ + net/netfilter/nf_conntrack_h323_asn1.c | 6 ++--- + net/netfilter/nf_conntrack_proto.c | 2 +- + net/netfilter/nf_conntrack_proto_tcp.c | 2 +- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nf_nat_core.c | 12 ++++----- + net/netfilter/nf_synproxy_core.c | 6 ++--- + net/netfilter/nf_tables_api.c | 8 +++--- + net/netfilter/nf_tables_core.c | 2 +- + net/netfilter/nfnetlink_cttimeout.c | 2 +- + net/netfilter/nft_cmp.c | 4 +-- + net/netfilter/nft_ct.c | 6 ++--- + net/netfilter/nft_fib.c | 2 +- + net/netfilter/nft_immediate.c | 4 +-- + net/netfilter/nft_payload.c | 2 +- + net/netfilter/utils.c | 8 +++--- + net/netfilter/x_tables.c | 2 +- + 22 files changed, 146 insertions(+), 65 deletions(-) +Merging ipvs-next/master (66846b7d058b Merge branch 'bnxt_en-Driver-update-for-net-next') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (0e20c3e10333 wireless: Fix trivial spelling) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c +Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c +Auto-merging drivers/net/wireless/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/wireless}/microchip,wilc1000.yaml | 0 + MAINTAINERS | 14 +- + drivers/net/wireless/Kconfig | 3 +- + drivers/net/wireless/Makefile | 1 + + drivers/net/wireless/admtek/adm8211.c | 25 +- + drivers/net/wireless/ath/Kconfig | 4 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 4 + + drivers/net/wireless/ath/ath10k/usb.c | 2 +- + drivers/net/wireless/ath/ath11k/Kconfig | 9 + + drivers/net/wireless/ath/ath11k/Makefile | 4 +- + drivers/net/wireless/ath/ath11k/core.c | 10 + + drivers/net/wireless/ath/ath11k/core.h | 52 +- + drivers/net/wireless/ath/ath11k/dbring.c | 356 ++ + drivers/net/wireless/ath/ath11k/dbring.h | 79 + + drivers/net/wireless/ath/ath11k/debug.c | 128 +- + drivers/net/wireless/ath/ath11k/dp.c | 3 +- + drivers/net/wireless/ath/ath11k/dp.h | 42 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 36 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 7 +- + drivers/net/wireless/ath/ath11k/mac.c | 220 +- + drivers/net/wireless/ath/ath11k/reg.c | 4 + + drivers/net/wireless/ath/ath11k/spectral.c | 1023 +++ + drivers/net/wireless/ath/ath11k/spectral.h | 82 + + drivers/net/wireless/ath/ath11k/wmi.c | 690 +- + drivers/net/wireless/ath/ath11k/wmi.h | 184 +- + drivers/net/wireless/ath/ath6kl/usb.c | 2 +- + drivers/net/wireless/ath/ath9k/Kconfig | 5 +- + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/net/wireless/ath/carl9170/Kconfig | 2 +- + drivers/net/wireless/ath/carl9170/usb.c | 2 +- + drivers/net/wireless/ath/spectral_common.h | 17 + + drivers/net/wireless/ath/wil6210/Kconfig | 2 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 2 +- + drivers/net/wireless/broadcom/b43/main.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 48 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 + + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 75 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 3 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 19 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 59 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 3 + + .../net/wireless/broadcom/brcm80211/brcmsmac/led.c | 62 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/led.h | 6 +- + drivers/net/wireless/cisco/airo.c | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 31 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 30 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 2 +- + drivers/net/wireless/intel/iwlegacy/common.c | 4 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 12 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 1 + + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 14 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 - + .../net/wireless/intersil/orinoco/orinoco_nortel.c | 3 +- + .../net/wireless/intersil/orinoco/orinoco_pci.c | 3 +- + .../net/wireless/intersil/orinoco/orinoco_pci.h | 32 +- + .../net/wireless/intersil/orinoco/orinoco_plx.c | 3 +- + .../net/wireless/intersil/orinoco/orinoco_tmd.c | 3 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 6 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 21 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 4 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 22 +- + drivers/net/wireless/microchip/Kconfig | 15 + + drivers/net/wireless/microchip/Makefile | 2 + + .../wireless/microchip}/wilc1000/Kconfig | 0 + .../wireless/microchip}/wilc1000/Makefile | 3 - + .../wireless/microchip}/wilc1000/cfg80211.c | 2 + + .../wireless/microchip}/wilc1000/cfg80211.h | 0 + .../wireless/microchip}/wilc1000/fw.h | 0 + .../wireless/microchip}/wilc1000/hif.c | 0 + .../wireless/microchip}/wilc1000/hif.h | 0 + .../wireless/microchip}/wilc1000/mon.c | 3 +- + .../wireless/microchip}/wilc1000/netdev.c | 35 +- + .../wireless/microchip}/wilc1000/netdev.h | 0 + .../wireless/microchip}/wilc1000/sdio.c | 0 + .../wireless/microchip}/wilc1000/spi.c | 0 + .../wireless/microchip}/wilc1000/wlan.c | 0 + .../wireless/microchip}/wilc1000/wlan.h | 0 + .../wireless/microchip}/wilc1000/wlan_cfg.c | 0 + .../wireless/microchip}/wilc1000/wlan_cfg.h | 0 + .../wireless/microchip}/wilc1000/wlan_if.h | 0 + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 23 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 138 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 12 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 14 + + drivers/net/wireless/realtek/rtw88/Makefile | 6 + + drivers/net/wireless/realtek/rtw88/bf.c | 5 +- + drivers/net/wireless/realtek/rtw88/coex.c | 98 +- + drivers/net/wireless/realtek/rtw88/coex.h | 3 + + drivers/net/wireless/realtek/rtw88/main.c | 12 +- + drivers/net/wireless/realtek/rtw88/main.h | 11 + + drivers/net/wireless/realtek/rtw88/pci.c | 9 + + drivers/net/wireless/realtek/rtw88/reg.h | 4 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 13 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1450 +++++ + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 233 + + .../net/wireless/realtek/rtw88/rtw8821c_table.c | 6611 ++++++++++++++++++++ + .../net/wireless/realtek/rtw88/rtw8821c_table.h | 15 + + drivers/net/wireless/realtek/rtw88/rtw8821ce.c | 30 + + drivers/net/wireless/realtek/rtw88/rtw8821ce.h | 14 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 7 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 10 +- + drivers/net/wireless/realtek/rtw88/rtw8822ce.c | 4 + + drivers/net/wireless/ti/wlcore/main.c | 84 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 4 +- + drivers/ssb/driver_chipcommon.c | 4 +- + drivers/ssb/driver_chipcommon_pmu.c | 2 +- + drivers/ssb/sprom.c | 2 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + 131 files changed, 11831 insertions(+), 626 deletions(-) + rename {drivers/staging/wilc1000 => Documentation/devicetree/bindings/net/wireless}/microchip,wilc1000.yaml (100%) + create mode 100644 drivers/net/wireless/ath/ath11k/dbring.c + create mode 100644 drivers/net/wireless/ath/ath11k/dbring.h + create mode 100644 drivers/net/wireless/ath/ath11k/spectral.c + create mode 100644 drivers/net/wireless/ath/ath11k/spectral.h + create mode 100644 drivers/net/wireless/microchip/Kconfig + create mode 100644 drivers/net/wireless/microchip/Makefile + rename drivers/{staging => net/wireless/microchip}/wilc1000/Kconfig (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/Makefile (72%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/cfg80211.c (99%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/cfg80211.h (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/fw.h (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/hif.c (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/hif.h (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/mon.c (98%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/netdev.c (96%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/netdev.h (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/sdio.c (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/spi.c (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/wlan.c (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/wlan.h (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/wlan_cfg.c (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/wlan_cfg.h (100%) + rename drivers/{staging => net/wireless/microchip}/wilc1000/wlan_if.h (100%) + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821c.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821c.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821c_table.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821c_table.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821ce.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821ce.h +Merging bluetooth/master (339ddaa62699 Bluetooth: Fix update of connection state in `hci_encrypt_cfm`) +$ git merge bluetooth/master +Auto-merging net/bluetooth/smp.c +Auto-merging drivers/bluetooth/btmtksdio.c +Auto-merging drivers/bluetooth/btmrvl_sdio.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/realtek-bluetooth.yaml | 2 +- + drivers/bluetooth/bcm203x.c | 2 +- + drivers/bluetooth/bluecard_cs.c | 2 - + drivers/bluetooth/btintel.c | 59 +++ + drivers/bluetooth/btintel.h | 21 + + drivers/bluetooth/btmrvl_main.c | 11 + + drivers/bluetooth/btmrvl_sdio.c | 21 +- + drivers/bluetooth/btmtksdio.c | 16 +- + drivers/bluetooth/btqca.c | 27 ++ + drivers/bluetooth/btqca.h | 2 + + drivers/bluetooth/btusb.c | 225 +++++++---- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_qca.c | 125 +++--- + drivers/net/wireless/marvell/mwifiex/sdio.h | 4 +- + include/net/bluetooth/bluetooth.h | 10 + + include/net/bluetooth/hci.h | 8 + + include/net/bluetooth/hci_core.h | 104 ++++- + include/net/bluetooth/hci_sock.h | 4 +- + include/net/bluetooth/mgmt.h | 95 +++++ + include/net/bluetooth/sco.h | 2 + + net/bluetooth/6lowpan.c | 5 + + net/bluetooth/Kconfig | 2 +- + net/bluetooth/Makefile | 2 +- + net/bluetooth/af_bluetooth.c | 5 +- + net/bluetooth/hci_conn.c | 44 ++- + net/bluetooth/hci_core.c | 184 ++++++++- + net/bluetooth/hci_event.c | 50 +-- + net/bluetooth/hci_request.c | 145 +++++-- + net/bluetooth/hci_request.h | 2 + + net/bluetooth/hci_sock.c | 7 +- + net/bluetooth/l2cap_core.c | 25 +- + net/bluetooth/l2cap_sock.c | 4 +- + net/bluetooth/mgmt.c | 433 ++++++++++++++++++++- + net/bluetooth/mgmt_config.c | 283 ++++++++++++++ + net/bluetooth/mgmt_config.h | 17 + + net/bluetooth/msft.c | 7 + + net/bluetooth/msft.h | 9 + + net/bluetooth/rfcomm/core.c | 2 +- + net/bluetooth/rfcomm/sock.c | 2 +- + net/bluetooth/sco.c | 32 ++ + net/bluetooth/smp.c | 2 +- + 41 files changed, 1728 insertions(+), 276 deletions(-) + create mode 100644 net/bluetooth/mgmt_config.c + create mode 100644 net/bluetooth/mgmt_config.h +Merging mac80211-next/master (29a720c1042f Merge branch 'Marvell-mvpp2-improvements') +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (0d7853ebbba3 gfs2: Pass glock holder to gfs2_file_direct_{read,write}) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 31 +++++++++++++++---------------- + fs/gfs2/glock.c | 6 ++++++ + 2 files changed, 21 insertions(+), 16 deletions(-) +Merging mtd/mtd/next (fbd9b5437b66 mtd: rawnand: stm32_fmc2: get resources from parent node) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 252 ++++ + .../bindings/mtd/st,stm32-fmc2-nand.yaml | 83 +- + drivers/memory/Kconfig | 10 + + drivers/memory/Makefile | 1 + + drivers/memory/stm32-fmc2-ebi.c | 1206 ++++++++++++++++++++ + drivers/mtd/nand/raw/Kconfig | 1 + + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 311 ++--- + 7 files changed, 1688 insertions(+), 176 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/st,stm32-fmc2-ebi.yaml + create mode 100644 drivers/memory/stm32-fmc2-ebi.c +Merging nand/nand/next (da151e3458c8 dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/stm32_fmc2_nand.c +Auto-merging drivers/mtd/nand/raw/cadence-nand-controller.c +Auto-merging drivers/mtd/nand/raw/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/fsl-upm-nand.txt | 10 +- + .../devicetree/bindings/mtd/nand-controller.yaml | 7 + + drivers/mtd/nand/Kconfig | 5 + + drivers/mtd/nand/onenand/Kconfig | 1 - + drivers/mtd/nand/raw/Kconfig | 1 - + drivers/mtd/nand/raw/ams-delta.c | 6 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 6 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 34 +-- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 31 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 6 +- + drivers/mtd/nand/raw/denali.c | 8 +- + drivers/mtd/nand/raw/fsl_upm.c | 311 ++++++++------------- + drivers/mtd/nand/raw/fsmc_nand.c | 6 +- + drivers/mtd/nand/raw/gpio.c | 112 ++++++-- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 6 +- + drivers/mtd/nand/raw/ingenic/jz4740_ecc.c | 4 +- + drivers/mtd/nand/raw/internals.h | 23 +- + drivers/mtd/nand/raw/marvell_nand.c | 18 +- + drivers/mtd/nand/raw/meson_nand.c | 14 +- + drivers/mtd/nand/raw/mtk_nand.c | 122 ++++---- + drivers/mtd/nand/raw/mxc_nand.c | 22 +- + drivers/mtd/nand/raw/mxic_nand.c | 6 +- + drivers/mtd/nand/raw/nand_base.c | 275 ++++++++++-------- + drivers/mtd/nand/raw/nand_bbt.c | 2 +- + drivers/mtd/nand/raw/nand_hynix.c | 16 +- + drivers/mtd/nand/raw/nand_ids.c | 24 +- + drivers/mtd/nand/raw/nand_legacy.c | 7 +- + drivers/mtd/nand/raw/nand_macronix.c | 10 +- + drivers/mtd/nand/raw/nand_micron.c | 2 +- + drivers/mtd/nand/raw/nand_timings.c | 116 ++++++-- + drivers/mtd/nand/raw/nand_toshiba.c | 72 ++++- + drivers/mtd/nand/raw/qcom_nandc.c | 18 +- + drivers/mtd/nand/raw/s3c2410.c | 6 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 6 +- + drivers/mtd/nand/raw/sunxi_nand.c | 6 +- + drivers/mtd/nand/raw/tango_nand.c | 129 +++++---- + drivers/mtd/nand/raw/tegra_nand.c | 6 +- + drivers/mtd/parsers/bcm63xxpart.c | 32 +-- + include/linux/mtd/nand.h | 12 +- + include/linux/mtd/rawnand.h | 265 +++++++++--------- + include/linux/mtd/spinand.h | 2 +- + 41 files changed, 1018 insertions(+), 747 deletions(-) +Merging spi-nor/spi-nor/next (fb249e1007e0 Merge tag 'spi-mem-dtr' into spi-nor/next) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/controllers/Kconfig | 11 - + drivers/mtd/spi-nor/controllers/Makefile | 1 - + drivers/mtd/spi-nor/controllers/intel-spi-pci.c | 2 + + drivers/mtd/spi-nor/core.c | 57 ++- + drivers/mtd/spi-nor/core.h | 10 +- + drivers/mtd/spi-nor/macronix.c | 3 + + drivers/mtd/spi-nor/sfdp.c | 3 +- + drivers/mtd/spi-nor/spansion.c | 1 - + drivers/mtd/spi-nor/winbond.c | 1 + + drivers/spi/Kconfig | 11 + + drivers/spi/Makefile | 1 + + drivers/spi/atmel-quadspi.c | 6 + + .../spi-cadence-quadspi.c} | 541 ++++++++------------- + drivers/spi/spi-mem.c | 16 +- + drivers/spi/spi-mtk-nor.c | 10 +- + drivers/spi/spi-mxic.c | 3 +- + drivers/spi/spi-zynq-qspi.c | 11 +- + include/linux/spi/spi-mem.h | 14 +- + 18 files changed, 318 insertions(+), 384 deletions(-) + rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => spi/spi-cadence-quadspi.c} (74%) +Merging crypto/master (1b3eeb8761f0 crypto: chelsio - Fix some pr_xxx messages) +$ git merge crypto/master +Auto-merging net/mptcp/crypto.c +Auto-merging drivers/crypto/chelsio/chcr_crypto.h +Removing arch/x86/include/asm/inst.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/rng/silex-insight,ba431-rng.yaml | 36 + + MAINTAINERS | 9 + + arch/arm/crypto/ghash-ce-glue.c | 51 +- + arch/arm64/crypto/ghash-ce-glue.c | 257 +++---- + arch/sparc/crypto/sha256_glue.c | 14 +- + arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 15 +- + arch/x86/crypto/aesni-intel_asm.S | 739 ++++++++++----------- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 1 - + arch/x86/crypto/chacha-ssse3-x86_64.S | 16 +- + arch/x86/crypto/chacha_glue.c | 17 +- + arch/x86/crypto/crc32-pclmul_asm.S | 47 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 5 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 17 +- + arch/x86/include/asm/inst.h | 311 --------- + crypto/acompress.c | 8 + + crypto/adiantum.c | 14 +- + crypto/af_alg.c | 11 +- + crypto/algapi.c | 21 +- + crypto/algif_aead.c | 4 +- + crypto/algif_skcipher.c | 4 +- + crypto/api.c | 24 +- + crypto/authenc.c | 14 +- + crypto/authencesn.c | 14 +- + crypto/ccm.c | 33 +- + crypto/chacha20poly1305.c | 14 +- + crypto/cmac.c | 5 +- + crypto/cryptd.c | 59 +- + crypto/ctr.c | 17 +- + crypto/cts.c | 13 +- + crypto/echainiv.c | 2 +- + crypto/essiv.c | 11 +- + crypto/gcm.c | 40 +- + crypto/geniv.c | 19 +- + crypto/hmac.c | 5 +- + crypto/internal.h | 23 +- + crypto/lrw.c | 132 ++-- + crypto/pcrypt.c | 14 +- + crypto/rsa-pkcs1pad.c | 13 +- + crypto/seqiv.c | 18 +- + crypto/simd.c | 6 +- + crypto/skcipher.c | 13 +- + crypto/vmac.c | 5 +- + crypto/xcbc.c | 5 +- + crypto/xts.c | 152 +++-- + drivers/char/hw_random/Kconfig | 10 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/ba431-rng.c | 235 +++++++ + drivers/char/hw_random/bcm2835-rng.c | 5 +- + drivers/char/hw_random/hisi-rng.c | 2 +- + drivers/char/hw_random/ks-sa-rng.c | 2 +- + drivers/char/hw_random/nomadik-rng.c | 2 +- + drivers/char/hw_random/npcm-rng.c | 2 +- + drivers/char/hw_random/octeon-rng.c | 6 +- + drivers/char/hw_random/omap-rng.c | 11 +- + drivers/char/hw_random/pic32-rng.c | 2 +- + drivers/char/hw_random/st-rng.c | 3 +- + drivers/char/hw_random/virtio-rng.c | 2 +- + drivers/crypto/Kconfig | 5 +- + .../crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c | 46 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss.h | 3 +- + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 42 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 12 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 8 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 39 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 12 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 26 +- + drivers/crypto/amlogic/Kconfig | 2 +- + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 27 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 6 +- + drivers/crypto/amlogic/amlogic-gxl.h | 3 +- + drivers/crypto/axis/artpec6_crypto.c | 20 +- + drivers/crypto/bcm/cipher.c | 72 +- + drivers/crypto/caam/caamalg.c | 35 +- + drivers/crypto/caam/caamalg_qi.c | 6 +- + drivers/crypto/caam/caamalg_qi2.c | 31 +- + drivers/crypto/caam/caamhash.c | 2 +- + drivers/crypto/caam/compat.h | 1 - + drivers/crypto/caam/ctrl.c | 12 +- + drivers/crypto/caam/dpseci.c | 18 + + drivers/crypto/caam/dpseci.h | 2 + + drivers/crypto/caam/dpseci_cmd.h | 1 + + drivers/crypto/cavium/cpt/cptvf_algs.c | 28 +- + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 24 +- + drivers/crypto/cavium/cpt/request_manager.h | 26 +- + drivers/crypto/cavium/nitrox/nitrox_aead.c | 4 +- + drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 16 +- + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 1 + + drivers/crypto/ccp/ccp-crypto-aes-galois.c | 1 + + drivers/crypto/ccp/ccp-crypto-aes-xts.c | 34 +- + drivers/crypto/ccp/ccp-crypto-aes.c | 2 + + drivers/crypto/ccp/ccp-crypto-des3.c | 1 + + drivers/crypto/ccp/ccp-crypto-sha.c | 4 +- + drivers/crypto/ccp/ccp-crypto.h | 4 +- + drivers/crypto/ccp/ccp-dev-v5.c | 8 +- + drivers/crypto/ccp/ccp-dev.h | 13 +- + drivers/crypto/ccp/ccp-ops.c | 43 +- + drivers/crypto/ccree/cc_cipher.c | 149 +++-- + drivers/crypto/chelsio/chcr_algo.c | 87 ++- + drivers/crypto/chelsio/chcr_crypto.h | 3 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 111 ++-- + drivers/crypto/hisilicon/qm.c | 43 +- + drivers/crypto/hisilicon/qm.h | 1 + + drivers/crypto/hisilicon/sec/sec_algs.c | 58 +- + drivers/crypto/hisilicon/sec2/sec.h | 4 + + drivers/crypto/hisilicon/sec2/sec_crypto.c | 95 ++- + drivers/crypto/hisilicon/sec2/sec_main.c | 132 ++-- + drivers/crypto/hisilicon/zip/zip.h | 2 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 6 +- + drivers/crypto/hisilicon/zip/zip_main.c | 5 +- + drivers/crypto/img-hash.c | 2 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 47 ++ + drivers/crypto/inside-secure/safexcel_hash.c | 18 + + drivers/crypto/ixp4xx_crypto.c | 6 +- + drivers/crypto/marvell/cesa/cipher.c | 18 +- + drivers/crypto/marvell/cesa/hash.c | 6 + + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 8 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h | 2 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 51 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.h | 6 +- + drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c | 9 +- + drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h | 24 +- + drivers/crypto/mediatek/mtk-aes.c | 63 +- + drivers/crypto/mxs-dcp.c | 33 +- + drivers/crypto/n2_core.c | 3 +- + drivers/crypto/omap-aes.c | 35 +- + drivers/crypto/omap-aes.h | 3 +- + drivers/crypto/omap-des.c | 6 +- + drivers/crypto/omap-sham.c | 18 +- + drivers/crypto/picoxcell_crypto.c | 55 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 48 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 48 +- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 48 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 48 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h | 48 +- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 48 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 48 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 48 +- + drivers/crypto/qat/qat_c62x/adf_drv.c | 48 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 48 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h | 48 +- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 48 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 102 +-- + drivers/crypto/qat/qat_common/adf_accel_engine.c | 52 +- + drivers/crypto/qat/qat_common/adf_admin.c | 144 ++-- + drivers/crypto/qat/qat_common/adf_aer.c | 50 +- + drivers/crypto/qat/qat_common/adf_cfg.c | 48 +- + drivers/crypto/qat/qat_common/adf_cfg.h | 48 +- + drivers/crypto/qat/qat_common/adf_cfg_common.h | 72 +- + drivers/crypto/qat/qat_common/adf_cfg_strings.h | 48 +- + drivers/crypto/qat/qat_common/adf_cfg_user.h | 58 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 60 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 52 +- + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 56 +- + drivers/crypto/qat/qat_common/adf_hw_arbiter.c | 48 +- + drivers/crypto/qat/qat_common/adf_init.c | 48 +- + drivers/crypto/qat/qat_common/adf_isr.c | 48 +- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 49 +- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.h | 48 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 48 +- + drivers/crypto/qat/qat_common/adf_transport.c | 110 +-- + drivers/crypto/qat/qat_common/adf_transport.h | 52 +- + .../qat/qat_common/adf_transport_access_macros.h | 54 +- + .../crypto/qat/qat_common/adf_transport_debug.c | 48 +- + .../crypto/qat/qat_common/adf_transport_internal.h | 75 +-- + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 48 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 48 +- + drivers/crypto/qat/qat_common/icp_qat_fw.h | 106 +-- + .../crypto/qat/qat_common/icp_qat_fw_init_admin.h | 145 ++-- + drivers/crypto/qat/qat_common/icp_qat_fw_la.h | 206 +++--- + .../qat/qat_common/icp_qat_fw_loader_handle.h | 48 +- + drivers/crypto/qat/qat_common/icp_qat_fw_pke.h | 100 +-- + drivers/crypto/qat/qat_common/icp_qat_hal.h | 48 +- + drivers/crypto/qat/qat_common/icp_qat_hw.h | 64 +- + drivers/crypto/qat/qat_common/icp_qat_uclo.h | 54 +- + drivers/crypto/qat/qat_common/qat_algs.c | 211 +++--- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 61 +- + drivers/crypto/qat/qat_common/qat_crypto.c | 48 +- + drivers/crypto/qat/qat_common/qat_crypto.h | 48 +- + drivers/crypto/qat/qat_common/qat_hal.c | 88 +-- + drivers/crypto/qat/qat_common/qat_uclo.c | 68 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 74 +-- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 48 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 48 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 48 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h | 48 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 48 +- + drivers/crypto/qce/cipher.h | 3 +- + drivers/crypto/qce/common.h | 2 + + drivers/crypto/qce/sha.c | 36 +- + drivers/crypto/qce/skcipher.c | 43 +- + drivers/crypto/sahara.c | 96 ++- + drivers/crypto/talitos.c | 117 ++-- + drivers/crypto/ux500/hash/hash_core.c | 18 +- + drivers/crypto/virtio/virtio_crypto_algs.c | 3 +- + drivers/crypto/virtio/virtio_crypto_core.c | 4 +- + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 1 + + drivers/firmware/efi/embedded-firmware.c | 9 +- + include/crypto/acompress.h | 18 + + include/crypto/algapi.h | 25 +- + include/crypto/chacha.h | 4 - + include/crypto/chacha20poly1305.h | 2 + + include/crypto/if_alg.h | 4 +- + include/crypto/internal/geniv.h | 2 +- + include/crypto/sha.h | 1 + + include/linux/crypto.h | 41 +- + lib/crc-t10dif.c | 75 ++- + lib/crypto/chacha20poly1305.c | 2 - + lib/crypto/sha256.c | 10 + + net/mptcp/crypto.c | 15 +- + sound/soc/codecs/cros_ec_codec.c | 27 +- + 210 files changed, 3181 insertions(+), 5356 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/silex-insight,ba431-rng.yaml + delete mode 100644 arch/x86/include/asm/inst.h + create mode 100644 drivers/char/hw_random/ba431-rng.c +Merging drm/drm-next (1cc4af412f40 Merge tag 'drm-intel-next-2020-07-02' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Removing drivers/gpu/drm/udl/udl_gem.c +Auto-merging drivers/gpu/drm/radeon/ni_dpm.c +Auto-merging drivers/gpu/drm/radeon/ci_dpm.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gpu.c +Removing drivers/gpu/drm/mgag200/mgag200_ttm.c +Removing drivers/gpu/drm/mgag200/mgag200_main.c +Removing drivers/gpu/drm/mgag200/mgag200_cursor.c +Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Auto-merging drivers/gpu/drm/mcde/mcde_drv.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gt/selftest_rps.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/aspeed/aspeed_gfx_drv.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/renoir_ppt.c +Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h +Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_stream.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/drm-mm.rst +Removing Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt +Removing Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt +Removing Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_fbc.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gvt/handlers.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_vma.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4f31028336d0] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 3 + + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 174 - + .../bindings/display/brcm,bcm2835-dpi.yaml | 72 + + .../bindings/display/brcm,bcm2835-dsi0.yaml | 84 + + .../bindings/display/brcm,bcm2835-hdmi.yaml | 80 + + .../bindings/display/brcm,bcm2835-hvs.yaml | 37 + + .../bindings/display/brcm,bcm2835-pixelvalve0.yaml | 40 + + .../bindings/display/brcm,bcm2835-txp.yaml | 37 + + .../bindings/display/brcm,bcm2835-v3d.yaml | 42 + + .../bindings/display/brcm,bcm2835-vc4.yaml | 34 + + .../bindings/display/brcm,bcm2835-vec.yaml | 44 + + .../bindings/display/bridge/ti,sn65dsi86.txt | 87 - + .../bindings/display/bridge/ti,sn65dsi86.yaml | 293 + + .../bindings/display/bridge/ti,tfp410.txt | 66 - + .../bindings/display/bridge/ti,tfp410.yaml | 131 + + .../bindings/display/panel/panel-simple.yaml | 8 + + Documentation/driver-api/dma-buf.rst | 6 +- + Documentation/gpu/drm-kms-helpers.rst | 12 - + Documentation/gpu/drm-kms.rst | 6 + + Documentation/gpu/drm-mm.rst | 17 +- + Documentation/gpu/todo.rst | 58 +- + MAINTAINERS | 2 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/char/agp/intel-gtt.c | 4 +- + drivers/dma-buf/dma-buf.c | 6 +- + drivers/dma-buf/dma-fence.c | 2 + + drivers/dma-buf/selftests.h | 2 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + 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_amdkfd_gpuvm.c | 10 +- + 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_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 106 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 134 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 300 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 126 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 145 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 26 + + 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 | 178 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 - + 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_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 527 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 411 + + .../inc/dmub_fw_meta.h => amdgpu/gfxhub_v2_1.h} | 50 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 94 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 8 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 613 + + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.h | 29 + + 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_gfx_if.h | 8 + + 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 | 47 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h | 15 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 1757 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h | 30 + + drivers/gpu/drm/amd/amdgpu/si.c | 33 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/sid.h | 26 +- + .../gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 16 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 15 +- + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 793 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 148 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 127 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 122 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 1684 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h | 29 + + 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_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 28 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 63 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 21 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 245 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 295 +- + drivers/gpu/drm/amd/display/Kconfig | 8 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 97 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 10 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 37 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 20 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 19 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 30 +- + .../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 | 204 + + .../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 + + .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c | 6 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 18 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 22 + + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 18 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 3 +- + .../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 | 137 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 59 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 43 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 42 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 163 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 40 +- + 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 | 65 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 28 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 75 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 15 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 36 + + drivers/gpu/drm/amd/display/dc/dce/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 20 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 4 +- + .../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 + + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 92 - + .../inc/dmub_types.h => dc/dce/dmub_hw_lock_mgr.c} | 78 +- + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h | 39 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 28 +- + .../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 | 37 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 7 + + .../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_dpp.c | 4 + + 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 | 134 +- + 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 | 93 +- + 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 | 4 +- + 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 | 719 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 70 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 141 + + 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 | 2691 + + .../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_cp_psp.h | 1 + + 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 | 6865 ++ + .../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 | 67 +- + .../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/dsc/rc_calc.c | 8 +- + 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_status.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 31 +- + 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 | 75 + + .../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 | 27 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 500 +- + .../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 | 49 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 6 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 10 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 6 - + 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 | 91 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 4 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../amd/display/include/grph_object_ctrl_defs.h | 5 + + drivers/gpu/drm/amd/display/modules/color/Makefile | 2 +- + .../drm/amd/display/modules/color/color_gamma.c | 115 +- + .../drm/amd/display/modules/color/color_gamma.h | 18 +- + .../drm/amd/display/modules/color/color_table.c | 48 + + .../drm/amd/display/modules/color/color_table.h | 47 + + .../gpu/drm/amd/display/modules/inc/mod_stats.h | 8 +- + .../drm/amd/display/modules/power/power_helpers.c | 96 +- + .../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 + + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 6 +- + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 36 + + .../amd/include/asic_reg/gc/gc_10_3_0_default.h | 7272 ++ + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 13473 ++++ + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 47727 +++++++++++++ + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 8 +- + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 27 + + .../drm/amd/include/asic_reg/gc/gc_9_1_offset.h | 8 +- + .../drm/amd/include/asic_reg/gc/gc_9_1_sh_mask.h | 26 + + .../drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h | 8 +- + .../drm/amd/include/asic_reg/gc/gc_9_2_1_sh_mask.h | 26 + + .../gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_d.h | 98 + + .../drm/amd/include/asic_reg/uvd/uvd_3_1_sh_mask.h | 804 + + .../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 | 1520 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1152 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 10 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 4 +- + .../amd/powerplay/hwmgr/vega12_processpptables.c | 2 +- + .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 84 +- + 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 | 1220 + + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 4 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 35 +- + .../gpu/drm/amd/powerplay/inc/smu_v11_0_7_ppsmc.h | 139 + + .../drm/amd/powerplay/inc/smu_v11_0_7_pptable.h | 196 + + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 2 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 747 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 31 +- + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 2640 + + .../sienna_cichlid_ppt.h} | 26 +- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 274 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 633 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 54 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 3288 - + drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 179 - + drivers/gpu/drm/arc/arcpgu_drv.c | 12 +- + drivers/gpu/drm/arm/Kconfig | 4 +- + .../drm/arm/display/komeda/komeda_framebuffer.c | 6 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 11 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 15 +- + drivers/gpu/drm/arm/malidp_drv.c | 45 +- + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 8 +- + drivers/gpu/drm/armada/armada_fb.c | 4 +- + drivers/gpu/drm/armada/armada_fbdev.c | 6 +- + drivers/gpu/drm/armada/armada_gem.c | 10 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- + drivers/gpu/drm/ast/ast_dp501.c | 24 +- + drivers/gpu/drm/ast/ast_drv.c | 14 +- + drivers/gpu/drm/ast/ast_drv.h | 7 +- + drivers/gpu/drm/ast/ast_main.c | 118 +- + drivers/gpu/drm/ast/ast_mode.c | 73 +- + drivers/gpu/drm/ast/ast_post.c | 28 +- + drivers/gpu/drm/ast/ast_ttm.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 11 +- + drivers/gpu/drm/bochs/bochs_kms.c | 7 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 137 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 1 + + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 1 + + drivers/gpu/drm/bridge/cdns-dsi.c | 1 + + drivers/gpu/drm/bridge/chrontel-ch7033.c | 1 + + drivers/gpu/drm/bridge/nwl-dsi.c | 1 + + drivers/gpu/drm/bridge/sii902x.c | 2 +- + drivers/gpu/drm/bridge/sii9234.c | 1 + + drivers/gpu/drm/bridge/sil-sii8620.c | 1 + + drivers/gpu/drm/bridge/simple-bridge.c | 113 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 307 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/bridge/tc358767.c | 1 + + drivers/gpu/drm/bridge/tc358768.c | 1 + + drivers/gpu/drm/bridge/thc63lvd1024.c | 1 + + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 323 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 21 +- + drivers/gpu/drm/drm_atomic_helper.c | 5 +- + drivers/gpu/drm/drm_auth.c | 46 +- + drivers/gpu/drm/drm_bridge.c | 10 +- + drivers/gpu/drm/drm_client.c | 35 +- + drivers/gpu/drm/drm_client_modeset.c | 42 +- + drivers/gpu/drm/drm_connector.c | 29 +- + drivers/gpu/drm/drm_crtc.c | 27 + + drivers/gpu/drm/drm_debugfs.c | 30 +- + drivers/gpu/drm/drm_dp_helper.c | 3 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 94 +- + drivers/gpu/drm/drm_edid.c | 340 +- + drivers/gpu/drm/drm_file.c | 10 +- + drivers/gpu/drm/drm_format_helper.c | 61 +- + drivers/gpu/drm/drm_fourcc.c | 12 + + drivers/gpu/drm/drm_gem.c | 84 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 20 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 172 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 2 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 21 +- + drivers/gpu/drm/drm_ioc32.c | 4 +- + drivers/gpu/drm/drm_ioctl.c | 11 +- + drivers/gpu/drm/drm_irq.c | 2 +- + drivers/gpu/drm/drm_managed.c | 2 + + drivers/gpu/drm/drm_mipi_dbi.c | 18 +- + drivers/gpu/drm/drm_mm.c | 122 +- + drivers/gpu/drm/drm_modes.c | 40 +- + drivers/gpu/drm/drm_prime.c | 6 +- + drivers/gpu/drm/drm_probe_helper.c | 9 +- + drivers/gpu/drm/drm_vblank.c | 215 +- + drivers/gpu/drm/drm_vm.c | 1 - + drivers/gpu/drm/drm_writeback.c | 1 - + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 5 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 11 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 +- + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 6 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 19 - + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 11 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 12 +- + drivers/gpu/drm/i2c/ch7006_mode.c | 1 - + drivers/gpu/drm/i2c/tda998x_drv.c | 1 + + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/display/icl_dsi.c | 14 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 4 + + drivers/gpu/drm/i915/display/intel_bios.c | 78 +- + drivers/gpu/drm/i915/display/intel_bw.c | 151 +- + drivers/gpu/drm/i915/display/intel_bw.h | 10 + + drivers/gpu/drm/i915/display/intel_cdclk.c | 100 +- + drivers/gpu/drm/i915/display/intel_color.c | 66 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 55 +- + drivers/gpu/drm/i915/display/intel_crt.c | 4 +- + drivers/gpu/drm/i915/display/intel_csr.c | 20 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 143 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 3 - + drivers/gpu/drm/i915/display/intel_display.c | 347 +- + drivers/gpu/drm/i915/display/intel_display.h | 7 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 9 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 373 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 7 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 33 +- + drivers/gpu/drm/i915/display/intel_dp.c | 257 +- + drivers/gpu/drm/i915/display/intel_dp.h | 4 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 4 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 36 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 56 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 77 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 256 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 17 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 39 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 7 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 41 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 27 + + drivers/gpu/drm/i915/display/intel_hotplug.h | 2 + + drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 30 +- + drivers/gpu/drm/i915/display/intel_panel.c | 4 +- + drivers/gpu/drm/i915/display/intel_psr.c | 94 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 21 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 30 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 11 +- + drivers/gpu/drm/i915/display/intel_tc.c | 14 +- + drivers/gpu/drm/i915/display/intel_tv.c | 7 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 325 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 27 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 134 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 1 + + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 145 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 3 - + .../drm/i915/gem/selftests/i915_gem_execbuffer.c | 21 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 55 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 37 + + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 4 + + drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 329 + + drivers/gpu/drm/i915/gt/gen2_engine_cs.h | 38 + + drivers/gpu/drm/i915/gt/gen6_engine_cs.c | 455 + + drivers/gpu/drm/i915/gt/gen6_engine_cs.h | 39 + + drivers/gpu/drm/i915/gt/intel_context_sseu.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 69 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 41 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 12 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 46 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 5 + + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 4 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 57 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 29 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 6 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 866 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 11 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 91 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 2 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 53 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.h | 14 + + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 101 + + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 132 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 85 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 931 +- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 9 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 68 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 25 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 17 + + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 15 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 20 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 37 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 14 +- + drivers/gpu/drm/i915/gvt/display.c | 30 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 1 + + drivers/gpu/drm/i915/gvt/edid.c | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 17 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 55 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 2 - + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 7 +- + drivers/gpu/drm/i915/i915_drv.c | 9 +- + drivers/gpu/drm/i915/i915_drv.h | 50 +- + drivers/gpu/drm/i915/i915_gem.c | 18 + + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 - + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- + drivers/gpu/drm/i915/i915_irq.c | 77 +- + drivers/gpu/drm/i915/i915_params.c | 43 +- + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 40 +- + drivers/gpu/drm/i915/i915_pmu.c | 17 +- + drivers/gpu/drm/i915/i915_query.c | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 190 +- + drivers/gpu/drm/i915/i915_request.c | 40 +- + drivers/gpu/drm/i915/i915_request.h | 11 +- + drivers/gpu/drm/i915/i915_trace.h | 10 +- + drivers/gpu/drm/i915/i915_utils.c | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 71 +- + drivers/gpu/drm/i915/i915_vma.h | 1 + + drivers/gpu/drm/i915/intel_device_info.c | 7 +- + drivers/gpu/drm/i915/intel_device_info.h | 5 + + drivers/gpu/drm/i915/intel_gvt.c | 10 +- + drivers/gpu/drm/i915/intel_pch.c | 42 +- + drivers/gpu/drm/i915/intel_pm.c | 414 +- + drivers/gpu/drm/i915/intel_pm.h | 29 +- + drivers/gpu/drm/i915/intel_region_lmem.c | 6 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 39 +- + drivers/gpu/drm/i915/intel_uncore.c | 10 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 + + .../gpu/drm/i915/selftests/i915_live_selftests.h | 4 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 4 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 871 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 18 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 1 + + drivers/gpu/drm/imx/dw_hdmi-imx.c | 6 +- + drivers/gpu/drm/imx/imx-drm-core.c | 12 +- + drivers/gpu/drm/ingenic/ingenic-drm.c | 13 +- + drivers/gpu/drm/lima/lima_gem.c | 10 +- + drivers/gpu/drm/lima/lima_sched.c | 2 +- + drivers/gpu/drm/mcde/mcde_drv.c | 12 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- + drivers/gpu/drm/meson/meson_drv.c | 15 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 34 +- + drivers/gpu/drm/meson/meson_venc_cvbs.c | 2 - + drivers/gpu/drm/mgag200/Kconfig | 4 +- + drivers/gpu/drm/mgag200/Makefile | 3 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 319 - + drivers/gpu/drm/mgag200/mgag200_drv.c | 204 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 56 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 160 - + drivers/gpu/drm/mgag200/mgag200_mm.c | 127 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 875 +- + drivers/gpu/drm/mgag200/mgag200_reg.h | 11 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 70 - + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 29 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 10 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 8 +- + drivers/gpu/drm/msm/msm_fb.c | 4 +- + drivers/gpu/drm/msm/msm_gem.c | 24 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 11 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 14 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 18 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 1 + + drivers/gpu/drm/omapdrm/dss/sdi.c | 1 + + drivers/gpu/drm/omapdrm/dss/venc.c | 1 + + drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 4 +- + drivers/gpu/drm/panel/panel-arm-versatile.c | 4 - + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 1 - + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 3 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 7 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 3 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 7 - + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 3 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 4 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 3 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 3 +- + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 3 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 1 - + drivers/gpu/drm/panel/panel-lg-lg4573.c | 3 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 1 - + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 1 - + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 2 - + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 1 - + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 4 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 3 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 3 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 3 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 3 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 5 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 1 - + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 6 - + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 3 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 1 - + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 3 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 3 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 1 - + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 3 +- + drivers/gpu/drm/panel/panel-simple.c | 214 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 3 +- + drivers/gpu/drm/panel/panel-sony-acx424akp.c | 2 - + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 1 - + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 1 - + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 1 - + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 5 - + drivers/gpu/drm/panel/panel-truly-nt35597.c | 1 - + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 1 - + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 8 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 8 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 4 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 6 +- + drivers/gpu/drm/qxl/qxl_drv.h | 6 +- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- + drivers/gpu/drm/qxl/qxl_gem.c | 2 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_kms.c | 5 +- + drivers/gpu/drm/qxl/qxl_object.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.h | 5 - + drivers/gpu/drm/qxl/qxl_ttm.c | 9 - + drivers/gpu/drm/radeon/ci_dpm.c | 2 +- + drivers/gpu/drm/radeon/ni_dpm.c | 7 +- + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_connectors.c | 20 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/gpu/drm/radeon/radeon_cursor.c | 6 +- + drivers/gpu/drm/radeon/radeon_display.c | 12 +- + drivers/gpu/drm/radeon/radeon_drv.c | 9 +- + drivers/gpu/drm/radeon/radeon_fb.c | 4 +- + drivers/gpu/drm/radeon/radeon_gem.c | 30 +- + drivers/gpu/drm/radeon/radeon_kms.c | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.h | 16 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 11 +- + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 6 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 3 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 9 + + drivers/gpu/drm/selftests/drm_mm_selftests.h | 1 + + drivers/gpu/drm/selftests/test-drm_mm.c | 130 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 11 +- + drivers/gpu/drm/sti/sti_drv.c | 12 +- + drivers/gpu/drm/sti/sti_hda.c | 1 - + drivers/gpu/drm/stm/drv.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 6 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 3 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 12 +- + drivers/gpu/drm/tegra/fb.c | 6 +- + drivers/gpu/drm/tegra/gem.c | 4 +- + drivers/gpu/drm/tidss/tidss_drv.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 13 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 25 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 3 +- + drivers/gpu/drm/tiny/hx8357d.c | 2 +- + drivers/gpu/drm/tiny/ili9225.c | 14 +- + drivers/gpu/drm/tiny/ili9341.c | 2 +- + drivers/gpu/drm/tiny/ili9486.c | 2 +- + drivers/gpu/drm/tiny/mi0283qt.c | 2 +- + drivers/gpu/drm/tiny/repaper.c | 15 +- + drivers/gpu/drm/tiny/st7586.c | 13 +- + drivers/gpu/drm/tiny/st7735r.c | 2 +- + drivers/gpu/drm/tve200/tve200_drv.c | 12 +- + drivers/gpu/drm/udl/Makefile | 2 +- + drivers/gpu/drm/udl/udl_drv.c | 4 +- + drivers/gpu/drm/udl/udl_drv.h | 3 - + drivers/gpu/drm/udl/udl_gem.c | 106 - + drivers/gpu/drm/v3d/v3d_bo.c | 6 +- + drivers/gpu/drm/v3d/v3d_gem.c | 4 +- + drivers/gpu/drm/v3d/v3d_irq.c | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 14 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 82 +- + drivers/gpu/drm/vc4/vc4_drv.c | 4 + + drivers/gpu/drm/vc4/vc4_drv.h | 26 + + drivers/gpu/drm/vc4/vc4_gem.c | 14 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +- + drivers/gpu/drm/vc4/vc4_kms.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 41 + + drivers/gpu/drm/vc4/vc4_v3d.c | 4 +- + drivers/gpu/drm/vgem/vgem_drv.c | 6 +- + drivers/gpu/drm/vgem/vgem_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- + drivers/gpu/drm/vkms/vkms_gem.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 - + drivers/gpu/drm/xen/xen_drm_front.c | 4 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 11 +- + drivers/video/console/newport_con.c | 12 +- + drivers/video/fbdev/amba-clcd.c | 19 +- + drivers/video/fbdev/aty/aty128fb.c | 6 +- + drivers/video/fbdev/aty/atyfb_base.c | 7 +- + drivers/video/fbdev/aty/radeon_base.c | 6 +- + drivers/video/fbdev/nvidia/nvidia.c | 6 +- + drivers/video/fbdev/omap/omapfb_main.c | 6 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 4 +- + drivers/video/fbdev/pvr2fb.c | 24 +- + drivers/video/fbdev/pxafb.c | 6 +- + drivers/video/fbdev/riva/fbdev.c | 6 +- + drivers/video/fbdev/s3c2410fb.c | 6 +- + drivers/video/fbdev/sm712fb.c | 2 + + drivers/video/hdmi.c | 2 +- + include/drm/amd_asic_type.h | 1 + + include/drm/bridge/dw_hdmi.h | 26 +- + include/drm/drm_bridge.h | 3 + + include/drm/drm_client.h | 2 + + include/drm/drm_device.h | 3 + + include/drm/drm_dp_helper.h | 10 +- + include/drm/drm_dp_mst_helper.h | 17 + + include/drm/drm_drv.h | 31 +- + include/drm/drm_edid.h | 6 +- + include/drm/drm_format_helper.h | 4 +- + include/drm/drm_gem.h | 37 +- + include/drm/drm_gem_cma_helper.h | 74 +- + include/drm/drm_gem_shmem_helper.h | 4 + + include/drm/drm_mipi_dbi.h | 5 - + include/drm/drm_modes.h | 194 +- + include/drm/i915_pciids.h | 9 + + include/linux/hdmi.h | 1 + + include/uapi/drm/amdgpu_drm.h | 10 +- + include/uapi/drm/drm_fourcc.h | 34 + + 840 files changed, 232586 insertions(+), 15690 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,tfp410.yaml + 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_fw_meta.h => amdgpu/gfxhub_v2_1.h} (53%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.h + 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/uvd_v3_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v3_1.h + 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/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 + rename drivers/gpu/drm/amd/display/{dmub/inc/dmub_types.h => dc/dce/dmub_hw_lock_mgr.c} (55%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.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/display/modules/color/color_table.c + create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_table.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/uvd/uvd_3_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_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/inc/smu_v11_0_7_pptable.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 + create mode 100644 drivers/gpu/drm/i915/gt/gen2_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/gt/gen2_engine_cs.h + create mode 100644 drivers/gpu/drm/i915/gt/gen6_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/gt/gen6_engine_cs.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.h + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_cursor.c + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_main.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_mm.c + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_ttm.c + delete mode 100644 drivers/gpu/drm/udl/udl_gem.c +Merging amdgpu/drm-next (d7373aaf7383 drm/amdgpu: add some additional DCE6 registers (v7)) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/amd/powerplay/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4ccd1274e989] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 143 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 75 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 111 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 26 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/cik.c | 8 + + drivers/gpu/drm/amd/amdgpu/cikd.h | 2 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 123 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 47 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 47 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 75 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 55 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 52 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 46 +- + drivers/gpu/drm/amd/amdgpu/mmsch_v3_0.h | 130 +++ + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 97 ++- + drivers/gpu/drm/amd/amdgpu/nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 119 +-- + drivers/gpu/drm/amd/amdgpu/si.c | 365 ++++++++- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 19 + + drivers/gpu/drm/amd/amdgpu/si_enums.h | 1 - + drivers/gpu/drm/amd/amdgpu/sid.h | 35 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 36 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 371 ++++++++- + drivers/gpu/drm/amd/amdgpu/vi.c | 16 +- + drivers/gpu/drm/amd/amdgpu/vi.h | 1 + + drivers/gpu/drm/amd/amdgpu/vid.h | 2 - + drivers/gpu/drm/amd/amdkfd/Makefile | 1 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 2 + + 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 | 35 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 1 + + 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_mqd_manager_v10.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 65 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 227 ++++++ + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 29 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 215 +++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 259 +++--- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 3 - + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 39 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 35 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 70 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 51 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 1 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 53 +- + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 65 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 105 +-- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 16 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 39 +- + drivers/gpu/drm/amd/display/dc/dc.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 28 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 - + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 1 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 156 ++-- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 27 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 9 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 46 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 8 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 3 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 + + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 28 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 5 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 23 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 15 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 4 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 10 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 6 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 21 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 40 +- + drivers/gpu/drm/amd/display/include/logger_types.h | 4 +- + .../drm/amd/display/modules/freesync/freesync.c | 37 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- + .../gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h | 76 ++ + .../drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h | 107 +++ + drivers/gpu/drm/amd/include/atomfirmware.h | 78 ++ + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 281 +++---- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 878 ++++++++------------- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 16 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 51 +- + .../powerplay/inc/smu11_driver_if_sienna_cichlid.h | 27 +- + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 55 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 11 - + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 656 +++++++-------- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 275 +++++-- + drivers/gpu/drm/amd/powerplay/renoir_ppt.h | 20 - + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 714 ++++++++--------- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 14 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 461 +++++++---- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 121 --- + drivers/gpu/drm/radeon/radeon_fence.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + include/drm/amd_asic_type.h | 1 + + include/uapi/linux/kfd_ioctl.h | 22 +- + sound/pci/hda/hda_intel.c | 3 + + 159 files changed, 5193 insertions(+), 2953 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_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 +$ git am -3 ../patches/0001-Revert-drm-amdgpu-atomfirmware-fix-vram_info-fetchin.patch +Applying: Revert "drm/amdgpu/atomfirmware: fix vram_info fetching for renoir" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +$ git add -A . +$ git commit -v -a --amend +[master f3bfab694a34] Merge remote-tracking branch 'amdgpu/drm-next' + Date: Mon Jul 20 12:06:21 2020 +1000 +Merging drm-intel/for-linux-next (111822b21be9 drm/i915/rkl: Add Wa_14011224835 for PHY B initialization) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/drm_probe_helper.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_probe_helper.c +Resolved 'drivers/gpu/drm/drm_probe_helper.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 628aa80b6434] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_crtc_helper_internal.h | 7 +- + drivers/gpu/drm/drm_probe_helper.c | 101 ++-- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/intel_bios.c | 3 + + drivers/gpu/drm/i915/display/intel_cdclk.c | 22 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 2 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 75 +++ + drivers/gpu/drm/i915/display/intel_ddi.c | 440 ++++++++------ + drivers/gpu/drm/i915/display/intel_display.c | 35 +- + drivers/gpu/drm/i915/display/intel_display.h | 2 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 12 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 43 +- + drivers/gpu/drm/i915/display/intel_dp.c | 366 ++++++------ + drivers/gpu/drm/i915/display/intel_dp.h | 4 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 28 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 129 ++-- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 6 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 38 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 52 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 14 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 75 ++- + drivers/gpu/drm/i915/display/intel_hdcp.c | 153 ++--- + drivers/gpu/drm/i915/display/intel_hdmi.c | 267 ++++----- + drivers/gpu/drm/i915/display/intel_hdmi.h | 6 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 8 +- + drivers/gpu/drm/i915/display/intel_lspcon.h | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 4 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 145 +++-- + drivers/gpu/drm/i915/display/intel_sdvo_regs.h | 8 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 5 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 1 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 22 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.h | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 41 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 29 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 36 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 2 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 5 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 4 +- + drivers/gpu/drm/i915/gt/debugfs_gt.c | 2 + + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 22 +- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 2 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 7 +- + drivers/gpu/drm/i915/gt/intel_context_sseu.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 91 ++- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 1 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 4 + + drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 49 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 18 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 17 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 5 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 9 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 11 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 13 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 88 ++- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 19 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 23 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 10 +- + drivers/gpu/drm/i915/gt/intel_reset_types.h | 7 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 4 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 3 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 591 ++++++++++++++++++- + drivers/gpu/drm/i915/gt/intel_sseu.h | 10 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 306 ++++++++++ + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.h | 17 + + drivers/gpu/drm/i915/gt/intel_timeline.c | 7 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 110 ++-- + drivers/gpu/drm/i915/gt/mock_engine.c | 3 + + drivers/gpu/drm/i915/gt/selftest_lrc.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 13 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 10 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 11 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 29 + + drivers/gpu/drm/i915/gvt/handlers.c | 4 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 2 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 286 +-------- + drivers/gpu/drm/i915/i915_drv.c | 9 +- + drivers/gpu/drm/i915/i915_drv.h | 39 +- + drivers/gpu/drm/i915/i915_gem.h | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 + + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 34 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 3 + + drivers/gpu/drm/i915/i915_irq.c | 59 +- + drivers/gpu/drm/i915/i915_pci.c | 56 +- + drivers/gpu/drm/i915/i915_perf.c | 13 +- + drivers/gpu/drm/i915/i915_pmu.c | 7 +- + drivers/gpu/drm/i915/i915_query.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 51 +- + drivers/gpu/drm/i915/i915_request.c | 203 ++++--- + drivers/gpu/drm/i915/i915_utils.c | 10 + + drivers/gpu/drm/i915/i915_utils.h | 16 +- + drivers/gpu/drm/i915/i915_vma.c | 8 +- + drivers/gpu/drm/i915/i915_vma_types.h | 1 - + drivers/gpu/drm/i915/intel_device_info.c | 653 +-------------------- + drivers/gpu/drm/i915/intel_device_info.h | 17 +- + drivers/gpu/drm/i915/intel_pch.c | 6 + + drivers/gpu/drm/i915/intel_pch.h | 4 + + drivers/gpu/drm/i915/intel_pm.c | 118 +++- + drivers/gpu/drm/i915/intel_uncore.c | 20 +- + drivers/gpu/drm/i915/intel_uncore.h | 4 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 133 +++++ + drivers/gpu/drm/i915/selftests/i915_request.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 12 +- + include/drm/drm_modeset_helper_vtables.h | 42 ++ + include/drm/i915_pciids.h | 12 +- + 120 files changed, 3407 insertions(+), 2219 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_sseu_debugfs.h +Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 50 ++++++++++++++++++++++++++++++---------- + drivers/gpu/drm/tegra/dc.h | 3 ++- + drivers/gpu/drm/tegra/dsi.c | 9 ++++++-- + drivers/gpu/drm/tegra/gr2d.c | 1 + + drivers/gpu/drm/tegra/gr2d.h | 1 + + drivers/gpu/drm/tegra/gr3d.c | 2 ++ + drivers/gpu/drm/tegra/plane.c | 3 ++- + drivers/gpu/drm/tegra/plane.h | 3 ++- + drivers/gpu/drm/tegra/sor.c | 4 ++-- + drivers/gpu/host1x/debug.c | 4 ++++ + drivers/gpu/host1x/hw/debug_hw.c | 6 +++++ + drivers/gpu/host1x/job.c | 27 ++++++++++++++++------ + drivers/gpu/host1x/mipi.c | 37 ++++++++++++++++------------- + include/linux/host1x.h | 4 +++- + 14 files changed, 111 insertions(+), 43 deletions(-) +Merging drm-misc/for-linux-next (40a55dc13e9d drm/ingenic: Silence uninitialized-variable warning) +$ git merge drm-misc/for-linux-next +Removing include/linux/amba/clcd.h +Removing include/linux/amba/clcd-regs.h +Auto-merging drivers/video/fbdev/core/fbcon.c +Removing drivers/video/fbdev/amba-clcd.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/tegra/dc.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Removing drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c +Auto-merging drivers/gpu/drm/meson/meson_registers.h +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Auto-merging drivers/gpu/drm/i915/display/intel_hotplug.c +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +Auto-merging drivers/gpu/drm/drm_probe_helper.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/panel/sharp,lq101r1sx01.txt +Removing Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt +Removing Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt +Removing Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,p079zca.txt +Removing Documentation/devicetree/bindings/display/ingenic,lcd.txt +Removing Documentation/devicetree/bindings/display/connector/vga-connector.txt +Removing Documentation/devicetree/bindings/display/connector/hdmi-connector.txt +Removing Documentation/devicetree/bindings/display/connector/dvi-connector.txt +Removing Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt +Removing Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 136902fa4c9a] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/brcm,bcm2835-dpi.yaml | 10 - + .../bindings/display/bridge/renesas,lvds.txt | 85 -- + .../bindings/display/bridge/renesas,lvds.yaml | 248 ++++++ + .../display/connector/analog-tv-connector.txt | 31 - + .../display/connector/analog-tv-connector.yaml | 52 ++ + .../bindings/display/connector/dvi-connector.txt | 36 - + .../bindings/display/connector/dvi-connector.yaml | 70 ++ + .../bindings/display/connector/hdmi-connector.txt | 31 - + .../bindings/display/connector/hdmi-connector.yaml | 64 ++ + .../bindings/display/connector/vga-connector.txt | 36 - + .../bindings/display/connector/vga-connector.yaml | 46 + + .../devicetree/bindings/display/ingenic,ipu.yaml | 65 ++ + .../devicetree/bindings/display/ingenic,lcd.txt | 45 - + .../devicetree/bindings/display/ingenic,lcd.yaml | 126 +++ + .../bindings/display/panel/innolux,p079zca.txt | 22 - + .../bindings/display/panel/panel-dsi-cm.txt | 29 - + .../bindings/display/panel/panel-dsi-cm.yaml | 86 ++ + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../display/panel/rocktech,jh057n00900.txt | 23 - + .../display/panel/rocktech,jh057n00900.yaml | 70 ++ + .../bindings/display/panel/samsung,s6e8aa0.txt | 56 -- + .../bindings/display/panel/samsung,s6e8aa0.yaml | 100 +++ + .../bindings/display/panel/sharp,lq101r1sx01.txt | 49 - + .../bindings/display/panel/sharp,lq101r1sx01.yaml | 87 ++ + .../bindings/display/simple-framebuffer.yaml | 44 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-kms.rst | 15 + + MAINTAINERS | 6 +- + drivers/dma-buf/dma-fence-chain.c | 7 - + drivers/dma-buf/st-dma-fence-chain.c | 43 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 107 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 13 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 7 +- + drivers/gpu/drm/arm/malidp_drv.c | 1 - + drivers/gpu/drm/ast/Makefile | 3 +- + drivers/gpu/drm/ast/ast_cursor.c | 289 ++++++ + drivers/gpu/drm/ast/ast_drv.h | 19 +- + drivers/gpu/drm/ast/ast_main.c | 35 +- + drivers/gpu/drm/ast/ast_mode.c | 322 ++----- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 7 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 49 +- + drivers/gpu/drm/bridge/tc358768.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 1 + + drivers/gpu/drm/drm_atomic_state_helper.c | 4 + + drivers/gpu/drm/drm_atomic_uapi.c | 7 + + drivers/gpu/drm/drm_bufs.c | 6 + + drivers/gpu/drm/drm_connector.c | 40 +- + drivers/gpu/drm/drm_crtc.c | 1 + + drivers/gpu/drm/drm_crtc_helper.c | 3 + + drivers/gpu/drm/drm_dp_helper.c | 68 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 20 + + drivers/gpu/drm/drm_edid.c | 165 ++-- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_file.c | 2 + + drivers/gpu/drm/drm_framebuffer.c | 1 + + drivers/gpu/drm/drm_internal.h | 27 + + drivers/gpu/drm/drm_ioc32.c | 2 + + drivers/gpu/drm/drm_lease.c | 4 + + drivers/gpu/drm/drm_lock.c | 1 + + drivers/gpu/drm/drm_mipi_dsi.c | 41 +- + drivers/gpu/drm/drm_mode_config.c | 1 + + drivers/gpu/drm/drm_of.c | 9 + + drivers/gpu/drm/drm_pci.c | 1 + + drivers/gpu/drm/drm_plane.c | 1 + + drivers/gpu/drm/drm_prime.c | 1 + + drivers/gpu/drm/drm_probe_helper.c | 38 +- + drivers/gpu/drm/drm_syncobj.c | 1 + + drivers/gpu/drm/drm_vblank.c | 73 +- + drivers/gpu/drm/drm_vblank_work.c | 267 ++++++ + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 2 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 52 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 26 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 21 +- + drivers/gpu/drm/ingenic/Kconfig | 11 + + drivers/gpu/drm/ingenic/Makefile | 2 + + .../ingenic/{ingenic-drm.c => ingenic-drm-drv.c} | 672 +++++++++----- + drivers/gpu/drm/ingenic/ingenic-drm.h | 173 ++++ + drivers/gpu/drm/ingenic/ingenic-ipu.c | 853 ++++++++++++++++++ + drivers/gpu/drm/ingenic/ingenic-ipu.h | 109 +++ + drivers/gpu/drm/lima/lima_drv.c | 4 + + drivers/gpu/drm/lima/lima_drv.h | 1 + + drivers/gpu/drm/lima/lima_sched.c | 5 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 16 +- + drivers/gpu/drm/meson/meson_crtc.c | 118 ++- + drivers/gpu/drm/meson/meson_drv.h | 16 + + drivers/gpu/drm/meson/meson_overlay.c | 293 +++++- + drivers/gpu/drm/meson/meson_registers.h | 22 + + drivers/gpu/drm/mgag200/mgag200_drv.h | 6 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 168 ++-- + drivers/gpu/drm/mgag200/mgag200_reg.h | 11 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 31 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/Kbuild | 4 + + drivers/gpu/drm/nouveau/dispnv50/atom.h | 21 + + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/core.h | 4 + + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/core907d.c | 3 + + drivers/gpu/drm/nouveau/dispnv50/core917d.c | 3 + + drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 3 + + drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 3 + + drivers/gpu/drm/nouveau/dispnv50/crc.c | 751 ++++++++++++++++ + drivers/gpu/drm/nouveau/dispnv50/crc.h | 131 +++ + drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 139 +++ + drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 153 ++++ + drivers/gpu/drm/nouveau/dispnv50/disp.c | 69 +- + drivers/gpu/drm/nouveau/dispnv50/disp.h | 24 + + drivers/gpu/drm/nouveau/dispnv50/handles.h | 16 + + drivers/gpu/drm/nouveau/dispnv50/head.c | 98 +- + drivers/gpu/drm/nouveau/dispnv50/head.h | 12 +- + drivers/gpu/drm/nouveau/dispnv50/head907d.c | 14 +- + drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 27 +- + drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 20 +- + drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 8 + + drivers/gpu/drm/nouveau/nouveau_bo.h | 3 + + drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 60 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 8 - + drivers/gpu/drm/omapdrm/omap_crtc.c | 8 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 4 - + drivers/gpu/drm/panel/Kconfig | 26 +- + drivers/gpu/drm/panel/Makefile | 2 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 4 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 2 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 2 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 2 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 423 --------- + drivers/gpu/drm/panel/panel-simple.c | 120 ++- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 654 ++++++++++++++ + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 4 +- + drivers/gpu/drm/pl111/pl111_debugfs.c | 1 - + drivers/gpu/drm/pl111/pl111_display.c | 1 - + drivers/gpu/drm/pl111/pl111_drm.h | 73 ++ + drivers/gpu/drm/pl111/pl111_drv.c | 1 - + drivers/gpu/drm/pl111/pl111_versatile.c | 10 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 11 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +- + drivers/gpu/drm/scheduler/sched_entity.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 14 +- + drivers/gpu/drm/stm/ltdc.c | 19 +- + drivers/gpu/drm/tegra/dc.c | 1 - + drivers/gpu/drm/tidss/tidss_crtc.c | 5 +- + drivers/gpu/drm/tidss/tidss_crtc.h | 2 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 6 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 2 +- + drivers/gpu/drm/tidss/tidss_dispc_regs.h | 2 +- + drivers/gpu/drm/tidss/tidss_drv.c | 2 +- + drivers/gpu/drm/tidss/tidss_drv.h | 2 +- + drivers/gpu/drm/tidss/tidss_encoder.c | 2 +- + drivers/gpu/drm/tidss/tidss_encoder.h | 2 +- + drivers/gpu/drm/tidss/tidss_irq.c | 2 +- + drivers/gpu/drm/tidss/tidss_irq.h | 2 +- + drivers/gpu/drm/tidss/tidss_kms.c | 7 +- + drivers/gpu/drm/tidss/tidss_kms.h | 2 +- + drivers/gpu/drm/tidss/tidss_plane.c | 2 +- + drivers/gpu/drm/tidss/tidss_plane.h | 2 +- + drivers/gpu/drm/tidss/tidss_scale_coefs.c | 2 +- + drivers/gpu/drm/tidss/tidss_scale_coefs.h | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 13 + + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 47 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 8 +- + drivers/gpu/drm/ttm/ttm_bo.c | 103 +-- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 5 + + drivers/gpu/drm/ttm/ttm_tt.c | 4 +- + drivers/gpu/drm/vboxvideo/hgsmi_defs.h | 2 +- + drivers/gpu/drm/vboxvideo/vbox_hgsmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 431 ++------- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 38 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 291 ++++++ + drivers/gpu/drm/vc4/vc4_regs.h | 9 +- + drivers/gpu/drm/vc4/vc4_txp.c | 109 ++- + drivers/gpu/drm/vgem/vgem_drv.c | 27 - + drivers/gpu/drm/virtio/virtgpu_display.c | 20 - + drivers/gpu/drm/vkms/vkms_drv.c | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 - + drivers/gpu/drm/zte/zx_vga.c | 6 +- + drivers/of/property.c | 23 + + drivers/video/fbdev/Kconfig | 20 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/amba-clcd.c | 986 --------------------- + drivers/video/fbdev/amifb.c | 8 + + drivers/video/fbdev/core/fbcon.c | 4 +- + drivers/video/fbdev/da8xx-fb.c | 4 +- + drivers/video/fbdev/neofb.c | 1 + + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 7 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 7 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 9 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 +- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 7 +- + drivers/video/fbdev/savage/savagefb_driver.c | 2 + + drivers/video/fbdev/sm712fb.c | 2 +- + drivers/video/fbdev/vt8623fb.c | 36 +- + include/drm/drm_atomic.h | 2 +- + include/drm/drm_bridge.h | 2 +- + include/drm/drm_connector.h | 126 ++- + include/drm/drm_edid.h | 9 + + include/drm/drm_gem.h | 4 +- + include/drm/drm_mode_config.h | 8 +- + include/drm/drm_rect.h | 2 +- + include/drm/drm_vblank.h | 20 + + include/drm/drm_vblank_work.h | 71 ++ + include/drm/gpu_scheduler.h | 6 +- + include/drm/ttm/ttm_bo_api.h | 2 - + include/drm/ttm/ttm_bo_driver.h | 3 - + include/linux/amba/clcd-regs.h | 87 -- + include/linux/amba/clcd.h | 290 ------ + include/linux/fb.h | 5 +- + include/linux/of_graph.h | 6 + + include/uapi/drm/drm_fourcc.h | 106 +++ + include/uapi/drm/i915_drm.h | 4 +- + include/uapi/drm/msm_drm.h | 4 +- + 238 files changed, 7700 insertions(+), 4282 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml + delete mode 100644 Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt + create mode 100644 Documentation/devicetree/bindings/display/connector/analog-tv-connector.yaml + delete mode 100644 Documentation/devicetree/bindings/display/connector/dvi-connector.txt + create mode 100644 Documentation/devicetree/bindings/display/connector/dvi-connector.yaml + delete mode 100644 Documentation/devicetree/bindings/display/connector/hdmi-connector.txt + create mode 100644 Documentation/devicetree/bindings/display/connector/hdmi-connector.yaml + delete mode 100644 Documentation/devicetree/bindings/display/connector/vga-connector.txt + create mode 100644 Documentation/devicetree/bindings/display/connector/vga-connector.yaml + create mode 100644 Documentation/devicetree/bindings/display/ingenic,ipu.yaml + delete mode 100644 Documentation/devicetree/bindings/display/ingenic,lcd.txt + create mode 100644 Documentation/devicetree/bindings/display/ingenic,lcd.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,p079zca.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-dsi-cm.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq101r1sx01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq101r1sx01.yaml + create mode 100644 drivers/gpu/drm/ast/ast_cursor.c + create mode 100644 drivers/gpu/drm/drm_vblank_work.c + rename drivers/gpu/drm/ingenic/{ingenic-drm.c => ingenic-drm-drv.c} (54%) + create mode 100644 drivers/gpu/drm/ingenic/ingenic-drm.h + create mode 100644 drivers/gpu/drm/ingenic/ingenic-ipu.c + create mode 100644 drivers/gpu/drm/ingenic/ingenic-ipu.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crc.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crc.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crc907d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcc37d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/handles.h + delete mode 100644 drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c + create mode 100644 drivers/gpu/drm/panel/panel-sitronix-st7703.c + delete mode 100644 drivers/video/fbdev/amba-clcd.c + create mode 100644 include/drm/drm_vblank_work.h + delete mode 100644 include/linux/amba/clcd-regs.h + delete mode 100644 include/linux/amba/clcd.h +Merging drm-msm/msm-next (6e9c6874fb50 drm: msm: a6xx: fix gpu failure after system resume) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_gpu.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gpu.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/gpu.txt | 28 ++++++ + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 107 +++++++++++---------- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 70 ++++++++------ + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 39 ++++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 63 ++++++++++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 28 ++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 29 +++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 + + drivers/gpu/drm/msm/dsi/dsi.c | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 27 +++++- + drivers/gpu/drm/msm/msm_drv.c | 67 ++++++------- + drivers/gpu/drm/msm/msm_gem.c | 36 ++++--- + drivers/gpu/drm/msm/msm_gpu.c | 7 +- + drivers/gpu/drm/msm/msm_gpu.h | 3 +- + 18 files changed, 378 insertions(+), 151 deletions(-) +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 (c5d5a32ead1e drm/etnaviv: fix ref count leak via pm_runtime_get_sync) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 80 ++++++++++++++++------------------- + 2 files changed, 40 insertions(+), 46 deletions(-) +Merging regmap/for-next (c9fadf212afd Merge remote-tracking branch 'regmap/for-5.9' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 53 +++++---- + drivers/base/regmap/regmap.c | 33 +++--- + include/linux/regmap.h | 245 ++++++++++++++++++++++++++++++++------- + 3 files changed, 248 insertions(+), 83 deletions(-) +Merging sound/for-next (6779ec13ca63 ALSA: asihpi: delete duplicated word) +$ git merge sound/for-next +Auto-merging sound/usb/quirks.c +Auto-merging sound/usb/quirks-table.h +Auto-merging sound/usb/pcm.c +Auto-merging sound/usb/midi.c +Auto-merging sound/usb/line6/driver.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + Documentation/sound/alsa-configuration.rst | 6 +- + Documentation/sound/cards/audigy-mixer.rst | 2 +- + Documentation/sound/cards/sb-live-mixer.rst | 2 +- + Documentation/sound/designs/compress-offload.rst | 83 ++++++++ + Documentation/sound/hd-audio/notes.rst | 6 +- + include/sound/gus.h | 4 + + include/sound/hdmi-codec.h | 2 +- + include/sound/memalloc.h | 9 +- + include/sound/omap-hdmi-audio.h | 2 +- + sound/atmel/ac97c.c | 20 +- + sound/core/init.c | 3 + + sound/core/memalloc.c | 9 +- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/oss/pcm_plugin.c | 2 +- + sound/core/pcm_iec958.c | 2 +- + sound/core/pcm_memory.c | 1 + + sound/core/pcm_native.c | 10 +- + sound/core/seq/oss/seq_oss_timer.c | 2 +- + sound/core/seq/seq_midi_emul.c | 2 +- + sound/core/sgbuf.c | 3 + + sound/drivers/opl3/opl3_midi.c | 4 +- + sound/drivers/vx/vx_core.c | 3 +- + sound/firewire/cmp.c | 1 - + sound/firewire/motu/motu-protocol-v3.c | 16 +- + sound/isa/es18xx.c | 2 +- + sound/isa/galaxy/galaxy.c | 6 +- + sound/isa/gus/gus_reset.c | 2 - + sound/isa/gus/gus_uart.c | 3 +- + sound/isa/msnd/msnd_pinnacle_mixer.c | 4 +- + sound/isa/opti9xx/miro.c | 10 +- + sound/isa/opti9xx/opti92x-ad1848.c | 12 +- + sound/isa/sb/sb8_main.c | 10 +- + sound/oss/dmasound/dmasound_atari.c | 2 +- + sound/oss/dmasound/dmasound_core.c | 4 +- + sound/pci/ac97/ac97_codec.c | 4 +- + sound/pci/ac97/ac97_patch.c | 14 +- + sound/pci/asihpi/asihpi.c | 12 +- + sound/pci/asihpi/hpi_internal.h | 2 +- + sound/pci/asihpi/hpicmn.c | 26 +-- + sound/pci/atiixp.c | 6 +- + sound/pci/au88x0/au88x0_a3ddata.c | 8 +- + sound/pci/au88x0/au88x0_core.c | 12 +- + sound/pci/au88x0/au88x0_xtalk.c | 36 ++-- + sound/pci/aw2/aw2-saa7146.c | 2 +- + sound/pci/azt3328.c | 2 +- + sound/pci/bt87x.c | 14 +- + sound/pci/ctxfi/ctatc.c | 6 +- + sound/pci/ctxfi/cthardware.c | 2 +- + sound/pci/ctxfi/cthw20k1.c | 2 +- + sound/pci/ctxfi/cthw20k2.c | 2 +- + sound/pci/ctxfi/ctimap.c | 2 +- + sound/pci/ctxfi/ctmixer.c | 2 +- + sound/pci/ctxfi/ctpcm.c | 2 +- + sound/pci/echoaudio/echoaudio.c | 183 +++++++++++------- + sound/pci/echoaudio/echoaudio.h | 14 +- + sound/pci/echoaudio/echoaudio_dsp.c | 4 +- + sound/pci/echoaudio/mona_dsp.c | 5 - + sound/pci/emu10k1/emu10k1_main.c | 4 +- + sound/pci/emu10k1/emu10k1_patch.c | 3 +- + sound/pci/emu10k1/emupcm.c | 5 +- + sound/pci/es1938.c | 3 +- + sound/pci/es1968.c | 20 +- + sound/pci/fm801.c | 27 +++ + sound/pci/hda/Kconfig | 24 +++ + sound/pci/hda/hda_beep.c | 2 +- + sound/pci/hda/hda_controller.c | 11 +- + sound/pci/hda/hda_controller.h | 2 +- + sound/pci/hda/hda_generic.c | 134 ++++++++----- + sound/pci/hda/hda_generic.h | 13 +- + sound/pci/hda/hda_intel.c | 44 ++--- + sound/pci/hda/hda_tegra.c | 1 + + sound/pci/hda/patch_conexant.c | 49 +++-- + sound/pci/hda/patch_hdmi.c | 64 +++++++ + sound/pci/hda/patch_realtek.c | 230 +++++++++++------------ + sound/pci/hda/patch_sigmatel.c | 22 ++- + sound/pci/hda/thinkpad_helper.c | 19 +- + sound/pci/ice1712/delta.c | 2 +- + sound/pci/intel8x0.c | 14 +- + sound/pci/korg1212/korg1212.c | 4 +- + sound/pci/mixart/mixart.c | 2 +- + sound/pci/mixart/mixart_core.c | 2 +- + sound/pci/nm256/nm256.c | 14 +- + sound/pci/oxygen/oxygen_pcm.c | 2 +- + sound/pci/oxygen/xonar_wm87x6.c | 6 +- + sound/pci/rme9652/hdspm.c | 4 +- + sound/pci/via82xx.c | 8 +- + sound/pci/via82xx_modem.c | 2 +- + sound/pci/ymfpci/ymfpci_main.c | 2 +- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 1 + + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 4 +- + sound/sparc/dbri.c | 10 +- + sound/usb/caiaq/audio.c | 2 +- + sound/usb/caiaq/device.c | 2 +- + sound/usb/card.c | 2 +- + sound/usb/clock.c | 2 +- + sound/usb/line6/driver.c | 3 +- + sound/usb/line6/driver.h | 8 +- + sound/usb/line6/podhd.c | 125 +++++++++++- + sound/usb/midi.c | 2 +- + sound/usb/mixer_maps.c | 2 +- + sound/usb/mixer_s1810c.c | 6 +- + sound/usb/mixer_scarlett_gen2.c | 4 +- + sound/usb/pcm.c | 6 +- + sound/usb/quirks-table.h | 2 +- + sound/usb/quirks.c | 14 +- + sound/usb/stream.c | 3 +- + sound/xen/xen_snd_front.c | 6 +- + sound/xen/xen_snd_front_evtchnl.c | 4 - + 108 files changed, 991 insertions(+), 569 deletions(-) +Merging sound-asoc/for-next (5f2224a2c3f8 Merge remote-tracking branch 'asoc/for-5.9' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/soc-io.c +Auto-merging sound/soc/codecs/cros_ec_codec.c +Removing include/sound/rt5670.h +Auto-merging include/sound/hdmi-codec.h +Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c +Auto-merging drivers/gpu/drm/i2c/tda998x_drv.c +Auto-merging drivers/gpu/drm/exynos/exynos_hdmi.c +Auto-merging drivers/gpu/drm/bridge/sii902x.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/sound/uniphier,evea.txt +Removing Documentation/devicetree/bindings/sound/uniphier,aio.txt +Removing Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.txt +Removing Documentation/devicetree/bindings/sound/ak4642.txt +Removing Documentation/devicetree/bindings/sound/ak4613.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4613.txt | 27 - + .../devicetree/bindings/sound/ak4613.yaml | 65 ++ + Documentation/devicetree/bindings/sound/ak4642.txt | 37 - + .../devicetree/bindings/sound/ak4642.yaml | 58 ++ + .../devicetree/bindings/sound/fsl,spdif.txt | 6 +- + .../devicetree/bindings/sound/fsl-asoc-card.txt | 15 +- + .../bindings/sound/intel,keembay-i2s.yaml | 70 ++ + .../devicetree/bindings/sound/max98357a.txt | 12 +- + .../devicetree/bindings/sound/maxim,max98390.yaml | 51 ++ + Documentation/devicetree/bindings/sound/mt6358.txt | 6 + + .../bindings/sound/mt8183-da7219-max98357.txt | 9 +- + .../sound/mt8183-mt6358-ts3a227-max98357.txt | 7 +- + .../devicetree/bindings/sound/renesas,fsi.yaml | 19 +- + .../devicetree/bindings/sound/renesas,rsnd.txt | 1 + + .../bindings/sound/rockchip,rk3328-codec.txt | 28 - + .../bindings/sound/rockchip,rk3328-codec.yaml | 69 ++ + .../bindings/sound/samsung,aries-wm8994.yaml | 147 ++++ + .../bindings/sound/socionext,uniphier-aio.yaml | 81 ++ + .../bindings/sound/socionext,uniphier-evea.yaml | 70 ++ + .../devicetree/bindings/sound/tas2562.txt | 7 +- + .../bindings/sound/ti,j721e-cpb-audio.yaml | 95 +++ + .../bindings/sound/ti,j721e-cpb-ivi-audio.yaml | 150 ++++ + .../devicetree/bindings/sound/uniphier,aio.txt | 45 -- + .../devicetree/bindings/sound/uniphier,evea.txt | 26 - + Documentation/devicetree/bindings/sound/wm8960.txt | 11 + + Documentation/devicetree/bindings/sound/wm8994.txt | 23 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 +- + Documentation/sound/kernel-api/alsa-driver-api.rst | 2 +- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 4 +- + drivers/gpu/drm/bridge/sii902x.c | 7 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 7 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 6 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 7 +- + drivers/gpu/drm/sti/sti_hdmi.c | 6 +- + drivers/gpu/drm/zte/zx_hdmi.c | 7 +- + include/sound/hda_codec.h | 2 + + include/sound/hdmi-codec.h | 6 +- + include/sound/rt5670.h | 26 - + include/sound/simple_card_utils.h | 6 +- + include/sound/soc-component.h | 33 +- + include/sound/soc-dai.h | 11 +- + include/sound/soc-dapm.h | 20 + + include/sound/soc-link.h | 1 + + include/sound/soc.h | 21 +- + include/sound/wm8960.h | 17 + + sound/pci/hda/hda_codec.c | 3 +- + sound/soc/Makefile | 2 +- + sound/soc/amd/acp-da7219-max98357a.c | 2 + + sound/soc/amd/acp-rt5645.c | 2 + + sound/soc/amd/acp3x-rt5682-max9836.c | 58 +- + sound/soc/amd/raven/acp3x-i2s.c | 12 - + sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +- + sound/soc/amd/renoir/rn-pci-acp3x.c | 33 + + sound/soc/amd/renoir/rn_acp3x.h | 2 + + sound/soc/atmel/atmel-classd.c | 133 ++- + sound/soc/atmel/atmel-pcm-dma.c | 2 +- + sound/soc/atmel/atmel-pdmic.c | 114 +-- + sound/soc/atmel/atmel_ssc_dai.c | 1 + + sound/soc/codecs/88pm860x-codec.c | 22 +- + sound/soc/codecs/Kconfig | 20 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ab8500-codec.c | 10 +- + sound/soc/codecs/ad193x.c | 5 +- + sound/soc/codecs/ad1980.c | 4 +- + sound/soc/codecs/adau1701.c | 5 +- + sound/soc/codecs/adau1761.c | 4 +- + sound/soc/codecs/adau17x1.c | 4 +- + sound/soc/codecs/adav80x.c | 2 +- + sound/soc/codecs/ak4458.c | 13 +- + sound/soc/codecs/ak4535.c | 10 +- + sound/soc/codecs/ak4613.c | 10 +- + sound/soc/codecs/ak4641.c | 8 +- + sound/soc/codecs/ak4671.c | 8 +- + sound/soc/codecs/alc5623.c | 11 +- + sound/soc/codecs/alc5632.c | 11 +- + sound/soc/codecs/arizona.c | 18 +- + sound/soc/codecs/cpcap.c | 11 +- + sound/soc/codecs/cq93vc.c | 5 +- + sound/soc/codecs/cros_ec_codec.c | 2 + + sound/soc/codecs/cs4265.c | 5 +- + sound/soc/codecs/cs4270.c | 19 +- + sound/soc/codecs/cs42l42.c | 16 +- + sound/soc/codecs/cs42l51.c | 13 +- + sound/soc/codecs/cs42l52.c | 5 +- + sound/soc/codecs/cs42l56.c | 5 +- + sound/soc/codecs/cs42l73.c | 4 +- + sound/soc/codecs/cs42xx8.c | 5 +- + sound/soc/codecs/cs4341.c | 5 +- + sound/soc/codecs/cs4349.c | 5 +- + sound/soc/codecs/cs47l35.c | 10 +- + sound/soc/codecs/cs47l85.c | 10 +- + sound/soc/codecs/da7210.c | 41 +- + sound/soc/codecs/da7213.c | 112 ++- + sound/soc/codecs/da7213.h | 2 + + sound/soc/codecs/da7218.c | 34 +- + sound/soc/codecs/da7219-aad.c | 16 +- + sound/soc/codecs/da7219.c | 22 +- + sound/soc/codecs/da732x.c | 18 +- + sound/soc/codecs/da9055.c | 19 +- + sound/soc/codecs/es8316.c | 7 +- + sound/soc/codecs/es8328.c | 9 +- + sound/soc/codecs/hdmi-codec.c | 25 +- + sound/soc/codecs/inno_rk3036.c | 6 +- + sound/soc/codecs/isabelle.c | 15 +- + sound/soc/codecs/jz4770.c | 6 +- + sound/soc/codecs/lm49453.c | 25 +- + sound/soc/codecs/madera.c | 49 +- + sound/soc/codecs/max98088.c | 24 +- + sound/soc/codecs/max98090.c | 26 +- + sound/soc/codecs/max98095.c | 16 +- + sound/soc/codecs/max98357a.c | 1 + + sound/soc/codecs/max98373-i2c.c | 612 ++++++++++++++ + sound/soc/codecs/max98373-sdw.c | 887 ++++++++++++++++++++ + sound/soc/codecs/max98373-sdw.h | 72 ++ + sound/soc/codecs/max98373.c | 611 +------------- + sound/soc/codecs/max98373.h | 17 +- + sound/soc/codecs/max98390.c | 34 +- + sound/soc/codecs/max9850.c | 2 +- + sound/soc/codecs/max9860.c | 2 +- + sound/soc/codecs/max9867.c | 5 +- + sound/soc/codecs/ml26124.c | 5 +- + sound/soc/codecs/msm8916-wcd-analog.c | 16 +- + sound/soc/codecs/msm8916-wcd-digital.c | 16 +- + sound/soc/codecs/mt6358.c | 23 +- + sound/soc/codecs/nau8822.c | 11 +- + sound/soc/codecs/pcm1681.c | 5 +- + sound/soc/codecs/pcm1789.c | 5 +- + sound/soc/codecs/pcm179x.c | 5 +- + sound/soc/codecs/pcm3168a.c | 5 +- + sound/soc/codecs/pcm512x.c | 5 +- + sound/soc/codecs/rk3328_codec.c | 5 +- + sound/soc/codecs/rl6231.c | 2 + + sound/soc/codecs/rt1011.c | 20 +- + sound/soc/codecs/rt1015.c | 35 +- + sound/soc/codecs/rt1015.h | 5 + + sound/soc/codecs/rt1305.c | 2 +- + sound/soc/codecs/rt274.c | 6 +- + sound/soc/codecs/rt286.c | 2 + + sound/soc/codecs/rt298.c | 4 +- + sound/soc/codecs/rt5616.c | 2 +- + sound/soc/codecs/rt5631.c | 40 +- + sound/soc/codecs/rt5640.c | 14 +- + sound/soc/codecs/rt5645.c | 16 +- + sound/soc/codecs/rt5651.c | 6 +- + sound/soc/codecs/rt5659.c | 51 +- + sound/soc/codecs/rt5660.c | 4 +- + sound/soc/codecs/rt5663.c | 34 +- + sound/soc/codecs/rt5665.c | 16 +- + sound/soc/codecs/rt5668.c | 16 +- + sound/soc/codecs/rt5670.c | 93 +-- + sound/soc/codecs/rt5670.h | 16 +- + sound/soc/codecs/rt5677-spi.c | 2 + + sound/soc/codecs/rt5677.c | 2 +- + sound/soc/codecs/rt5682-i2c.c | 4 +- + sound/soc/codecs/rt5682-sdw.c | 2 +- + sound/soc/codecs/rt5682.c | 93 ++- + sound/soc/codecs/rt5682.h | 4 + + sound/soc/codecs/sgtl5000.c | 21 +- + sound/soc/codecs/ssm2518.c | 5 +- + sound/soc/codecs/ssm2602.c | 5 +- + sound/soc/codecs/ssm4567.c | 5 +- + sound/soc/codecs/sta32x.c | 6 +- + sound/soc/codecs/sta350.c | 2 +- + sound/soc/codecs/sta529.c | 5 +- + sound/soc/codecs/tas2552.c | 11 +- + sound/soc/codecs/tas2562.c | 147 +++- + sound/soc/codecs/tas2562.h | 5 +- + sound/soc/codecs/tas2770.c | 5 +- + sound/soc/codecs/tas571x.c | 5 +- + sound/soc/codecs/tas5720.c | 9 +- + sound/soc/codecs/tas6424.c | 5 +- + sound/soc/codecs/tda7419.c | 9 +- + sound/soc/codecs/tfa9879.c | 5 +- + sound/soc/codecs/tlv320adcx140.c | 62 +- + sound/soc/codecs/tlv320aic23.c | 21 +- + sound/soc/codecs/tlv320aic26.c | 11 +- + sound/soc/codecs/tlv320aic31xx.c | 9 +- + sound/soc/codecs/tlv320aic32x4.c | 21 +- + sound/soc/codecs/tlv320aic3x.c | 19 +- + sound/soc/codecs/tpa6130a2.c | 2 +- + sound/soc/codecs/tscs42xx.c | 4 +- + sound/soc/codecs/tscs454.c | 24 +- + sound/soc/codecs/twl6040.c | 5 +- + sound/soc/codecs/uda134x.c | 5 +- + sound/soc/codecs/wcd-clsh-v2.c | 2 +- + sound/soc/codecs/wcd9335.c | 48 +- + sound/soc/codecs/wcd934x.c | 52 +- + sound/soc/codecs/wm0010.c | 4 +- + sound/soc/codecs/wm2200.c | 4 +- + sound/soc/codecs/wm5100.c | 18 +- + sound/soc/codecs/wm5110.c | 6 +- + sound/soc/codecs/wm8350.c | 37 +- + sound/soc/codecs/wm8400.c | 67 +- + sound/soc/codecs/wm8510.c | 33 +- + sound/soc/codecs/wm8523.c | 6 +- + sound/soc/codecs/wm8580.c | 17 +- + sound/soc/codecs/wm8711.c | 13 +- + sound/soc/codecs/wm8728.c | 15 +- + sound/soc/codecs/wm8731.c | 11 +- + sound/soc/codecs/wm8741.c | 5 +- + sound/soc/codecs/wm8750.c | 13 +- + sound/soc/codecs/wm8753.c | 56 +- + sound/soc/codecs/wm8770.c | 7 +- + sound/soc/codecs/wm8776.c | 7 +- + sound/soc/codecs/wm8804.c | 2 +- + sound/soc/codecs/wm8900.c | 27 +- + sound/soc/codecs/wm8903.c | 27 +- + sound/soc/codecs/wm8904.c | 25 +- + sound/soc/codecs/wm8940.c | 37 +- + sound/soc/codecs/wm8955.c | 9 +- + sound/soc/codecs/wm8958-dsp2.c | 18 +- + sound/soc/codecs/wm8960.c | 49 +- + sound/soc/codecs/wm8961.c | 65 +- + sound/soc/codecs/wm8962.c | 38 +- + sound/soc/codecs/wm8971.c | 13 +- + sound/soc/codecs/wm8974.c | 29 +- + sound/soc/codecs/wm8978.c | 17 +- + sound/soc/codecs/wm8983.c | 15 +- + sound/soc/codecs/wm8985.c | 15 +- + sound/soc/codecs/wm8988.c | 17 +- + sound/soc/codecs/wm8990.c | 23 +- + sound/soc/codecs/wm8991.c | 45 +- + sound/soc/codecs/wm8993.c | 37 +- + sound/soc/codecs/wm8994.c | 77 +- + sound/soc/codecs/wm8995.c | 26 +- + sound/soc/codecs/wm8996.c | 35 +- + sound/soc/codecs/wm8998.c | 8 +- + sound/soc/codecs/wm9081.c | 43 +- + sound/soc/codecs/wm9090.c | 4 +- + sound/soc/codecs/wm9713.c | 4 +- + sound/soc/codecs/wm_adsp.c | 10 +- + sound/soc/codecs/wm_hubs.c | 30 +- + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/fsl-asoc-card.c | 186 ++++- + sound/soc/fsl/fsl_asrc.c | 103 ++- + sound/soc/fsl/fsl_audmix.c | 10 +- + sound/soc/fsl/fsl_easrc.c | 49 +- + sound/soc/fsl/fsl_esai.c | 32 +- + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/fsl/fsl_spdif.c | 223 +++-- + sound/soc/fsl/fsl_ssi.c | 70 +- + sound/soc/fsl/fsl_ssi_dbg.c | 4 +- + sound/soc/fsl/mpc8610_hpcd.c | 2 + + sound/soc/generic/simple-card-utils.c | 7 +- + sound/soc/img/img-i2s-in.c | 4 +- + sound/soc/img/img-parallel-out.c | 4 +- + sound/soc/intel/Kconfig | 7 + + sound/soc/intel/Makefile | 1 + + sound/soc/intel/atom/sst-atom-controls.c | 65 +- + sound/soc/intel/atom/sst/sst_loader.c | 4 + + sound/soc/intel/atom/sst/sst_stream.c | 43 +- + sound/soc/intel/boards/Kconfig | 15 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bdw-rt5650.c | 12 +- + sound/soc/intel/boards/bdw-rt5677.c | 30 +- + sound/soc/intel/boards/broadwell.c | 12 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 117 ++- + sound/soc/intel/boards/bxt_rt298.c | 2 + + sound/soc/intel/boards/bytcht_cx2072x.c | 12 +- + sound/soc/intel/boards/bytcht_da7213.c | 12 +- + sound/soc/intel/boards/bytcht_es8316.c | 17 +- + sound/soc/intel/boards/bytcr_rt5640.c | 16 +- + sound/soc/intel/boards/bytcr_rt5651.c | 16 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 12 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 17 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 30 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 98 +-- + sound/soc/intel/boards/kbl_rt5660.c | 17 +- + sound/soc/intel/boards/sof_maxim_common.c | 55 +- + sound/soc/intel/boards/sof_maxim_common.h | 3 + + sound/soc/intel/boards/sof_rt5682.c | 56 +- + sound/soc/intel/boards/sof_sdw.c | 72 +- + sound/soc/intel/boards/sof_sdw_common.h | 15 + + sound/soc/intel/boards/sof_sdw_max98373.c | 86 ++ + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 13 + + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 13 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 25 + + sound/soc/intel/keembay/Makefile | 4 + + sound/soc/intel/keembay/kmb_platform.c | 654 +++++++++++++++ + sound/soc/intel/keembay/kmb_platform.h | 145 ++++ + sound/soc/mediatek/Kconfig | 12 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 315 ++++++-- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 200 ++++- + sound/soc/meson/Kconfig | 1 + + sound/soc/meson/aiu-encoder-i2s.c | 3 +- + sound/soc/meson/aiu-fifo-i2s.c | 3 +- + sound/soc/meson/aiu-fifo.c | 3 +- + sound/soc/meson/axg-spdifout.c | 5 +- + sound/soc/pxa/mioa701_wm9713.c | 8 +- + sound/soc/pxa/pxa-ssp.c | 2 +- + sound/soc/qcom/Kconfig | 4 +- + sound/soc/qcom/qdsp6/q6adm.c | 7 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 27 +- + sound/soc/qcom/qdsp6/q6asm.c | 6 +- + sound/soc/rockchip/rockchip_spdif.c | 59 +- + sound/soc/samsung/Kconfig | 15 +- + sound/soc/samsung/Makefile | 2 + + sound/soc/samsung/aries_wm8994.c | 695 ++++++++++++++++ + sound/soc/samsung/pcm.c | 5 + + sound/soc/samsung/spdif.c | 6 +- + sound/soc/sh/fsi.c | 4 +- + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/sh/rcar/rsnd.h | 2 +- + sound/soc/sh/rcar/ssi.c | 28 +- + sound/soc/sh/rcar/ssiu.c | 6 +- + sound/soc/sh/siu_pcm.c | 6 +- + sound/soc/sh/ssi.c | 2 +- + sound/soc/soc-ac97.c | 9 +- + sound/soc/soc-component.c | 676 +++++++++++----- + sound/soc/soc-compress.c | 4 +- + sound/soc/soc-core.c | 113 +-- + sound/soc/soc-dai.c | 8 +- + sound/soc/soc-dapm.c | 31 +- + sound/soc/soc-io.c | 202 ----- + sound/soc/soc-link.c | 6 + + sound/soc/soc-ops.c | 43 +- + sound/soc/soc-pcm.c | 128 +-- + sound/soc/soc-topology.c | 73 +- + sound/soc/soc-utils.c | 3 +- + sound/soc/sof/nocodec.c | 1 + + sound/soc/sof/sof-acpi-dev.c | 8 +- + sound/soc/spear/spdif_out.c | 8 +- + sound/soc/sti/uniperif.h | 2 +- + sound/soc/sunxi/sun4i-i2s.c | 10 +- + sound/soc/sunxi/sun4i-spdif.c | 2 +- + sound/soc/tegra/tegra20_das.c | 3 +- + sound/soc/tegra/tegra30_ahub.c | 4 +- + sound/soc/tegra/tegra30_i2s.c | 4 +- + sound/soc/ti/Kconfig | 8 + + sound/soc/ti/Makefile | 2 + + sound/soc/ti/ams-delta.c | 9 +- + sound/soc/ti/davinci-mcasp.c | 3 + + sound/soc/ti/j721e-evm.c | 896 +++++++++++++++++++++ + sound/soc/ti/omap-mcbsp-st.c | 3 - + sound/soc/uniphier/aio-core.c | 7 +- + sound/soc/ux500/ux500_msp_i2s.c | 8 +- + 338 files changed, 9321 insertions(+), 3688 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/ak4613.txt + create mode 100644 Documentation/devicetree/bindings/sound/ak4613.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ak4642.txt + create mode 100644 Documentation/devicetree/bindings/sound/ak4642.yaml + create mode 100644 Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98390.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.yaml + create mode 100644 Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml + create mode 100644 Documentation/devicetree/bindings/sound/socionext,uniphier-aio.yaml + create mode 100644 Documentation/devicetree/bindings/sound/socionext,uniphier-evea.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/uniphier,aio.txt + delete mode 100644 Documentation/devicetree/bindings/sound/uniphier,evea.txt + delete mode 100644 include/sound/rt5670.h + create mode 100644 sound/soc/codecs/max98373-i2c.c + create mode 100644 sound/soc/codecs/max98373-sdw.c + create mode 100644 sound/soc/codecs/max98373-sdw.h + create mode 100644 sound/soc/intel/boards/sof_sdw_max98373.c + create mode 100644 sound/soc/intel/keembay/Makefile + create mode 100644 sound/soc/intel/keembay/kmb_platform.c + create mode 100644 sound/soc/intel/keembay/kmb_platform.h + create mode 100644 sound/soc/samsung/aries_wm8994.c + delete mode 100644 sound/soc/soc-io.c + create mode 100644 sound/soc/ti/j721e-evm.c +Merging modules/modules-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge modules/modules-next +Already up to date. +Merging input/next (606e70220784 Input: mt - cleanup open-coded __set_bit()) +$ git merge input/next +Auto-merging drivers/input/touchscreen/elants_i2c.c +Merge made by the 'recursive' strategy. + drivers/input/input-mt.c | 2 +- + drivers/input/joystick/db9.c | 10 +++++----- + drivers/input/joystick/gamecon.c | 10 ++++++---- + drivers/input/joystick/sidewinder.c | 15 ++++++++++----- + drivers/input/joystick/spaceball.c | 8 ++++---- + drivers/input/keyboard/adp5589-keys.c | 2 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 1 - + drivers/input/misc/cm109.c | 8 ++------ + drivers/input/misc/iqs269a.c | 21 +++++++-------------- + drivers/input/misc/pwm-vibra.c | 2 +- + drivers/input/misc/xen-kbdfront.c | 4 ++-- + drivers/input/mouse/appletouch.c | 2 +- + drivers/input/mouse/cyapa_gen3.c | 4 ++-- + drivers/input/mouse/cyapa_gen5.c | 2 +- + drivers/input/mouse/cyapa_gen6.c | 2 +- + drivers/input/mouse/elantech.c | 12 +++++------- + drivers/input/mouse/hgpk.c | 4 ++-- + drivers/input/mouse/navpoint.c | 2 +- + drivers/input/mouse/sentelic.c | 2 +- + drivers/input/mouse/sermouse.c | 4 ++-- + drivers/input/serio/i8042.c | 2 +- + drivers/input/serio/libps2.c | 2 +- + drivers/input/sparse-keymap.c | 2 +- + drivers/input/tablet/gtco.c | 6 +++--- + drivers/input/tablet/pegasus_notetaker.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 3 +-- + drivers/input/touchscreen/elants_i2c.c | 2 +- + drivers/input/touchscreen/elo.c | 2 +- + drivers/input/touchscreen/exc3000.c | 5 ++--- + drivers/input/touchscreen/iqs5xx.c | 2 +- + drivers/input/touchscreen/max11801_ts.c | 1 - + drivers/input/touchscreen/stmfts.c | 2 +- + 33 files changed, 70 insertions(+), 80 deletions(-) +Merging block/for-next (656707e1d0fc Merge branch 'for-5.9/io_uring' into for-next) +$ git merge block/for-next +Auto-merging mm/swapfile.c +Auto-merging mm/page_io.c +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/buffer.c +CONFLICT (content): Merge conflict in fs/buffer.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/disk-io.c +CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c +Auto-merging drivers/md/dm-writecache.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/block/rsxx/core.c +Removing block/blk-softirq.c +Auto-merging Documentation/trace/ftrace.rst +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/block/biodoc.rst +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'fs/btrfs/disk-io.c' using previous resolution. +Resolved 'fs/buffer.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b3914ede233d] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block | 18 + + Documentation/admin-guide/cgroup-v2.rst | 3 +- + Documentation/block/biodoc.rst | 2 +- + Documentation/block/queue-sysfs.rst | 14 + + Documentation/block/writeback_cache_control.rst | 2 +- + Documentation/cdrom/cdrom-standard.rst | 18 +- + Documentation/fault-injection/fault-injection.rst | 2 +- + Documentation/filesystems/locking.rst | 4 +- + Documentation/trace/ftrace.rst | 4 +- + arch/m68k/emu/nfblock.c | 8 +- + arch/xtensa/platforms/iss/simdisk.c | 11 +- + block/Kconfig | 5 +- + block/Makefile | 2 +- + block/bio.c | 161 +- + block/blk-cgroup.c | 402 ++-- + block/blk-core.c | 290 +-- + block/blk-crypto-fallback.c | 2 +- + block/blk-crypto.c | 2 +- + block/blk-flush.c | 23 +- + block/blk-ioc.c | 42 +- + block/blk-iocost.c | 3 +- + block/blk-iolatency.c | 3 +- + block/blk-lib.c | 31 +- + block/blk-merge.c | 25 +- + block/blk-mq-debugfs.c | 8 +- + block/blk-mq-sched.c | 101 +- + block/blk-mq-tag.c | 62 +- + block/blk-mq-tag.h | 41 +- + block/blk-mq.c | 390 ++-- + block/blk-mq.h | 17 +- + block/blk-softirq.c | 156 -- + block/blk-sysfs.c | 79 +- + block/blk-throttle.c | 14 +- + block/blk-timeout.c | 28 +- + block/blk-zoned.c | 1 + + block/blk.h | 37 +- + block/bounce.c | 2 +- + block/bsg-lib.c | 5 +- + block/genhd.c | 85 +- + block/partitions/core.c | 2 - + drivers/block/brd.c | 5 +- + drivers/block/drbd/drbd_int.h | 8 +- + drivers/block/drbd/drbd_main.c | 71 +- + drivers/block/drbd/drbd_proc.c | 1 - + drivers/block/drbd/drbd_receiver.c | 2 +- + drivers/block/drbd/drbd_req.c | 8 +- + drivers/block/drbd/drbd_worker.c | 2 +- + drivers/block/floppy.c | 7 +- + drivers/block/loop.c | 17 +- + drivers/block/mtip32xx/mtip32xx.c | 3 +- + drivers/block/nbd.c | 5 +- + drivers/block/null_blk.h | 1 + + drivers/block/null_blk_main.c | 34 +- + drivers/block/null_blk_zoned.c | 16 +- + drivers/block/pktcdvd.c | 15 +- + drivers/block/ps3vram.c | 20 +- + drivers/block/rsxx/core.c | 30 +- + drivers/block/rsxx/dev.c | 14 +- + drivers/block/skd_main.c | 9 +- + drivers/block/umem.c | 11 +- + drivers/block/virtio_blk.c | 3 +- + drivers/block/xen-blkfront.c | 3 +- + drivers/block/zram/zram_drv.c | 14 +- + drivers/cdrom/cdrom.c | 28 +- + drivers/dax/super.c | 2 +- + drivers/lightnvm/core.c | 8 +- + drivers/lightnvm/pblk-init.c | 16 +- + drivers/lightnvm/pblk-read.c | 2 +- + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/btree.c | 2 +- + drivers/md/bcache/request.c | 58 +- + drivers/md/bcache/request.h | 4 +- + drivers/md/bcache/super.c | 25 +- + drivers/md/dm-cache-target.c | 25 +- + drivers/md/dm-clone-target.c | 25 +- + drivers/md/dm-crypt.c | 6 +- + drivers/md/dm-delay.c | 2 +- + drivers/md/dm-era-target.c | 17 +- + drivers/md/dm-integrity.c | 4 +- + drivers/md/dm-mpath.c | 2 +- + drivers/md/dm-raid.c | 12 - + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-rq.c | 3 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-snap.c | 6 +- + drivers/md/dm-table.c | 37 +- + drivers/md/dm-thin.c | 20 +- + drivers/md/dm-verity-target.c | 2 +- + drivers/md/dm-writecache.c | 2 +- + drivers/md/dm-zoned-target.c | 2 +- + drivers/md/dm.c | 75 +- + drivers/md/dm.h | 1 - + drivers/md/md-bitmap.c | 2 +- + drivers/md/md-cluster.c | 1 + + drivers/md/md-faulty.c | 4 +- + drivers/md/md-linear.c | 28 +- + drivers/md/md-multipath.c | 27 +- + drivers/md/md.c | 159 +- + drivers/md/md.h | 13 +- + drivers/md/raid0.c | 24 +- + drivers/md/raid1.c | 45 +- + drivers/md/raid10.c | 56 +- + drivers/md/raid5-cache.c | 7 + + drivers/md/raid5.c | 41 +- + drivers/mmc/core/block.c | 11 +- + drivers/nvdimm/blk.c | 5 +- + drivers/nvdimm/btt.c | 5 +- + drivers/nvdimm/pmem.c | 5 +- + drivers/nvme/host/Makefile | 1 + + drivers/nvme/host/core.c | 304 ++- + drivers/nvme/host/fc.c | 4 +- + drivers/nvme/host/hwmon.c | 2 +- + drivers/nvme/host/lightnvm.c | 4 +- + drivers/nvme/host/multipath.c | 20 +- + drivers/nvme/host/nvme.h | 57 +- + drivers/nvme/host/pci.c | 62 +- + drivers/nvme/host/rdma.c | 35 +- + drivers/nvme/host/tcp.c | 79 +- + drivers/nvme/host/zns.c | 256 +++ + drivers/nvme/target/admin-cmd.c | 2 +- + drivers/nvme/target/configfs.c | 16 +- + drivers/nvme/target/core.c | 4 +- + drivers/nvme/target/discovery.c | 2 +- + drivers/nvme/target/fcloop.c | 29 +- + drivers/nvme/target/loop.c | 4 +- + drivers/nvme/target/nvmet.h | 5 +- + drivers/nvme/target/rdma.c | 3 +- + drivers/nvme/target/tcp.c | 13 +- + drivers/s390/block/dasd.c | 2 +- + drivers/s390/block/dasd_diag.c | 33 +- + drivers/s390/block/dcssblk.c | 12 +- + drivers/s390/block/scm_blk.c | 3 +- + drivers/s390/block/xpram.c | 8 +- + drivers/scsi/scsi_lib.c | 20 +- + drivers/scsi/sd_zbc.c | 6 + + drivers/tty/sysrq.c | 2 - + fs/adfs/super.c | 1 + + fs/affs/file.c | 1 + + fs/befs/linuxvfs.c | 1 + + fs/block_dev.c | 317 +-- + fs/btrfs/disk-io.c | 23 - + fs/btrfs/file.c | 2 +- + fs/buffer.c | 4 - + fs/direct-io.c | 4 +- + fs/efs/super.c | 1 + + fs/hfs/inode.c | 1 + + fs/internal.h | 17 +- + fs/io-wq.c | 9 +- + fs/io-wq.h | 11 +- + fs/io_uring.c | 2304 ++++++++++++--------- + fs/isofs/inode.c | 3 - + fs/jfs/jfs_mount.c | 1 + + fs/jfs/resize.c | 1 + + fs/ntfs/dir.c | 1 + + fs/proc/devices.c | 1 + + fs/quota/dquot.c | 1 + + fs/reiserfs/procfs.c | 1 + + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_pwork.c | 2 +- + include/linux/backing-dev-defs.h | 43 +- + include/linux/backing-dev.h | 22 +- + include/linux/bio.h | 12 - + include/linux/blk-cgroup.h | 107 +- + include/linux/blk-mq.h | 21 +- + include/linux/blk_types.h | 37 +- + include/linux/blkdev.h | 216 +- + include/linux/buffer_head.h | 1 + + include/linux/cdrom.h | 2 - + include/linux/dasd_mod.h | 2 + + include/linux/device-mapper.h | 11 - + include/linux/fs.h | 179 +- + include/linux/genhd.h | 40 +- + include/linux/jbd2.h | 1 + + include/linux/lightnvm.h | 3 +- + include/linux/nvme.h | 134 +- + include/linux/pagemap.h | 75 + + include/linux/sched/task.h | 6 + + include/trace/events/block.h | 15 + + include/uapi/linux/blkzoned.h | 15 +- + include/uapi/linux/io_uring.h | 4 +- + kernel/cgroup/rstat.c | 1 - + kernel/trace/blktrace.c | 86 +- + lib/sbitmap.c | 3 + + mm/backing-dev.c | 157 +- + mm/filemap.c | 107 +- + mm/page_io.c | 17 + + mm/swapfile.c | 2 +- + security/loadpin/loadpin.c | 1 + + tools/io_uring/liburing.h | 6 +- + 189 files changed, 4421 insertions(+), 3831 deletions(-) + delete mode 100644 block/blk-softirq.c + create mode 100644 drivers/nvme/host/zns.c +Merging device-mapper/for-next (02622abba2da dm crypt: Enable zoned block device support) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-verity-target.c +Auto-merging drivers/md/dm-rq.c +Auto-merging drivers/md/dm-mpath.c +Auto-merging drivers/md/dm-crypt.c +CONFLICT (content): Merge conflict in drivers/md/dm-crypt.c +Resolved 'drivers/md/dm-crypt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a72fd737bc0a] Merge remote-tracking branch 'device-mapper/for-next' +$ git diff -M --stat --summary HEAD^.. + .../admin-guide/device-mapper/dm-dust.rst | 32 ++++- + Documentation/admin-guide/device-mapper/verity.rst | 4 + + drivers/md/dm-bufio.c | 60 ++++++--- + drivers/md/dm-crypt.c | 129 ++++++++++++++++-- + drivers/md/dm-dust.c | 58 ++++++-- + drivers/md/dm-mpath.c | 146 ++++++++++++++------- + drivers/md/dm-rq.c | 3 - + drivers/md/dm-verity-target.c | 13 +- + drivers/md/dm-verity.h | 3 +- + 9 files changed, 343 insertions(+), 105 deletions(-) +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (c624b49a40ae Merge branch 'fixes' into next) +$ git merge mmc/next +Removing Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt +Removing Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt +Removing Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/mmc-controller.yaml | 5 + + .../devicetree/bindings/mmc/mmc-pwrseq-emmc.txt | 25 --- + .../devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml | 46 ++++ + .../devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt | 16 -- + .../devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml | 39 ++++ + .../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 31 --- + .../devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 62 ++++++ + .../devicetree/bindings/mmc/sdhci-am654.txt | 1 + + .../devicetree/bindings/mmc/sdhci-msm.txt | 18 ++ + arch/arm/mach-omap2/mmc.h | 4 - + drivers/mmc/core/core.c | 11 +- + drivers/mmc/core/host.c | 6 + + drivers/mmc/core/mmc.c | 3 +- + drivers/mmc/core/queue.c | 2 +- + drivers/mmc/core/quirks.h | 6 +- + drivers/mmc/core/regulator.c | 2 + + drivers/mmc/core/sdio.c | 64 ++++-- + drivers/mmc/core/sdio_io.c | 3 +- + drivers/mmc/host/atmel-mci.c | 4 +- + drivers/mmc/host/cqhci.c | 2 +- + drivers/mmc/host/dw_mmc-exynos.c | 4 +- + drivers/mmc/host/mmci.c | 2 + + drivers/mmc/host/mtk-sd.c | 3 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 28 ++- + drivers/mmc/host/rtsx_pci_sdmmc.c | 4 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 5 +- + drivers/mmc/host/sdhci-acpi.c | 1 + + drivers/mmc/host/sdhci-esdhc-imx.c | 39 ++++ + drivers/mmc/host/sdhci-iproc.c | 2 + + drivers/mmc/host/sdhci-msm.c | 235 +++++++++++++++++++-- + drivers/mmc/host/sdhci-of-arasan.c | 7 +- + drivers/mmc/host/sdhci-s3c.c | 4 + + drivers/mmc/host/sdhci-tegra.c | 9 + + drivers/mmc/host/sdhci.c | 22 +- + drivers/mmc/host/sdhci.h | 1 + + drivers/mmc/host/sdhci_am654.c | 86 ++++++-- + drivers/mmc/host/sh_mmcif.c | 6 +- + drivers/mmc/host/tmio_mmc.h | 3 + + drivers/mmc/host/tmio_mmc_core.c | 8 + + drivers/net/wireless/rsi/rsi_91x_sdio.c | 8 +- + drivers/net/wireless/rsi/rsi_sdio.h | 4 - + include/linux/mmc/host.h | 2 + + include/linux/mmc/sdio_ids.h | 4 + + include/linux/platform_data/mmc-omap.h | 3 + + 44 files changed, 662 insertions(+), 178 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml +Merging mfd/for-mfd-next (c61f4d58eefc mfd: kempld-core: Fix 'assignment of read-only location' error) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/smsc.h +Auto-merging drivers/thermal/Makefile +Auto-merging drivers/thermal/Kconfig +Removing drivers/mfd/smsc-ece1099.c +Auto-merging MAINTAINERS +Removing Documentation/driver-api/smsc_ece1099.rst +Auto-merging Documentation/driver-api/index.rst +Removing Documentation/devicetree/bindings/pinctrl/pinctrl-stmfx.txt +Removing Documentation/devicetree/bindings/mfd/stmfx.txt +Removing Documentation/devicetree/bindings/mfd/cros-ec.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/cros-ec.txt | 76 ------ + .../devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 129 ++++++++++ + .../devicetree/bindings/mfd/khadas,mcu.yaml | 44 ++++ + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 5 + + .../devicetree/bindings/mfd/st,stmfx.yaml | 122 ++++++++++ + Documentation/devicetree/bindings/mfd/stmfx.txt | 28 --- + .../devicetree/bindings/pinctrl/pinctrl-stmfx.txt | 116 --------- + Documentation/driver-api/index.rst | 1 - + Documentation/driver-api/smsc_ece1099.rst | 60 ----- + MAINTAINERS | 41 ++++ + drivers/clocksource/Kconfig | 4 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-stm32-lp.c | 221 +++++++++++++++++ + drivers/mfd/Kconfig | 33 ++- + drivers/mfd/Makefile | 2 +- + drivers/mfd/ab3100-core.c | 2 +- + drivers/mfd/ab3100-otp.c | 20 +- + drivers/mfd/ab8500-debugfs.c | 2 +- + drivers/mfd/altera-sysmgr.c | 19 +- + drivers/mfd/arizona-core.c | 20 +- + drivers/mfd/atmel-smc.c | 4 +- + drivers/mfd/axp20x-i2c.c | 4 + + drivers/mfd/cros_ec_dev.c | 4 +- + drivers/mfd/da9063-core.c | 31 --- + drivers/mfd/da9063-i2c.c | 271 +++++++++++++++++++-- + drivers/mfd/db8500-prcmu.c | 6 +- + drivers/mfd/intel-lpss-pci.c | 19 ++ + drivers/mfd/kempld-core.c | 30 +-- + drivers/mfd/khadas-mcu.c | 142 +++++++++++ + drivers/mfd/lm3533-ctrlbank.c | 94 ++++--- + drivers/mfd/madera-core.c | 12 +- + drivers/mfd/madera-i2c.c | 1 - + drivers/mfd/mfd-core.c | 113 ++++++++- + drivers/mfd/motorola-cpcap.c | 23 ++ + drivers/mfd/omap-usb-host.c | 4 +- + drivers/mfd/omap-usb-tll.c | 2 + + drivers/mfd/rave-sp.c | 2 +- + drivers/mfd/si476x-cmd.c | 74 +++--- + drivers/mfd/si476x-i2c.c | 7 +- + drivers/mfd/smsc-ece1099.c | 87 ------- + drivers/mfd/sprd-sc27xx-spi.c | 82 +------ + drivers/mfd/stm32-lptimer.c | 1 + + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/tps65010.c | 5 +- + drivers/mfd/tps65217.c | 4 +- + drivers/mfd/tps65218.c | 4 +- + drivers/mfd/tps6586x.c | 7 +- + drivers/mfd/twl4030-irq.c | 4 +- + drivers/mfd/wm831x-core.c | 4 + + drivers/mfd/wm8350-core.c | 4 + + drivers/mfd/wm8400-core.c | 2 + + drivers/thermal/Kconfig | 11 + + drivers/thermal/Makefile | 1 + + drivers/thermal/khadas_mcu_fan.c | 162 ++++++++++++ + include/linux/mfd/core.h | 37 ++- + include/linux/mfd/da9063/core.h | 1 + + include/linux/mfd/da9063/registers.h | 15 +- + include/linux/mfd/khadas-mcu.h | 91 +++++++ + include/linux/mfd/madera/pdata.h | 1 - + include/linux/mfd/smsc.h | 104 -------- + include/linux/mfd/stm32-lptimer.h | 5 + + 62 files changed, 1631 insertions(+), 797 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/cros-ec.txt + create mode 100644 Documentation/devicetree/bindings/mfd/google,cros-ec.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/khadas,mcu.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/st,stmfx.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/stmfx.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-stmfx.txt + delete mode 100644 Documentation/driver-api/smsc_ece1099.rst + create mode 100644 drivers/clocksource/timer-stm32-lp.c + create mode 100644 drivers/mfd/khadas-mcu.c + delete mode 100644 drivers/mfd/smsc-ece1099.c + create mode 100644 drivers/thermal/khadas_mcu_fan.c + create mode 100644 include/linux/mfd/khadas-mcu.h + delete mode 100644 include/linux/mfd/smsc.h +Merging backlight/for-backlight-next (c847e429db9d video: backlight: sky81452-backlight: Fix some kerneldoc issues) +$ git merge backlight/for-backlight-next +Removing include/linux/platform_data/sky81452-backlight.h +Removing drivers/video/backlight/ot200_bl.c +Merge made by the 'recursive' strategy. + drivers/mfd/sky81452.c | 2 - + drivers/video/backlight/Kconfig | 7 - + drivers/video/backlight/Makefile | 1 - + drivers/video/backlight/backlight.c | 2 + + drivers/video/backlight/ili922x.c | 8 +- + drivers/video/backlight/lcd.c | 1 + + drivers/video/backlight/lm3533_bl.c | 2 +- + drivers/video/backlight/lm3630a_bl.c | 4 +- + drivers/video/backlight/lms501kf03.c | 9 -- + drivers/video/backlight/ot200_bl.c | 162 ----------------------- + drivers/video/backlight/qcom-wled.c | 8 -- + drivers/video/backlight/sky81452-backlight.c | 52 +++++--- + include/linux/mfd/sky81452.h | 2 - + include/linux/platform_data/sky81452-backlight.h | 35 ----- + 14 files changed, 43 insertions(+), 252 deletions(-) + delete mode 100644 drivers/video/backlight/ot200_bl.c + delete mode 100644 include/linux/platform_data/sky81452-backlight.h +Merging battery/for-next (5d809cb28056 power: supply: max8998_charger: Correct ONLINE and add STATUS props) +$ git merge battery/for-next +Removing Documentation/devicetree/bindings/power/supply/gpio-charger.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/bq25890.txt | 30 ++++---- + .../bindings/power/supply/gpio-charger.txt | 31 -------- + .../bindings/power/supply/gpio-charger.yaml | 63 +++++++++++++++ + drivers/power/supply/axp20x_usb_power.c | 2 +- + drivers/power/supply/bq24190_charger.c | 4 +- + drivers/power/supply/gpio-charger.c | 38 +++++---- + drivers/power/supply/max8998_charger.c | 25 +++++- + drivers/power/supply/power_supply_sysfs.c | 2 +- + drivers/power/supply/sbs-battery.c | 89 +++++++++++++++++++++- + 9 files changed, 219 insertions(+), 65 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.yaml +Merging regulator/for-next (f8369b5d78de Merge remote-tracking branch 'regulator/for-5.9' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/da9211.txt | 4 + + .../regulator/google,cros-ec-regulator.yaml | 51 ++ + .../bindings/regulator/mt6397-regulator.txt | 3 + + .../bindings/regulator/nxp,pca9450-regulator.yaml | 190 +++++ + .../bindings/regulator/onnn,fan53880.yaml | 85 +++ + .../bindings/regulator/qcom,smd-rpm-regulator.txt | 1 + + .../regulator/qcom,usb-vbus-regulator.yaml | 41 + + .../bindings/regulator/qcom-labibb-regulator.yaml | 70 ++ + .../bindings/regulator/silergy,sy8827n.yaml | 45 ++ + drivers/platform/chrome/cros_ec_trace.c | 5 + + drivers/regulator/Kconfig | 55 ++ + drivers/regulator/Makefile | 6 + + drivers/regulator/ab8500.c | 7 +- + drivers/regulator/anatop-regulator.c | 2 +- + drivers/regulator/core.c | 63 +- + drivers/regulator/cpcap-regulator.c | 18 +- + drivers/regulator/cros-ec-regulator.c | 257 +++++++ + drivers/regulator/da9211-regulator.c | 30 +- + drivers/regulator/dbx500-prcmu.c | 8 - + drivers/regulator/devres.c | 54 +- + drivers/regulator/fan53880.c | 184 +++++ + drivers/regulator/fixed.c | 2 +- + drivers/regulator/gpio-regulator.c | 2 +- + drivers/regulator/lp87565-regulator.c | 21 +- + drivers/regulator/ltc3676.c | 2 +- + drivers/regulator/max14577-regulator.c | 2 +- + drivers/regulator/max8907-regulator.c | 6 +- + drivers/regulator/max8997-regulator.c | 14 +- + drivers/regulator/max8998.c | 2 +- + drivers/regulator/mp886x.c | 5 +- + drivers/regulator/mt6397-regulator.c | 17 +- + drivers/regulator/of_regulator.c | 2 +- + drivers/regulator/pca9450-regulator.c | 843 +++++++++++++++++++++ + drivers/regulator/pfuze100-regulator.c | 9 +- + drivers/regulator/pwm-regulator.c | 2 +- + drivers/regulator/qcom-labibb-regulator.c | 175 +++++ + drivers/regulator/qcom-rpmh-regulator.c | 14 +- + drivers/regulator/qcom_rpm-regulator.c | 6 +- + drivers/regulator/qcom_smd-regulator.c | 43 +- + drivers/regulator/qcom_spmi-regulator.c | 24 +- + drivers/regulator/qcom_usb_vbus-regulator.c | 97 +++ + drivers/regulator/stpmic1_regulator.c | 2 +- + drivers/regulator/sy8827n.c | 185 +++++ + drivers/regulator/tps65217-regulator.c | 7 +- + drivers/regulator/tps65218-regulator.c | 4 +- + drivers/regulator/wm8350-regulator.c | 10 +- + drivers/regulator/wm8400-regulator.c | 6 +- + .../dt-bindings/regulator/dlg,da9211-regulator.h | 16 + + .../regulator/mediatek,mt6397-regulator.h | 15 + + include/linux/platform_data/cros_ec_commands.h | 82 ++ + include/linux/regulator/consumer.h | 10 + + include/linux/regulator/driver.h | 7 +- + include/linux/regulator/machine.h | 1 + + include/linux/regulator/pca9450.h | 219 ++++++ + 54 files changed, 2901 insertions(+), 130 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/onnn,fan53880.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/silergy,sy8827n.yaml + create mode 100644 drivers/regulator/cros-ec-regulator.c + create mode 100644 drivers/regulator/fan53880.c + create mode 100644 drivers/regulator/pca9450-regulator.c + create mode 100644 drivers/regulator/qcom-labibb-regulator.c + create mode 100644 drivers/regulator/qcom_usb_vbus-regulator.c + create mode 100644 drivers/regulator/sy8827n.c + create mode 100644 include/dt-bindings/regulator/dlg,da9211-regulator.h + create mode 100644 include/dt-bindings/regulator/mediatek,mt6397-regulator.h + create mode 100644 include/linux/regulator/pca9450.h +Merging security/next-testing (8ca4a830cefa Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Auto-merging security/selinux/include/classmap.h +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/keys/encrypted-keys/encrypted.c +Auto-merging security/integrity/ima/ima_template_lib.c +Auto-merging security/integrity/ima/ima_template.c +Auto-merging security/apparmor/Kconfig +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging fs/userfaultfd.c +Merge made by the 'recursive' strategy. + fs/anon_inodes.c | 191 ++++++++++++++++++----- + fs/userfaultfd.c | 30 +++- + include/linux/anon_inodes.h | 13 ++ + include/linux/lsm_hook_defs.h | 2 + + include/linux/lsm_hooks.h | 7 + + include/linux/security.h | 3 + + security/Kconfig | 2 +- + security/apparmor/Kconfig | 2 +- + security/integrity/ima/Kconfig | 2 +- + security/integrity/ima/ima_template.c | 2 +- + security/integrity/ima/ima_template_lib.c | 2 +- + security/integrity/ima/ima_template_lib.h | 2 +- + security/keys/encrypted-keys/ecryptfs_format.c | 2 +- + security/keys/encrypted-keys/ecryptfs_format.h | 2 +- + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/security.c | 9 ++ + security/selinux/hooks.c | 53 +++++++ + security/selinux/include/classmap.h | 2 + + 19 files changed, 275 insertions(+), 55 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-Add-a-new-LSM-supporting-anonymous-inode-.patch +Applying: fix up for "Add a new LSM-supporting anonymous inode interface" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/anon_inodes.c +M include/linux/security.h +$ git add -A . +$ git commit -v -a --amend +[master 23e63d49a91f] Merge remote-tracking branch 'security/next-testing' + Date: Mon Jul 20 12:47:28 2020 +1000 +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 (34e980bb83a0 IMA: Add audit log for failure conditions) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + security/integrity/ima/ima.h | 48 ++++++++++++++++++++++----------- + security/integrity/ima/ima_main.c | 18 +++++++++---- + security/integrity/ima/ima_policy.c | 2 +- + security/integrity/ima/ima_queue_keys.c | 5 ++++ + security/integrity/integrity.h | 13 +++++++++ + security/integrity/integrity_audit.c | 11 +++++++- + 6 files changed, 74 insertions(+), 23 deletions(-) +Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) +$ git merge keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (4d63f7c2e382 security: Add LSM hooks to set*gid syscalls) +$ git merge safesetid/safesetid-next +Auto-merging security/security.c +Auto-merging kernel/sys.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Merge made by the 'recursive' strategy. +Merging selinux/next (54b27f9287a7 selinux: complete the inlining of hashtab functions) +$ git merge selinux/next +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/ss/conditional.c +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + scripts/selinux/mdp/mdp.c | 23 ++++-- + security/selinux/hooks.c | 7 +- + security/selinux/netif.c | 2 +- + security/selinux/netnode.c | 2 +- + security/selinux/netport.c | 2 +- + security/selinux/ss/conditional.c | 8 +-- + security/selinux/ss/conditional.h | 2 +- + security/selinux/ss/hashtab.c | 59 ++------------- + security/selinux/ss/hashtab.h | 77 ++++++++++++++++---- + security/selinux/ss/mls.c | 23 +++--- + security/selinux/ss/policydb.c | 148 ++++++++++++++++++++++++-------------- + security/selinux/ss/policydb.h | 9 +++ + security/selinux/ss/services.c | 38 +++++----- + security/selinux/ss/symtab.c | 21 ++++-- + security/selinux/ss/symtab.h | 3 + + 15 files changed, 258 insertions(+), 166 deletions(-) +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 (ba47d845d715 Linux 5.8-rc6) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (786a2aa281f4 Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102")) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (92188b41f139 Merge tag 'perf-tools-fixes-2020-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into master) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (8da45cf05a9f Merge branches 'iommu/fixes', 'arm/renesas', 'arm/qcom', 'arm/mediatek', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/Kconfig +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +Auto-merging arch/powerpc/include/asm/device.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/mediatek,iommu.txt | 2 + + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + + .../memory-controllers/mediatek,smi-common.txt | 5 +- + .../memory-controllers/mediatek,smi-larb.txt | 3 +- + MAINTAINERS | 1 + + arch/arm/include/asm/device.h | 3 - + arch/arm64/include/asm/device.h | 3 - + arch/ia64/include/asm/device.h | 3 - + arch/powerpc/include/asm/device.h | 3 - + arch/x86/include/asm/device.h | 3 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 10 +- + drivers/iommu/Kconfig | 14 +- + drivers/iommu/amd/init.c | 2 +- + drivers/iommu/amd/iommu.c | 31 ++-- + drivers/iommu/exynos-iommu.c | 20 +- + drivers/iommu/fsl_pamu.c | 5 +- + drivers/iommu/fsl_pamu_domain.c | 8 +- + drivers/iommu/intel/iommu.c | 18 +- + drivers/iommu/iommu.c | 23 ++- + drivers/iommu/iova.c | 4 +- + drivers/iommu/ipmmu-vmsa.c | 6 +- + drivers/iommu/msm_iommu.c | 4 +- + drivers/iommu/mtk_iommu.c | 110 +++++++---- + drivers/iommu/mtk_iommu.h | 23 ++- + drivers/iommu/mtk_iommu_v1.c | 10 +- + drivers/iommu/omap-iommu.c | 22 +-- + drivers/iommu/qcom_iommu.c | 64 +++---- + drivers/iommu/rockchip-iommu.c | 8 +- + drivers/iommu/tegra-gart.c | 8 +- + drivers/iommu/tegra-smmu.c | 8 +- + drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 4 +- + drivers/memory/mtk-smi.c | 22 +++ + include/dt-bindings/memory/mt6779-larb-port.h | 206 +++++++++++++++++++++ + include/linux/iommu.h | 32 ++-- + include/uapi/linux/iommu.h | 6 +- + 35 files changed, 491 insertions(+), 204 deletions(-) + create mode 100644 include/dt-bindings/memory/mt6779-larb-port.h +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 (d7481b24b816 audit: issue CWD record to accompany LSM_AUDIT_DATA_* records) +$ git merge audit/next +Auto-merging net/netfilter/x_tables.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/bridge/netfilter/ebtables.c +Auto-merging kernel/audit_tree.c +Merge made by the 'recursive' strategy. + include/linux/audit.h | 41 ++++++++++----- + kernel/audit_tree.c | 4 +- + kernel/auditsc.c | 45 +++++++++++++--- + net/bridge/netfilter/ebtables.c | 6 +-- + net/netfilter/nf_tables_api.c | 112 ++++++++++++++++++++++++++++++++++++++++ + net/netfilter/x_tables.c | 5 +- + security/lsm_audit.c | 5 ++ + 7 files changed, 191 insertions(+), 27 deletions(-) +Merging devicetree/for-next (c46ed28dbe95 dt-bindings: pwm: samsung: Do not require interrupts on Exynos SoCs) +$ git merge devicetree/for-next +Auto-merging include/linux/device.h +Auto-merging drivers/of/property.c +Auto-merging drivers/base/core.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/timer/mrvl,mmp-timer.txt +Removing Documentation/devicetree/bindings/thermal/qoriq-thermal.txt +Removing Documentation/devicetree/bindings/rtc/sa1100-rtc.txt +Removing Documentation/devicetree/bindings/rtc/imxdi-rtc.txt +Removing Documentation/devicetree/bindings/mmc/mxs-mmc.txt +Removing Documentation/devicetree/bindings/mmc/fsl-imx-mmc.txt +Removing Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +Removing Documentation/devicetree/bindings/media/i2c/adv7180.txt +Removing Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt +Removing Documentation/devicetree/bindings/leds/backlight/led-backlight.txt +Removing Documentation/devicetree/bindings/leds/backlight/gpio-backlight.txt +Removing Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.txt +Removing Documentation/devicetree/bindings/interrupt-controller/mrvl,intc.txt +Removing Documentation/devicetree/bindings/input/imx-keypad.txt +Removing Documentation/devicetree/bindings/i2c/i2c-pxa.txt +Removing Documentation/devicetree/bindings/i2c/i2c-mxs.txt +Removing Documentation/devicetree/bindings/i2c/i2c-imx.txt +Removing Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt +Removing Documentation/devicetree/bindings/gpio/mrvl-gpio.txt +Removing Documentation/devicetree/bindings/clock/imx7ulp-clock.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx35-clock.yaml | 2 +- + .../devicetree/bindings/clock/imx7ulp-clock.txt | 103 ------------ + .../bindings/clock/imx7ulp-pcc-clock.yaml | 121 ++++++++++++++ + .../bindings/clock/imx7ulp-scg-clock.yaml | 99 +++++++++++ + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 2 +- + .../devicetree/bindings/gpio/mrvl-gpio.txt | 48 ------ + .../devicetree/bindings/gpio/mrvl-gpio.yaml | 173 +++++++++++++++++++ + .../devicetree/bindings/i2c/i2c-imx-lpi2c.txt | 20 --- + .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 47 ++++++ + Documentation/devicetree/bindings/i2c/i2c-imx.txt | 49 ------ + Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 103 ++++++++++++ + Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 25 --- + Documentation/devicetree/bindings/i2c/i2c-mxs.yaml | 51 ++++++ + Documentation/devicetree/bindings/i2c/i2c-pxa.txt | 31 ---- + Documentation/devicetree/bindings/i2c/i2c-pxa.yaml | 74 +++++++++ + .../devicetree/bindings/input/imx-keypad.txt | 53 ------ + .../devicetree/bindings/input/imx-keypad.yaml | 85 ++++++++++ + .../devicetree/bindings/input/matrix-keymap.txt | 28 +--- + .../devicetree/bindings/input/matrix-keymap.yaml | 46 ++++++ + .../bindings/interrupt-controller/mrvl,intc.txt | 64 ------- + .../bindings/interrupt-controller/mrvl,intc.yaml | 134 +++++++++++++++ + .../interrupt-controller/renesas,rza1-irqc.txt | 43 ----- + .../interrupt-controller/renesas,rza1-irqc.yaml | 80 +++++++++ + .../bindings/leds/backlight/gpio-backlight.txt | 16 -- + .../bindings/leds/backlight/gpio-backlight.yaml | 41 +++++ + .../bindings/leds/backlight/led-backlight.txt | 28 ---- + .../bindings/leds/backlight/led-backlight.yaml | 57 +++++++ + .../bindings/leds/backlight/pwm-backlight.txt | 61 ------- + .../bindings/leds/backlight/pwm-backlight.yaml | 104 ++++++++++++ + .../devicetree/bindings/media/i2c/adv7180.txt | 49 ------ + .../devicetree/bindings/media/i2c/adv7180.yaml | 184 +++++++++++++++++++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 3 +- + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 67 -------- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 124 ++++++++++++++ + .../devicetree/bindings/mmc/fsl-imx-mmc.txt | 23 --- + .../devicetree/bindings/mmc/fsl-imx-mmc.yaml | 53 ++++++ + Documentation/devicetree/bindings/mmc/mxs-mmc.txt | 27 --- + Documentation/devicetree/bindings/mmc/mxs-mmc.yaml | 58 +++++++ + .../devicetree/bindings/property-units.txt | 1 + + .../devicetree/bindings/pwm/pwm-samsung.yaml | 23 ++- + .../devicetree/bindings/rtc/imxdi-rtc.txt | 20 --- + .../devicetree/bindings/rtc/imxdi-rtc.yaml | 44 +++++ + .../devicetree/bindings/rtc/sa1100-rtc.txt | 17 -- + .../devicetree/bindings/rtc/sa1100-rtc.yaml | 57 +++++++ + .../devicetree/bindings/spi/brcm,bcm2835-spi.txt | 3 +- + .../devicetree/bindings/thermal/qoriq-thermal.txt | 71 -------- + .../devicetree/bindings/thermal/qoriq-thermal.yaml | 114 +++++++++++++ + .../devicetree/bindings/timer/mrvl,mmp-timer.txt | 17 -- + .../devicetree/bindings/timer/mrvl,mmp-timer.yaml | 46 ++++++ + .../devicetree/bindings/usb/renesas,usb-xhci.yaml | 86 ++++++++++ + Documentation/devicetree/bindings/usb/usb-xhci.txt | 18 -- + MAINTAINERS | 1 + + drivers/base/core.c | 2 +- + drivers/of/of_reserved_mem.c | 2 +- + drivers/of/property.c | 62 ++++++- + include/linux/device.h | 1 + + 56 files changed, 2067 insertions(+), 894 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-pcc-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-scg-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/mrvl-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-imx.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-imx.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mxs.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mxs.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-pxa.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-pxa.yaml + delete mode 100644 Documentation/devicetree/bindings/input/imx-keypad.txt + create mode 100644 Documentation/devicetree/bindings/input/imx-keypad.yaml + create mode 100644 Documentation/devicetree/bindings/input/matrix-keymap.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mrvl,intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mrvl,intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/backlight/gpio-backlight.txt + create mode 100644 Documentation/devicetree/bindings/leds/backlight/gpio-backlight.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/backlight/led-backlight.txt + create mode 100644 Documentation/devicetree/bindings/leds/backlight/led-backlight.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt + create mode 100644 Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/adv7180.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv7180.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-mmc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/mxs-mmc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mxs-mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/sa1100-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/sa1100-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/qoriq-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/mrvl,mmp-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/mrvl,mmp-timer.yaml + create mode 100644 Documentation/devicetree/bindings/usb/renesas,usb-xhci.yaml +Merging mailbox/mailbox-for-next (e9f901dc05c0 mailbox: qcom: Add ipq6018 apcs compatible) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (e3c1bb248f15 Merge remote-tracking branch 'spi/for-5.9' into spi-next) +$ git merge spi/for-next +Removing include/linux/platform_data/spi-imx.h +Auto-merging drivers/spi/spi-geni-qcom.c +Auto-merging drivers/memory/Makefile +CONFLICT (content): Merge conflict in drivers/memory/Makefile +Auto-merging drivers/memory/Kconfig +CONFLICT (content): Merge conflict in drivers/memory/Kconfig +Auto-merging arch/arm/mach-imx/devices/devices-common.h +Removing Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt +Removing Documentation/devicetree/bindings/spi/mxs-spi.txt +Removing Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt +Resolved 'drivers/memory/Kconfig' using previous resolution. +Resolved 'drivers/memory/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f5db0044e63b] Merge remote-tracking branch 'spi/for-next' +$ git diff -M --stat --summary HEAD^.. + .../memory-controllers/renesas,rpc-if.yaml | 88 +++ + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 56 -- + .../devicetree/bindings/spi/fsl-imx-cspi.yaml | 97 ++++ + Documentation/devicetree/bindings/spi/mxs-spi.txt | 26 - + Documentation/devicetree/bindings/spi/mxs-spi.yaml | 56 ++ + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 1 + + .../devicetree/bindings/spi/spi-davinci.txt | 4 +- + .../devicetree/bindings/spi/spi-fsl-lpspi.txt | 29 - + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 60 ++ + Documentation/spi/spi-sc18is602.rst | 2 +- + arch/arm/mach-imx/devices-imx27.h | 10 +- + arch/arm/mach-imx/devices-imx31.h | 10 +- + arch/arm/mach-imx/devices/devices-common.h | 5 +- + arch/arm/mach-imx/devices/platform-spi_imx.c | 9 +- + arch/arm/mach-imx/mach-mx27_3ds.c | 40 +- + arch/arm/mach-imx/mach-mx31_3ds.c | 13 +- + arch/arm/mach-imx/mach-mx31lilly.c | 14 +- + arch/arm/mach-imx/mach-mx31lite.c | 19 +- + arch/arm/mach-imx/mach-mx31moboard.c | 12 +- + arch/arm/mach-imx/mach-pca100.c | 21 +- + arch/arm/mach-imx/mach-pcm037_eet.c | 7 +- + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 1 + + drivers/memory/renesas-rpc-if.c | 603 +++++++++++++++++++++ + drivers/spi/Kconfig | 23 +- + drivers/spi/Makefile | 1 + + drivers/spi/atmel-quadspi.c | 8 +- + drivers/spi/spi-altera.c | 179 +++++- + drivers/spi/spi-atmel.c | 4 +- + drivers/spi/spi-bcm2835.c | 51 +- + drivers/spi/spi-bcm2835aux.c | 6 +- + drivers/spi/spi-bcm63xx-hsspi.c | 12 + + drivers/spi/spi-bcm63xx.c | 12 + + drivers/spi/spi-cavium-thunderx.c | 1 + + drivers/spi/spi-coldfire-qspi.c | 4 +- + drivers/spi/spi-ep93xx.c | 2 +- + drivers/spi/spi-fsl-lpspi.c | 47 +- + drivers/spi/spi-fsl-qspi.c | 2 +- + drivers/spi/spi-fsl-spi.c | 18 +- + drivers/spi/spi-geni-qcom.c | 179 +++--- + drivers/spi/spi-img-spfi.c | 56 +- + drivers/spi/spi-imx.c | 127 +---- + drivers/spi/spi-lantiq-ssc.c | 4 +- + drivers/spi/spi-npcm-fiu.c | 6 +- + drivers/spi/spi-npcm-pspi.c | 28 +- + drivers/spi/spi-oc-tiny.c | 2 +- + drivers/spi/spi-omap-100k.c | 1 - + drivers/spi/spi-omap-uwire.c | 4 +- + drivers/spi/spi-omap2-mcspi.c | 19 +- + drivers/spi/spi-orion.c | 2 +- + drivers/spi/spi-rpc-if.c | 216 ++++++++ + drivers/spi/spi-sun6i.c | 77 ++- + drivers/spi/spi-ti-qspi.c | 2 +- + drivers/spi/spi.c | 73 ++- + include/linux/platform_data/spi-imx.h | 33 -- + include/linux/spi/altera.h | 29 + + include/linux/spi/spi.h | 21 +- + include/memory/renesas-rpc-if.h | 87 +++ + 58 files changed, 1824 insertions(+), 704 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/mxs-spi.txt + create mode 100644 Documentation/devicetree/bindings/spi/mxs-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-fsl-lpspi.yaml + create mode 100644 drivers/memory/renesas-rpc-if.c + create mode 100644 drivers/spi/spi-rpc-if.c + delete mode 100644 include/linux/platform_data/spi-imx.h + create mode 100644 include/linux/spi/altera.h + create mode 100644 include/memory/renesas-rpc-if.h +Merging tip/auto-latest (8b68f1cda59d Merge branch 'irq/urgent') +$ git merge tip/auto-latest +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/irq/manage.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/perf_event.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/spi/spi.c +CONFLICT (content): Merge conflict in drivers/spi/spi.c +Auto-merging drivers/powercap/idle_inject.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/acpi/acpi_pad.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/fpu/xstate.c +Auto-merging arch/x86/include/asm/msr-index.h +CONFLICT (modify/delete): arch/x86/include/asm/inst.h deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/x86/include/asm/inst.h left in tree. +Auto-merging arch/x86/include/asm/idtentry.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/s390/include/asm/smp.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'drivers/spi/spi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e3562f1c7db8] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-mapping | 33 ++ + Documentation/admin-guide/kernel-parameters.txt | 2 + + Documentation/x86/x86_64/fsgs.rst | 199 +++++++ + Documentation/x86/x86_64/index.rst | 1 + + arch/arm/common/bL_switcher.c | 3 +- + arch/arm/include/asm/percpu.h | 2 + + arch/arm/include/asm/thread_info.h | 5 - + arch/powerpc/include/asm/dtl.h | 52 ++ + arch/powerpc/include/asm/lppaca.h | 44 -- + arch/powerpc/include/asm/paca.h | 2 +- + arch/powerpc/kernel/time.c | 2 + + arch/powerpc/kvm/book3s_hv.c | 1 + + arch/powerpc/platforms/pseries/dtl.c | 1 + + arch/powerpc/platforms/pseries/lpar.c | 1 + + arch/powerpc/platforms/pseries/setup.c | 1 + + arch/powerpc/platforms/pseries/svm.c | 1 + + arch/s390/include/asm/smp.h | 1 + + arch/s390/include/asm/thread_info.h | 1 - + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/percpu_64.h | 2 + + arch/sparc/include/asm/trap_block.h | 2 + + arch/x86/Kconfig | 3 - + arch/x86/entry/calling.h | 40 ++ + arch/x86/entry/common.c | 88 ++- + arch/x86/entry/entry_64.S | 139 +++-- + arch/x86/events/amd/power.c | 4 - + arch/x86/events/core.c | 28 +- + arch/x86/events/intel/core.c | 127 ++-- + arch/x86/events/intel/ds.c | 6 +- + arch/x86/events/intel/lbr.c | 733 ++++++++++++++++++++---- + arch/x86/events/intel/uncore.c | 26 +- + arch/x86/events/intel/uncore.h | 37 ++ + arch/x86/events/intel/uncore_snb.c | 80 ++- + arch/x86/events/intel/uncore_snbep.c | 208 ++++++- + arch/x86/events/perf_event.h | 125 +++- + arch/x86/include/asm/asm.h | 6 +- + arch/x86/include/asm/bug.h | 1 + + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/div64.h | 14 +- + arch/x86/include/asm/fpu/internal.h | 47 +- + arch/x86/include/asm/fpu/types.h | 27 + + arch/x86/include/asm/fpu/xstate.h | 36 ++ + arch/x86/include/asm/fsgsbase.h | 47 +- + arch/x86/include/asm/idtentry.h | 37 +- + arch/x86/include/asm/inst.h | 166 ++++++ + arch/x86/include/asm/kprobes.h | 2 + + arch/x86/include/asm/mem_encrypt.h | 5 +- + arch/x86/include/asm/msr-index.h | 20 +- + arch/x86/include/asm/perf_event.h | 82 ++- + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/include/asm/processor.h | 6 +- + arch/x86/include/asm/stackprotector.h | 12 + + arch/x86/include/asm/topology.h | 2 +- + arch/x86/include/uapi/asm/hwcap2.h | 3 + + arch/x86/kernel/alternative.c | 41 +- + arch/x86/kernel/cpu/bugs.c | 19 +- + arch/x86/kernel/cpu/common.c | 22 + + arch/x86/kernel/cpu/mce/core.c | 2 + + arch/x86/kernel/cpu/mce/dev-mcelog.c | 2 +- + arch/x86/kernel/cpu/mce/inject.c | 2 +- + arch/x86/kernel/cpu/microcode/core.c | 2 - + arch/x86/kernel/fpu/core.c | 39 ++ + arch/x86/kernel/fpu/xstate.c | 89 ++- + arch/x86/kernel/idt.c | 2 +- + arch/x86/kernel/kprobes/core.c | 15 +- + arch/x86/kernel/kprobes/opt.c | 38 +- + arch/x86/kernel/kvm.c | 6 +- + arch/x86/kernel/msr.c | 69 +++ + arch/x86/kernel/nmi.c | 9 +- + arch/x86/kernel/process.c | 10 +- + arch/x86/kernel/process_64.c | 139 ++++- + arch/x86/kernel/ptrace.c | 60 +- + arch/x86/kernel/smpboot.c | 64 ++- + arch/x86/kernel/traps.c | 23 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/mm/fault.c | 6 +- + arch/x86/mm/init.c | 3 +- + arch/x86/mm/mem_encrypt.c | 2 +- + arch/x86/xen/smp_pv.c | 2 - + crypto/crypto_engine.c | 3 +- + drivers/acpi/acpi_pad.c | 3 +- + drivers/block/drbd/drbd_receiver.c | 5 +- + drivers/edac/mce_amd.c | 3 + + drivers/firmware/psci/psci_checker.c | 10 +- + drivers/gpu/drm/msm/msm_drv.c | 13 +- + drivers/gpu/drm/scheduler/sched_main.c | 3 +- + drivers/hwmon/fam15h_power.c | 4 - + drivers/media/pci/ivtv/ivtv-driver.c | 4 +- + drivers/mmc/core/sdio_irq.c | 3 +- + drivers/pci/pci-driver.c | 5 +- + drivers/platform/chrome/cros_ec_spi.c | 11 +- + drivers/powercap/idle_inject.c | 4 +- + drivers/spi/spi.c | 4 +- + drivers/staging/android/ion/ion_heap.c | 4 +- + drivers/thermal/intel/intel_powerclamp.c | 5 +- + drivers/tty/serial/sc16is7xx.c | 3 +- + drivers/watchdog/watchdog_dev.c | 3 +- + include/asm-generic/bug.h | 1 + + include/asm-generic/vmlinux.lds.h | 24 +- + include/linux/compiler.h | 53 -- + include/linux/context_tracking.h | 2 + + include/linux/cpu.h | 1 + + include/linux/ftrace.h | 12 +- + include/linux/hardirq.h | 28 +- + include/linux/instrumentation.h | 57 ++ + include/linux/irqdesc.h | 15 - + include/linux/irqflags.h | 23 +- + include/linux/irqhandler.h | 1 - + include/linux/kprobes.h | 15 + + include/linux/lockdep.h | 212 +------ + include/linux/lockdep_types.h | 196 +++++++ + include/linux/math64.h | 2 + + include/linux/perf_event.h | 13 +- + include/linux/psi_types.h | 7 +- + include/linux/sched.h | 6 +- + include/linux/sched/isolation.h | 1 + + include/linux/sched/mm.h | 2 - + include/linux/sched/sysctl.h | 3 + + include/linux/spinlock.h | 1 + + include/linux/spinlock_types.h | 2 +- + include/linux/vmalloc.h | 20 +- + include/trace/events/sched.h | 12 + + include/uapi/linux/perf_event.h | 26 +- + init/do_mounts_initrd.c | 5 - + kernel/events/core.c | 115 +++- + kernel/fork.c | 4 +- + kernel/irq/Kconfig | 4 - + kernel/irq/chip.c | 13 - + kernel/irq/manage.c | 6 +- + kernel/kallsyms.c | 42 +- + kernel/kcsan/core.c | 5 +- + kernel/kcsan/report.c | 9 +- + kernel/kprobes.c | 57 ++ + kernel/kthread.c | 6 +- + kernel/locking/lockdep.c | 80 ++- + kernel/locking/locktorture.c | 10 +- + kernel/rcu/rcuperf.c | 8 +- + kernel/rcu/rcutorture.c | 7 +- + kernel/sched/core.c | 189 +++++- + kernel/sched/cpudeadline.c | 24 + + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/cputime.c | 46 +- + kernel/sched/deadline.c | 118 +++- + kernel/sched/fair.c | 85 +-- + kernel/sched/idle.c | 11 +- + kernel/sched/isolation.c | 3 +- + kernel/sched/pelt.c | 6 +- + kernel/sched/pelt.h | 5 + + kernel/sched/psi.c | 110 ++-- + kernel/sched/rt.c | 4 +- + kernel/sched/sched.h | 99 +++- + kernel/sched/stop_task.c | 12 +- + kernel/sched/topology.c | 2 +- + kernel/softirq.c | 8 +- + kernel/sysctl.c | 14 + + kernel/trace/ftrace.c | 101 +++- + lib/Kconfig.debug | 11 + + lib/Makefile | 24 + + lib/cpumask.c | 16 +- + lib/math/div64.c | 41 ++ + lib/test_fpu.c | 89 +++ + mm/vmalloc.c | 24 +- + net/core/net-sysfs.c | 10 +- + tools/include/linux/irqflags.h | 4 +- + tools/objtool/arch.h | 2 +- + tools/objtool/arch/x86/decode.c | 2 +- + tools/objtool/check.c | 202 +++---- + tools/objtool/check.h | 2 +- + tools/objtool/elf.c | 308 +++++++--- + tools/objtool/elf.h | 29 +- + tools/objtool/orc_gen.c | 46 +- + tools/objtool/special.c | 28 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/fpu/.gitignore | 2 + + tools/testing/selftests/fpu/Makefile | 9 + + tools/testing/selftests/fpu/run_test_fpu.sh | 46 ++ + tools/testing/selftests/fpu/test_fpu.c | 61 ++ + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/fsgsbase.c | 28 +- + tools/testing/selftests/x86/fsgsbase_restore.c | 245 ++++++++ + tools/testing/selftests/x86/syscall_arg_fault.c | 26 + + 181 files changed, 4992 insertions(+), 1495 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-mapping + create mode 100644 Documentation/x86/x86_64/fsgs.rst + create mode 100644 arch/powerpc/include/asm/dtl.h + create mode 100644 arch/x86/include/asm/inst.h + create mode 100644 include/linux/instrumentation.h + create mode 100644 include/linux/lockdep_types.h + create mode 100644 lib/test_fpu.c + create mode 100644 tools/testing/selftests/fpu/.gitignore + create mode 100644 tools/testing/selftests/fpu/Makefile + create mode 100755 tools/testing/selftests/fpu/run_test_fpu.sh + create mode 100644 tools/testing/selftests/fpu/test_fpu.c + create mode 100644 tools/testing/selftests/x86/fsgsbase_restore.c +$ git am -3 ../patches/0001-need-to-keep-more-of-asm-inst.h.patch +Applying: need to keep more of asm/inst.h +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/include/asm/inst.h +$ git add -A . +$ git commit -v -a --amend +[master 739eeb91be98] Merge remote-tracking branch 'tip/auto-latest' + Date: Mon Jul 20 13:29:57 2020 +1000 +$ git am -3 ../patches/0001-Revert-sched-Remove-sched_setscheduler-EXPORTs.patch +Applying: Revert "sched: Remove sched_setscheduler*() EXPORTs" +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/sched/core.c +$ git add -A . +$ git commit -v -a --amend +[master 54f5299ad963] Merge remote-tracking branch 'tip/auto-latest' + Date: Mon Jul 20 13:29:57 2020 +1000 +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 (399cd3b33cef Merge branch 'edac-urgent' into edac-for-next) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/edac_device_sysfs.c | 1 + + drivers/edac/edac_mc.c | 4 +- + drivers/edac/edac_pci_sysfs.c | 2 +- + drivers/edac/ghes_edac.c | 323 +++++++++++++++++++++++---------------- + drivers/edac/i10nm_base.c | 12 +- + drivers/edac/pnd2_edac.c | 1 + + drivers/edac/skx_base.c | 2 +- + include/linux/edac.h | 29 +--- + 8 files changed, 211 insertions(+), 163 deletions(-) +Merging irqchip/irq/irqchip-next (005c34ae4b44 irqchip/gic: Atomically update affinity) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (29ce24519c06 ring-buffer: Do not trigger a WARN if clock going backwards is detected) +$ git merge ftrace/for-next +Auto-merging kernel/trace/ftrace.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/ftrace.c | 14 +- + arch/x86/kernel/ftrace_64.S | 29 +- + include/linux/ring_buffer.h | 1 + + include/trace/trace_events.h | 19 +- + kernel/trace/ftrace.c | 8 + + kernel/trace/ring_buffer.c | 694 ++++++++++++++++++++++++++++++++++--------- + kernel/trace/trace.c | 26 +- + kernel/trace/trace.h | 2 +- + 8 files changed, 600 insertions(+), 193 deletions(-) +Merging rcu/rcu/next (5707b0d01724 rcutorture: Add CONFIG_PROVE_RCU_LIST to TREE05) +$ git merge rcu/rcu/next +Auto-merging tools/objtool/check.c +Auto-merging net/core/sock.c +Auto-merging mm/mmap.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/rcu/rcuperf.c +Auto-merging kernel/locking/locktorture.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/kcsan/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging arch/x86/entry/common.c +Auto-merging MAINTAINERS +Auto-merging Documentation/memory-barriers.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Removing Documentation/RCU/rculist_nulls.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Data-Structures/Data-Structures.rst | 2 +- + .../RCU/Design/Requirements/Requirements.rst | 11 +- + Documentation/RCU/{checklist.txt => checklist.rst} | 17 +- + Documentation/RCU/index.rst | 9 + + .../RCU/{lockdep-splat.txt => lockdep-splat.rst} | 109 +- + Documentation/RCU/{lockdep.txt => lockdep.rst} | 12 +- + Documentation/RCU/rculist_nulls.rst | 200 ++++ + Documentation/RCU/rculist_nulls.txt | 172 --- + Documentation/RCU/{rcuref.txt => rcuref.rst} | 199 ++-- + Documentation/RCU/{stallwarn.txt => stallwarn.rst} | 62 +- + Documentation/RCU/{torture.txt => torture.rst} | 117 +- + Documentation/RCU/whatisRCU.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 164 +++ + Documentation/atomic_t.txt | 24 +- + Documentation/dev-tools/kcsan.rst | 3 +- + Documentation/litmus-tests/README | 35 + + ...b__after_atomic-is-stronger-than-acquire.litmus | 32 + + ...Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus | 25 + + .../litmus-tests/rcu/RCU+sync+free.litmus | 42 + + .../litmus-tests/rcu/RCU+sync+read.litmus | 37 + + Documentation/locking/locktorture.rst | 2 +- + Documentation/memory-barriers.txt | 6 +- + MAINTAINERS | 6 +- + arch/x86/entry/common.c | 2 +- + arch/x86/kvm/mmu/page_track.c | 6 +- + arch/x86/mm/pat/set_memory.c | 2 +- + fs/btrfs/extent_io.c | 2 + + include/linux/rculist.h | 52 +- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 65 +- + include/linux/rcupdate_trace.h | 4 +- + include/linux/rcutiny.h | 21 +- + include/linux/rcutree.h | 3 +- + include/linux/smp.h | 3 + + include/linux/smp_types.h | 3 + + include/linux/torture.h | 5 + + include/trace/events/rcu.h | 73 +- + kernel/Makefile | 2 + + kernel/fork.c | 8 +- + kernel/kcsan/Makefile | 9 +- + kernel/kcsan/atomic.h | 6 +- + kernel/kcsan/core.c | 119 ++ + kernel/kcsan/kcsan-test.c | 1170 ++++++++++++++++++++ + kernel/kcsan/{test.c => selftest.c} | 0 + kernel/locking/lockdep.c | 4 +- + kernel/locking/locktorture.c | 16 +- + kernel/locking/osq_lock.c | 6 +- + kernel/rcu/Kconfig.debug | 19 + + kernel/rcu/Makefile | 1 + + kernel/rcu/rcu_segcblist.c | 10 +- + kernel/rcu/rcuperf.c | 25 +- + kernel/rcu/rcutorture.c | 145 ++- + kernel/rcu/refscale.c | 717 ++++++++++++ + kernel/rcu/srcutree.c | 29 +- + kernel/rcu/tasks.h | 37 +- + kernel/rcu/tiny.c | 7 +- + kernel/rcu/tree.c | 448 +++++--- + kernel/rcu/tree.h | 15 +- + kernel/rcu/tree_exp.h | 8 +- + kernel/rcu/tree_plugin.h | 11 +- + kernel/rcu/tree_stall.h | 17 +- + kernel/rcu/update.c | 29 +- + kernel/scftorture.c | 574 ++++++++++ + kernel/smp.c | 138 +++ + kernel/time/tick-sched.c | 24 +- + kernel/torture.c | 6 +- + lib/Kconfig.debug | 21 + + lib/Kconfig.kcsan | 26 +- + lib/nmi_backtrace.c | 6 +- + lib/test_vmalloc.c | 103 +- + mm/list_lru.c | 6 +- + mm/mmap.c | 1 + + net/core/sock.c | 4 +- + scripts/Makefile.kcsan | 2 +- + tools/memory-model/Documentation/explanation.txt | 83 +- + tools/memory-model/Documentation/recipes.txt | 2 +- + tools/memory-model/Documentation/references.txt | 23 +- + tools/memory-model/README | 40 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 + + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + tools/objtool/check.c | 50 + + .../testing/selftests/rcutorture/bin/configinit.sh | 4 +- + .../selftests/rcutorture/bin/console-badness.sh | 16 + + .../testing/selftests/rcutorture/bin/functions.sh | 23 +- + tools/testing/selftests/rcutorture/bin/jitter.sh | 6 + + .../testing/selftests/rcutorture/bin/kvm-build.sh | 6 + + .../selftests/rcutorture/bin/kvm-check-branches.sh | 108 ++ + .../rcutorture/bin/kvm-recheck-refscale.sh | 71 ++ + .../selftests/rcutorture/bin/kvm-recheck-scf.sh | 38 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 20 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 27 +- + .../selftests/rcutorture/bin/kvm-transform.sh | 51 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 20 +- + .../selftests/rcutorture/bin/parse-console.sh | 34 +- + .../selftests/rcutorture/configs/rcu/TREE05 | 1 + + .../selftests/rcutorture/configs/refscale/CFLIST | 2 + + .../selftests/rcutorture/configs/refscale/CFcommon | 2 + + .../rcutorture/configs/refscale/NOPREEMPT | 18 + + .../selftests/rcutorture/configs/refscale/PREEMPT | 18 + + .../rcutorture/configs/refscale/ver_functions.sh | 16 + + .../selftests/rcutorture/configs/scf/CFLIST | 2 + + .../selftests/rcutorture/configs/scf/CFcommon | 2 + + .../selftests/rcutorture/configs/scf/NOPREEMPT | 9 + + .../rcutorture/configs/scf/NOPREEMPT.boot | 1 + + .../selftests/rcutorture/configs/scf/PREEMPT | 9 + + .../rcutorture/configs/scf/ver_functions.sh | 30 + + tools/testing/selftests/rcutorture/doc/initrd.txt | 36 +- + .../selftests/rcutorture/doc/rcu-test-image.txt | 41 +- + 122 files changed, 5588 insertions(+), 1009 deletions(-) + rename Documentation/RCU/{checklist.txt => checklist.rst} (98%) + rename Documentation/RCU/{lockdep-splat.txt => lockdep-splat.rst} (54%) + rename Documentation/RCU/{lockdep.txt => lockdep.rst} (96%) + create mode 100644 Documentation/RCU/rculist_nulls.rst + delete mode 100644 Documentation/RCU/rculist_nulls.txt + rename Documentation/RCU/{rcuref.txt => rcuref.rst} (50%) + rename Documentation/RCU/{stallwarn.txt => stallwarn.rst} (88%) + rename Documentation/RCU/{torture.txt => torture.rst} (76%) + create mode 100644 Documentation/litmus-tests/README + create mode 100644 Documentation/litmus-tests/atomic/Atomic-RMW+mb__after_atomic-is-stronger-than-acquire.litmus + create mode 100644 Documentation/litmus-tests/atomic/Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus + create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+free.litmus + create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+read.litmus + create mode 100644 kernel/kcsan/kcsan-test.c + rename kernel/kcsan/{test.c => selftest.c} (100%) + create mode 100644 kernel/rcu/refscale.c + create mode 100644 kernel/scftorture.c + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/console-badness.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-refscale.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-scf.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-transform.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/PREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/ver_functions.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/PREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/ver_functions.sh +Merging kvm/linux-next (c34b26b98cac KVM: MIPS: clean up redundant 'kvm_run' parameters) +$ git merge kvm/linux-next +Auto-merging include/linux/kvm_host.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/mmu/page_track.c +Auto-merging arch/x86/kernel/kvm.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kvm.c +Auto-merging arch/x86/include/asm/idtentry.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/mips/kvm/vz.c +Auto-merging arch/mips/kvm/emulate.c +Removing arch/mips/kvm/00README.txt +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/x86/kernel/kvm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 959a4199beb1] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 10 +- + Documentation/virt/kvm/api.rst | 5 + + arch/arm64/include/asm/kvm_coproc.h | 12 +- + arch/arm64/include/asm/kvm_host.h | 22 +- + arch/arm64/include/asm/kvm_mmu.h | 2 +- + arch/arm64/include/asm/kvm_types.h | 8 + + arch/arm64/kvm/arm.c | 8 +- + arch/arm64/kvm/handle_exit.c | 36 +-- + arch/arm64/kvm/mmio.c | 11 +- + arch/arm64/kvm/mmu.c | 61 +---- + arch/arm64/kvm/sys_regs.c | 13 +- + arch/mips/Kconfig | 1 + + arch/mips/include/asm/kvm_host.h | 39 +-- + arch/mips/include/asm/kvm_types.h | 7 + + arch/mips/kvm/00README.txt | 31 --- + arch/mips/kvm/Kconfig | 3 +- + arch/mips/kvm/emulate.c | 63 ++--- + arch/mips/kvm/mips.c | 11 +- + arch/mips/kvm/mmu.c | 44 +-- + arch/mips/kvm/trap_emul.c | 114 ++++---- + arch/mips/kvm/vz.c | 26 +- + arch/powerpc/include/asm/Kbuild | 1 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/kvm/kvm-s390.c | 43 +-- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/hardirq.h | 4 +- + arch/x86/include/asm/idtentry.h | 4 + + arch/x86/include/asm/kvm_host.h | 76 ++---- + arch/x86/include/asm/kvm_para.h | 3 +- + arch/x86/include/asm/kvm_types.h | 7 + + arch/x86/include/asm/qspinlock.h | 1 + + arch/x86/kernel/kvm.c | 118 +++++--- + arch/x86/kvm/cpuid.c | 112 +++++--- + arch/x86/kvm/cpuid.h | 2 +- + arch/x86/kvm/lapic.c | 6 +- + arch/x86/kvm/mmu.h | 15 +- + arch/x86/kvm/mmu/mmu.c | 345 +++++++++++------------- + arch/x86/kvm/{ => mmu}/mmu_audit.c | 12 +- + arch/x86/kvm/mmu/mmu_internal.h | 63 +++++ + arch/x86/kvm/{ => mmu}/mmutrace.h | 2 +- + arch/x86/kvm/mmu/page_track.c | 2 +- + arch/x86/kvm/mmu/paging_tmpl.h | 19 +- + arch/x86/kvm/pmu.c | 5 + + arch/x86/kvm/pmu.h | 2 + + arch/x86/kvm/svm/avic.c | 2 +- + arch/x86/kvm/svm/nested.c | 37 ++- + arch/x86/kvm/svm/sev.c | 37 +-- + arch/x86/kvm/svm/svm.c | 224 ++++++++------- + arch/x86/kvm/svm/svm.h | 28 +- + arch/x86/kvm/svm/vmenter.S | 2 +- + arch/x86/kvm/vmx/nested.c | 118 +++++--- + arch/x86/kvm/vmx/ops.h | 4 + + arch/x86/kvm/vmx/vmenter.S | 5 +- + arch/x86/kvm/vmx/vmx.c | 133 +++++---- + arch/x86/kvm/x86.c | 181 +++++++------ + arch/x86/kvm/x86.h | 33 ++- + arch/x86/xen/spinlock.c | 4 +- + include/asm-generic/kvm_types.h | 5 + + include/linux/kvm_host.h | 12 +- + include/linux/kvm_types.h | 19 ++ + include/uapi/linux/kvm.h | 2 + + kernel/locking/qspinlock.c | 7 + + virt/kvm/async_pf.c | 16 +- + virt/kvm/kvm_main.c | 63 +++++ + 64 files changed, 1257 insertions(+), 1046 deletions(-) + create mode 100644 arch/arm64/include/asm/kvm_types.h + create mode 100644 arch/mips/include/asm/kvm_types.h + delete mode 100644 arch/mips/kvm/00README.txt + create mode 100644 arch/x86/include/asm/kvm_types.h + rename arch/x86/kvm/{ => mmu}/mmu_audit.c (96%) + create mode 100644 arch/x86/kvm/mmu/mmu_internal.h + rename arch/x86/kvm/{ => mmu}/mmutrace.h (99%) + create mode 100644 include/asm-generic/kvm_types.h +$ git am -3 ../patches/0001-fix-up-for-idtentry_-enter-exit-_cond_rcu-renaming.patch +Applying: fix up for idtentry_{enter,exit}_cond_rcu() renaming +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/kvm.c +$ git add -A . +$ git commit -v -a --amend +[master f382ed097169] Merge remote-tracking branch 'kvm/linux-next' + Date: Mon Jul 20 14:25:48 2020 +1000 +Merging kvm-arm/next (b72eb1f68137 Merge branch 'kvm-arm64/pre-nv-5.9' into kvmarm-master/next) +$ git merge kvm-arm/next +Removing arch/arm64/kvm/sys_regs_generic_v8.c +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/kvm/reset.c +Auto-merging arch/arm64/kvm/mmu.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/mmu.c +Removing arch/arm64/kvm/hyp/tlb.c +Removing arch/arm64/kvm/hyp/sysreg-sr.c +Removing arch/arm64/kvm/hyp/switch.c +Auto-merging arch/arm64/kvm/hyp/nvhe/hyp-init.S +Auto-merging arch/arm64/kvm/handle_exit.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/handle_exit.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/kvm_coproc.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_coproc.h +Auto-merging arch/arm64/Kconfig +Resolved 'arch/arm64/include/asm/kvm_coproc.h' using previous resolution. +Resolved 'arch/arm64/kvm/handle_exit.c' using previous resolution. +Resolved 'arch/arm64/kvm/mmu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c17881971601] Merge remote-tracking branch 'kvm-arm/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/Kconfig | 4 +- + arch/arm64/include/asm/kvm_asm.h | 75 +- + arch/arm64/include/asm/kvm_coproc.h | 8 - + arch/arm64/include/asm/kvm_emulate.h | 73 +- + arch/arm64/include/asm/kvm_host.h | 94 ++- + arch/arm64/include/asm/kvm_hyp.h | 15 +- + arch/arm64/include/asm/kvm_mmu.h | 16 +- + arch/arm64/include/asm/kvm_ptrauth.h | 34 +- + arch/arm64/include/asm/mmu.h | 7 - + arch/arm64/include/asm/virt.h | 13 +- + arch/arm64/kernel/asm-offsets.c | 3 +- + arch/arm64/kernel/image-vars.h | 54 ++ + arch/arm64/kvm/Makefile | 4 +- + arch/arm64/kvm/arch_timer.c | 157 +++- + arch/arm64/kvm/arm.c | 57 +- + arch/arm64/kvm/fpsimd.c | 6 +- + arch/arm64/kvm/guest.c | 79 +- + arch/arm64/kvm/handle_exit.c | 32 +- + arch/arm64/kvm/hyp/Makefile | 24 +- + arch/arm64/kvm/hyp/aarch32.c | 8 +- + arch/arm64/kvm/hyp/entry.S | 4 +- + arch/arm64/kvm/hyp/fpsimd.S | 1 - + arch/arm64/kvm/hyp/hyp-entry.S | 21 +- + .../kvm/hyp/{debug-sr.c => include/hyp/debug-sr.h} | 88 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 511 +++++++++++ + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 193 +++++ + arch/arm64/kvm/hyp/nvhe/Makefile | 42 + + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 77 ++ + arch/arm64/kvm/{ => hyp/nvhe}/hyp-init.S | 5 + + arch/arm64/kvm/hyp/nvhe/switch.c | 272 ++++++ + arch/arm64/kvm/hyp/nvhe/sysreg-sr.c | 46 + + arch/arm64/kvm/hyp/{ => nvhe}/timer-sr.c | 6 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 156 ++++ + arch/arm64/kvm/hyp/smccc_wa.S | 32 + + arch/arm64/kvm/hyp/switch.c | 936 --------------------- + arch/arm64/kvm/hyp/sysreg-sr.c | 333 -------- + arch/arm64/kvm/hyp/tlb.c | 242 ------ + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 4 +- + arch/arm64/kvm/hyp/vgic-v3-sr.c | 134 ++- + arch/arm64/kvm/hyp/vhe/Makefile | 11 + + arch/arm64/kvm/hyp/vhe/debug-sr.c | 26 + + arch/arm64/kvm/hyp/vhe/switch.c | 219 +++++ + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 114 +++ + arch/arm64/kvm/hyp/vhe/timer-sr.c | 12 + + arch/arm64/kvm/hyp/vhe/tlb.c | 162 ++++ + arch/arm64/kvm/inject_fault.c | 2 +- + arch/arm64/kvm/mmu.c | 287 ++++--- + arch/arm64/kvm/regmap.c | 37 +- + arch/arm64/kvm/reset.c | 23 +- + arch/arm64/kvm/sys_regs.c | 207 ++--- + arch/arm64/kvm/sys_regs_generic_v8.c | 96 --- + arch/arm64/kvm/trace_arm.h | 8 +- + arch/arm64/kvm/vgic/vgic-irqfd.c | 24 +- + arch/arm64/kvm/vgic/vgic-its.c | 3 +- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +- + include/kvm/arm_arch_timer.h | 13 +- + scripts/kallsyms.c | 1 + + 57 files changed, 2773 insertions(+), 2340 deletions(-) + rename arch/arm64/kvm/hyp/{debug-sr.c => include/hyp/debug-sr.h} (66%) + create mode 100644 arch/arm64/kvm/hyp/include/hyp/switch.h + create mode 100644 arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h + create mode 100644 arch/arm64/kvm/hyp/nvhe/Makefile + create mode 100644 arch/arm64/kvm/hyp/nvhe/debug-sr.c + rename arch/arm64/kvm/{ => hyp/nvhe}/hyp-init.S (95%) + create mode 100644 arch/arm64/kvm/hyp/nvhe/switch.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/sysreg-sr.c + rename arch/arm64/kvm/hyp/{ => nvhe}/timer-sr.c (84%) + create mode 100644 arch/arm64/kvm/hyp/nvhe/tlb.c + create mode 100644 arch/arm64/kvm/hyp/smccc_wa.S + delete mode 100644 arch/arm64/kvm/hyp/switch.c + delete mode 100644 arch/arm64/kvm/hyp/sysreg-sr.c + delete mode 100644 arch/arm64/kvm/hyp/tlb.c + create mode 100644 arch/arm64/kvm/hyp/vhe/Makefile + create mode 100644 arch/arm64/kvm/hyp/vhe/debug-sr.c + create mode 100644 arch/arm64/kvm/hyp/vhe/switch.c + create mode 100644 arch/arm64/kvm/hyp/vhe/sysreg-sr.c + create mode 100644 arch/arm64/kvm/hyp/vhe/timer-sr.c + create mode 100644 arch/arm64/kvm/hyp/vhe/tlb.c + delete mode 100644 arch/arm64/kvm/sys_regs_generic_v8.c +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 +Already up to date. +Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) +$ git merge kvms390/next +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/include/asm/kvm_host.h +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d08080b1d1ab] Merge remote-tracking branch 'kvms390/next' +$ git diff -M --stat --summary HEAD^.. + arch/s390/include/asm/diag.h | 6 ++---- + arch/s390/include/asm/kvm_host.h | 4 +++- + arch/s390/include/uapi/asm/kvm.h | 7 +++++-- + arch/s390/kernel/setup.c | 3 +-- + arch/s390/kvm/kvm-s390.c | 11 ++++++++++- + arch/s390/kvm/vsie.c | 1 + + include/uapi/linux/kvm.h | 1 + + 7 files changed, 23 insertions(+), 10 deletions(-) +Merging xen-tip/linux-next (ba8c42348897 xen/xenbus: Fix a double free in xenbus_map_ring_pv()) +$ git merge xen-tip/linux-next +Already up to date. +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 (69ce97f2329f Merge branch 'for-next') +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/acerhdf.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/laptops/thinkpad-acpi.rst +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 17 +++ + .../admin-guide/laptops/thinkpad-acpi.rst | 15 +++ + MAINTAINERS | 6 + + drivers/platform/mellanox/mlxreg-hotplug.c | 114 +++++++++-------- + drivers/platform/mellanox/mlxreg-io.c | 45 +++++-- + drivers/platform/x86/Kconfig | 23 +++- + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acerhdf.c | 2 +- + drivers/platform/x86/apple-gmux.c | 16 +-- + drivers/platform/x86/asus-nb-wmi.c | 82 ++++++++++++ + drivers/platform/x86/dell-wmi.c | 28 +++- + drivers/platform/x86/intel-hid.c | 2 +- + drivers/platform/x86/intel-vbtn.c | 2 +- + drivers/platform/x86/intel_atomisp2_led.c | 116 +++++++++++++++++ + drivers/platform/x86/intel_cht_int33fe_common.c | 14 +- + drivers/platform/x86/intel_pmc_core.c | 4 +- + drivers/platform/x86/mlx-platform.c | 141 +++++++++++++++++++++ + drivers/platform/x86/pcengines-apuv2.c | 3 - + drivers/platform/x86/system76_acpi.c | 12 +- + drivers/platform/x86/thinkpad_acpi.c | 128 +++++++++++++++++-- + include/linux/platform_data/mlxreg.h | 4 + + include/linux/string_helpers.h | 15 +++ + lib/test-string_helpers.c | 67 ++++++++++ + tools/power/x86/intel-speed-select/isst-config.c | 81 +++++++++--- + 24 files changed, 813 insertions(+), 125 deletions(-) + create mode 100644 drivers/platform/x86/intel_atomisp2_led.c +Merging chrome-platform/for-next (e48bc01ed5ad platform/chrome: cros_ec_sensorhub: Fix EC timestamp overflow) +$ git merge chrome-platform/for-next +Auto-merging include/linux/platform_data/cros_ec_commands.h +Auto-merging drivers/platform/chrome/cros_ec_spi.c +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 1 + + drivers/platform/chrome/cros_ec_debugfs.c | 24 +- + drivers/platform/chrome/cros_ec_ishtp.c | 4 +- + drivers/platform/chrome/cros_ec_rpmsg.c | 3 + + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 4 +- + drivers/platform/chrome/cros_ec_spi.c | 4 + + drivers/platform/chrome/cros_ec_typec.c | 350 +++++++++++++++++++++-- + include/linux/platform_data/cros_ec_commands.h | 33 ++- + 8 files changed, 392 insertions(+), 31 deletions(-) +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (10d3e0d81587 leds: Add multicolor ID to the color ID list) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../bindings/leds/leds-class-multicolor.yaml | 37 +++++++++ + .../devicetree/bindings/leds/leds-pca955x.txt | 6 +- + drivers/leds/led-class.c | 1 + + drivers/leds/led-core.c | 1 + + drivers/leds/led-triggers.c | 2 +- + drivers/leds/leds-88pm860x.c | 14 +++- + drivers/leds/leds-bcm6328.c | 97 +++++++++++++++++----- + drivers/leds/leds-da903x.c | 14 +++- + drivers/leds/leds-gpio.c | 15 +--- + drivers/leds/leds-lm3533.c | 12 ++- + drivers/leds/leds-lm355x.c | 16 ++-- + drivers/leds/leds-lm36274.c | 15 +++- + drivers/leds/leds-lm3642.c | 9 +- + drivers/leds/leds-lp5523.c | 19 +++-- + drivers/leds/leds-lp55xx-common.c | 49 +++++------ + drivers/leds/leds-ns2.c | 9 +- + drivers/leds/leds-pca955x.c | 2 +- + drivers/leds/leds-wm831x-status.c | 14 +++- + drivers/leds/trigger/ledtrig-gpio.c | 3 +- + include/dt-bindings/leds/common.h | 3 +- + include/linux/platform_data/leds-lp55xx.h | 6 +- + 21 files changed, 233 insertions(+), 111 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml +Merging ipmi/for-next (29a54910152a ipmi: ssif: Remove finished TODO comment about SMBus alert) +$ git merge ipmi/for-next +Auto-merging Documentation/driver-api/ipmi.rst +Merge made by the 'recursive' strategy. + Documentation/driver-api/ipmi.rst | 4 ++++ + drivers/char/ipmi/ipmi_ssif.c | 5 ----- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging driver-core/driver-core-next (da6d647598a6 driver core: Add waiting_for_supplier sysfs file for devices) +$ git merge driver-core/driver-core-next +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Auto-merging fs/debugfs/file.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/base/core.c +Resolved 'include/linux/device.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d182c1bb4c18] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-platform | 10 + + Documentation/ABI/testing/sysfs-class-devlink | 126 +++++++++ + Documentation/ABI/testing/sysfs-devices-consumer | 8 + + .../ABI/testing/sysfs-devices-state_synced | 24 ++ + Documentation/ABI/testing/sysfs-devices-supplier | 8 + + .../ABI/testing/sysfs-devices-waiting_for_supplier | 17 ++ + Documentation/driver-api/driver-model/platform.rst | 2 +- + drivers/base/core.c | 237 ++++++++++++++++- + drivers/base/dd.c | 29 ++- + drivers/base/devres.c | 25 +- + drivers/base/driver.c | 4 +- + drivers/base/firmware_loader/main.c | 12 +- + drivers/base/memory.c | 15 +- + drivers/base/platform.c | 28 +- + drivers/base/swnode.c | 8 +- + drivers/base/topology.c | 2 +- + fs/debugfs/file.c | 2 +- + include/linux/device.h | 287 ++++++++++----------- + include/linux/sysfs.h | 7 + + lib/Kconfig.debug | 8 +- + lib/devres.c | 17 +- + lib/kobject.c | 33 ++- + scripts/coccinelle/misc/add_namespace.cocci | 8 +- + scripts/nsdeps | 2 +- + 24 files changed, 710 insertions(+), 209 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-devlink + create mode 100644 Documentation/ABI/testing/sysfs-devices-consumer + create mode 100644 Documentation/ABI/testing/sysfs-devices-state_synced + create mode 100644 Documentation/ABI/testing/sysfs-devices-supplier + create mode 100644 Documentation/ABI/testing/sysfs-devices-waiting_for_supplier +Merging usb/usb-next (313da01ad524 usb: misc: sisusbvga: Move static const tables out to different include file) +$ git merge usb/usb-next +Auto-merging drivers/usb/gadget/usbstring.c +Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c +Auto-merging drivers/usb/gadget/udc/gr_udc.c +Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c +Auto-merging drivers/usb/dwc3/dwc3-pci.c +Auto-merging drivers/usb/chipidea/core.c +Auto-merging drivers/usb/cdns3/ep0.c +Auto-merging drivers/usb/c67x00/c67x00-sched.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/usb/URB.rst | 2 +- + MAINTAINERS | 7 + + arch/mips/configs/fuloong2e_defconfig | 2 +- + arch/mips/configs/gcw0_defconfig | 2 +- + arch/mips/configs/lemote2f_defconfig | 2 +- + drivers/usb/atm/cxacru.c | 4 +- + drivers/usb/atm/ueagle-atm.c | 4 +- + drivers/usb/c67x00/c67x00-hcd.c | 6 +- + drivers/usb/c67x00/c67x00-ll-hpi.c | 6 +- + drivers/usb/c67x00/c67x00-sched.c | 26 +- + drivers/usb/cdns3/core.c | 8 +- + drivers/usb/cdns3/ep0.c | 22 +- + drivers/usb/cdns3/gadget.c | 23 +- + drivers/usb/chipidea/ci_hdrc_pci.c | 2 +- + drivers/usb/chipidea/core.c | 1 + + drivers/usb/chipidea/debug.c | 10 +- + drivers/usb/chipidea/otg.c | 6 +- + drivers/usb/chipidea/udc.c | 62 +- + drivers/usb/chipidea/usbmisc_imx.c | 2 +- + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/common/debug.c | 14 +- + drivers/usb/common/ulpi.c | 5 +- + drivers/usb/common/usb-conn-gpio.c | 2 +- + drivers/usb/core/Kconfig | 8 +- + drivers/usb/core/config.c | 10 +- + drivers/usb/core/devices.c | 4 + + drivers/usb/core/hcd.c | 8 +- + drivers/usb/core/hub.c | 8 +- + drivers/usb/core/ledtrig-usbport.c | 6 +- + drivers/usb/core/of.c | 2 +- + .../core/{otg_whitelist.h => otg_productlist.h} | 14 +- + drivers/usb/core/quirks.c | 18 +- + drivers/usb/core/urb.c | 4 +- + drivers/usb/core/usb.c | 5 +- + drivers/usb/core/usb.h | 2 +- + drivers/usb/dwc2/core.h | 2 +- + drivers/usb/dwc2/debugfs.c | 20 +- + drivers/usb/dwc2/gadget.c | 16 +- + drivers/usb/dwc2/hcd.c | 4 +- + drivers/usb/dwc2/params.c | 12 +- + drivers/usb/dwc3/core.c | 2 +- + drivers/usb/dwc3/core.h | 2 +- + drivers/usb/dwc3/debug.h | 2 +- + drivers/usb/dwc3/debugfs.c | 22 +- + drivers/usb/dwc3/drd.c | 4 +- + drivers/usb/dwc3/dwc3-haps.c | 2 +- + drivers/usb/dwc3/dwc3-keystone.c | 2 +- + drivers/usb/dwc3/dwc3-of-simple.c | 4 +- + drivers/usb/dwc3/dwc3-omap.c | 9 +- + drivers/usb/dwc3/dwc3-pci.c | 2 +- + drivers/usb/dwc3/dwc3-qcom.c | 22 +- + drivers/usb/dwc3/ep0.c | 12 +- + drivers/usb/dwc3/gadget.c | 12 +- + drivers/usb/dwc3/gadget.h | 2 +- + drivers/usb/dwc3/host.c | 2 +- + drivers/usb/dwc3/io.h | 2 +- + drivers/usb/dwc3/trace.c | 2 +- + drivers/usb/dwc3/trace.h | 2 +- + drivers/usb/dwc3/ulpi.c | 2 +- + drivers/usb/early/ehci-dbgp.c | 6 +- + drivers/usb/early/xhci-dbc.c | 3 +- + drivers/usb/gadget/Kconfig | 4 +- + drivers/usb/gadget/composite.c | 20 +- + drivers/usb/gadget/configfs.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_hid.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 2 +- + drivers/usb/gadget/function/f_phonet.c | 4 +- + drivers/usb/gadget/function/f_printer.c | 6 +- + drivers/usb/gadget/function/f_rndis.c | 2 +- + drivers/usb/gadget/function/f_tcm.c | 2 +- + drivers/usb/gadget/function/u_ether.c | 8 +- + drivers/usb/gadget/function/u_serial.c | 8 +- + drivers/usb/gadget/function/u_serial.h | 2 +- + drivers/usb/gadget/function/u_uac1_legacy.c | 14 +- + drivers/usb/gadget/legacy/inode.c | 7 +- + drivers/usb/gadget/legacy/nokia.c | 1 - + drivers/usb/gadget/legacy/printer.c | 1 - + drivers/usb/gadget/legacy/zero.c | 4 +- + drivers/usb/gadget/udc/Kconfig | 2 +- + drivers/usb/gadget/udc/amd5536udc.h | 2 +- + drivers/usb/gadget/udc/amd5536udc_pci.c | 3 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 3 - + drivers/usb/gadget/udc/bcm63xx_udc.c | 16 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 10 +- + drivers/usb/gadget/udc/core.c | 20 +- + drivers/usb/gadget/udc/dummy_hcd.c | 34 +- + drivers/usb/gadget/udc/goku_udc.c | 9 +- + drivers/usb/gadget/udc/gr_udc.c | 6 +- + drivers/usb/gadget/udc/gr_udc.h | 2 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 2 +- + drivers/usb/gadget/udc/max3420_udc.c | 5 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 1 - + drivers/usb/gadget/udc/mv_udc_core.c | 3 +- + drivers/usb/gadget/udc/net2272.c | 2 +- + drivers/usb/gadget/udc/net2272.h | 5 - + drivers/usb/gadget/udc/omap_udc.c | 4 +- + drivers/usb/gadget/udc/pch_udc.c | 36 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 15 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 4 +- + drivers/usb/gadget/udc/snps_udc_core.c | 2 +- + drivers/usb/gadget/udc/tegra-xudc.c | 2 +- + drivers/usb/gadget/udc/udc-xilinx.c | 4 +- + drivers/usb/gadget/usbstring.c | 4 +- + drivers/usb/host/Kconfig | 4 +- + drivers/usb/host/bcma-hcd.c | 4 +- + drivers/usb/host/ehci-dbg.c | 2 +- + drivers/usb/host/ehci-fsl.c | 6 +- + drivers/usb/host/ehci-hcd.c | 4 +- + drivers/usb/host/ehci-omap.c | 2 +- + drivers/usb/host/ehci-pci.c | 3 +- + drivers/usb/host/ehci-platform.c | 2 + + drivers/usb/host/ehci-q.c | 2 +- + drivers/usb/host/ehci-sched.c | 2 +- + drivers/usb/host/fhci-sched.c | 19 +- + drivers/usb/host/fhci-tds.c | 11 +- + drivers/usb/host/fotg210-hcd.c | 15 +- + drivers/usb/host/imx21-hcd.c | 2 +- + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/isp1362.h | 2 +- + drivers/usb/host/max3421-hcd.c | 6 +- + drivers/usb/host/ohci-at91.c | 5 +- + drivers/usb/host/ohci-hcd.c | 6 +- + drivers/usb/host/ohci-hub.c | 2 +- + drivers/usb/host/ohci-pci.c | 4 - + drivers/usb/host/ohci-q.c | 6 +- + drivers/usb/host/ohci-s3c2410.c | 2 +- + drivers/usb/host/ohci-tmio.c | 6 +- + drivers/usb/host/ohci.h | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 15 +- + drivers/usb/host/pci-quirks.c | 2 +- + drivers/usb/host/r8a66597-hcd.c | 8 +- + drivers/usb/host/xhci-dbgcap.c | 2 +- + drivers/usb/host/xhci-dbgtty.c | 2 +- + drivers/usb/host/xhci-debugfs.c | 1 + + drivers/usb/host/xhci-hub.c | 7 +- + drivers/usb/host/xhci-mem.c | 2 +- + drivers/usb/host/xhci-plat.c | 4 +- + drivers/usb/host/xhci-tegra.c | 8 - + drivers/usb/host/xhci.c | 2 +- + drivers/usb/image/mdc800.c | 2 +- + drivers/usb/isp1760/isp1760-hcd.c | 4 +- + drivers/usb/misc/adutux.c | 6 +- + drivers/usb/misc/appledisplay.c | 2 +- + drivers/usb/misc/ehset.c | 8 +- + drivers/usb/misc/iowarrior.c | 16 +- + drivers/usb/misc/ldusb.c | 24 +- + drivers/usb/misc/legousbtower.c | 26 +- + drivers/usb/misc/sisusbvga/sisusb.c | 8 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 12 +- + drivers/usb/misc/sisusbvga/sisusb_init.c | 1 + + drivers/usb/misc/sisusbvga/sisusb_init.h | 664 +------------------- + drivers/usb/misc/sisusbvga/sisusb_tables.h | 688 +++++++++++++++++++++ + drivers/usb/misc/usbtest.c | 8 +- + drivers/usb/misc/yurex.c | 2 +- + drivers/usb/mtu3/mtu3_core.c | 2 +- + drivers/usb/mtu3/mtu3_debug.h | 2 + + drivers/usb/mtu3/mtu3_gadget_ep0.c | 16 +- + drivers/usb/mtu3/mtu3_trace.c | 3 +- + drivers/usb/musb/Kconfig | 2 +- + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/musb_dsps.c | 8 +- + drivers/usb/musb/musb_gadget_ep0.c | 20 +- + drivers/usb/musb/musb_host.h | 1 - + drivers/usb/musb/musb_virthub.c | 20 +- + drivers/usb/phy/phy-ab8500-usb.c | 12 +- + drivers/usb/phy/phy-fsl-usb.c | 166 +---- + drivers/usb/phy/phy-fsl-usb.h | 14 - + drivers/usb/phy/phy-isp1301-omap.c | 14 +- + drivers/usb/phy/phy-keystone.c | 2 +- + drivers/usb/phy/phy-mv-usb.c | 2 +- + drivers/usb/phy/phy-twl6030-usb.c | 2 +- + drivers/usb/phy/phy.c | 49 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 2 +- + drivers/usb/renesas_usbhs/pipe.c | 2 +- + drivers/usb/serial/ftdi_sio.h | 4 +- + drivers/usb/serial/qcserial.c | 5 +- + drivers/usb/serial/sierra.c | 57 +- + drivers/usb/storage/Kconfig | 2 +- + drivers/usb/storage/alauda.c | 3 +- + drivers/usb/storage/freecom.c | 2 +- + drivers/usb/storage/scsiglue.c | 2 +- + drivers/usb/storage/uas-detect.h | 2 +- + drivers/usb/storage/unusual_devs.h | 2 +- + drivers/usb/typec/altmodes/displayport.c | 3 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 75 ++- + drivers/usb/typec/tcpm/fusb302.c | 1 + + drivers/usb/typec/tps6598x.c | 2 +- + drivers/usb/typec/ucsi/Kconfig | 2 +- + drivers/usb/typec/ucsi/ucsi.c | 3 +- + drivers/usb/usbip/stub_rx.c | 2 +- + drivers/usb/usbip/vhci_hcd.c | 7 +- + drivers/usb/usbip/vhci_rx.c | 2 +- + drivers/usb/usbip/vudc_transfer.c | 4 +- + include/linux/usb.h | 14 +- + include/linux/usb/ch9.h | 8 +- + include/linux/usb/gadget.h | 9 +- + include/linux/usb/pd_vdo.h | 2 +- + include/linux/usb/quirks.h | 4 +- + include/linux/usb/serial.h | 2 +- + include/linux/usb/typec.h | 14 + + include/linux/usb/typec_altmode.h | 14 +- + include/uapi/linux/usb/ch9.h | 17 +- + tools/usb/usbip/doc/usbip.8 | 4 +- + tools/usb/usbip/doc/usbipd.8 | 2 +- + tools/usb/usbip/libsrc/usbip_host_common.c | 2 +- + tools/usb/usbip/vudc/vudc_server_example.sh | 2 +- + 208 files changed, 1471 insertions(+), 1566 deletions(-) + rename drivers/usb/core/{otg_whitelist.h => otg_productlist.h} (90%) + create mode 100644 drivers/usb/misc/sisusbvga/sisusb_tables.h +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 (e0439cd97573 USB: serial: sierra: clean up special-interface handling) +$ git merge usb-serial/usb-next +Auto-merging include/linux/usb/serial.h +Auto-merging drivers/usb/serial/option.c +Auto-merging drivers/usb/serial/iuu_phoenix.c +Auto-merging drivers/usb/serial/cypress_m8.c +Auto-merging drivers/usb/serial/ch341.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/aircable.c | 2 +- + drivers/usb/serial/ch341.c | 127 +++++++++++++++++++--- + drivers/usb/serial/console.c | 5 +- + drivers/usb/serial/cp210x.c | 228 +++++++++++++++++++++++++++++++++++++-- + drivers/usb/serial/cypress_m8.c | 4 +- + drivers/usb/serial/f81232.c | 4 +- + drivers/usb/serial/f81534.c | 2 +- + drivers/usb/serial/ftdi_sio.c | 59 +++++----- + drivers/usb/serial/garmin_gps.c | 13 ++- + drivers/usb/serial/generic.c | 22 ++-- + drivers/usb/serial/io_edgeport.c | 4 +- + drivers/usb/serial/iuu_phoenix.c | 12 +-- + drivers/usb/serial/keyspan_pda.c | 3 +- + drivers/usb/serial/kobil_sct.c | 6 +- + drivers/usb/serial/mxuport.c | 6 +- + drivers/usb/serial/option.c | 3 +- + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/quatech2.c | 18 +--- + drivers/usb/serial/sierra.c | 61 ++++++----- + drivers/usb/serial/ssu100.c | 7 +- + drivers/usb/serial/upd78f0730.c | 2 +- + include/linux/usb/serial.h | 95 ++++++++-------- + 22 files changed, 499 insertions(+), 186 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (c71d13f9a868 Documentation: ABI: usb: chipidea: Update Li Jun's e-mail) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/udc.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging phy-next/next (bca21e930451 phy: samsung-ufs: add UFS PHY driver for samsung SoC) +$ git merge phy-next/next +Removing drivers/phy/qualcomm/phy-qcom-ufs.c +Removing drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.h +Removing drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c +Removing drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.h +Removing drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c +Removing drivers/phy/qualcomm/phy-qcom-ufs-i.h +Auto-merging drivers/phy/allwinner/phy-sun4i-usb.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 2 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 75 ++ + .../phy/socionext,uniphier-usb3hs-phy.yaml | 8 +- + .../devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml | 105 +++ + MAINTAINERS | 9 + + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 17 +- + drivers/phy/allwinner/Kconfig | 2 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 3 +- + drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 4 +- + drivers/phy/cadence/phy-cadence-salvo.c | 2 +- + drivers/phy/marvell/phy-mvebu-a3700-utmi.c | 2 +- + drivers/phy/motorola/phy-mapphone-mdm6600.c | 3 +- + drivers/phy/phy-core.c | 5 +- + drivers/phy/phy-xgene.c | 2 +- + drivers/phy/qualcomm/Kconfig | 24 - + drivers/phy/qualcomm/Makefile | 3 - + drivers/phy/qualcomm/phy-qcom-qmp.c | 510 ++++++++++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 7 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 85 ++ + drivers/phy/qualcomm/phy-qcom-ufs-i.h | 131 --- + drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c | 172 ---- + drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.h | 168 ---- + drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c | 226 ----- + drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.h | 226 ----- + drivers/phy/qualcomm/phy-qcom-ufs.c | 648 -------------- + drivers/phy/rockchip/phy-rockchip-typec.c | 2 +- + drivers/phy/samsung/Kconfig | 17 +- + drivers/phy/samsung/Makefile | 1 + + drivers/phy/samsung/phy-exynos-dp-video.c | 4 +- + drivers/phy/samsung/phy-exynos-mipi-video.c | 4 +- + drivers/phy/samsung/phy-exynos-pcie.c | 2 +- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 16 +- + drivers/phy/samsung/phy-exynos7-ufs.h | 81 ++ + drivers/phy/samsung/phy-samsung-ufs.c | 366 ++++++++ + drivers/phy/samsung/phy-samsung-ufs.h | 139 +++ + drivers/phy/samsung/phy-samsung-usb2.c | 2 +- + drivers/phy/st/phy-stm32-usbphyc.c | 4 +- + drivers/phy/ti/phy-dm816x-usb.c | 11 +- + drivers/phy/ti/phy-ti-pipe3.c | 5 +- + drivers/phy/xilinx/Kconfig | 13 + + drivers/phy/xilinx/Makefile | 3 + + drivers/phy/xilinx/phy-zynqmp.c | 993 +++++++++++++++++++++ + include/dt-bindings/phy/phy.h | 1 + + 46 files changed, 2450 insertions(+), 1658 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/samsung,ufs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml + delete mode 100644 drivers/phy/qualcomm/phy-qcom-ufs-i.h + delete mode 100644 drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c + delete mode 100644 drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.h + delete mode 100644 drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c + delete mode 100644 drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.h + delete mode 100644 drivers/phy/qualcomm/phy-qcom-ufs.c + create mode 100644 drivers/phy/samsung/phy-exynos7-ufs.h + create mode 100644 drivers/phy/samsung/phy-samsung-ufs.c + create mode 100644 drivers/phy/samsung/phy-samsung-ufs.h + create mode 100644 drivers/phy/xilinx/Kconfig + create mode 100644 drivers/phy/xilinx/Makefile + create mode 100644 drivers/phy/xilinx/phy-zynqmp.c +Merging tty/tty-next (ea1be1e59b19 serial: Remove duplicated macro definition of port type) +$ git merge tty/tty-next +Auto-merging include/linux/serial_core.h +Auto-merging drivers/video/fbdev/core/fbcon.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/usb/misc/sisusbvga/sisusb_con.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/serial/qcom_geni_serial.c +CONFLICT (content): Merge conflict in drivers/tty/serial/qcom_geni_serial.c +Auto-merging drivers/tty/serial/kgdboc.c +Resolved 'drivers/tty/serial/qcom_geni_serial.c' using previous resolution. +Resolved 'drivers/video/fbdev/core/fbcon.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 213535d80c32] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/serial/st,stm32-uart.yaml | 4 +- + arch/um/drivers/line.c | 5 - + arch/um/drivers/line.h | 1 - + arch/um/drivers/ssl.c | 1 - + arch/um/drivers/stdio_console.c | 1 - + drivers/accessibility/braille/braille_console.c | 10 +- + drivers/staging/speakup/main.c | 28 +- + drivers/tty/moxa.h | 2 +- + drivers/tty/serial/8250/8250_em.c | 16 +- + drivers/tty/serial/8250/8250_ingenic.c | 16 +- + drivers/tty/serial/8250/8250_men_mcb.c | 4 +- + drivers/tty/serial/8250/8250_mtk.c | 16 +- + drivers/tty/serial/8250/8250_omap.c | 16 +- + drivers/tty/serial/8250/8250_port.c | 1 + + drivers/tty/serial/8250/8250_pxa.c | 14 +- + drivers/tty/serial/fsl_lpuart.c | 3 + + drivers/tty/serial/kgdboc.c | 3 +- + drivers/tty/serial/qcom_geni_serial.c | 2 +- + drivers/tty/serial/samsung_tty.c | 24 +- + drivers/tty/serial/serial-tegra.c | 6 +- + drivers/tty/serial/serial_core.c | 1 + + drivers/tty/serial/stm32-usart.c | 5 +- + drivers/tty/vt/consolemap.c | 2 +- + drivers/tty/vt/selection.c | 2 +- + drivers/tty/vt/vt.c | 980 +++++++++-------- + drivers/tty/vt/vt_ioctl.c | 1109 ++++++++++---------- + drivers/usb/misc/sisusbvga/sisusb_con.c | 11 +- + drivers/video/console/mdacon.c | 20 +- + drivers/video/console/sticon.c | 14 +- + drivers/video/console/vgacon.c | 36 +- + drivers/video/fbdev/core/bitblit.c | 10 +- + drivers/video/fbdev/core/fbcon.c | 10 +- + drivers/video/fbdev/core/fbcon_ccw.c | 8 +- + drivers/video/fbdev/core/fbcon_cw.c | 8 +- + drivers/video/fbdev/core/fbcon_ud.c | 8 +- + drivers/video/fbdev/core/tileblit.c | 6 +- + include/linux/console.h | 13 +- + include/linux/console_struct.h | 93 +- + include/linux/serial_core.h | 2 +- + include/linux/vt_kern.h | 3 - + include/uapi/linux/serial_core.h | 14 - + 41 files changed, 1321 insertions(+), 1207 deletions(-) +Merging char-misc/char-misc-next (fadbfc38dde2 hpilo: Replace one-element array with flexible-array member) +$ git merge char-misc/char-misc-next +Auto-merging drivers/mmc/host/rtsx_pci_sdmmc.c +Auto-merging drivers/misc/uacce/uacce.c +Auto-merging drivers/misc/ocxl/config.c +Auto-merging drivers/misc/habanalabs/goya/goya.c +Auto-merging drivers/misc/habanalabs/gaudi/gaudi.c +Auto-merging drivers/misc/habanalabs/firmware_if.c +Auto-merging drivers/misc/genwqe/card_base.c +Auto-merging drivers/char/virtio_console.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../testing/sysfs-devices-platform-stratix10-rsu | 36 + + Documentation/driver-api/firmware/built-in-fw.rst | 2 +- + .../driver-api/firmware/direct-fs-lookup.rst | 2 +- + .../driver-api/firmware/firmware_cache.rst | 2 +- + .../driver-api/firmware/request_firmware.rst | 2 +- + Documentation/driver-api/uio-howto.rst | 2 +- + Documentation/driver-api/xillybus.rst | 2 +- + MAINTAINERS | 2 + + drivers/char/mwave/smapi.c | 4 +- + drivers/char/raw.c | 8 +- + drivers/char/ttyprintk.c | 2 +- + drivers/char/virtio_console.c | 8 +- + drivers/firmware/stratix10-rsu.c | 170 ++++- + drivers/firmware/stratix10-svc.c | 17 + + drivers/misc/c2port/core.c | 2 +- + drivers/misc/cardreader/Makefile | 2 +- + drivers/misc/cardreader/rts5228.c | 740 +++++++++++++++++++++ + drivers/misc/cardreader/rts5228.h | 168 +++++ + drivers/misc/cardreader/rtsx_pcr.c | 89 ++- + drivers/misc/cardreader/rtsx_pcr.h | 5 + + drivers/misc/cardreader/rtsx_usb.c | 2 +- + drivers/misc/cb710/core.c | 28 +- + drivers/misc/cb710/sgbuf2.c | 1 + + drivers/misc/cxl/flash.c | 4 +- + drivers/misc/cxl/hcalls.c | 42 +- + drivers/misc/cxl/sysfs.c | 2 +- + drivers/misc/cxl/vphb.c | 4 +- + drivers/misc/eeprom/at24.c | 2 +- + drivers/misc/eeprom/eeprom_93cx6.c | 4 +- + drivers/misc/enclosure.c | 8 +- + drivers/misc/genwqe/card_base.c | 32 +- + drivers/misc/genwqe/card_ddcb.c | 20 +- + drivers/misc/genwqe/card_debugfs.c | 2 +- + drivers/misc/genwqe/card_dev.c | 24 +- + drivers/misc/genwqe/card_sysfs.c | 8 +- + drivers/misc/genwqe/card_utils.c | 30 +- + drivers/misc/habanalabs/firmware_if.c | 3 + + drivers/misc/habanalabs/gaudi/gaudi.c | 2 +- + drivers/misc/habanalabs/gaudi/gaudi_security.c | 3 +- + drivers/misc/habanalabs/goya/goya.c | 16 +- + drivers/misc/habanalabs/goya/goya_coresight.c | 3 +- + drivers/misc/habanalabs/irq.c | 25 +- + drivers/misc/habanalabs/pci.c | 13 +- + drivers/misc/hpilo.c | 2 +- + drivers/misc/hpilo.h | 22 +- + drivers/misc/ibmasm/command.c | 6 +- + drivers/misc/ibmasm/dot_command.c | 6 +- + drivers/misc/ibmasm/event.c | 4 +- + drivers/misc/ibmasm/r_heartbeat.c | 2 +- + drivers/misc/ibmvmc.c | 6 +- + drivers/misc/lattice-ecp3-config.c | 19 +- + drivers/misc/lkdtm/bugs.c | 53 +- + drivers/misc/lkdtm/heap.c | 9 +- + drivers/misc/lkdtm/lkdtm.h | 2 - + drivers/misc/lkdtm/perms.c | 22 +- + drivers/misc/lkdtm/usercopy.c | 7 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- + drivers/misc/mei/hw-me-regs.h | 4 + + drivers/misc/mei/hw-me.c | 39 +- + drivers/misc/mei/hw-me.h | 2 +- + drivers/misc/mei/pci-me.c | 2 + + drivers/misc/mic/card/mic_debugfs.c | 10 +- + drivers/misc/mic/cosm/cosm_debugfs.c | 4 +- + drivers/misc/mic/cosm/cosm_main.c | 1 + + drivers/misc/mic/host/mic_debugfs.c | 8 +- + drivers/misc/mic/host/mic_intr.c | 4 +- + drivers/misc/mic/host/mic_main.c | 1 - + drivers/misc/mic/host/mic_x100.c | 13 + + drivers/misc/mic/host/mic_x100.h | 9 - + drivers/misc/mic/scif/scif_api.c | 6 +- + drivers/misc/mic/scif/scif_dma.c | 3 +- + drivers/misc/mic/scif/scif_epd.c | 9 + + drivers/misc/mic/scif/scif_fence.c | 34 +- + drivers/misc/mic/scif/scif_nm.c | 17 +- + drivers/misc/mic/scif/scif_nodeqp.c | 18 +- + drivers/misc/mic/scif/scif_ports.c | 9 +- + drivers/misc/mic/scif/scif_rma.c | 12 +- + drivers/misc/mic/vop/vop_main.c | 9 +- + drivers/misc/ocxl/config.c | 18 +- + drivers/misc/pch_phub.c | 57 +- + drivers/misc/phantom.c | 20 +- + drivers/misc/pti.c | 16 +- + drivers/misc/sgi-xp/xp_main.c | 4 +- + drivers/misc/ti-st/st_core.c | 79 ++- + drivers/misc/ti-st/st_kim.c | 71 +- + drivers/misc/tifm_7xx1.c | 30 +- + drivers/misc/uacce/uacce.c | 9 - + drivers/mmc/host/rtsx_pci_sdmmc.c | 2 + + drivers/mux/adgs1408.c | 6 +- + drivers/uio/uio_dmem_genirq.c | 19 + + drivers/uio/uio_pdrv_genirq.c | 24 +- + drivers/virt/vboxguest/vboxguest_core.c | 266 ++++++-- + drivers/virt/vboxguest/vboxguest_core.h | 23 +- + drivers/virt/vboxguest/vboxguest_utils.c | 1 + + include/linux/firmware/intel/stratix10-smc.h | 43 ++ + .../linux/firmware/intel/stratix10-svc-client.h | 17 +- + include/linux/rtsx_pci.h | 11 + + include/linux/vbox_utils.h | 1 + + include/linux/vmw_vmci_defs.h | 2 +- + include/uapi/linux/raw.h | 2 - + include/uapi/linux/vbox_vmmdev_types.h | 3 + + include/uapi/linux/vboxguest.h | 24 + + scripts/headers_install.sh | 1 - + tools/testing/selftests/lkdtm/run.sh | 6 + + tools/testing/selftests/lkdtm/tests.txt | 1 + + 105 files changed, 2129 insertions(+), 546 deletions(-) + create mode 100644 drivers/misc/cardreader/rts5228.c + create mode 100644 drivers/misc/cardreader/rts5228.h +Merging extcon/extcon-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (3b71c69024a7 soundwire: fix the kernel-doc comment) +$ git merge soundwire/next +Auto-merging include/linux/mod_devicetable.h +Auto-merging drivers/soundwire/intel.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/soundwire/stream.rst | 11 +- + MAINTAINERS | 3 +- + drivers/soundwire/Makefile | 10 +- + drivers/soundwire/bus.c | 130 ++++++++++++- + drivers/soundwire/bus_type.c | 19 +- + drivers/soundwire/cadence_master.c | 52 +++-- + drivers/soundwire/intel.c | 220 ++++++++++------------ + drivers/soundwire/intel.h | 13 ++ + drivers/soundwire/intel_init.c | 261 ++++++++++++++++++++------ + drivers/soundwire/qcom.c | 4 +- + drivers/soundwire/stream.c | 98 ++++++++++ + include/linux/mod_devicetable.h | 2 + + include/linux/soundwire/sdw.h | 33 ++-- + include/linux/soundwire/sdw_registers.h | 117 +++++++++++- + scripts/mod/devicetable-offsets.c | 2 + + scripts/mod/file2alias.c | 6 +- + 16 files changed, 748 insertions(+), 233 deletions(-) +Merging thunderbolt/next (ef7e12078ab8 thunderbolt: Fix old style declaration warning) +$ git merge thunderbolt/next +Auto-merging drivers/thunderbolt/tunnel.c +Auto-merging drivers/net/thunderbolt.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 57 +- + Documentation/admin-guide/thunderbolt.rst | 11 +- + drivers/net/thunderbolt.c | 4 +- + drivers/thunderbolt/Kconfig | 9 +- + drivers/thunderbolt/Makefile | 3 + + drivers/thunderbolt/domain.c | 2 +- + drivers/thunderbolt/eeprom.c | 1 + + drivers/thunderbolt/lc.c | 14 + + drivers/thunderbolt/nhi.c | 30 +- + drivers/thunderbolt/nvm.c | 170 +++ + drivers/thunderbolt/path.c | 38 +- + drivers/thunderbolt/quirks.c | 42 + + drivers/thunderbolt/retimer.c | 485 +++++++ + drivers/thunderbolt/sb_regs.h | 33 + + drivers/thunderbolt/switch.c | 232 ++-- + drivers/thunderbolt/tb.c | 388 ++++-- + drivers/thunderbolt/tb.h | 131 +- + drivers/thunderbolt/tb_regs.h | 31 + + drivers/thunderbolt/test.c | 1626 +++++++++++++++++++++++ + drivers/thunderbolt/tunnel.c | 314 ++++- + drivers/thunderbolt/tunnel.h | 37 +- + drivers/thunderbolt/usb4.c | 874 +++++++++++- + drivers/thunderbolt/xdomain.c | 94 +- + include/linux/thunderbolt.h | 2 - + 24 files changed, 4260 insertions(+), 368 deletions(-) + create mode 100644 drivers/thunderbolt/nvm.c + create mode 100644 drivers/thunderbolt/quirks.c + create mode 100644 drivers/thunderbolt/retimer.c + create mode 100644 drivers/thunderbolt/sb_regs.h + create mode 100644 drivers/thunderbolt/test.c +$ git am -3 ../patches/0001-thunderbolt-merge-fix-for-kunix_resource-changes.patch +Applying: thunderbolt: merge fix for kunix_resource changes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thunderbolt/test.c +$ git add -A . +$ git commit -v -a --amend +[master fb632c248f19] Merge remote-tracking branch 'thunderbolt/next' + Date: Mon Jul 20 15:18:14 2020 +1000 +Merging staging/staging-next (9d5d041eebe3 staging: comedi: comedi_fops.c: added casts to get rid of sparse warnings) +$ git merge staging/staging-next +Removing drivers/staging/wilc1000/TODO +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.h +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h +Removing drivers/staging/vc04_services/interface/vchi/vchi_common.h +Removing drivers/staging/vc04_services/interface/vchi/vchi_cfg.h +Removing drivers/staging/vc04_services/interface/vchi/vchi.h +Removing drivers/staging/rtl8192u/copying +Auto-merging drivers/staging/qlge/qlge_main.c +Auto-merging drivers/staging/android/ion/ion_heap.c +Auto-merging drivers/iio/pressure/zpa2326.c +Auto-merging drivers/iio/pressure/ms5611_core.c +Auto-merging drivers/iio/magnetometer/ak8974.c +CONFLICT (content): Merge conflict in drivers/iio/magnetometer/ak8974.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/iio/humidity/hts221_buffer.c +Auto-merging drivers/iio/humidity/hts221.h +Auto-merging drivers/iio/humidity/hdc100x.c +Auto-merging drivers/iio/health/afe4404.c +Auto-merging drivers/iio/health/afe4403.c +Auto-merging drivers/iio/adc/adi-axi-adc.c +Auto-merging drivers/iio/adc/ad7780.c +Auto-merging drivers/iio/accel/mma8452.c +Auto-merging drivers/counter/104-quad-8.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt +Removing Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt +Removing Documentation/devicetree/bindings/iio/adc/ingenic,adc.txt +Recorded preimage for 'drivers/iio/magnetometer/ak8974.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/iio/magnetometer/ak8974.c'. +[master 8af3f71b5892] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 3 +- + Documentation/ABI/testing/sysfs-bus-iio-icm42600 | 20 + + Documentation/ABI/testing/sysfs-bus-iio-scd30 | 34 + + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 4 +- + .../devicetree/bindings/iio/adc/ingenic,adc.txt | 49 -- + .../devicetree/bindings/iio/adc/ingenic,adc.yaml | 71 ++ + .../devicetree/bindings/iio/adc/qcom,spmi-vadc.txt | 173 ----- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 278 +++++++ + .../bindings/iio/chemical/sensirion,scd30.yaml | 68 ++ + .../devicetree/bindings/iio/dac/ti,dac7612.txt | 2 +- + .../devicetree/bindings/iio/iio-bindings.txt | 2 +- + .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 14 + + .../bindings/iio/imu/invensense,icm42600.yaml | 90 +++ + .../devicetree/bindings/iio/light/apds9300.txt | 2 +- + .../devicetree/bindings/iio/light/apds9960.txt | 2 +- + .../devicetree/bindings/iio/light/opt3001.txt | 2 +- + .../devicetree/bindings/iio/light/vl6180.txt | 2 +- + .../bindings/iio/magnetometer/ak8975.txt | 30 - + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 83 +++ + .../bindings/iio/magnetometer/bmc150_magn.txt | 6 +- + .../bindings/iio/potentiometer/mcp41010.txt | 2 +- + .../bindings/iio/potentiostat/lmp91000.txt | 4 +- + .../bindings/iio/pressure/asc,dlhl60d.yaml | 2 +- + .../bindings/iio/proximity/devantech-srf04.yaml | 4 +- + Documentation/driver-api/generic-counter.rst | 2 +- + Documentation/driver-api/iio/buffers.rst | 2 +- + MAINTAINERS | 18 +- + drivers/counter/104-quad-8.c | 1 - + drivers/counter/stm32-lptimer-cnt.c | 1 - + drivers/iio/accel/Kconfig | 8 +- + drivers/iio/accel/Makefile | 1 + + drivers/iio/accel/adis16201.c | 1 - + drivers/iio/accel/adis16209.c | 1 - + drivers/iio/accel/adxl345_core.c | 3 +- + drivers/iio/accel/adxl372.c | 21 +- + drivers/iio/accel/bma180.c | 1 - + drivers/iio/accel/bma220_spi.c | 1 - + drivers/iio/accel/bma400_core.c | 1 - + drivers/iio/accel/bma400_spi.c | 120 ++++ + drivers/iio/accel/bmc150-accel-core.c | 5 +- + drivers/iio/accel/cros_ec_accel_legacy.c | 46 +- + drivers/iio/accel/da280.c | 1 - + drivers/iio/accel/da311.c | 1 - + drivers/iio/accel/dmard06.c | 1 - + drivers/iio/accel/dmard09.c | 1 - + drivers/iio/accel/dmard10.c | 1 - + drivers/iio/accel/hid-sensor-accel-3d.c | 1 - + drivers/iio/accel/kxcjk-1013.c | 3 - + drivers/iio/accel/kxsd9.c | 3 - + drivers/iio/accel/mc3230.c | 1 - + drivers/iio/accel/mma7455_core.c | 1 - + drivers/iio/accel/mma7660.c | 1 - + drivers/iio/accel/mma8452.c | 1 - + drivers/iio/accel/mma9551.c | 1 - + drivers/iio/accel/mma9553.c | 1 - + drivers/iio/accel/mxc4005.c | 3 +- + drivers/iio/accel/mxc6255.c | 1 - + drivers/iio/accel/sca3000.c | 1 - + drivers/iio/accel/ssp_accel_sensor.c | 2 - + drivers/iio/accel/st_accel_buffer.c | 22 +- + drivers/iio/accel/stk8312.c | 3 - + drivers/iio/accel/stk8ba50.c | 3 - + drivers/iio/adc/Kconfig | 2 +- + drivers/iio/adc/ab8500-gpadc.c | 2 - + drivers/iio/adc/ad7091r-base.c | 1 - + drivers/iio/adc/ad7124.c | 1 - + drivers/iio/adc/ad7192.c | 1 - + drivers/iio/adc/ad7266.c | 4 - + drivers/iio/adc/ad7291.c | 2 - + drivers/iio/adc/ad7292.c | 1 - + drivers/iio/adc/ad7298.c | 2 - + drivers/iio/adc/ad7476.c | 3 - + drivers/iio/adc/ad7606.c | 4 +- + drivers/iio/adc/ad7766.c | 3 - + drivers/iio/adc/ad7768-1.c | 9 +- + drivers/iio/adc/ad7780.c | 1 - + drivers/iio/adc/ad7791.c | 2 - + drivers/iio/adc/ad7793.c | 2 - + drivers/iio/adc/ad7887.c | 5 - + drivers/iio/adc/ad7923.c | 2 - + drivers/iio/adc/ad7949.c | 4 +- + drivers/iio/adc/ad799x.c | 2 - + drivers/iio/adc/ad_sigma_delta.c | 5 - + drivers/iio/adc/adi-axi-adc.c | 1 - + drivers/iio/adc/aspeed_adc.c | 1 - + drivers/iio/adc/at91-sama5d2_adc.c | 49 +- + drivers/iio/adc/at91_adc.c | 31 +- + drivers/iio/adc/axp20x_adc.c | 2 - + drivers/iio/adc/axp288_adc.c | 1 - + drivers/iio/adc/bcm_iproc_adc.c | 2 - + drivers/iio/adc/berlin2-adc.c | 1 - + drivers/iio/adc/cc10001_adc.c | 1 - + drivers/iio/adc/cpcap-adc.c | 24 +- + drivers/iio/adc/da9150-gpadc.c | 2 - + drivers/iio/adc/dln2-adc.c | 13 +- + drivers/iio/adc/envelope-detector.c | 2 - + drivers/iio/adc/ep93xx_adc.c | 1 - + drivers/iio/adc/exynos_adc.c | 2 - + drivers/iio/adc/fsl-imx25-gcq.c | 1 - + drivers/iio/adc/hi8435.c | 8 +- + drivers/iio/adc/hx711.c | 1 - + drivers/iio/adc/imx7d_adc.c | 1 - + drivers/iio/adc/ina2xx-adc.c | 4 +- + drivers/iio/adc/ingenic-adc.c | 6 +- + drivers/iio/adc/intel_mrfld_adc.c | 1 - + drivers/iio/adc/lp8788_adc.c | 2 - + drivers/iio/adc/lpc18xx_adc.c | 1 - + drivers/iio/adc/lpc32xx_adc.c | 6 +- + drivers/iio/adc/ltc2471.c | 1 - + drivers/iio/adc/ltc2485.c | 1 - + drivers/iio/adc/ltc2496.c | 4 +- + drivers/iio/adc/ltc2497-core.c | 1 - + drivers/iio/adc/ltc2497.c | 4 +- + drivers/iio/adc/max1027.c | 7 +- + drivers/iio/adc/max11100.c | 7 +- + drivers/iio/adc/max1118.c | 8 +- + drivers/iio/adc/max1241.c | 1 - + drivers/iio/adc/max1363.c | 15 +- + drivers/iio/adc/max9611.c | 2 - + drivers/iio/adc/mcp320x.c | 15 +- + drivers/iio/adc/mcp3422.c | 12 +- + drivers/iio/adc/mcp3911.c | 2 - + drivers/iio/adc/men_z188_adc.c | 1 - + drivers/iio/adc/meson_saradc.c | 2 - + drivers/iio/adc/mt6577_auxadc.c | 1 - + drivers/iio/adc/mxs-lradc-adc.c | 3 - + drivers/iio/adc/nau7802.c | 2 - + drivers/iio/adc/npcm_adc.c | 1 - + drivers/iio/adc/palmas_gpadc.c | 1 - + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 2 - + drivers/iio/adc/qcom-spmi-adc5.c | 244 ++++++- + drivers/iio/adc/qcom-spmi-iadc.c | 2 - + drivers/iio/adc/qcom-spmi-vadc.c | 2 - + drivers/iio/adc/qcom-vadc-common.c | 262 +++++++ + drivers/iio/adc/qcom-vadc-common.h | 15 + + drivers/iio/adc/rcar-gyroadc.c | 2 - + drivers/iio/adc/rn5t618-adc.c | 1 - + drivers/iio/adc/rockchip_saradc.c | 219 ++++-- + drivers/iio/adc/sc27xx_adc.c | 1 - + drivers/iio/adc/sd_adc_modulator.c | 7 +- + drivers/iio/adc/spear_adc.c | 1 - + drivers/iio/adc/stm32-adc.c | 155 ++-- + drivers/iio/adc/stm32-dfsdm-adc.c | 105 +-- + drivers/iio/adc/stmpe-adc.c | 1 - + drivers/iio/adc/stx104.c | 1 - + drivers/iio/adc/sun4i-gpadc-iio.c | 2 - + drivers/iio/adc/ti-adc081c.c | 14 +- + drivers/iio/adc/ti-adc0832.c | 11 +- + drivers/iio/adc/ti-adc084s021.c | 9 +- + drivers/iio/adc/ti-adc108s102.c | 1 - + drivers/iio/adc/ti-adc12138.c | 1 - + drivers/iio/adc/ti-adc128s052.c | 8 +- + drivers/iio/adc/ti-adc161s626.c | 5 +- + drivers/iio/adc/ti-ads1015.c | 4 - + drivers/iio/adc/ti-ads124s08.c | 4 +- + drivers/iio/adc/ti-ads7950.c | 3 +- + drivers/iio/adc/ti-ads8344.c | 4 +- + drivers/iio/adc/ti-ads8688.c | 2 - + drivers/iio/adc/ti-tlc4541.c | 10 +- + drivers/iio/adc/ti_am335x_adc.c | 38 +- + drivers/iio/adc/twl4030-madc.c | 4 +- + drivers/iio/adc/twl6030-gpadc.c | 1 - + drivers/iio/adc/vf610_adc.c | 9 +- + drivers/iio/adc/viperboard_adc.c | 1 - + drivers/iio/adc/xilinx-xadc-core.c | 4 - + drivers/iio/afe/iio-rescale.c | 1 - + drivers/iio/amplifiers/ad8366.c | 8 +- + drivers/iio/amplifiers/hmc425a.c | 1 - + drivers/iio/buffer/industrialio-triggered-buffer.c | 10 +- + drivers/iio/chemical/Kconfig | 33 + + drivers/iio/chemical/Makefile | 3 + + drivers/iio/chemical/ams-iaq-core.c | 1 - + drivers/iio/chemical/atlas-ezo-sensor.c | 5 +- + drivers/iio/chemical/atlas-sensor.c | 7 +- + drivers/iio/chemical/bme680_core.c | 1 - + drivers/iio/chemical/ccs811.c | 1 - + drivers/iio/chemical/pms7003.c | 1 - + drivers/iio/chemical/scd30.h | 78 ++ + drivers/iio/chemical/scd30_core.c | 771 ++++++++++++++++++++ + drivers/iio/chemical/scd30_i2c.c | 139 ++++ + drivers/iio/chemical/scd30_serial.c | 263 +++++++ + drivers/iio/chemical/sgp30.c | 1 - + drivers/iio/chemical/sps30.c | 1 - + drivers/iio/chemical/vz89x.c | 1 - + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 5 + + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 24 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 - + drivers/iio/common/st_sensors/st_sensors_spi.c | 1 - + drivers/iio/dac/ad5064.c | 1 - + drivers/iio/dac/ad5360.c | 1 - + drivers/iio/dac/ad5380.c | 3 +- + drivers/iio/dac/ad5421.c | 1 - + drivers/iio/dac/ad5446.c | 2 - + drivers/iio/dac/ad5449.c | 1 - + drivers/iio/dac/ad5504.c | 1 - + drivers/iio/dac/ad5592r-base.c | 9 +- + drivers/iio/dac/ad5624r_spi.c | 1 - + drivers/iio/dac/ad5686.c | 1 - + drivers/iio/dac/ad5755.c | 1 - + drivers/iio/dac/ad5758.c | 1 - + drivers/iio/dac/ad5761.c | 1 - + drivers/iio/dac/ad5764.c | 1 - + drivers/iio/dac/ad5770r.c | 1 - + drivers/iio/dac/ad5791.c | 1 - + drivers/iio/dac/ad7303.c | 1 - + drivers/iio/dac/ad8801.c | 1 - + drivers/iio/dac/cio-dac.c | 1 - + drivers/iio/dac/dpot-dac.c | 1 - + drivers/iio/dac/ds4424.c | 2 - + drivers/iio/dac/lpc18xx_dac.c | 1 - + drivers/iio/dac/ltc1660.c | 1 - + drivers/iio/dac/ltc2632.c | 1 - + drivers/iio/dac/m62332.c | 3 - + drivers/iio/dac/max517.c | 3 - + drivers/iio/dac/max5821.c | 1 - + drivers/iio/dac/mcp4725.c | 1 - + drivers/iio/dac/mcp4922.c | 1 - + drivers/iio/dac/stm32-dac.c | 1 - + drivers/iio/dac/ti-dac082s085.c | 13 +- + drivers/iio/dac/ti-dac5571.c | 20 +- + drivers/iio/dac/ti-dac7311.c | 4 +- + drivers/iio/dac/ti-dac7612.c | 1 - + drivers/iio/dac/vf610_dac.c | 2 - + drivers/iio/dummy/iio_simple_dummy.c | 14 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 14 - + drivers/iio/frequency/ad9523.c | 1 - + drivers/iio/frequency/adf4350.c | 1 - + drivers/iio/frequency/adf4371.c | 1 - + drivers/iio/gyro/adis16080.c | 1 - + drivers/iio/gyro/adis16130.c | 1 - + drivers/iio/gyro/adis16136.c | 1 - + drivers/iio/gyro/adis16260.c | 1 - + drivers/iio/gyro/adxrs450.c | 1 - + drivers/iio/gyro/bmg160_core.c | 3 - + drivers/iio/gyro/fxas21002c_core.c | 1 - + drivers/iio/gyro/hid-sensor-gyro-3d.c | 1 - + drivers/iio/gyro/itg3200_core.c | 1 - + drivers/iio/gyro/mpu3050-core.c | 3 - + drivers/iio/gyro/ssp_gyro_sensor.c | 1 - + drivers/iio/gyro/st_gyro_buffer.c | 21 +- + drivers/iio/health/afe4403.c | 3 +- + drivers/iio/health/afe4404.c | 3 +- + drivers/iio/health/afe440x.h | 2 +- + drivers/iio/health/max30100.c | 1 - + drivers/iio/health/max30102.c | 1 - + drivers/iio/humidity/am2315.c | 1 - + drivers/iio/humidity/dht11.c | 1 - + drivers/iio/humidity/hdc100x.c | 23 +- + drivers/iio/humidity/hid-sensor-humidity.c | 1 - + drivers/iio/humidity/hts221.h | 4 +- + drivers/iio/humidity/hts221_buffer.c | 11 +- + drivers/iio/humidity/hts221_core.c | 5 +- + drivers/iio/humidity/htu21.c | 1 - + drivers/iio/humidity/si7005.c | 1 - + drivers/iio/humidity/si7020.c | 1 - + drivers/iio/iio_core_trigger.h | 17 + + drivers/iio/imu/Kconfig | 1 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis16400.c | 1 - + drivers/iio/imu/adis16460.c | 1 - + drivers/iio/imu/adis16475.c | 1 - + drivers/iio/imu/adis16480.c | 7 +- + drivers/iio/imu/bmi160/bmi160.h | 3 + + drivers/iio/imu/bmi160/bmi160_core.c | 47 +- + drivers/iio/imu/fxos8700_core.c | 1 - + drivers/iio/imu/inv_icm42600/Kconfig | 29 + + drivers/iio/imu/inv_icm42600/Makefile | 15 + + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 395 ++++++++++ + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 787 ++++++++++++++++++++ + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 601 ++++++++++++++++ + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h | 98 +++ + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 786 ++++++++++++++++++++ + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 798 +++++++++++++++++++++ + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 101 +++ + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 100 +++ + drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c | 84 +++ + drivers/iio/imu/inv_icm42600/inv_icm42600_temp.h | 30 + + .../iio/imu/inv_icm42600/inv_icm42600_timestamp.c | 195 +++++ + .../iio/imu/inv_icm42600/inv_icm42600_timestamp.h | 85 +++ + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 6 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 1 - + drivers/iio/imu/kmx61.c | 1 - + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 1 - + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 1 - + drivers/iio/industrialio-buffer.c | 58 +- + drivers/iio/industrialio-core.c | 129 ++-- + drivers/iio/industrialio-event.c | 68 +- + drivers/iio/industrialio-trigger.c | 22 +- + drivers/iio/light/acpi-als.c | 1 - + drivers/iio/light/adjd_s311.c | 1 - + drivers/iio/light/adux1020.c | 1 - + drivers/iio/light/al3010.c | 1 - + drivers/iio/light/al3320a.c | 1 - + drivers/iio/light/apds9300.c | 1 - + drivers/iio/light/apds9960.c | 1 - + drivers/iio/light/bh1750.c | 1 - + drivers/iio/light/bh1780.c | 1 - + drivers/iio/light/cm32181.c | 1 - + drivers/iio/light/cm3232.c | 1 - + drivers/iio/light/cm3323.c | 1 - + drivers/iio/light/cm3605.c | 1 - + drivers/iio/light/cm36651.c | 1 - + drivers/iio/light/cros_ec_light_prox.c | 6 +- + drivers/iio/light/gp2ap002.c | 1 - + drivers/iio/light/gp2ap020a00f.c | 11 - + drivers/iio/light/hid-sensor-als.c | 1 - + drivers/iio/light/hid-sensor-prox.c | 1 - + drivers/iio/light/iqs621-als.c | 7 +- + drivers/iio/light/isl29018.c | 1 - + drivers/iio/light/isl29028.c | 1 - + drivers/iio/light/isl29125.c | 21 +- + drivers/iio/light/jsa1212.c | 1 - + drivers/iio/light/lm3533-als.c | 2 +- + drivers/iio/light/ltr501.c | 1 - + drivers/iio/light/lv0104cs.c | 3 +- + drivers/iio/light/max44000.c | 1 - + drivers/iio/light/max44009.c | 1 - + drivers/iio/light/noa1305.c | 1 - + drivers/iio/light/opt3001.c | 3 +- + drivers/iio/light/pa12203001.c | 1 - + drivers/iio/light/rpr0521.c | 3 - + drivers/iio/light/si1133.c | 1 - + drivers/iio/light/si1145.c | 3 - + drivers/iio/light/st_uvis25_core.c | 3 - + drivers/iio/light/stk3310.c | 3 +- + drivers/iio/light/tcs3414.c | 21 +- + drivers/iio/light/tcs3472.c | 1 - + drivers/iio/light/tsl2563.c | 13 +- + drivers/iio/light/tsl2583.c | 1 - + drivers/iio/light/tsl2772.c | 1 - + drivers/iio/light/tsl4531.c | 1 - + drivers/iio/light/us5182d.c | 1 - + drivers/iio/light/vcnl4000.c | 36 +- + drivers/iio/light/vcnl4035.c | 1 - + drivers/iio/light/veml6030.c | 1 - + drivers/iio/light/veml6070.c | 1 - + drivers/iio/light/vl6180.c | 1 - + drivers/iio/light/zopt2201.c | 1 - + drivers/iio/magnetometer/ak8974.c | 1 - + drivers/iio/magnetometer/ak8975.c | 23 +- + drivers/iio/magnetometer/bmc150_magn.c | 3 - + drivers/iio/magnetometer/bmc150_magn_i2c.c | 3 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 1 - + drivers/iio/magnetometer/hmc5843_core.c | 1 - + drivers/iio/magnetometer/mag3110.c | 1 - + drivers/iio/magnetometer/mmc35240.c | 3 +- + drivers/iio/magnetometer/rm3100-core.c | 3 - + drivers/iio/magnetometer/st_magn_buffer.c | 26 +- + drivers/iio/multiplexer/iio-mux.c | 1 - + drivers/iio/orientation/hid-sensor-incl-3d.c | 1 - + drivers/iio/orientation/hid-sensor-rotation.c | 1 - + drivers/iio/position/iqs624-pos.c | 7 +- + drivers/iio/potentiometer/ad5272.c | 3 +- + drivers/iio/potentiometer/ds1803.c | 1 - + drivers/iio/potentiometer/max5432.c | 1 - + drivers/iio/potentiometer/max5481.c | 3 +- + drivers/iio/potentiometer/max5487.c | 1 - + drivers/iio/potentiometer/mcp4018.c | 1 - + drivers/iio/potentiometer/mcp41010.c | 3 +- + drivers/iio/potentiometer/mcp4131.c | 3 +- + drivers/iio/potentiometer/mcp4531.c | 1 - + drivers/iio/potentiometer/tpl0102.c | 1 - + drivers/iio/potentiostat/lmp91000.c | 14 +- + drivers/iio/pressure/abp060mg.c | 1 - + drivers/iio/pressure/bmp280-core.c | 1 - + drivers/iio/pressure/cros_ec_baro.c | 8 +- + drivers/iio/pressure/dlhl60d.c | 4 +- + drivers/iio/pressure/dps310.c | 1 - + drivers/iio/pressure/hid-sensor-press.c | 1 - + drivers/iio/pressure/hp03.c | 1 - + drivers/iio/pressure/hp206c.c | 1 - + drivers/iio/pressure/icp10100.c | 1 - + drivers/iio/pressure/mpl115.c | 1 - + drivers/iio/pressure/mpl3115.c | 1 - + drivers/iio/pressure/ms5611_core.c | 1 - + drivers/iio/pressure/ms5637.c | 1 - + drivers/iio/pressure/st_pressure_buffer.c | 26 +- + drivers/iio/pressure/t5403.c | 1 - + drivers/iio/pressure/zpa2326.c | 28 +- + drivers/iio/proximity/as3935.c | 1 - + drivers/iio/proximity/isl29501.c | 1 - + drivers/iio/proximity/mb1232.c | 1 - + drivers/iio/proximity/ping.c | 1 - + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 1 - + drivers/iio/proximity/rfd77402.c | 1 - + drivers/iio/proximity/srf04.c | 3 +- + drivers/iio/proximity/srf08.c | 7 +- + drivers/iio/proximity/sx9310.c | 3 - + drivers/iio/proximity/sx9500.c | 10 - + drivers/iio/proximity/vcnl3020.c | 1 - + drivers/iio/proximity/vl53l0x-i2c.c | 1 - + drivers/iio/resolver/ad2s1200.c | 1 - + drivers/iio/resolver/ad2s90.c | 1 - + drivers/iio/temperature/hid-sensor-temperature.c | 1 - + drivers/iio/temperature/iqs620at-temp.c | 1 - + drivers/iio/temperature/ltc2983.c | 1 - + drivers/iio/temperature/max31856.c | 2 - + drivers/iio/temperature/maxim_thermocouple.c | 1 - + drivers/iio/temperature/mlx90614.c | 1 - + drivers/iio/temperature/mlx90632.c | 1 - + drivers/iio/temperature/tmp006.c | 1 - + drivers/iio/temperature/tmp007.c | 1 - + drivers/iio/temperature/tsys01.c | 1 - + drivers/iio/temperature/tsys02d.c | 1 - + drivers/iio/trigger/stm32-timer-trigger.c | 2 - + drivers/input/touchscreen/tsc2007_iio.c | 1 - + drivers/most/core.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 3 +- + drivers/staging/android/ion/ion.c | 25 +- + drivers/staging/android/ion/ion.h | 1 - + drivers/staging/android/ion/ion_heap.c | 53 +- + drivers/staging/android/ion/ion_system_heap.c | 2 +- + drivers/staging/clocking-wizard/Kconfig | 2 +- + drivers/staging/comedi/comedi_fops.c | 7 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 18 +- + drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 14 + + drivers/staging/fsl-dpaa2/ethsw/dpsw.c | 106 +++ + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 9 + + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 102 ++- + drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 4 + + drivers/staging/gasket/gasket_core.c | 29 +- + drivers/staging/gasket/gasket_page_table.c | 6 +- + drivers/staging/gasket/gasket_sysfs.h | 2 +- + drivers/staging/iio/Documentation/device.txt | 4 +- + drivers/staging/iio/accel/adis16203.c | 1 - + drivers/staging/iio/accel/adis16240.c | 1 - + drivers/staging/iio/adc/ad7280a.c | 1 - + drivers/staging/iio/adc/ad7816.c | 1 - + drivers/staging/iio/addac/adt7316.c | 1 - + drivers/staging/iio/cdc/ad7150.c | 2 - + drivers/staging/iio/cdc/ad7746.c | 2 - + drivers/staging/iio/frequency/ad9832.c | 1 - + drivers/staging/iio/frequency/ad9834.c | 1 - + drivers/staging/iio/impedance-analyzer/ad5933.c | 1 - + drivers/staging/iio/resolver/ad2s1210.c | 1 - + drivers/staging/kpc2000/kpc_dma/fileops.c | 39 +- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 1 + + drivers/staging/ks7010/ks_wlan_net.c | 4 +- + drivers/staging/most/cdev/cdev.c | 49 +- + drivers/staging/most/sound/sound.c | 58 +- + drivers/staging/nvec/README | 2 +- + drivers/staging/qlge/qlge.h | 7 +- + drivers/staging/qlge/qlge_dbg.c | 588 +++++++-------- + drivers/staging/qlge/qlge_ethtool.c | 8 +- + drivers/staging/qlge/qlge_main.c | 69 +- + drivers/staging/qlge/qlge_mpi.c | 55 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 20 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 89 +-- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 48 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 115 ++- + drivers/staging/rtl8188eu/core/rtw_security.c | 107 +-- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 68 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- + drivers/staging/rtl8188eu/include/drv_types.h | 1 - + .../staging/rtl8188eu/include/hal8188e_phy_cfg.h | 25 - + .../rtl8188eu/include/hal8188e_rate_adaptive.h | 12 +- + drivers/staging/rtl8188eu/include/hal_com.h | 1 - + drivers/staging/rtl8188eu/include/ieee80211.h | 11 - + drivers/staging/rtl8188eu/include/odm.h | 6 +- + drivers/staging/rtl8188eu/include/odm_debug.h | 2 - + drivers/staging/rtl8188eu/include/pwrseq.h | 3 - + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 1 - + drivers/staging/rtl8188eu/include/recv_osdep.h | 2 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 1 - + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 1 - + drivers/staging/rtl8188eu/include/rtw_debug.h | 1 - + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 2 - + drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 1 - + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 3 - + drivers/staging/rtl8188eu/include/rtw_recv.h | 3 - + drivers/staging/rtl8188eu/include/rtw_rf.h | 1 - + drivers/staging/rtl8188eu/include/rtw_security.h | 3 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 6 - + drivers/staging/rtl8188eu/include/wifi.h | 55 -- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 3 - + drivers/staging/rtl8188eu/include/xmit_osdep.h | 3 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 56 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 2 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 12 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 76 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 26 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.h | 4 +- + drivers/staging/rtl8192u/copying | 340 --------- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 16 - + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8192u/r8192U_dm.c | 4 +- + drivers/staging/rtl8712/Kconfig | 2 +- + drivers/staging/rtl8712/basic_types.h | 8 - + drivers/staging/rtl8712/hal_init.c | 25 +- + drivers/staging/rtl8712/ieee80211.h | 584 +-------------- + drivers/staging/rtl8712/osdep_intf.h | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 44 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 7 +- + drivers/staging/rtl8712/rtl871x_ht.h | 2 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 19 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 30 +- + drivers/staging/rtl8712/rtl871x_recv.c | 7 +- + drivers/staging/rtl8712/rtl871x_recv.h | 2 - + drivers/staging/rtl8712/rtl871x_security.c | 2 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8712/usb_intf.c | 11 +- + drivers/staging/rtl8712/wifi.h | 76 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 6 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 3 - + drivers/staging/rtl8723bs/include/wifi.h | 5 - + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 70 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 5 - + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 2 +- + drivers/staging/rts5208/ms.c | 6 +- + drivers/staging/rts5208/rtsx.c | 31 +- + drivers/staging/rts5208/rtsx_chip.c | 12 +- + drivers/staging/speakup/spkguide.txt | 2 +- + drivers/staging/vc04_services/Kconfig | 2 + + drivers/staging/vc04_services/Makefile | 9 +- + .../staging/vc04_services/bcm2835-audio/Makefile | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 100 ++- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 4 +- + .../bcm2835-audio/vc_vchi_audioserv_defs.h | 5 +- + .../staging/vc04_services/bcm2835-camera/Kconfig | 1 + + .../staging/vc04_services/bcm2835-camera/Makefile | 4 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 66 +- + .../linux/raspberrypi/vchiq.h} | 67 +- + .../vc04_services/interface/{vchi => }/TODO | 0 + .../staging/vc04_services/interface/vchi/vchi.h | 159 ---- + .../vc04_services/interface/vchi/vchi_cfg.h | 238 ------ + .../vc04_services/interface/vchi/vchi_common.h | 138 ---- + .../vc04_services/interface/vchiq_arm/vchiq.h | 21 - + .../interface/vchiq_arm/vchiq_2835_arm.c | 17 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 88 ++- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 119 ++- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 46 +- + .../interface/vchiq_arm/vchiq_ioctl.h | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 617 ---------------- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 85 --- + .../vc04_services/interface/vchiq_arm/vchiq_util.h | 50 -- + drivers/staging/vc04_services/vchiq-mmal/Kconfig | 7 + + drivers/staging/vc04_services/vchiq-mmal/Makefile | 9 + + .../{bcm2835-camera => vchiq-mmal}/mmal-common.h | 5 + + .../mmal-encodings.h | 0 + .../mmal-msg-common.h | 0 + .../mmal-msg-format.h | 0 + .../{bcm2835-camera => vchiq-mmal}/mmal-msg-port.h | 0 + .../{bcm2835-camera => vchiq-mmal}/mmal-msg.h | 2 +- + .../mmal-parameters.h | 32 +- + .../{bcm2835-camera => vchiq-mmal}/mmal-vchiq.c | 274 ++++--- + .../{bcm2835-camera => vchiq-mmal}/mmal-vchiq.h | 6 +- + drivers/staging/vt6655/channel.c | 2 +- + drivers/staging/vt6655/device_main.c | 25 +- + drivers/staging/vt6655/key.c | 6 +- + drivers/staging/vt6655/rxtx.c | 80 +-- + drivers/staging/vt6656/channel.c | 2 +- + drivers/staging/vt6656/key.c | 2 +- + drivers/staging/wfx/bh.c | 34 +- + drivers/staging/wfx/bus_spi.c | 14 +- + drivers/staging/wfx/data_rx.c | 85 +-- + drivers/staging/wfx/data_tx.c | 127 ++-- + drivers/staging/wfx/data_tx.h | 3 +- + drivers/staging/wfx/debug.c | 23 + + drivers/staging/wfx/fwio.c | 11 +- + drivers/staging/wfx/hif_rx.c | 22 +- + drivers/staging/wfx/main.c | 51 +- + drivers/staging/wfx/main.h | 2 - + drivers/staging/wfx/queue.c | 150 ++-- + drivers/staging/wfx/queue.h | 13 +- + drivers/staging/wfx/sta.c | 36 +- + drivers/staging/wfx/sta.h | 4 +- + drivers/staging/wfx/traces.h | 51 ++ + drivers/staging/wfx/wfx.h | 5 +- + drivers/staging/wilc1000/TODO | 3 - + include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h | 67 ++ + include/dt-bindings/iio/qcom,spmi-adc7-pm8350b.h | 88 +++ + include/dt-bindings/iio/qcom,spmi-adc7-pmk8350.h | 46 ++ + include/dt-bindings/iio/qcom,spmi-adc7-pmr735a.h | 28 + + include/dt-bindings/iio/qcom,spmi-adc7-pmr735b.h | 28 + + include/dt-bindings/iio/qcom,spmi-vadc.h | 78 +- + include/linux/iio/common/cros_ec_sensors_core.h | 11 +- + include/linux/iio/iio-opaque.h | 36 + + include/linux/iio/iio.h | 61 +- + include/linux/iio/trigger_consumer.h | 7 - + 588 files changed, 10002 insertions(+), 5965 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-icm42600 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-scd30 + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ingenic,adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/chemical/sensirion,scd30.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/invensense,icm42600.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/asahi-kasei,ak8975.yaml + create mode 100644 drivers/iio/accel/bma400_spi.c + create mode 100644 drivers/iio/chemical/scd30.h + create mode 100644 drivers/iio/chemical/scd30_core.c + create mode 100644 drivers/iio/chemical/scd30_i2c.c + create mode 100644 drivers/iio/chemical/scd30_serial.c + create mode 100644 drivers/iio/imu/inv_icm42600/Kconfig + create mode 100644 drivers/iio/imu/inv_icm42600/Makefile + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600.h + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_core.c + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_temp.h + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_timestamp.c + create mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_timestamp.h + delete mode 100644 drivers/staging/rtl8192u/copying + rename drivers/staging/vc04_services/{interface/vchiq_arm/vchiq_if.h => include/linux/raspberrypi/vchiq.h} (56%) + rename drivers/staging/vc04_services/interface/{vchi => }/TODO (100%) + delete mode 100644 drivers/staging/vc04_services/interface/vchi/vchi.h + delete mode 100644 drivers/staging/vc04_services/interface/vchi/vchi_cfg.h + delete mode 100644 drivers/staging/vc04_services/interface/vchi/vchi_common.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.h + create mode 100644 drivers/staging/vc04_services/vchiq-mmal/Kconfig + create mode 100644 drivers/staging/vc04_services/vchiq-mmal/Makefile + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-common.h (96%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-encodings.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg-common.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg-format.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg-port.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg.h (99%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-parameters.h (96%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-vchiq.c (88%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-vchiq.h (97%) + delete mode 100644 drivers/staging/wilc1000/TODO + create mode 100644 include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h + create mode 100644 include/dt-bindings/iio/qcom,spmi-adc7-pm8350b.h + create mode 100644 include/dt-bindings/iio/qcom,spmi-adc7-pmk8350.h + create mode 100644 include/dt-bindings/iio/qcom,spmi-adc7-pmr735a.h + create mode 100644 include/dt-bindings/iio/qcom,spmi-adc7-pmr735b.h + create mode 100644 include/linux/iio/iio-opaque.h +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. +Merging icc/icc-next (0d64189c3617 interconnect: msm8916: Fix buswidth of pcnoc_s nodes) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + drivers/interconnect/core.c | 16 ++++++++-------- + drivers/interconnect/qcom/msm8916.c | 14 +++++++------- + include/linux/interconnect-provider.h | 16 ++++++++++++---- + 3 files changed, 27 insertions(+), 19 deletions(-) +Merging dmaengine/next (9c5ba900e511 Merge branch 'for-linus' into next) +$ git merge dmaengine/next +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/dma/ioat/init.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/driver-api/dmaengine/provider.rst +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4b7feb7a1b3f] Merge remote-tracking branch 'dmaengine/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 56 ++--- + .../devicetree/bindings/dma/arm-pl330.txt | 1 + + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 1 + + .../devicetree/bindings/dma/renesas,usb-dmac.yaml | 1 + + Documentation/driver-api/dmaengine/provider.rst | 21 +- + MAINTAINERS | 31 ++- + drivers/dma/Kconfig | 3 +- + drivers/dma/acpi-dma.c | 17 +- + drivers/dma/altera-msgdma.c | 6 +- + drivers/dma/at_hdmac.c | 6 +- + drivers/dma/dmatest.c | 11 +- + drivers/dma/dw/Makefile | 6 +- + drivers/dma/dw/acpi.c | 2 + + drivers/dma/dw/pci.c | 4 + + drivers/dma/ep93xx_dma.c | 2 + + drivers/dma/fsl-qdma.c | 65 +++++- + drivers/dma/hisi_dma.c | 5 +- + drivers/dma/idxd/cdev.c | 3 + + drivers/dma/idxd/device.c | 222 ++++++++----------- + drivers/dma/idxd/dma.c | 3 +- + drivers/dma/idxd/idxd.h | 21 +- + drivers/dma/idxd/init.c | 34 +-- + drivers/dma/idxd/irq.c | 43 ++-- + drivers/dma/idxd/submit.c | 74 +++---- + drivers/dma/idxd/sysfs.c | 24 +-- + drivers/dma/imx-sdma.c | 4 +- + drivers/dma/ioat/dma.c | 7 +- + drivers/dma/ioat/init.c | 2 +- + drivers/dma/iop-adma.c | 3 +- + drivers/dma/mediatek/mtk-hsdma.c | 8 +- + drivers/dma/mmp_pdma.c | 8 +- + drivers/dma/mmp_tdma.c | 2 +- + drivers/dma/mv_xor_v2.c | 6 +- + drivers/dma/nbpfaxi.c | 13 +- + drivers/dma/of-dma.c | 8 +- + drivers/dma/pl330.c | 66 +++--- + drivers/dma/ste_dma40.c | 2 + + drivers/dma/sun4i-dma.c | 12 +- + drivers/dma/ti/k3-udma-glue.c | 79 ++++--- + drivers/dma/ti/k3-udma-private.c | 8 +- + drivers/dma/ti/k3-udma.c | 240 +++++++++------------ + drivers/dma/ti/k3-udma.h | 61 ++---- + drivers/dma/xgene-dma.c | 2 + + include/linux/dmaengine.h | 4 +- + 44 files changed, 587 insertions(+), 610 deletions(-) +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 (bca2c579a5e9 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/aacraid/linit.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 136 +++ + Documentation/scsi/advansys.rst | 2 +- + Documentation/scsi/scsi-parameters.rst | 2 +- + drivers/s390/scsi/zfcp_ccw.c | 7 +- + drivers/s390/scsi/zfcp_erp.c | 2 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + drivers/s390/scsi/zfcp_qdio.c | 7 +- + drivers/scsi/Kconfig | 15 +- + drivers/scsi/aacraid/aachba.c | 22 +- + drivers/scsi/aacraid/commctrl.c | 14 +- + drivers/scsi/aacraid/commsup.c | 12 +- + drivers/scsi/aacraid/dpcsup.c | 15 +- + drivers/scsi/aacraid/linit.c | 6 +- + drivers/scsi/aacraid/rx.c | 12 +- + drivers/scsi/aha152x.c | 3 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 10 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 13 +- + drivers/scsi/aic94xx/aic94xx_hwi.c | 3 +- + drivers/scsi/aic94xx/aic94xx_init.c | 2 +- + drivers/scsi/aic94xx/aic94xx_scb.c | 6 +- + drivers/scsi/aic94xx/aic94xx_seq.c | 6 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 21 +- + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/be2iscsi/be_iscsi.c | 11 +- + drivers/scsi/be2iscsi/be_main.c | 4 +- + drivers/scsi/be2iscsi/be_mgmt.c | 3 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 18 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 22 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 7 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 4 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 242 +++-- + drivers/scsi/cxgbi/libcxgbi.c | 670 ++++++++++---- + drivers/scsi/cxgbi/libcxgbi.h | 46 +- + drivers/scsi/fcoe/fcoe.c | 10 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 28 +- + drivers/scsi/fcoe/fcoe_transport.c | 4 +- + drivers/scsi/fdomain.h | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 6 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 4 +- + drivers/scsi/hosts.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/ipr.c | 90 +- + drivers/scsi/ipr.h | 4 +- + drivers/scsi/libfc/fc_disc.c | 6 +- + drivers/scsi/libfc/fc_exch.c | 7 +- + drivers/scsi/libfc/fc_fcp.c | 11 +- + drivers/scsi/libfc/fc_lport.c | 7 +- + drivers/scsi/libfc/fc_rport.c | 4 +- + drivers/scsi/lpfc/lpfc.h | 15 + + drivers/scsi/lpfc/lpfc_bsg.c | 35 +- + drivers/scsi/lpfc/lpfc_bsg.h | 14 + + drivers/scsi/lpfc/lpfc_crtn.h | 2 +- + drivers/scsi/lpfc/lpfc_ct.c | 16 +- + drivers/scsi/lpfc/lpfc_els.c | 131 +-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 216 ++--- + drivers/scsi/lpfc/lpfc_hw4.h | 5 +- + drivers/scsi/lpfc/lpfc_init.c | 695 ++++++++------ + drivers/scsi/lpfc/lpfc_logmsg.h | 24 +- + drivers/scsi/lpfc/lpfc_mem.c | 3 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 67 +- + drivers/scsi/lpfc/lpfc_nvme.c | 110 ++- + drivers/scsi/lpfc/lpfc_nvmet.c | 96 +- + drivers/scsi/lpfc/lpfc_scsi.c | 125 +-- + drivers/scsi/lpfc/lpfc_sli.c | 556 +++++++----- + drivers/scsi/lpfc/lpfc_sli4.h | 18 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 86 +- + drivers/scsi/megaraid.c | 222 +++-- + drivers/scsi/megaraid/megaraid_mbox.c | 4 +- + drivers/scsi/megaraid/megaraid_mm.c | 1 - + drivers/scsi/megaraid/megaraid_sas.h | 20 + + drivers/scsi/megaraid/megaraid_sas_base.c | 175 ++-- + drivers/scsi/megaraid/megaraid_sas_fp.c | 11 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 93 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 14 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 7 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 16 +- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.h | 2 +- + drivers/scsi/myrs.c | 34 +- + drivers/scsi/pcmcia/nsp_cs.c | 5 +- + drivers/scsi/pm8001/pm8001_ctl.c | 14 + + drivers/scsi/pm8001/pm8001_init.c | 30 +- + drivers/scsi/qedf/qedf_debugfs.c | 18 +- + drivers/scsi/qedf/qedf_io.c | 30 +- + drivers/scsi/qedf/qedf_main.c | 10 +- + drivers/scsi/qla2xxx/qla_bsg.c | 3 +- + drivers/scsi/qla2xxx/qla_dbg.c | 111 +-- + drivers/scsi/qla2xxx/qla_dbg.h | 1 + + drivers/scsi/qla2xxx/qla_def.h | 64 +- + drivers/scsi/qla2xxx/qla_fw.h | 8 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 +- + drivers/scsi/qla2xxx/qla_init.c | 48 +- + drivers/scsi/qla2xxx/qla_inline.h | 2 +- + drivers/scsi/qla2xxx/qla_iocb.c | 10 +- + drivers/scsi/qla2xxx/qla_isr.c | 290 +++++- + drivers/scsi/qla2xxx/qla_mbx.c | 64 +- + drivers/scsi/qla2xxx/qla_nx.c | 20 +- + drivers/scsi/qla2xxx/qla_os.c | 37 +- + drivers/scsi/qla2xxx/qla_target.h | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 1 + + drivers/scsi/qla4xxx/ql4_init.c | 7 +- + drivers/scsi/scsi.c | 3 - + drivers/scsi/scsi_debug.c | 332 ++++--- + drivers/scsi/scsi_lib.c | 58 +- + drivers/scsi/scsi_priv.h | 1 - + drivers/scsi/scsi_transport_iscsi.c | 29 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/sd.h | 6 - + drivers/scsi/sd_zbc.c | 2 +- + drivers/scsi/storvsc_drv.c | 13 +- + drivers/scsi/ufs/Kconfig | 21 + + drivers/scsi/ufs/Makefile | 2 + + drivers/scsi/ufs/ufs-exynos.c | 1297 +++++++++++++++++++++++++++ + drivers/scsi/ufs/ufs-exynos.h | 287 ++++++ + drivers/scsi/ufs/ufs-mediatek.c | 138 ++- + drivers/scsi/ufs/ufs-mediatek.h | 4 +- + drivers/scsi/ufs/ufs.h | 38 +- + drivers/scsi/ufs/ufs_bsg.c | 5 +- + drivers/scsi/ufs/ufs_quirks.h | 3 +- + drivers/scsi/ufs/ufshcd-crypto.c | 238 +++++ + drivers/scsi/ufs/ufshcd-crypto.h | 77 ++ + drivers/scsi/ufs/ufshcd-pci.c | 25 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 27 +- + drivers/scsi/ufs/ufshcd.c | 530 +++++------ + drivers/scsi/ufs/ufshcd.h | 102 ++- + drivers/scsi/ufs/ufshci.h | 94 +- + drivers/scsi/ufs/unipro.h | 33 + + drivers/scsi/virtio_scsi.c | 14 +- + drivers/target/iscsi/cxgbit/cxgbit.h | 1 - + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 34 +- + drivers/target/iscsi/cxgbit/cxgbit_target.c | 24 +- + drivers/target/target_core_fabric_lib.c | 105 ++- + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_pr.c | 61 +- + drivers/target/target_core_transport.c | 7 +- + drivers/target/target_core_user.c | 24 +- + drivers/target/target_core_xcopy.c | 11 +- + include/scsi/fc/fc_ms.h | 4 +- + include/trace/events/ufs.h | 31 + + include/uapi/scsi/fc/fc_els.h | 2 + + 145 files changed, 6176 insertions(+), 2658 deletions(-) + create mode 100644 drivers/scsi/ufs/ufs-exynos.c + create mode 100644 drivers/scsi/ufs/ufs-exynos.h + create mode 100644 drivers/scsi/ufs/ufshcd-crypto.c + create mode 100644 drivers/scsi/ufs/ufshcd-crypto.h +Merging scsi-mkp/for-next (42b840bcfc16 scsi: aic7xxx: Fix 'amount_xferred' set but not used issue) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (cb91909e48a4 tools/virtio: Use tools/include/list.h instead of stubs) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (bb949a8b3fe6 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/remoteproc/qcom_q6v5_mss.c +Removing Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwlock/qcom-hwspinlock.txt | 39 ---- + .../bindings/hwlock/qcom-hwspinlock.yaml | 65 ++++++ + .../bindings/remoteproc/qcom,pil-info.yaml | 44 ++++ + drivers/hwspinlock/Kconfig | 10 +- + drivers/hwspinlock/qcom_hwspinlock.c | 70 +++++-- + drivers/remoteproc/Kconfig | 8 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/ingenic_rproc.c | 84 +++----- + drivers/remoteproc/qcom_common.c | 133 ++++++++++-- + drivers/remoteproc/qcom_common.h | 5 +- + drivers/remoteproc/qcom_pil_info.c | 129 ++++++++++++ + drivers/remoteproc/qcom_pil_info.h | 9 + + drivers/remoteproc/qcom_q6v5_adsp.c | 16 +- + drivers/remoteproc/qcom_q6v5_mss.c | 15 +- + drivers/remoteproc/qcom_q6v5_pas.c | 15 +- + drivers/remoteproc/qcom_q6v5_wcss.c | 14 +- + drivers/remoteproc/qcom_sysmon.c | 4 +- + drivers/remoteproc/qcom_wcnss.c | 14 +- + drivers/remoteproc/remoteproc_core.c | 233 ++++++++++++++++++--- + drivers/remoteproc/remoteproc_internal.h | 8 + + drivers/remoteproc/remoteproc_sysfs.c | 17 +- + include/linux/remoteproc.h | 9 +- + include/linux/remoteproc/qcom_rproc.h | 36 +++- + 23 files changed, 786 insertions(+), 192 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.txt + create mode 100644 Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml + create mode 100644 drivers/remoteproc/qcom_pil_info.c + create mode 100644 drivers/remoteproc/qcom_pil_info.h +Merging gpio/for-next (70d7cd6c82a9 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + .../devicetree/bindings/gpio/gpio-pca9570.yaml | 47 + + .../devicetree/bindings/gpio/gpio-zynq.txt | 4 +- + Documentation/driver-api/gpio/drivers-on-gpio.rst | 7 + + arch/arm/plat-orion/gpio.c | 8 +- + drivers/gpio/Kconfig | 12 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/TODO | 2 +- + drivers/gpio/gpio-aggregator.c | 63 +- + drivers/gpio/gpio-altera.c | 3 +- + drivers/gpio/gpio-it87.c | 14 +- + drivers/gpio/gpio-max732x.c | 2 +- + drivers/gpio/gpio-max77620.c | 71 +- + drivers/gpio/gpio-mlxbf.c | 2 +- + drivers/gpio/gpio-mlxbf2.c | 4 +- + drivers/gpio/gpio-mmio.c | 20 +- + drivers/gpio/gpio-mpc8xxx.c | 2 +- + drivers/gpio/gpio-mvebu.c | 8 +- + drivers/gpio/gpio-omap.c | 26 + + drivers/gpio/gpio-pca953x.c | 2 + + drivers/gpio/gpio-pca9570.c | 146 +++ + drivers/gpio/gpio-pmic-eic-sprd.c | 2 +- + drivers/gpio/gpio-sama5d2-piobu.c | 16 +- + drivers/gpio/gpio-syscon.c | 12 +- + drivers/gpio/gpio-xra1403.c | 8 +- + drivers/gpio/gpio-zynq.c | 66 +- + drivers/gpio/gpiolib-cdev.c | 1121 +++++++++++++++++++ + drivers/gpio/gpiolib-cdev.h | 11 + + drivers/gpio/gpiolib-of.c | 3 + + drivers/gpio/gpiolib-sysfs.c | 3 +- + drivers/gpio/gpiolib-sysfs.h | 24 + + drivers/gpio/gpiolib.c | 1144 +------------------- + drivers/gpio/gpiolib.h | 20 +- + drivers/pinctrl/pinctrl-at91.c | 7 +- + include/linux/gpio/driver.h | 18 +- + include/uapi/linux/gpio.h | 2 +- + tools/gpio/gpio-event-mon.c | 3 +- + tools/gpio/gpio-utils.c | 4 +- + tools/gpio/lsgpio.c | 3 +- + 39 files changed, 1634 insertions(+), 1279 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml + create mode 100644 drivers/gpio/gpio-pca9570.c + create mode 100644 drivers/gpio/gpiolib-cdev.c + create mode 100644 drivers/gpio/gpiolib-cdev.h + create mode 100644 drivers/gpio/gpiolib-sysfs.h +Merging gpio-brgl/gpio/for-next (df51f402e3b1 tools: gpio: fix spurious close warning in gpio-event-mon) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (532e762d51d0 gpio: pch: Move IRQ status message to verbose debug level) +$ git merge gpio-intel/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-ml-ioh.c | 2 +- + drivers/gpio/gpio-pch.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging pinctrl/for-next (8d93caaf4f6b Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +Auto-merging drivers/pinctrl/pinctrl-single.c +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-single.c +Auto-merging drivers/pinctrl/freescale/pinctrl-imx.c +Auto-merging drivers/gpio/gpio-omap.c +Auto-merging arch/arm/boot/dts/am33xx-l4.dtsi +Removing Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.txt +Auto-merging Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt +Removing Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.txt +Resolved 'drivers/pinctrl/pinctrl-single.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6253db4b45e3] Merge remote-tracking branch 'pinctrl/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/pinctrl/ingenic,pinctrl.txt | 81 -- + .../bindings/pinctrl/ingenic,pinctrl.yaml | 136 ++++ + .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 3 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 + + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 + + .../bindings/pinctrl/renesas,rza2-pinctrl.txt | 87 -- + .../bindings/pinctrl/renesas,rza2-pinctrl.yaml | 100 +++ + arch/arm/boot/dts/am33xx-l4.dtsi | 2 +- + drivers/gpio/gpio-omap.c | 17 +- + drivers/pinctrl/actions/pinctrl-owl.c | 4 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 7 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 25 +- + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 6 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 18 +- + drivers/pinctrl/core.c | 12 +- + drivers/pinctrl/devicetree.c | 5 +- + drivers/pinctrl/freescale/Kconfig | 14 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 2 + + drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 5 + + drivers/pinctrl/freescale/pinctrl-imx8mm.c | 6 + + drivers/pinctrl/freescale/pinctrl-imx8mn.c | 6 + + drivers/pinctrl/freescale/pinctrl-imx8mp.c | 6 + + drivers/pinctrl/freescale/pinctrl-imx8mq.c | 6 + + drivers/pinctrl/freescale/pinctrl-imx8qm.c | 5 + + drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 5 + + drivers/pinctrl/freescale/pinctrl-scu.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 2 +- + drivers/pinctrl/meson/pinctrl-meson-a1.c | 5 - + drivers/pinctrl/meson/pinctrl-meson.c | 11 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 7 +- + drivers/pinctrl/pinconf-generic.c | 3 +- + drivers/pinctrl/pinctrl-amd.c | 13 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 2 + + drivers/pinctrl/pinctrl-at91.c | 6 +- + drivers/pinctrl/pinctrl-bm1880.c | 4 +- + drivers/pinctrl/pinctrl-ingenic.c | 15 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 12 +- + drivers/pinctrl/pinctrl-ocelot.c | 430 +++++++++- + drivers/pinctrl/pinctrl-rockchip.c | 24 +- + drivers/pinctrl/pinctrl-rza1.c | 24 +- + drivers/pinctrl/pinctrl-single.c | 35 +- + drivers/pinctrl/pinmux.c | 5 +- + drivers/pinctrl/qcom/Kconfig | 2 + + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 1 + + drivers/pinctrl/qcom/pinctrl-ipq8074.c | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 93 ++- + drivers/pinctrl/qcom/pinctrl-msm.h | 6 + + drivers/pinctrl/qcom/pinctrl-msm8976.c | 3 - + drivers/pinctrl/qcom/pinctrl-sc7180.c | 1 + + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 4 + + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 4 +- + drivers/pinctrl/sh-pfc/Kconfig | 4 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 6 + + drivers/pinctrl/sh-pfc/pfc-r8a77951.c | 877 +++++++++++---------- + drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 76 ++ + drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 76 ++ + drivers/pinctrl/sh-pfc/sh_pfc.h | 1 + + drivers/pinctrl/sirf/pinctrl-atlas7.c | 21 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 60 +- + drivers/pinctrl/tegra/pinctrl-tegra194.c | 1 - + include/dt-bindings/pinctrl/omap.h | 2 +- + 65 files changed, 1683 insertions(+), 734 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.yaml +Merging pinctrl-intel/for-next (653d96455e1e pinctrl: tigerlake: Add support for Tiger Lake-H) +$ git merge pinctrl-intel/for-next +Auto-merging drivers/pinctrl/intel/pinctrl-baytrail.c +CONFLICT (content): Merge conflict in drivers/pinctrl/intel/pinctrl-baytrail.c +Resolved 'drivers/pinctrl/intel/pinctrl-baytrail.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 572635de50b8] Merge remote-tracking branch 'pinctrl-intel/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/pinctrl/intel/pinctrl-baytrail.c | 3 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 418 +++++++++++++++-------------- + drivers/pinctrl/intel/pinctrl-intel.c | 192 ++++++++----- + drivers/pinctrl/intel/pinctrl-intel.h | 4 + + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 28 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 50 ++-- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 358 ++++++++++++++++++++++++ + 7 files changed, 740 insertions(+), 313 deletions(-) +Merging pinctrl-samsung/for-next (7efece8a057f pinctrl: samsung: Use bank name as irqchip name) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 58 ++++++++++++++++++-------------- + 1 file changed, 32 insertions(+), 26 deletions(-) +Merging pwm/for-next (b8fb642afa02 pwm: iqs620a: Use lowercase hexadecimal literals for consistency) +$ git merge pwm/for-next +Auto-merging drivers/gpu/drm/i915/display/intel_panel.c +Merge made by the 'recursive' strategy. + drivers/clk/clk-pwm.c | 7 ++++++- + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/hwmon/pwm-fan.c | 2 +- + drivers/pwm/core.c | 14 +++++++------- + drivers/pwm/pwm-clps711x.c | 2 +- + drivers/pwm/pwm-imx-tpm.c | 2 +- + drivers/pwm/pwm-imx27.c | 2 +- + drivers/pwm/pwm-iqs620a.c | 15 ++++++++------- + drivers/pwm/pwm-sifive.c | 2 +- + drivers/pwm/pwm-stm32-lp.c | 2 +- + drivers/pwm/pwm-sun4i.c | 2 +- + drivers/pwm/sysfs.c | 8 ++++---- + drivers/video/backlight/pwm_bl.c | 3 ++- + drivers/video/fbdev/ssd1307fb.c | 2 +- + include/linux/pwm.h | 12 ++++++------ + 15 files changed, 42 insertions(+), 35 deletions(-) +Merging userns/for-next (f06b71fe4d4c Make the user mode driver code a better citizen) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (3ff6685579ae ktest.pl: Add MAIL_MAX_SIZE to limit the amount of log emailed) +$ git merge ktest/for-next +Merge made by the 'recursive' strategy. + tools/testing/ktest/ktest.pl | 99 ++++++++++++++++++++++++++++++++++------- + tools/testing/ktest/sample.conf | 18 ++++++++ + 2 files changed, 102 insertions(+), 15 deletions(-) +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (850d0cc64c8e selftests/harness: Limit step counter reporting) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging tools/testing/selftests/kselftest.h +Auto-merging tools/testing/selftests/kmod/kmod.sh +Merge made by the 'recursive' strategy. + .../breakpoints/step_after_suspend_test.c | 53 ++-- + tools/testing/selftests/clone3/clone3.c | 2 +- + .../selftests/clone3/clone3_clear_sighand.c | 3 +- + tools/testing/selftests/clone3/clone3_set_tid.c | 2 +- + .../selftests/filesystems/binderfs/binderfs_test.c | 284 +++++++++++---------- + tools/testing/selftests/kmod/kmod.sh | 2 +- + tools/testing/selftests/kselftest.h | 106 +++++++- + tools/testing/selftests/kselftest/runner.sh | 2 +- + tools/testing/selftests/kselftest_harness.h | 181 +++++++++---- + tools/testing/selftests/lib.mk | 20 +- + .../selftests/pid_namespace/regression_enomem.c | 1 - + tools/testing/selftests/pidfd/pidfd_getfd_test.c | 1 - + tools/testing/selftests/pidfd/pidfd_setns_test.c | 1 - + tools/testing/selftests/pidfd/pidfd_test.c | 55 +++- + tools/testing/selftests/seccomp/seccomp_bpf.c | 225 +++++----------- + tools/testing/selftests/sigaltstack/sas.c | 4 +- + tools/testing/selftests/sync/sync_test.c | 2 +- + tools/testing/selftests/uevent/uevent_filtering.c | 1 - + 18 files changed, 534 insertions(+), 411 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 (bf14b015bf51 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 +++++++++++---------- + tools/testing/selftests/livepatch/README | 16 +- + tools/testing/selftests/livepatch/functions.sh | 40 +++- + .../testing/selftests/livepatch/test-callbacks.sh | 84 +++----- + tools/testing/selftests/livepatch/test-ftrace.sh | 6 +- + .../testing/selftests/livepatch/test-livepatch.sh | 12 +- + .../selftests/livepatch/test-shadow-vars.sh | 85 +++++--- + tools/testing/selftests/livepatch/test-state.sh | 21 +- + 9 files changed, 296 insertions(+), 245 deletions(-) +Merging coresight/next (2b0949812420 coresight: etm4x: Fix save/restore during cpu idle) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/coresight.txt | 13 ++ + drivers/hwtracing/coresight/coresight-catu.c | 5 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 17 ++- + drivers/hwtracing/coresight/coresight-etm4x.c | 49 +++--- + drivers/hwtracing/coresight/coresight-etm4x.h | 9 +- + drivers/hwtracing/coresight/coresight-platform.c | 5 +- + drivers/hwtracing/coresight/coresight-priv.h | 2 + + drivers/hwtracing/coresight/coresight-replicator.c | 68 +++++---- + drivers/hwtracing/coresight/coresight-stm.c | 2 - + drivers/hwtracing/coresight/coresight-tmc-etf.c | 13 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc.c | 26 +++- + drivers/hwtracing/coresight/coresight-tmc.h | 1 + + drivers/hwtracing/coresight/coresight.c | 166 +++++++++++++++++++++ + include/linux/coresight.h | 6 +- + 15 files changed, 314 insertions(+), 70 deletions(-) +Merging rtc/rtc-next (a5e6f964bb2c rtc: cleanup obsolete comment about struct rtc_class_ops) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 1 + + drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- + drivers/rtc/rtc-bq32k.c | 2 +- + drivers/rtc/rtc-cpcap.c | 2 +- + drivers/rtc/rtc-ds1374.c | 258 ++++++++++--------------------------------- + drivers/rtc/rtc-goldfish.c | 1 + + drivers/rtc/rtc-imxdi.c | 4 +- + drivers/rtc/rtc-max77686.c | 20 +++- + drivers/rtc/rtc-mcp795.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 4 +- + drivers/rtc/rtc-pl031.c | 1 + + include/linux/rtc.h | 4 - + 12 files changed, 90 insertions(+), 211 deletions(-) +Merging nvdimm/libnvdimm-for-next (b86153077d5c Merge branch 'for-5.8/papr_scm' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (8f3d9f354286 Linux 5.7-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (c97aedc52dce selftests/seccomp: Test SECCOMP_IOCTL_NOTIF_ADDFD) +$ git merge seccomp/for-next/seccomp +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +CONFLICT (content): Merge conflict in tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging tools/testing/selftests/kselftest_harness.h +Auto-merging net/core/sock.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/net/sock.h +Recorded preimage for 'tools/testing/selftests/seccomp/seccomp_bpf.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/seccomp/seccomp_bpf.c'. +[master 1b9a619caa55] Merge remote-tracking branch 'seccomp/for-next/seccomp' +$ git diff -M --stat --summary HEAD^.. + arch/mips/include/asm/seccomp.h | 4 +- + fs/file.c | 61 +++ + fs/proc/array.c | 2 + + include/asm-generic/seccomp.h | 2 +- + include/linux/file.h | 19 + + include/linux/seccomp.h | 10 +- + include/net/sock.h | 4 + + include/uapi/linux/seccomp.h | 25 +- + init/init_task.c | 3 + + kernel/exit.c | 1 + + kernel/fork.c | 1 - + kernel/pid.c | 14 +- + kernel/seccomp.c | 376 ++++++++++++--- + net/compat.c | 55 +-- + net/core/scm.c | 50 +- + net/core/sock.c | 21 + + tools/testing/selftests/seccomp/config | 1 + + .../testing/selftests/seccomp/seccomp_benchmark.c | 80 +++- + tools/testing/selftests/seccomp/seccomp_bpf.c | 505 ++++++++++++++++++--- + tools/testing/selftests/seccomp/settings | 1 + + 20 files changed, 996 insertions(+), 239 deletions(-) + create mode 100644 tools/testing/selftests/seccomp/settings +Merging kspp/for-next/kspp (36f78758dca5 Merge branch 'kspp/tasklets/new-api/v1' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging tools/include/linux/compiler.h +Auto-merging scripts/checkpatch.pl +Auto-merging net/sched/sch_sfq.c +Auto-merging net/sched/sch_htb.c +Auto-merging net/sched/sch_hfsc.c +Auto-merging net/sched/sch_fq_pie.c +Auto-merging net/sched/sch_fq_codel.c +Auto-merging net/sched/sch_cbq.c +Auto-merging net/sched/sch_cake.c +Auto-merging net/dccp/options.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/softirq.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging kernel/dma/debug.c +Auto-merging kernel/Makefile +Auto-merging include/net/flow_offload.h +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/overlayfs/copy_up.c +Auto-merging fs/fuse/file.c +Auto-merging fs/f2fs/data.c +Auto-merging drivers/usb/host/fhci-sched.c +Auto-merging drivers/usb/gadget/udc/snps_udc_core.c +Auto-merging drivers/ssb/driver_chipcommon.c +Auto-merging drivers/s390/crypto/ap_bus.c +Auto-merging drivers/pci/pcie/aer.c +Auto-merging drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c +Auto-merging drivers/net/wireless/intel/iwlegacy/4965-mac.c +Auto-merging drivers/net/wireless/broadcom/b43legacy/main.c +Auto-merging drivers/net/wireless/broadcom/b43/phy_n.c +Auto-merging drivers/net/wan/farsync.c +Auto-merging drivers/net/ethernet/sun/niu.c +Auto-merging drivers/net/ethernet/sun/cassini.c +Auto-merging drivers/net/ethernet/neterion/s2io.c +Auto-merging drivers/mtd/nand/raw/s3c2410.c +Auto-merging drivers/mmc/host/sdhci.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/dm-writecache.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/md/dm-snap-persistent.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/infiniband/hw/mlx5/devx.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/idle/intel_idle.c +Auto-merging drivers/i2c/busses/i2c-rk3x.c +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/drm_edid.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/bridge/sil-sii8620.c +Auto-merging drivers/acpi/acpi_pad.c +Auto-merging block/blk-merge.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/mmu/paging_tmpl.h +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging Makefile +Auto-merging Documentation/process/deprecated.rst +Resolved 'drivers/gpu/drm/drm_edid.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ff5c99f2120d] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + Documentation/process/deprecated.rst | 18 ++ + Makefile | 13 +- + arch/arm/mach-sa1100/assabet.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/arm/vdso/Makefile | 2 +- + arch/ia64/kernel/process.c | 2 +- + arch/ia64/mm/discontig.c | 2 +- + arch/ia64/mm/tlb.c | 2 +- + arch/mips/lib/dump_tlb.c | 2 +- + arch/mips/mm/init.c | 2 +- + arch/mips/mm/tlb-r4k.c | 6 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + arch/powerpc/kvm/book3s_pr.c | 3 - + arch/powerpc/kvm/powerpc.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +- + arch/s390/kernel/smp.c | 2 +- + arch/x86/kernel/quirks.c | 10 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/mmu/paging_tmpl.h | 2 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/mm/numa.c | 18 +- + block/blk-merge.c | 2 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/atm/zatm.c | 2 +- + drivers/block/drbd/drbd_nl.c | 6 +- + drivers/block/drbd/drbd_state.c | 2 +- + drivers/block/rbd.c | 2 +- + drivers/clk/clk-gate.c | 2 +- + drivers/clk/spear/clk-vco-pll.c | 2 +- + drivers/clk/st/clkgen-fsyn.c | 1 - + drivers/firewire/ohci.c | 14 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- + drivers/gpu/drm/drm_edid.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 4 +- + drivers/i2c/busses/i2c-rk3x.c | 2 +- + drivers/ide/ide-acpi.c | 2 +- + drivers/ide/ide-atapi.c | 2 +- + drivers/ide/ide-io-std.c | 4 +- + drivers/ide/ide-io.c | 8 +- + drivers/ide/ide-sysfs.c | 2 +- + drivers/ide/ide-taskfile.c | 1 - + drivers/ide/umc8672.c | 2 +- + drivers/idle/intel_idle.c | 2 +- + drivers/infiniband/core/uverbs_cmd.c | 4 +- + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/cxgb4/cq.c | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 6 +- + drivers/infiniband/hw/mlx5/cq.c | 6 +- + drivers/infiniband/hw/mlx5/devx.c | 2 +- + drivers/infiniband/hw/mlx5/wr.c | 2 +- + drivers/infiniband/hw/mthca/mthca_qp.c | 10 +- + drivers/infiniband/sw/siw/siw_qp_rx.c | 2 +- + drivers/input/keyboard/omap-keypad.c | 2 +- + drivers/input/serio/hil_mlc.c | 2 +- + drivers/input/serio/serio_raw.c | 2 +- + drivers/input/touchscreen/sur40.c | 4 +- + drivers/iommu/intel/iommu.c | 2 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-table.c | 2 +- + drivers/md/dm-writecache.c | 2 +- + drivers/md/raid5.c | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 2 +- + drivers/media/tuners/qt1010.c | 4 +- + drivers/media/usb/gspca/vicam.c | 2 +- + drivers/media/usb/uvc/uvc_video.c | 8 +- + drivers/memstick/host/jmb38x_ms.c | 2 +- + drivers/memstick/host/tifm_ms.c | 2 +- + drivers/mmc/host/sdhci.c | 2 +- + drivers/mtd/nand/raw/nand_ecc.c | 2 +- + drivers/mtd/nand/raw/s3c2410.c | 2 +- + drivers/mtd/parsers/afs.c | 4 +- + drivers/mtd/ubi/eba.c | 2 +- + drivers/net/can/janz-ican3.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 4 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 6 +- + drivers/net/wan/farsync.c | 4 +- + drivers/net/wan/z85230.c | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 2 +- + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/broadcom/b43/debugfs.c | 2 +- + drivers/net/wireless/broadcom/b43/dma.c | 2 +- + drivers/net/wireless/broadcom/b43/lo.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- + drivers/net/wireless/broadcom/b43/xmit.c | 12 +- + drivers/net/wireless/broadcom/b43legacy/debugfs.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 4 +- + drivers/pci/pcie/aer.c | 2 +- + drivers/platform/x86/hdaps.c | 4 +- + drivers/s390/crypto/ap_bus.c | 2 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + drivers/spi/spi-davinci.c | 1 - + drivers/ssb/driver_chipcommon.c | 4 +- + drivers/staging/most/dim2/dim2.c | 2 +- + drivers/staging/octeon/ethernet-tx.c | 2 +- + drivers/tty/cyclades.c | 2 +- + drivers/tty/isicom.c | 2 +- + drivers/tty/vt/keyboard.c | 2 +- + drivers/usb/gadget/udc/snps_udc_core.c | 6 +- + drivers/usb/host/fhci-sched.c | 2 +- + drivers/usb/musb/cppi_dma.c | 2 +- + drivers/usb/storage/sddr55.c | 4 +- + drivers/vhost/net.c | 6 +- + drivers/video/fbdev/matrox/matroxfb_maven.c | 6 +- + drivers/video/fbdev/pm3fb.c | 6 +- + drivers/video/fbdev/riva/riva_hw.c | 3 +- + drivers/virtio/virtio_ring.c | 6 +- + fs/afs/dir.c | 2 +- + fs/afs/security.c | 2 +- + fs/dlm/netlink.c | 2 +- + fs/erofs/data.c | 4 +- + fs/erofs/zdata.c | 2 +- + fs/f2fs/data.c | 4 +- + fs/fat/dir.c | 2 +- + fs/fuse/control.c | 4 +- + fs/fuse/cuse.c | 2 +- + fs/fuse/file.c | 2 +- + fs/gfs2/aops.c | 2 +- + fs/gfs2/bmap.c | 2 +- + fs/gfs2/lops.c | 2 +- + fs/hfsplus/unicode.c | 2 +- + fs/isofs/namei.c | 4 +- + fs/jffs2/erase.c | 2 +- + fs/nfsd/nfsctl.c | 2 +- + fs/ocfs2/alloc.c | 4 +- + fs/ocfs2/dir.c | 14 +- + fs/ocfs2/extent_map.c | 4 +- + fs/ocfs2/namei.c | 2 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/xattr.c | 2 +- + fs/omfs/file.c | 2 +- + fs/overlayfs/copy_up.c | 2 +- + fs/ubifs/commit.c | 6 +- + fs/ubifs/dir.c | 2 +- + fs/ubifs/file.c | 4 +- + fs/ubifs/journal.c | 4 +- + fs/ubifs/lpt.c | 2 +- + fs/ubifs/tnc.c | 6 +- + fs/ubifs/tnc_misc.c | 4 +- + fs/udf/balloc.c | 2 +- + fs/xfs/xfs_bmap_util.c | 2 +- + include/linux/compiler-clang.h | 2 - + include/linux/compiler-gcc.h | 6 - + include/linux/compiler_attributes.h | 13 ++ + include/linux/interrupt.h | 41 +++- + include/linux/page-flags-layout.h | 4 +- + include/net/flow_offload.h | 2 +- + init/main.c | 12 +- + kernel/Makefile | 1 + + kernel/async.c | 4 +- + kernel/audit.c | 2 +- + kernel/backtracetest.c | 2 +- + kernel/debug/debug_core.c | 2 +- + kernel/debug/kdb/kdb_io.c | 2 +- + kernel/dma/debug.c | 2 +- + kernel/events/core.c | 2 +- + kernel/events/uprobes.c | 2 +- + kernel/exit.c | 2 +- + kernel/futex.c | 14 +- + kernel/irq/resend.c | 2 +- + kernel/locking/lockdep.c | 16 +- + kernel/softirq.c | 18 +- + kernel/stackleak.c | 16 +- + kernel/trace/ring_buffer.c | 2 +- + lib/radix-tree.c | 2 +- + lib/test_lockup.c | 2 +- + mm/debug_vm_pgtable.c | 2 +- + mm/frontswap.c | 2 +- + mm/ksm.c | 2 +- + mm/memcontrol.c | 2 +- + mm/memory.c | 2 +- + mm/mempolicy.c | 4 +- + mm/page_alloc.c | 2 +- + mm/percpu.c | 2 +- + mm/slub.c | 4 +- + mm/swap.c | 4 +- + net/atm/pppoatm.c | 2 +- + net/dccp/options.c | 2 +- + net/ipv4/netfilter/nf_socket_ipv4.c | 6 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/nf_socket_ipv6.c | 2 +- + net/iucv/iucv.c | 2 +- + net/netfilter/nf_conntrack_ftp.c | 2 +- + net/netfilter/nfnetlink_log.c | 2 +- + net/netfilter/nfnetlink_queue.c | 4 +- + net/sched/cls_flow.c | 2 +- + net/sched/sch_cake.c | 2 +- + net/sched/sch_cbq.c | 2 +- + net/sched/sch_fq_codel.c | 2 +- + net/sched/sch_fq_pie.c | 2 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_htb.c | 2 +- + net/sched/sch_sfq.c | 2 +- + net/sunrpc/svcsock.c | 4 +- + net/sunrpc/xprtsock.c | 10 +- + net/tls/tls_sw.c | 2 +- + scripts/Makefile.gcc-plugins | 2 + + scripts/checkpatch.pl | 16 +- + scripts/gcc-plugins/cyc_complexity_plugin.c | 2 +- + scripts/gcc-plugins/sancov_plugin.c | 2 +- + scripts/gcc-plugins/stackleak_plugin.c | 248 ++++++++++++++++++--- + scripts/gcc-plugins/structleak_plugin.c | 2 +- + security/Kconfig.hardening | 29 ++- + sound/core/control_compat.c | 2 +- + sound/drivers/pcsp/pcsp_lib.c | 2 +- + sound/isa/sb/sb16_csp.c | 2 +- + sound/usb/endpoint.c | 2 +- + tools/include/linux/compiler.h | 2 - + tools/virtio/linux/kernel.h | 2 - + 224 files changed, 671 insertions(+), 409 deletions(-) +Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) +$ 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 0fb342976f42] Merge remote-tracking branch 'fsi/next' +$ git diff -M --stat --summary HEAD^.. +Merging slimbus/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (79e491b6b406 nvmem: qfprom: use NVMEM_DEVID_AUTO for multiple instances) +$ git merge nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/nvmem/core.c | 43 ++++++++++++++++++++++++++++++++++-------- + drivers/nvmem/qfprom.c | 1 + + drivers/nvmem/sc27xx-efuse.c | 27 +++++++++++++++++++++++--- + drivers/nvmem/sprd-efuse.c | 4 ++-- + include/linux/nvmem-consumer.h | 1 + + include/linux/nvmem-provider.h | 3 +++ + 7 files changed, 67 insertions(+), 13 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 (11478f56f20e hv_netvsc: Use vmbus_requestor to generate transaction IDs for VMBus hardening) +$ git merge hyperv/hyperv-next +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + drivers/hv/channel.c | 165 ++++++++++++++++++++++++++++++++++++-- + drivers/hv/channel_mgmt.c | 31 ++----- + drivers/hv/hv.c | 3 - + drivers/hv/vmbus_drv.c | 17 ++-- + drivers/net/hyperv/hyperv_net.h | 13 +++ + drivers/net/hyperv/netvsc.c | 79 ++++++++++++++---- + drivers/net/hyperv/rndis_filter.c | 1 + + drivers/scsi/storvsc_drv.c | 101 +++++++++++++++++++---- + include/linux/hyperv.h | 44 ++++++---- + tools/hv/hv_kvp_daemon.c | 2 +- + 10 files changed, 365 insertions(+), 91 deletions(-) +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 (2c308ef41351 kgdb: Make "kgdbcon" work properly with "kgdb_earlycon") +$ git merge kgdb/kgdb/for-next +Auto-merging kernel/debug/kdb/kdb_io.c +Auto-merging kernel/debug/debug_core.c +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 22 ++++++++++++++-------- + kernel/debug/kdb/kdb_io.c | 14 +++++++------- + 2 files changed, 21 insertions(+), 15 deletions(-) +Merging pidfd/for-next (b2763dd39a78 Merge branch 'pidfd' into for-next) +$ git merge pidfd/for-next +Auto-merging tools/testing/selftests/pidfd/pidfd_setns_test.c +Auto-merging tools/testing/selftests/Makefile +Auto-merging kernel/fork.c +Auto-merging include/linux/sched/task.h +Auto-merging fs/file.c +CONFLICT (content): Merge conflict in fs/file.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/kernel/process.c +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/ia64/kernel/process.c +Auto-merging arch/csky/kernel/process.c +CONFLICT (content): Merge conflict in arch/csky/kernel/process.c +Auto-merging arch/csky/Kconfig +CONFLICT (content): Merge conflict in arch/csky/Kconfig +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging arch/Kconfig +Resolved 'arch/csky/Kconfig' using previous resolution. +Resolved 'arch/csky/kernel/process.c' using previous resolution. +Resolved 'arch/riscv/Kconfig' using previous resolution. +Resolved 'fs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 317134fdaf25] Merge remote-tracking branch 'pidfd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 7 - + arch/alpha/kernel/process.c | 9 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arc/Kconfig | 1 - + arch/arc/kernel/process.c | 5 +- + arch/arm/Kconfig | 1 - + arch/arm/kernel/process.c | 5 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/kernel/process.c | 2 +- + arch/c6x/kernel/process.c | 4 +- + arch/csky/Kconfig | 1 - + arch/csky/kernel/process.c | 2 +- + arch/h8300/kernel/process.c | 17 +- + arch/hexagon/kernel/process.c | 6 +- + arch/ia64/kernel/entry.S | 32 ++-- + arch/ia64/kernel/process.c | 29 ++- + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/Kconfig | 1 - + arch/m68k/kernel/process.c | 8 +- + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/process.c | 6 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/Kconfig | 1 - + arch/mips/kernel/process.c | 5 +- + 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/nds32/kernel/process.c | 4 +- + arch/nios2/kernel/entry.S | 7 +- + arch/nios2/kernel/process.c | 23 ++- + arch/openrisc/Kconfig | 1 - + arch/openrisc/kernel/process.c | 6 +- + arch/parisc/Kconfig | 1 - + arch/parisc/kernel/process.c | 2 +- + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/Kconfig | 1 - + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/riscv/Kconfig | 1 - + arch/riscv/kernel/process.c | 4 +- + arch/s390/Kconfig | 1 - + arch/s390/kernel/process.c | 4 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/process_32.c | 6 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/include/asm/syscalls.h | 7 +- + arch/sparc/kernel/Makefile | 1 + + arch/sparc/kernel/entry.S | 29 +-- + arch/sparc/kernel/kernel.h | 11 +- + arch/sparc/kernel/process.c | 110 +++++++++++ + arch/sparc/kernel/process_32.c | 33 +--- + arch/sparc/kernel/process_64.c | 40 +--- + arch/sparc/kernel/syscalls.S | 23 ++- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/um/Kconfig | 1 - + arch/um/kernel/process.c | 2 +- + arch/unicore32/kernel/process.c | 7 +- + arch/x86/Kconfig | 1 - + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/entry/vdso/vma.c | 5 +- + arch/x86/kernel/process.c | 4 +- + arch/x86/kernel/sys_ia32.c | 3 - + arch/x86/kernel/unwind_frame.c | 2 +- + arch/xtensa/Kconfig | 1 - + arch/xtensa/kernel/process.c | 2 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/file.c | 121 ++++++++++-- + fs/open.c | 17 ++ + include/linux/fdtable.h | 6 +- + include/linux/sched/task.h | 17 +- + include/linux/syscalls.h | 2 + + include/linux/time_namespace.h | 6 + + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/close_range.h | 9 + + kernel/fork.c | 78 +++----- + kernel/nsproxy.c | 21 ++- + kernel/time/namespace.c | 22 +-- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/core/.gitignore | 1 + + tools/testing/selftests/core/Makefile | 7 + + tools/testing/selftests/core/close_range_test.c | 227 +++++++++++++++++++++++ + tools/testing/selftests/pidfd/pidfd.h | 4 + + tools/testing/selftests/pidfd/pidfd_setns_test.c | 76 ++++++++ + 86 files changed, 797 insertions(+), 326 deletions(-) + create mode 100644 arch/sparc/kernel/process.c + create mode 100644 include/uapi/linux/close_range.h + create mode 100644 tools/testing/selftests/core/.gitignore + create mode 100644 tools/testing/selftests/core/Makefile + create mode 100644 tools/testing/selftests/core/close_range_test.c +Merging devfreq/devfreq-next (3aa66b690fdc memory: samsung: exynos5422-dmc: Use delayed timer as default) +$ git merge devfreq/devfreq-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 12 +++ + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 2 + + MAINTAINERS | 9 +++ + drivers/devfreq/devfreq-event.c | 4 +- + drivers/devfreq/devfreq.c | 86 +++++++++++++++++++++- + drivers/devfreq/rk3399_dmc.c | 42 ++++++----- + drivers/memory/samsung/exynos5422-dmc.c | 1 + + include/linux/devfreq.h | 9 +++ + 8 files changed, 143 insertions(+), 22 deletions(-) +Merging hmm/hmm (b223555dc4ed nouveau/hmm: support mapping large sysmem pages) +$ git merge hmm/hmm +Auto-merging drivers/gpu/drm/nouveau/nouveau_svm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/nouveau/nouveau_svm.c | 236 +++++++++------------ + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 82 +++++++ + include/linux/hmm.h | 24 ++- + lib/test_hmm.c | 4 + + lib/test_hmm_uapi.h | 4 + + mm/hmm.c | 16 +- + tools/testing/selftests/vm/hmm-tests.c | 76 +++++++ + 8 files changed, 301 insertions(+), 146 deletions(-) +Merging fpga/for-next (eacfbf589c90 fpga: dfl: pci: add device id for Intel FPGA PAC N3000) +$ git merge fpga/for-next +Auto-merging drivers/fpga/dfl-pci.c +Auto-merging drivers/fpga/dfl-afu-main.c +Auto-merging Documentation/fpga/dfl.rst +Merge made by the 'recursive' strategy. + .../bindings/fpga/xilinx-slave-serial.txt | 16 +- + Documentation/fpga/dfl.rst | 19 ++ + drivers/fpga/dfl-afu-dma-region.c | 19 +- + drivers/fpga/dfl-afu-error.c | 17 ++ + drivers/fpga/dfl-afu-main.c | 32 +++ + drivers/fpga/dfl-fme-error.c | 18 ++ + drivers/fpga/dfl-fme-main.c | 6 + + drivers/fpga/dfl-pci.c | 78 ++++- + drivers/fpga/dfl.c | 313 ++++++++++++++++++++- + drivers/fpga/dfl.h | 63 ++++- + drivers/fpga/fpga-bridge.c | 6 +- + drivers/fpga/fpga-mgr.c | 4 +- + drivers/fpga/xilinx-spi.c | 61 +++- + include/uapi/linux/fpga-dfl.h | 82 ++++++ + 14 files changed, 687 insertions(+), 47 deletions(-) +Merging kunit/test (48778464bb7d Linux 5.8-rc2) +$ 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 (d43c7fb05765 kunit: tool: fix improper treatment of file location) +$ git merge kunit-next/kunit +Auto-merging tools/testing/kunit/kunit_tool_test.py +Auto-merging tools/testing/kunit/kunit.py +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/kunit-tool.rst | 17 +-- + Documentation/dev-tools/kunit/start.rst | 2 +- + include/kunit/test.h | 210 +++++++++++++++++++++++---- + lib/kunit/kunit-test.c | 111 +++++++++++--- + lib/kunit/string-stream.c | 14 +- + lib/kunit/test.c | 171 +++++++++++++--------- + tools/testing/kunit/kunit.py | 24 --- + tools/testing/kunit/kunit_kernel.py | 6 +- + tools/testing/kunit/kunit_tool_test.py | 14 +- + 9 files changed, 396 insertions(+), 173 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 (8613fc59031e mhi: fix doubled words and struct image_info kernel-doc) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + include/linux/mhi.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging notifications/notifications-pipe-core (54e552c96d30 watch_queue: Add superblock notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging security/security.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/fs.h +Auto-merging fs/namespace.c +Auto-merging fs/internal.h +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Merge made by the 'recursive' strategy. + Documentation/watch_queue.rst | 24 ++- + 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/super.c | 205 +++++++++++++++++++++++++ + include/linux/dcache.h | 1 + + include/linux/fs.h | 62 ++++++++ + include/linux/lsm_hook_defs.h | 6 + + include/linux/lsm_hooks.h | 12 ++ + include/linux/security.h | 16 ++ + include/linux/syscalls.h | 4 + + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/watch_queue.h | 65 +++++++- + kernel/sys_ni.c | 6 + + samples/watch_queue/watch_test.c | 44 +++++- + security/security.c | 14 ++ + 37 files changed, 792 insertions(+), 5 deletions(-) + create mode 100644 fs/mount_notify.c +Merging fsinfo/fsinfo-core (dbc87e74d022 vfs, fsinfo: Add an RCU safe per-ns mount list) +$ git merge fsinfo/fsinfo-core +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/internal.h +Auto-merging fs/ext4/super.c +Auto-merging fs/afs/internal.h +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Merge made by the 'recursive' strategy. + 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 | 6 + + fs/mount_notify.c | 2 + + fs/namespace.c | 457 ++++++++++++++- + include/linux/fs.h | 4 + + include/linux/fsinfo.h | 112 ++++ + include/linux/syscalls.h | 4 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/fsinfo.h | 335 +++++++++++ + include/uapi/linux/mount.h | 10 +- + kernel/sys_ni.c | 1 + + samples/vfs/Makefile | 6 +- + samples/vfs/test-fsinfo.c | 854 ++++++++++++++++++++++++++++ + samples/vfs/test-mntinfo.c | 279 +++++++++ + 42 files changed, 3741 insertions(+), 11 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 +Using index info to reconstruct a base tree... +M arch/arm64/include/asm/unistd32.h +M include/uapi/asm-generic/unistd.h +Falling back to patching base and 3-way merge... +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging arch/arm64/include/asm/unistd32.h +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/include/asm/unistd.h +$ git add -A . +$ git commit -v -a --amend +[master e7a8cc84d7ce] Merge remote-tracking branch 'fsinfo/fsinfo-core' + Date: Mon Jul 20 17:17:51 2020 +1000 +$ git am -3 ../patches/0001-Revert-vfs-fsinfo-Add-an-RCU-safe-per-ns-mount-list.patch +Applying: Revert "vfs, fsinfo: Add an RCU safe per-ns mount list" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/mount.h +M fs/namespace.c +$ git add -A . +$ git commit -v -a --amend +[master e28f4cf1a3cd] Merge remote-tracking branch 'fsinfo/fsinfo-core' + Date: Mon Jul 20 17:17:51 2020 +1000 +Merging memblock/for-next (3346dd99fb4c MAINTAINERS: remove "PKUNITY SOC DRIVERS" entry) +$ git merge memblock/for-next +Removing drivers/video/fbdev/fb-puv3.c +Auto-merging drivers/video/fbdev/Makefile +Auto-merging drivers/video/fbdev/Kconfig +Removing drivers/rtc/rtc-puv3.c +Auto-merging drivers/rtc/Kconfig +Removing drivers/pwm/pwm-puv3.c +Removing drivers/input/serio/i8042-unicore32io.h +Removing drivers/i2c/busses/i2c-puv3.c +Removing drivers/cpufreq/unicore2-cpufreq.c +Auto-merging drivers/cpufreq/Makefile +Removing arch/unicore32/mm/tlb-ucv2.S +Removing arch/unicore32/mm/proc-ucv2.S +Removing arch/unicore32/mm/proc-syms.c +Removing arch/unicore32/mm/proc-macros.S +Removing arch/unicore32/mm/pgd.c +Removing arch/unicore32/mm/mmu.c +Removing arch/unicore32/mm/mm.h +Removing arch/unicore32/mm/ioremap.c +Removing arch/unicore32/mm/init.c +Removing arch/unicore32/mm/flush.c +Removing arch/unicore32/mm/fault.c +Removing arch/unicore32/mm/extable.c +Removing arch/unicore32/mm/cache-ucv2.S +Removing arch/unicore32/mm/alignment.c +Removing arch/unicore32/mm/Makefile +Removing arch/unicore32/mm/Kconfig +Removing arch/unicore32/lib/strnlen_user.S +Removing arch/unicore32/lib/strncpy_from_user.S +Removing arch/unicore32/lib/findbit.S +Removing arch/unicore32/lib/delay.S +Removing arch/unicore32/lib/copy_to_user.S +Removing arch/unicore32/lib/copy_template.S +Removing arch/unicore32/lib/copy_page.S +Removing arch/unicore32/lib/copy_from_user.S +Removing arch/unicore32/lib/clear_user.S +Removing arch/unicore32/lib/backtrace.S +Removing arch/unicore32/lib/Makefile +Removing arch/unicore32/kernel/vmlinux.lds.S +Removing arch/unicore32/kernel/traps.c +Removing arch/unicore32/kernel/time.c +Removing arch/unicore32/kernel/sys.c +Removing arch/unicore32/kernel/stacktrace.c +Removing arch/unicore32/kernel/sleep.S +Removing arch/unicore32/kernel/signal.c +Removing arch/unicore32/kernel/setup.h +Removing arch/unicore32/kernel/setup.c +Removing arch/unicore32/kernel/puv3-nb0916.c +Removing arch/unicore32/kernel/puv3-core.c +Removing arch/unicore32/kernel/ptrace.c +CONFLICT (modify/delete): arch/unicore32/kernel/process.c deleted in memblock/for-next and modified in HEAD. Version HEAD of arch/unicore32/kernel/process.c left in tree. +Removing arch/unicore32/kernel/pm.c +Removing arch/unicore32/kernel/pci.c +Removing arch/unicore32/kernel/module.c +Removing arch/unicore32/kernel/ksyms.h +Removing arch/unicore32/kernel/ksyms.c +Removing arch/unicore32/kernel/irq.c +Removing arch/unicore32/kernel/hibernate_asm.S +Removing arch/unicore32/kernel/hibernate.c +Removing arch/unicore32/kernel/head.S +Removing arch/unicore32/kernel/gpio.c +Removing arch/unicore32/kernel/fpu-ucf64.c +Removing arch/unicore32/kernel/entry.S +Removing arch/unicore32/kernel/elf.c +Removing arch/unicore32/kernel/early_printk.c +Removing arch/unicore32/kernel/dma.c +Removing arch/unicore32/kernel/debug.S +Removing arch/unicore32/kernel/debug-macro.S +Removing arch/unicore32/kernel/clock.c +Removing arch/unicore32/kernel/asm-offsets.c +Removing arch/unicore32/kernel/Makefile +Removing arch/unicore32/include/uapi/asm/unistd.h +Removing arch/unicore32/include/uapi/asm/sigcontext.h +Removing arch/unicore32/include/uapi/asm/ptrace.h +Removing arch/unicore32/include/uapi/asm/byteorder.h +Removing arch/unicore32/include/uapi/asm/Kbuild +Removing arch/unicore32/include/mach/uncompress.h +Removing arch/unicore32/include/mach/regs-unigfx.h +Removing arch/unicore32/include/mach/regs-umal.h +Removing arch/unicore32/include/mach/regs-uart.h +Removing arch/unicore32/include/mach/regs-spi.h +Removing arch/unicore32/include/mach/regs-sdc.h +Removing arch/unicore32/include/mach/regs-rtc.h +Removing arch/unicore32/include/mach/regs-resetc.h +Removing arch/unicore32/include/mach/regs-ps2.h +Removing arch/unicore32/include/mach/regs-pm.h +Removing arch/unicore32/include/mach/regs-pci.h +Removing arch/unicore32/include/mach/regs-ost.h +Removing arch/unicore32/include/mach/regs-nand.h +Removing arch/unicore32/include/mach/regs-intc.h +Removing arch/unicore32/include/mach/regs-i2c.h +Removing arch/unicore32/include/mach/regs-gpio.h +Removing arch/unicore32/include/mach/regs-dmac.h +Removing arch/unicore32/include/mach/regs-ac97.h +Removing arch/unicore32/include/mach/pm.h +Removing arch/unicore32/include/mach/ocd.h +Removing arch/unicore32/include/mach/memory.h +Removing arch/unicore32/include/mach/map.h +Removing arch/unicore32/include/mach/hardware.h +Removing arch/unicore32/include/mach/dma.h +Removing arch/unicore32/include/mach/bitfield.h +Removing arch/unicore32/include/mach/PKUnity.h +Removing arch/unicore32/include/asm/vmalloc.h +Removing arch/unicore32/include/asm/uaccess.h +Removing arch/unicore32/include/asm/traps.h +Removing arch/unicore32/include/asm/tlbflush.h +Removing arch/unicore32/include/asm/tlb.h +Removing arch/unicore32/include/asm/timex.h +Removing arch/unicore32/include/asm/thread_info.h +Removing arch/unicore32/include/asm/syscall.h +Removing arch/unicore32/include/asm/switch_to.h +Removing arch/unicore32/include/asm/suspend.h +Removing arch/unicore32/include/asm/string.h +Removing arch/unicore32/include/asm/stacktrace.h +Removing arch/unicore32/include/asm/ptrace.h +Removing arch/unicore32/include/asm/processor.h +Removing arch/unicore32/include/asm/pgtable.h +Removing arch/unicore32/include/asm/pgtable-hwdef.h +Removing arch/unicore32/include/asm/pgalloc.h +Removing arch/unicore32/include/asm/pci.h +Removing arch/unicore32/include/asm/page.h +Removing arch/unicore32/include/asm/mmu_context.h +Removing arch/unicore32/include/asm/mmu.h +Removing arch/unicore32/include/asm/memory.h +Removing arch/unicore32/include/asm/memblock.h +Removing arch/unicore32/include/asm/linkage.h +Removing arch/unicore32/include/asm/irqflags.h +Removing arch/unicore32/include/asm/irq.h +Removing arch/unicore32/include/asm/io.h +Removing arch/unicore32/include/asm/hwdef-copro.h +Removing arch/unicore32/include/asm/hwcap.h +Removing arch/unicore32/include/asm/gpio.h +Removing arch/unicore32/include/asm/fpu-ucf64.h +Removing arch/unicore32/include/asm/fpstate.h +Removing arch/unicore32/include/asm/elf.h +Removing arch/unicore32/include/asm/dma.h +Removing arch/unicore32/include/asm/delay.h +Removing arch/unicore32/include/asm/cputype.h +Removing arch/unicore32/include/asm/cpu-single.h +Removing arch/unicore32/include/asm/cmpxchg.h +Removing arch/unicore32/include/asm/checksum.h +Removing arch/unicore32/include/asm/cacheflush.h +Removing arch/unicore32/include/asm/cache.h +Removing arch/unicore32/include/asm/bug.h +Removing arch/unicore32/include/asm/bitops.h +Removing arch/unicore32/include/asm/barrier.h +Removing arch/unicore32/include/asm/assembler.h +Removing arch/unicore32/include/asm/Kbuild +Removing arch/unicore32/configs/defconfig +Removing arch/unicore32/boot/compressed/vmlinux.lds.S +Removing arch/unicore32/boot/compressed/piggy.S.in +Removing arch/unicore32/boot/compressed/misc.c +Removing arch/unicore32/boot/compressed/head.S +Removing arch/unicore32/boot/compressed/Makefile +Removing arch/unicore32/boot/Makefile +Removing arch/unicore32/Makefile +Removing arch/unicore32/Kconfig.debug +Removing arch/unicore32/Kconfig +Removing arch/unicore32/.gitignore +Auto-merging MAINTAINERS +Auto-merging Documentation/features/debug/kgdb/arch-support.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/unicore32/kernel/process.c +rm 'arch/unicore32/kernel/process.c' +$ git commit --no-edit -v -a +[master eb92a8cdbeb4] Merge remote-tracking branch 'memblock/for-next' +$ git diff -M --stat --summary HEAD^.. + .../features/core/cBPF-JIT/arch-support.txt | 1 - + .../features/core/eBPF-JIT/arch-support.txt | 1 - + .../core/generic-idle-thread/arch-support.txt | 1 - + .../features/core/jump-labels/arch-support.txt | 1 - + .../features/core/tracehook/arch-support.txt | 1 - + .../features/debug/KASAN/arch-support.txt | 1 - + .../debug/debug-vm-pgtable/arch-support.txt | 1 - + .../debug/gcov-profile-all/arch-support.txt | 1 - + Documentation/features/debug/kgdb/arch-support.txt | 1 - + .../debug/kprobes-on-ftrace/arch-support.txt | 1 - + .../features/debug/kprobes/arch-support.txt | 1 - + .../features/debug/kretprobes/arch-support.txt | 1 - + .../features/debug/optprobes/arch-support.txt | 1 - + .../features/debug/stackprotector/arch-support.txt | 1 - + .../features/debug/uprobes/arch-support.txt | 1 - + .../debug/user-ret-profiler/arch-support.txt | 1 - + .../features/io/dma-contiguous/arch-support.txt | 1 - + .../locking/cmpxchg-local/arch-support.txt | 1 - + .../features/locking/lockdep/arch-support.txt | 1 - + .../locking/queued-rwlocks/arch-support.txt | 1 - + .../locking/queued-spinlocks/arch-support.txt | 1 - + .../features/perf/kprobes-event/arch-support.txt | 1 - + .../features/perf/perf-regs/arch-support.txt | 1 - + .../features/perf/perf-stackdump/arch-support.txt | 1 - + .../sched/membarrier-sync-core/arch-support.txt | 1 - + .../features/sched/numa-balancing/arch-support.txt | 1 - + .../seccomp/seccomp-filter/arch-support.txt | 1 - + .../time/arch-tick-broadcast/arch-support.txt | 1 - + .../features/time/clockevents/arch-support.txt | 1 - + .../time/context-tracking/arch-support.txt | 1 - + .../features/time/irq-time-acct/arch-support.txt | 1 - + .../time/modern-timekeeping/arch-support.txt | 1 - + .../features/time/virt-cpuacct/arch-support.txt | 1 - + .../features/vm/ELF-ASLR/arch-support.txt | 1 - + .../features/vm/PG_uncached/arch-support.txt | 1 - + Documentation/features/vm/THP/arch-support.txt | 1 - + Documentation/features/vm/TLB/arch-support.txt | 1 - + .../features/vm/huge-vmap/arch-support.txt | 1 - + .../features/vm/ioremap_prot/arch-support.txt | 1 - + .../features/vm/pte_special/arch-support.txt | 1 - + MAINTAINERS | 17 - + arch/unicore32/.gitignore | 22 - + arch/unicore32/Kconfig | 200 ----- + arch/unicore32/Kconfig.debug | 29 - + arch/unicore32/Makefile | 59 -- + arch/unicore32/boot/Makefile | 39 - + arch/unicore32/boot/compressed/Makefile | 64 -- + arch/unicore32/boot/compressed/head.S | 201 ----- + arch/unicore32/boot/compressed/misc.c | 123 --- + arch/unicore32/boot/compressed/piggy.S.in | 6 - + arch/unicore32/boot/compressed/vmlinux.lds.S | 58 -- + arch/unicore32/configs/defconfig | 214 ------ + arch/unicore32/include/asm/Kbuild | 7 - + arch/unicore32/include/asm/assembler.h | 128 ---- + arch/unicore32/include/asm/barrier.h | 16 - + arch/unicore32/include/asm/bitops.h | 46 -- + arch/unicore32/include/asm/bug.h | 20 - + arch/unicore32/include/asm/cache.h | 24 - + arch/unicore32/include/asm/cacheflush.h | 186 ----- + arch/unicore32/include/asm/checksum.h | 38 - + arch/unicore32/include/asm/cmpxchg.h | 58 -- + arch/unicore32/include/asm/cpu-single.h | 42 -- + arch/unicore32/include/asm/cputype.h | 30 - + arch/unicore32/include/asm/delay.h | 49 -- + arch/unicore32/include/asm/dma.h | 20 - + arch/unicore32/include/asm/elf.h | 90 --- + arch/unicore32/include/asm/fpstate.h | 23 - + arch/unicore32/include/asm/fpu-ucf64.h | 50 -- + arch/unicore32/include/asm/gpio.h | 101 --- + arch/unicore32/include/asm/hwcap.h | 29 - + arch/unicore32/include/asm/hwdef-copro.h | 45 -- + arch/unicore32/include/asm/io.h | 69 -- + arch/unicore32/include/asm/irq.h | 102 --- + arch/unicore32/include/asm/irqflags.h | 50 -- + arch/unicore32/include/asm/linkage.h | 19 - + arch/unicore32/include/asm/memblock.h | 43 -- + arch/unicore32/include/asm/memory.h | 102 --- + arch/unicore32/include/asm/mmu.h | 14 - + arch/unicore32/include/asm/mmu_context.h | 98 --- + arch/unicore32/include/asm/page.h | 74 -- + arch/unicore32/include/asm/pci.h | 20 - + arch/unicore32/include/asm/pgalloc.h | 87 --- + arch/unicore32/include/asm/pgtable-hwdef.h | 51 -- + arch/unicore32/include/asm/pgtable.h | 267 ------- + arch/unicore32/include/asm/processor.h | 74 -- + arch/unicore32/include/asm/ptrace.h | 58 -- + arch/unicore32/include/asm/stacktrace.h | 28 - + arch/unicore32/include/asm/string.h | 35 - + arch/unicore32/include/asm/suspend.h | 26 - + arch/unicore32/include/asm/switch_to.h | 27 - + arch/unicore32/include/asm/syscall.h | 12 - + arch/unicore32/include/asm/thread_info.h | 133 ---- + arch/unicore32/include/asm/timex.h | 31 - + arch/unicore32/include/asm/tlb.h | 24 - + arch/unicore32/include/asm/tlbflush.h | 192 ----- + arch/unicore32/include/asm/traps.h | 18 - + arch/unicore32/include/asm/uaccess.h | 38 - + arch/unicore32/include/asm/vmalloc.h | 4 - + arch/unicore32/include/mach/PKUnity.h | 95 --- + arch/unicore32/include/mach/bitfield.h | 21 - + arch/unicore32/include/mach/dma.h | 45 -- + arch/unicore32/include/mach/hardware.h | 30 - + arch/unicore32/include/mach/map.h | 17 - + arch/unicore32/include/mach/memory.h | 54 -- + arch/unicore32/include/mach/ocd.h | 33 - + arch/unicore32/include/mach/pm.h | 37 - + arch/unicore32/include/mach/regs-ac97.h | 33 - + arch/unicore32/include/mach/regs-dmac.h | 82 -- + arch/unicore32/include/mach/regs-gpio.h | 71 -- + arch/unicore32/include/mach/regs-i2c.h | 64 -- + arch/unicore32/include/mach/regs-intc.h | 29 - + arch/unicore32/include/mach/regs-nand.h | 80 -- + arch/unicore32/include/mach/regs-ost.h | 91 --- + arch/unicore32/include/mach/regs-pci.h | 95 --- + arch/unicore32/include/mach/regs-pm.h | 127 ---- + arch/unicore32/include/mach/regs-ps2.h | 21 - + arch/unicore32/include/mach/regs-resetc.h | 35 - + arch/unicore32/include/mach/regs-rtc.h | 38 - + arch/unicore32/include/mach/regs-sdc.h | 157 ---- + arch/unicore32/include/mach/regs-spi.h | 99 --- + arch/unicore32/include/mach/regs-uart.h | 3 - + arch/unicore32/include/mach/regs-umal.h | 230 ------ + arch/unicore32/include/mach/regs-unigfx.h | 201 ----- + arch/unicore32/include/mach/uncompress.h | 31 - + arch/unicore32/include/uapi/asm/Kbuild | 2 - + arch/unicore32/include/uapi/asm/byteorder.h | 25 - + arch/unicore32/include/uapi/asm/ptrace.h | 91 --- + arch/unicore32/include/uapi/asm/sigcontext.h | 30 - + arch/unicore32/include/uapi/asm/unistd.h | 21 - + arch/unicore32/kernel/Makefile | 31 - + arch/unicore32/kernel/asm-offsets.c | 108 --- + arch/unicore32/kernel/clock.c | 387 ---------- + arch/unicore32/kernel/debug-macro.S | 86 --- + arch/unicore32/kernel/debug.S | 82 -- + arch/unicore32/kernel/dma.c | 179 ----- + arch/unicore32/kernel/early_printk.c | 46 -- + arch/unicore32/kernel/elf.c | 35 - + arch/unicore32/kernel/entry.S | 802 -------------------- + arch/unicore32/kernel/fpu-ucf64.c | 117 --- + arch/unicore32/kernel/gpio.c | 121 --- + arch/unicore32/kernel/head.S | 249 ------ + arch/unicore32/kernel/hibernate.c | 159 ---- + arch/unicore32/kernel/hibernate_asm.S | 114 --- + arch/unicore32/kernel/irq.c | 371 --------- + arch/unicore32/kernel/ksyms.c | 57 -- + arch/unicore32/kernel/ksyms.h | 14 - + arch/unicore32/kernel/module.c | 105 --- + arch/unicore32/kernel/pci.c | 371 --------- + arch/unicore32/kernel/pm.c | 121 --- + arch/unicore32/kernel/process.c | 318 -------- + arch/unicore32/kernel/ptrace.c | 147 ---- + arch/unicore32/kernel/puv3-core.c | 276 ------- + arch/unicore32/kernel/puv3-nb0916.c | 147 ---- + arch/unicore32/kernel/setup.c | 352 --------- + arch/unicore32/kernel/setup.h | 36 - + arch/unicore32/kernel/signal.c | 424 ----------- + arch/unicore32/kernel/sleep.S | 199 ----- + arch/unicore32/kernel/stacktrace.c | 127 ---- + arch/unicore32/kernel/sys.c | 37 - + arch/unicore32/kernel/time.c | 128 ---- + arch/unicore32/kernel/traps.c | 322 -------- + arch/unicore32/kernel/vmlinux.lds.S | 59 -- + arch/unicore32/lib/Makefile | 28 - + arch/unicore32/lib/backtrace.S | 168 ----- + arch/unicore32/lib/clear_user.S | 54 -- + arch/unicore32/lib/copy_from_user.S | 101 --- + arch/unicore32/lib/copy_page.S | 36 - + arch/unicore32/lib/copy_template.S | 211 ------ + arch/unicore32/lib/copy_to_user.S | 93 --- + arch/unicore32/lib/delay.S | 48 -- + arch/unicore32/lib/findbit.S | 97 --- + arch/unicore32/lib/strncpy_from_user.S | 42 -- + arch/unicore32/lib/strnlen_user.S | 39 - + arch/unicore32/mm/Kconfig | 41 - + arch/unicore32/mm/Makefile | 14 - + arch/unicore32/mm/alignment.c | 524 ------------- + arch/unicore32/mm/cache-ucv2.S | 209 ------ + arch/unicore32/mm/extable.c | 21 - + arch/unicore32/mm/fault.c | 481 ------------ + arch/unicore32/mm/flush.c | 94 --- + arch/unicore32/mm/init.c | 261 ------- + arch/unicore32/mm/ioremap.c | 242 ------ + arch/unicore32/mm/mm.h | 31 - + arch/unicore32/mm/mmu.c | 513 ------------- + arch/unicore32/mm/pgd.c | 102 --- + arch/unicore32/mm/proc-macros.S | 142 ---- + arch/unicore32/mm/proc-syms.c | 19 - + arch/unicore32/mm/proc-ucv2.S | 131 ---- + arch/unicore32/mm/tlb-ucv2.S | 86 --- + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/unicore2-cpufreq.c | 76 -- + drivers/i2c/busses/Kconfig | 11 - + drivers/i2c/busses/Makefile | 1 - + drivers/i2c/busses/i2c-puv3.c | 275 ------- + drivers/input/serio/i8042-unicore32io.h | 70 -- + drivers/input/serio/i8042.h | 2 - + drivers/pwm/Kconfig | 9 - + drivers/pwm/Makefile | 1 - + drivers/pwm/pwm-puv3.c | 150 ---- + drivers/rtc/Kconfig | 9 - + drivers/rtc/Makefile | 1 - + drivers/rtc/rtc-puv3.c | 286 ------- + drivers/video/fbdev/Kconfig | 11 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/fb-puv3.c | 836 --------------------- + kernel/reboot.c | 2 +- + 206 files changed, 1 insertion(+), 17454 deletions(-) + delete mode 100644 arch/unicore32/.gitignore + delete mode 100644 arch/unicore32/Kconfig + delete mode 100644 arch/unicore32/Kconfig.debug + delete mode 100644 arch/unicore32/Makefile + delete mode 100644 arch/unicore32/boot/Makefile + delete mode 100644 arch/unicore32/boot/compressed/Makefile + delete mode 100644 arch/unicore32/boot/compressed/head.S + delete mode 100644 arch/unicore32/boot/compressed/misc.c + delete mode 100644 arch/unicore32/boot/compressed/piggy.S.in + delete mode 100644 arch/unicore32/boot/compressed/vmlinux.lds.S + delete mode 100644 arch/unicore32/configs/defconfig + delete mode 100644 arch/unicore32/include/asm/Kbuild + delete mode 100644 arch/unicore32/include/asm/assembler.h + delete mode 100644 arch/unicore32/include/asm/barrier.h + delete mode 100644 arch/unicore32/include/asm/bitops.h + delete mode 100644 arch/unicore32/include/asm/bug.h + delete mode 100644 arch/unicore32/include/asm/cache.h + delete mode 100644 arch/unicore32/include/asm/cacheflush.h + delete mode 100644 arch/unicore32/include/asm/checksum.h + delete mode 100644 arch/unicore32/include/asm/cmpxchg.h + delete mode 100644 arch/unicore32/include/asm/cpu-single.h + delete mode 100644 arch/unicore32/include/asm/cputype.h + delete mode 100644 arch/unicore32/include/asm/delay.h + delete mode 100644 arch/unicore32/include/asm/dma.h + delete mode 100644 arch/unicore32/include/asm/elf.h + delete mode 100644 arch/unicore32/include/asm/fpstate.h + delete mode 100644 arch/unicore32/include/asm/fpu-ucf64.h + delete mode 100644 arch/unicore32/include/asm/gpio.h + delete mode 100644 arch/unicore32/include/asm/hwcap.h + delete mode 100644 arch/unicore32/include/asm/hwdef-copro.h + delete mode 100644 arch/unicore32/include/asm/io.h + delete mode 100644 arch/unicore32/include/asm/irq.h + delete mode 100644 arch/unicore32/include/asm/irqflags.h + delete mode 100644 arch/unicore32/include/asm/linkage.h + delete mode 100644 arch/unicore32/include/asm/memblock.h + delete mode 100644 arch/unicore32/include/asm/memory.h + delete mode 100644 arch/unicore32/include/asm/mmu.h + delete mode 100644 arch/unicore32/include/asm/mmu_context.h + delete mode 100644 arch/unicore32/include/asm/page.h + delete mode 100644 arch/unicore32/include/asm/pci.h + delete mode 100644 arch/unicore32/include/asm/pgalloc.h + delete mode 100644 arch/unicore32/include/asm/pgtable-hwdef.h + delete mode 100644 arch/unicore32/include/asm/pgtable.h + delete mode 100644 arch/unicore32/include/asm/processor.h + delete mode 100644 arch/unicore32/include/asm/ptrace.h + delete mode 100644 arch/unicore32/include/asm/stacktrace.h + delete mode 100644 arch/unicore32/include/asm/string.h + delete mode 100644 arch/unicore32/include/asm/suspend.h + delete mode 100644 arch/unicore32/include/asm/switch_to.h + delete mode 100644 arch/unicore32/include/asm/syscall.h + delete mode 100644 arch/unicore32/include/asm/thread_info.h + delete mode 100644 arch/unicore32/include/asm/timex.h + delete mode 100644 arch/unicore32/include/asm/tlb.h + delete mode 100644 arch/unicore32/include/asm/tlbflush.h + delete mode 100644 arch/unicore32/include/asm/traps.h + delete mode 100644 arch/unicore32/include/asm/uaccess.h + delete mode 100644 arch/unicore32/include/asm/vmalloc.h + delete mode 100644 arch/unicore32/include/mach/PKUnity.h + delete mode 100644 arch/unicore32/include/mach/bitfield.h + delete mode 100644 arch/unicore32/include/mach/dma.h + delete mode 100644 arch/unicore32/include/mach/hardware.h + delete mode 100644 arch/unicore32/include/mach/map.h + delete mode 100644 arch/unicore32/include/mach/memory.h + delete mode 100644 arch/unicore32/include/mach/ocd.h + delete mode 100644 arch/unicore32/include/mach/pm.h + delete mode 100644 arch/unicore32/include/mach/regs-ac97.h + delete mode 100644 arch/unicore32/include/mach/regs-dmac.h + delete mode 100644 arch/unicore32/include/mach/regs-gpio.h + delete mode 100644 arch/unicore32/include/mach/regs-i2c.h + delete mode 100644 arch/unicore32/include/mach/regs-intc.h + delete mode 100644 arch/unicore32/include/mach/regs-nand.h + delete mode 100644 arch/unicore32/include/mach/regs-ost.h + delete mode 100644 arch/unicore32/include/mach/regs-pci.h + delete mode 100644 arch/unicore32/include/mach/regs-pm.h + delete mode 100644 arch/unicore32/include/mach/regs-ps2.h + delete mode 100644 arch/unicore32/include/mach/regs-resetc.h + delete mode 100644 arch/unicore32/include/mach/regs-rtc.h + delete mode 100644 arch/unicore32/include/mach/regs-sdc.h + delete mode 100644 arch/unicore32/include/mach/regs-spi.h + delete mode 100644 arch/unicore32/include/mach/regs-uart.h + delete mode 100644 arch/unicore32/include/mach/regs-umal.h + delete mode 100644 arch/unicore32/include/mach/regs-unigfx.h + delete mode 100644 arch/unicore32/include/mach/uncompress.h + delete mode 100644 arch/unicore32/include/uapi/asm/Kbuild + delete mode 100644 arch/unicore32/include/uapi/asm/byteorder.h + delete mode 100644 arch/unicore32/include/uapi/asm/ptrace.h + delete mode 100644 arch/unicore32/include/uapi/asm/sigcontext.h + delete mode 100644 arch/unicore32/include/uapi/asm/unistd.h + delete mode 100644 arch/unicore32/kernel/Makefile + delete mode 100644 arch/unicore32/kernel/asm-offsets.c + delete mode 100644 arch/unicore32/kernel/clock.c + delete mode 100644 arch/unicore32/kernel/debug-macro.S + delete mode 100644 arch/unicore32/kernel/debug.S + delete mode 100644 arch/unicore32/kernel/dma.c + delete mode 100644 arch/unicore32/kernel/early_printk.c + delete mode 100644 arch/unicore32/kernel/elf.c + delete mode 100644 arch/unicore32/kernel/entry.S + delete mode 100644 arch/unicore32/kernel/fpu-ucf64.c + delete mode 100644 arch/unicore32/kernel/gpio.c + delete mode 100644 arch/unicore32/kernel/head.S + delete mode 100644 arch/unicore32/kernel/hibernate.c + delete mode 100644 arch/unicore32/kernel/hibernate_asm.S + delete mode 100644 arch/unicore32/kernel/irq.c + delete mode 100644 arch/unicore32/kernel/ksyms.c + delete mode 100644 arch/unicore32/kernel/ksyms.h + delete mode 100644 arch/unicore32/kernel/module.c + delete mode 100644 arch/unicore32/kernel/pci.c + delete mode 100644 arch/unicore32/kernel/pm.c + delete mode 100644 arch/unicore32/kernel/process.c + delete mode 100644 arch/unicore32/kernel/ptrace.c + delete mode 100644 arch/unicore32/kernel/puv3-core.c + delete mode 100644 arch/unicore32/kernel/puv3-nb0916.c + delete mode 100644 arch/unicore32/kernel/setup.c + delete mode 100644 arch/unicore32/kernel/setup.h + delete mode 100644 arch/unicore32/kernel/signal.c + delete mode 100644 arch/unicore32/kernel/sleep.S + delete mode 100644 arch/unicore32/kernel/stacktrace.c + delete mode 100644 arch/unicore32/kernel/sys.c + delete mode 100644 arch/unicore32/kernel/time.c + delete mode 100644 arch/unicore32/kernel/traps.c + delete mode 100644 arch/unicore32/kernel/vmlinux.lds.S + delete mode 100644 arch/unicore32/lib/Makefile + delete mode 100644 arch/unicore32/lib/backtrace.S + delete mode 100644 arch/unicore32/lib/clear_user.S + delete mode 100644 arch/unicore32/lib/copy_from_user.S + delete mode 100644 arch/unicore32/lib/copy_page.S + delete mode 100644 arch/unicore32/lib/copy_template.S + delete mode 100644 arch/unicore32/lib/copy_to_user.S + delete mode 100644 arch/unicore32/lib/delay.S + delete mode 100644 arch/unicore32/lib/findbit.S + delete mode 100644 arch/unicore32/lib/strncpy_from_user.S + delete mode 100644 arch/unicore32/lib/strnlen_user.S + delete mode 100644 arch/unicore32/mm/Kconfig + delete mode 100644 arch/unicore32/mm/Makefile + delete mode 100644 arch/unicore32/mm/alignment.c + delete mode 100644 arch/unicore32/mm/cache-ucv2.S + delete mode 100644 arch/unicore32/mm/extable.c + delete mode 100644 arch/unicore32/mm/fault.c + delete mode 100644 arch/unicore32/mm/flush.c + delete mode 100644 arch/unicore32/mm/init.c + delete mode 100644 arch/unicore32/mm/ioremap.c + delete mode 100644 arch/unicore32/mm/mm.h + delete mode 100644 arch/unicore32/mm/mmu.c + delete mode 100644 arch/unicore32/mm/pgd.c + delete mode 100644 arch/unicore32/mm/proc-macros.S + delete mode 100644 arch/unicore32/mm/proc-syms.c + delete mode 100644 arch/unicore32/mm/proc-ucv2.S + delete mode 100644 arch/unicore32/mm/tlb-ucv2.S + delete mode 100644 drivers/cpufreq/unicore2-cpufreq.c + delete mode 100644 drivers/i2c/busses/i2c-puv3.c + delete mode 100644 drivers/input/serio/i8042-unicore32io.h + delete mode 100644 drivers/pwm/pwm-puv3.c + delete mode 100644 drivers/rtc/rtc-puv3.c + delete mode 100644 drivers/video/fbdev/fb-puv3.c +Merging set_fs/set_fs-rw (2750e3608b79 fs: don't allow splice read/write without explicit ops) +$ git merge set_fs/set_fs-rw +Auto-merging sound/core/info.c +Auto-merging net/ipv4/netfilter/ipt_CLUSTERIP.c +Auto-merging net/bluetooth/6lowpan.c +Auto-merging mm/swapfile.c +Auto-merging mm/shmem.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/sched/psi.c +Auto-merging kernel/kallsyms.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/bpf-cgroup.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/array.c +Auto-merging fs/omfs/file.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfs/file.c +Auto-merging fs/hfs/inode.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/fuse/file.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ext4/file.c +Auto-merging fs/exfat/file.c +Auto-merging fs/debugfs/file.c +Auto-merging fs/btrfs/file.c +CONFLICT (content): Merge conflict in fs/btrfs/file.c +Auto-merging fs/block_dev.c +Auto-merging fs/affs/file.c +Auto-merging drivers/usb/host/xhci-debugfs.c +Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c +Auto-merging drivers/usb/dwc3/debugfs.c +Auto-merging drivers/usb/dwc2/debugfs.c +Auto-merging drivers/usb/chipidea/debug.c +Auto-merging drivers/staging/rtl8192u/ieee80211/ieee80211_module.c +Auto-merging drivers/soc/qcom/socinfo.c +Auto-merging drivers/s390/block/dasd.c +Auto-merging drivers/pwm/core.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/intel_pmc_core.c +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/pci/controller/pci-tegra.c +Auto-merging drivers/net/xen-netback/xenbus.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/debugfs.c +Auto-merging drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +Auto-merging drivers/misc/habanalabs/debugfs.c +Auto-merging drivers/mfd/tps65010.c +Auto-merging drivers/mfd/ab8500-debugfs.c +Auto-merging drivers/mfd/ab3100-otp.c +Auto-merging drivers/mfd/ab3100-core.c +Auto-merging drivers/memory/tegra/tegra30-emc.c +Auto-merging drivers/memory/tegra/tegra20-emc.c +Auto-merging drivers/memory/tegra/tegra186-emc.c +Auto-merging drivers/memory/tegra/tegra124-emc.c +Auto-merging drivers/media/cec/core/cec-core.c +Auto-merging drivers/md/md.c +Auto-merging drivers/hwmon/dell-smm-hwmon.c +Auto-merging drivers/gpu/host1x/debug.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs_params.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_debugfs.c +Auto-merging drivers/gpu/drm/drm_mipi_dbi.c +Auto-merging drivers/gpu/drm/drm_debugfs.c +Auto-merging drivers/gpu/drm/arm/malidp_drv.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/firmware/tegra/bpmp-debugfs.c +Auto-merging drivers/crypto/qat/qat_common/adf_transport_debug.c +Auto-merging drivers/crypto/qat/qat_common/adf_cfg.c +Auto-merging drivers/crypto/hisilicon/qm.c +Auto-merging drivers/crypto/amlogic/amlogic-gxl-core.c +Auto-merging drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +Auto-merging drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +Auto-merging drivers/block/rsxx/core.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/block/nbd.c +Auto-merging drivers/acpi/battery.c +CONFLICT (content): Merge conflict in drivers/acpi/battery.c +Auto-merging block/blk-mq-debugfs.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging arch/um/kernel/process.c +Auto-merging arch/powerpc/platforms/pseries/lpar.c +Auto-merging arch/powerpc/mm/ptdump/hashpagetable.c +Auto-merging arch/powerpc/mm/numa.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/numa.c +Auto-merging arch/arm/mm/alignment.c +Auto-merging Documentation/process/clang-format.rst +Resolved 'arch/powerpc/mm/numa.c' using previous resolution. +Resolved 'drivers/acpi/battery.c' using previous resolution. +Resolved 'fs/btrfs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5e9818ec1190] Merge remote-tracking branch 'set_fs/set_fs-rw' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/seq_file.rst | 2 +- + Documentation/process/clang-format.rst | 4 +- + .../translations/it_IT/process/clang-format.rst | 4 +- + arch/alpha/kernel/srm_env.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/ptdump_debugfs.c | 2 +- + arch/arm64/kvm/vgic/vgic-debug.c | 2 +- + arch/c6x/platforms/pll.c | 2 +- + arch/mips/cavium-octeon/oct_ilm.c | 2 +- + arch/mips/kernel/segment.c | 2 +- + arch/mips/ralink/bootrom.c | 2 +- + arch/powerpc/kernel/rtas-proc.c | 10 +- + arch/powerpc/kvm/book3s_xive_native.c | 2 +- + arch/powerpc/kvm/timing.c | 2 +- + arch/powerpc/mm/ptdump/bats.c | 2 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- + arch/powerpc/mm/ptdump/ptdump.c | 2 +- + arch/powerpc/mm/ptdump/segment_regs.c | 2 +- + arch/powerpc/platforms/cell/spufs/file.c | 8 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 4 +- + arch/powerpc/platforms/pseries/lparcfg.c | 2 +- + arch/s390/kernel/diag.c | 2 +- + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/pci/pci_debug.c | 2 +- + arch/sh/mm/alignment.c | 2 +- + arch/sh/mm/asids-debugfs.c | 2 +- + arch/sh/mm/cache-debugfs.c | 2 +- + arch/sh/mm/pmb.c | 2 +- + arch/sh/mm/tlb-debugfs.c | 2 +- + arch/sparc/kernel/led.c | 2 +- + arch/um/kernel/exitcode.c | 2 +- + arch/um/kernel/process.c | 2 +- + arch/x86/kernel/cpu/mce/severity.c | 2 +- + arch/x86/kernel/cpu/mtrr/if.c | 2 +- + arch/x86/mm/pat/memtype.c | 2 +- + arch/x86/mm/pat/set_memory.c | 2 +- + arch/x86/platform/uv/tlb_uv.c | 2 +- + arch/x86/xen/p2m.c | 2 +- + block/blk-mq-debugfs.c | 2 +- + drivers/acpi/proc.c | 2 +- + drivers/base/power/wakeup.c | 2 +- + drivers/block/aoe/aoeblk.c | 2 +- + drivers/block/drbd/drbd_debugfs.c | 10 +- + drivers/block/nbd.c | 4 +- + drivers/block/pktcdvd.c | 2 +- + drivers/block/rsxx/core.c | 4 +- + drivers/bus/mvebu-mbus.c | 4 +- + drivers/char/tpm/eventlog/common.c | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 2 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 2 +- + drivers/crypto/caam/dpseci-debugfs.c | 2 +- + drivers/crypto/cavium/zip/zip_main.c | 6 +- + drivers/crypto/hisilicon/qm.c | 2 +- + drivers/crypto/qat/qat_common/adf_cfg.c | 2 +- + .../crypto/qat/qat_common/adf_transport_debug.c | 4 +- + drivers/firmware/tegra/bpmp-debugfs.c | 2 +- + drivers/gpio/gpiolib.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 4 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 2 +- + drivers/gpu/drm/arm/malidp_drv.c | 2 +- + drivers/gpu/drm/armada/armada_debugfs.c | 2 +- + drivers/gpu/drm/drm_debugfs.c | 6 +- + drivers/gpu/drm/drm_debugfs_crc.c | 2 +- + drivers/gpu/drm/drm_mipi_dbi.c | 2 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 16 +-- + drivers/gpu/drm/i915/gt/debugfs_gt.h | 2 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 +- + drivers/gpu/drm/msm/msm_debugfs.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 2 +- + drivers/gpu/host1x/debug.c | 4 +- + drivers/gpu/vga/vga_switcheroo.c | 2 +- + drivers/hid/hid-picolcd_debugfs.c | 2 +- + drivers/hid/hid-wiimote-debug.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 2 +- + drivers/ide/ide-proc.c | 4 +- + drivers/infiniband/hw/cxgb4/device.c | 4 +- + drivers/infiniband/hw/qib/qib_debugfs.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 4 +- + drivers/input/input.c | 4 +- + drivers/macintosh/via-pmu.c | 2 +- + drivers/md/bcache/closure.c | 2 +- + drivers/md/md.c | 2 +- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/memory/emif.c | 4 +- + drivers/memory/tegra/tegra124-emc.c | 2 +- + drivers/memory/tegra/tegra186-emc.c | 2 +- + drivers/memory/tegra/tegra20-emc.c | 2 +- + drivers/memory/tegra/tegra30-emc.c | 2 +- + drivers/mfd/ab3100-core.c | 2 +- + drivers/mfd/ab3100-otp.c | 2 +- + drivers/mfd/ab8500-debugfs.c | 14 +-- + drivers/mfd/tps65010.c | 2 +- + drivers/misc/habanalabs/debugfs.c | 2 +- + drivers/misc/sgi-gru/gruprocfs.c | 6 +- + drivers/mmc/core/mmc_test.c | 2 +- + drivers/mtd/mtdcore.c | 4 +- + drivers/mtd/ubi/debug.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 38 +++---- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 8 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 2 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 2 +- + drivers/net/wireless/ath/ath5k/debug.c | 2 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 14 +-- + .../wireless/broadcom/brcm80211/brcmsmac/debug.c | 2 +- + drivers/net/wireless/intel/ipw2x00/libipw_module.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 +- + .../net/wireless/intersil/hostap/hostap_download.c | 2 +- + .../net/wireless/mediatek/mt76/mt7603/debugfs.c | 2 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_debugfs.c | 4 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/debugfs.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/debug.c | 2 +- + drivers/net/wireless/realtek/rtw88/debug.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_debugfs.c | 4 +- + drivers/net/xen-netback/xenbus.c | 2 +- + drivers/nvme/host/fabrics.c | 2 +- + drivers/parisc/led.c | 2 +- + drivers/pci/controller/pci-tegra.c | 2 +- + drivers/platform/x86/asus-wmi.c | 2 +- + drivers/platform/x86/intel_pmc_core.c | 2 +- + drivers/platform/x86/intel_telemetry_debugfs.c | 4 +- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/platform/x86/toshiba_acpi.c | 8 +- + drivers/pnp/pnpbios/proc.c | 2 +- + drivers/power/supply/da9030_battery.c | 2 +- + drivers/pwm/core.c | 2 +- + drivers/ras/cec.c | 2 +- + drivers/ras/debugfs.c | 2 +- + drivers/s390/block/dasd.c | 2 +- + drivers/s390/block/dasd_proc.c | 2 +- + drivers/s390/cio/blacklist.c | 2 +- + drivers/s390/cio/qdio_debug.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 32 +++--- + drivers/scsi/qedf/qedf_dbg.h | 2 +- + drivers/scsi/qedi/qedi_dbg.h | 2 +- + drivers/scsi/qla2xxx/qla_dfs.c | 12 +- + drivers/scsi/scsi_devinfo.c | 2 +- + drivers/scsi/scsi_proc.c | 4 +- + drivers/scsi/sg.c | 4 +- + drivers/scsi/snic/snic_debugfs.c | 4 +- + drivers/sh/intc/virq-debugfs.c | 2 +- + drivers/soc/qcom/cmd-db.c | 2 +- + drivers/soc/qcom/socinfo.c | 4 +- + drivers/soc/ti/knav_dma.c | 2 +- + drivers/soc/ti/knav_qmss_queue.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- + drivers/usb/chipidea/debug.c | 4 +- + drivers/usb/dwc2/debugfs.c | 2 +- + drivers/usb/dwc3/debugfs.c | 8 +- + drivers/usb/gadget/function/rndis.c | 2 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 2 +- + drivers/usb/host/xhci-debugfs.c | 6 +- + drivers/usb/mtu3/mtu3_debugfs.c | 8 +- + drivers/usb/musb/musb_debugfs.c | 4 +- + drivers/video/fbdev/via/viafbdev.c | 14 +-- + drivers/visorbus/visorbus_main.c | 2 +- + drivers/xen/xenfs/xensyms.c | 2 +- + fs/adfs/file.c | 1 - + fs/affs/file.c | 1 - + fs/afs/file.c | 1 - + fs/bfs/file.c | 1 - + fs/block_dev.c | 1 - + fs/btrfs/file.c | 1 - + fs/ceph/file.c | 1 - + fs/cifs/cifs_debug.c | 14 +-- + fs/cifs/cifsfs.c | 6 - + fs/cifs/dfs_cache.c | 2 +- + fs/coda/file.c | 1 - + fs/cramfs/inode.c | 1 - + fs/debugfs/file.c | 10 +- + fs/dlm/debug_fs.c | 8 +- + fs/ecryptfs/file.c | 1 - + fs/exfat/file.c | 1 - + fs/ext2/file.c | 1 - + fs/ext4/file.c | 1 - + fs/f2fs/file.c | 1 - + fs/fat/file.c | 1 - + fs/fscache/object-list.c | 2 +- + fs/fuse/file.c | 1 - + fs/gfs2/file.c | 2 - + fs/gfs2/glock.c | 6 +- + fs/hfs/inode.c | 1 - + fs/hfsplus/inode.c | 1 - + fs/hostfs/hostfs_kern.c | 1 - + fs/hpfs/file.c | 1 - + fs/jbd2/journal.c | 2 +- + fs/jffs2/file.c | 1 - + fs/jfs/file.c | 1 - + fs/jfs/jfs_debug.c | 2 +- + fs/minix/file.c | 1 - + fs/nfs/file.c | 1 - + fs/nfs/nfs4file.c | 1 - + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfsctl.c | 12 +- + fs/nfsd/stats.c | 2 +- + fs/nilfs2/file.c | 1 - + fs/ntfs/file.c | 1 - + fs/ocfs2/cluster/netdebug.c | 6 +- + fs/ocfs2/dlm/dlmdebug.c | 2 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/file.c | 2 - + fs/omfs/file.c | 1 - + fs/openpromfs/inode.c | 2 +- + fs/orangefs/orangefs-debugfs.c | 2 +- + fs/proc/array.c | 2 +- + fs/proc/base.c | 24 ++-- + fs/proc/cpuinfo.c | 2 +- + fs/proc/fd.c | 2 +- + fs/proc/generic.c | 4 +- + fs/proc/inode.c | 119 ++++++++++++++------ + fs/proc/proc_net.c | 4 +- + fs/proc/proc_sysctl.c | 44 ++++---- + fs/proc/stat.c | 2 +- + fs/proc/task_mmu.c | 8 +- + fs/proc/task_nommu.c | 2 +- + fs/proc_namespace.c | 6 +- + fs/ramfs/file-mmu.c | 1 - + fs/ramfs/file-nommu.c | 1 - + fs/read_write.c | 61 ++++++---- + fs/reiserfs/file.c | 1 - + fs/romfs/mmap-nommu.c | 1 - + fs/seq_file.c | 45 +++++--- + fs/splice.c | 123 ++------------------- + fs/sysv/file.c | 1 - + fs/ubifs/file.c | 1 - + fs/udf/file.c | 1 - + fs/ufs/file.c | 1 - + fs/vboxsf/file.c | 1 - + fs/xfs/xfs_file.c | 1 - + fs/zonefs/super.c | 1 - + include/linux/bpf-cgroup.h | 2 +- + include/linux/fs.h | 2 - + include/linux/proc_fs.h | 1 + + include/linux/seq_file.h | 7 +- + ipc/util.c | 2 +- + kernel/bpf/cgroup.c | 2 +- + kernel/bpf/inode.c | 2 +- + kernel/fail_function.c | 2 +- + kernel/gcov/fs.c | 2 +- + kernel/irq/debugfs.c | 2 +- + kernel/irq/proc.c | 6 +- + kernel/kallsyms.c | 2 +- + kernel/kcsan/debugfs.c | 2 +- + kernel/latencytop.c | 2 +- + kernel/locking/lockdep_proc.c | 2 +- + kernel/module.c | 2 +- + kernel/profile.c | 2 +- + kernel/sched/debug.c | 2 +- + kernel/sched/psi.c | 6 +- + kernel/time/test_udelay.c | 2 +- + kernel/trace/ftrace.c | 16 +-- + kernel/trace/trace.c | 20 ++-- + kernel/trace/trace_dynevent.c | 2 +- + kernel/trace/trace_events.c | 10 +- + kernel/trace/trace_events_hist.c | 4 +- + kernel/trace/trace_events_synth.c | 2 +- + kernel/trace/trace_events_trigger.c | 2 +- + kernel/trace/trace_kprobe.c | 4 +- + kernel/trace/trace_printk.c | 2 +- + kernel/trace/trace_stack.c | 4 +- + kernel/trace/trace_stat.c | 2 +- + kernel/trace/trace_uprobe.c | 4 +- + lib/debugobjects.c | 2 +- + lib/dynamic_debug.c | 4 +- + lib/error-inject.c | 2 +- + lib/kunit/debugfs.c | 2 +- + mm/kmemleak.c | 2 +- + mm/shmem.c | 1 - + mm/slab_common.c | 2 +- + mm/swapfile.c | 2 +- + net/6lowpan/debugfs.c | 2 +- + net/atm/mpoa_proc.c | 2 +- + net/batman-adv/debugfs.c | 4 +- + net/bluetooth/6lowpan.c | 2 +- + net/core/pktgen.c | 6 +- + net/hsr/hsr_debugfs.c | 2 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/ipv4/route.c | 4 +- + net/l2tp/l2tp_debugfs.c | 2 +- + net/netfilter/xt_recent.c | 2 +- + net/sunrpc/cache.c | 4 +- + net/sunrpc/debugfs.c | 4 +- + net/sunrpc/rpc_pipe.c | 2 +- + net/sunrpc/stats.c | 2 +- + security/apparmor/apparmorfs.c | 10 +- + security/integrity/ima/ima_fs.c | 6 +- + security/selinux/selinuxfs.c | 2 +- + security/smack/smackfs.c | 20 ++-- + sound/core/info.c | 2 +- + 303 files changed, 668 insertions(+), 732 deletions(-) +Merging init/init-user-pointers (d12bd437760b initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Auto-merging init/main.c +Auto-merging init/do_mounts_initrd.c +Auto-merging include/linux/syscalls.h +Removing include/linux/raid/md_u.h +Auto-merging include/linux/fs.h +Auto-merging fs/read_write.c +Auto-merging fs/open.c +Auto-merging fs/file.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/md.c +CONFLICT (content): Merge conflict in drivers/md/md.c +Resolved 'drivers/md/md.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b7e6a2fbfd97] Merge remote-tracking branch 'init/init-user-pointers' +$ git diff -M --stat --summary HEAD^.. + arch/arm/kernel/atags_parse.c | 2 - + arch/sh/kernel/setup.c | 2 - + arch/sparc/kernel/setup_32.c | 2 - + arch/sparc/kernel/setup_64.c | 2 - + arch/x86/kernel/setup.c | 2 - + drivers/md/Makefile | 3 + + init/do_mounts_md.c => drivers/md/md-autodetect.c | 246 ++++++++++------------ + drivers/md/md.c | 38 +--- + drivers/md/md.h | 12 ++ + fs/file.c | 7 +- + fs/ioctl.c | 7 +- + fs/open.c | 56 +++-- + fs/read_write.c | 2 +- + fs/readdir.c | 11 +- + fs/utimes.c | 109 +++++----- + include/linux/fs.h | 4 + + include/linux/initrd.h | 6 - + include/linux/raid/detect.h | 8 + + include/linux/raid/md_u.h | 13 -- + include/linux/syscalls.h | 17 -- + init/Makefile | 1 - + init/do_mounts.c | 70 +----- + init/do_mounts.h | 21 -- + init/do_mounts_initrd.c | 13 +- + init/do_mounts_rd.c | 102 +++++---- + init/initramfs.c | 112 ++++------ + init/main.c | 16 +- + 27 files changed, 354 insertions(+), 530 deletions(-) + rename init/do_mounts_md.c => drivers/md/md-autodetect.c (59%) + delete mode 100644 include/linux/raid/md_u.h +Merging akpm-current/current (794cc0150f12 ipc/shm.c: Remove the superfluous break) +$ git merge --no-ff akpm-current/current +Auto-merging tools/testing/selftests/vm/hmm-tests.c +Auto-merging tools/testing/selftests/kmod/kmod.sh +Auto-merging security/keys/encrypted-keys/encrypted.c +Auto-merging scripts/checkpatch.pl +Auto-merging net/core/sock.c +Auto-merging net/bluetooth/smp.c +Auto-merging mm/vmalloc.c +Auto-merging mm/util.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap.c +Auto-merging mm/slub.c +Auto-merging mm/slab_common.c +Auto-merging mm/shmem.c +Auto-merging mm/percpu.c +Auto-merging mm/page_io.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mmap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/debug_vm_pgtable.c +Auto-merging mm/cma.h +CONFLICT (content): Merge conflict in mm/cma.h +Auto-merging mm/Kconfig +Auto-merging lib/test_lockup.c +Auto-merging lib/cpumask.c +CONFLICT (content): Merge conflict in lib/cpumask.c +Auto-merging lib/bitmap.c +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Auto-merging kernel/power/snapshot.c +Auto-merging kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging kernel/events/callchain.c +Auto-merging kernel/crash_core.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pgtable.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/mman.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/crash_core.h +Auto-merging include/asm-generic/tlb.h +Auto-merging fs/proc/page.c +Auto-merging fs/proc/base.c +Auto-merging fs/open.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/fat/file.c +Auto-merging fs/exec.c +Auto-merging fs/crypto/keysetup_v1.c +CONFLICT (content): Merge conflict in fs/crypto/keysetup_v1.c +Auto-merging fs/crypto/keyring.c +Auto-merging fs/cifs/dfs_cache.c +Auto-merging fs/buffer.c +Auto-merging fs/Kconfig +Auto-merging drivers/staging/rtl8723bs/core/rtw_security.c +Auto-merging drivers/s390/crypto/ap_bus.h +CONFLICT (content): Merge conflict in drivers/s390/crypto/ap_bus.h +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/btt.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c +Auto-merging drivers/misc/ibmvmc.c +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/iommu/ipmmu-vmsa.c +Auto-merging drivers/crypto/virtio/virtio_crypto_core.c +Auto-merging drivers/crypto/virtio/virtio_crypto_algs.c +Auto-merging drivers/crypto/mediatek/mtk-aes.c +CONFLICT (content): Merge conflict in drivers/crypto/mediatek/mtk-aes.c +Auto-merging drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h +Auto-merging drivers/crypto/marvell/cesa/hash.c +Auto-merging drivers/crypto/ccree/cc_cipher.c +Auto-merging drivers/crypto/cavium/cpt/cptvf_reqmanager.c +Auto-merging drivers/crypto/amlogic/amlogic-gxl-cipher.c +Auto-merging drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c +Auto-merging drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c +Auto-merging drivers/base/memory.c +Auto-merging crypto/skcipher.c +Auto-merging crypto/seqiv.c +Auto-merging crypto/rsa-pkcs1pad.c +Auto-merging crypto/gcm.c +Auto-merging crypto/api.c +Auto-merging crypto/adiantum.c +Auto-merging arch/x86/mm/numa.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/alternative.c +Auto-merging arch/sparc/kernel/process_32.c +Auto-merging arch/s390/mm/cmm.c +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/powerpc/mm/ptdump/ptdump.c +Auto-merging arch/powerpc/mm/ptdump/hashpagetable.c +Auto-merging arch/powerpc/mm/numa.c +Auto-merging arch/powerpc/mm/init_32.c +Auto-merging arch/parisc/mm/init.c +Auto-merging arch/parisc/kernel/process.c +Auto-merging arch/parisc/kernel/pci-dma.c +Auto-merging arch/nds32/kernel/process.c +Auto-merging arch/microblaze/kernel/process.c +Auto-merging arch/m68k/mm/mcfmmu.c +Auto-merging arch/ia64/mm/tlb.c +Auto-merging arch/ia64/mm/discontig.c +Auto-merging arch/ia64/kernel/process.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/init.c +CONFLICT (content): Merge conflict in arch/arm64/mm/init.c +Auto-merging arch/arm64/mm/hugetlbpage.c +Auto-merging Documentation/vm/memory-model.rst +Auto-merging Documentation/filesystems/proc.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/proc.rst +Auto-merging Documentation/admin-guide/sysctl/vm.rst +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging .mailmap +Resolved 'Documentation/filesystems/proc.rst' using previous resolution. +Resolved 'arch/arm64/mm/init.c' using previous resolution. +Resolved 'drivers/crypto/mediatek/mtk-aes.c' using previous resolution. +Resolved 'drivers/s390/crypto/ap_bus.h' using previous resolution. +Resolved 'fs/crypto/keysetup_v1.c' using previous resolution. +Resolved 'kernel/rcu/tree.c' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Resolved 'lib/cpumask.c' using previous resolution. +Resolved 'mm/cma.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 59b56de12abe] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 3 + + Documentation/admin-guide/cgroup-v2.rst | 4 + + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/sysctl/kernel.rst | 3 +- + Documentation/admin-guide/sysctl/vm.rst | 19 +- + Documentation/dev-tools/kasan.rst | 10 +- + Documentation/filesystems/proc.rst | 11 +- + Documentation/filesystems/tmpfs.rst | 11 + + Documentation/vm/arch_pgtable_helpers.rst | 258 +++++++ + Documentation/vm/memory-model.rst | 7 +- + Documentation/vm/page_migration.rst | 27 + + Documentation/vm/slub.rst | 37 +- + arch/alpha/include/asm/core_apecs.h | 6 +- + arch/alpha/include/asm/core_cia.h | 6 +- + arch/alpha/include/asm/core_lca.h | 6 +- + arch/alpha/include/asm/core_marvel.h | 4 +- + arch/alpha/include/asm/core_mcpcia.h | 6 +- + arch/alpha/include/asm/core_t2.h | 2 +- + arch/alpha/include/asm/io.h | 20 +- + arch/alpha/include/asm/io_trivial.h | 16 +- + arch/alpha/include/asm/jensen.h | 2 +- + arch/alpha/include/asm/machvec.h | 6 +- + arch/alpha/include/asm/pgalloc.h | 21 +- + arch/alpha/include/asm/tlbflush.h | 1 - + arch/alpha/include/asm/uaccess.h | 2 +- + arch/alpha/kernel/core_irongate.c | 1 - + arch/alpha/kernel/core_marvel.c | 3 +- + arch/alpha/kernel/core_titan.c | 1 - + arch/alpha/kernel/io.c | 12 +- + arch/alpha/kernel/machvec_impl.h | 2 - + arch/alpha/kernel/smp.c | 1 - + arch/alpha/mm/numa.c | 1 - + arch/arc/include/asm/segment.h | 3 +- + arch/arc/mm/fault.c | 1 - + arch/arc/mm/init.c | 1 - + arch/arm/include/asm/pgalloc.h | 12 +- + arch/arm/include/asm/tlb.h | 1 - + arch/arm/include/asm/uaccess.h | 4 +- + arch/arm/kernel/machine_kexec.c | 1 - + arch/arm/kernel/smp.c | 1 - + arch/arm/kernel/suspend.c | 1 - + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 1 - + arch/arm/mm/hugetlbpage.c | 1 - + arch/arm/mm/init.c | 9 +- + arch/arm/mm/mmu.c | 1 + + arch/arm64/include/asm/pgalloc.h | 39 +- + arch/arm64/include/asm/uaccess.h | 2 +- + arch/arm64/kernel/sdei.c | 2 +- + arch/arm64/kernel/smp.c | 1 - + arch/arm64/mm/hugetlbpage.c | 1 - + arch/arm64/mm/init.c | 23 +- + arch/arm64/mm/ioremap.c | 1 - + arch/arm64/mm/mmu.c | 1 + + arch/arm64/mm/numa.c | 10 - + arch/csky/include/asm/pgalloc.h | 7 +- + arch/csky/include/asm/segment.h | 2 +- + arch/csky/kernel/smp.c | 1 - + arch/h8300/include/asm/segment.h | 2 +- + arch/hexagon/include/asm/pgalloc.h | 7 +- + arch/ia64/include/asm/pgalloc.h | 24 - + arch/ia64/include/asm/tlb.h | 1 - + arch/ia64/include/asm/uaccess.h | 2 +- + arch/ia64/kernel/process.c | 1 - + arch/ia64/kernel/smp.c | 1 - + arch/ia64/kernel/smpboot.c | 1 - + arch/ia64/mm/contig.c | 1 - + arch/ia64/mm/discontig.c | 2 - + arch/ia64/mm/hugetlbpage.c | 1 - + arch/ia64/mm/numa.c | 2 - + arch/ia64/mm/tlb.c | 1 - + arch/m68k/include/asm/mmu_context.h | 2 +- + arch/m68k/include/asm/segment.h | 2 +- + arch/m68k/include/asm/sun3_pgalloc.h | 7 +- + arch/m68k/include/asm/tlbflush.h | 12 +- + arch/m68k/kernel/dma.c | 2 +- + arch/m68k/kernel/traps.c | 3 +- + arch/m68k/mm/cache.c | 2 +- + arch/m68k/mm/fault.c | 1 - + arch/m68k/mm/kmap.c | 2 +- + arch/m68k/mm/mcfmmu.c | 1 + + arch/m68k/mm/memory.c | 1 - + arch/m68k/sun3x/dvma.c | 2 +- + arch/microblaze/include/asm/pgalloc.h | 6 - + arch/microblaze/include/asm/tlbflush.h | 1 - + arch/microblaze/include/asm/uaccess.h | 2 +- + arch/microblaze/kernel/process.c | 1 - + arch/microblaze/kernel/signal.c | 1 - + arch/microblaze/mm/init.c | 3 - + arch/mips/include/asm/pgalloc.h | 19 +- + arch/mips/include/asm/uaccess.h | 2 +- + arch/mips/kernel/setup.c | 8 - + arch/mips/kernel/unaligned.c | 27 +- + arch/mips/loongson64/numa.c | 1 - + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/mips/sgi-ip27/ip27-memory.c | 2 - + arch/mips/sgi-ip32/ip32-memory.c | 1 - + arch/nds32/include/asm/uaccess.h | 2 +- + arch/nds32/kernel/process.c | 2 +- + arch/nds32/mm/alignment.c | 7 +- + arch/nds32/mm/mm-nds32.c | 2 + + arch/nios2/include/asm/pgalloc.h | 7 +- + arch/nios2/include/asm/uaccess.h | 2 +- + arch/openrisc/include/asm/pgalloc.h | 33 +- + arch/openrisc/include/asm/tlbflush.h | 1 - + arch/openrisc/include/asm/uaccess.h | 2 +- + arch/openrisc/kernel/or32_ksyms.c | 1 - + arch/parisc/include/asm/io.h | 4 +- + arch/parisc/include/asm/mmu_context.h | 1 - + arch/parisc/include/asm/pgalloc.h | 12 +- + arch/parisc/include/asm/uaccess.h | 2 +- + arch/parisc/kernel/cache.c | 1 - + arch/parisc/kernel/pci-dma.c | 1 - + arch/parisc/kernel/process.c | 1 - + arch/parisc/kernel/signal.c | 1 - + arch/parisc/kernel/smp.c | 1 - + arch/parisc/lib/iomap.c | 72 +- + arch/parisc/mm/hugetlbpage.c | 1 - + arch/parisc/mm/init.c | 5 - + arch/parisc/mm/ioremap.c | 2 +- + arch/powerpc/include/asm/tlb.h | 1 - + arch/powerpc/include/asm/uaccess.h | 3 +- + arch/powerpc/kernel/iomap.c | 28 +- + arch/powerpc/mm/book3s64/hash_hugetlbpage.c | 1 - + arch/powerpc/mm/book3s64/hash_pgtable.c | 1 - + arch/powerpc/mm/book3s64/hash_tlb.c | 1 - + arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 1 - + arch/powerpc/mm/init_32.c | 1 - + arch/powerpc/mm/kasan/8xx.c | 1 - + arch/powerpc/mm/kasan/book3s_32.c | 1 - + arch/powerpc/mm/mem.c | 3 - + arch/powerpc/mm/nohash/40x.c | 1 - + arch/powerpc/mm/nohash/8xx.c | 1 - + arch/powerpc/mm/nohash/fsl_booke.c | 1 - + arch/powerpc/mm/nohash/kaslr_booke.c | 1 - + arch/powerpc/mm/nohash/tlb.c | 1 + + arch/powerpc/mm/numa.c | 36 +- + arch/powerpc/mm/pgtable.c | 1 - + arch/powerpc/mm/pgtable_64.c | 1 - + arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- + arch/powerpc/mm/ptdump/ptdump.c | 1 - + arch/powerpc/platforms/pseries/cmm.c | 1 - + arch/riscv/include/asm/pgalloc.h | 18 +- + arch/riscv/include/asm/uaccess.h | 6 +- + arch/riscv/mm/fault.c | 1 - + arch/riscv/mm/init.c | 1 - + arch/s390/crypto/prng.c | 4 +- + arch/s390/include/asm/tlb.h | 1 - + arch/s390/include/asm/tlbflush.h | 1 - + arch/s390/include/asm/uaccess.h | 2 +- + arch/s390/kernel/machine_kexec.c | 1 - + arch/s390/kernel/ptrace.c | 1 - + arch/s390/kvm/diag.c | 1 - + arch/s390/kvm/priv.c | 1 - + arch/s390/kvm/pv.c | 1 - + arch/s390/mm/cmm.c | 1 - + arch/s390/mm/init.c | 1 - + arch/s390/mm/mmap.c | 1 - + arch/s390/mm/pgtable.c | 1 - + arch/sh/include/asm/pgalloc.h | 4 + + arch/sh/include/asm/segment.h | 3 +- + arch/sh/kernel/idle.c | 1 - + arch/sh/kernel/iomap.c | 22 +- + arch/sh/kernel/machine_kexec.c | 1 - + arch/sh/kernel/traps_32.c | 18 +- + arch/sh/mm/cache-sh3.c | 1 - + arch/sh/mm/cache-sh7705.c | 1 - + arch/sh/mm/hugetlbpage.c | 1 - + arch/sh/mm/init.c | 16 +- + arch/sh/mm/ioremap_fixed.c | 1 - + arch/sh/mm/numa.c | 3 - + arch/sh/mm/tlb-sh3.c | 1 - + arch/sparc/include/asm/ide.h | 1 - + arch/sparc/include/asm/tlb_64.h | 1 - + arch/sparc/include/asm/uaccess_32.h | 2 +- + arch/sparc/include/asm/uaccess_64.h | 2 +- + arch/sparc/kernel/leon_smp.c | 1 - + arch/sparc/kernel/process_32.c | 1 - + arch/sparc/kernel/signal_32.c | 1 - + arch/sparc/kernel/smp_32.c | 1 - + arch/sparc/kernel/smp_64.c | 1 + + arch/sparc/kernel/sun4m_irq.c | 1 - + arch/sparc/mm/highmem.c | 1 - + arch/sparc/mm/init_64.c | 1 - + arch/sparc/mm/io-unit.c | 1 - + arch/sparc/mm/iommu.c | 1 - + arch/sparc/mm/tlb.c | 1 - + arch/um/include/asm/pgalloc.h | 9 +- + arch/um/include/asm/pgtable-3level.h | 3 - + arch/um/kernel/mem.c | 17 - + arch/x86/ia32/ia32_aout.c | 1 - + arch/x86/include/asm/mmu_context.h | 1 - + arch/x86/include/asm/pgalloc.h | 42 +- + arch/x86/include/asm/uaccess.h | 2 +- + arch/x86/kernel/alternative.c | 1 + + arch/x86/kernel/apic/apic.c | 1 - + arch/x86/kernel/mpparse.c | 1 - + arch/x86/kernel/setup.c | 12 +- + arch/x86/kernel/traps.c | 1 - + arch/x86/mm/fault.c | 1 - + arch/x86/mm/hugetlbpage.c | 1 - + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 10 +- + arch/x86/mm/kaslr.c | 1 - + arch/x86/mm/numa.c | 1 - + arch/x86/mm/pgtable_32.c | 1 - + arch/x86/mm/pti.c | 1 - + arch/x86/platform/uv/bios_uv.c | 1 + + arch/x86/power/hibernate.c | 2 +- + arch/xtensa/include/asm/pgalloc.h | 40 +- + arch/xtensa/include/asm/uaccess.h | 2 +- + arch/xtensa/kernel/xtensa_ksyms.c | 1 - + arch/xtensa/mm/cache.c | 1 - + arch/xtensa/mm/fault.c | 1 - + crypto/adiantum.c | 2 +- + crypto/ahash.c | 4 +- + crypto/api.c | 2 +- + crypto/asymmetric_keys/verify_pefile.c | 4 +- + crypto/deflate.c | 2 +- + crypto/drbg.c | 10 +- + crypto/ecc.c | 8 +- + crypto/ecdh.c | 2 +- + crypto/gcm.c | 2 +- + crypto/gf128mul.c | 4 +- + crypto/jitterentropy-kcapi.c | 2 +- + crypto/rng.c | 2 +- + crypto/rsa-pkcs1pad.c | 6 +- + crypto/seqiv.c | 2 +- + crypto/shash.c | 2 +- + crypto/skcipher.c | 2 +- + crypto/testmgr.c | 6 +- + crypto/zstd.c | 2 +- + drivers/base/memory.c | 2 +- + drivers/base/node.c | 10 +- + drivers/block/xen-blkback/common.h | 1 - + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 2 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +- + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 4 +- + drivers/crypto/atmel-ecc.c | 2 +- + drivers/crypto/caam/caampkc.c | 28 +- + drivers/crypto/cavium/cpt/cptvf_main.c | 6 +- + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 12 +- + drivers/crypto/cavium/nitrox/nitrox_lib.c | 4 +- + drivers/crypto/cavium/zip/zip_crypto.c | 6 +- + drivers/crypto/ccp/ccp-crypto-rsa.c | 6 +- + drivers/crypto/ccree/cc_aead.c | 4 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 4 +- + drivers/crypto/ccree/cc_cipher.c | 6 +- + drivers/crypto/ccree/cc_hash.c | 8 +- + drivers/crypto/ccree/cc_request_mgr.c | 2 +- + drivers/crypto/marvell/cesa/hash.c | 2 +- + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 6 +- + drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h | 2 +- + drivers/crypto/nx/nx.c | 4 +- + drivers/crypto/virtio/virtio_crypto_algs.c | 12 +- + drivers/crypto/virtio/virtio_crypto_core.c | 2 +- + drivers/firmware/arm_sdei.c | 5 +- + drivers/iommu/ipmmu-vmsa.c | 1 - + drivers/md/dm-crypt.c | 32 +- + drivers/md/dm-integrity.c | 6 +- + drivers/misc/ibmvmc.c | 6 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 6 +- + drivers/net/ppp/ppp_mppe.c | 6 +- + drivers/net/wireguard/noise.c | 4 +- + drivers/net/wireguard/peer.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 6 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 6 +- + drivers/net/wireless/intersil/orinoco/wext.c | 4 +- + .../net/wireless/realtek/rtl818x/rtl8180/rtl8180.h | 6 +- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/hw/intel/ntb_hw_gen3.h | 2 +- + drivers/ntb/hw/intel/ntb_hw_intel.h | 2 +- + drivers/nvdimm/btt.c | 4 +- + drivers/nvdimm/pmem.c | 6 +- + drivers/rapidio/devices/rio_mport_cdev.c | 7 +- + drivers/rapidio/rio-scan.c | 8 +- + drivers/s390/crypto/ap_bus.h | 4 +- + drivers/staging/ks7010/ks_hostif.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/target/iscsi/iscsi_target_auth.c | 2 +- + drivers/virtio/virtio_pci_modern.c | 6 +- + drivers/xen/balloon.c | 1 - + drivers/xen/privcmd.c | 1 - + fs/Kconfig | 15 + + fs/aio.c | 9 +- + fs/binfmt_elf_fdpic.c | 1 - + fs/buffer.c | 56 +- + fs/cifs/cifsencrypt.c | 2 +- + fs/cifs/connect.c | 10 +- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/misc.c | 8 +- + fs/coredump.c | 17 +- + fs/crypto/keyring.c | 6 +- + fs/crypto/keysetup_v1.c | 4 +- + fs/ecryptfs/keystore.c | 4 +- + fs/ecryptfs/messaging.c | 2 +- + fs/exec.c | 30 +- + fs/fat/Kconfig | 2 +- + fs/fat/fatent.c | 3 + + fs/fat/file.c | 4 +- + fs/hugetlbfs/inode.c | 6 + + fs/minix/inode.c | 42 +- + fs/minix/itree_common.c | 8 +- + fs/minix/itree_v1.c | 12 +- + fs/minix/itree_v2.c | 13 +- + fs/minix/minix.h | 1 - + fs/namei.c | 10 +- + fs/ocfs2/namei.c | 17 +- + fs/ocfs2/ocfs2.h | 4 +- + fs/ocfs2/suballoc.c | 4 +- + fs/ocfs2/super.c | 4 +- + fs/open.c | 6 - + fs/proc/base.c | 11 +- + fs/proc/meminfo.c | 10 +- + fs/proc/page.c | 40 +- + fs/ramfs/inode.c | 12 + + fs/signalfd.c | 10 +- + fs/squashfs/block.c | 273 ++++---- + fs/squashfs/decompressor.h | 5 +- + fs/squashfs/decompressor_multi.c | 9 +- + fs/squashfs/decompressor_multi_percpu.c | 6 +- + fs/squashfs/decompressor_single.c | 9 +- + fs/squashfs/lz4_wrapper.c | 17 +- + fs/squashfs/lzo_wrapper.c | 17 +- + fs/squashfs/squashfs.h | 4 +- + fs/squashfs/super.c | 1 + + fs/squashfs/xz_wrapper.c | 51 +- + fs/squashfs/zlib_wrapper.c | 63 +- + fs/squashfs/zstd_wrapper.c | 64 +- + fs/ufs/super.c | 2 +- + include/asm-generic/iomap.h | 28 +- + include/asm-generic/pgalloc.h | 80 +++ + include/asm-generic/tlb.h | 1 - + include/asm-generic/uaccess.h | 4 +- + include/crypto/aead.h | 2 +- + include/crypto/akcipher.h | 2 +- + include/crypto/gf128mul.h | 2 +- + include/crypto/hash.h | 2 +- + include/crypto/internal/acompress.h | 2 +- + include/crypto/kpp.h | 2 +- + include/crypto/skcipher.h | 2 +- + include/linux/compaction.h | 2 + + include/linux/compiler_types.h | 44 +- + include/linux/crash_core.h | 6 + + include/linux/fs.h | 15 + + include/linux/generic-radix-tree.h | 2 +- + include/linux/huge_mm.h | 67 +- + include/linux/io-64-nonatomic-hi-lo.h | 4 +- + include/linux/io-64-nonatomic-lo-hi.h | 4 +- + include/linux/kasan.h | 4 +- + include/linux/kernel.h | 2 +- + include/linux/memcontrol.h | 211 +++++- + include/linux/memremap.h | 6 + + include/linux/mm.h | 79 +-- + include/linux/mm_inline.h | 6 +- + include/linux/mm_types.h | 6 +- + include/linux/mman.h | 4 + + include/linux/mmzone.h | 52 +- + include/linux/nmi.h | 1 + + include/linux/oom.h | 4 +- + include/linux/page-flags.h | 6 +- + include/linux/pageblock-flags.h | 24 +- + include/linux/pagemap.h | 6 +- + include/linux/percpu_counter.h | 4 + + include/linux/pgtable.h | 12 +- + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 16 +- + include/linux/shmem_fs.h | 3 + + include/linux/slab.h | 9 +- + include/linux/slab_def.h | 9 +- + include/linux/slub_def.h | 31 +- + include/linux/swap.h | 2 - + include/linux/syscalls.h | 2 +- + include/linux/uaccess.h | 20 +- + include/linux/vm_event_item.h | 3 + + include/linux/vmstat.h | 14 +- + include/linux/wait.h | 4 +- + include/linux/xattr.h | 3 +- + include/ras/ras_event.h | 3 + + include/trace/events/migrate.h | 17 +- + include/uapi/linux/auto_dev-ioctl.h | 2 +- + init/Kconfig | 9 +- + ipc/sem.c | 3 +- + ipc/shm.c | 4 +- + kernel/Makefile | 2 +- + kernel/crash_core.c | 50 ++ + kernel/events/callchain.c | 5 +- + kernel/events/core.c | 5 +- + kernel/exit.c | 2 +- + kernel/fork.c | 51 +- + kernel/hung_task.c | 44 ++ + kernel/kcov.c | 6 +- + kernel/kmod.c | 5 +- + kernel/kthread.c | 6 +- + kernel/panic.c | 2 +- + kernel/power/snapshot.c | 2 +- + kernel/rcu/tree.c | 6 +- + kernel/scs.c | 2 +- + kernel/stacktrace.c | 5 +- + kernel/sysctl.c | 19 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 19 +- + lib/Kconfig.kasan | 39 +- + lib/Makefile | 2 +- + lib/bitmap.c | 4 +- + lib/cpumask.c | 102 ++- + lib/iomap.c | 30 +- + lib/mpi/mpiutil.c | 6 +- + lib/percpu_counter.c | 19 + + lib/test_bitmap.c | 58 ++ + lib/test_bitops.c | 18 +- + lib/test_bits.c | 75 ++ + lib/test_kasan.c | 85 ++- + lib/test_kmod.c | 2 +- + lib/test_lockup.c | 2 +- + mm/Kconfig | 6 +- + mm/Makefile | 2 +- + mm/cma.c | 17 +- + mm/cma.h | 4 +- + mm/compaction.c | 185 ++++- + mm/debug.c | 83 +-- + mm/debug_vm_pgtable.c | 666 +++++++++++++++++- + mm/filemap.c | 11 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 35 +- + mm/hugetlb.c | 80 ++- + mm/hwpoison-inject.c | 18 +- + mm/internal.h | 5 +- + {lib => mm}/ioremap.c | 2 + + mm/kasan/common.c | 41 +- + mm/kasan/generic.c | 43 ++ + mm/kasan/generic_report.c | 1 + + mm/kasan/kasan.h | 23 +- + mm/kasan/quarantine.c | 1 + + mm/kasan/report.c | 54 +- + mm/kasan/tags.c | 37 + + mm/maccess.c | 22 +- + mm/madvise.c | 37 +- + mm/memcontrol.c | 776 +++++++++++++-------- + mm/memory-failure.c | 307 ++++---- + mm/memory.c | 17 +- + mm/memory_hotplug.c | 33 +- + mm/mempolicy.c | 2 +- + mm/memremap.c | 20 + + mm/migrate.c | 95 ++- + mm/mlock.c | 9 +- + mm/mm_init.c | 22 +- + mm/mmap.c | 66 +- + mm/mremap.c | 17 +- + mm/oom_kill.c | 24 +- + mm/page-writeback.c | 6 +- + mm/page_alloc.c | 268 ++++--- + mm/page_io.c | 4 +- + mm/page_vma_mapped.c | 6 +- + mm/percpu-internal.h | 55 +- + mm/percpu-km.c | 5 +- + mm/percpu-stats.c | 36 +- + mm/percpu-vm.c | 5 +- + mm/percpu.c | 208 +++++- + mm/pgalloc-track.h | 51 ++ + mm/rmap.c | 8 +- + mm/shmem.c | 129 +++- + mm/shuffle.c | 46 +- + mm/shuffle.h | 17 - + mm/slab.c | 101 +-- + mm/slab.h | 395 +++++------ + mm/slab_common.c | 682 ++---------------- + mm/slob.c | 12 +- + mm/slub.c | 588 +++++----------- + mm/sparse-vmemmap.c | 20 +- + mm/sparse.c | 31 +- + mm/swap.c | 16 +- + mm/swap_slots.c | 45 +- + mm/swap_state.c | 6 +- + mm/swapfile.c | 2 +- + mm/util.c | 48 +- + mm/vmalloc.c | 176 ++--- + mm/vmscan.c | 39 +- + mm/vmstat.c | 90 ++- + mm/workingset.c | 12 +- + net/atm/mpoa_caches.c | 4 +- + net/bluetooth/ecdh_helper.c | 6 +- + net/bluetooth/smp.c | 24 +- + net/core/sock.c | 2 +- + net/ipv4/tcp_fastopen.c | 2 +- + net/mac80211/aead_api.c | 4 +- + net/mac80211/aes_gmac.c | 2 +- + net/mac80211/key.c | 2 +- + net/mac802154/llsec.c | 20 +- + net/sctp/auth.c | 2 +- + net/sctp/socket.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 4 +- + net/sunrpc/auth_gss/gss_krb5_keys.c | 6 +- + net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- + net/tipc/crypto.c | 10 +- + net/wireless/core.c | 2 +- + net/wireless/ibss.c | 4 +- + net/wireless/lib80211_crypt_tkip.c | 2 +- + net/wireless/lib80211_crypt_wep.c | 2 +- + net/wireless/nl80211.c | 24 +- + net/wireless/sme.c | 6 +- + net/wireless/util.c | 2 +- + net/wireless/wext-sme.c | 2 +- + scripts/bloat-o-meter | 2 + + scripts/checkpatch.pl | 125 +++- + scripts/coccinelle/free/devm_free.cocci | 4 +- + scripts/coccinelle/free/ifnullfree.cocci | 4 +- + scripts/coccinelle/free/kfree.cocci | 6 +- + scripts/coccinelle/free/kfreeaddr.cocci | 2 +- + scripts/const_structs.checkpatch | 1 + + scripts/decode_stacktrace.sh | 79 ++- + scripts/deprecated_terms.txt | 7 + + scripts/spelling.txt | 19 + + scripts/tags.sh | 18 +- + security/apparmor/domain.c | 4 +- + security/apparmor/include/file.h | 2 +- + security/apparmor/policy.c | 24 +- + security/apparmor/policy_ns.c | 6 +- + security/apparmor/policy_unpack.c | 14 +- + security/keys/big_key.c | 6 +- + security/keys/dh.c | 14 +- + security/keys/encrypted-keys/encrypted.c | 14 +- + security/keys/trusted-keys/trusted_tpm1.c | 34 +- + security/keys/user_defined.c | 6 +- + tools/cgroup/memcg_slabinfo.py | 226 ++++++ + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/test_kmem.c | 450 ++++++++++++ + tools/testing/selftests/kmod/kmod.sh | 4 +- + tools/testing/selftests/vm/hmm-tests.c | 35 + + 534 files changed, 6816 insertions(+), 4445 deletions(-) + create mode 100644 Documentation/vm/arch_pgtable_helpers.rst + create mode 100644 lib/test_bits.c + rename {lib => mm}/ioremap.c (99%) + create mode 100644 mm/pgalloc-track.h + create mode 100644 scripts/deprecated_terms.txt + create mode 100644 tools/cgroup/memcg_slabinfo.py + create mode 100644 tools/testing/selftests/cgroup/test_kmem.c +$ git am -3 ../patches/0001-fix-up-for-hugetlb.c-code-movement.patch +Applying: fix up for hugetlb.c code movement +$ git reset HEAD^ +Unstaged changes after reset: +M mm/hugetlb.c +$ git add -A . +$ git commit -v -a --amend +[master 9dfa5c1dcba0] Merge branch 'akpm-current/current' + Date: Mon Jul 20 18:16:05 2020 +1000 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/64)
Rebasing (2/64)
Rebasing (3/64)
Rebasing (4/64)
Rebasing (5/64)
Rebasing (6/64)
Rebasing (7/64)
Rebasing (8/64)
Rebasing (9/64)
Rebasing (10/64)
Rebasing (11/64)
Rebasing (12/64)
Rebasing (13/64)
Rebasing (14/64)
Rebasing (15/64)
Rebasing (16/64)
Rebasing (17/64)
Rebasing (18/64)
Rebasing (19/64)
Rebasing (20/64)
Rebasing (21/64)
Rebasing (22/64)
Rebasing (23/64)
Rebasing (24/64)
Rebasing (25/64)
Rebasing (26/64)
Rebasing (27/64)
Rebasing (28/64)
Rebasing (29/64)
Rebasing (30/64)
Rebasing (31/64)
Rebasing (32/64)
Rebasing (33/64)
Rebasing (34/64)
Rebasing (35/64)
Rebasing (36/64)
Rebasing (37/64)
Rebasing (38/64)
Rebasing (39/64)
Rebasing (40/64)
Rebasing (41/64)
Rebasing (42/64)
Rebasing (43/64)
Rebasing (44/64)
Rebasing (45/64)
Rebasing (46/64)
Rebasing (47/64)
Rebasing (48/64)
Rebasing (49/64)
Rebasing (50/64)
Rebasing (51/64)
Rebasing (52/64)
Rebasing (53/64)
Rebasing (54/64)
Rebasing (55/64)
Rebasing (56/64)
Rebasing (57/64)
Rebasing (58/64)
Rebasing (59/64)
Rebasing (60/64)
Rebasing (61/64)
Rebasing (62/64)
Rebasing (63/64)
Rebasing (64/64)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 39eea6d7709c...d3a0b365954e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (d3a0b365954e sh: add missing EXPORT_SYMBOL() for __delay) +$ git merge --no-ff akpm/master +Removing kernel/sysctl_binary.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/syscalls/syscall.tbl | 3 +- + arch/alpha/mm/fault.c | 8 +- + arch/arc/kernel/process.c | 2 +- + arch/arc/mm/fault.c | 18 +- + arch/arm/configs/am200epdkit_defconfig | 1 - + arch/arm/mm/fault.c | 25 +-- + arch/arm/tools/syscall.tbl | 3 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 6 +- + arch/arm64/kernel/mte.c | 2 +- + arch/arm64/mm/fault.c | 29 +--- + arch/csky/mm/fault.c | 13 +- + arch/hexagon/mm/vm_fault.c | 9 +- + arch/ia64/kernel/syscalls/syscall.tbl | 3 +- + arch/ia64/mm/fault.c | 9 +- + arch/m68k/kernel/syscalls/syscall.tbl | 3 +- + arch/m68k/mm/fault.c | 14 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 3 +- + arch/microblaze/mm/fault.c | 9 +- + arch/mips/configs/cu1000-neo_defconfig | 1 - + arch/mips/kernel/syscalls/syscall_n32.tbl | 3 +- + arch/mips/kernel/syscalls/syscall_n64.tbl | 3 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 3 +- + arch/mips/mm/fault.c | 14 +- + arch/nds32/mm/fault.c | 19 +-- + arch/nios2/mm/fault.c | 14 +- + arch/openrisc/mm/fault.c | 9 +- + arch/parisc/kernel/syscalls/syscall.tbl | 3 +- + arch/parisc/mm/fault.c | 8 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 3 +- + arch/powerpc/mm/copro_fault.c | 7 +- + arch/powerpc/mm/fault.c | 11 +- + arch/riscv/mm/fault.c | 16 +- + arch/s390/kernel/syscalls/syscall.tbl | 3 +- + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/kvm/priv.c | 8 +- + arch/s390/mm/fault.c | 16 +- + arch/s390/mm/gmap.c | 4 +- + arch/sh/configs/dreamcast_defconfig | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/microdev_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7619_defconfig | 1 - + arch/sh/configs/se7705_defconfig | 1 - + arch/sh/configs/se7750_defconfig | 1 - + arch/sh/configs/se7751_defconfig | 1 - + arch/sh/configs/secureedge5410_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/shmin_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sh/include/asm/string_32.h | 26 --- + arch/sh/kernel/syscalls/syscall.tbl | 3 +- + arch/sh/lib/delay.c | 1 + + arch/sh/mm/fault.c | 11 +- + arch/sparc/kernel/syscalls/syscall.tbl | 3 +- + arch/sparc/mm/fault_32.c | 13 +- + arch/sparc/mm/fault_64.c | 11 +- + arch/um/kernel/trap.c | 6 +- + arch/x86/entry/syscalls/syscall_32.tbl | 3 +- + arch/x86/entry/syscalls/syscall_64.tbl | 4 +- + arch/x86/mm/fault.c | 17 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 3 +- + arch/xtensa/mm/fault.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- + drivers/infiniband/core/umem_odp.c | 2 +- + drivers/iommu/amd/iommu_v2.c | 2 +- + drivers/iommu/intel/svm.c | 3 +- + drivers/sh/clk/cpg.c | 23 +-- + drivers/vfio/vfio_iommu_type1.c | 4 +- + fs/exec.c | 2 +- + fs/io_uring.c | 2 +- + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/compat.h | 5 +- + include/linux/hugetlb.h | 41 ++++- + include/linux/memcontrol.h | 2 +- + include/linux/migrate.h | 34 +--- + include/linux/mm.h | 20 ++- + include/linux/pid.h | 1 + + include/linux/syscalls.h | 4 +- + include/linux/sysctl.h | 6 +- + include/uapi/asm-generic/unistd.h | 4 +- + kernel/Makefile | 2 +- + kernel/events/uprobes.c | 6 +- + kernel/exit.c | 17 -- + kernel/futex.c | 2 +- + kernel/pid.c | 17 ++ + kernel/sys_ni.c | 3 +- + kernel/sysctl_binary.c | 171 ------------------- + mm/filemap.c | 20 ++- + mm/frontswap.c | 8 +- + mm/gup.c | 118 +++++-------- + mm/hmm.c | 3 +- + mm/hugetlb.c | 35 +--- + mm/internal.h | 8 +- + mm/kmemleak.c | 2 + + mm/ksm.c | 3 +- + mm/list_lru.c | 2 +- + mm/madvise.c | 190 ++++++++++++++++++--- + mm/memory-failure.c | 15 +- + mm/memory.c | 73 +++++++- + mm/memory_hotplug.c | 42 ++--- + mm/mempolicy.c | 29 +--- + mm/mempool.c | 2 +- + mm/migrate.c | 51 +++++- + mm/page_alloc.c | 8 +- + mm/page_counter.c | 13 +- + mm/page_io.c | 8 +- + mm/page_isolation.c | 5 - + mm/process_vm_access.c | 2 +- + mm/rmap.c | 2 +- + mm/swap.c | 5 +- + mm/swap_state.c | 4 +- + mm/swapfile.c | 31 ++-- + scripts/deprecated_terms.txt | 7 +- + security/tomoyo/domain.c | 2 +- + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 2 +- + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + virt/kvm/async_pf.c | 2 +- + virt/kvm/kvm_main.c | 2 +- + 133 files changed, 669 insertions(+), 856 deletions(-) + delete mode 100644 kernel/sysctl_binary.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..276249048891 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200720 |