diff options
| -rw-r--r-- | Next/SHA1s | 329 | ||||
| -rw-r--r-- | Next/Trees | 331 | ||||
| -rw-r--r-- | Next/merge.log | 18687 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 19348 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b0067b1bc51a --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,329 @@ +Name SHA1 +---- ---- +origin bcf876870b95592b52519ed4aafcf9d95999bc9c +fixes dbf24e30ce2e85e501ddaba0e00db48b4716f04b +kbuild-current 28ab576ba8de934ee3145b6d75119f016de567cb +arc-current 11ba468877bb23f28956a35e896356252d63c983 +arm-current 5c6360ee4a0e7f62de34341ad5d3c936f49b391d +arm64-fixes 6a7389f0312f01bb6641d37b395548a2922a057c +arm-soc-fixes fe1d899f4212a08dad98accb47cd335b58cc9085 +uniphier-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +drivers-memory-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +m68k-current 3381df0954199458fa3993db72fb427f0ed1e43b +powerpc-fixes 909adfc66b9a1db21b5e8733e9ebfa6cd5135d74 +s390-fixes 92ed301919932f777713b9172e525674157e983d +sparc 17ec0a17e90f4b761025a6b80c8d458b9d5f9ddd +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net ac3a0c8472969a03c0496ae774b3a29eb26c8d5a +bpf 69138b34a7248d2396ab85c8652e20c0c39beaba +ipsec 71b59bf482b2dd662774f34108c5b904efa9e02b +netfilter 78470d9d0d9f2f8d16f28382a4071568e839c0d5 +ipvs eadede5f936276e93e62834ffbe1550d305e0921 +wireless-drivers 1cfd3426ef989b83fa6176490a38777057e57f6c +mac80211 04e35caa32ec9aae6b306d07f07dc2ee6d69166c +rdma-fixes fb448ce87a4a9482b084e67faf804aec79ed9b43 +sound-current f1ec5be17b9aafbc5f573da023850566b43d8e5e +sound-asoc-fixes c8f7dbdbaa15c700ea02abf92b8d9bda2e91050b +regmap-fixes 2b0f61e27f75f0f53d51dcbf334aaba21eb27109 +regulator-fixes 92ed301919932f777713b9172e525674157e983d +spi-fixes 8ade0c2fabd3f15e334cc1b8e3780477ae7b9662 +pci-current b361663c5a40c8bc758b7f7f2239f7a192180e7c +driver-core.current 92ed301919932f777713b9172e525674157e983d +tty.current 92ed301919932f777713b9172e525674157e983d +usb.current 92ed301919932f777713b9172e525674157e983d +usb-gadget-fixes 8778eb0927ddcd3f431805c37b78fa56481aeed9 +usb-serial-fixes 92ed301919932f777713b9172e525674157e983d +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy 38b1927e5bf9bcad4a2e33189ef1c5569f9599ba +staging.current 92ed301919932f777713b9172e525674157e983d +char-misc.current 92ed301919932f777713b9172e525674157e983d +soundwire-fixes bf6d6e68d2028a2d82f4c106f50ec75cc1e6ef89 +thunderbolt-fixes ba47d845d715a010f7b51f6f89bae32845e6acb7 +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 f7e6b19bc76471ba03725fe58e0c218a3d6266c3 +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 5868347a192afb99b189d72946ab6a321b6115ac +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 2a4117df9b436a0e4c79d211284ab2097bcd00dc +kvm-fixes 830f01b089b12bbe93bd55f2d62837253012a30e +kvms390-fixes 774911290c589e98e3638e73b24b0a4d4530e97c +hwmon-fixes ba47d845d715a010f7b51f6f89bae32845e6acb7 +nvdimm-fixes 543094e19c82b5d171e139d09a1a3ea0a7361117 +btrfs-fixes 061e532804fa50c36a73b77f1263d4b21d8aafa8 +vfs-fixes 5fff09bc141570cd15c118b097b17dec832b517f +dma-mapping-fixes 1ec8cd744c0c0426e60faa268af9d076f7aa2418 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 92ed301919932f777713b9172e525674157e983d +samsung-krzk-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pinctrl-samsung-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +devicetree-fixes 0115e6c98c22f3fc7ff7da2a41480483abe95b37 +scsi-fixes 3f0dcfbcd2e162fc0a11c1f59b7acd42ee45f126 +drm-fixes 887c909dd5d557c203a233ebbe238c18438a680a +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 92ed301919932f777713b9172e525674157e983d +mmc-fixes ebd4050c6144b38098d8eed34df461e5e3fa82a9 +rtc-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes 77b48bea2fee47c15a835f6725dd8df0bc38375a +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 1b4cab57f3bababb8f2b69c2d8852c5dcdc7448d +pidfd-fixes 7665a47f70b3f64bf09c233cc7df73fde9e506f1 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +gpio-intel-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pinctrl-intel-fixes 45c11a927606c612e4898a9484867b71318699f6 +erofs-fixes 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes c63d2dd7e134ebddce4745c51f9572b3f0d92b26 +ubifs-fixes f37e99aca03f63aa3f2bd13ceaf769455d12c4b0 +drm-misc-fixes a9e10b169e65f0f7061233ebe843a4b4f488dbae +kspp-gustavo 48778464bb7d346b47157d21ffde2af6b2d39110 +kbuild 71e6bc234960bfbec30b82df0ebc003cec7d639b +compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b +dma-mapping 274b3f7bf34415eed106e479e4815e897ce5d763 +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 4dffbda6a996813bc2760f021e1edf669cf84805 +arm64 0e4cd9f2654915be8d09a1bd1b405ce5426e64c4 +arm-perf 55fdc1f44cd6bb1d61c9ca946d8f7cd67ea0bf36 +arm-soc e7e7df91deea4dc3bded9941957d8d033c9ab771 +amlogic bef87d25eebf2c657272edbe4549552d56bd65f8 +aspeed 2c887638a5fa1ac5e2491ae911f50d554b604985 +at91 ec539e70d882af33660bcab178a59b1251588a22 +drivers-memory f046e4a3f0b95bcc410116acbe7e04e648d48f97 +imx-mxs 3c1a41dab7b84a9fdedcb75afbbe2a30660a7595 +keystone 50c950e2c8b6c11fc7bb2f23856bd541f1b55a16 +mediatek 647a84d1e4dcc43369a968d6d2215de17b1c30d0 +mvebu 29bd9d8c2ac147964552b1bbfaf2b43fe53fd10c +omap a5b4d0a1b174b2675d7740b92a84e23e5dfe8148 +qcom 8746b1314c2e17b0b7b9a136e7abf7b4bf30c6f4 +raspberrypi 25c6f3960764b266a609281341f889a06d045039 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 344cb4f80fba071550975e18b7b6975c8addbbcf +reset dc76572330e3990324d65fc73e592b2af7326851 +rockchip 088d74f511583cafbfc6ae37dc21fefe22f1fd05 +samsung-krzk 3f61e08ac0be4355737bc16228c264765c52960b +scmi 5714ee50bb4375bd586858ad800b1d9772847452 +sunxi 9afd0849996190e7ce878f37a9408aee30deb84f +tegra 8617339892a65cae34b9db786b037d6219ed3d7e +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +uniphier 4f8fb65af5299d138f57e6d62f88d2d5964d40eb +clk 277b917a96162c8d6d9488095919a5c8832b2422 +clk-samsung 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +csky bdcd93ef9afb42a6051e472fa62c693b1f9edbd8 +h8300 9d48776fc609e434736e5cb114830d7e0b843739 +ia64 1a9d3c34c593f7ce3c6673e9e015b3253330eab2 +m68k 382f429bb559fe991b1ece2e5e58c812e28b3ad8 +m68knommu fde87ebf1daa8d96e4412aa06536da4b55103e02 +microblaze b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +mips bc6e8dc112133a60efbede8acde36dd5d1e748a1 +nds32 0a2e478902c75be12b3e384cfe80b731e659f863 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc b974d6482cc54a132351214ef32efa2b96989ada +parisc-hd e72b23dec1da5e62a0090c5da1d926778284e230 +powerpc af0870c4e75655b1931d0a5ffde2f448a2794362 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e9e4ef9116b12951eaee3f8447ba9bbb40ab3620 +risc-v 3843aca0521d039efce0240f54b37bea23ba9f16 +s390 9a996c67a65d937b23408e56935ef23404c9418e +sh 55b4ddbb7ee5911d969cb698994ea9eec7908791 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f6e8c474390be2e6f5bd0b8966e19958214609ff +xtensa a0fc1436f1f4f84e93144480bf30e0c958d135b6 +fscrypt 55e32c54bbd5741cad462c9ee00c453c72fa74b9 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs cd37cdd68ef189c107f5cc4491c20f110e54559f +ceph 7ed286f3e061ee394782bd9fb4ed96bff0b5a021 +cifs 7efd081582619e7c270d1c0a422385dcaa99fa9f +configfs 059ccbfff8a826c0e7bfe5d69a55e1179672d8f8 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs b361b45cc1a1f69d2a6b4b16087d560dcdff9f71 +exfat 7c9d236387fa05999bfa6a20197dc2f0fc9fafd3 +ext3 2a347b9461f067d4df30255f33235ee5615cbf36 +ext4 43c18181b7017c723fb057beb283e86e228416eb +f2fs 33ba0a4869d8adc9a33b80db75fd69468132538b +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 31070f6ccec09f3bd4f1e28cd1e592fa4f3ba0b6 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 048c397aa88b8c6ebbcce8b5c480ae53773f14b9 +nfs-anna 65caafd0d2145d1dd02072c4ced540624daeab40 +nfsd b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +orangefs 0df556457748d160013e88202c11712c16a83b0c +overlayfs 4518dfcf761e3c44632855abcf433236cf7ab6c6 +ubifs 798b7347e4f29553db4b996393caf12f5b233daf +v9fs 2ed0b7578170c3bab10cde09d4440897b305e40c +xfs 818d5a91559ffe1e1f2095dcbbdb96c13fdb94ec +zonefs 2f4b7462d2fab380ba53f633948880552abb0b32 +iomap 66143873c6a0b24242f24f65fde70c643b26b4e7 +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks 5ef159681309621aa8fe06d94397b85b51974d55 +vfs 61c09fc5c03f7b2e07b1ccc97b5cf47312e34860 +printk a0ebfe187a25848772c3a118ce795161c8062a69 +pci 0c5192ef0f034a82bef7a15391e822a1f9a15054 +pstore fd49e03280e596e54edb93a91bc96170f8e97e4a +hid bc12a7f8e273e25b044690fc25c9f6a8fa1db39c +i2c 1caa617497fe9a932398e798a56c6748025111d0 +i3c b4203ce0556348dcfe29f897d1dbe65102874d89 +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging 2fdf8f7f086712bbe296d1d4d4049ca88e7a662d +jc_docs 2c12c8103d8f15790cf880f1545dafa36acb004a +v4l-dvb 8f2a4a9d5ff5202d0b3e3a144ebb9b67aabadd29 +v4l-dvb-next 0d6db85131e014c128e57649793aff5aa96e065f +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 86ed8b05f59717b20b75cd2a4a17cbd26788183a +cpufreq-arm f259eab3ea0e7ed73db91f6358274dd3a9a27d79 +cpupower fa0866a1d1be8ffa6979bf2127272b7e3d511fcd +devfreq 27a69714450f5c9288cec2b20f1ae4f7ad34dacf +opp 06a8a059e88bd73ee81a4ad19e97c04766f84def +thermal 89945047b1666c021c4222ef285239c1275f8e24 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm fa601a9ebd49eac6581f9b448ef5e49ecf944301 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 76251e15ea73898b62ed0da3210189e50e1fe3c9 +net-next bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004 +bpf-next b5cc46cdff76cdfe2cb45ab2636d847efb1012cc +ipsec-next b328ecc468f8f92433c9ad82675c0ce9f99b10cf +mlx5-next 042dd05bddbd84e6a52b337a65d1994003c9b9bb +netfilter-next 77a92189ecfd061616ad531d386639aab7baaad9 +ipvs-next 66846b7d058bbb6e2954b8b84d6480024e72a777 +wireless-drivers-next 3dc05ffb04436020f63138186dbc4f37bd938552 +bluetooth 3b799254cf6f481460719023d7a18f46651e5e7f +mac80211-next c8ad010665c0b85c6a35466b2159e907b8dd85d1 +gfs2 0d7853ebbba3b12f7a06109dfad52f72a6b6817f +mtd 3d19792a7d7279b1aece733c2605a3671c6459c9 +nand da151e3458c825fa9d57c2db6e37748166e4d129 +spi-nor e93a977367b2aefff3c1fb426bbdfc6e2980815f +crypto 3cbfe80737c18ac6e635421ab676716a393d3074 +drm 418eda8f3fe292782c150266d693d55d284c0c98 +amdgpu d0689b3aae842105caad85d745128a54ff470a13 +drm-intel 6bd0b413618ffb50f900ec770283d8c2217d069f +drm-tegra 4fba6d22ca9ad28b8871d763b35a4da2e1ca272e +drm-misc f369bc3f9096f5d355e8b80540bc30ac9a602912 +drm-msm 1041dee2178ffd59e2c693426475c21594f9db86 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 408a85e31e3e5127c91e082c3544082ef1ba48d3 +etnaviv c5d5a32ead1e3a61a07a1e59eb52a53e4a6b2a7f +regmap c9fadf212afd4f924a3502e3904917ee280854c0 +sound 2ac82e20e2377fb0b63ce40bba56558f2df7cd3e +sound-asoc 84569f329f7fcb40b7b1860f273b2909dabf2a2b +modules d062557a33196d055ac44b97fff8720895df553d +input 873a3a14a47e819bb2d1e3cf4dc8c59c200ec32b +block c0117e681d7e1c09cb4ab101cf5b6a52af6e4f6f +device-mapper 4861f596091f7b8ded844204d422a6d72b4a7815 +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc ac42e4e906b64be68434452c3ad14cb6ef2d1774 +mfd 3ce0baa5b7d899f9085ca3136f43cb765b6cc41d +backlight 7eb99a39ef767644bbfd2b3f12f139d13e3ee8b3 +battery 46cbd0b05799e8234b719d18f3a4b27679c4c92e +regulator 3f02794888213efb224ef8e38d5d0e0f74b95416 +security 8ca4a830cefa75ef1f5ec7bc828a0b84b71b714f +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity 3db0d0c276a752af39beb5ca7424cb659aa005bb +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 4d63f7c2e382d3251964ca677fd0e85775c5f82a +selinux 54b27f9287a7b3dfc85549f01fc9d292c92c68b9 +smack 42a2df3e829f3c5562090391b33714b2e2e5ad4a +tomoyo bcf876870b95592b52519ed4aafcf9d95999bc9c +tpmdd 85467f63a05c43364ba0b90d0c05bb89191543fa +watchdog 92ed301919932f777713b9172e525674157e983d +iommu e46b3c0d011eab9933c183d5b47569db8e377281 +vfio ccd59dce1a21f473518bf273bdf5b182bab955b3 +audit b43870c74f3fdf0cd06bf5f1b7a5ed70a2cd4ed2 +devicetree fb820b494acb70e3a20e50935118239c7e5c94dd +mailbox e9f901dc05c09c4f89183cadcb2d93177f3100cb +spi 11ba28229f8258164731e42f4c3e93762cb6578e +tip 2d0dc97212086fed896125374b548acbfd3ce161 +clockevents 9fba22584e54340365c611987c451e384bc4a96f +edac 399cd3b33cef95c1db070e14e137cdce5a7ddd5b +irqchip ac62460c24126eb2442e3653a266ebbf05b004d8 +ftrace 29ce24519c0692ca7d998d7444a9e016a4c44fa7 +rcu c86409b6f860e3da36b14dac6058c722d2cecfd4 +kvm c34b26b98caca48ec9ee981d4a89ac4f73376a3a +kvm-arm 16314874b12b451bd5a1df86bcb69745eb487502 +kvm-ppc 81ab595ddd3c3036806b460526e1fbc5b271ff33 +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip ba8c423488974f02b538e9dc1730f0334f9b85aa +percpu 4fa640dc52302b5e62b01b05c755b055549633ae +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 67186653c90360922e3965d0376a61dbf6c42711 +chrome-platform fc8cacf3fc68664e30a6df2b361ae05b9769585e +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 2742b4192a279c6ec72e55d5474c4c07756c7845 +ipmi 634b06def11cf7ecf6282c79735f08004e323983 +driver-core 76acb5ee76b1ae5870cac9c8125ca09e9106d5b2 +usb e3ee0e740c3887d2293e8d54a8707218d70d86ca +usb-gadget f5e46aa4a124bfac34a770c4cfe5023de99380d4 +usb-serial d2a4309c1ab6df424b2239fe2920d6f26f808d17 +usb-chipidea-next d6f93d21001e4388a25b0b922e02e64bc6004d2f +phy-next 3d7b0ca5300bd01b176f2b4c10e173db802560d8 +tty 81f0f78965ebfe48c4997801050f64687cebea48 +char-misc 22362aa30bad6f03b5bcbbeee3cdc61950d40086 +extcon b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +soundwire a81844034e5b382df6cc06bc2943ae24be797afd +thunderbolt ef7e12078ab832c72315adcfa05e7a9498a5e109 +staging 5bbd90550da8f7bdac769b5825597e67183c9411 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 12a400b016ab955be8e4c569346fa18aaceed9d7 +dmaengine fe541ee394a74f322fc2fecb66dc7f4cfe44c320 +cgroup 936f2a70f2077f64fab1dcb3eca71879e82ecd3f +scsi 700f3d4333d9037c8544801b8ccf64cf58f52b71 +scsi-mkp bf1a28f92a8b00ee8ce48cc11338980e31ddb7b3 +vhost 0adbeeb13028e064258aec9a616b7d80dd9459f4 +rpmsg f6cac270d1420d7c297d3807fc5e28d32dcf8dcd +gpio b470cef1ffac1acc327fe3343a2ce3ef3a526a21 +gpio-brgl df51f402e3b15b00284309bd3016bb4536d2260c +gpio-intel 4941b8dedb3f33dcca5c6aef919ea518ff8947ce +pinctrl 43dd0f2fff0e0971d024b97c30b5b8fd11c02ce6 +pinctrl-intel b4f2fcb534875e2e57c96a0358267f2109d68004 +pinctrl-samsung b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pwm 6ced5ff0be8e94871ba846dfbddf69d21363f3d7 +userns 7fce69dff8db30cb93aace0bbebda09972027af7 +ktest 3ff6685579ae0a122009e304bdefa4041c44fe8f +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 850d0cc64c8e2e0895acf735ac0a53c78b80dbe5 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching bf14b015bf516fc769a47ea56303e014c76a7ce1 +coresight 342c8a1d1d9e418d32fa02d635cf96989f9a986e +rtc 3d6cfb36ed719e5efdc2a6a8e8ee07f185c88da1 +nvdimm 49688e654e48ae176b5bfda33d2416b68e607ce8 +at24 8f3d9f354286745c751374f5f1fcafee6b3f3136 +ntb b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +seccomp c97aedc52dce4c87d4c44de4e6af941cd102600c +kspp 36f78758dca53bd4ee396ecf130aefa96b2a3016 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi e1059cacc40823cd6104d6845c7fd2d6a27eb98f +slimbus b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +nvmem a24ef5be460b771424db6674f8d3f5d025415821 +xarray 27586ca786a729cda6c807621a1494900a56e7bc +hyperv 3245b7b959d585bce8a8ef6a9bd9901a50c0197a +auxdisplay 3f03b64981723b61048ea46642bcaa9b518f3ad3 +kgdb 2c308ef41351372a5c23a1047d71db3015ed7a9c +pidfd da83d0cb92373b4424c60ff97edd941e300a1e7a +hmm 7d17e83abec1be3355260b3e4812044c65c32907 +fpga eacfbf589c904bf8362cbd2d6cac123b0230e272 +kunit 48778464bb7d346b47157d21ffde2af6b2d39110 +cel 0a8e7b7d08466b5fc52f8e96070acc116d82a8bb +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 11399346ac39a26ade2a90303d38ad318163c665 +kunit-next d43c7fb05765152d4d4a39a8ef957c4ea14d8847 +trivial c1a371cf80fbc06280cc0064ca99a39d0428ded3 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi d0dc371b39a71aea55160970455d8a37bbf40fb6 +notifications 55cfafc50262741b1adb5f899ab902566ff0ad94 +fsinfo 4c5a79e9b772b2d7b8521697fcf068f612c5bb4d +memblock 3346dd99fb4cd174fdbfb68dc62cd109e4323f0f +set_fs 2750e3608b796cd913564387ffd40f276e50ad21 +init 38b082236e77d403fed23ac2d30d570598744ec3 +akpm-current 59b3299ce7281df760b40756f98c0fe420914cb8 +akpm 933c67936bf27e845ba4b97fb158d2204fde24ba diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..bfed9b72884d --- /dev/null +++ b/Next/Trees @@ -0,0 +1,331 @@ +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 +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/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 +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#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 +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#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 +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/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.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#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 +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/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 +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..874bf706927e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,18687 @@ +$ date -R +Mon, 03 Aug 2020 08:33:23 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 59% (7500/12595)
Updating files: 60% (7557/12595)
Updating files: 61% (7683/12595)
Updating files: 62% (7809/12595)
Updating files: 63% (7935/12595)
Updating files: 64% (8061/12595)
Updating files: 65% (8187/12595)
Updating files: 66% (8313/12595)
Updating files: 67% (8439/12595)
Updating files: 68% (8565/12595)
Updating files: 69% (8691/12595)
Updating files: 70% (8817/12595)
Updating files: 71% (8943/12595)
Updating files: 72% (9069/12595)
Updating files: 73% (9195/12595)
Updating files: 74% (9321/12595)
Updating files: 75% (9447/12595)
Updating files: 76% (9573/12595)
Updating files: 77% (9699/12595)
Updating files: 78% (9825/12595)
Updating files: 79% (9951/12595)
Updating files: 80% (10076/12595)
Updating files: 81% (10202/12595)
Updating files: 82% (10328/12595)
Updating files: 83% (10454/12595)
Updating files: 84% (10580/12595)
Updating files: 85% (10706/12595)
Updating files: 86% (10832/12595)
Updating files: 87% (10958/12595)
Updating files: 88% (11084/12595)
Updating files: 89% (11210/12595)
Updating files: 90% (11336/12595)
Updating files: 91% (11462/12595)
Updating files: 92% (11588/12595)
Updating files: 93% (11714/12595)
Updating files: 94% (11840/12595)
Updating files: 95% (11966/12595)
Updating files: 96% (12092/12595)
Updating files: 97% (12218/12595)
Updating files: 97% (12342/12595)
Updating files: 98% (12344/12595)
Updating files: 99% (12470/12595)
Updating files: 100% (12595/12595)
Updating files: 100% (12595/12595), done. +HEAD is now at e2c46b5762c6 Merge tag 'block-5.8-2020-07-30' of git://git.kernel.dk/linux-block +Merging origin/master (bcf876870b95 Linux 5.8) +$ git merge origin/master +Updating e2c46b5762c6..bcf876870b95 +Fast-forward + Documentation/networking/bareudp.rst | 5 +- + Documentation/networking/devlink/devlink-trap.rst | 4 + + MAINTAINERS | 7 +- + Makefile | 2 +- + arch/arm/include/asm/percpu.h | 2 + + arch/arm/kernel/hw_breakpoint.c | 27 ++++- + arch/arm/kernel/vdso.c | 1 + + arch/arm/mm/mmu.c | 2 +- + arch/arm64/include/asm/alternative.h | 4 +- + arch/arm64/include/asm/checksum.h | 5 +- + arch/arm64/include/asm/kvm_host.h | 11 +- + arch/arm64/include/asm/smp.h | 1 - + arch/arm64/kvm/mmu.c | 11 +- + arch/powerpc/kernel/exceptions-64s.S | 14 ++- + arch/powerpc/mm/book3s64/hash_utils.c | 25 +++++ + arch/powerpc/perf/core-book3s.c | 6 + + arch/x86/kernel/i8259.c | 2 +- + arch/x86/kvm/lapic.c | 2 +- + arch/x86/kvm/svm/svm.c | 9 +- + arch/x86/kvm/vmx/nested.c | 16 ++- + arch/x86/kvm/vmx/nested.h | 5 + + drivers/atm/atmtcp.c | 10 +- + drivers/firmware/qemu_fw_cfg.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 36 ++++-- + drivers/gpu/drm/nouveau/nouveau_display.c | 27 ++++- + drivers/i2c/i2c-core-slave.c | 7 +- + drivers/infiniband/core/cq.c | 14 ++- + drivers/infiniband/core/ucma.c | 4 + + drivers/infiniband/hw/mlx5/odp.c | 5 +- + drivers/infiniband/hw/mlx5/qp.c | 29 ++--- + drivers/infiniband/sw/rdmavt/qp.c | 33 +----- + drivers/infiniband/sw/rdmavt/rc.c | 4 +- + drivers/net/bareudp.c | 29 +++-- + drivers/net/ethernet/cortina/gemini.c | 5 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 18 ++- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 35 +++--- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 38 +++++-- + drivers/net/ethernet/ibm/ibmvnic.c | 2 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 +- + drivers/net/ethernet/intel/igb/igb_main.c | 9 ++ + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 3 + + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 + + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 21 +++- + drivers/net/ethernet/mellanox/mlx4/main.c | 2 + + .../net/ethernet/mellanox/mlx5/core/en/rep/bond.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 30 +++-- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 2 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 2 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 31 +++++- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 27 +++-- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 19 ++-- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 28 +---- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 78 ++++++++++--- + drivers/net/ethernet/mellanox/mlxsw/core.c | 8 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 59 +++++----- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 14 ++- + drivers/net/ethernet/mscc/ocelot.c | 10 +- + drivers/net/ethernet/ni/nixge.c | 8 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- + drivers/net/usb/hso.c | 5 +- + drivers/net/usb/lan78xx.c | 113 ++++++------------- + drivers/net/vxlan.c | 16 ++- + drivers/pci/quirks.c | 13 +++ + drivers/pinctrl/qcom/Kconfig | 2 + + drivers/pinctrl/qcom/pinctrl-msm.c | 74 +++++++++++- + drivers/pinctrl/qcom/pinctrl-msm.h | 4 + + drivers/pinctrl/qcom/pinctrl-sc7180.c | 1 + + drivers/vhost/scsi.c | 2 +- + drivers/virtio/Kconfig | 2 +- + drivers/virtio/virtio_balloon.c | 11 +- + include/linux/i2c.h | 2 +- + include/linux/mlx5/mlx5_ifc.h | 1 + + include/linux/rhashtable.h | 69 ++++++------ + include/net/addrconf.h | 1 + + include/net/devlink.h | 3 + + include/net/xfrm.h | 15 ++- + include/rdma/rdmavt_qp.h | 19 ++++ + kernel/bpf/btf.c | 5 + + kernel/bpf/hashtab.c | 12 +- + kernel/signal.c | 2 +- + lib/rhashtable.c | 35 +++--- + net/bluetooth/hci_event.c | 26 +++-- + net/bpfilter/bpfilter_kern.c | 2 +- + net/compat.c | 2 +- + net/core/devlink.c | 25 ++++- + net/ipv4/fib_trie.c | 2 +- + net/ipv6/anycast.c | 17 ++- + net/ipv6/esp6.c | 13 ++- + net/ipv6/ipv6_sockglue.c | 1 + + net/ipv6/route.c | 8 +- + net/key/af_key.c | 11 +- + net/mac80211/cfg.c | 1 + + net/mac80211/mesh.c | 13 +++ + net/mac80211/mesh_pathtbl.c | 1 + + net/mac80211/sta_info.c | 4 +- + net/mac80211/tx.c | 7 +- + net/mac80211/util.c | 4 + + net/mptcp/protocol.c | 2 +- + net/rds/recv.c | 3 +- + net/rxrpc/call_object.c | 27 +++-- + net/rxrpc/conn_object.c | 8 +- + net/rxrpc/recvmsg.c | 2 +- + net/rxrpc/sendmsg.c | 3 + + net/sched/act_ct.c | 4 +- + net/wireless/nl80211.c | 6 +- + net/xfrm/espintcp.c | 62 ++++++++--- + net/xfrm/xfrm_policy.c | 43 +++---- + net/xfrm/xfrm_user.c | 18 +-- + scripts/Makefile.modpost | 3 - + scripts/kconfig/.gitignore | 2 +- + scripts/kconfig/Makefile | 13 ++- + scripts/kconfig/qconf.cc | 23 +--- + scripts/kconfig/qconf.h | 4 - + scripts/mod/modpost.c | 1 + + sound/pci/hda/hda_codec.c | 8 ++ + sound/pci/hda/hda_controller.h | 2 +- + sound/pci/hda/hda_intel.c | 17 ++- + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pci/hda/patch_realtek.c | 36 +++++- + sound/usb/pcm.c | 1 + + tools/lib/traceevent/event-parse.c | 1 + + tools/lib/traceevent/plugins/Makefile | 2 +- + tools/perf/arch/arm/util/auxtrace.c | 8 +- + tools/perf/tests/shell/record+zstd_comp_decomp.sh | 3 +- + .../selftests/bpf/prog_tests/btf_map_in_map.c | 124 ++++++++++++++++++--- + tools/testing/selftests/bpf/test_offload.py | 3 + + .../testing/selftests/bpf/verifier/event_output.c | 1 + + .../kvm/x86_64/vmx_set_nested_state_test.c | 42 +++++-- + tools/testing/selftests/net/forwarding/ethtool.sh | 2 - + tools/testing/selftests/net/psock_fanout.c | 3 +- + tools/testing/selftests/net/rxtimestamp.c | 3 +- + tools/testing/selftests/net/so_txtime.c | 2 +- + tools/testing/selftests/net/tcp_mmap.c | 6 +- + 140 files changed, 1262 insertions(+), 625 deletions(-) +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 (28ab576ba8de kbuild: remove redundant FORCE definition in scripts/Makefile.modpost) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (11ba468877bb Linux 5.8-rc5) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI calls due to p4d typo in create_mapping_late()) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (6a7389f0312f MAINTAINERS: Include drivers subdirs for ARM PMU PROFILING AND DEBUGGING entry) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (fe1d899f4212 ARM: dts: keystone-k2g-evm: fix rgmii phy-mode for ksz9031 phy) +$ 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 drivers-memory-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge drivers-memory-fixes/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 (909adfc66b9a powerpc/64s/hash: Fix hash_preload running with interrupts enabled) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (92ed30191993 Linux 5.8-rc7) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (17ec0a17e90f sparc: Use fallthrough pseudo-keyword) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/include/asm/backoff.h | 2 +- + arch/sparc/include/asm/pgtsrmmu.h | 2 +- + arch/sparc/kernel/auxio_64.c | 1 - + arch/sparc/kernel/central.c | 2 +- + arch/sparc/kernel/kgdb_32.c | 2 +- + arch/sparc/kernel/kgdb_64.c | 2 +- + arch/sparc/kernel/pcr.c | 2 +- + arch/sparc/kernel/prom_32.c | 2 +- + arch/sparc/kernel/signal32.c | 4 ++-- + arch/sparc/kernel/signal_32.c | 4 ++-- + arch/sparc/kernel/signal_64.c | 4 ++-- + arch/sparc/kernel/viohs.c | 6 ++---- + arch/sparc/lib/memset.S | 1 + + arch/sparc/math-emu/math_32.c | 8 ++++---- + arch/sparc/mm/srmmu.c | 18 +++++++++--------- + 17 files changed, 34 insertions(+), 32 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 (ac3a0c847296 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge net/master +Already up to date. +Merging bpf/master (69138b34a724 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (71b59bf482b2 espintcp: count packets dropped in espintcp_rcv) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (78470d9d0d9f netfilter: nft_meta: fix iifgroup matching) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_tables.h | 2 ++ + net/netfilter/nf_tables_api.c | 10 ++++++++-- + net/netfilter/nft_compat.c | 36 ++++++++++++++++++++++++++++++++---- + net/netfilter/nft_meta.c | 2 +- + 4 files changed, 43 insertions(+), 7 deletions(-) +Merging ipvs/master (eadede5f9362 Merge branch 'hns3-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (1cfd3426ef98 ath10k: Fix NULL pointer dereference in AHB device probe) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (04e35caa32ec mac80211: remove STA txq pending airtime underflow warning) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (fb448ce87a4a RDMA/core: Free DIM memory in error unwind) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (f1ec5be17b9a ALSA: hda/realtek: Add alc269/alc662 pin-tables for Loongson-3 laptops) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 114 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 114 insertions(+) +Merging sound-asoc-fixes/for-linus (c8f7dbdbaa15 Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-lantiq-ssc.c | 2 +- + sound/soc/codecs/max98357a.c | 50 +++++++++++++++++----- + sound/soc/codecs/max98390.c | 2 +- + sound/soc/fsl/fsl_sai.c | 5 ++- + sound/soc/fsl/fsl_sai.h | 2 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 41 ++++++++++++++---- + sound/soc/intel/boards/skl_hda_dsp_common.h | 1 + + sound/soc/intel/boards/skl_hda_dsp_generic.c | 17 +++++--- + sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 2 +- + sound/soc/meson/axg-card.c | 20 +++++---- + sound/soc/meson/axg-tdm-formatter.c | 11 ++--- + sound/soc/meson/axg-tdm-formatter.h | 1 - + sound/soc/meson/axg-tdm-interface.c | 26 +++++++---- + sound/soc/meson/axg-tdmin.c | 16 ++++++- + sound/soc/meson/axg-tdmout.c | 3 -- + sound/soc/meson/gx-card.c | 18 ++++---- + sound/soc/meson/meson-card-utils.c | 4 -- + sound/soc/soc-core.c | 5 ++- + sound/soc/soc-dai.c | 16 ++++--- + sound/soc/soc-pcm.c | 42 ++++++++++-------- + 20 files changed, 186 insertions(+), 98 deletions(-) +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 (92ed30191993 Linux 5.8-rc7) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (8ade0c2fabd3 Merge remote-tracking branch 'spi/for-5.8' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-dw-dma.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (b361663c5a40 PCI/ASPM: Disable ASPM on ASMedia ASM1083/1085 PCIe-to-PCI bridge) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (92ed30191993 Linux 5.8-rc7) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (92ed30191993 Linux 5.8-rc7) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (92ed30191993 Linux 5.8-rc7) +$ 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 (92ed30191993 Linux 5.8-rc7) +$ 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 (92ed30191993 Linux 5.8-rc7) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (92ed30191993 Linux 5.8-rc7) +$ git merge char-misc.current/char-misc-linus +Already up to date. +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 (ba47d845d715 Linux 5.8-rc6) +$ 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 +Already up to date. +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 (f7e6b19bc764 mtd: properly check all write ioctls for permissions) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/mtdchar.c | 56 ++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 47 insertions(+), 9 deletions(-) +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 (830f01b089b1 KVM: SVM: Fix disable pause loop exit/pause filtering capability on SVM) +$ 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 (ba47d845d715 Linux 5.8-rc6) +$ 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 (061e532804fa 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 (5fff09bc1415 xtensa: fix access check in csum_and_copy_from_user) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (1ec8cd744c0c Revert "dma-pool: do not allocate pool memory from CMA") +$ git merge dma-mapping-fixes/for-linus +Merge made by the 'recursive' strategy. + kernel/dma/pool.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (92ed30191993 Linux 5.8-rc7) +$ 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 (3f0dcfbcd2e1 scsi: core: Run queue in case of I/O resource contention failure) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (887c909dd5d5 Merge tag 'amd-drm-fixes-5.8-2020-07-30' 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 (92ed30191993 Linux 5.8-rc7) +$ 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 +Already up to date. +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 (1b4cab57f3ba riscv: disable stack-protector for vDSO) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/kernel/vdso/Makefile | 2 ++ + 1 file changed, 2 insertions(+) +Merging pidfd-fixes/fixes (7665a47f70b3 signal: fix typo in dequeue_synchronous_signal()) +$ 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 +Already up to date. +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 ubifs-fixes/fixes (f37e99aca03f Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into master) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (a9e10b169e65 drm: re-add deleted doc for drm_gem_open_ioctl) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_gem.c | 3 +++ + drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- + 2 files changed, 6 insertions(+), 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 (71e6bc234960 Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging scripts/kconfig/qconf.h +Auto-merging scripts/kconfig/qconf.cc +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging arch/x86/boot/compressed/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig-language.rst | 4 ++-- + Documentation/kbuild/makefiles.rst | 14 ++++++++++++++ + Makefile | 5 ++--- + arch/Kconfig | 3 --- + arch/arm/boot/compressed/Makefile | 9 ++------- + arch/mips/vdso/Makefile | 3 +-- + arch/powerpc/boot/Makefile | 2 ++ + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/platforms/powermac/Makefile | 2 +- + arch/powerpc/xmon/Makefile | 3 +-- + arch/s390/Makefile | 2 +- + arch/sh/boot/compressed/Makefile | 5 +---- + 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 | 3 ++- + arch/xtensa/boot/boot-redboot/Makefile | 1 + + drivers/firmware/efi/libstub/Makefile | 4 ++-- + drivers/xen/Makefile | 3 +-- + kernel/trace/Makefile | 4 ++-- + lib/Makefile | 9 +++------ + lib/livepatch/Makefile | 4 ---- + mm/kasan/Makefile | 2 +- + scripts/Makefile.build | 8 +++----- + scripts/Makefile.lib | 17 +++++++++-------- + scripts/checkkconfigsymbols.py | 2 +- + scripts/checkpatch.pl | 6 +----- + scripts/kconfig/images.c | 30 +++++++++++++++--------------- + scripts/kconfig/images.h | 30 +++++++++++++++--------------- + scripts/kconfig/lexer.l | 2 +- + scripts/kconfig/qconf.cc | 12 ++++++++++-- + scripts/kconfig/qconf.h | 4 ++++ + scripts/link-vmlinux.sh | 4 ++++ + scripts/package/buildtar | 12 ++++++++++++ + 43 files changed, 134 insertions(+), 120 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 (274b3f7bf344 dma-contiguous: cleanup dma_alloc_contiguous) +$ 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/contiguous.c | 31 +++-- + kernel/dma/debug.c | 8 +- + kernel/dma/direct.c | 74 ----------- + kernel/dma/mapping.c | 214 ++++++++++++++++++++++++++++++-- + 26 files changed, 415 insertions(+), 416 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 (4dffbda6a996 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Removing arch/arm/include/asm/hardware/it8152.h +Removing arch/arm/common/it8152.c +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/arm/arm.rst | 6 +- + arch/arm/Kbuild | 11 ++ + arch/arm/Kconfig | 39 +--- + arch/arm/Kconfig.assembler | 6 + + arch/arm/Makefile | 16 +- + arch/arm/common/Makefile | 1 - + arch/arm/common/it8152.c | 352 --------------------------------- + arch/arm/include/asm/hardware/it8152.h | 116 ----------- + arch/arm/include/asm/uaccess.h | 6 +- + arch/arm/include/asm/vfp.h | 2 + + arch/arm/include/asm/vfpmacros.h | 31 ++- + arch/arm/kernel/bios32.c | 17 -- + arch/arm/kernel/stacktrace.c | 24 +++ + arch/arm/mm/mmu.c | 5 - + arch/arm/mm/proc-macros.S | 4 +- + arch/arm/vfp/Makefile | 2 - + arch/arm/vfp/vfphw.S | 31 ++- + arch/arm/vfp/vfpinstr.h | 23 ++- + 18 files changed, 116 insertions(+), 576 deletions(-) + create mode 100644 arch/arm/Kbuild + create mode 100644 arch/arm/Kconfig.assembler + delete mode 100644 arch/arm/common/it8152.c + delete mode 100644 arch/arm/include/asm/hardware/it8152.h +Merging arm64/for-next/core (0e4cd9f26549 Merge branch 'for-next/read-barrier-depends' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging scripts/checkpatch.pl +Auto-merging mm/memory.c +Auto-merging include/linux/compiler_types.h +Auto-merging drivers/perf/arm_smmuv3_pmu.c +Auto-merging arch/arm64/kvm/hyp-init.S +Auto-merging arch/arm64/kernel/vmlinux.lds.S +Auto-merging arch/arm64/kernel/entry.S +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/include/asm/vdso/compat_gettimeofday.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/vdso/compat_gettimeofday.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Makefile +Resolved 'arch/arm64/include/asm/vdso/compat_gettimeofday.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a2cb9c2528e9] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Requirements/Requirements.rst | 2 +- + Documentation/admin-guide/kdump/vmcoreinfo.rst | 16 ++ + .../devicetree/bindings/misc/fsl,qoriq-mc.txt | 50 +++++- + Documentation/memory-barriers.txt | 156 +----------------- + .../translations/ko_KR/memory-barriers.txt | 146 +---------------- + arch/alpha/include/asm/atomic.h | 16 +- + arch/alpha/include/asm/barrier.h | 59 +------ + arch/alpha/include/asm/pgtable.h | 10 +- + arch/alpha/include/asm/rwonce.h | 35 ++++ + arch/arm/include/asm/vdso/gettimeofday.h | 1 + + arch/arm64/Kconfig | 23 ++- + arch/arm64/Makefile | 7 + + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/acpi.h | 15 +- + arch/arm64/include/asm/cpucaps.h | 4 +- + arch/arm64/include/asm/cpufeature.h | 7 + + arch/arm64/include/asm/hugetlb.h | 2 + + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/kernel-pgtable.h | 2 +- + arch/arm64/include/asm/memory.h | 12 +- + arch/arm64/include/asm/mmu_context.h | 6 +- + arch/arm64/include/asm/perf_event.h | 27 ++++ + arch/arm64/include/asm/pgtable-hwdef.h | 23 +-- + arch/arm64/include/asm/pgtable.h | 10 ++ + arch/arm64/include/asm/ptrace.h | 2 +- + arch/arm64/include/asm/stage2_pgtable.h | 9 ++ + arch/arm64/include/asm/sysreg.h | 49 +++++- + arch/arm64/include/asm/tlb.h | 29 +++- + arch/arm64/include/asm/tlbflush.h | 177 +++++++++++++++++++-- + arch/arm64/include/asm/uaccess.h | 1 + + arch/arm64/include/asm/vdso.h | 2 + + arch/arm64/include/asm/vdso/compat_gettimeofday.h | 13 ++ + arch/arm64/include/asm/vdso/gettimeofday.h | 9 ++ + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/include/uapi/asm/sigcontext.h | 2 +- + arch/arm64/kernel/acpi.c | 75 +++++++++ + arch/arm64/kernel/cpufeature.c | 149 ++++++++++++----- + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/crash_core.c | 10 ++ + arch/arm64/kernel/entry.S | 96 +++++------ + arch/arm64/kernel/module-plts.c | 46 +++++- + arch/arm64/kernel/perf_event.c | 89 ++++++++--- + arch/arm64/kernel/setup.c | 24 +-- + arch/arm64/kernel/stacktrace.c | 2 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/kernel/vdso.c | 136 ++++++++++++++-- + arch/arm64/kernel/vdso/vdso.lds.S | 5 +- + arch/arm64/kernel/vdso32/vdso.lds.S | 5 +- + arch/arm64/kernel/vmlinux.lds.S | 1 - + arch/arm64/kvm/hyp-init.S | 1 + + arch/arm64/kvm/sys_regs.c | 68 ++++---- + arch/arm64/mm/context.c | 10 +- + arch/arm64/mm/hugetlbpage.c | 42 ++++- + arch/arm64/mm/init.c | 22 +-- + arch/riscv/include/asm/vdso/gettimeofday.h | 1 + + drivers/acpi/arm64/iort.c | 108 +++++++++---- + drivers/acpi/scan.c | 8 +- + drivers/bus/fsl-mc/dprc-driver.c | 31 +--- + drivers/bus/fsl-mc/fsl-mc-bus.c | 79 ++++++--- + drivers/bus/fsl-mc/fsl-mc-msi.c | 36 +++-- + drivers/bus/fsl-mc/fsl-mc-private.h | 6 +- + drivers/iommu/of_iommu.c | 81 +++++----- + drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 105 +++++++++--- + drivers/of/base.c | 42 ++--- + drivers/of/device.c | 8 +- + drivers/of/irq.c | 34 ++-- + drivers/pci/msi.c | 9 +- + drivers/perf/arm_smmuv3_pmu.c | 3 +- + drivers/vhost/vhost.c | 5 - + include/acpi/acpi_bus.h | 9 +- + include/asm-generic/Kbuild | 1 + + include/asm-generic/barrier.h | 19 +-- + include/asm-generic/rwonce.h | 90 +++++++++++ + include/asm-generic/tlb.h | 55 +++++-- + include/linux/acpi.h | 7 + + include/linux/acpi_iort.h | 20 +-- + include/linux/arm-smccc.h | 44 ++--- + include/linux/compiler.h | 134 +--------------- + include/linux/compiler_types.h | 41 +++++ + include/linux/nospec.h | 2 + + include/linux/of.h | 4 +- + include/linux/of_device.h | 16 +- + include/linux/of_iommu.h | 6 +- + include/linux/of_irq.h | 13 +- + include/linux/percpu-refcount.h | 2 +- + include/linux/ptr_ring.h | 2 +- + include/linux/sched_clock.h | 28 ++++ + include/uapi/linux/perf_event.h | 23 ++- + include/vdso/datapage.h | 1 + + kernel/crash_core.c | 1 + + kernel/time/sched_clock.c | 41 ++--- + mm/memory.c | 2 +- + scripts/checkpatch.pl | 9 +- + scripts/recordmcount.c | 6 + + tools/bpf/Makefile | 3 +- + tools/include/uapi/linux/filter.h | 90 +++++++++++ + tools/include/uapi/linux/perf_event.h | 23 ++- + tools/memory-model/Documentation/explanation.txt | 26 ++- + 98 files changed, 1892 insertions(+), 1091 deletions(-) + create mode 100644 arch/alpha/include/asm/rwonce.h + create mode 100644 include/asm-generic/rwonce.h + create mode 100644 tools/include/uapi/linux/filter.h +Merging arm-perf/for-next/perf (55fdc1f44cd6 arm64: perf: Expose some new events via sysfs) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (e7e7df91deea soc: document merges) +$ git merge arm-soc/for-next +Auto-merging include/linux/of.h +Auto-merging include/linux/arm-smccc.h +Auto-merging drivers/i2c/busses/i2c-qcom-geni.c +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/bus/ti-sysc.c +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi +Removing arch/arm64/boot/dts/qcom/msm8994-pins.dtsi +Removing arch/arm64/boot/dts/qcom/msm8992-pins.dtsi +Auto-merging arch/arm/boot/dts/omap3-n900.dts +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/soc/ti/k3-ringacc.txt +Removing Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt +Removing Documentation/devicetree/bindings/reset/fsl,imx7-src.txt +Removing Documentation/devicetree/bindings/reset/fsl,imx-src.txt +Removing Documentation/devicetree/bindings/arm/al,alpine.yaml +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-turris-mox-rwtm | 9 + + Documentation/ABI/testing/sysfs-bus-optee-devices | 8 + + Documentation/ABI/testing/sysfs-devices-soc | 30 + + .../devicetree/bindings/arm/al,alpine.yaml | 21 - + .../devicetree/bindings/arm/amazon,al.yaml | 33 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + Documentation/devicetree/bindings/arm/fsl.yaml | 5 + + .../devicetree/bindings/arm/intel,keembay.yaml | 19 + + .../devicetree/bindings/arm/mediatek.yaml | 5 + + .../devicetree/bindings/arm/microchip,sparx5.yaml | 65 + + .../bindings/arm/mstar/mstar,l3bridge.yaml | 44 + + .../devicetree/bindings/arm/mstar/mstar.yaml | 33 + + Documentation/devicetree/bindings/arm/renesas.yaml | 13 + + .../devicetree/bindings/arm/rockchip.yaml | 6 + + .../bindings/arm/stm32/st,stm32-syscon.yaml | 14 +- + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + Documentation/devicetree/bindings/arm/tegra.yaml | 18 + + .../bindings/clock/microchip,sparx5-dpll.yaml | 52 + + .../devicetree/bindings/firmware/qcom,scm.txt | 2 + + .../bindings/fuse/nvidia,tegra20-fuse.txt | 5 +- + .../devicetree/bindings/gpu/nvidia,gk20a.txt | 25 + + .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 19 +- + .../bindings/interrupt-controller/ti,sci-intr.txt | 2 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 + + .../bindings/mfd/ti,j721e-system-controller.yaml | 74 + + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../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 + + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + .../devicetree/bindings/rtc/atmel,at91sam9-rtc.txt | 4 +- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 62 - + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 87 + + .../devicetree/bindings/soc/ti/k3-ringacc.txt | 59 - + .../devicetree/bindings/soc/ti/k3-ringacc.yaml | 102 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 2 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 6 +- + .../devicetree/bindings/vendor-prefixes.yaml | 10 + + MAINTAINERS | 42 +- + arch/arm/Kconfig | 2 + + arch/arm/Makefile | 1 + + arch/arm/boot/dts/Makefile | 18 + + 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/arm-realview-eb-mp.dtsi | 2 +- + arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- + arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +- + arch/arm/boot/dts/arm-realview-pbx-a9.dts | 2 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 5 +- + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 219 ++ + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 1231 +++++++++++- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 42 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 466 ++++- + arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 152 ++ + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 79 +- + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 11 + + arch/arm/boot/dts/aspeed-g5.dtsi | 5 +- + arch/arm/boot/dts/aspeed-g6.dtsi | 15 +- + arch/arm/boot/dts/at91-sam9x60ek.dts | 13 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 30 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 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/berlin2.dtsi | 2 +- + arch/arm/boot/dts/berlin2cd.dtsi | 2 +- + arch/arm/boot/dts/berlin2q.dtsi | 2 +- + arch/arm/boot/dts/da850-evm.dts | 2 +- + 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/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-pinctrl.dtsi | 2 +- + 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/exynos5422-odroid-core.dtsi | 6 - + arch/arm/boot/dts/exynos5800.dtsi | 6 +- + arch/arm/boot/dts/hi3620.dtsi | 2 +- + arch/arm/boot/dts/hisi-x5hd2.dtsi | 2 +- + 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-tbs2910.dts | 14 +- + 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-gw51xx.dtsi | 153 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 160 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 166 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 168 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 147 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 153 +- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 141 +- + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 165 +- + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 141 +- + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 142 +- + arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 142 +- + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 160 +- + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 148 +- + arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 153 +- + 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 | 15 +- + 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 +- + .../boot/dts/infinity-msc313-breadbee_crust.dts | 25 + + arch/arm/boot/dts/infinity-msc313.dtsi | 14 + + arch/arm/boot/dts/infinity.dtsi | 11 + + arch/arm/boot/dts/infinity3-msc313e-breadbee.dts | 25 + + arch/arm/boot/dts/infinity3-msc313e.dtsi | 14 + + arch/arm/boot/dts/infinity3.dtsi | 11 + + arch/arm/boot/dts/kirkwood-b3.dts | 2 +- + arch/arm/boot/dts/ls1021a.dtsi | 17 +- + arch/arm/boot/dts/mercury5-ssc8336n-midrived08.dts | 25 + + arch/arm/boot/dts/mercury5-ssc8336n.dtsi | 14 + + arch/arm/boot/dts/mercury5.dtsi | 11 + + 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/mmp2-olpc-xo-1-75.dts | 78 +- + arch/arm/boot/dts/mmp2.dtsi | 89 +- + arch/arm/boot/dts/mmp3-dell-ariel.dts | 8 + + arch/arm/boot/dts/mmp3.dtsi | 25 + + arch/arm/boot/dts/mstar-v7.dtsi | 107 + + 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/qcom-ipq8064-rb3011.dts | 308 +++ + arch/arm/boot/dts/qcom-ipq8064.dtsi | 115 ++ + 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/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 | 322 +++ + arch/arm/boot/dts/rk3288-vyasa.dts | 3 +- + arch/arm/boot/dts/rk3288.dtsi | 20 +- + arch/arm/boot/dts/rk3xxx.dtsi | 3 + + .../boot/dts/rockchip-radxa-dalang-carrier.dtsi | 97 +- + arch/arm/boot/dts/rv1108.dtsi | 13 +- + 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/boot/dts/sam9x60.dtsi | 7 + + arch/arm/boot/dts/sh73a0.dtsi | 7 +- + arch/arm/boot/dts/socfpga.dtsi | 2 + + arch/arm/boot/dts/socfpga_arria10.dtsi | 2 + + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 5 + + arch/arm/boot/dts/ste-ab8500.dtsi | 14 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 2 +- + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 45 + + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 4 +- + arch/arm/boot/dts/stm32429i-eval.dts | 10 +- + arch/arm/boot/dts/stm32746g-eval.dts | 8 +- + arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 85 +- + arch/arm/boot/dts/stm32f429-disco.dts | 97 +- + arch/arm/boot/dts/stm32f429.dtsi | 22 +- + arch/arm/boot/dts/stm32f469-disco.dts | 8 +- + arch/arm/boot/dts/stm32f746.dtsi | 7 +- + arch/arm/boot/dts/stm32f769-disco.dts | 4 +- + arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 +- + arch/arm/boot/dts/stm32h743.dtsi | 7 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 258 ++- + arch/arm/boot/dts/stm32mp151.dtsi | 4 +- + arch/arm/boot/dts/stm32mp157a-dk1.dts | 2 + + arch/arm/boot/dts/stm32mp157c-dk2.dts | 11 + + arch/arm/boot/dts/stm32mp157c-ed1.dts | 4 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 15 + + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 38 +- + arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts | 38 + + arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 18 +- + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 12 + + 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/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 | 5 + + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 14 + + arch/arm/boot/dts/vf610.dtsi | 2 +- + arch/arm/boot/dts/vfxxx.dtsi | 22 + + arch/arm/configs/exynos_defconfig | 4 +- + arch/arm/configs/imx_v6_v7_defconfig | 3 + + arch/arm/configs/multi_v7_defconfig | 11 +- + arch/arm/configs/pxa_defconfig | 4 +- + arch/arm/configs/sama5_defconfig | 8 + + arch/arm/configs/shmobile_defconfig | 13 +- + arch/arm/configs/sunxi_defconfig | 48 +- + arch/arm/configs/tegra_defconfig | 45 +- + arch/arm/mach-at91/Makefile.boot | 2 +- + arch/arm/mach-at91/pm.c | 11 +- + arch/arm/mach-davinci/Kconfig | 4 +- + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 2 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 13 +- + arch/arm/mach-davinci/board-mityomapl138.c | 2 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- + arch/arm/mach-davinci/cpuidle.c | 2 +- + arch/arm/mach-davinci/cpuidle.h | 2 +- + arch/arm/mach-davinci/da850.c | 2 +- + arch/arm/mach-davinci/da8xx-dt.c | 2 +- + arch/arm/mach-davinci/include/mach/pm.h | 2 +- + arch/arm/mach-davinci/pm.c | 2 +- + arch/arm/mach-davinci/sleep.S | 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-mstar/Kconfig | 26 + + arch/arm/mach-mstar/Makefile | 1 + + arch/arm/mach-mstar/mstarv7.c | 80 + + 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/mach-s3c24xx/Kconfig | 2 +- + arch/arm/mach-s3c24xx/common-smdk.c | 67 +- + arch/arm/mach-s3c24xx/mach-h1940.c | 2 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 65 +- + arch/arm/mach-s3c24xx/mach-n30.c | 56 +- + arch/arm/mach-s3c24xx/mach-qt2410.c | 12 +- + arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +- + arch/arm/mach-s3c24xx/mach-vr1000.c | 38 +- + arch/arm/mach-socfpga/pm.c | 8 +- + arch/arm/plat-omap/dma.c | 2 +- + arch/arm/plat-orion/gpio.c | 8 +- + arch/arm/soc-for-next-contents.txt | 229 +++ + arch/arm64/Kconfig.platforms | 20 + + arch/arm64/boot/dts/Makefile | 3 +- + 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-bananapi-m2-plus-v1.2.dts | 1 + + .../boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi | 79 + + .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 1 + + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 38 + + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 38 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 2 + + arch/arm64/boot/dts/{al => amazon}/Makefile | 1 + + .../boot/dts/{al => amazon}/alpine-v2-evp.dts | 0 + arch/arm64/boot/dts/{al => amazon}/alpine-v2.dtsi | 0 + arch/arm64/boot/dts/amazon/alpine-v3-evp.dts | 24 + + arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 408 ++++ + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 55 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 136 +- + arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-gx-mali450.dtsi | 61 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 18 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 63 +- + arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 46 +- + arch/arm64/boot/dts/amlogic/meson-gxl-s805x.dtsi | 17 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 12 +- + .../boot/dts/amlogic/meson-gxm-wetek-core2.dts | 87 + + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 45 +- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 26 +- + .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 92 + + .../arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 88 + + 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 +- + 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-rdb.dts | 2 +- + 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/boot/dts/hisilicon/hi3660-hikey960.dts | 83 + + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 34 + + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 428 ++-- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 10 +- + 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/intel/socfpga_agilex.dtsi | 79 + + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 8 + + arch/arm64/boot/dts/marvell/armada-7040.dtsi | 28 + + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 40 + + arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 18 + + 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/microchip/Makefile | 4 + + arch/arm64/boot/dts/microchip/sparx5.dtsi | 213 ++ + arch/arm64/boot/dts/microchip/sparx5_pcb125.dts | 21 + + arch/arm64/boot/dts/microchip/sparx5_pcb134.dts | 17 + + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 252 +++ + .../boot/dts/microchip/sparx5_pcb134_emmc.dts | 17 + + arch/arm64/boot/dts/microchip/sparx5_pcb135.dts | 17 + + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 92 + + .../boot/dts/microchip/sparx5_pcb135_emmc.dts | 17 + + .../boot/dts/microchip/sparx5_pcb_common.dtsi | 19 + + 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/qcom/Makefile | 8 + + 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 + + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 245 ++- + .../boot/dts/qcom/msm8992-msft-lumia-talkman.dts | 39 + + arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 90 - + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 364 ++++ + arch/arm64/boot/dts/qcom/msm8992.dtsi | 566 ++++-- + .../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-smd-rpm.dtsi | 268 --- + .../qcom/msm8994-sony-xperia-kitakami-sumire.dts | 13 + + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 235 +++ + arch/arm64/boot/dts/qcom/msm8994.dtsi | 642 +++++- + 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 | 19 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 604 +++++- + .../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-db845c.dts | 118 ++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 525 ++++- + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 21 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 1038 ++++++++++ + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 30 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 1717 +++++++++++++++- + 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 + + 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 | 206 +- + .../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/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 | 35 +- + drivers/bus/ti-sysc.c | 6 +- + drivers/char/tpm/tpm_ftpm_tee.c | 70 +- + drivers/clk/clk-scmi.c | 22 +- + drivers/clk/imx/clk-imx8mp.c | 1 + + drivers/clk/imx/clk-vf610.c | 1 + + drivers/cpufreq/scmi-cpufreq.c | 3 +- + drivers/dma/ti/k3-udma-glue.c | 42 +- + drivers/dma/ti/k3-udma.c | 34 +- + 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/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/firmware/qcom_scm.c | 8 +- + 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/firmware/ti_sci.c | 2 +- + drivers/firmware/ti_sci.h | 2 +- + drivers/firmware/turris-mox-rwtm.c | 166 ++ + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 + + drivers/i2c/busses/i2c-qcom-geni.c | 26 +- + drivers/interconnect/qcom/bcm-voter.c | 6 +- + drivers/irqchip/irq-ti-sci-inta.c | 2 +- + drivers/irqchip/irq-ti-sci-intr.c | 2 +- + drivers/leds/leds-s3c24xx.c | 36 +- + drivers/memory/Kconfig | 6 + + drivers/memory/brcmstb_dpfe.c | 7 +- + drivers/memory/bt1-l2-ctl.c | 2 + + drivers/memory/da8xx-ddrctl.c | 2 - + drivers/memory/emif-asm-offsets.c | 10 +- + drivers/memory/emif.c | 23 +- + drivers/memory/fsl_ifc.c | 30 +- + drivers/memory/jz4780-nemc.c | 17 +- + drivers/memory/mtk-smi.c | 2 +- + drivers/memory/mvebu-devbus.c | 20 +- + drivers/memory/of_memory.c | 32 +- + drivers/memory/of_memory.h | 21 +- + drivers/memory/omap-gpmc.c | 66 +- + drivers/memory/pl172.c | 19 +- + drivers/memory/samsung/Kconfig | 7 + + drivers/memory/samsung/exynos-srom.c | 22 +- + drivers/memory/samsung/exynos5422-dmc.c | 15 +- + 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/memory/ti-aemif.c | 16 +- + drivers/memory/ti-emif-pm.c | 2 +- + drivers/reset/reset-intel-gw.c | 24 +- + drivers/reset/reset-simple.c | 23 +- + drivers/reset/reset-socfpga.c | 3 +- + drivers/reset/reset-sunxi.c | 3 +- + drivers/reset/reset-ti-sci.c | 2 +- + drivers/reset/reset-ti-syscon.c | 2 +- + drivers/reset/reset-uniphier-glue.c | 3 +- + drivers/soc/imx/Kconfig | 10 +- + drivers/soc/imx/Makefile | 1 - + drivers/soc/mediatek/mtk-cmdq-helper.c | 46 +- + drivers/soc/qcom/Kconfig | 2 +- + drivers/soc/qcom/pdr_interface.c | 4 +- + drivers/soc/qcom/qcom-geni-se.c | 165 ++ + drivers/soc/qcom/rpmh-rsc.c | 19 +- + drivers/soc/qcom/rpmh.c | 4 +- + drivers/soc/qcom/smd-rpm.c | 5 + + drivers/soc/qcom/socinfo.c | 65 +- + 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/samsung/Kconfig | 3 + + drivers/soc/samsung/Makefile | 1 + + drivers/soc/samsung/exynos-regulator-coupler.c | 221 ++ + drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 +- + drivers/soc/ti/k3-ringacc.c | 200 +- + drivers/soc/ti/knav_qmss_acc.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/spi/spi-geni-qcom.c | 193 +- + drivers/spi/spi-qcom-qspi.c | 117 +- + drivers/tee/optee/core.c | 27 +- + drivers/tee/optee/device.c | 38 +- + drivers/tee/optee/optee_private.h | 10 +- + drivers/tty/serial/qcom_geni_serial.c | 210 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 4 +- + include/dt-bindings/clock/microchip,sparx5.h | 23 + + include/dt-bindings/clock/r8a774e1-cpg-mssr.h | 59 + + include/dt-bindings/clock/vf610-clock.h | 3 +- + include/dt-bindings/mux/mux-j721e-wiz.h | 53 + + include/dt-bindings/pinctrl/k3.h | 2 +- + include/dt-bindings/power/qcom-rpmpd.h | 1 + + include/dt-bindings/power/r8a774e1-sysc.h | 36 + + include/dt-bindings/reset/ti-syscon.h | 2 +- + include/linux/arm-smccc.h | 5 + + include/linux/firmware/imx/sci.h | 2 + + include/linux/firmware/imx/svc/rm.h | 69 + + include/linux/mailbox/mtk-cmdq-mailbox.h | 2 + + include/linux/of.h | 5 + + include/linux/platform_data/leds-s3c24xx.h | 6 - + include/linux/qcom-geni-se.h | 45 + + {drivers => include/linux}/reset/reset-simple.h | 7 + + include/linux/scmi_protocol.h | 110 +- + include/linux/soc/mediatek/mtk-cmdq.h | 31 + + include/linux/soc/ti/k3-ringacc.h | 4 + + include/linux/soc/ti/ti_sci_inta_msi.h | 2 +- + include/linux/soc/ti/ti_sci_protocol.h | 6 +- + include/soc/qcom/rpmh.h | 7 +- + include/soc/tegra/bpmp-abi.h | 913 ++++++--- + include/soc/tegra/fuse.h | 2 + + include/trace/events/scmi.h | 6 +- + 918 files changed, 50867 insertions(+), 9369 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-turris-mox-rwtm + create mode 100644 Documentation/ABI/testing/sysfs-bus-optee-devices + delete mode 100644 Documentation/devicetree/bindings/arm/al,alpine.yaml + create mode 100644 Documentation/devicetree/bindings/arm/amazon,al.yaml + create mode 100644 Documentation/devicetree/bindings/arm/intel,keembay.yaml + create mode 100644 Documentation/devicetree/bindings/arm/microchip,sparx5.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mstar/mstar,l3bridge.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mstar/mstar.yaml + create mode 100644 Documentation/devicetree/bindings/clock/microchip,sparx5-dpll.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml + 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 + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/ti/k3-ringacc.txt + create mode 100644 Documentation/devicetree/bindings/soc/ti/k3-ringacc.yaml + create mode 100644 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts + 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 + create mode 100644 arch/arm/boot/dts/infinity-msc313-breadbee_crust.dts + create mode 100644 arch/arm/boot/dts/infinity-msc313.dtsi + create mode 100644 arch/arm/boot/dts/infinity.dtsi + create mode 100644 arch/arm/boot/dts/infinity3-msc313e-breadbee.dts + create mode 100644 arch/arm/boot/dts/infinity3-msc313e.dtsi + create mode 100644 arch/arm/boot/dts/infinity3.dtsi + create mode 100644 arch/arm/boot/dts/mercury5-ssc8336n-midrived08.dts + create mode 100644 arch/arm/boot/dts/mercury5-ssc8336n.dtsi + create mode 100644 arch/arm/boot/dts/mercury5.dtsi + create mode 100644 arch/arm/boot/dts/mstar-v7.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8064-rb3011.dts + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts + create mode 100644 arch/arm/boot/dts/rk3288-rock-pi-n8.dts + create mode 100644 arch/arm/boot/dts/rk3288-vmarc-som.dtsi + 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/mach-mstar/Kconfig + create mode 100644 arch/arm/mach-mstar/Makefile + create mode 100644 arch/arm/mach-mstar/mstarv7.c + create mode 100644 arch/arm/soc-for-next-contents.txt + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi + rename arch/arm64/boot/dts/{al => amazon}/Makefile (64%) + rename arch/arm64/boot/dts/{al => amazon}/alpine-v2-evp.dts (100%) + rename arch/arm64/boot/dts/{al => amazon}/alpine-v2.dtsi (100%) + create mode 100644 arch/arm64/boot/dts/amazon/alpine-v3-evp.dts + create mode 100644 arch/arm64/boot/dts/amazon/alpine-v3.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gx-mali450.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dts + 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/microchip/Makefile + create mode 100644 arch/arm64/boot/dts/microchip/sparx5.dtsi + create mode 100644 arch/arm64/boot/dts/microchip/sparx5_pcb125.dts + create mode 100644 arch/arm64/boot/dts/microchip/sparx5_pcb134.dts + create mode 100644 arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi + create mode 100644 arch/arm64/boot/dts/microchip/sparx5_pcb134_emmc.dts + create mode 100644 arch/arm64/boot/dts/microchip/sparx5_pcb135.dts + create mode 100644 arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi + create mode 100644 arch/arm64/boot/dts/microchip/sparx5_pcb135_emmc.dts + create mode 100644 arch/arm64/boot/dts/microchip/sparx5_pcb_common.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/qcom/msm8992-msft-lumia-talkman.dts + delete mode 100644 arch/arm64/boot/dts/qcom/msm8992-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts + delete mode 100644 arch/arm64/boot/dts/qcom/msm8994-pins.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.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 + 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 + 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 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 drivers/soc/samsung/exynos-regulator-coupler.c + create mode 100644 include/dt-bindings/clock/microchip,sparx5.h + create mode 100644 include/dt-bindings/clock/r8a774e1-cpg-mssr.h + create mode 100644 include/dt-bindings/mux/mux-j721e-wiz.h + create mode 100644 include/dt-bindings/power/r8a774e1-sysc.h + create mode 100644 include/linux/firmware/imx/svc/rm.h + rename {drivers => include/linux}/reset/reset-simple.h (74%) +Merging amlogic/for-next (bef87d25eebf 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 (2c887638a5fa ARM: dts: Aspeed: tacoma: Enable EHCI controller) +$ git merge aspeed/for-next +Already up to date. +Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (f046e4a3f0b9 memory: jz4780_nemc: Only request IO memory the driver will use) +$ git merge drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (3c1a41dab7b8 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging keystone/next (50c950e2c8b6 Merge branch 'for_5.9/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 (29bd9d8c2ac1 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 (8746b1314c2e Merge branches 'arm64-for-5.10', 'arm64-defconfig-for-5.10' and 'drivers-for-5.10' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 1 + + 1 file changed, 1 insertion(+) +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 (dc76572330e3 reset: Fix and extend kerneldoc) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../bindings/reset/xlnx,zynqmp-reset.txt | 11 ++- + drivers/reset/Kconfig | 5 +- + drivers/reset/core.c | 3 +- + drivers/reset/reset-imx7.c | 9 +- + drivers/reset/reset-zynqmp.c | 50 ++++++++-- + include/dt-bindings/reset/xlnx-versal-resets.h | 105 +++++++++++++++++++++ + 6 files changed, 168 insertions(+), 15 deletions(-) + create mode 100644 include/dt-bindings/reset/xlnx-versal-resets.h +Merging rockchip/for-next (088d74f51158 Merge branch 'v5.9-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3288-cru.txt | 8 ++- + drivers/clk/rockchip/clk-pll.c | 70 +++++++++++++--------- + drivers/clk/rockchip/clk-rk3188.c | 1 + + drivers/clk/rockchip/clk-rk3288.c | 39 +++++++++++- + drivers/clk/rockchip/clk-rk3328.c | 8 +-- + 5 files changed, 89 insertions(+), 37 deletions(-) +Merging samsung-krzk/for-next (3f61e08ac0be Merge branch 'next/memory-ctrl-drivers' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (5714ee50bb43 copy_xstate_to_kernel: Fix typo which caused GDB regression) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (9afd08499961 Merge branch 'sunxi/dt-for-5.9' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (8617339892a6 Merge branch for-5.9/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-pll.c | 27 +++++++++++++++++---------- + drivers/clk/tegra/clk-tegra210-emc.c | 2 ++ + 2 files changed, 19 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 +Already up to date! +Merge made by the 'recursive' strategy. +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 (277b917a9616 Merge branch 'clk-qcom' 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 +Auto-merging drivers/clk/tegra/clk-pll.c +Auto-merging MAINTAINERS +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/clock/qcom,sc7180-gpucc.yaml +Removing Documentation/devicetree/bindings/clock/idt,versaclock5.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 | 68 ++ + .../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 | 92 -- + .../devicetree/bindings/clock/idt,versaclock5.yaml | 154 +++ + .../devicetree/bindings/clock/qcom,a53pll.yaml | 21 +- + .../{qcom,sdm845-gpucc.yaml => qcom,gpucc.yaml} | 18 +- + .../bindings/clock/qcom,msm8996-apcc.yaml | 54 + + .../devicetree/bindings/clock/qcom,rpmcc.txt | 4 + + .../bindings/clock/qcom,sc7180-gpucc.yaml | 74 -- + .../bindings/clock/qcom,sc7180-lpasscorecc.yaml | 108 ++ + .../bindings/clock/renesas,cpg-clocks.yaml | 241 +++++ + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + .../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 +- + MAINTAINERS | 4 +- + drivers/clk/Kconfig | 2 - + drivers/clk/Makefile | 1 + + drivers/clk/actions/owl-s500.c | 89 +- + drivers/clk/at91/Makefile | 1 + + drivers/clk/at91/at91rm9200.c | 3 +- + drivers/clk/at91/at91sam9260.c | 3 +- + drivers/clk/at91/at91sam9g45.c | 5 +- + drivers/clk/at91/at91sam9n12.c | 7 +- + drivers/clk/at91/at91sam9rl.c | 3 +- + drivers/clk/at91/at91sam9x5.c | 7 +- + drivers/clk/at91/clk-generated.c | 44 +- + drivers/clk/at91/clk-main.c | 6 +- + drivers/clk/at91/clk-master.c | 310 +++++- + drivers/clk/at91/clk-peripheral.c | 111 +- + drivers/clk/at91/clk-programmable.c | 11 +- + drivers/clk/at91/clk-sam9x60-pll.c | 547 +++++++--- + drivers/clk/at91/clk-system.c | 4 +- + drivers/clk/at91/clk-utmi.c | 103 +- + drivers/clk/at91/dt-compat.c | 25 +- + drivers/clk/at91/pmc.h | 43 +- + drivers/clk/at91/sam9x60.c | 66 +- + drivers/clk/at91/sama5d2.c | 41 +- + drivers/clk/at91/sama5d3.c | 8 +- + drivers/clk/at91/sama5d4.c | 7 +- + drivers/clk/at91/sama7g5.c | 1059 ++++++++++++++++++++ + drivers/clk/at91/sckc.c | 5 +- + 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-iproc-asiu.c | 4 +- + drivers/clk/bcm/clk-raspberrypi.c | 311 +++--- + drivers/clk/clk-cdce706.c | 2 +- + drivers/clk/clk-gpio.c | 2 +- + drivers/clk/clk-qoriq.c | 10 +- + drivers/clk/clk-si5351.c | 4 +- + drivers/clk/clk-sparx5.c | 295 ++++++ + drivers/clk/clk-versaclock5.c | 304 ++++-- + drivers/clk/clk.c | 47 + + drivers/clk/davinci/pll.c | 2 +- + drivers/clk/imx/clk-pllv3.c | 4 +- + drivers/clk/ingenic/jz4780-cgu.c | 165 +-- + drivers/clk/ingenic/x1000-cgu.c | 97 +- + drivers/clk/ingenic/x1830-cgu.c | 13 + + drivers/clk/keystone/sci-clk.c | 2 +- + drivers/clk/keystone/syscon-clk.c | 2 +- + drivers/clk/meson/g12a.c | 119 +++ + drivers/clk/meson/g12a.h | 7 +- + drivers/clk/meson/meson8b.c | 67 +- + drivers/clk/meson/meson8b.h | 6 +- + drivers/clk/mmp/clk-pxa168.c | 1 + + drivers/clk/mmp/clk-pxa910.c | 1 + + drivers/clk/qcom/Kconfig | 53 + + drivers/clk/qcom/Makefile | 6 + + drivers/clk/qcom/apss-ipq-pll.c | 95 ++ + drivers/clk/qcom/apss-ipq6018.c | 106 ++ + drivers/clk/qcom/clk-alpha-pll.c | 70 +- + drivers/clk/qcom/clk-alpha-pll.h | 21 +- + drivers/clk/qcom/clk-cpu-8996.c | 538 ++++++++++ + drivers/clk/qcom/clk-smd-rpm.c | 297 ++++++ + drivers/clk/qcom/gcc-ipq806x.c | 2 +- + drivers/clk/qcom/gcc-ipq8074.c | 60 ++ + drivers/clk/qcom/gcc-sc7180.c | 16 +- + drivers/clk/qcom/gcc-sdm660.c | 4 + + drivers/clk/qcom/gcc-sdm845.c | 4 +- + drivers/clk/qcom/gcc-sm8150.c | 26 +- + drivers/clk/qcom/gdsc.c | 39 + + drivers/clk/qcom/gdsc.h | 2 + + drivers/clk/qcom/gpucc-sc7180.c | 27 +- + drivers/clk/qcom/gpucc-sdm845.c | 27 +- + drivers/clk/qcom/gpucc-sm8150.c | 320 ++++++ + drivers/clk/qcom/gpucc-sm8250.c | 348 +++++++ + drivers/clk/qcom/lpasscorecc-sc7180.c | 476 +++++++++ + drivers/clk/renesas/Kconfig | 5 + + drivers/clk/renesas/Makefile | 1 + + 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/r8a774e1-cpg-mssr.c | 349 +++++++ + 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 | 23 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 1 + + drivers/clk/sirf/clk-atlas6.c | 2 +- + drivers/clk/socfpga/clk-agilex.c | 8 +- + drivers/clk/versatile/icst.c | 2 +- + drivers/clk/versatile/icst.h | 2 +- + drivers/clk/x86/clk-cgu-pll.c | 2 +- + drivers/clk/x86/clk-cgu.c | 32 +- + 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/actions,s500-cmu.h | 7 +- + 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/g12a-clkc.h | 2 + + include/dt-bindings/clock/jz4780-cgu.h | 144 +-- + include/dt-bindings/clock/qcom,apss-ipq.h | 12 + + include/dt-bindings/clock/qcom,gcc-ipq8074.h | 4 + + include/dt-bindings/clock/qcom,gcc-sc7180.h | 1 + + include/dt-bindings/clock/qcom,gcc-sdm660.h | 1 + + include/dt-bindings/clock/qcom,gpucc-sm8150.h | 33 + + include/dt-bindings/clock/qcom,gpucc-sm8250.h | 34 + + .../dt-bindings/clock/qcom,lpasscorecc-sc7180.h | 29 + + include/dt-bindings/clock/qcom,rpmcc.h | 16 + + include/dt-bindings/clock/x1000-cgu.h | 2 + + include/dt-bindings/clock/x1830-cgu.h | 2 + + include/dt-bindings/reset/actions,s500-reset.h | 67 ++ + include/linux/clk-provider.h | 2 +- + include/linux/clk/at91_pmc.h | 4 + + include/soc/qcom/kryo-l2-accessors.h | 12 + + 154 files changed, 8145 insertions(+), 1452 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 + delete mode 100644 Documentation/devicetree/bindings/clock/idt,versaclock5.txt + create mode 100644 Documentation/devicetree/bindings/clock/idt,versaclock5.yaml + rename Documentation/devicetree/bindings/clock/{qcom,sdm845-gpucc.yaml => qcom,gpucc.yaml} (75%) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-lpasscorecc.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/at91/sama7g5.c + create mode 100644 drivers/clk/bcm/clk-bcm2711-dvp.c + create mode 100644 drivers/clk/clk-sparx5.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/clk/qcom/gpucc-sm8150.c + create mode 100644 drivers/clk/qcom/gpucc-sm8250.c + create mode 100644 drivers/clk/qcom/lpasscorecc-sc7180.c + create mode 100644 drivers/clk/renesas/r8a774e1-cpg-mssr.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/dt-bindings/clock/qcom,gpucc-sm8150.h + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sm8250.h + create mode 100644 include/dt-bindings/clock/qcom,lpasscorecc-sc7180.h + create mode 100644 include/dt-bindings/reset/actions,s500-reset.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 (bdcd93ef9afb csky: Add context tracking support) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 29 +++- + arch/csky/abiv2/inc/abi/entry.h | 3 - + arch/csky/abiv2/mcount.S | 4 +- + arch/csky/include/asm/Kbuild | 1 + + arch/csky/include/asm/bug.h | 3 +- + arch/csky/include/asm/irq_work.h | 11 ++ + arch/csky/include/asm/processor.h | 6 - + arch/csky/include/asm/ptrace.h | 7 + + arch/csky/include/asm/thread_info.h | 2 +- + arch/csky/kernel/entry.S | 28 ++++ + arch/csky/kernel/process.c | 10 -- + arch/csky/kernel/ptrace.c | 37 +---- + arch/csky/kernel/smp.c | 62 ++++++- + arch/csky/kernel/traps.c | 223 +++++++++++++++++--------- + arch/csky/lib/Makefile | 1 + + arch/csky/lib/error-inject.c | 10 ++ + arch/csky/mm/fault.c | 10 +- + arch/csky/mm/highmem.c | 2 - + tools/testing/selftests/seccomp/seccomp_bpf.c | 13 +- + 19 files changed, 319 insertions(+), 143 deletions(-) + create mode 100644 arch/csky/include/asm/irq_work.h + create mode 100644 arch/csky/lib/error-inject.c +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 (1a9d3c34c593 x86/cpu: Add Lakefield, Alder Lake and Rocket Lake to Intel family) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/x86/include/asm/intel-family.h | 7 +++++++ + 1 file changed, 7 insertions(+) +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 (fde87ebf1daa 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 (bc6e8dc11213 MIPS: handle Loongson-specific GSExc exception) +$ git merge mips/mips-next +Auto-merging drivers/memory/Kconfig +Removing arch/mips/pci/pci-virtio-guest.c +Removing arch/mips/paravirt/setup.c +Removing arch/mips/paravirt/serial.c +Removing arch/mips/paravirt/paravirt-smp.c +Removing arch/mips/paravirt/paravirt-irq.c +Removing arch/mips/paravirt/Platform +Removing arch/mips/paravirt/Makefile +Removing arch/mips/paravirt/Kconfig +Auto-merging arch/mips/kernel/traps.c +Removing arch/mips/kernel/mips_machine.c +Removing arch/mips/include/uapi/asm/kvm_para.h +Removing arch/mips/include/asm/mips_machine.h +Removing arch/mips/include/asm/kvm_para.h +Removing arch/mips/configs/mips_paravirt_defconfig +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/power/mti,mips-cpc.txt +Removing Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/bus/mti,mips-cdmm.yaml | 35 ++ + .../bindings/interrupt-controller/mips-gic.txt | 67 ---- + .../bindings/interrupt-controller/mti,gic.yaml | 148 ++++++++ + .../devicetree/bindings/mips/ingenic/devices.yaml | 17 +- + .../bindings/mips/ingenic/ingenic,cpu.yaml | 67 ++++ + .../devicetree/bindings/mips/loongson/devices.yaml | 16 +- + .../devicetree/bindings/power/mti,mips-cpc.txt | 8 - + .../devicetree/bindings/power/mti,mips-cpc.yaml | 35 ++ + .../devicetree/bindings/timer/ingenic,tcu.yaml | 5 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 11 + + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 24 +- + arch/mips/ath79/setup.c | 1 - + arch/mips/bcm63xx/boards/board_bcm963xx.c | 55 +-- + 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 | 364 ++++++++++++++++++++ + arch/mips/boot/dts/ingenic/qi_lb60.dts | 8 +- + arch/mips/boot/dts/ingenic/rs90.dts | 315 +++++++++++++++++ + 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 | 41 +++ + arch/mips/boot/dts/loongson/ls7a-pch.dtsi | 378 +++++++++++++++++++++ + arch/mips/boot/dts/loongson/rs780e-pch.dtsi | 4 +- + arch/mips/cavium-octeon/octeon-usb.c | 5 +- + arch/mips/configs/ci20_defconfig | 1 + + arch/mips/configs/cu1000-neo_defconfig | 4 + + arch/mips/configs/cu1830-neo_defconfig | 123 +++++++ + arch/mips/configs/mips_paravirt_defconfig | 98 ------ + arch/mips/configs/qi_lb60_defconfig | 1 + + arch/mips/configs/rs90_defconfig | 183 ++++++++++ + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/bootinfo.h | 23 +- + arch/mips/include/asm/checksum.h | 4 +- + arch/mips/include/asm/cpu-features.h | 8 + + arch/mips/include/asm/cpu.h | 8 +- + arch/mips/include/asm/elf.h | 1 + + arch/mips/include/asm/io.h | 4 +- + arch/mips/include/asm/kvm_para.h | 115 ------- + .../include/asm/mach-cavium-octeon/mangle-port.h | 12 +- + .../include/asm/mach-dec/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-generic/mangle-port.h | 12 +- + arch/mips/include/asm/mach-generic/spaces.h | 4 + + .../include/asm/mach-ip27/cpu-feature-overrides.h | 3 - + arch/mips/include/asm/mach-ip27/mangle-port.h | 6 +- + .../include/asm/mach-ip30/cpu-feature-overrides.h | 3 - + 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-loongson64/spaces.h | 3 +- + .../asm/mach-paravirt/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-tx39xx/mangle-port.h | 6 +- + arch/mips/include/asm/mach-tx49xx/mangle-port.h | 6 +- + arch/mips/include/asm/mips_machine.h | 46 --- + arch/mips/include/asm/mipsregs.h | 39 ++- + arch/mips/include/asm/octeon/cvmx-l2c.h | 2 +- + arch/mips/include/asm/octeon/cvmx-pip.h | 2 +- + arch/mips/include/asm/octeon/cvmx-pko.h | 7 +- + arch/mips/include/asm/octeon/cvmx-pow.h | 8 +- + arch/mips/include/asm/octeon/octeon.h | 2 +- + arch/mips/include/asm/war.h | 2 +- + arch/mips/include/uapi/asm/Kbuild | 2 + + arch/mips/include/uapi/asm/kvm_para.h | 5 - + arch/mips/jz4740/Kconfig | 18 + + arch/mips/jz4740/setup.c | 52 +-- + arch/mips/kernel/Makefile | 1 - + arch/mips/kernel/cpu-probe.c | 39 ++- + arch/mips/kernel/genex.S | 14 + + arch/mips/kernel/head.S | 6 + + arch/mips/kernel/mips_machine.c | 62 ---- + arch/mips/kernel/setup.c | 2 +- + arch/mips/kernel/topology.c | 2 +- + arch/mips/kernel/traps.c | 40 ++- + 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/loongson64/init.c | 87 +++-- + arch/mips/mm/c-r4k.c | 4 +- + arch/mips/paravirt/Kconfig | 7 - + arch/mips/paravirt/Makefile | 14 - + arch/mips/paravirt/Platform | 7 - + arch/mips/paravirt/paravirt-irq.c | 368 -------------------- + arch/mips/paravirt/paravirt-smp.c | 145 -------- + arch/mips/paravirt/serial.c | 39 --- + arch/mips/paravirt/setup.c | 67 ---- + arch/mips/pci/Makefile | 1 - + arch/mips/pci/pci-virtio-guest.c | 131 ------- + arch/mips/vdso/genvdso.c | 12 +- + drivers/bus/Kconfig | 2 +- + drivers/bus/mips_cdmm.c | 15 + + drivers/memory/Kconfig | 1 - + drivers/of/address.c | 27 +- + drivers/platform/mips/cpu_hwmon.c | 66 ++-- + drivers/platform/mips/rs780e-acpi.c | 2 +- + include/linux/of_address.h | 4 + + 105 files changed, 2923 insertions(+), 1598 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/mti,mips-cdmm.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mti,gic.yaml + create mode 100644 Documentation/devicetree/bindings/mips/ingenic/ingenic,cpu.yaml + delete mode 100644 Documentation/devicetree/bindings/power/mti,mips-cpc.txt + create mode 100644 Documentation/devicetree/bindings/power/mti,mips-cpc.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 + delete mode 100644 arch/mips/configs/mips_paravirt_defconfig + create mode 100644 arch/mips/configs/rs90_defconfig + delete mode 100644 arch/mips/include/asm/kvm_para.h + delete mode 100644 arch/mips/include/asm/mips_machine.h + delete mode 100644 arch/mips/include/uapi/asm/kvm_para.h + delete mode 100644 arch/mips/kernel/mips_machine.c + delete mode 100644 arch/mips/paravirt/Kconfig + delete mode 100644 arch/mips/paravirt/Makefile + delete mode 100644 arch/mips/paravirt/Platform + delete mode 100644 arch/mips/paravirt/paravirt-irq.c + delete mode 100644 arch/mips/paravirt/paravirt-smp.c + delete mode 100644 arch/mips/paravirt/serial.c + delete mode 100644 arch/mips/paravirt/setup.c + delete mode 100644 arch/mips/pci/pci-virtio-guest.c +Merging nds32/next (0a2e478902c7 nds32: use get_kernel_nofault in dump_mem) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 3 files changed, 4 insertions(+), 49 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 (b974d6482cc5 openrisc: Implement proper SMP tlb flushing) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/uaccess.h | 2 +- + arch/openrisc/kernel/setup.c | 8 ++-- + arch/openrisc/kernel/smp.c | 85 +++++++++++++++++++++++++++++++++---- + arch/openrisc/kernel/stacktrace.c | 18 +++++++- + arch/openrisc/kernel/vmlinux.lds.S | 12 ------ + arch/openrisc/mm/tlb.c | 17 +++++--- + init/init_task.c | 1 + + 7 files changed, 112 insertions(+), 31 deletions(-) +Merging parisc-hd/for-next (e72b23dec1da parisc: Do not use an ordered store in pa_tlb_lock()) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/Kconfig +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 2 +- + arch/parisc/include/asm/bitops.h | 41 +++++++++++--------------------- + arch/parisc/include/asm/elf.h | 2 +- + arch/parisc/include/asm/spinlock.h | 33 ++++++++------------------ + arch/parisc/kernel/entry.S | 48 ++++++++++++++++++++------------------ + arch/parisc/kernel/pdt.c | 3 +++ + arch/parisc/kernel/syscall.S | 24 ++++--------------- + arch/parisc/mm/init.c | 12 +++++----- + 8 files changed, 63 insertions(+), 102 deletions(-) +Merging powerpc/next (af0870c4e756 powerpc/papr_scm: Add support for fetching nvdimm 'fuel-gauge' metric) +$ git merge powerpc/next +Removing tools/testing/selftests/powerpc/mm/prot_sao.c +Auto-merging kernel/kexec_file.c +Auto-merging include/asm-generic/barrier.h +Auto-merging drivers/md/dm-writecache.c +Removing arch/powerpc/platforms/pseries/offline_states.h +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Removing arch/powerpc/kernel/eeh_dev.c +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/include/asm/device.h +Auto-merging arch/powerpc/boot/Makefile +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging Documentation/memory-barriers.txt +Merge made by the 'recursive' strategy. + .../testing/sysfs-bus-event_source-devices-hv_24x7 | 7 + + Documentation/ABI/testing/sysfs-bus-papr-pmem | 27 + + Documentation/ABI/testing/sysfs-class-ocxl | 11 + + Documentation/admin-guide/kernel-parameters.txt | 4 + + Documentation/core-api/cpu_hotplug.rst | 7 - + .../sched/membarrier-sync-core/arch-support.txt | 4 +- + Documentation/memory-barriers.txt | 14 + + Documentation/powerpc/cpu_families.rst | 10 +- + Documentation/powerpc/mpc52xx.rst | 2 +- + Documentation/powerpc/syscall64-abi.rst | 42 +- + Documentation/virt/kvm/api.rst | 3 + + MAINTAINERS | 1 - + arch/m68k/include/asm/adb_iop.h | 1 + + arch/powerpc/Kconfig | 30 +- + arch/powerpc/Makefile | 3 +- + arch/powerpc/boot/Makefile | 8 +- + 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/fsl/p4080ds.dts | 43 +- + 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/boot/serial.c | 2 +- + arch/powerpc/configs/44x/akebono_defconfig | 3 - + 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/85xx/xes_mpc85xx_defconfig | 3 - + arch/powerpc/configs/86xx-hw.config | 2 - + arch/powerpc/configs/fsl-emb-nonhw.config | 1 - + arch/powerpc/configs/g5_defconfig | 1 - + arch/powerpc/configs/holly_defconfig | 1 - + arch/powerpc/configs/linkstation_defconfig | 1 - + arch/powerpc/configs/mpc512x_defconfig | 1 - + arch/powerpc/configs/mpc83xx_defconfig | 1 - + arch/powerpc/configs/mvme5100_defconfig | 4 +- + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/pmac32_defconfig | 8 - + arch/powerpc/configs/powernv_defconfig | 2 - + arch/powerpc/configs/ppc40x_defconfig | 3 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 39 - + arch/powerpc/configs/ps3_defconfig | 2 - + arch/powerpc/configs/pseries_defconfig | 3 +- + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/powerpc/configs/storcenter_defconfig | 1 - + arch/powerpc/crypto/crc32-vpmsum_core.S | 2 +- + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/asm-prototypes.h | 6 +- + arch/powerpc/include/asm/atomic.h | 28 + + arch/powerpc/include/asm/barrier.h | 29 + + arch/powerpc/include/asm/book3s/32/pgtable.h | 15 +- + arch/powerpc/include/asm/book3s/64/hash-4k.h | 21 +- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 12 +- + arch/powerpc/include/asm/book3s/64/hash-pkey.h | 32 + + arch/powerpc/include/asm/book3s/64/kexec.h | 23 + + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 10 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 11 + + arch/powerpc/include/asm/book3s/64/pgalloc.h | 16 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 25 +- + arch/powerpc/include/asm/book3s/64/pkeys.h | 27 + + arch/powerpc/include/asm/book3s/64/radix-4k.h | 2 +- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 15 + + arch/powerpc/include/asm/cacheflush.h | 1 + + arch/powerpc/include/asm/cputable.h | 30 +- + arch/powerpc/include/asm/cputime.h | 4 +- + arch/powerpc/include/asm/crashdump-ppc64.h | 19 + + arch/powerpc/include/asm/dbell.h | 64 +- + arch/powerpc/include/asm/device.h | 3 + + arch/powerpc/include/asm/drmem.h | 9 +- + arch/powerpc/include/asm/eeh.h | 26 +- + arch/powerpc/include/asm/epapr_hcalls.h | 4 +- + arch/powerpc/include/asm/exception-64e.h | 59 +- + arch/powerpc/include/asm/exception-64s.h | 14 + + arch/powerpc/include/asm/firmware.h | 10 +- + arch/powerpc/include/asm/fixmap.h | 2 +- + arch/powerpc/include/asm/hardirq.h | 1 - + arch/powerpc/include/asm/head-64.h | 2 +- + arch/powerpc/include/asm/hugetlb.h | 7 + + arch/powerpc/include/asm/hvcall.h | 39 +- + arch/powerpc/include/asm/hw_breakpoint.h | 6 +- + arch/powerpc/include/asm/hydra.h | 2 +- + arch/powerpc/include/asm/imc-pmu.h | 5 + + arch/powerpc/include/asm/inst.h | 19 + + arch/powerpc/include/asm/kasan.h | 2 + + arch/powerpc/include/asm/kexec.h | 41 +- + arch/powerpc/include/asm/kexec_ranges.h | 25 + + arch/powerpc/include/asm/kvm_book3s_asm.h | 2 +- + arch/powerpc/include/asm/kvm_booke.h | 2 + + arch/powerpc/include/asm/kvm_host.h | 6 +- + arch/powerpc/include/asm/kvm_para.h | 26 +- + arch/powerpc/include/asm/machdep.h | 2 +- + arch/powerpc/include/asm/mce.h | 3 + + arch/powerpc/include/asm/mman.h | 30 +- + arch/powerpc/include/asm/mmu.h | 23 + + arch/powerpc/include/asm/mmu_context.h | 2 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 22 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 - + arch/powerpc/include/asm/paca.h | 1 + + arch/powerpc/include/asm/page.h | 4 +- + arch/powerpc/include/asm/paravirt.h | 87 ++ + arch/powerpc/include/asm/pci-bridge.h | 1 - + arch/powerpc/include/asm/perf_event.h | 2 + + arch/powerpc/include/asm/perf_event_server.h | 14 +- + arch/powerpc/include/asm/pkeys.h | 65 +- + arch/powerpc/include/asm/plpar_wrappers.h | 59 +- + arch/powerpc/include/asm/pnv-ocxl.h | 40 +- + arch/powerpc/include/asm/ppc-opcode.h | 571 +++++----- + arch/powerpc/include/asm/ppc_asm.h | 4 +- + arch/powerpc/include/asm/processor.h | 5 +- + arch/powerpc/include/asm/ptrace.h | 9 +- + arch/powerpc/include/asm/qspinlock.h | 91 ++ + arch/powerpc/include/asm/qspinlock_paravirt.h | 7 + + arch/powerpc/include/asm/reg.h | 10 +- + arch/powerpc/include/asm/rtas.h | 3 - + arch/powerpc/include/asm/security_features.h | 2 + + arch/powerpc/include/asm/setup.h | 4 +- + arch/powerpc/include/asm/simple_spinlock.h | 288 +++++ + arch/powerpc/include/asm/simple_spinlock_types.h | 21 + + arch/powerpc/include/asm/smu.h | 2 +- + arch/powerpc/include/asm/sparsemem.h | 6 - + arch/powerpc/include/asm/spinlock.h | 308 +----- + arch/powerpc/include/asm/spinlock_types.h | 17 +- + arch/powerpc/include/asm/sstep.h | 7 + + arch/powerpc/include/asm/string.h | 2 +- + arch/powerpc/include/asm/time.h | 1 - + arch/powerpc/include/asm/timex.h | 2 +- + arch/powerpc/include/asm/topology.h | 27 - + arch/powerpc/include/asm/xive.h | 1 - + arch/powerpc/include/uapi/asm/kvm.h | 5 + + arch/powerpc/include/uapi/asm/mman.h | 2 +- + arch/powerpc/include/uapi/asm/papr_pdsm.h | 9 + + arch/powerpc/kernel/Makefile | 7 +- + arch/powerpc/kernel/align.c | 8 +- + arch/powerpc/kernel/asm-offsets.c | 5 + + arch/powerpc/kernel/cacheinfo.c | 62 +- + arch/powerpc/kernel/cpu_setup_power.S | 29 +- + arch/powerpc/kernel/cputable.c | 3 +- + arch/powerpc/kernel/dawr.c | 2 +- + arch/powerpc/kernel/dbell.c | 55 - + arch/powerpc/kernel/dt_cpu_ftrs.c | 52 +- + arch/powerpc/kernel/eeh.c | 106 +- + arch/powerpc/kernel/eeh_dev.c | 67 -- + arch/powerpc/kernel/eeh_driver.c | 12 +- + arch/powerpc/kernel/eeh_pe.c | 141 +-- + arch/powerpc/kernel/eeh_sysfs.c | 2 +- + arch/powerpc/kernel/entry_32.S | 6 + + arch/powerpc/kernel/entry_64.S | 190 +++- + arch/powerpc/kernel/exceptions-64s.S | 150 ++- + arch/powerpc/kernel/fadump.c | 26 + + arch/powerpc/kernel/firmware.c | 19 + + arch/powerpc/kernel/fpu.S | 4 +- + arch/powerpc/kernel/head_32.S | 16 +- + arch/powerpc/kernel/hw_breakpoint.c | 98 +- + arch/powerpc/kernel/irq.c | 9 +- + arch/powerpc/kernel/kprobes.c | 2 +- + arch/powerpc/kernel/mce.c | 18 +- + arch/powerpc/kernel/mce_power.c | 84 ++ + arch/powerpc/kernel/misc_64.S | 14 - + arch/powerpc/kernel/module.c | 11 + + arch/powerpc/kernel/of_platform.c | 4 +- + arch/powerpc/kernel/paca.c | 13 +- + arch/powerpc/kernel/pci_dn.c | 29 +- + arch/powerpc/kernel/process.c | 111 +- + arch/powerpc/kernel/prom.c | 22 +- + arch/powerpc/kernel/prom_init.c | 30 +- + arch/powerpc/kernel/ptrace/ptrace-view.c | 27 +- + 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/setup-common.c | 3 + + arch/powerpc/kernel/setup_64.c | 5 +- + arch/powerpc/kernel/signal.c | 19 +- + arch/powerpc/kernel/signal_32.c | 20 +- + arch/powerpc/kernel/signal_64.c | 29 +- + arch/powerpc/kernel/smp.c | 1 + + arch/powerpc/kernel/syscall_64.c | 40 +- + arch/powerpc/kernel/sysfs.c | 8 + + arch/powerpc/kernel/trace/ftrace.c | 26 +- + arch/powerpc/kernel/traps.c | 8 - + arch/powerpc/kernel/vdso.c | 2 +- + arch/powerpc/kernel/vdso32/Makefile | 2 +- + arch/powerpc/kernel/vdso32/vdso32.lds.S | 1 + + arch/powerpc/kernel/vdso64/Makefile | 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/vdso64/vdso64.lds.S | 3 +- + arch/powerpc/kernel/vector.S | 4 +- + arch/powerpc/kexec/Makefile | 2 +- + arch/powerpc/kexec/core_64.c | 2 + + arch/powerpc/kexec/elf_64.c | 36 +- + arch/powerpc/kexec/file_load.c | 62 +- + arch/powerpc/kexec/file_load_64.c | 1119 ++++++++++++++++++++ + arch/powerpc/kexec/ranges.c | 412 +++++++ + arch/powerpc/kvm/book3s_hv.c | 46 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 2 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 8 + + arch/powerpc/kvm/book3s_hv_ras.c | 2 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 36 +- + arch/powerpc/kvm/book3s_interrupts.S | 2 +- + arch/powerpc/kvm/trace_hv.h | 2 +- + arch/powerpc/lib/Makefile | 3 + + arch/powerpc/lib/code-patching.c | 2 +- + arch/powerpc/lib/locks.c | 12 +- + arch/powerpc/lib/pmem.c | 48 +- + arch/powerpc/lib/sstep.c | 41 +- + arch/powerpc/lib/test_emulate_step.c | 697 ++++++++++-- + arch/powerpc/lib/test_emulate_step_exec_instr.S | 2 + + arch/powerpc/mm/book3s32/hash_low.S | 2 +- + arch/powerpc/mm/book3s32/mmu.c | 17 +- + arch/powerpc/mm/book3s64/hash_utils.c | 25 +- + arch/powerpc/mm/book3s64/pgtable.c | 8 +- + arch/powerpc/mm/book3s64/pkeys.c | 300 +++--- + arch/powerpc/mm/book3s64/radix_pgtable.c | 219 ++-- + arch/powerpc/mm/book3s64/radix_tlb.c | 82 +- + arch/powerpc/mm/drmem.c | 87 +- + arch/powerpc/mm/fault.c | 106 +- + arch/powerpc/mm/hugetlbpage.c | 18 + + arch/powerpc/mm/init_32.c | 2 + + arch/powerpc/mm/init_64.c | 6 +- + arch/powerpc/mm/kasan/kasan_init_32.c | 35 +- + arch/powerpc/mm/mem.c | 5 - + arch/powerpc/mm/nohash/tlb_low_64e.S | 47 +- + arch/powerpc/mm/numa.c | 506 +-------- + arch/powerpc/mm/pgtable-frag.c | 3 + + arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- + arch/powerpc/mm/ptdump/ptdump.c | 55 +- + 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/Makefile | 2 +- + arch/powerpc/perf/callchain.h | 25 +- + arch/powerpc/perf/callchain_32.c | 21 +- + arch/powerpc/perf/callchain_64.c | 13 +- + arch/powerpc/perf/core-book3s.c | 108 +- + arch/powerpc/perf/generic-compat-pmu.c | 2 +- + arch/powerpc/perf/hv-24x7.c | 54 + + arch/powerpc/perf/imc-pmu.c | 29 +- + arch/powerpc/perf/internal.h | 1 + + arch/powerpc/perf/isa207-common.c | 91 +- + arch/powerpc/perf/isa207-common.h | 37 +- + arch/powerpc/perf/mpc7450-pmu.c | 23 +- + arch/powerpc/perf/power10-events-list.h | 70 ++ + arch/powerpc/perf/power10-pmu.c | 419 ++++++++ + arch/powerpc/perf/power5+-pmu.c | 19 +- + arch/powerpc/perf/power5-pmu.c | 19 +- + arch/powerpc/perf/power6-pmu.c | 18 +- + arch/powerpc/perf/power7-pmu.c | 19 +- + arch/powerpc/perf/power8-pmu.c | 2 +- + arch/powerpc/perf/power9-pmu.c | 2 +- + arch/powerpc/perf/ppc970-pmu.c | 26 +- + arch/powerpc/platforms/52xx/lite5200_sleep.S | 2 +- + arch/powerpc/platforms/85xx/Kconfig | 2 +- + arch/powerpc/platforms/cell/Kconfig | 1 + + arch/powerpc/platforms/cell/spufs/coredump.c | 21 +- + arch/powerpc/platforms/pasemi/misc.c | 3 +- + arch/powerpc/platforms/powermac/feature.c | 2 +- + arch/powerpc/platforms/powermac/low_i2c.c | 6 +- + arch/powerpc/platforms/powermac/pfunc_base.c | 4 +- + arch/powerpc/platforms/powermac/udbg_scc.c | 2 +- + arch/powerpc/platforms/powernv/Makefile | 1 + + arch/powerpc/platforms/powernv/eeh-powernv.c | 114 +- + arch/powerpc/platforms/powernv/idle.c | 48 +- + arch/powerpc/platforms/powernv/opal-async.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 923 +++------------- + arch/powerpc/platforms/powernv/pci-sriov.c | 768 ++++++++++++++ + arch/powerpc/platforms/powernv/pci.c | 14 +- + arch/powerpc/platforms/powernv/pci.h | 103 +- + arch/powerpc/platforms/powernv/setup.c | 10 +- + arch/powerpc/platforms/pseries/Kconfig | 9 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 382 ++++--- + arch/powerpc/platforms/pseries/firmware.c | 1 + + arch/powerpc/platforms/pseries/hotplug-cpu.c | 190 +--- + arch/powerpc/platforms/pseries/hotplug-memory.c | 109 +- + arch/powerpc/platforms/pseries/hvcserver.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 8 +- + arch/powerpc/platforms/pseries/mobility.c | 43 +- + arch/powerpc/platforms/pseries/offline_states.h | 38 - + arch/powerpc/platforms/pseries/papr_scm.c | 296 +++++- + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- + arch/powerpc/platforms/pseries/pmem.c | 7 +- + arch/powerpc/platforms/pseries/setup.c | 24 +- + arch/powerpc/platforms/pseries/smp.c | 90 +- + arch/powerpc/platforms/pseries/suspend.c | 27 +- + arch/powerpc/purgatory/Makefile | 4 +- + .../purgatory/{trampoline.S => trampoline_64.S} | 54 +- + arch/powerpc/sysdev/xive/native.c | 2 + + arch/powerpc/sysdev/xive/spapr.c | 2 +- + arch/powerpc/tools/unrel_branch_check.sh | 5 +- + arch/powerpc/xmon/xmon.c | 40 +- + drivers/cpuidle/cpuidle-powernv.c | 14 - + drivers/cpuidle/cpuidle-pseries.c | 187 +++- + drivers/crypto/vmx/aesp8-ppc.pl | 2 +- + drivers/crypto/vmx/ghashp8-ppc.pl | 2 +- + drivers/macintosh/adb-iop.c | 186 ++-- + drivers/macintosh/adb.c | 2 +- + drivers/macintosh/therm_adt746x.c | 4 +- + drivers/macintosh/via-macii.c | 324 +++--- + drivers/md/dm-writecache.c | 2 +- + drivers/misc/ocxl/Kconfig | 2 +- + drivers/misc/ocxl/config.c | 105 +- + drivers/misc/ocxl/ocxl_internal.h | 15 +- + 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/asm-generic/qspinlock.h | 4 + + include/linux/cpuhotplug.h | 1 + + include/linux/kexec.h | 29 +- + include/linux/mm.h | 2 - + include/misc/ocxl-config.h | 1 + + include/misc/ocxl.h | 102 +- + include/trace/events/mmflags.h | 2 - + kernel/kexec_file.c | 16 +- + mm/ksm.c | 4 - + tools/arch/powerpc/include/uapi/asm/kvm.h | 5 + + tools/perf/arch/powerpc/util/book3s_hcalls.h | 2 +- + .../powerpc/alignment/alignment_handler.c | 150 ++- + .../selftests/powerpc/benchmarks/context_switch.c | 21 +- + .../testing/selftests/powerpc/eeh/eeh-functions.sh | 11 +- + .../selftests/powerpc/include/instructions.h | 77 ++ + tools/testing/selftests/powerpc/include/pkeys.h | 136 +++ + tools/testing/selftests/powerpc/include/reg.h | 6 + + tools/testing/selftests/powerpc/include/utils.h | 29 + + 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 | 5 +- + tools/testing/selftests/powerpc/mm/Makefile | 18 +- + tools/testing/selftests/powerpc/mm/bad_accesses.c | 28 - + .../testing/selftests/powerpc/mm/pkey_exec_prot.c | 294 +++++ + tools/testing/selftests/powerpc/mm/pkey_siginfo.c | 333 ++++++ + tools/testing/selftests/powerpc/mm/prot_sao.c | 42 - + .../selftests/powerpc/mm/stack_expansion_ldst.c | 202 ++++ + .../selftests/powerpc/mm/stack_expansion_signal.c | 118 +++ + .../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/pmu/lib.h | 1 + + .../selftests/powerpc/pmu/per_event_excludes.c | 7 +- + tools/testing/selftests/powerpc/ptrace/core-pkey.c | 2 +- + .../testing/selftests/powerpc/ptrace/ptrace-pkey.c | 57 +- + .../selftests/powerpc/security/spectre_v2.c | 10 + + .../testing/selftests/powerpc/stringloops/memcmp.c | 40 +- + tools/testing/selftests/powerpc/utils.c | 65 +- + 381 files changed, 11026 insertions(+), 5673 deletions(-) + create mode 100644 arch/powerpc/include/asm/book3s/64/hash-pkey.h + create mode 100644 arch/powerpc/include/asm/book3s/64/kexec.h + create mode 100644 arch/powerpc/include/asm/book3s/64/pkeys.h + create mode 100644 arch/powerpc/include/asm/crashdump-ppc64.h + create mode 100644 arch/powerpc/include/asm/kexec_ranges.h + create mode 100644 arch/powerpc/include/asm/paravirt.h + create mode 100644 arch/powerpc/include/asm/qspinlock.h + create mode 100644 arch/powerpc/include/asm/qspinlock_paravirt.h + create mode 100644 arch/powerpc/include/asm/simple_spinlock.h + create mode 100644 arch/powerpc/include/asm/simple_spinlock_types.h + delete mode 100644 arch/powerpc/kernel/eeh_dev.c + create mode 100644 arch/powerpc/kexec/file_load_64.c + create mode 100644 arch/powerpc/kexec/ranges.c + create mode 100644 arch/powerpc/perf/power10-events-list.h + create mode 100644 arch/powerpc/perf/power10-pmu.c + create mode 100644 arch/powerpc/platforms/powernv/pci-sriov.c + delete mode 100644 arch/powerpc/platforms/pseries/offline_states.h + rename arch/powerpc/purgatory/{trampoline.S => trampoline_64.S} (70%) + create mode 100644 tools/testing/selftests/powerpc/include/pkeys.h + create mode 100644 tools/testing/selftests/powerpc/math/fpu_denormal.c + create mode 100644 tools/testing/selftests/powerpc/mm/pkey_exec_prot.c + create mode 100644 tools/testing/selftests/powerpc/mm/pkey_siginfo.c + delete mode 100644 tools/testing/selftests/powerpc/mm/prot_sao.c + create mode 100644 tools/testing/selftests/powerpc/mm/stack_expansion_ldst.c + create mode 100644 tools/testing/selftests/powerpc/mm/stack_expansion_signal.c +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (3843aca0521d riscv: fix build warning of mm/pageattr) +$ git merge risc-v/for-next +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/kernel/vdso/Makefile +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + .../features/core/jump-labels/arch-support.txt | 2 +- + .../debug/debug-vm-pgtable/arch-support.txt | 2 +- + arch/riscv/Kconfig | 12 ++++ + arch/riscv/boot/Makefile | 2 + + arch/riscv/configs/defconfig | 1 + + arch/riscv/configs/nommu_k210_defconfig | 1 + + arch/riscv/configs/nommu_virt_defconfig | 1 + + arch/riscv/configs/rv32_defconfig | 1 + + arch/riscv/include/asm/irq_work.h | 10 +++ + arch/riscv/include/asm/jump_label.h | 60 ++++++++++++++++++ + arch/riscv/include/asm/mmio.h | 6 -- + arch/riscv/include/asm/stackprotector.h | 33 ++++++++++ + arch/riscv/include/uapi/asm/hwcap.h | 2 +- + arch/riscv/include/uapi/asm/unistd.h | 2 +- + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/asm-offsets.c | 3 - + arch/riscv/kernel/entry.S | 54 ++++++++++++++-- + arch/riscv/kernel/head.S | 10 ++- + arch/riscv/kernel/jump_label.c | 53 ++++++++++++++++ + arch/riscv/kernel/module.c | 16 +++++ + arch/riscv/kernel/process.c | 6 ++ + arch/riscv/kernel/smp.c | 15 +++++ + arch/riscv/kernel/smpboot.c | 10 +-- + arch/riscv/kernel/traps.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 ++++++++ + arch/riscv/mm/pageattr.c | 3 +- + include/linux/pgtable.h | 71 +++++++++++----------- + tools/arch/riscv/include/uapi/asm/unistd.h | 2 +- + 31 files changed, 350 insertions(+), 70 deletions(-) + create mode 100644 arch/riscv/include/asm/irq_work.h + create mode 100644 arch/riscv/include/asm/jump_label.h + create mode 100644 arch/riscv/include/asm/stackprotector.h + create mode 100644 arch/riscv/kernel/jump_label.c +Merging s390/features (9a996c67a65d s390/vmemmap: coding style updates) +$ git merge s390/features +Auto-merging arch/s390/kernel/setup.c +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 | 7 +- + arch/s390/appldata/appldata_os.c | 6 +- + arch/s390/include/asm/asm-const.h | 12 + + arch/s390/include/asm/debug.h | 18 +- + arch/s390/include/asm/extable.h | 52 ++- + arch/s390/include/asm/linkage.h | 35 +- + arch/s390/include/asm/pci_dma.h | 11 - + arch/s390/include/asm/pgtable.h | 2 +- + arch/s390/include/asm/ptrace.h | 5 + + arch/s390/include/asm/smp.h | 4 + + arch/s390/include/asm/syscall_wrapper.h | 6 +- + 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/kprobes.c | 4 +- + arch/s390/kernel/lgr.c | 2 +- + arch/s390/kernel/setup.c | 8 - + arch/s390/kernel/smp.c | 5 +- + arch/s390/kernel/time.c | 55 ++- + arch/s390/kernel/topology.c | 4 +- + arch/s390/kernel/traps.c | 7 +- + arch/s390/lib/Makefile | 2 + + arch/s390/lib/error-inject.c | 14 + + arch/s390/mm/cmm.c | 2 +- + arch/s390/mm/extmem.c | 32 +- + arch/s390/mm/fault.c | 6 +- + arch/s390/mm/vmem.c | 703 +++++++++++++++++++------------- + arch/s390/net/bpf_jit_comp.c | 139 ++++++- + arch/s390/pci/pci_mmio.c | 20 +- + drivers/s390/char/tty3270.c | 12 +- + drivers/s390/char/zcore.c | 57 +-- + drivers/s390/cio/qdio.h | 9 +- + drivers/s390/cio/qdio_debug.c | 2 +- + drivers/s390/cio/qdio_main.c | 41 +- + 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 +-- + scripts/sorttable.c | 41 ++ + 55 files changed, 1595 insertions(+), 1259 deletions(-) + create mode 100644 arch/s390/include/asm/asm-const.h + delete mode 100644 arch/s390/include/uapi/asm/debug.h + create mode 100644 arch/s390/lib/error-inject.c +Merging sh/for-next (55b4ddbb7ee5 sh: bring syscall_set_return_value in line with other architectures) +$ git merge sh/for-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +CONFLICT (content): Merge conflict in tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging kernel/dma/Kconfig +Removing arch/sh/drivers/pci/fixups-cayman.c +Removing arch/sh/configs/cayman_defconfig +Removing arch/sh/boards/mach-cayman/setup.c +Removing arch/sh/boards/mach-cayman/panic.c +Removing arch/sh/boards/mach-cayman/irq.c +Removing arch/sh/boards/mach-cayman/Makefile +Resolved 'tools/testing/selftests/seccomp/seccomp_bpf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c69412e49f55] Merge remote-tracking branch 'sh/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/m68k/Kconfig | 4 +- + arch/m68k/Kconfig.machine | 1 + + arch/sh/Kconfig | 109 ++++++++-------- + arch/sh/Makefile | 5 - + arch/sh/boards/Kconfig | 6 - + arch/sh/boards/board-sh2007.c | 4 +- + arch/sh/boards/mach-cayman/Makefile | 5 - + arch/sh/boards/mach-cayman/irq.c | 148 --------------------- + arch/sh/boards/mach-cayman/panic.c | 46 ------- + arch/sh/boards/mach-cayman/setup.c | 181 -------------------------- + arch/sh/configs/ap325rxa_defconfig | 3 - + arch/sh/configs/cayman_defconfig | 66 ---------- + arch/sh/configs/ecovec24_defconfig | 3 - + arch/sh/configs/migor_defconfig | 3 - + arch/sh/configs/se7724_defconfig | 2 - + arch/sh/drivers/pci/Makefile | 1 - + arch/sh/drivers/pci/common.c | 6 +- + arch/sh/drivers/pci/fixups-cayman.c | 78 ----------- + arch/sh/drivers/pci/pci-sh7780.c | 23 ++-- + arch/sh/drivers/pci/pci.c | 11 +- + arch/sh/include/asm/adc.h | 2 - + arch/sh/include/asm/addrspace.h | 3 - + arch/sh/include/asm/bitops.h | 4 - + arch/sh/include/asm/cache.h | 2 - + arch/sh/include/asm/cacheflush.h | 3 - + arch/sh/include/asm/dma.h | 2 - + arch/sh/include/asm/elf.h | 2 - + arch/sh/include/asm/freq.h | 2 - + arch/sh/include/asm/futex.h | 3 - + arch/sh/include/asm/io.h | 119 ++--------------- + arch/sh/include/asm/kdebug.h | 3 +- + arch/sh/include/asm/mmu_context.h | 2 - + arch/sh/include/asm/mmzone.h | 3 - + arch/sh/include/asm/pci.h | 4 - + arch/sh/include/asm/processor_32.h | 2 - + arch/sh/include/asm/smc37c93x.h | 4 +- + arch/sh/include/asm/sparsemem.h | 3 - + arch/sh/include/asm/stacktrace.h | 2 - + arch/sh/include/asm/string_32.h | 4 - + arch/sh/include/asm/syscall_32.h | 5 +- + arch/sh/include/asm/syscalls_32.h | 3 - + arch/sh/include/asm/thread_info.h | 5 - + arch/sh/include/asm/uaccess_32.h | 53 ++++++++ + arch/sh/include/asm/watchdog.h | 2 - + arch/sh/kernel/Makefile | 2 - + arch/sh/kernel/disassemble.c | 103 +++++++-------- + arch/sh/kernel/dma-coherent.c | 51 +------- + arch/sh/kernel/dumpstack.c | 30 ++--- + arch/sh/kernel/entry-common.S | 59 +++++---- + arch/sh/kernel/io_trapped.c | 2 - + arch/sh/kernel/ioport.c | 1 + + arch/sh/kernel/machvec.c | 8 +- + arch/sh/kernel/perf_callchain.c | 6 - + arch/sh/kernel/process_32.c | 44 +++---- + arch/sh/kernel/ptrace_32.c | 5 +- + arch/sh/kernel/stacktrace.c | 7 - + arch/sh/lib/Makefile | 2 - + arch/sh/lib/delay.c | 1 - + arch/sh/mm/Makefile | 2 - + arch/sh/mm/consistent.c | 2 - + arch/sh/mm/fault.c | 3 +- + arch/sh/mm/init.c | 1 + + arch/sh/mm/ioremap.c | 55 ++++++++ + arch/sh/mm/ioremap.h | 23 ++++ + arch/sh/mm/ioremap_fixed.c | 1 + + arch/sh/mm/pgtable.c | 7 +- + arch/sh/oprofile/backtrace.c | 7 - + arch/sh/tools/mach-types | 1 - + arch/um/Kconfig | 4 +- + drivers/input/serio/i8042-io.h | 2 - + kernel/dma/Kconfig | 3 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 8 +- + 72 files changed, 370 insertions(+), 1012 deletions(-) + delete mode 100644 arch/sh/boards/mach-cayman/Makefile + delete mode 100644 arch/sh/boards/mach-cayman/irq.c + delete mode 100644 arch/sh/boards/mach-cayman/panic.c + delete mode 100644 arch/sh/boards/mach-cayman/setup.c + delete mode 100644 arch/sh/configs/cayman_defconfig + delete mode 100644 arch/sh/drivers/pci/fixups-cayman.c + create mode 100644 arch/sh/mm/ioremap.h +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 (a0fc1436f1f4 xtensa: add missing exclusive access state management) +$ git merge xtensa/xtensa-for-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +CONFLICT (content): Merge conflict in tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging arch/xtensa/boot/boot-redboot/Makefile +Auto-merging arch/xtensa/boot/boot-elf/Makefile +Resolved 'tools/testing/selftests/seccomp/seccomp_bpf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bc2ecfa78bab] Merge remote-tracking branch 'xtensa/xtensa-for-next' +$ git diff -M --stat --summary HEAD^.. + .../features/seccomp/seccomp-filter/arch-support.txt | 2 +- + arch/xtensa/Kconfig | 16 ++++++++++++++++ + arch/xtensa/boot/Makefile | 12 +++++++----- + arch/xtensa/boot/boot-elf/Makefile | 4 ++-- + arch/xtensa/boot/boot-redboot/Makefile | 4 ++-- + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/asm/initialize_mmu.h | 2 +- + arch/xtensa/include/asm/thread_info.h | 11 ++++++++++- + arch/xtensa/include/uapi/asm/ptrace.h | 3 ++- + arch/xtensa/kernel/asm-offsets.c | 3 +++ + arch/xtensa/kernel/entry.S | 11 +++++++++++ + arch/xtensa/kernel/perf_event.c | 2 +- + arch/xtensa/kernel/ptrace.c | 14 +++++++++++++- + tools/testing/selftests/seccomp/seccomp_bpf.c | 15 ++++++++++++++- + 14 files changed, 84 insertions(+), 16 deletions(-) +Merging fscrypt/master (55e32c54bbd5 fscrypt: don't load ->i_crypt_info before it's known to be valid) +$ 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 | 25 ++- + fs/buffer.c | 7 +- + fs/crypto/Kconfig | 8 +- + fs/crypto/Makefile | 1 + + fs/crypto/bio.c | 51 +++++ + fs/crypto/crypto.c | 4 +- + fs/crypto/fname.c | 45 ++--- + fs/crypto/fscrypt_private.h | 144 ++++++++++--- + fs/crypto/inline_crypt.c | 367 ++++++++++++++++++++++++++++++++++ + fs/crypto/keyring.c | 21 +- + fs/crypto/keysetup.c | 91 ++++++--- + fs/crypto/keysetup_v1.c | 20 +- + fs/crypto/policy.c | 20 +- + 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 | 111 +++++++++- + 24 files changed, 940 insertions(+), 139 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 (cd37cdd68ef1 Merge branch 'for-next-current-v5.7-20200730' into for-next-20200730) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 211 +++++-------- + fs/btrfs/block-group.h | 3 +- + fs/btrfs/btrfs_inode.h | 11 + + 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 | 127 ++++++-- + fs/btrfs/delalloc-space.c | 36 +-- + fs/btrfs/delalloc-space.h | 10 +- + fs/btrfs/disk-io.c | 92 +++++- + fs/btrfs/disk-io.h | 2 + + fs/btrfs/extent-io-tree.h | 5 +- + fs/btrfs/extent-tree.c | 24 +- + fs/btrfs/extent_io.c | 241 +++++++------- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 143 +++++---- + fs/btrfs/free-space-cache.c | 27 +- + fs/btrfs/free-space-cache.h | 2 +- + fs/btrfs/inode-map.c | 3 +- + fs/btrfs/inode.c | 553 ++++++++++++++++++--------------- + fs/btrfs/ioctl.c | 86 ++++- + 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 | 65 +--- + fs/btrfs/ref-verify.c | 2 + + fs/btrfs/reflink.c | 26 +- + fs/btrfs/relocation.c | 71 ++--- + fs/btrfs/scrub.c | 153 +++------ + fs/btrfs/space-info.c | 2 +- + fs/btrfs/super.c | 174 ++++++++--- + fs/btrfs/sysfs.c | 163 +++++++++- + 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 | 8 +- + fs/btrfs/transaction.h | 28 +- + fs/btrfs/tree-defrag.c | 5 +- + fs/btrfs/tree-log.c | 58 ++-- + fs/btrfs/volumes.c | 133 +++++--- + fs/btrfs/volumes.h | 2 +- + include/trace/events/btrfs.h | 147 +++++---- + include/uapi/linux/btrfs.h | 21 +- + include/uapi/linux/btrfs_tree.h | 4 +- + 47 files changed, 1958 insertions(+), 1254 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 (7efd08158261 cifs: document and cleanup dfs mount) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsacl.h | 4 +- + fs/cifs/cifsglob.h | 2 +- + fs/cifs/cifsproto.h | 9 +- + fs/cifs/cifssmb.c | 151 ++++------------ + fs/cifs/connect.c | 508 +++++++++++++++++++++++++++++++--------------------- + fs/cifs/dfs_cache.c | 136 +++++++++++--- + fs/cifs/dfs_cache.h | 7 +- + fs/cifs/inode.c | 2 - + fs/cifs/misc.c | 7 +- + fs/cifs/netmisc.c | 27 +++ + fs/cifs/sess.c | 4 +- + fs/cifs/smb1ops.c | 4 +- + fs/cifs/smb2misc.c | 73 +++++--- + fs/cifs/smb2pdu.c | 115 +----------- + fs/cifs/smb2pdu.h | 2 +- + fs/cifs/transport.c | 2 +- + 16 files changed, 560 insertions(+), 493 deletions(-) +Merging configfs/for-next (059ccbfff8a8 configfs: use flush file op to commit writes to a binary file) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/file.c | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) +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 (b361b45cc1a1 erofs: remove WQ_CPU_INTENSIVE flag from unbound wq's) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/compress.h | 2 +- + fs/erofs/data.c | 2 +- + fs/erofs/decompressor.c | 2 +- + fs/erofs/dir.c | 2 +- + fs/erofs/erofs_fs.h | 2 +- + fs/erofs/inode.c | 123 +++++++++++++++++++++++++++++++----------------- + fs/erofs/internal.h | 2 +- + fs/erofs/namei.c | 2 +- + fs/erofs/super.c | 2 +- + fs/erofs/utils.c | 16 ++----- + fs/erofs/xattr.c | 2 +- + fs/erofs/xattr.h | 2 +- + fs/erofs/zdata.c | 6 +-- + fs/erofs/zdata.h | 2 +- + fs/erofs/zmap.c | 2 +- + fs/erofs/zpvec.h | 2 +- + 16 files changed, 100 insertions(+), 71 deletions(-) +Merging exfat/dev (7c9d236387fa exfat: optimize exfat_zeroed_cluster()) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 4 ++-- + fs/exfat/dir.c | 32 ++++++++++++++++------------- + fs/exfat/exfat_fs.h | 8 +++----- + fs/exfat/fatent.c | 58 ++++++++++------------------------------------------- + fs/exfat/file.c | 5 ++++- + fs/exfat/inode.c | 9 +++++---- + fs/exfat/misc.c | 22 ++++++++++++++++++-- + fs/exfat/namei.c | 12 +++++------ + fs/exfat/super.c | 14 ++++++------- + 9 files changed, 75 insertions(+), 89 deletions(-) +Merging ext3/for_next (2a347b9461f0 Merge name event comparison fix.) +$ git merge ext3/for_next +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 | 8 +- + 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/kernfs/file.c | 13 +- + fs/nfsd/filecache.c | 10 +- + fs/notify/dnotify/dnotify.c | 16 +- + fs/notify/fanotify/fanotify.c | 443 +++++++++++++++++++++++------------ + fs/notify/fanotify/fanotify.h | 118 ++++++++-- + fs/notify/fanotify/fanotify_user.c | 218 ++++++++++++----- + fs/notify/fsnotify.c | 244 ++++++++++++++----- + fs/notify/inotify/inotify.h | 6 +- + fs/notify/inotify/inotify_fsnotify.c | 51 +++- + fs/notify/inotify/inotify_user.c | 18 +- + fs/quota/Kconfig | 2 +- + fs/reiserfs/reiserfs.h | 2 +- + fs/udf/ecma_167.h | 2 +- + fs/udf/osta_udf.h | 2 +- + fs/udf/super.c | 4 +- + include/linux/fanotify.h | 6 +- + include/linux/fsnotify.h | 84 ++++--- + include/linux/fsnotify_backend.h | 93 ++++++-- + include/uapi/linux/fanotify.h | 16 +- + kernel/audit_fsnotify.c | 22 +- + kernel/audit_tree.c | 10 +- + kernel/audit_watch.c | 19 +- + kernel/trace/trace.c | 3 +- + 32 files changed, 1044 insertions(+), 500 deletions(-) +Merging ext4/dev (43c18181b701 ext4: fix potential negative array index in do_split()) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/extents.c | 10 +++++----- + fs/ext4/namei.c | 16 +++++++++++++--- + fs/jbd2/transaction.c | 10 ++++++++++ + 3 files changed, 28 insertions(+), 8 deletions(-) +Merging f2fs/dev (33ba0a4869d8 f2fs: compress: disable compression mount option if compression is off) +$ 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 87252cdb3eed] 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 | 11 +- + fs/f2fs/compress.c | 89 +++++++---- + fs/f2fs/data.c | 93 +++++++++--- + fs/f2fs/debug.c | 64 ++++++-- + fs/f2fs/dir.c | 2 +- + fs/f2fs/extent_cache.c | 18 +-- + fs/f2fs/f2fs.h | 77 ++++++---- + fs/f2fs/file.c | 258 ++++++++++++++++++++++++++++---- + fs/f2fs/gc.c | 75 ++++++---- + fs/f2fs/inline.c | 21 ++- + fs/f2fs/inode.c | 4 +- + fs/f2fs/namei.c | 18 ++- + fs/f2fs/node.c | 38 ++--- + fs/f2fs/recovery.c | 12 +- + fs/f2fs/segment.c | 127 +++++++++++----- + fs/f2fs/segment.h | 10 +- + fs/f2fs/super.c | 68 +++++---- + fs/f2fs/sysfs.c | 23 ++- + fs/f2fs/verity.c | 6 +- + fs/f2fs/xattr.c | 4 +- + include/trace/events/f2fs.h | 63 ++++++++ + 23 files changed, 807 insertions(+), 284 deletions(-) +Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info) +$ git merge fsverity/fsverity +Merge made by the 'recursive' strategy. + fs/verity/open.c | 15 ++++++++++++--- + include/linux/fsverity.h | 9 +++++++-- + 2 files changed, 19 insertions(+), 5 deletions(-) +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 (048c397aa88b NFSv4.2: xattr cache: get rid of cache discard work queue) +$ git merge nfs/linux-next +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/direct.c +Merge made by the 'recursive' strategy. + fs/nfs/Makefile | 2 +- + fs/nfs/client.c | 22 +- + fs/nfs/dir.c | 24 +- + fs/nfs/direct.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 14 +- + fs/nfs/inode.c | 20 +- + fs/nfs/nfs42.h | 24 + + fs/nfs/nfs42proc.c | 248 ++++++++ + fs/nfs/nfs42xattr.c | 1056 ++++++++++++++++++++++++++++++++ + fs/nfs/nfs42xdr.c | 438 +++++++++++++ + fs/nfs/nfs4_fs.h | 35 ++ + fs/nfs/nfs4client.c | 33 +- + fs/nfs/nfs4proc.c | 239 +++++++- + fs/nfs/nfs4super.c | 10 + + fs/nfs/nfs4xdr.c | 31 + + fs/nfs/nfstrace.h | 3 +- + include/linux/freezer.h | 14 + + include/linux/nfs4.h | 25 + + include/linux/nfs_fs.h | 12 + + include/linux/nfs_fs_sb.h | 6 + + include/linux/nfs_xdr.h | 60 +- + include/uapi/linux/nfs4.h | 3 + + include/uapi/linux/nfs_fs.h | 1 + + net/sunrpc/rpc_pipe.c | 2 +- + 24 files changed, 2267 insertions(+), 57 deletions(-) + create mode 100644 fs/nfs/nfs42xattr.c +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 (b3a9e3b9622a Linux 5.8-rc1) +$ git merge nfsd/nfsd-next +Already up to date. +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/next (798b7347e4f2 jffs2: fix UAF problem) +$ git merge ubifs/next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/fastmap-wl.c | 5 +++++ + drivers/mtd/ubi/wl.c | 3 ++- + fs/jffs2/dir.c | 6 +++++- + fs/jffs2/scan.c | 3 ++- + fs/ubifs/journal.c | 10 ++++++---- + fs/ubifs/misc.h | 2 +- + fs/ubifs/sb.c | 5 +++-- + fs/ubifs/super.c | 18 ++++++++++++++++++ + fs/ubifs/ubifs.h | 1 + + 9 files changed, 43 insertions(+), 10 deletions(-) +Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory allocation) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + fs/9p/v9fs.c | 5 ++-- + fs/9p/vfs_inode.c | 65 +++++++------------------------------------------- + fs/9p/vfs_inode_dotl.c | 9 +++++-- + net/9p/trans_fd.c | 2 +- + 4 files changed, 18 insertions(+), 63 deletions(-) +Merging xfs/for-next (818d5a91559f fs/xfs: Support that ioctl(SETXFLAGS/GETXFLAGS) can set/get inode DAX on XFS.) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/kmem.c | 21 - + fs/xfs/kmem.h | 8 - + fs/xfs/libxfs/xfs_ag.c | 4 +- + fs/xfs/libxfs/xfs_ag_resv.h | 12 - + fs/xfs/libxfs/xfs_alloc.c | 25 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 10 +- + fs/xfs/libxfs/xfs_attr.c | 865 ++++++++++++++++++++++--------------- + fs/xfs/libxfs/xfs_attr.h | 1 + + fs/xfs/libxfs/xfs_attr_leaf.c | 117 +++-- + fs/xfs/libxfs/xfs_attr_leaf.h | 3 + + fs/xfs/libxfs/xfs_attr_remote.c | 216 +++++---- + fs/xfs/libxfs/xfs_attr_remote.h | 3 +- + fs/xfs/libxfs/xfs_bmap.c | 8 +- + fs/xfs/libxfs/xfs_bmap.h | 15 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_btree_staging.h | 6 +- + fs/xfs/libxfs/xfs_da_btree.c | 12 +- + fs/xfs/libxfs/xfs_da_btree.h | 2 +- + fs/xfs/libxfs/xfs_dir2_node.c | 17 +- + fs/xfs/libxfs/xfs_dquot_buf.c | 25 +- + fs/xfs/libxfs/xfs_format.h | 36 +- + fs/xfs/libxfs/xfs_ialloc.c | 28 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +- + fs/xfs/libxfs/xfs_inode_buf.c | 33 +- + fs/xfs/libxfs/xfs_inode_buf.h | 6 - + fs/xfs/libxfs/xfs_inode_fork.c | 6 +- + fs/xfs/libxfs/xfs_quota_defs.h | 31 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 6 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 11 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- + fs/xfs/libxfs/xfs_shared.h | 1 + + fs/xfs/libxfs/xfs_trans_inode.c | 110 +++-- + fs/xfs/libxfs/xfs_trans_space.h | 2 +- + fs/xfs/scrub/bmap.c | 22 +- + fs/xfs/scrub/dabtree.c | 4 +- + fs/xfs/scrub/quota.c | 83 ++-- + fs/xfs/scrub/repair.c | 10 +- + fs/xfs/scrub/repair.h | 4 +- + fs/xfs/scrub/rtbitmap.c | 47 ++ + fs/xfs/xfs_bmap_item.c | 4 +- + fs/xfs/xfs_bmap_util.c | 18 +- + fs/xfs/xfs_buf.c | 44 +- + fs/xfs/xfs_buf.h | 48 +- + fs/xfs/xfs_buf_item.c | 422 +++++++++--------- + fs/xfs/xfs_buf_item.h | 8 +- + fs/xfs/xfs_buf_item_recover.c | 14 +- + fs/xfs/xfs_dquot.c | 415 ++++++++++-------- + fs/xfs/xfs_dquot.h | 129 ++++-- + fs/xfs/xfs_dquot_item.c | 26 +- + fs/xfs/xfs_dquot_item_recover.c | 14 +- + fs/xfs/xfs_extfree_item.c | 6 +- + fs/xfs/xfs_file.c | 28 +- + fs/xfs/xfs_icache.c | 376 +++++----------- + fs/xfs/xfs_icache.h | 5 +- + fs/xfs/xfs_icreate_item.c | 2 +- + fs/xfs/xfs_inode.c | 698 ++++++++++++++---------------- + fs/xfs/xfs_inode.h | 5 +- + fs/xfs/xfs_inode_item.c | 308 ++++++------- + fs/xfs/xfs_inode_item.h | 24 +- + fs/xfs/xfs_inode_item_recover.c | 2 +- + fs/xfs/xfs_ioctl.c | 14 +- + fs/xfs/xfs_iomap.c | 42 +- + fs/xfs/xfs_linux.h | 4 - + fs/xfs/xfs_log.c | 9 +- + fs/xfs/xfs_log_cil.c | 3 +- + fs/xfs/xfs_log_priv.h | 4 +- + fs/xfs/xfs_log_recover.c | 5 +- + fs/xfs/xfs_mount.c | 15 +- + fs/xfs/xfs_mount.h | 1 - + fs/xfs/xfs_qm.c | 189 ++++---- + fs/xfs/xfs_qm.h | 106 ++--- + fs/xfs/xfs_qm_bhv.c | 22 +- + fs/xfs/xfs_qm_syscalls.c | 250 +++++------ + fs/xfs/xfs_quota.h | 19 +- + fs/xfs/xfs_quotaops.c | 26 +- + fs/xfs/xfs_refcount_item.c | 5 +- + fs/xfs/xfs_reflink.c | 355 +++++++-------- + fs/xfs/xfs_reflink.h | 2 - + fs/xfs/xfs_rmap_item.c | 5 +- + fs/xfs/xfs_super.c | 19 +- + fs/xfs/xfs_trace.h | 228 +++++++--- + fs/xfs/xfs_trans.c | 23 +- + fs/xfs/xfs_trans.h | 5 - + fs/xfs/xfs_trans_ail.c | 26 +- + fs/xfs/xfs_trans_buf.c | 15 +- + fs/xfs/xfs_trans_dquot.c | 375 ++++++++-------- + 86 files changed, 3250 insertions(+), 2929 deletions(-) +Merging zonefs/for-next (2f4b7462d2fa zonefs: update documentation to reflect zone size vs capacity) +$ git merge zonefs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/buffer.c +CONFLICT (content): Merge conflict in fs/buffer.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/nvme/host/tcp.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/nvme.h +Auto-merging drivers/nvme/host/core.c +CONFLICT (content): Merge conflict in drivers/nvme/host/core.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-writecache.c +Auto-merging drivers/md/dm-integrity.c +Removing block/blk-softirq.c +Resolved 'drivers/nvme/host/core.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 873a80e208d9] Merge remote-tracking branch 'zonefs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block | 18 ++ + Documentation/block/biodoc.rst | 2 +- + Documentation/block/queue-sysfs.rst | 14 + + Documentation/block/writeback_cache_control.rst | 2 +- + Documentation/fault-injection/fault-injection.rst | 2 +- + Documentation/filesystems/zonefs.rst | 22 +- + Documentation/trace/ftrace.rst | 4 +- + arch/m68k/emu/nfblock.c | 8 +- + arch/xtensa/platforms/iss/simdisk.c | 9 +- + block/Kconfig | 5 +- + block/Makefile | 2 +- + block/bio.c | 161 +--------- + block/blk-cgroup.c | 184 ++++++++++-- + block/blk-core.c | 286 +++++++++--------- + block/blk-crypto-fallback.c | 2 +- + block/blk-crypto.c | 2 +- + block/blk-iocost.c | 3 +- + block/blk-iolatency.c | 3 +- + block/blk-merge.c | 25 +- + block/blk-mq-debugfs.c | 8 +- + block/blk-mq-sched.c | 103 ++++++- + block/blk-mq-tag.c | 62 +--- + block/blk-mq-tag.h | 39 ++- + block/blk-mq.c | 350 +++++++++++++++------- + block/blk-mq.h | 17 +- + block/blk-rq-qos.c | 2 - + block/blk-softirq.c | 156 ---------- + block/blk-sysfs.c | 79 +++-- + block/blk-throttle.c | 14 +- + block/blk-timeout.c | 6 +- + block/blk-zoned.c | 1 + + block/blk.h | 18 +- + block/bounce.c | 2 +- + block/bsg-lib.c | 5 +- + block/genhd.c | 73 ++++- + drivers/block/brd.c | 5 +- + drivers/block/drbd/drbd_int.h | 8 +- + drivers/block/drbd/drbd_main.c | 12 +- + 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 | 10 +- + 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/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 | 11 +- + drivers/md/bcache/request.h | 4 +- + drivers/md/bcache/super.c | 24 +- + drivers/md/dm-cache-target.c | 6 +- + drivers/md/dm-clone-target.c | 10 +- + drivers/md/dm-crypt.c | 6 +- + drivers/md/dm-delay.c | 2 +- + drivers/md/dm-era-target.c | 2 +- + drivers/md/dm-integrity.c | 4 +- + drivers/md/dm-mpath.c | 2 +- + 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-thin.c | 4 +- + drivers/md/dm-verity-target.c | 2 +- + drivers/md/dm-writecache.c | 2 +- + drivers/md/dm-zoned-target.c | 2 +- + drivers/md/dm.c | 42 ++- + drivers/md/md-bitmap.c | 2 +- + drivers/md/md-cluster.c | 1 + + drivers/md/md-faulty.c | 4 +- + drivers/md/md-linear.c | 4 +- + drivers/md/md-multipath.c | 4 +- + drivers/md/md.c | 117 ++++++-- + drivers/md/md.h | 9 +- + drivers/md/raid0.c | 8 +- + drivers/md/raid1.c | 14 +- + drivers/md/raid10.c | 30 +- + drivers/md/raid5-cache.c | 7 + + drivers/md/raid5.c | 16 +- + drivers/mmc/core/block.c | 8 +- + 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 | 302 ++++++++++++++++--- + 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 | 53 +--- + fs/buffer.c | 4 - + fs/direct-io.c | 4 +- + fs/efs/super.c | 1 + + fs/hfs/inode.c | 1 + + fs/internal.h | 17 +- + 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_pwork.c | 2 +- + fs/zonefs/super.c | 16 +- + fs/zonefs/zonefs.h | 3 + + include/linux/bio.h | 12 - + include/linux/blk-cgroup.h | 101 +------ + include/linux/blk-mq.h | 21 +- + include/linux/blk_types.h | 29 +- + include/linux/blkdev.h | 212 ++++++++----- + include/linux/buffer_head.h | 1 + + include/linux/dasd_mod.h | 2 + + include/linux/fs.h | 169 +---------- + include/linux/genhd.h | 39 ++- + include/linux/jbd2.h | 1 + + include/linux/lightnvm.h | 3 +- + include/linux/nvme.h | 134 ++++++++- + include/trace/events/block.h | 15 + + include/uapi/linux/blkzoned.h | 15 +- + kernel/cgroup/rstat.c | 1 - + kernel/trace/blktrace.c | 86 ++++-- + lib/sbitmap.c | 3 + + mm/page_io.c | 17 ++ + mm/swapfile.c | 2 +- + security/loadpin/loadpin.c | 1 + + 164 files changed, 2582 insertions(+), 1706 deletions(-) + delete mode 100644 block/blk-softirq.c + create mode 100644 drivers/nvme/host/zns.c +Merging iomap/iomap-for-next (66143873c6a0 iomap: fall back to buffered writes for invalidation failures) +$ git merge iomap/iomap-for-next +Auto-merging fs/zonefs/super.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/ext4/file.c | 2 ++ + fs/gfs2/file.c | 3 ++- + fs/iomap/apply.c | 13 +++++++++---- + fs/iomap/direct-io.c | 37 +++++++++++++++++++++---------------- + fs/iomap/trace.h | 1 + + fs/xfs/xfs_file.c | 8 ++++---- + fs/zonefs/super.c | 7 +++++-- + 7 files changed, 44 insertions(+), 27 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 (61c09fc5c03f Merge branches 'fixes' and 'hch.init_path' into for-next) +$ git merge vfs/for-next +Removing include/uapi/linux/elfcore.h +Removing include/linux/raid/md_u.h +Auto-merging include/linux/fs.h +Auto-merging fs/namespace.c +Auto-merging fs/internal.h +Auto-merging fs/btrfs/inode.c +Auto-merging drivers/soc/qcom/pdr_interface.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/md.c +Auto-merging arch/xtensa/kernel/ptrace.c +Auto-merging arch/x86/kernel/fpu/xstate.c +CONFLICT (content): Merge conflict in arch/x86/kernel/fpu/xstate.c +Auto-merging arch/sh/kernel/ptrace_32.c +Auto-merging arch/sh/kernel/process_32.c +Auto-merging arch/powerpc/kernel/ptrace/ptrace-view.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/ptrace/ptrace-view.c +Auto-merging arch/csky/kernel/ptrace.c +Auto-merging arch/arm64/kernel/ptrace.c +Resolved 'arch/powerpc/kernel/ptrace/ptrace-view.c' using previous resolution. +Resolved 'arch/x86/kernel/fpu/xstate.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f4ea38d1cb11] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arc/kernel/ptrace.c | 148 +++--- + arch/arm/kernel/atags_parse.c | 2 - + arch/arm/kernel/ptrace.c | 52 +- + arch/arm64/kernel/ptrace.c | 303 ++++------- + arch/c6x/kernel/ptrace.c | 11 +- + arch/csky/kernel/ptrace.c | 24 +- + arch/h8300/kernel/ptrace.c | 17 +- + arch/hexagon/kernel/ptrace.c | 62 +-- + arch/ia64/include/asm/elf.h | 2 - + arch/ia64/kernel/ptrace.c | 396 ++++++--------- + arch/mips/kernel/ptrace.c | 204 +++----- + arch/nds32/kernel/ptrace.c | 9 +- + arch/nios2/kernel/ptrace.c | 51 +- + arch/openrisc/kernel/ptrace.c | 26 +- + arch/parisc/kernel/ptrace.c | 84 +-- + arch/powerpc/include/asm/elf.h | 2 - + arch/powerpc/kernel/ptrace/ptrace-altivec.c | 37 +- + arch/powerpc/kernel/ptrace/ptrace-decl.h | 44 +- + arch/powerpc/kernel/ptrace/ptrace-novsx.c | 5 +- + arch/powerpc/kernel/ptrace/ptrace-spe.c | 16 +- + arch/powerpc/kernel/ptrace/ptrace-tm.c | 152 ++---- + arch/powerpc/kernel/ptrace/ptrace-view.c | 194 +++---- + arch/powerpc/kernel/ptrace/ptrace-vsx.c | 13 +- + arch/riscv/kernel/ptrace.c | 33 +- + arch/s390/kernel/ptrace.c | 199 +++----- + arch/s390/lib/test_unwind.c | 1 + + arch/sh/kernel/process_32.c | 5 +- + arch/sh/kernel/ptrace_32.c | 48 +- + arch/sh/kernel/setup.c | 2 - + arch/sparc/kernel/ptrace_32.c | 269 +++++----- + arch/sparc/kernel/ptrace_64.c | 591 +++++++++++----------- + arch/sparc/kernel/setup_32.c | 2 - + arch/sparc/kernel/setup_64.c | 2 - + arch/x86/include/asm/elf.h | 2 - + arch/x86/include/asm/fpu/internal.h | 1 - + arch/x86/include/asm/fpu/regset.h | 4 +- + arch/x86/include/asm/fpu/xstate.h | 4 +- + arch/x86/kernel/fpu/regset.c | 55 +- + arch/x86/kernel/fpu/signal.c | 13 +- + arch/x86/kernel/fpu/xstate.c | 164 +----- + arch/x86/kernel/ptrace.c | 75 +-- + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/tls.c | 32 +- + arch/x86/kernel/tls.h | 2 +- + arch/x86/math-emu/fpu_entry.c | 19 +- + arch/xtensa/kernel/ptrace.c | 16 +- + drivers/base/devtmpfs.c | 59 ++- + drivers/dma/sf-pdma/sf-pdma.c | 1 + + drivers/dma/st_fdma.c | 1 + + drivers/dma/uniphier-xdmac.c | 1 + + drivers/md/Makefile | 3 + + init/do_mounts_md.c => drivers/md/md-autodetect.c | 247 +++++---- + drivers/md/md.c | 38 +- + drivers/md/md.h | 12 + + 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/Makefile | 2 +- + fs/binfmt_elf.c | 84 +-- + fs/binfmt_elf_fdpic.c | 205 ++++---- + fs/btrfs/inode.c | 1 + + fs/file.c | 7 +- + fs/init.c | 265 ++++++++++ + fs/internal.h | 19 +- + fs/ioctl.c | 7 +- + fs/namei.c | 20 +- + fs/namespace.c | 107 ++-- + fs/ocfs2/dlmfs/dlmfs.c | 52 +- + fs/ocfs2/dlmfs/userdlm.c | 12 +- + fs/ocfs2/dlmfs/userdlm.h | 4 +- + fs/open.c | 78 +-- + fs/read_write.c | 2 +- + fs/readdir.c | 11 +- + fs/utimes.c | 109 ++-- + include/linux/elfcore-compat.h | 4 - + include/linux/elfcore.h | 66 ++- + include/linux/fs.h | 40 +- + include/linux/init_syscalls.h | 19 + + include/linux/initrd.h | 6 - + include/linux/raid/detect.h | 8 + + include/linux/raid/md_u.h | 13 - + include/linux/regset.h | 218 +++----- + include/linux/skbuff.h | 1 + + include/linux/socket.h | 1 + + include/linux/syscalls.h | 83 --- + include/linux/uio.h | 1 - + include/uapi/linux/elfcore.h | 101 ---- + init/Makefile | 1 - + init/do_mounts.c | 82 +-- + init/do_mounts.h | 28 +- + init/do_mounts_initrd.c | 39 +- + init/do_mounts_rd.c | 101 ++-- + init/initramfs.c | 148 ++---- + init/main.c | 27 +- + init/noinitramfs.c | 8 +- + kernel/Makefile | 2 +- + kernel/regset.c | 76 +++ + lib/iov_iter.c | 3 +- + scripts/headers_install.sh | 1 - + usr/include/Makefile | 1 - + 102 files changed, 2357 insertions(+), 3468 deletions(-) + rename init/do_mounts_md.c => drivers/md/md-autodetect.c (59%) + create mode 100644 fs/init.c + create mode 100644 include/linux/init_syscalls.h + delete mode 100644 include/linux/raid/md_u.h + delete mode 100644 include/uapi/linux/elfcore.h + create mode 100644 kernel/regset.c +Merging printk/for-next (a0ebfe187a25 Merge branch 'for-5.9' into for-next) +$ git merge printk/for-next +Auto-merging include/asm-generic/qspinlock.h +Auto-merging arch/powerpc/include/asm/atomic.h +Auto-merging arch/parisc/include/asm/atomic.h +Auto-merging arch/alpha/include/asm/atomic.h +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/alpha/include/asm/atomic.h | 1 - + arch/arc/include/asm/atomic.h | 2 - + arch/arm/include/asm/atomic.h | 2 - + arch/arm64/include/asm/atomic.h | 2 - + arch/h8300/include/asm/atomic.h | 2 - + arch/hexagon/include/asm/atomic.h | 2 - + arch/ia64/include/asm/atomic.h | 1 - + arch/m68k/include/asm/atomic.h | 2 - + arch/mips/fw/arc/arc_con.c | 4 +- + arch/mips/include/asm/atomic.h | 1 - + arch/parisc/include/asm/atomic.h | 2 - + arch/powerpc/include/asm/atomic.h | 2 - + arch/riscv/include/asm/atomic.h | 2 - + arch/s390/include/asm/atomic.h | 2 - + arch/s390/include/asm/bug.h | 2 +- + arch/sh/include/asm/atomic.h | 2 - + arch/sparc/include/asm/atomic_32.h | 2 - + arch/sparc/include/asm/atomic_64.h | 1 - + arch/x86/include/asm/atomic.h | 2 - + arch/xtensa/include/asm/atomic.h | 2 - + 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/asm-generic/atomic.h | 2 - + include/asm-generic/qspinlock.h | 1 + + include/asm-generic/qspinlock_types.h | 8 - + include/linux/crash_core.h | 3 + + include/linux/lockdep.h | 177 +-- + include/linux/lockdep_types.h | 194 ++++ + include/linux/printk.h | 1 + + include/linux/ratelimit.h | 36 +- + include/linux/ratelimit_types.h | 43 + + include/linux/spinlock.h | 1 + + include/linux/spinlock_types.h | 2 +- + include/linux/types.h | 2 + + kernel/printk/Makefile | 1 + + kernel/printk/printk.c | 966 +++++++++-------- + kernel/printk/printk_ringbuffer.c | 1685 +++++++++++++++++++++++++++++ + kernel/printk/printk_ringbuffer.h | 400 +++++++ + lib/vsprintf.c | 17 +- + 44 files changed, 2873 insertions(+), 730 deletions(-) + create mode 100644 include/linux/lockdep_types.h + create mode 100644 include/linux/ratelimit_types.h + create mode 100644 kernel/printk/printk_ringbuffer.c + create mode 100644 kernel/printk/printk_ringbuffer.h +Merging pci/next (d189141dc9d4 Merge branch 'pci/doc') +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/msi.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 +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/block/rsxx/core.c +Auto-merging arch/powerpc/kernel/eeh_driver.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/PCI/pci-error-recovery.rst | 8 +- + Documentation/PCI/pci.rst | 9 +- + .../bindings/pci/cdns,cdns-pcie-host.yaml | 8 +- + .../bindings/pci/nvidia,tegra20-pcie.txt | 12 - + Documentation/devicetree/bindings/pci/pci.txt | 4 +- + .../devicetree/bindings/pci/qcom,pcie.txt | 15 +- + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 94 ++++ + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 113 ++++ + .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 99 ++++ + MAINTAINERS | 4 +- + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/x86/pci/fixup.c | 4 +- + arch/x86/pci/xen.c | 2 +- + drivers/block/rsxx/core.c | 2 +- + drivers/dma/ioat/init.c | 6 +- + drivers/gpu/drm/qxl/qxl_dev.h | 2 - + drivers/iommu/intel/iommu.c | 8 +- + drivers/media/pci/ngene/ngene-cards.c | 2 +- + drivers/misc/genwqe/card_base.c | 2 +- + drivers/misc/pci_endpoint_test.c | 9 + + 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/rocker/rocker_hw.h | 1 - + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/pci/access.c | 16 +- + drivers/pci/ats.c | 18 +- + drivers/pci/bus.c | 6 +- + drivers/pci/controller/Kconfig | 8 + + drivers/pci/controller/Makefile | 1 + + drivers/pci/controller/cadence/Kconfig | 23 + + drivers/pci/controller/cadence/Makefile | 1 + + drivers/pci/controller/cadence/pci-j721e.c | 485 ++++++++++++++++ + drivers/pci/controller/cadence/pcie-cadence-ep.c | 137 ++++- + drivers/pci/controller/cadence/pcie-cadence-host.c | 387 ++++++++++--- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 16 +- + drivers/pci/controller/cadence/pcie-cadence.c | 17 +- + drivers/pci/controller/cadence/pcie-cadence.h | 169 +++++- + drivers/pci/controller/dwc/pci-dra7xx.c | 16 +- + drivers/pci/controller/dwc/pci-exynos.c | 6 +- + drivers/pci/controller/dwc/pci-imx6.c | 4 +- + drivers/pci/controller/dwc/pci-keystone.c | 9 +- + drivers/pci/controller/dwc/pcie-al.c | 13 +- + drivers/pci/controller/dwc/pcie-armada8k.c | 1 - + drivers/pci/controller/dwc/pcie-artpec6.c | 12 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 27 +- + drivers/pci/controller/dwc/pcie-designware-plat.c | 3 +- + drivers/pci/controller/dwc/pcie-designware.c | 2 +- + drivers/pci/controller/dwc/pcie-designware.h | 3 +- + drivers/pci/controller/dwc/pcie-hisi.c | 219 -------- + drivers/pci/controller/dwc/pcie-histb.c | 7 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 7 +- + drivers/pci/controller/dwc/pcie-kirin.c | 19 +- + drivers/pci/controller/dwc/pcie-qcom.c | 198 ++++--- + drivers/pci/controller/dwc/pcie-spear13xx.c | 1 - + drivers/pci/controller/dwc/pcie-uniphier.c | 3 +- + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 37 +- + drivers/pci/controller/mobiveil/pcie-mobiveil.h | 1 - + drivers/pci/controller/pci-aardvark.c | 38 +- + drivers/pci/controller/pci-ftpci100.c | 14 +- + drivers/pci/controller/pci-host-common.c | 57 +- + drivers/pci/controller/pci-hyperv.c | 86 +-- + drivers/pci/controller/pci-loongson.c | 14 +- + drivers/pci/controller/pci-mvebu.c | 33 +- + drivers/pci/controller/pci-rcar-gen2.c | 162 ++---- + drivers/pci/controller/pci-tegra.c | 71 +-- + drivers/pci/controller/pci-v3-semi.c | 25 +- + drivers/pci/controller/pci-versatile.c | 33 +- + drivers/pci/controller/pci-xgene.c | 25 +- + drivers/pci/controller/pcie-altera-msi.c | 3 +- + drivers/pci/controller/pcie-altera.c | 36 +- + drivers/pci/controller/pcie-brcmstb.c | 33 +- + drivers/pci/controller/pcie-iproc-platform.c | 10 +- + drivers/pci/controller/pcie-iproc.c | 21 +- + drivers/pci/controller/pcie-iproc.h | 2 - + drivers/pci/controller/pcie-mediatek.c | 20 +- + drivers/pci/controller/pcie-rcar-host.c | 95 +--- + drivers/pci/controller/pcie-rockchip-ep.c | 1 + + drivers/pci/controller/pcie-rockchip-host.c | 42 +- + drivers/pci/controller/pcie-rockchip.c | 5 +- + drivers/pci/controller/pcie-rockchip.h | 2 - + drivers/pci/controller/pcie-xilinx-cpm.c | 614 +++++++++++++++++++++ + drivers/pci/controller/pcie-xilinx-nwl.c | 34 +- + drivers/pci/controller/pcie-xilinx.c | 35 +- + drivers/pci/controller/vmd.c | 44 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 2 +- + drivers/pci/endpoint/pci-ep-cfs.c | 2 +- + drivers/pci/endpoint/pci-epc-core.c | 2 +- + drivers/pci/endpoint/pci-epc-mem.c | 2 +- + drivers/pci/endpoint/pci-epf-core.c | 4 +- + drivers/pci/hotplug/acpi_pcihp.c | 4 +- + drivers/pci/hotplug/pciehp_core.c | 1 + + drivers/pci/hotplug/rpadlpar_core.c | 6 +- + drivers/pci/irq.c | 50 -- + drivers/pci/msi.c | 22 +- + drivers/pci/of.c | 49 +- + drivers/pci/p2pdma.c | 23 +- + drivers/pci/pci-acpi.c | 9 +- + drivers/pci/pci-label.c | 2 +- + drivers/pci/pci-pf-stub.c | 2 +- + drivers/pci/pci.c | 286 +++++----- + drivers/pci/pci.h | 15 +- + drivers/pci/pcie/Kconfig | 2 +- + drivers/pci/pcie/aer.c | 87 +-- + drivers/pci/pcie/aer_inject.c | 2 +- + drivers/pci/pcie/aspm.c | 1 + + drivers/pci/pcie/err.c | 7 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/probe.c | 17 +- + drivers/pci/quirks.c | 33 +- + drivers/pci/setup-bus.c | 3 +- + drivers/pci/setup-res.c | 3 +- + drivers/pci/slot.c | 6 +- + drivers/pci/switch/switchtec.c | 16 +- + drivers/pci/vc.c | 1 - + 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/kernel.h | 1 + + include/linux/pci-ats.h | 4 + + include/linux/pci.h | 30 +- + include/linux/pci_ids.h | 2 + + samples/vfio-mdev/mdpy-defs.h | 2 +- + 126 files changed, 2890 insertions(+), 1669 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/ti,j721e-pci-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/ti,j721e-pci-host.yaml + create mode 100644 Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml + create mode 100644 drivers/pci/controller/cadence/pci-j721e.c + create mode 100644 drivers/pci/controller/pcie-xilinx-cpm.c +$ git reset --hard HEAD^ +HEAD is now at 3ee12055dc06 Merge remote-tracking branch 'printk/for-next' +Merging next-20200731 version of pci +$ git merge -m next-20200731/pci 0c5192ef0f034a82bef7a15391e822a1f9a15054 +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/msi.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 +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/block/rsxx/core.c +Auto-merging arch/powerpc/kernel/eeh_driver.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/PCI/pci-error-recovery.rst | 8 +- + Documentation/PCI/pci.rst | 9 +- + .../bindings/pci/cdns,cdns-pcie-host.yaml | 8 +- + Documentation/devicetree/bindings/pci/pci.txt | 4 +- + .../devicetree/bindings/pci/qcom,pcie.txt | 15 +- + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 94 ++++ + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 113 ++++ + .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 99 ++++ + MAINTAINERS | 4 +- + 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/gpu/drm/qxl/qxl_dev.h | 2 - + drivers/iommu/intel/iommu.c | 6 +- + drivers/media/pci/ngene/ngene-cards.c | 2 +- + drivers/misc/genwqe/card_base.c | 2 +- + drivers/misc/pci_endpoint_test.c | 9 + + 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/rocker/rocker_hw.h | 1 - + 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/Kconfig | 8 + + drivers/pci/controller/Makefile | 1 + + drivers/pci/controller/cadence/Kconfig | 23 + + drivers/pci/controller/cadence/Makefile | 1 + + drivers/pci/controller/cadence/pci-j721e.c | 493 +++++++++++++++++ + drivers/pci/controller/cadence/pcie-cadence-ep.c | 129 ++++- + drivers/pci/controller/cadence/pcie-cadence-host.c | 310 +++++++++-- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 16 +- + drivers/pci/controller/cadence/pcie-cadence.c | 8 +- + drivers/pci/controller/cadence/pcie-cadence.h | 161 +++++- + drivers/pci/controller/dwc/pci-dra7xx.c | 16 +- + drivers/pci/controller/dwc/pci-exynos.c | 2 +- + drivers/pci/controller/dwc/pci-imx6.c | 2 +- + drivers/pci/controller/dwc/pci-keystone.c | 5 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 12 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-plat.c | 3 +- + drivers/pci/controller/dwc/pcie-designware.c | 2 +- + drivers/pci/controller/dwc/pcie-designware.h | 2 +- + drivers/pci/controller/dwc/pcie-histb.c | 7 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 7 +- + drivers/pci/controller/dwc/pcie-kirin.c | 19 +- + drivers/pci/controller/dwc/pcie-qcom.c | 198 ++++--- + drivers/pci/controller/dwc/pcie-uniphier.c | 3 +- + drivers/pci/controller/pci-aardvark.c | 11 +- + drivers/pci/controller/pci-loongson.c | 6 +- + drivers/pci/controller/pci-mvebu.c | 16 +- + drivers/pci/controller/pci-tegra.c | 32 -- + drivers/pci/controller/pcie-rcar-host.c | 4 +- + drivers/pci/controller/pcie-xilinx-cpm.c | 613 +++++++++++++++++++++ + drivers/pci/controller/vmd.c | 44 +- + drivers/pci/msi.c | 22 +- + drivers/pci/of.c | 2 +- + drivers/pci/p2pdma.c | 2 +- + drivers/pci/pci-acpi.c | 9 +- + drivers/pci/pci-label.c | 2 +- + drivers/pci/pci.c | 286 +++++----- + drivers/pci/pci.h | 7 +- + drivers/pci/pcie/Kconfig | 2 +- + drivers/pci/pcie/aer.c | 87 +-- + drivers/pci/pcie/aer_inject.c | 2 +- + drivers/pci/pcie/aspm.c | 1 + + drivers/pci/pcie/err.c | 7 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/probe.c | 4 +- + drivers/pci/quirks.c | 26 +- + drivers/pci/setup-bus.c | 2 +- + drivers/pci/setup-res.c | 3 +- + drivers/pci/slot.c | 6 +- + 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/kernel.h | 1 + + include/linux/pci.h | 11 +- + include/linux/pci_ids.h | 2 + + samples/vfio-mdev/mdpy-defs.h | 2 +- + 83 files changed, 2560 insertions(+), 520 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/ti,j721e-pci-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/ti,j721e-pci-host.yaml + create mode 100644 Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml + create mode 100644 drivers/pci/controller/cadence/pci-j721e.c + create mode 100644 drivers/pci/controller/pcie-xilinx-cpm.c +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 (bc12a7f8e273 Merge branch 'for-5.8/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/Kconfig +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 2 +- + drivers/hid/hid-cp2112.c | 2 +- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-input.c | 36 ++-- + drivers/hid/hid-lenovo.c | 360 +++++++++++++++++++++++++------- + drivers/hid/hid-mcp2221.c | 2 +- + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-udraw-ps3.c | 2 +- + 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 + + 15 files changed, 416 insertions(+), 150 deletions(-) +Merging i2c/i2c/for-next (1caa617497fe Merge branch 'i2c/for-5.9' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 3 + + .../devicetree/bindings/i2c/renesas,i2c.txt | 1 + + .../devicetree/bindings/i2c/renesas,iic.txt | 1 + + 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-amd8111.c | 2 +- + drivers/i2c/busses/i2c-aspeed.c | 4 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 2 +- + drivers/i2c/busses/i2c-digicolor.c | 2 +- + drivers/i2c/busses/i2c-emev2.c | 3 +- + drivers/i2c/busses/i2c-fsi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 11 ++- + drivers/i2c/busses/i2c-mv64xxx.c | 9 +- + 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-rcar.c | 15 +-- + 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-synquacer.c | 3 +- + drivers/i2c/busses/i2c-tegra.c | 101 ++++++++++++--------- + drivers/i2c/busses/i2c-viapro.c | 8 +- + drivers/i2c/busses/scx200_acb.c | 2 +- + drivers/i2c/i2c-core-base.c | 8 +- + drivers/i2c/i2c-dev.c | 4 +- + drivers/i2c/i2c-slave-eeprom.c | 2 +- + include/linux/i2c.h | 3 - + 30 files changed, 157 insertions(+), 106 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 (2fdf8f7f0867 hwmon: (sparx5) Make symbol 's5_temp_match' static) +$ git merge hwmon-staging/hwmon-next +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 | 41 ++ + 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 + + drivers/hwmon/Kconfig | 20 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm1025.c | 2 +- + drivers/hwmon/adm1026.c | 2 +- + drivers/hwmon/corsair-cpro.c | 582 +++++++++++++++++++++ + 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 | 49 +- + 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 +- + 73 files changed, 1233 insertions(+), 193 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 (2c12c8103d8f scripts/kernel-doc: optionally treat warnings as errors) +$ 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 fs/cifs/cifsglob.h +Auto-merging drivers/md/dm-crypt.c +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/translations/ko_KR/memory-barriers.txt +Auto-merging Documentation/trace/ftrace.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/printk-formats.rst +Auto-merging Documentation/core-api/dma-api.rst +Auto-merging Documentation/core-api/cpu_hotplug.rst +Auto-merging Documentation/block/biodoc.rst +Auto-merging Documentation/arm64/sve.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +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/filesystems/f2fs.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c2aeb0c24c7f] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 9 + + CREDITS | 72 +- + 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 | 9 +- + Documentation/admin-guide/ext4.rst | 4 +- + .../special-register-buffer-data-sampling.rst | 6 +- + Documentation/admin-guide/index.rst | 1 + + 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/concepts.rst | 2 +- + 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 | 4 +- + Documentation/admin-guide/xfs.rst | 2 +- + Documentation/arm/booting.rst | 2 +- + Documentation/arm64/acpi_object_usage.rst | 2 +- + Documentation/arm64/arm-acpi.rst | 4 +- + 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 +- + Documentation/bpf/bpf_devel_QA.rst | 1 + + Documentation/bpf/index.rst | 8 + + .../bus-virt-phys-mapping.rst} | 2 +- + Documentation/core-api/cpu_hotplug.rst | 4 +- + 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/memory-allocation.rst | 44 ++ + Documentation/core-api/printk-basics.rst | 2 +- + Documentation/core-api/printk-formats.rst | 4 +- + .../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/connector.rst | 5 +- + 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/fb/modedb.rst | 2 +- + 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 | 32 +- + Documentation/filesystems/proc.rst | 155 ++-- + .../filesystems/ramfs-rootfs-initramfs.rst | 8 +- + Documentation/filesystems/sysfs-pci.rst | 2 +- + Documentation/filesystems/sysfs-tagging.rst | 2 +- + Documentation/filesystems/ubifs-authentication.rst | 4 +- + Documentation/filesystems/vfs.rst | 16 +- + 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/ia64/efirtc.rst | 2 +- + Documentation/index.rst | 14 + + 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/index.rst | 4 +- + Documentation/process/kernel-docs.rst | 28 +- + Documentation/process/maintainer-pgp-guide.rst | 2 +- + Documentation/process/submitting-drivers.rst | 22 +- + Documentation/process/submitting-patches.rst | 9 +- + 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 | 58 ++ + 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} | 73 ++ + Documentation/{xz.txt => staging/xz.rst} | 0 + Documentation/timers/no_hz.rst | 2 - + Documentation/trace/ftrace.rst | 18 +- + Documentation/trace/histogram-design.rst | 4 +- + Documentation/trace/index.rst | 3 + + Documentation/{kprobes.txt => trace/kprobes.rst} | 16 +- + 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/it_IT/process/coding-style.rst | 2 +- + .../translations/ko_KR/memory-barriers.txt | 6 +- + .../zh_CN/admin-guide/clearing-warn-once.rst | 9 + + .../translations/zh_CN/admin-guide/cpu-load.rst | 105 +++ + .../translations/zh_CN/admin-guide/index.rst | 125 +++ + Documentation/translations/zh_CN/arm/Booting | 2 +- + .../translations/zh_CN/filesystems/sysfs.txt | 6 +- + Documentation/translations/zh_CN/index.rst | 4 + + .../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 | 22 +- + 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 | 30 +- + scripts/sphinx-pre-install | 4 - + tools/testing/selftests/vm/protection_keys.c | 2 +- + 274 files changed, 3363 insertions(+), 1923 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/{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/{kprobes.txt => trace/kprobes.rst} (99%) + 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 + create mode 100644 Documentation/translations/zh_CN/admin-guide/clearing-warn-once.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/cpu-load.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/index.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/sama5_defconfig +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 -- + 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 +- + 255 files changed, 12738 insertions(+), 12046 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 +Already up to date. +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 (86ed8b05f597 Merge branch 'pm-cpuidle' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/device.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging drivers/pci/pci-acpi.c +Auto-merging drivers/memory/samsung/exynos5422-dmc.c +Auto-merging drivers/cpufreq/scmi-cpufreq.c +Removing drivers/acpi/cm_sbs.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/admin-guide/pm/intel_pstate.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 02327bdb0acb] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-devfreq | 12 + + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/admin-guide/pm/cpufreq.rst | 6 +- + Documentation/admin-guide/pm/intel_pstate.rst | 86 +++-- + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 2 + + .../firmware-guide/acpi/DSD-properties-rules.rst | 4 +- + .../acpi/dsd/data-node-references.rst | 4 +- + Documentation/firmware-guide/acpi/dsd/graph.rst | 10 +- + Documentation/firmware-guide/acpi/dsd/leds.rst | 6 +- + Documentation/firmware-guide/acpi/lpit.rst | 2 +- + Documentation/hwmon/acpi_power_meter.rst | 2 +- + Documentation/power/energy-model.rst | 135 ++++---- + Documentation/power/powercap/powercap.rst | 15 +- + MAINTAINERS | 9 + + arch/powerpc/platforms/cell/cpufreq_spudemand.c | 26 +- + arch/x86/include/asm/msr-index.h | 6 +- + drivers/acpi/Kconfig | 22 +- + 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/exprep.c | 4 - + drivers/acpi/acpica/exregion.c | 64 +++- + drivers/acpi/acpica/utdelete.c | 6 +- + drivers/acpi/acpica/utids.c | 3 +- + drivers/acpi/apei/hest.c | 2 +- + 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/nfit/nfit.h | 2 +- + drivers/acpi/numa/srat.c | 10 +- + drivers/acpi/osl.c | 63 ++-- + drivers/acpi/processor_idle.c | 13 +- + drivers/acpi/property.c | 14 +- + drivers/acpi/resource.c | 2 +- + drivers/acpi/spcr.c | 4 +- + drivers/acpi/sysfs.c | 12 +- + drivers/acpi/tables.c | 25 +- + 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 | 381 ++++++++++++++++----- + 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/cpuidle/Kconfig.arm | 10 + + drivers/cpuidle/Makefile | 5 +- + drivers/cpuidle/cpuidle-psci-domain.c | 74 ++-- + drivers/cpuidle/cpuidle-psci.c | 141 ++++---- + drivers/cpuidle/cpuidle-psci.h | 11 +- + drivers/cpuidle/cpuidle-tegra.c | 8 +- + drivers/devfreq/devfreq-event.c | 4 +- + drivers/devfreq/devfreq.c | 195 ++++++++--- + drivers/devfreq/rk3399_dmc.c | 42 ++- + drivers/idle/intel_idle.c | 53 ++- + drivers/memory/samsung/exynos5422-dmc.c | 14 +- + drivers/mmc/host/jz4740_mmc.c | 12 +- + drivers/opp/core.c | 3 +- + drivers/opp/of.c | 76 ++-- + drivers/opp/ti-opp-supply.c | 2 +- + 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 | 77 ++++- + drivers/powercap/intel_rapl_msr.c | 15 + + drivers/thermal/cpufreq_cooling.c | 12 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actypes.h | 14 +- + include/linux/cpufreq.h | 14 + + include/linux/cpuidle.h | 9 +- + include/linux/devfreq.h | 9 + + include/linux/device.h | 5 + + include/linux/energy_model.h | 149 ++++---- + include/linux/intel_rapl.h | 5 +- + include/linux/pm.h | 10 +- + include/linux/pm_domain.h | 12 +- + include/linux/pm_opp.h | 15 +- + include/linux/tboot.h | 2 +- + 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 +- + tools/power/cpupower/lib/cpufreq.c | 10 +- + tools/power/cpupower/man/cpupower-idle-info.1 | 2 +- + tools/power/cpupower/man/cpupower-monitor.1 | 4 +- + tools/power/cpupower/utils/helpers/bitmask.c | 6 +- + tools/power/pm-graph/README | 2 +- + tools/power/pm-graph/sleepgraph.py | 249 ++++++++------ + 116 files changed, 1937 insertions(+), 1655 deletions(-) + delete mode 100644 drivers/acpi/cm_sbs.c +Merging cpufreq-arm/cpufreq/arm/linux-next (f259eab3ea0e cpufreq: make schedutil the default for arm and arm64) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging include/linux/pm_opp.h +Auto-merging include/linux/cpufreq.h +Auto-merging drivers/opp/core.c +Auto-merging drivers/cpufreq/qcom-cpufreq-hw.c +Auto-merging drivers/cpufreq/cpufreq.c +Merge made by the 'recursive' strategy. + .../bindings/arm/nvidia,tegra194-ccplex.yaml | 69 ++++ + drivers/cpufreq/Kconfig | 2 +- + 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/cpufreq.c | 2 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 91 ++++- + 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/cpufreq.h | 2 +- + include/linux/pm_opp.h | 6 + + 16 files changed, 702 insertions(+), 102 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 +Already up to date. +Merging devfreq/devfreq-next (27a69714450f PM / devfreq: Fix the wrong end with semicolon) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (06a8a059e88b opp: Allow disabled OPPs in dev_pm_opp_get_freq()) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (89945047b166 thermal: mediatek: Add tsensor support for V2 thermal system) +$ 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/qcom/tsens.c +Auto-merging drivers/thermal/mtk_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 +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/thermal/thermal.txt +Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +Auto-merging Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scmi.txt | 2 +- + Documentation/devicetree/bindings/arm/arm,scpi.txt | 2 +- + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 2 +- + .../arm/marvell/ap80x-system-controller.txt | 2 +- + .../arm/marvell/cp110-system-controller.txt | 2 +- + .../devicetree/bindings/cpufreq/cpufreq-dt.txt | 3 +- + .../bindings/cpufreq/cpufreq-mediatek.txt | 4 +- + .../bindings/cpufreq/nvidia,tegra20-cpufreq.txt | 2 +- + .../devicetree/bindings/hwmon/gpio-fan.txt | 3 +- + Documentation/devicetree/bindings/hwmon/lm90.txt | 4 +- + .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 2 +- + .../bindings/thermal/amazon,al-thermal.txt | 2 +- + .../bindings/thermal/brcm,avs-ro-thermal.yaml | 2 +- + .../bindings/thermal/brcm,bcm2835-thermal.txt | 2 +- + .../bindings/thermal/hisilicon-thermal.txt | 2 +- + .../bindings/thermal/max77620_thermal.txt | 6 +- + .../bindings/thermal/mediatek-thermal.txt | 2 +- + .../bindings/thermal/nvidia,tegra124-soctherm.txt | 10 +- + .../thermal/nvidia,tegra186-bpmp-thermal.txt | 2 +- + .../bindings/thermal/qcom-spmi-temp-alarm.txt | 2 +- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../bindings/thermal/rockchip-thermal.txt | 2 +- + .../devicetree/bindings/thermal/tango-thermal.txt | 2 +- + .../bindings/thermal/thermal-generic-adc.txt | 2 +- + .../devicetree/bindings/thermal/thermal.txt | 586 ------------------- + MAINTAINERS | 8 + + 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/devfreq_cooling.c | 10 +- + drivers/thermal/dove_thermal.c | 6 + + drivers/thermal/gov_power_allocator.c | 9 +- + drivers/thermal/hisi_thermal.c | 6 +- + drivers/thermal/imx8mm_thermal.c | 1 + + drivers/thermal/imx_thermal.c | 60 +- + .../intel/int340x_thermal/int3400_thermal.c | 38 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 5 + + .../int340x_thermal/processor_thermal_device.c | 2 +- + 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/mtk_thermal.c | 234 ++++++-- + drivers/thermal/qcom/tsens-v0_1.c | 144 ++++- + drivers/thermal/qcom/tsens.c | 3 + + drivers/thermal/qcom/tsens.h | 2 +- + drivers/thermal/rcar_gen3_thermal.c | 10 +- + 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 | 174 +++++- + 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 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- + include/linux/clock_cooling.h | 57 -- + include/linux/devfreq_cooling.h | 9 +- + include/linux/thermal.h | 31 +- + include/uapi/linux/thermal.h | 89 ++- + net/netlink/genetlink.c | 2 +- + 75 files changed, 1629 insertions(+), 1609 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/thermal/thermal.txt + 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 (fa601a9ebd49 fs: dlm: implement tcp graceful shutdown) +$ 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 | 131 ++++++++++++++++++++++++++++++++++++++++---------- + fs/dlm/plock.c | 20 ++++++++ + fs/dlm/recoverd.c | 1 + + include/net/sock.h | 1 + + net/core/sock.c | 8 +++ + 9 files changed, 194 insertions(+), 28 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 (76251e15ea73 RDMA/rxe: Remove pkey table) +$ git merge rdma/for-next +Auto-merging include/rdma/rdmavt_qp.h +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 +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +Auto-merging drivers/infiniband/sw/siw/siw_main.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/odp.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/hw/hfi1/tid_rdma.c +Auto-merging drivers/infiniband/hw/hfi1/qp.c +Auto-merging drivers/infiniband/hw/efa/efa_verbs.c +Auto-merging drivers/infiniband/core/mad.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/counters.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/infiniband/Kconfig | 8 - + drivers/infiniband/core/cache.c | 45 +- + drivers/infiniband/core/cma.c | 257 +- + drivers/infiniband/core/counters.c | 24 +- + drivers/infiniband/core/device.c | 28 +- + 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 | 223 +- + drivers/infiniband/core/sysfs.c | 61 +- + drivers/infiniband/core/trace.c | 2 - + drivers/infiniband/core/umem.c | 1 + + drivers/infiniband/core/umem_odp.c | 2 + + drivers/infiniband/core/uverbs_cmd.c | 321 +- + drivers/infiniband/core/uverbs_ioctl.c | 1 + + drivers/infiniband/core/uverbs_main.c | 4 + + .../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 | 48 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 54 +- + drivers/infiniband/core/verbs.c | 185 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 170 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 10 +- + drivers/infiniband/hw/bnxt_re/main.c | 23 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 751 ++-- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 127 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 58 +- + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 1 + + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 9 +- + drivers/infiniband/hw/cxgb4/mem.c | 3 +- + drivers/infiniband/hw/cxgb4/provider.c | 22 +- + drivers/infiniband/hw/cxgb4/restrack.c | 24 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 15 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 2 + + drivers/infiniband/hw/efa/efa_com_cmd.h | 2 + + drivers/infiniband/hw/efa/efa_main.c | 6 +- + drivers/infiniband/hw/efa/efa_verbs.c | 42 + + drivers/infiniband/hw/hfi1/chip.c | 27 +- + drivers/infiniband/hw/hfi1/firmware.c | 16 - + drivers/infiniband/hw/hfi1/mad.c | 9 +- + drivers/infiniband/hw/hfi1/pcie.c | 22 +- + drivers/infiniband/hw/hfi1/pio.c | 2 +- + drivers/infiniband/hw/hfi1/pio_copy.c | 12 +- + drivers/infiniband/hw/hfi1/platform.c | 10 +- + drivers/infiniband/hw/hfi1/qp.c | 2 +- + drivers/infiniband/hw/hfi1/qp.h | 14 - + drivers/infiniband/hw/hfi1/qsfp.c | 4 +- + drivers/infiniband/hw/hfi1/rc.c | 25 +- + drivers/infiniband/hw/hfi1/sdma.c | 9 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 4 +- + drivers/infiniband/hw/hfi1/uc.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 31 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 7 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 253 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 19 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 210 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 10 - + drivers/infiniband/hw/hns/hns_roce_restrack.c | 14 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 22 +- + 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 | 4380 +++++--------------- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 109 +- + drivers/infiniband/hw/mlx5/mr.c | 2 +- + drivers/infiniband/hw/mlx5/odp.c | 28 +- + drivers/infiniband/hw/mlx5/qp.c | 71 +- + 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/mlx5/wr.c | 68 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 2 +- + drivers/infiniband/hw/qedr/main.c | 3 +- + drivers/infiniband/hw/qedr/qedr.h | 5 +- + drivers/infiniband/hw/qedr/verbs.c | 45 +- + 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 | 41 +- + 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_param.h | 4 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 35 +- + drivers/infiniband/sw/rxe/rxe_req.c | 5 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 48 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - + drivers/infiniband/sw/siw/siw_main.c | 1 - + drivers/infiniband/sw/siw/siw_verbs.c | 11 +- + drivers/infiniband/sw/siw/siw_verbs.h | 3 +- + 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 | 25 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 112 +- + drivers/infiniband/ulp/isert/ib_isert.c | 175 +- + drivers/infiniband/ulp/isert/ib_isert.h | 21 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 23 + + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 16 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 20 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 11 +- + .../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 | 2 +- + 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 | 18 +- + include/linux/mlx5/driver.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 134 +- + include/linux/mlx5/qp.h | 2 +- + include/linux/mlx5/rsc_dump.h | 51 + + include/rdma/ib.h | 31 +- + include/rdma/ib_addr.h | 31 +- + include/rdma/ib_cache.h | 29 +- + include/rdma/ib_cm.h | 1 + + include/rdma/ib_hdrs.h | 44 +- + include/rdma/ib_mad.h | 31 +- + include/rdma/ib_marshall.h | 31 +- + include/rdma/ib_pack.h | 29 +- + include/rdma/ib_pma.h | 31 +- + include/rdma/ib_sa.h | 29 +- + include/rdma/ib_smi.h | 31 +- + include/rdma/ib_umem.h | 29 +- + include/rdma/ib_umem_odp.h | 29 +- + include/rdma/ib_verbs.h | 100 +- + include/rdma/iw_cm.h | 30 +- + include/rdma/iw_portmap.h | 30 +- + include/rdma/opa_addr.h | 44 +- + include/rdma/opa_port_info.h | 31 +- + include/rdma/opa_smi.h | 31 +- + include/rdma/opa_vnic.h | 49 +- + include/rdma/rdma_cm.h | 31 +- + include/rdma/rdma_cm_ib.h | 31 +- + include/rdma/rdma_netlink.h | 2 +- + include/rdma/rdma_vt.h | 50 +- + include/rdma/rdmavt_cq.h | 53 +- + include/rdma/rdmavt_mr.h | 50 +- + include/rdma/rdmavt_qp.h | 50 +- + include/rdma/uverbs_ioctl.h | 30 +- + include/rdma/uverbs_named_ioctl.h | 29 +- + include/rdma/uverbs_std_types.h | 43 +- + include/rdma/uverbs_types.h | 29 +- + include/uapi/rdma/efa-abi.h | 15 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 15 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 16 +- + include/uapi/rdma/qedr-abi.h | 10 +- + include/uapi/rdma/rdma_netlink.h | 9 + + include/uapi/rdma/rdma_user_ioctl.h | 2 +- + 177 files changed, 7034 insertions(+), 7626 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 (bd0b33b24897 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge net-next/master +Removing tools/build/feature/test-clang-bpf-global-var.c +Removing tools/bpf/bpftool/skeleton/profiler.h +Auto-merging tools/bpf/Makefile +Auto-merging scripts/link-vmlinux.sh +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/core/sock.c +Auto-merging net/core/dev.c +Auto-merging lib/Makefile +Auto-merging kernel/trace/Makefile +Auto-merging kernel/Makefile +Auto-merging include/net/sock.h +Auto-merging include/net/netfilter/nf_tables.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/phylink.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +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 +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/mellanox/mlx5/core/ipoib/ipoib.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.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/infiniband/hw/qedr/verbs.c +Auto-merging drivers/infiniband/hw/qedr/main.c +Auto-merging arch/s390/net/bpf_jit_comp.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/index.rst +Auto-merging Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt +Resolved 'drivers/net/ethernet/sfc/efx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b23546ef37aa] 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 + + Documentation/devicetree/bindings/net/dsa/dsa.txt | 255 +- + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 92 + + .../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/realtek-bluetooth.yaml | 2 +- + .../devicetree/bindings/net/ti,dp83867.yaml | 2 +- + .../devicetree/bindings/net/ti,dp83869.yaml | 18 +- + .../bindings/net/wireless}/microchip,wilc1000.yaml | 0 + Documentation/driver-api/driver-model/devres.rst | 3 +- + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/pldmfw/driver-ops.rst | 56 + + Documentation/driver-api/pldmfw/file-format.rst | 203 + + Documentation/driver-api/pldmfw/index.rst | 72 + + Documentation/filesystems/debugfs.rst | 12 +- + Documentation/networking/batman-adv.rst | 8 +- + Documentation/networking/dccp.rst | 3 + + .../{ => 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 | 4 +- + .../device_drivers/{ => ethernet}/intel/e1000.rst | 0 + .../device_drivers/{ => ethernet}/intel/e1000e.rst | 0 + .../device_drivers/{ => ethernet}/intel/fm10k.rst | 2 +- + .../device_drivers/{ => ethernet}/intel/i40e.rst | 0 + .../device_drivers/{ => ethernet}/intel/iavf.rst | 2 +- + .../device_drivers/{ => ethernet}/intel/ice.rst | 0 + .../device_drivers/{ => ethernet}/intel/igb.rst | 2 +- + .../device_drivers/{ => ethernet}/intel/igbvf.rst | 2 +- + .../device_drivers/{ => ethernet}/intel/ixgb.rst | 2 +- + .../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 | 80 +- + Makefile | 25 +- + arch/arm64/include/asm/unistd32.h | 4 +- + arch/c6x/lib/checksum.c | 2 +- + arch/c6x/lib/csum_64plus.S | 8 +- + arch/mips/boot/dts/mscc/ocelot_pcb120.dts | 12 +- + arch/mips/kernel/syscalls/syscall_n32.tbl | 4 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 4 +- + arch/nios2/include/asm/checksum.h | 5 +- + arch/parisc/kernel/syscalls/syscall.tbl | 4 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 4 +- + arch/riscv/net/bpf_jit.h | 483 +- + arch/riscv/net/bpf_jit_comp32.c | 14 +- + arch/riscv/net/bpf_jit_comp64.c | 293 +- + arch/riscv/net/bpf_jit_core.c | 6 +- + arch/s390/kernel/syscalls/syscall.tbl | 4 +- + arch/s390/net/bpf_jit_comp.c | 63 +- + arch/sparc/kernel/sys32.S | 12 +- + arch/sparc/kernel/syscalls/syscall.tbl | 4 +- + arch/x86/entry/syscall_x32.c | 7 + + arch/x86/entry/syscalls/syscall_32.tbl | 4 +- + arch/x86/entry/syscalls/syscall_64.tbl | 4 +- + crypto/af_alg.c | 8 +- + crypto/algif_aead.c | 4 - + crypto/algif_hash.c | 4 - + crypto/algif_rng.c | 2 - + crypto/algif_skcipher.c | 4 - + drivers/atm/Kconfig | 8 +- + drivers/atm/eni.c | 17 - + drivers/atm/firestream.c | 2 - + drivers/atm/fore200e.c | 27 - + drivers/atm/horizon.c | 40 - + drivers/atm/iphase.c | 16 - + drivers/atm/lanai.c | 2 - + drivers/atm/solos-pci.c | 4 +- + drivers/atm/zatm.c | 16 - + 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 | 303 +- + drivers/bluetooth/hci_h5.c | 2 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_qca.c | 134 +- + drivers/bluetooth/hci_serdev.c | 3 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 3 +- + drivers/crypto/chelsio/chtls/chtls_main.c | 18 +- + drivers/infiniband/hw/bnxt_re/hw_counters.c | 2 +- + drivers/infiniband/hw/i40iw/Makefile | 1 - + drivers/infiniband/hw/i40iw/i40iw.h | 2 +- + drivers/infiniband/hw/qedr/main.c | 20 +- + drivers/infiniband/hw/qedr/verbs.c | 97 +- + drivers/isdn/capi/Kconfig | 2 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 12 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 3 +- + drivers/isdn/hardware/mISDN/netjet.c | 8 +- + drivers/isdn/mISDN/socket.c | 10 +- + drivers/net/Kconfig | 3 +- + drivers/net/appletalk/Kconfig | 3 +- + drivers/net/bareudp.c | 2 +- + 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 | 41 +- + drivers/net/dsa/mv88e6xxx/chip.h | 7 +- + drivers/net/dsa/mv88e6xxx/global1.c | 17 + + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + 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 | 372 +- + drivers/net/dsa/qca8k.h | 16 + + drivers/net/dsa/rtl8366.c | 37 +- + 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_admin_defs.h | 47 +- + drivers/net/ethernet/amazon/ena/ena_com.c | 19 +- + drivers/net/ethernet/amazon/ena/ena_com.h | 13 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.c | 51 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 3 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 205 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 3 + + drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h | 5 + + 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_drvinfo.c | 62 +- + .../net/ethernet/aquantia/atlantic/aq_drvinfo.h | 10 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 98 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 17 +- + .../net/ethernet/aquantia/atlantic/aq_hw_utils.c | 34 +- + .../net/ethernet/aquantia/atlantic/aq_hw_utils.h | 8 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 22 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 117 +- + 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 | 77 +- + drivers/net/ethernet/aquantia/atlantic/aq_ptp.h | 27 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 85 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 22 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 74 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.h | 11 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 136 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 70 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 3 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 61 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 28 +- + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 41 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 62 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 2 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 4 +- + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 10 +- + .../aquantia/atlantic/hw_atl2/hw_atl2_utils.c | 3 +- + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 227 +- + 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 | 880 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 126 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 15 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 190 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 468 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 18 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 + + drivers/net/ethernet/broadcom/tg3.h | 2 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 3 +- + drivers/net/ethernet/brocade/bna/bfi.h | 2 +- + drivers/net/ethernet/cadence/macb.h | 3 + + drivers/net/ethernet/cadence/macb_main.c | 210 +- + 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_device.c | 11 +- + .../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 | 118 +- + 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 | 625 +- + 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 | 109 +- + drivers/net/ethernet/chelsio/cxgb4/smt.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 +- + drivers/net/ethernet/fealnx.c | 91 +- + .../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 | 250 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 15 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 3 +- + drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 13 + + drivers/net/ethernet/freescale/dpaa2/dpni.c | 44 +- + drivers/net/ethernet/freescale/dpaa2/dpni.h | 16 + + drivers/net/ethernet/freescale/enetc/Kconfig | 2 + + drivers/net/ethernet/freescale/enetc/enetc.c | 162 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 36 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 84 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 50 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 196 +- + 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 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 6 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 33 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2 +- + 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 | 23 + + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 608 ++ + drivers/net/ethernet/huawei/hinic/hinic_devlink.h | 119 + + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 602 +- + .../net/ethernet/huawei/hinic/hinic_hw_api_cmd.c | 27 +- + .../net/ethernet/huawei/hinic/hinic_hw_api_cmd.h | 4 + + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 254 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 213 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c | 39 + + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h | 6 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 23 + + drivers/net/ethernet/huawei/hinic/hinic_hw_if.h | 10 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_io.h | 10 + + drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 11 + + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 15 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 205 +- + drivers/net/ethernet/huawei/hinic/hinic_port.c | 256 +- + drivers/net/ethernet/huawei/hinic/hinic_port.h | 144 + + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 58 +- + drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 12 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 80 + + drivers/net/ethernet/huawei/hinic/hinic_tx.h | 2 + + drivers/net/ethernet/intel/Kconfig | 25 +- + drivers/net/ethernet/intel/e100.c | 38 +- + drivers/net/ethernet/intel/e1000/e1000.h | 1 - + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 6 +- + 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 | 17 +- + 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 | 68 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_type.h | 8 - + drivers/net/ethernet/intel/ice/Makefile | 1 + + drivers/net/ethernet/intel/ice/ice.h | 22 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 212 +- + drivers/net/ethernet/intel/ice/ice_base.c | 2 +- + drivers/net/ethernet/intel/ice/ice_common.c | 1419 +++- + drivers/net/ethernet/intel/ice/ice_common.h | 36 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 6 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 37 +- + drivers/net/ethernet/intel/ice/ice_dcb.h | 4 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 6 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 11 + + drivers/net/ethernet/intel/ice/ice_devlink.c | 119 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 741 ++- + 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_fw_update.c | 773 +++ + drivers/net/ethernet/intel/ice/ice_fw_update.h | 12 + + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 9 + + drivers/net/ethernet/intel/ice/ice_lib.c | 36 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 2 + + drivers/net/ethernet/intel/ice/ice_main.c | 1127 +++- + drivers/net/ethernet/intel/ice/ice_nvm.c | 191 +- + drivers/net/ethernet/intel/ice/ice_nvm.h | 20 + + drivers/net/ethernet/intel/ice/ice_sched.c | 131 +- + drivers/net/ethernet/intel/ice/ice_sched.h | 2 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 58 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 4 +- + drivers/net/ethernet/intel/ice/ice_type.h | 71 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 55 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 2 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 16 +- + 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 | 13 +- + drivers/net/ethernet/intel/igb/igb_main.c | 41 +- + 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 | 46 +- + 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 | 21 +- + 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 | 28 +- + drivers/net/ethernet/intel/igc/igc_main.c | 68 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 256 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 30 +- + 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 | 283 +- + 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 | 313 +- + 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 | 6 +- + 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 | 61 +- + 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 | 237 +- + 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/en_rx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 11 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 4 +- + 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 | 98 +- + .../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 | 91 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 13 + + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 54 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 22 +- + .../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 | 23 +- + .../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 | 206 +- + .../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_common.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 23 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 84 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 151 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 46 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 169 +- + 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 | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 161 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 37 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 115 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 4 +- + .../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/ipoib/ipoib.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 2 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 8 +- + .../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 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 145 +- + .../mellanox/mlx5/core/steering/dr_matcher.c | 15 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 4 +- + 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/core_env.c | 53 +- + 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 | 194 +- + 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_cnt.c | 5 +- + 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 | 93 +- + 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_ptp.c | 74 +- + 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/myricom/myri10ge/myri10ge.c | 37 +- + 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 | 82 +- + 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/packetengines/hamachi.c | 111 +- + drivers/net/ethernet/packetengines/yellowfin.c | 83 +- + drivers/net/ethernet/pensando/Kconfig | 2 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 9 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 2 - + .../net/ethernet/pensando/ionic/ionic_devlink.c | 5 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 88 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 24 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 14 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 59 +- + drivers/net/ethernet/qlogic/qed/Makefile | 41 +- + drivers/net/ethernet/qlogic/qed/qed.h | 155 +- + drivers/net/ethernet/qlogic/qed/qed_chain.c | 371 ++ + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 49 +- + 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 | 475 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 62 +- + 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 | 1085 +-- + 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 | 117 +- + 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 | 83 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 32 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 811 ++- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 161 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 176 +- + 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 | 84 +- + 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 | 237 +- + 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 | 58 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 136 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 63 +- + 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 | 209 +- + drivers/net/ethernet/qlogic/qede/qede_dcbnl.c | 7 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 528 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 181 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 205 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 228 +- + 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/rdc/r6040.c | 64 +- + drivers/net/ethernet/realtek/r8169.h | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 390 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 81 +- + drivers/net/ethernet/sfc/Kconfig | 5 +- + drivers/net/ethernet/sfc/Makefile | 4 +- + drivers/net/ethernet/sfc/bitfield.h | 34 +- + drivers/net/ethernet/sfc/ef10.c | 346 +- + drivers/net/ethernet/sfc/ef100.c | 541 ++ + drivers/net/ethernet/sfc/ef100.h | 12 + + drivers/net/ethernet/sfc/ef100_ethtool.c | 24 + + drivers/net/ethernet/sfc/ef100_ethtool.h | 12 + + drivers/net/ethernet/sfc/ef100_netdev.c | 273 + + drivers/net/ethernet/sfc/ef100_netdev.h | 17 + + drivers/net/ethernet/sfc/ef100_nic.c | 619 ++ + drivers/net/ethernet/sfc/ef100_nic.h | 32 + + drivers/net/ethernet/sfc/ef100_regs.h | 693 ++ + drivers/net/ethernet/sfc/ef100_rx.c | 31 + + drivers/net/ethernet/sfc/ef100_rx.h | 20 + + drivers/net/ethernet/sfc/ef100_tx.c | 51 + + drivers/net/ethernet/sfc/ef100_tx.h | 22 + + drivers/net/ethernet/sfc/efx.c | 317 +- + drivers/net/ethernet/sfc/efx.h | 50 +- + drivers/net/ethernet/sfc/efx_channels.c | 76 +- + drivers/net/ethernet/sfc/efx_channels.h | 3 + + drivers/net/ethernet/sfc/efx_common.c | 263 +- + drivers/net/ethernet/sfc/efx_common.h | 44 +- + drivers/net/ethernet/sfc/ethtool.c | 914 --- + drivers/net/ethernet/sfc/ethtool_common.c | 910 ++- + drivers/net/ethernet/sfc/ethtool_common.h | 35 +- + drivers/net/ethernet/sfc/farch.c | 6 +- + drivers/net/ethernet/sfc/io.h | 16 +- + drivers/net/ethernet/sfc/mcdi.c | 74 +- + drivers/net/ethernet/sfc/mcdi.h | 14 +- + 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 | 77 +- + drivers/net/ethernet/sfc/nic.c | 44 + + drivers/net/ethernet/sfc/nic.h | 301 +- + drivers/net/ethernet/sfc/nic_common.h | 286 + + drivers/net/ethernet/sfc/ptp.c | 25 +- + 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 | 9 +- + drivers/net/ethernet/sfc/tx.c | 82 +- + 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/silan/sc92031.c | 26 +- + drivers/net/ethernet/sis/sis190.c | 52 +- + drivers/net/ethernet/sis/sis900.c | 112 +- + 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_ethtool.c | 19 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 18 +- + .../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 | 33 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 6 +- + 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/hyperv/hyperv_net.h | 1 + + drivers/net/hyperv/netvsc_drv.c | 43 + + 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 | 14 +- + 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-mux-gpio.c | 11 +- + 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 | 431 +- + drivers/net/phy/realtek.c | 12 + + drivers/net/phy/sfp.c | 54 +- + drivers/net/plip/plip.c | 4 +- + drivers/net/ppp/pppoe.c | 2 - + drivers/net/ppp/pptp.c | 2 - + drivers/net/thunderbolt.c | 4 + + drivers/net/tun.c | 2 +- + 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 | 468 +- + drivers/net/vxlan.c | 6 +- + drivers/net/wan/c101.c | 2 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wan/farsync.c | 12 +- + 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 | 6 +- + 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/mac.c | 9 +- + 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 | 222 +- + 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/Kconfig | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 33 +- + 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/mac80211_hwsim.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 21 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 +- + drivers/net/wireless/marvell/mwifiex/sdio.h | 4 +- + 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/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/idt8a340_reg.h | 48 + + drivers/ptp/ptp_chardev.c | 33 +- + drivers/ptp/ptp_clockmatrix.c | 1151 +++- + drivers/ptp/ptp_clockmatrix.h | 61 +- + drivers/ptp/ptp_pch.c | 37 +- + drivers/s390/net/ism_drv.c | 2 +- + drivers/s390/net/qeth_core.h | 10 +- + drivers/s390/net/qeth_core_main.c | 269 +- + 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 | 14 +- + drivers/s390/net/qeth_l3_main.c | 20 +- + drivers/scsi/qedf/qedf_main.c | 78 +- + 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 - + 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/checksum.h | 6 +- + include/asm-generic/vmlinux.lds.h | 4 + + include/linux/atmdev.h | 9 - + include/linux/binfmts.h | 1 - + include/linux/bpf-cgroup.h | 4 + + include/linux/bpf-netns.h | 3 + + include/linux/bpf.h | 33 + + include/linux/bpf_types.h | 2 + + include/linux/bpf_verifier.h | 1 + + include/linux/bpfilter.h | 13 +- + include/linux/btf_ids.h | 130 + + include/linux/compat.h | 4 - + include/linux/debugfs.h | 12 +- + include/linux/ethtool.h | 55 + + include/linux/filter.h | 152 +- + include/linux/fsl/enetc_mdio.h | 1 + + include/linux/hashtable.h | 4 +- + include/linux/icmp.h | 5 + + include/linux/icmpv6.h | 22 +- + include/linux/if_bridge.h | 1 + + include/linux/indirect_call_wrapper.h | 12 + + include/linux/ipv6.h | 3 +- + include/linux/linkmode.h | 6 + + include/linux/marvell_phy.h | 2 + + include/linux/mdio.h | 1 + + include/linux/mlx5/accel.h | 6 +- + include/linux/mlx5/driver.h | 5 +- + 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 +- + include/linux/mroute.h | 5 +- + include/linux/mroute6.h | 8 +- + include/linux/net.h | 10 +- + .../i40e => include/linux/net/intel}/i40e_client.h | 9 - + include/linux/netdevice.h | 12 + + include/linux/netfilter.h | 20 +- + include/linux/netfilter/x_tables.h | 4 +- + 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 | 105 +- + include/linux/pldmfw.h | 165 + + 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 | 360 +- + include/linux/qed/qed_eth_if.h | 30 +- + include/linux/qed/qed_fcoe_if.h | 4 +- + include/linux/qed/qed_if.h | 184 +- + 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 | 8 +- + include/linux/sockptr.h | 127 + + include/linux/syscalls.h | 4 + + include/linux/tcp.h | 4 +- + 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/bluetooth/bluetooth.h | 12 + + include/net/bluetooth/hci.h | 28 +- + include/net/bluetooth/hci_core.h | 107 +- + include/net/bluetooth/hci_sock.h | 4 +- + include/net/bluetooth/mgmt.h | 95 + + include/net/bluetooth/sco.h | 2 + + include/net/bonding.h | 8 + + include/net/busy_poll.h | 6 +- + include/net/caif/caif_layer.h | 4 +- + include/net/cfg80211.h | 41 +- + include/net/cipso_ipv4.h | 12 - + include/net/compat.h | 1 - + include/net/devlink.h | 69 +- + include/net/dsa.h | 54 +- + include/net/fib_rules.h | 18 + + include/net/flow.h | 18 - + include/net/flow_dissector.h | 9 + + include/net/flow_offload.h | 20 +- + include/net/fq.h | 1 - + include/net/fq_impl.h | 3 +- + include/net/ieee80211_radiotap.h | 1 + + include/net/inet_connection_sock.h | 16 +- + include/net/inet_sock.h | 1 + + include/net/ip.h | 17 +- + include/net/ip6_checksum.h | 9 - + include/net/ip6_fib.h | 38 +- + include/net/ip_vs.h | 15 +- + include/net/ipv6.h | 10 +- + include/net/l3mdev.h | 39 + + include/net/mac80211.h | 42 +- + include/net/mptcp.h | 15 +- + include/net/netfilter/nf_tables.h | 23 +- + include/net/pkt_cls.h | 54 +- + include/net/regulatory.h | 2 +- + include/net/request_sock.h | 2 +- + include/net/rpl.h | 6 - + include/net/sctp/sctp.h | 4 +- + include/net/sctp/structs.h | 18 +- + include/net/sock.h | 30 +- + include/net/switchdev.h | 38 + + include/net/tc_act/tc_police.h | 42 +- + include/net/tcp.h | 27 +- + include/net/tls.h | 34 +- + include/net/transp_v6.h | 3 - + include/net/tso.h | 23 +- + include/net/udp.h | 10 +- + include/net/udp_tunnel.h | 164 +- + include/net/wimax.h | 2 +- + include/net/xdp.h | 57 +- + include/net/xdp_sock.h | 4 + + include/net/xfrm.h | 14 +- + 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/trace/events/xdp.h | 16 +- + include/uapi/asm-generic/unistd.h | 4 +- + 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 | 369 +- + include/uapi/linux/caif/caif_socket.h | 2 +- + include/uapi/linux/devlink.h | 15 + + include/uapi/linux/errqueue.h | 14 +- + include/uapi/linux/ethtool.h | 87 + + include/uapi/linux/ethtool_netlink.h | 57 + + include/uapi/linux/hsr_netlink.h | 2 +- + include/uapi/linux/icmp.h | 22 + + include/uapi/linux/icmpv6.h | 1 + + include/uapi/linux/if_bridge.h | 75 + + include/uapi/linux/if_link.h | 23 +- + include/uapi/linux/if_xdp.h | 5 +- + include/uapi/linux/in.h | 1 + + include/uapi/linux/in6.h | 1 + + 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/nl80211.h | 94 +- + include/uapi/linux/pkt_cls.h | 3 + + include/uapi/linux/pkt_sched.h | 2 + + include/uapi/linux/ptp_clock.h | 34 +- + include/uapi/linux/rtnetlink.h | 46 +- + include/uapi/linux/snmp.h | 1 + + include/uapi/linux/tcp.h | 1 + + include/uapi/linux/wireless.h | 2 +- + include/uapi/linux/xdp_diag.h | 11 + + include/uapi/linux/xfrm.h | 1 + + 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 | 164 +- + kernel/bpf/core.c | 55 + + kernel/bpf/cpumap.c | 170 +- + kernel/bpf/devmap.c | 6 + + kernel/bpf/hashtab.c | 23 +- + kernel/bpf/local_storage.c | 3 + + kernel/bpf/lpm_trie.c | 8 +- + kernel/bpf/map_iter.c | 7 +- + kernel/bpf/net_namespace.c | 131 +- + 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 | 12 + + kernel/bpf/task_iter.c | 12 +- + kernel/bpf/verifier.c | 147 +- + 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 + + lib/Kconfig | 4 + + lib/Makefile | 3 + + lib/checksum.c | 4 +- + lib/pldmfw/Makefile | 2 + + lib/pldmfw/pldmfw.c | 879 +++ + lib/pldmfw/pldmfw_private.h | 238 + + lib/test_bpf.c | 20 - + mm/cma.h | 3 + + mm/cma_debug.c | 7 +- + net/9p/client.c | 2 +- + net/9p/trans_rdma.c | 7 +- + net/Kconfig | 1 - + net/appletalk/ddp.c | 2 - + net/atm/common.c | 20 +- + net/atm/common.h | 2 +- + net/atm/lec_arpc.h | 2 +- + net/atm/pvc.c | 2 +- + net/atm/svc.c | 6 +- + net/ax25/Kconfig | 10 +- + net/ax25/af_ax25.c | 6 +- + 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/bluetooth/6lowpan.c | 5 + + net/bluetooth/Kconfig | 2 +- + net/bluetooth/Makefile | 2 +- + net/bluetooth/af_bluetooth.c | 5 +- + net/bluetooth/bnep/sock.c | 2 - + net/bluetooth/cmtp/sock.c | 2 - + net/bluetooth/hci_conn.c | 51 +- + net/bluetooth/hci_core.c | 212 +- + net/bluetooth/hci_event.c | 71 +- + net/bluetooth/hci_request.c | 286 +- + net/bluetooth/hci_request.h | 5 +- + net/bluetooth/hci_sock.c | 15 +- + net/bluetooth/hidp/sock.c | 2 - + net/bluetooth/l2cap_core.c | 25 +- + net/bluetooth/l2cap_sock.c | 26 +- + net/bluetooth/mgmt.c | 577 +- + 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 | 14 +- + net/bluetooth/sco.c | 38 +- + net/bluetooth/selftest.c | 2 +- + net/bluetooth/smp.c | 8 +- + net/bpfilter/Kconfig | 10 +- + net/bpfilter/Makefile | 2 + + net/bpfilter/bpfilter_kern.c | 96 +- + 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/bridge/netfilter/ebtables.c | 250 +- + net/caif/caif_socket.c | 10 +- + net/can/af_can.c | 2 + + net/can/bcm.c | 2 - + net/can/j1939/socket.c | 12 +- + net/can/raw.c | 16 +- + net/compat.c | 122 +- + net/core/bpf_sk_storage.c | 44 +- + net/core/dev.c | 53 +- + net/core/dev_ioctl.c | 29 +- + net/core/devlink.c | 644 +- + net/core/fib_rules.c | 31 +- + net/core/filter.c | 383 +- + net/core/flow_dissector.c | 17 + + net/core/flow_offload.c | 12 +- + net/core/neighbour.c | 1 + + net/core/rtnetlink.c | 113 +- + net/core/skbuff.c | 2 +- + net/core/sock.c | 119 +- + 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/dccp.h | 8 +- + net/dccp/feat.c | 6 + + net/dccp/input.c | 1 + + net/dccp/ipv4.c | 14 +- + net/dccp/ipv6.c | 14 - + net/dccp/options.c | 4 + + net/dccp/proto.c | 54 +- + net/dccp/timer.c | 2 + + net/decnet/af_decnet.c | 26 +- + 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 | 25 +- + net/dsa/dsa_priv.h | 2 +- + net/dsa/master.c | 62 +- + net/dsa/slave.c | 6 +- + 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/Kconfig | 35 +- + net/hsr/hsr_debugfs.c | 41 +- + net/hsr/hsr_device.c | 183 +- + net/hsr/hsr_device.h | 2 + + net/hsr/hsr_forward.c | 319 +- + net/hsr/hsr_forward.h | 16 +- + net/hsr/hsr_framereg.c | 95 +- + net/hsr/hsr_framereg.h | 31 +- + net/hsr/hsr_main.c | 2 + + net/hsr/hsr_main.h | 120 +- + net/hsr/hsr_netlink.c | 38 +- + net/hsr/hsr_netlink.h | 2 + + net/hsr/hsr_slave.c | 26 +- + net/hsr/hsr_slave.h | 4 + + net/ieee802154/socket.c | 14 +- + net/ipv4/Kconfig | 8 +- + net/ipv4/Makefile | 3 +- + net/ipv4/af_inet.c | 15 +- + net/ipv4/bpfilter/sockopt.c | 36 +- + net/ipv4/cipso_ipv4.c | 10 +- + net/ipv4/fib_rules.c | 12 +- + net/ipv4/fib_trie.c | 2 +- + net/ipv4/icmp.c | 59 + + net/ipv4/inet_connection_sock.c | 61 +- + net/ipv4/inet_diag.c | 65 +- + net/ipv4/inet_hashtables.c | 60 +- + net/ipv4/ip_options.c | 43 +- + net/ipv4/ip_output.c | 6 + + net/ipv4/ip_sockglue.c | 601 +- + net/ipv4/ip_vti.c | 80 +- + net/ipv4/ipcomp.c | 1 + + net/ipv4/ipmr.c | 17 +- + net/ipv4/netfilter/arp_tables.c | 105 +- + net/ipv4/netfilter/ip_tables.c | 104 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 21 + + net/ipv4/proc.c | 1 + + net/ipv4/raw.c | 30 +- + net/ipv4/syncookies.c | 45 +- + net/ipv4/tcp.c | 67 +- + net/ipv4/tcp_highspeed.c | 2 +- + net/ipv4/tcp_htcp.c | 2 +- + net/ipv4/tcp_input.c | 150 +- + net/ipv4/tcp_ipv4.c | 167 +- + net/ipv4/tcp_output.c | 16 +- + net/ipv4/tcp_timer.c | 2 +- + net/ipv4/tcp_veno.c | 2 +- + net/ipv4/tunnel4.c | 43 + + net/ipv4/udp.c | 283 +- + net/ipv4/udp_impl.h | 10 +- + 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/ipv4/udplite.c | 4 - + net/ipv6/Kconfig | 2 +- + net/ipv6/af_inet6.c | 4 - + net/ipv6/datagram.c | 16 + + net/ipv6/exthdrs.c | 3 +- + net/ipv6/fib6_rules.c | 21 +- + net/ipv6/icmp.c | 5 +- + net/ipv6/inet6_hashtables.c | 66 +- + net/ipv6/ip6_fib.c | 3 +- + net/ipv6/ip6_flowlabel.c | 316 +- + 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/ip6_vti.c | 52 +- + net/ipv6/ip6mr.c | 17 +- + net/ipv6/ipcomp6.c | 1 + + net/ipv6/ipv6_sockglue.c | 724 +- + net/ipv6/netfilter/ip6_tables.c | 104 +- + net/ipv6/netfilter/nf_reject_ipv6.c | 26 + + net/ipv6/ping.c | 1 + + net/ipv6/raw.c | 62 +- + net/ipv6/route.c | 15 +- + net/ipv6/rpl_iptunnel.c | 3 +- + net/ipv6/syncookies.c | 5 +- + net/ipv6/tcp_ipv6.c | 23 +- + net/ipv6/tunnel6.c | 41 + + net/ipv6/udp.c | 138 +- + net/ipv6/udp_impl.h | 10 +- + net/ipv6/udplite.c | 4 - + net/iucv/af_iucv.c | 4 +- + net/kcm/kcmsock.c | 6 +- + net/key/af_key.c | 2 - + net/l2tp/l2tp_core.c | 247 +- + net/l2tp/l2tp_core.h | 205 +- + net/l2tp/l2tp_debugfs.c | 34 +- + net/l2tp/l2tp_eth.c | 21 +- + net/l2tp/l2tp_ip.c | 41 +- + net/l2tp/l2tp_ip6.c | 43 +- + net/l2tp/l2tp_netlink.c | 259 +- + net/l2tp/l2tp_ppp.c | 97 +- + net/l3mdev/l3mdev.c | 93 + + net/llc/af_llc.c | 5 +- + 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/airtime.c | 26 +- + net/mac80211/cfg.c | 21 +- + net/mac80211/chan.c | 9 +- + net/mac80211/debugfs_netdev.c | 5 + + net/mac80211/driver-ops.h | 11 +- + net/mac80211/ht.c | 4 +- + net/mac80211/ibss.c | 4 +- + net/mac80211/ieee80211_i.h | 16 +- + net/mac80211/iface.c | 25 +- + net/mac80211/key.c | 2 +- + net/mac80211/mesh.c | 9 +- + net/mac80211/mesh_hwmp.c | 41 +- + net/mac80211/mesh_pathtbl.c | 4 +- + net/mac80211/mesh_plink.c | 2 +- + net/mac80211/mlme.c | 14 +- + net/mac80211/offchannel.c | 6 +- + net/mac80211/rx.c | 66 +- + net/mac80211/scan.c | 8 +- + net/mac80211/sta_info.c | 6 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/status.c | 4 +- + net/mac80211/tdls.c | 8 +- + net/mac80211/tx.c | 99 +- + net/mac80211/util.c | 20 +- + net/mac80211/wme.c | 2 +- + net/mpls/af_mpls.c | 17 +- + net/mptcp/Kconfig | 24 +- + net/mptcp/Makefile | 7 + + net/mptcp/crypto.c | 63 +- + net/mptcp/crypto_test.c | 72 + + net/mptcp/ctrl.c | 1 + + net/mptcp/mptcp_diag.c | 169 + + net/mptcp/options.c | 71 +- + net/mptcp/pm.c | 46 +- + net/mptcp/pm_netlink.c | 2 +- + net/mptcp/protocol.c | 848 ++- + net/mptcp/protocol.h | 130 +- + net/mptcp/subflow.c | 335 +- + net/mptcp/syncookies.c | 130 + + net/mptcp/token.c | 373 +- + net/mptcp/token_test.c | 140 + + net/ncsi/ncsi-rsp.c | 2 +- + net/netfilter/ipvs/ip_vs_conn.c | 53 +- + net/netfilter/ipvs/ip_vs_core.c | 92 +- + net/netfilter/ipvs/ip_vs_ctl.c | 33 +- + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_flow_table_offload.c | 2 +- + net/netfilter/nf_sockopt.c | 60 +- + 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/netfilter/x_tables.c | 28 +- + net/netlabel/netlabel_domainhash.c | 2 +- + net/netlink/af_netlink.c | 11 +- + net/netrom/af_netrom.c | 4 +- + net/nfc/core.c | 3 +- + net/nfc/llcp_sock.c | 8 +- + net/nfc/nci/core.c | 4 +- + net/nfc/rawsock.c | 4 - + net/openvswitch/datapath.c | 23 + + net/openvswitch/datapath.h | 6 +- + 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 | 96 +- + net/packet/internal.h | 2 +- + net/phonet/pep.c | 4 +- + net/phonet/socket.c | 10 - + net/qrtr/qrtr.c | 2 - + net/rds/af_rds.c | 30 +- + net/rds/rdma.c | 14 +- + net/rds/rdma_transport.h | 2 +- + net/rds/rds.h | 6 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/af_rxrpc.c | 10 +- + net/rxrpc/ar-internal.h | 4 +- + net/rxrpc/key.c | 9 +- + 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 | 9 +- + 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 | 17 + + net/sched/cls_matchall.c | 3 +- + net/sched/cls_tcindex.c | 2 +- + net/sched/cls_u32.c | 24 +- + net/sched/em_canid.c | 1 + + net/sched/ematch.c | 3 +- + net/sched/sch_api.c | 6 +- + 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/sctp/ipv6.c | 6 - + net/sctp/protocol.c | 20 +- + net/sctp/socket.c | 1239 ++-- + net/smc/af_smc.c | 26 +- + net/smc/smc_clc.h | 1 + + net/smc/smc_core.c | 4 +- + net/socket.c | 133 +- + 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 | 16 +- + net/tipc/udp_media.c | 2 +- + net/tls/tls_device.c | 60 +- + net/tls/tls_main.c | 17 +- + net/unix/af_unix.c | 6 - + net/vmw_vsock/af_vsock.c | 6 +- + net/wireless/chan.c | 35 + + net/wireless/core.c | 5 +- + net/wireless/mesh.c | 1 + + net/wireless/nl80211.c | 74 +- + net/wireless/reg.c | 4 +- + net/wireless/scan.c | 10 + + net/wireless/trace.h | 4 +- + net/wireless/util.c | 8 + + net/wireless/wext-compat.c | 1 - + net/x25/Kconfig | 2 +- + net/x25/af_x25.c | 4 +- + net/x25/x25_link.c | 2 +- + net/x25/x25_route.c | 2 +- + net/xdp/xsk.c | 44 +- + 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 +- + net/xfrm/xfrm_input.c | 24 +- + net/xfrm/xfrm_interface.c | 136 +- + net/xfrm/xfrm_policy.c | 11 + + net/xfrm/xfrm_replay.c | 12 +- + net/xfrm/xfrm_state.c | 6 +- + 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/offwaketime_kern.c | 7 +- + samples/bpf/test_map_in_map_kern.c | 94 +- + samples/bpf/test_map_in_map_user.c | 53 +- + samples/bpf/test_overhead_kprobe_kern.c | 12 +- + samples/bpf/test_probe_write_user_kern.c | 9 +- + samples/bpf/tracex1_kern.c | 9 +- + samples/bpf/tracex5_kern.c | 4 +- + samples/bpf/xdp_redirect_cpu_kern.c | 25 +- + samples/bpf/xdp_redirect_cpu_user.c | 209 +- + samples/bpf/xdpsock_user.c | 87 +- + scripts/bpf_helpers_doc.py | 21 +- + 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 | 13 +- + tools/bpf/bpftool/Makefile | 66 +- + tools/bpf/bpftool/bash-completion/bpftool | 2 +- + tools/bpf/bpftool/btf.c | 6 + + tools/bpf/bpftool/common.c | 483 +- + tools/bpf/bpftool/feature.c | 4 +- + tools/bpf/bpftool/gen.c | 28 +- + tools/bpf/bpftool/link.c | 11 +- + tools/bpf/bpftool/main.c | 12 +- + tools/bpf/bpftool/main.h | 129 +- + tools/bpf/bpftool/map.c | 167 +- + tools/bpf/bpftool/pids.c | 231 + + tools/bpf/bpftool/prog.c | 196 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 81 + + 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 | 130 + + tools/include/linux/compiler.h | 4 + + tools/include/uapi/asm-generic/unistd.h | 4 +- + tools/include/uapi/linux/bpf.h | 369 +- + 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 | 3 +- + tools/lib/bpf/btf.c | 9 +- + tools/lib/bpf/btf.h | 12 +- + tools/lib/bpf/btf_dump.c | 10 +- + tools/lib/bpf/libbpf.c | 817 ++- + tools/lib/bpf/libbpf.h | 34 +- + tools/lib/bpf/libbpf.map | 22 + + tools/lib/bpf/libbpf_probes.c | 3 + + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 4 +- + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 4 +- + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 4 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/bpf/Makefile | 24 +- + tools/testing/selftests/bpf/bpf_legacy.h | 14 - + tools/testing/selftests/bpf/network_helpers.c | 187 +- + tools/testing/selftests/bpf/network_helpers.h | 11 +- + 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 | 129 + + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 1282 ++++ + tools/testing/selftests/bpf/prog_tests/skeleton.c | 6 +- + .../selftests/bpf/prog_tests/sockopt_inherit.c | 3 +- + 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 + + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 70 + + 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 | 28 +- + 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_sk_lookup.c | 641 ++ + 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 +- + .../bpf/progs/test_xdp_with_cpumap_helpers.c | 36 + + tools/testing/selftests/bpf/progs/trace_printk.c | 21 + + tools/testing/selftests/bpf/progs/udp_limit.c | 42 + + tools/testing/selftests/bpf/test_kmod.sh | 12 +- + tools/testing/selftests/bpf/test_lwt_seg6local.sh | 2 +- + tools/testing/selftests/bpf/test_progs.c | 66 +- + tools/testing/selftests/bpf/test_progs.h | 4 + + .../testing/selftests/bpf/verifier/ctx_sk_lookup.c | 492 ++ + 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 | 112 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 66 +- + tools/testing/selftests/net/rxtimestamp.c | 122 +- + tools/testing/selftests/net/rxtimestamp.sh | 4 + + tools/testing/selftests/net/txtimestamp.c | 10 +- + .../testing/selftests/net/vrf_strict_mode_test.sh | 396 ++ + tools/testing/selftests/ptp/testptp.c | 51 +- + .../selftests/tc-testing/{bpf => }/Makefile | 9 +- + .../selftests/tc-testing/{bpf => }/action.c | 0 + tools/testing/selftests/tc-testing/tdc.sh | 5 + + tools/testing/selftests/tc-testing/tdc_config.py | 2 +- + 1832 files changed, 102731 insertions(+), 38152 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/dsa.yaml + rename {drivers/staging/wilc1000 => Documentation/devicetree/bindings/net/wireless}/microchip,wilc1000.yaml (100%) + create mode 100644 Documentation/driver-api/pldmfw/driver-ops.rst + create mode 100644 Documentation/driver-api/pldmfw/file-format.rst + create mode 100644 Documentation/driver-api/pldmfw/index.rst + 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 (99%) + 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 (99%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/i40e.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/iavf.rst (99%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ice.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/igb.rst (99%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/igbvf.rst (98%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ixgb.rst (99%) + 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/intel/ice/ice_fw_update.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_fw_update.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_chain.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_ptp.h + create mode 100644 drivers/net/ethernet/sfc/ef100.c + create mode 100644 drivers/net/ethernet/sfc/ef100.h + create mode 100644 drivers/net/ethernet/sfc/ef100_ethtool.c + create mode 100644 drivers/net/ethernet/sfc/ef100_ethtool.h + create mode 100644 drivers/net/ethernet/sfc/ef100_netdev.c + create mode 100644 drivers/net/ethernet/sfc/ef100_netdev.h + create mode 100644 drivers/net/ethernet/sfc/ef100_nic.c + create mode 100644 drivers/net/ethernet/sfc/ef100_nic.h + create mode 100644 drivers/net/ethernet/sfc/ef100_regs.h + create mode 100644 drivers/net/ethernet/sfc/ef100_rx.c + create mode 100644 drivers/net/ethernet/sfc/ef100_rx.h + create mode 100644 drivers/net/ethernet/sfc/ef100_tx.c + create mode 100644 drivers/net/ethernet/sfc/ef100_tx.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 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 + 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/pldmfw.h + create mode 100644 include/linux/sockptr.h + 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 lib/pldmfw/Makefile + create mode 100644 lib/pldmfw/pldmfw.c + create mode 100644 lib/pldmfw/pldmfw_private.h + create mode 100644 net/bluetooth/mgmt_config.c + create mode 100644 net/bluetooth/mgmt_config.h + 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/syncookies.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/sk_lookup.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/prog_tests/xdp_cpumap_attach.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_sk_lookup.c + create mode 100644 tools/testing/selftests/bpf/progs/test_varlen.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.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/ctx_sk_lookup.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 + rename tools/testing/selftests/tc-testing/{bpf => }/Makefile (79%) + rename tools/testing/selftests/tc-testing/{bpf => }/action.c (100%) + create mode 100755 tools/testing/selftests/tc-testing/tdc.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 6d26decd4435] Merge remote-tracking branch 'net-next/master' + Date: Mon Aug 3 12:46:06 2020 +1000 +Merging bpf-next/master (b5cc46cdff76 selftests/bpf: Fix spurious test failures in core_retro selftest) +$ git merge bpf-next/master +Auto-merging net/ipv6/route.c +Auto-merging net/core/rtnetlink.c +Auto-merging net/core/dev.c +CONFLICT (content): Merge conflict in net/core/dev.c +Auto-merging kernel/bpf/hashtab.c +Auto-merging kernel/bpf/btf.c +Auto-merging include/linux/netdevice.h +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/marvell/mvneta.c +Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging Documentation/bpf/index.rst +Recorded preimage for 'net/core/dev.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'net/core/dev.c'. +[master 691b9d3095f1] Merge remote-tracking branch 'bpf-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/index.rst | 21 +- + Documentation/bpf/map_cgroup_storage.rst | 169 +++++++ + Documentation/networking/filter.rst | 2 + + arch/arm64/include/asm/extable.h | 12 + + arch/arm64/mm/extable.c | 12 +- + arch/arm64/net/bpf_jit_comp.c | 93 +++- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 6 - + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 4 - + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 3 - + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 5 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 3 - + drivers/net/ethernet/intel/ice/ice_main.c | 3 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 - + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 - + drivers/net/ethernet/marvell/mvneta.c | 5 - + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 3 - + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 24 - + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 18 - + .../net/ethernet/netronome/nfp/nfp_net_common.c | 4 - + drivers/net/ethernet/qlogic/qede/qede_filter.c | 3 - + drivers/net/ethernet/sfc/efx.c | 5 - + drivers/net/ethernet/socionext/netsec.c | 3 - + drivers/net/ethernet/ti/cpsw_priv.c | 3 - + drivers/net/hyperv/netvsc_bpf.c | 21 +- + drivers/net/netdevsim/bpf.c | 4 - + drivers/net/netdevsim/netdevsim.h | 2 +- + drivers/net/tun.c | 15 - + drivers/net/veth.c | 15 - + drivers/net/virtio_net.c | 17 - + drivers/net/xen-netfront.c | 21 - + fs/proc/proc_net.c | 2 +- + include/linux/bpf-cgroup.h | 12 +- + include/linux/bpf.h | 127 +++-- + include/linux/filter.h | 3 +- + include/linux/netdevice.h | 29 +- + include/linux/proc_fs.h | 3 +- + include/net/xdp.h | 2 - + include/uapi/linux/bpf.h | 24 +- + kernel/bpf/Makefile | 2 +- + kernel/bpf/arraymap.c | 138 ++++++ + kernel/bpf/bpf_iter.c | 85 +++- + kernel/bpf/btf.c | 13 + + kernel/bpf/cgroup.c | 82 ++-- + kernel/bpf/core.c | 12 - + kernel/bpf/hashtab.c | 194 ++++++++ + kernel/bpf/local_storage.c | 216 +++++---- + kernel/bpf/map_iter.c | 78 ++- + kernel/bpf/net_namespace.c | 8 + + kernel/bpf/prog_iter.c | 107 ++++ + kernel/bpf/stackmap.c | 183 ++++++- + kernel/bpf/syscall.c | 52 ++ + kernel/bpf/task_iter.c | 24 +- + kernel/bpf/verifier.c | 96 +++- + kernel/events/core.c | 18 + + kernel/trace/bpf_trace.c | 4 +- + net/core/bpf_sk_storage.c | 216 +++++++++ + net/core/dev.c | 539 ++++++++++++++++----- + net/core/filter.c | 3 + + net/core/rtnetlink.c | 5 +- + net/core/xdp.c | 9 - + net/ipv4/tcp_ipv4.c | 12 +- + net/ipv4/udp.c | 14 +- + net/ipv6/route.c | 8 +- + net/ipv6/udp.c | 5 +- + net/netlink/af_netlink.c | 8 +- + net/xdp/xsk.c | 2 +- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 18 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 8 + + tools/bpf/bpftool/Makefile | 3 +- + tools/bpf/bpftool/bash-completion/bpftool | 22 +- + tools/bpf/bpftool/feature.c | 8 + + tools/bpf/bpftool/iter.c | 33 +- + tools/bpf/bpftool/link.c | 37 +- + tools/bpf/bpftool/prog.c | 1 + + tools/include/uapi/linux/bpf.h | 24 +- + tools/lib/bpf/bpf.c | 11 + + tools/lib/bpf/bpf.h | 5 +- + tools/lib/bpf/bpf_tracing.h | 4 +- + tools/lib/bpf/btf.c | 4 +- + tools/lib/bpf/btf_dump.c | 2 +- + tools/lib/bpf/libbpf.c | 36 +- + tools/lib/bpf/libbpf.h | 6 +- + tools/lib/bpf/libbpf.map | 3 + + tools/testing/selftests/bpf/cgroup_helpers.c | 23 + + tools/testing/selftests/bpf/cgroup_helpers.h | 1 + + tools/testing/selftests/bpf/get_cgroup_id_user.c | 14 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 455 +++++++++++++++++ + .../selftests/bpf/prog_tests/cg_storage_multi.c | 417 ++++++++++++++++ + .../testing/selftests/bpf/prog_tests/cgroup_link.c | 20 +- + .../testing/selftests/bpf/prog_tests/core_retro.c | 8 +- + .../bpf/prog_tests/get_stackid_cannot_attach.c | 91 ++++ + .../selftests/bpf/prog_tests/perf_event_stackmap.c | 116 +++++ + .../selftests/bpf/prog_tests/section_names.c | 2 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 109 +++-- + tools/testing/selftests/bpf/prog_tests/xdp_link.c | 151 ++++++ + tools/testing/selftests/bpf/progs/bpf_iter.h | 18 + + .../selftests/bpf/progs/bpf_iter_bpf_array_map.c | 40 ++ + .../selftests/bpf/progs/bpf_iter_bpf_hash_map.c | 100 ++++ + .../bpf/progs/bpf_iter_bpf_percpu_array_map.c | 46 ++ + .../bpf/progs/bpf_iter_bpf_percpu_hash_map.c | 50 ++ + .../bpf/progs/bpf_iter_bpf_sk_storage_map.c | 34 ++ + .../selftests/bpf/progs/bpf_iter_test_kern5.c | 35 ++ + .../selftests/bpf/progs/bpf_iter_test_kern6.c | 21 + + .../testing/selftests/bpf/progs/cg_storage_multi.h | 13 + + .../bpf/progs/cg_storage_multi_egress_only.c | 33 ++ + .../bpf/progs/cg_storage_multi_isolated.c | 57 +++ + .../selftests/bpf/progs/cg_storage_multi_shared.c | 57 +++ + .../selftests/bpf/progs/perf_event_stackmap.c | 59 +++ + .../testing/selftests/bpf/progs/test_core_retro.c | 13 + + tools/testing/selftests/bpf/progs/test_xdp_link.c | 12 + + tools/testing/selftests/bpf/progs/udp_limit.c | 19 + + tools/testing/selftests/bpf/tcp_client.py | 2 +- + tools/testing/selftests/bpf/tcp_server.py | 2 +- + tools/testing/selftests/bpf/test_cgroup_storage.c | 17 +- + tools/testing/selftests/bpf/test_dev_cgroup.c | 15 +- + tools/testing/selftests/bpf/test_netcnt.c | 21 +- + .../selftests/bpf/test_skb_cgroup_id_user.c | 8 +- + tools/testing/selftests/bpf/test_sock.c | 8 +- + tools/testing/selftests/bpf/test_sock_addr.c | 8 +- + tools/testing/selftests/bpf/test_sock_fields.c | 14 +- + tools/testing/selftests/bpf/test_socket_cookie.c | 8 +- + tools/testing/selftests/bpf/test_sockmap.c | 18 +- + tools/testing/selftests/bpf/test_sysctl.c | 8 +- + tools/testing/selftests/bpf/test_tcpbpf_user.c | 8 +- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 8 +- + tools/testing/selftests/bpf/test_xdp_redirect.sh | 84 ++-- + tools/testing/selftests/bpf/testing_helpers.c | 14 + + tools/testing/selftests/bpf/testing_helpers.h | 3 + + 128 files changed, 4465 insertions(+), 861 deletions(-) + create mode 100644 Documentation/bpf/map_cgroup_storage.rst + create mode 100644 kernel/bpf/prog_iter.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cg_storage_multi.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/get_stackid_cannot_attach.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/perf_event_stackmap.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_link.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_bpf_array_map.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_bpf_hash_map.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_bpf_percpu_array_map.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_bpf_percpu_hash_map.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_bpf_sk_storage_map.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_test_kern5.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_test_kern6.c + create mode 100644 tools/testing/selftests/bpf/progs/cg_storage_multi.h + create mode 100644 tools/testing/selftests/bpf/progs/cg_storage_multi_egress_only.c + create mode 100644 tools/testing/selftests/bpf/progs/cg_storage_multi_isolated.c + create mode 100644 tools/testing/selftests/bpf/progs/cg_storage_multi_shared.c + create mode 100644 tools/testing/selftests/bpf/progs/perf_event_stackmap.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_link.c +Merging ipsec-next/master (b328ecc468f8 xfrm: Make the policy hold queue work with VTI.) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (042dd05bddbd RDMA/mlx5: ConnectX-7 new capabilities to set relaxed ordering by UMR) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (77a92189ecfd netfilter: nf_tables: report EEXIST on overlaps) +$ git merge netfilter-next/master +Auto-merging net/netfilter/x_tables.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/bridge/netfilter/ebtables.c +Merge made by the 'recursive' strategy. + include/net/ip_vs.h | 29 ++++++++++++++++++ + include/uapi/linux/netfilter/xt_connmark.h | 2 +- + net/bridge/netfilter/ebtables.c | 2 +- + net/decnet/netfilter/dn_rtmsg.c | 2 +- + net/ipv6/netfilter/ip6t_ah.c | 3 +- + net/ipv6/netfilter/ip6t_frag.c | 3 +- + net/ipv6/netfilter/ip6t_hbh.c | 3 +- + net/ipv6/netfilter/ip6t_rt.c | 3 +- + net/netfilter/Kconfig | 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 | 31 +++++++++++--------- + net/netfilter/nf_tables_core.c | 2 +- + net/netfilter/nfnetlink_acct.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/nft_set_pipapo.c | 4 +-- + net/netfilter/utils.c | 8 ++--- + net/netfilter/x_tables.c | 2 +- + net/netfilter/xt_CONNSECMARK.c | 2 +- + net/netfilter/xt_connmark.c | 2 +- + net/netfilter/xt_nfacct.c | 2 +- + net/netfilter/xt_time.c | 2 +- + 35 files changed, 173 insertions(+), 93 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 (3dc05ffb0443 brcmfmac: Set timeout value when configuring power save) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/mediatek/mt76/usb.c +Auto-merging drivers/net/wireless/mediatek/mt76/tx.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7915/main.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +Removing drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/usb.c +CONFLICT (content): Merge conflict in drivers/net/wireless/mediatek/mt76/mt7615/usb.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +CONFLICT (content): Merge conflict in drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/main.c +CONFLICT (content): Merge conflict in drivers/net/wireless/mediatek/mt76/mt7615/main.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/mac.h +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/mac.c +CONFLICT (content): Merge conflict in drivers/net/wireless/mediatek/mt76/mt7615/mac.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/dma.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7603/main.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt76.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +Recorded preimage for 'drivers/net/wireless/mediatek/mt76/mt7615/mac.c' +Recorded preimage for 'drivers/net/wireless/mediatek/mt76/mt7615/main.c' +Recorded preimage for 'drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h' +Recorded preimage for 'drivers/net/wireless/mediatek/mt76/mt7615/usb.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/wireless/mediatek/mt76/mt7615/mac.c'. +Recorded resolution for 'drivers/net/wireless/mediatek/mt76/mt7615/main.c'. +Recorded resolution for 'drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h'. +Recorded resolution for 'drivers/net/wireless/mediatek/mt76/mt7615/usb.c'. +[master 7247a9ee89be] Merge remote-tracking branch 'wireless-drivers-next/master' +$ git diff -M --stat --summary HEAD^.. + .../device_drivers/wifi/intel/ipw2100.rst | 2 +- + drivers/bcma/driver_gpio.c | 23 +- + drivers/bcma/scan.c | 8 +- + drivers/net/wireless/broadcom/b43/main.c | 14 +- + drivers/net/wireless/broadcom/b43/phy_common.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_g.c | 12 +- + drivers/net/wireless/broadcom/b43/phy_ht.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_lp.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 150 +++---- + drivers/net/wireless/broadcom/b43/radio_2056.c | 2 +- + drivers/net/wireless/broadcom/b43/tables_nphy.c | 4 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 8 +- + drivers/net/wireless/broadcom/b43legacy/phy.c | 8 +- + drivers/net/wireless/broadcom/b43legacy/radio.c | 8 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 8 + + drivers/net/wireless/cisco/airo.c | 39 +- + drivers/net/wireless/intel/ipw2x00/Kconfig | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 123 +++-- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 56 +-- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 +- + drivers/net/wireless/intersil/Kconfig | 2 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 6 +- + drivers/net/wireless/intersil/hostap/hostap_pci.c | 34 +- + drivers/net/wireless/intersil/orinoco/Kconfig | 4 +- + drivers/net/wireless/intersil/p54/Kconfig | 6 +- + drivers/net/wireless/intersil/p54/fwio.c | 2 +- + drivers/net/wireless/intersil/p54/p54pci.c | 65 +-- + drivers/net/wireless/intersil/p54/p54usb.c | 2 +- + drivers/net/wireless/intersil/prism54/isl_oid.h | 2 +- + drivers/net/wireless/intersil/prism54/islpci_dev.c | 30 +- + drivers/net/wireless/intersil/prism54/islpci_eth.c | 24 +- + .../net/wireless/intersil/prism54/islpci_hotplug.c | 39 +- + drivers/net/wireless/intersil/prism54/islpci_mgt.c | 21 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 2 +- + drivers/net/wireless/mediatek/mt76/Kconfig | 4 + + drivers/net/wireless/mediatek/mt76/Makefile | 3 + + drivers/net/wireless/mediatek/mt76/debugfs.c | 7 +- + drivers/net/wireless/mediatek/mt76/dma.c | 6 + + drivers/net/wireless/mediatek/mt76/eeprom.c | 5 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 37 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 115 ++++- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 - + drivers/net/wireless/mediatek/mt76/mt7615/Kconfig | 19 +- + drivers/net/wireless/mediatek/mt76/mt7615/Makefile | 7 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 102 ++++- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 4 - + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 312 +++++++++++-- + drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 5 + + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 332 +++++++++++--- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 371 ++++++++++++--- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.h | 54 ++- + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 49 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 95 +++- + drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 4 + + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 4 + + .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 1 - + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 33 +- + drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 478 ++++++++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt7615/sdio.h | 115 +++++ + .../net/wireless/mediatek/mt76/mt7615/sdio_mcu.c | 162 +++++++ + .../net/wireless/mediatek/mt76/mt7615/sdio_txrx.c | 268 +++++++++++ + .../net/wireless/mediatek/mt76/mt7615/testmode.c | 363 +++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 246 +--------- + .../net/wireless/mediatek/mt76/mt7615/usb_init.c | 145 ------ + .../net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 7 +- + .../net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 394 ++++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 - + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 3 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 8 +- + drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 70 ++- + .../net/wireless/mediatek/mt76/mt76x2/pci_init.c | 17 + + drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 8 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 11 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 21 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 44 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 93 ++-- + drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 17 - + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 13 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 117 ++++- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 6 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 35 +- + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 5 + + drivers/net/wireless/mediatek/mt76/pci.c | 1 + + drivers/net/wireless/mediatek/mt76/sdio.c | 368 +++++++++++++++ + drivers/net/wireless/mediatek/mt76/testmode.c | 497 +++++++++++++++++++++ + drivers/net/wireless/mediatek/mt76/testmode.h | 156 +++++++ + drivers/net/wireless/mediatek/mt76/tx.c | 47 ++ + drivers/net/wireless/mediatek/mt76/usb.c | 90 +--- + drivers/net/wireless/mediatek/mt76/util.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/mcu.c | 4 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 6 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 3 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 3 +- + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 3 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00pci.c | 31 +- + drivers/net/wireless/ralink/rt2x00/rt2x00pci.h | 9 +- + drivers/net/wireless/ralink/rt2x00/rt2x00soc.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 3 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 8 +- + drivers/net/wireless/realtek/rtw88/coex.c | 3 +- + drivers/net/wireless/realtek/rtw88/debug.c | 30 ++ + drivers/net/wireless/realtek/rtw88/fw.c | 17 +- + drivers/net/wireless/realtek/rtw88/fw.h | 2 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 27 ++ + drivers/net/wireless/realtek/rtw88/main.c | 11 +- + drivers/net/wireless/realtek/rtw88/main.h | 2 + + drivers/net/wireless/realtek/rtw88/reg.h | 1 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 405 ++++++++++++++++- + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 26 ++ + drivers/net/wireless/realtek/rtw88/tx.c | 104 +++-- + drivers/net/wireless/realtek/rtw88/tx.h | 13 +- + drivers/net/wireless/ti/wl1251/event.c | 2 +- + include/linux/mmc/sdio_ids.h | 3 + + 124 files changed, 5595 insertions(+), 1277 deletions(-) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/sdio.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/sdio.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/testmode.c + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c + create mode 100644 drivers/net/wireless/mediatek/mt76/sdio.c + create mode 100644 drivers/net/wireless/mediatek/mt76/testmode.c + create mode 100644 drivers/net/wireless/mediatek/mt76/testmode.h +Merging bluetooth/master (3b799254cf6f Bluetooth: hci_uart: Cancel init work before unregistering) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_sdio.c | 54 +++-------------------------------------- + drivers/bluetooth/hci_h5.c | 2 -- + drivers/bluetooth/hci_ldisc.c | 1 + + drivers/bluetooth/hci_serdev.c | 2 ++ + 4 files changed, 7 insertions(+), 52 deletions(-) +Merging mac80211-next/master (c8ad010665c0 mac80211: warn only once in check_sdata_in_driver() at each caller) +$ 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 (3d19792a7d72 mtd: rawnand: omap_elm: Replace HTTP links with HTTPS ones) +$ git merge mtd/mtd/next +Auto-merging drivers/memory/Kconfig +Merge made by the 'recursive' strategy. + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 252 ++++ + .../devicetree/bindings/mtd/davinci-nand.txt | 4 +- + .../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/chips/Kconfig | 2 +- + drivers/mtd/hyperbus/hbmc-am654.c | 2 +- + drivers/mtd/hyperbus/hyperbus-core.c | 2 +- + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/maps/sc520cdp.c | 2 +- + drivers/mtd/nand/raw/Kconfig | 1 + + drivers/mtd/nand/raw/omap_elm.c | 2 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 311 ++--- + 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/controllers/intel-spi.c | 13 +- + drivers/mtd/spi-nor/core.c | 57 +- + drivers/mtd/spi-nor/core.h | 10 +- + drivers/mtd/spi-nor/macronix.c | 6 + + drivers/mtd/spi-nor/micron-st.c | 4 +- + drivers/mtd/spi-nor/sfdp.c | 3 +- + drivers/mtd/spi-nor/spansion.c | 4 +- + drivers/mtd/spi-nor/winbond.c | 4 +- + 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/mtd/hyperbus.h | 2 +- + include/linux/spi/spi-mem.h | 14 +- + 35 files changed, 2035 insertions(+), 575 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/st,stm32-fmc2-ebi.yaml + create mode 100644 drivers/memory/stm32-fmc2-ebi.c + rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => spi/spi-cadence-quadspi.c} (74%) +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 (e93a977367b2 mtd: revert "spi-nor: intel: provide a range for poll_timout") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (3cbfe80737c1 crypto: sa2ul - Fix inconsistent IS_ERR and PTR_ERR) +$ git merge crypto/master +Auto-merging net/mptcp/crypto.c +Auto-merging drivers/crypto/chelsio/chcr_crypto.h +Auto-merging crypto/algif_skcipher.c +Auto-merging crypto/algif_aead.c +Auto-merging crypto/af_alg.c +Auto-merging MAINTAINERS +Auto-merging Documentation/crypto/api-intro.rst +CONFLICT (content): Merge conflict in Documentation/crypto/api-intro.rst +Resolved 'Documentation/crypto/api-intro.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fec71ffe8a71] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/padata.rst | 18 +- + Documentation/crypto/api-intro.rst | 2 +- + Documentation/crypto/userspace-if.rst | 4 +- + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 76 + + Documentation/devicetree/bindings/rng/imx-rng.txt | 3 + + .../devicetree/bindings/rng/ingenic,rng.yaml | 36 + + .../bindings/rng/silex-insight,ba431-rng.yaml | 36 + + MAINTAINERS | 9 + + arch/arm/crypto/crc32-ce-core.S | 2 +- + arch/arm/crypto/ghash-ce-glue.c | 51 +- + arch/arm/crypto/sha1-armv4-large.S | 2 +- + arch/arm/crypto/sha256-armv4.pl | 2 +- + arch/arm/crypto/sha256-core.S_shipped | 2 +- + arch/arm/crypto/sha512-armv4.pl | 4 +- + arch/arm/crypto/sha512-core.S_shipped | 4 +- + 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 | 7 +- + arch/x86/crypto/curve25519-x86_64.c | 6 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 17 +- + arch/x86/include/asm/inst.h | 163 -- + crypto/Kconfig | 46 +- + 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/blake2b_generic.c | 2 +- + crypto/camellia_generic.c | 2 +- + 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/dh.c | 38 + + crypto/ecc.c | 44 +- + crypto/ecc.h | 14 + + 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/jitterentropy.c | 4 +- + crypto/lrw.c | 134 +- + crypto/pcrypt.c | 31 +- + crypto/rsa-pkcs1pad.c | 13 +- + crypto/salsa20_generic.c | 4 +- + crypto/seqiv.c | 18 +- + crypto/sha3_generic.c | 2 +- + crypto/simd.c | 6 +- + crypto/skcipher.c | 13 +- + crypto/testmgr.h | 10 +- + crypto/vmac.c | 5 +- + crypto/xcbc.c | 5 +- + crypto/xts.c | 154 +- + drivers/char/hw_random/Kconfig | 27 +- + drivers/char/hw_random/Makefile | 2 + + drivers/char/hw_random/ba431-rng.c | 235 ++ + drivers/char/hw_random/bcm2835-rng.c | 5 +- + drivers/char/hw_random/core.c | 2 +- + drivers/char/hw_random/hisi-rng.c | 2 +- + drivers/char/hw_random/ingenic-rng.c | 154 ++ + 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 | 19 +- + drivers/crypto/Makefile | 1 + + .../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 | 37 +- + drivers/crypto/caam/caamalg_qi.c | 8 +- + drivers/crypto/caam/caamalg_qi2.c | 42 +- + 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/caam/error.c | 3 + + drivers/crypto/caam/jr.c | 3 +- + drivers/crypto/caam/regs.h | 11 +- + 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.c | 4 +- + drivers/crypto/ccp/ccp-dev.h | 13 +- + drivers/crypto/ccp/ccp-ops.c | 43 +- + drivers/crypto/ccp/sp-dev.c | 6 +- + drivers/crypto/ccp/sp-dev.h | 6 +- + drivers/crypto/ccp/sp-pci.c | 17 +- + drivers/crypto/ccp/sp-platform.c | 2 +- + 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.c | 13 +- + drivers/crypto/inside-secure/safexcel.h | 3 + + 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/cesa.c | 11 +- + drivers/crypto/marvell/cesa/cesa.h | 1 + + 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 | 41 +- + 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 | 77 +- + .../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/sa2ul.c | 2420 ++++++++++++++++++++ + drivers/crypto/sa2ul.h | 403 ++++ + 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/hash.h | 2 +- + include/crypto/if_alg.h | 4 +- + include/crypto/internal/geniv.h | 2 +- + include/crypto/sha.h | 1 + + include/crypto/skcipher.h | 2 +- + include/linux/crypto.h | 41 +- + include/linux/mpi.h | 3 + + include/linux/padata.h | 21 +- + kernel/padata.c | 177 +- + lib/crc-t10dif.c | 75 +- + lib/crypto/chacha20poly1305.c | 2 - + lib/crypto/sha256.c | 10 + + lib/mpi/Makefile | 1 + + lib/mpi/mpi-sub-ui.c | 78 + + net/mptcp/crypto.c | 15 +- + sound/soc/codecs/cros_ec_codec.c | 27 +- + 257 files changed, 6648 insertions(+), 5497 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml + create mode 100644 Documentation/devicetree/bindings/rng/ingenic,rng.yaml + create mode 100644 Documentation/devicetree/bindings/rng/silex-insight,ba431-rng.yaml + create mode 100644 drivers/char/hw_random/ba431-rng.c + create mode 100644 drivers/char/hw_random/ingenic-rng.c + create mode 100644 drivers/crypto/sa2ul.c + create mode 100644 drivers/crypto/sa2ul.h + create mode 100644 lib/mpi/mpi-sub-ui.c +Merging drm/drm-next (418eda8f3fe2 Merge tag 'drm-intel-next-2020-07-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Removing include/linux/amba/clcd.h +Removing include/linux/amba/clcd-regs.h +Auto-merging include/drm/drm_mode_config.h +Removing drivers/video/fbdev/amba-clcd.c +Removing drivers/gpu/drm/udl/udl_gem.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Removing drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +Auto-merging drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.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_drm_crtc.c +Auto-merging drivers/gpu/drm/drm_of.c +Auto-merging drivers/gpu/drm/drm_mipi_dbi.c +Auto-merging drivers/gpu/drm/drm_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/bridge/nwl-dsi.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging drivers/gpu/drm/bochs/bochs_kms.c +Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.h +Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.c +Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h +Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h +Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/drm-mm.rst +Auto-merging Documentation/driver-api/dmaengine/provider.rst +Auto-merging Documentation/driver-api/dmaengine/client.rst +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/ti,tfp410.txt +Removing Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt +Removing Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt +Removing Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt +Resolved 'drivers/gpu/drm/drm_gem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d3aacb782e35] 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 | 62 + + .../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/nwl-dsi.yaml | 9 +- + .../bindings/display/bridge/renesas,lvds.txt | 85 - + .../bindings/display/bridge/renesas,lvds.yaml | 248 + + .../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 + + .../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 + + .../bindings/display/panel/panel-simple.yaml | 8 + + .../display/panel/rocktech,jh057n00900.txt | 23 - + .../display/panel/rocktech,jh057n00900.yaml | 71 + + .../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 +- + .../bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 174 + + .../bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 68 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/dma-buf.rst | 88 +- + Documentation/driver-api/dmaengine/client.rst | 4 +- + Documentation/driver-api/dmaengine/provider.rst | 49 + + Documentation/fb/ep93xx-fb.rst | 2 +- + Documentation/gpu/drm-kms-helpers.rst | 12 - + Documentation/gpu/drm-kms.rst | 21 + + Documentation/gpu/drm-mm.rst | 17 +- + Documentation/gpu/todo.rst | 58 +- + Documentation/gpu/vgaarbiter.rst | 8 +- + MAINTAINERS | 26 +- + 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-chain.c | 7 - + drivers/dma-buf/dma-fence.c | 209 + + drivers/dma-buf/dma-resv.c | 8 + + drivers/dma-buf/selftests.h | 2 +- + drivers/dma-buf/st-dma-fence-chain.c | 43 +- + drivers/dma/Kconfig | 10 + + drivers/dma/xilinx/Makefile | 1 + + drivers/dma/xilinx/xilinx_dpdma.c | 1533 + + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 12 +- + .../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 | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 90 +- + 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 | 161 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 275 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 44 +- + 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 | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 109 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 15 +- + 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 | 384 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 230 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 1 - + 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_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 186 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 35 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 26 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 206 +- + 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.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 - + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 101 + + drivers/gpu/drm/amd/amdgpu/athub_v2_1.h | 30 + + drivers/gpu/drm/amd/amdgpu/cik.c | 8 + + drivers/gpu/drm/amd/amdgpu/cikd.h | 2 - + 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 | 650 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 51 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 428 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.h | 39 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 149 +- + 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 | 3 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 17 +- + 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_v1_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 128 +- + 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 | 67 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 14 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 191 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 8 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 104 +- + .../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 | 13 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h | 15 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 1776 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h | 30 + + drivers/gpu/drm/amd/amdgpu/si.c | 398 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 19 + + drivers/gpu/drm/amd/amdgpu/si_dpm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/si_enums.h | 1 - + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/sid.h | 61 +- + .../gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 62 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h | 4 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 52 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + + 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/uvd_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 153 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 132 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 122 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 1981 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h | 29 + + 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/cwsr_trap_handler.h | 877 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 301 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 18 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 63 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 64 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 + + 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 | 2 + + 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 | 80 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 245 +- + 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 | 296 +- + drivers/gpu/drm/amd/display/Kconfig | 8 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 350 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 3 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 10 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 811 +- + .../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 | 21 +- + .../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 | 19 + + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 39 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 53 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 73 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 51 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 1 + + .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h | 60 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 562 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h | 38 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 314 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h | 108 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 140 +- + 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 | 268 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 79 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 67 + + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 3 - + drivers/gpu/drm/amd/display/dc/dc.h | 72 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 82 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 25 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 37 + + 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 | 4 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 28 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 8 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 12 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 183 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 2 + + .../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 | 22 +- + 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 | 135 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 7 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 120 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 8 +- + 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 | 6 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 9 +- + 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 | 270 + + 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 | 342 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2723 + + .../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 | 6863 ++ + .../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 | 16 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 67 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 232 +- + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 18 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 10 +- + 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 | 33 +- + 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 | 78 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 19 + + 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/dsc.h | 5 + + 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 | 7 + + 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 | 392 + + .../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 | 22 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 499 +- + .../gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h | 63 - + .../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 | 34 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 195 + + 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 | 55 +- + 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/include/logger_types.h | 4 +- + 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 + + .../drm/amd/display/modules/freesync/freesync.c | 78 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 7 +- + .../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 | 361 + + .../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 | 4 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2039 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1970 +- + 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 | 225 +- + 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 | 1233 + + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 5 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 114 +- + .../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 | 36 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 1969 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 681 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.h | 20 - + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 2752 + + .../sienna_cichlid_ppt.h} | 26 +- + drivers/gpu/drm/amd/powerplay/smu_cmn.c | 633 + + drivers/gpu/drm/amd/powerplay/smu_cmn.h | 83 + + drivers/gpu/drm/amd/powerplay/smu_internal.h | 264 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 1377 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 339 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 11 +- + 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 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 7 +- + .../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 | 46 +- + 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/Makefile | 3 +- + drivers/gpu/drm/ast/ast_cursor.c | 289 + + drivers/gpu/drm/ast/ast_dp501.c | 24 +- + drivers/gpu/drm/ast/ast_drv.c | 14 +- + drivers/gpu/drm/ast/ast_drv.h | 28 +- + drivers/gpu/drm/ast/ast_main.c | 182 +- + drivers/gpu/drm/ast/{ast_ttm.c => ast_mm.c} | 79 +- + drivers/gpu/drm/ast/ast_mode.c | 371 +- + drivers/gpu/drm/ast/ast_post.c | 28 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 7 +- + 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 | 3 +- + drivers/gpu/drm/bridge/simple-bridge.c | 113 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 356 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/bridge/tc358767.c | 1 + + drivers/gpu/drm/bridge/tc358768.c | 3 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 1 + + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 327 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 21 +- + drivers/gpu/drm/drm_atomic.c | 1 + + drivers/gpu/drm/drm_atomic_helper.c | 5 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 4 + + drivers/gpu/drm/drm_atomic_uapi.c | 7 + + drivers/gpu/drm/drm_auth.c | 46 +- + drivers/gpu/drm/drm_bridge.c | 10 +- + drivers/gpu/drm/drm_bufs.c | 6 + + drivers/gpu/drm/drm_client.c | 35 +- + drivers/gpu/drm/drm_client_modeset.c | 42 +- + drivers/gpu/drm/drm_connector.c | 69 +- + drivers/gpu/drm/drm_crtc.c | 28 + + drivers/gpu/drm/drm_crtc_helper.c | 3 + + drivers/gpu/drm/drm_crtc_helper_internal.h | 7 +- + drivers/gpu/drm/drm_debugfs.c | 30 +- + drivers/gpu/drm/drm_dp_helper.c | 71 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 114 +- + drivers/gpu/drm/drm_edid.c | 511 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_file.c | 12 +- + drivers/gpu/drm/drm_format_helper.c | 61 +- + drivers/gpu/drm/drm_fourcc.c | 12 + + drivers/gpu/drm/drm_framebuffer.c | 1 + + drivers/gpu/drm/drm_gem.c | 84 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 24 +- + 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 | 119 +- + drivers/gpu/drm/drm_internal.h | 27 + + drivers/gpu/drm/drm_ioc32.c | 6 +- + drivers/gpu/drm/drm_ioctl.c | 11 +- + drivers/gpu/drm/drm_irq.c | 2 +- + drivers/gpu/drm/drm_lease.c | 4 + + drivers/gpu/drm/drm_lock.c | 1 + + drivers/gpu/drm/drm_managed.c | 2 + + drivers/gpu/drm/drm_mipi_dbi.c | 25 +- + drivers/gpu/drm/drm_mipi_dsi.c | 41 +- + drivers/gpu/drm/drm_mm.c | 122 +- + drivers/gpu/drm/drm_mode_config.c | 1 + + drivers/gpu/drm/drm_modes.c | 42 +- + 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 | 7 +- + drivers/gpu/drm/drm_probe_helper.c | 142 +- + drivers/gpu/drm/drm_syncobj.c | 1 + + drivers/gpu/drm/drm_vblank.c | 313 +- + drivers/gpu/drm/drm_vblank_work.c | 267 + + 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 | 12 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 80 +- + 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/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/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/i810/i810_dma.c | 10 +- + drivers/gpu/drm/i915/Makefile | 3 + + 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 | 81 +- + 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 | 111 +- + drivers/gpu/drm/i915/display/intel_color.c | 66 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 80 +- + 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 | 481 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 3 - + drivers/gpu/drm/i915/display/intel_display.c | 359 +- + drivers/gpu/drm/i915/display/intel_display.h | 9 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 21 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 377 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 7 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 73 +- + drivers/gpu/drm/i915/display/intel_dp.c | 559 +- + drivers/gpu/drm/i915/display/intel_dp.h | 8 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 4 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 43 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 185 +- + 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 | 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_dvo.c | 14 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 104 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 160 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 300 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 6 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 53 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 2 + + drivers/gpu/drm/i915/display/intel_lspcon.c | 8 +- + drivers/gpu/drm/i915/display/intel_lspcon.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 | 98 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 166 +- + drivers/gpu/drm/i915/display/intel_sdvo_regs.h | 8 +- + 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_vbt_defs.h | 1 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 12 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 28 +- + 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_dmabuf.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 347 +- + 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 | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.h | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 68 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 +- + 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_pages.c | 29 +- + 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_shrinker.c | 36 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 2 +- + 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 - + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 5 +- + .../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 | 41 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 4 + + drivers/gpu/drm/i915/gt/debugfs_gt.c | 2 + + 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/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.h | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 160 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 41 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 1 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 16 + + drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 95 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 23 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 17 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 5 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 6 +- + 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 | 130 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 19 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 29 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 29 +- + 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 | 870 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 14 +- + 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 | 112 +- + 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 | 939 +- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 11 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 68 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 38 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 17 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 10 +- + 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 | 31 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 29 + + 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 | 21 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 2 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 55 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 2 - + drivers/gpu/drm/i915/i915_debugfs.c | 288 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 7 +- + drivers/gpu/drm/i915/i915_drv.c | 18 +- + drivers/gpu/drm/i915/i915_drv.h | 77 +- + drivers/gpu/drm/i915/i915_gem.c | 18 + + drivers/gpu/drm/i915/i915_gem.h | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 + + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 - + drivers/gpu/drm/i915/i915_getparam.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 38 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 3 + + drivers/gpu/drm/i915/i915_irq.c | 136 +- + drivers/gpu/drm/i915/i915_params.c | 43 +- + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 93 +- + drivers/gpu/drm/i915/i915_perf.c | 13 +- + drivers/gpu/drm/i915/i915_pmu.c | 17 +- + drivers/gpu/drm/i915/i915_query.c | 5 +- + drivers/gpu/drm/i915/i915_reg.h | 208 +- + drivers/gpu/drm/i915/i915_request.c | 57 +- + drivers/gpu/drm/i915/i915_request.h | 11 +- + drivers/gpu/drm/i915/i915_trace.h | 10 +- + drivers/gpu/drm/i915/i915_utils.c | 12 +- + drivers/gpu/drm/i915/i915_utils.h | 16 +- + drivers/gpu/drm/i915/i915_vma.c | 79 +- + drivers/gpu/drm/i915/i915_vma.h | 1 + + drivers/gpu/drm/i915/i915_vma_types.h | 1 - + drivers/gpu/drm/i915/intel_device_info.c | 660 +- + drivers/gpu/drm/i915/intel_device_info.h | 21 +- + drivers/gpu/drm/i915/intel_gvt.c | 10 +- + drivers/gpu/drm/i915/intel_pch.c | 48 +- + drivers/gpu/drm/i915/intel_pch.h | 4 + + drivers/gpu/drm/i915/intel_pm.c | 522 +- + 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 | 30 +- + drivers/gpu/drm/i915/intel_uncore.h | 4 +- + 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 | 135 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 873 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 18 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 12 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 1 + + drivers/gpu/drm/imx/dw_hdmi-imx.c | 21 +- + drivers/gpu/drm/imx/imx-drm-core.c | 15 +- + drivers/gpu/drm/imx/imx-ldb.c | 36 +- + drivers/gpu/drm/imx/imx-tve.c | 48 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 42 +- + drivers/gpu/drm/imx/parallel-display.c | 38 +- + drivers/gpu/drm/ingenic/Kconfig | 11 + + drivers/gpu/drm/ingenic/Makefile | 2 + + .../ingenic/{ingenic-drm.c => ingenic-drm-drv.c} | 685 +- + 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_gem.c | 10 +- + drivers/gpu/drm/lima/lima_sched.c | 7 +- + drivers/gpu/drm/mcde/mcde_drv.c | 12 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 20 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 269 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- + drivers/gpu/drm/meson/meson_crtc.c | 118 +- + drivers/gpu/drm/meson/meson_drv.c | 15 +- + drivers/gpu/drm/meson/meson_drv.h | 16 + + drivers/gpu/drm/meson/meson_dw_hdmi.c | 34 +- + drivers/gpu/drm/meson/meson_overlay.c | 293 +- + drivers/gpu/drm/meson/meson_registers.h | 22 + + 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 | 62 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 160 - + drivers/gpu/drm/mgag200/mgag200_mm.c | 127 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 995 +- + drivers/gpu/drm/mgag200/mgag200_reg.h | 22 +- + 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 | 4 +- + 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 | 24 +- + drivers/gpu/drm/nouveau/Kbuild | 7 + + drivers/gpu/drm/nouveau/Kconfig | 8 + + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 59 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 10 +- + 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/base.h | 12 +- + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 235 +- + drivers/gpu/drm/nouveau/dispnv50/base827c.c | 74 +- + drivers/gpu/drm/nouveau/dispnv50/base907c.c | 159 +- + drivers/gpu/drm/nouveau/dispnv50/core.h | 20 +- + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 71 +- + drivers/gpu/drm/nouveau/dispnv50/core907d.c | 3 + + drivers/gpu/drm/nouveau/dispnv50/core917d.c | 3 + + drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 132 +- + drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 47 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 749 + + drivers/gpu/drm/nouveau/dispnv50/crc.h | 132 + + drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 142 + + drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 154 + + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 32 +- + drivers/gpu/drm/nouveau/dispnv50/cursc37a.c | 23 +- + drivers/gpu/drm/nouveau/dispnv50/dac507d.c | 30 +- + drivers/gpu/drm/nouveau/dispnv50/dac907d.c | 20 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 339 +- + drivers/gpu/drm/nouveau/dispnv50/disp.h | 46 +- + drivers/gpu/drm/nouveau/dispnv50/handles.h | 16 + + drivers/gpu/drm/nouveau/dispnv50/head.c | 104 +- + drivers/gpu/drm/nouveau/dispnv50/head.h | 84 +- + drivers/gpu/drm/nouveau/dispnv50/head507d.c | 408 +- + drivers/gpu/drm/nouveau/dispnv50/head827d.c | 165 +- + drivers/gpu/drm/nouveau/dispnv50/head907d.c | 449 +- + drivers/gpu/drm/nouveau/dispnv50/head917d.c | 64 +- + drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 324 +- + drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 199 +- + drivers/gpu/drm/nouveau/dispnv50/lut.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/oimm507b.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/ovly.h | 6 +- + drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 138 +- + drivers/gpu/drm/nouveau/dispnv50/ovly827e.c | 76 +- + drivers/gpu/drm/nouveau/dispnv50/ovly907e.c | 65 +- + drivers/gpu/drm/nouveau/dispnv50/pior507d.c | 30 +- + drivers/gpu/drm/nouveau/dispnv50/sor507d.c | 30 +- + drivers/gpu/drm/nouveau/dispnv50/sor907d.c | 28 +- + drivers/gpu/drm/nouveau/dispnv50/sorc37d.c | 20 +- + drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 42 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 100 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.h | 57 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 337 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 179 +- + drivers/gpu/drm/nouveau/include/nvfw/pmu.h | 6 +- + drivers/gpu/drm/nouveau/include/nvfw/sec2.h | 6 +- + .../gpu/drm/nouveau/include/nvhw/class/cl0039.h | 45 + + .../gpu/drm/nouveau/include/nvhw/class/cl006c.h | 46 + + .../gpu/drm/nouveau/include/nvhw/class/cl006e.h | 30 + + .../gpu/drm/nouveau/include/nvhw/class/cl176e.h | 10 + + .../gpu/drm/nouveau/include/nvhw/class/cl206e.h | 35 + + .../gpu/drm/nouveau/include/nvhw/class/cl502d.h | 337 + + .../gpu/drm/nouveau/include/nvhw/class/cl5039.h | 153 + + .../gpu/drm/nouveau/include/nvhw/class/cl507a.h | 36 + + .../gpu/drm/nouveau/include/nvhw/class/cl507c.h | 165 + + .../gpu/drm/nouveau/include/nvhw/class/cl507d.h | 372 + + .../gpu/drm/nouveau/include/nvhw/class/cl507e.h | 93 + + .../gpu/drm/nouveau/include/nvhw/class/cl826f.h | 39 + + .../gpu/drm/nouveau/include/nvhw/class/cl827c.h | 86 + + .../gpu/drm/nouveau/include/nvhw/class/cl827d.h | 106 + + .../gpu/drm/nouveau/include/nvhw/class/cl827e.h | 88 + + .../gpu/drm/nouveau/include/nvhw/class/cl837d.h | 101 + + .../gpu/drm/nouveau/include/nvhw/class/cl887d.h | 68 + + .../gpu/drm/nouveau/include/nvhw/class/cl902d.h | 357 + + .../gpu/drm/nouveau/include/nvhw/class/cl9039.h | 74 + + .../gpu/drm/nouveau/include/nvhw/class/cl906f.h | 74 + + .../gpu/drm/nouveau/include/nvhw/class/cl907c.h | 143 + + .../gpu/drm/nouveau/include/nvhw/class/cl907d.h | 429 + + .../gpu/drm/nouveau/include/nvhw/class/cl907e.h | 73 + + .../gpu/drm/nouveau/include/nvhw/class/cl917d.h | 104 + + .../gpu/drm/nouveau/include/nvhw/class/cla0b5.h | 162 + + .../gpu/drm/nouveau/include/nvhw/class/clc37a.h | 31 + + .../gpu/drm/nouveau/include/nvhw/class/clc37b.h | 49 + + .../gpu/drm/nouveau/include/nvhw/class/clc37d.h | 567 + + .../gpu/drm/nouveau/include/nvhw/class/clc37e.h | 394 + + .../gpu/drm/nouveau/include/nvhw/class/clc57d.h | 286 + + .../gpu/drm/nouveau/include/nvhw/class/clc57e.h | 142 + + drivers/gpu/drm/nouveau/include/nvhw/drf.h | 208 + + drivers/gpu/drm/nouveau/include/nvif/client.h | 4 +- + drivers/gpu/drm/nouveau/include/nvif/device.h | 6 +- + drivers/gpu/drm/nouveau/include/nvif/disp.h | 3 +- + drivers/gpu/drm/nouveau/include/nvif/mem.h | 14 +- + drivers/gpu/drm/nouveau/include/nvif/mmu.h | 5 +- + drivers/gpu/drm/nouveau/include/nvif/notify.h | 9 +- + drivers/gpu/drm/nouveau/include/nvif/object.h | 22 +- + drivers/gpu/drm/nouveau/include/nvif/parent.h | 25 + + drivers/gpu/drm/nouveau/include/nvif/printf.h | 20 + + drivers/gpu/drm/nouveau/include/nvif/push.h | 359 + + drivers/gpu/drm/nouveau/include/nvif/push006c.h | 73 + + drivers/gpu/drm/nouveau/include/nvif/push206e.h | 13 + + drivers/gpu/drm/nouveau/include/nvif/push507c.h | 25 + + drivers/gpu/drm/nouveau/include/nvif/push906f.h | 48 + + drivers/gpu/drm/nouveau/include/nvif/pushc37b.h | 18 + + drivers/gpu/drm/nouveau/include/nvif/user.h | 4 +- + drivers/gpu/drm/nouveau/include/nvif/vmm.h | 6 +- + drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h | 10 +- + .../gpu/drm/nouveau/include/nvkm/core/firmware.h | 5 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/acr.h | 3 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h | 2 +- + .../gpu/drm/nouveau/include/nvkm/subdev/timer.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 24 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 388 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 46 +- + drivers/gpu/drm/nouveau/nouveau_bo0039.c | 109 + + drivers/gpu/drm/nouveau/nouveau_bo5039.c | 151 + + drivers/gpu/drm/nouveau/nouveau_bo74c1.c | 54 + + drivers/gpu/drm/nouveau/nouveau_bo85b5.c | 74 + + drivers/gpu/drm/nouveau/nouveau_bo9039.c | 98 + + drivers/gpu/drm/nouveau/nouveau_bo90b5.c | 67 + + drivers/gpu/drm/nouveau/nouveau_boa0b5.c | 90 + + drivers/gpu/drm/nouveau/nouveau_chan.c | 92 +- + drivers/gpu/drm/nouveau/nouveau_chan.h | 6 + + drivers/gpu/drm/nouveau/nouveau_connector.c | 18 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 25 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 69 +- + drivers/gpu/drm/nouveau/nouveau_dma.c | 13 - + drivers/gpu/drm/nouveau/nouveau_dma.h | 80 - + drivers/gpu/drm/nouveau/nouveau_dmem.c | 132 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 89 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 40 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 8 - + drivers/gpu/drm/nouveau/nouveau_vmm.c | 6 +- + drivers/gpu/drm/nouveau/nv04_fbcon.c | 186 +- + drivers/gpu/drm/nouveau/nv04_fence.c | 11 +- + drivers/gpu/drm/nouveau/nv10_fence.c | 18 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 41 +- + drivers/gpu/drm/nouveau/nv50_fbcon.c | 290 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 3 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 52 +- + drivers/gpu/drm/nouveau/nvc0_fbcon.c | 288 +- + drivers/gpu/drm/nouveau/nvc0_fence.c | 48 +- + drivers/gpu/drm/nouveau/nvif/client.c | 13 +- + drivers/gpu/drm/nouveau/nvif/device.c | 14 +- + drivers/gpu/drm/nouveau/nvif/disp.c | 9 +- + drivers/gpu/drm/nouveau/nvif/driver.c | 2 +- + drivers/gpu/drm/nouveau/nvif/mem.c | 30 +- + drivers/gpu/drm/nouveau/nvif/mmu.c | 13 +- + drivers/gpu/drm/nouveau/nvif/notify.c | 11 +- + drivers/gpu/drm/nouveau/nvif/object.c | 13 +- + drivers/gpu/drm/nouveau/nvif/user.c | 9 +- + drivers/gpu/drm/nouveau/nvif/vmm.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 8 +- + .../gpu/drm/nouveau/nvkm/engine/disp/channv50.h | 2 + + .../gpu/drm/nouveau/nvkm/engine/disp/coregf119.c | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregp102.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregv100.c | 3 +- + .../gpu/drm/nouveau/nvkm/engine/disp/corenv50.c | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacgp102.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacgv100.c | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c | 34 +- + .../gpu/drm/nouveau/nvkm/engine/disp/hdmigm200.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp108.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c | 21 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/nvfw/acr.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c | 44 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm20b.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp108.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp10b.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/priv.h | 3 + + drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/dcb.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 3 - + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 83 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmtu102.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild | 2 +- + .../nouveau/nvkm/subdev/pmu/{gp100.c => gm200.c} | 18 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c | 2 +- + 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_crtc.c | 8 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 6 +- + 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/Kconfig | 26 +- + drivers/gpu/drm/panel/Makefile | 2 +- + 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 | 7 +- + 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-ltk050h3146w.c | 4 +- + 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 | 4 +- + 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 | 5 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 3 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 5 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 3 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 424 - + 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 | 326 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 654 + + 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 | 7 +- + 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/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/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 | 27 +- + 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_fence.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 | 26 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +- + 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/scheduler/sched_entity.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 14 +- + 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/stm/ltdc.c | 19 +- + 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/dc.c | 51 +- + drivers/gpu/drm/tegra/dc.h | 3 +- + drivers/gpu/drm/tegra/drm.c | 12 +- + drivers/gpu/drm/tegra/dsi.c | 9 +- + drivers/gpu/drm/tegra/fb.c | 6 +- + drivers/gpu/drm/tegra/gem.c | 4 +- + 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/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 | 4 +- + 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 | 60 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 25 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 11 +- + 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/ttm/ttm_agp_backend.c | 9 +- + drivers/gpu/drm/ttm/ttm_bo.c | 140 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 110 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 5 + + drivers/gpu/drm/ttm/ttm_tt.c | 12 +- + 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/vboxvideo/hgsmi_defs.h | 2 +- + drivers/gpu/drm/vboxvideo/vbox_hgsmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 14 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 495 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 +- + drivers/gpu/drm/vc4/vc4_drv.h | 64 +- + drivers/gpu/drm/vc4/vc4_gem.c | 14 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 291 + + drivers/gpu/drm/vc4/vc4_kms.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 41 + + drivers/gpu/drm/vc4/vc4_regs.h | 9 +- + drivers/gpu/drm/vc4/vc4_txp.c | 109 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 4 +- + drivers/gpu/drm/vgem/vgem_drv.c | 31 +- + drivers/gpu/drm/vgem/vgem_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 22 +- + 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_drv.c | 2 + + drivers/gpu/drm/vkms/vkms_gem.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 10 +- + 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 | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 26 +- + drivers/gpu/drm/xen/xen_drm_front.c | 4 +- + drivers/gpu/drm/xlnx/Kconfig | 13 + + drivers/gpu/drm/xlnx/Makefile | 2 + + drivers/gpu/drm/xlnx/zynqmp_disp.c | 1697 + + drivers/gpu/drm/xlnx/zynqmp_disp.h | 42 + + drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 201 + + drivers/gpu/drm/xlnx/zynqmp_dp.c | 1734 + + drivers/gpu/drm/xlnx/zynqmp_dp.h | 27 + + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 322 + + drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 54 + + drivers/gpu/drm/zte/zx_drm_drv.c | 11 +- + drivers/gpu/drm/zte/zx_vga.c | 6 +- + 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 +- + drivers/gpu/ipu-v3/ipu-common.c | 2 + + drivers/gpu/ipu-v3/ipu-image-convert.c | 145 +- + drivers/of/property.c | 23 + + drivers/video/console/newport_con.c | 12 +- + drivers/video/fbdev/Kconfig | 28 +- + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/amba-clcd.c | 989 - + drivers/video/fbdev/amifb.c | 8 + + 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/core/fbcon.c | 4 +- + drivers/video/fbdev/core/fbmon.c | 4 +- + drivers/video/fbdev/da8xx-fb.c | 4 +- + drivers/video/fbdev/ep93xx-fb.c | 2 +- + drivers/video/fbdev/grvga.c | 2 +- + drivers/video/fbdev/macfb.c | 2 +- + drivers/video/fbdev/metronomefb.c | 2 +- + drivers/video/fbdev/neofb.c | 1 + + drivers/video/fbdev/nvidia/nvidia.c | 6 +- + drivers/video/fbdev/omap/omapfb_main.c | 6 +- + drivers/video/fbdev/omap2/omapfb/dss/Kconfig | 4 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 9 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 7 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 9 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 11 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 7 +- + 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/sa1100fb.c | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 2 + + drivers/video/fbdev/sm712fb.c | 4 +- + drivers/video/fbdev/vt8623fb.c | 36 +- + drivers/video/hdmi.c | 2 +- + include/drm/amd_asic_type.h | 2 + + include/drm/bridge/dw_hdmi.h | 26 +- + include/drm/drm_atomic.h | 2 +- + include/drm/drm_bridge.h | 5 +- + include/drm/drm_client.h | 2 + + include/drm/drm_connector.h | 126 +- + 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 | 15 +- + include/drm/drm_format_helper.h | 4 +- + include/drm/drm_gem.h | 41 +- + include/drm/drm_gem_cma_helper.h | 74 +- + include/drm/drm_gem_shmem_helper.h | 4 + + include/drm/drm_gem_vram_helper.h | 3 + + include/drm/drm_mipi_dbi.h | 5 - + include/drm/drm_mode_config.h | 8 +- + include/drm/drm_modes.h | 194 +- + include/drm/drm_modeset_helper_vtables.h | 42 + + 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/i915_pciids.h | 17 + + include/drm/ttm/ttm_bo_api.h | 4 +- + include/drm/ttm/ttm_bo_driver.h | 17 - + include/drm/ttm/ttm_tt.h | 2 +- + include/dt-bindings/dma/xlnx-zynqmp-dpdma.h | 16 + + include/linux/amba/clcd-regs.h | 87 - + include/linux/amba/clcd.h | 290 - + include/linux/dma-fence.h | 13 + + include/linux/dmaengine.h | 17 + + include/linux/fb.h | 5 +- + include/linux/hdmi.h | 1 + + include/linux/host1x.h | 4 +- + include/linux/of_graph.h | 6 + + include/uapi/drm/amdgpu_drm.h | 10 +- + include/uapi/drm/drm_fourcc.h | 140 + + include/uapi/drm/drm_mode.h | 2 +- + include/uapi/drm/i915_drm.h | 4 +- + include/uapi/drm/msm_drm.h | 4 +- + include/uapi/linux/kfd_ioctl.h | 22 +- + 1372 files changed, 266471 insertions(+), 29028 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/renesas,lvds.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,lvds.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 + 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 Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml + create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml + create mode 100644 drivers/dma/xilinx/xilinx_dpdma.c + 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 + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.h + 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 + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_v3_0.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/amdkfd/kfd_smi_events.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h + 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_fw_meta.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%) + create mode 100644 drivers/gpu/drm/amd/powerplay/smu_cmn.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smu_cmn.h + 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/ast/ast_cursor.c + rename drivers/gpu/drm/ast/{ast_ttm.c => ast_mm.c} (61%) + create mode 100644 drivers/gpu/drm/drm_vblank_work.c + 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/intel_sseu_debugfs.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_sseu_debugfs.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.h + rename drivers/gpu/drm/ingenic/{ingenic-drm.c => ingenic-drm-drv.c} (53%) + 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 + 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 + 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 + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl0039.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl006c.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl006e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl176e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl206e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl502d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl5039.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl507a.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl507c.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl507d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl507e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl826f.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl827c.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl827d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl827e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl837d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl887d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl902d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl9039.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl906f.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl907c.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl907d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl907e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cl917d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/cla0b5.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc37a.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc37b.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc37d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc37e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc57d.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/class/clc57e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvhw/drf.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/parent.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/printf.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/push.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/push006c.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/push206e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/push507c.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/push906f.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/pushc37b.h + create mode 100644 drivers/gpu/drm/nouveau/nouveau_bo0039.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_bo5039.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_bo74c1.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_bo85b5.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_bo9039.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_bo90b5.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_boa0b5.c + rename drivers/gpu/drm/nouveau/nvkm/subdev/pmu/{gp100.c => gm200.c} (79%) + 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/gpu/drm/udl/udl_gem.c + create mode 100644 drivers/gpu/drm/xlnx/Kconfig + create mode 100644 drivers/gpu/drm/xlnx/Makefile + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_disp.c + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_disp.h + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_disp_regs.h + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dp.c + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dp.h + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dpsub.c + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dpsub.h + delete mode 100644 drivers/video/fbdev/amba-clcd.c + create mode 100644 include/drm/drm_vblank_work.h + create mode 100644 include/dt-bindings/dma/xlnx-zynqmp-dpdma.h + delete mode 100644 include/linux/amba/clcd-regs.h + delete mode 100644 include/linux/amba/clcd.h +Merging amdgpu/drm-next (d0689b3aae84 drm/amdgpu/smu: rework i2c adpater registration) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.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/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +[master 69d5c82d12b6] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 20 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 424 +++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 3 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 1 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 62 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 62 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 158 +- + 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 | 7 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 26 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 62 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 13 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 13 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 45 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/si.c | 102 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 14 - + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 331 +++++ + drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 51 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 29 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 980 ++++++------- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 67 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 2 + + drivers/gpu/drm/amd/display/Kconfig | 8 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 197 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 193 ++- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 17 +- + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/bios/Makefile | 9 + + .../drm/amd/display/dc/bios/command_table_helper.c | 8 + + .../drm/amd/display/dc/bios/command_table_helper.h | 3 + + .../amd/display/dc/bios/command_table_helper2.c | 8 + + .../amd/display/dc/bios/command_table_helper2.h | 3 + + .../dc/bios/dce60/command_table_helper_dce60.c | 354 +++++ + .../dc/bios/dce60/command_table_helper_dce60.h | 33 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 11 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 6 + + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 174 +++ + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.h | 36 + + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 69 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 18 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 49 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 29 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 18 +- + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 131 ++ + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 23 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 37 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 18 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 46 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.h | 49 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 369 +++++ + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 38 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 176 ++- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 103 ++ + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 205 +++ + drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 49 + + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 330 +++++ + drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 178 +++ + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce60/Makefile | 34 + + .../drm/amd/display/dc/dce60/dce60_hw_sequencer.c | 432 ++++++ + .../drm/amd/display/dc/dce60/dce60_hw_sequencer.h | 37 + + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 1527 ++++++++++++++++++++ + .../gpu/drm/amd/display/dc/dce60/dce60_resource.h | 47 + + .../amd/display/dc/dce60/dce60_timing_generator.c | 266 ++++ + .../amd/display/dc/dce60/dce60_timing_generator.h | 39 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 27 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 3 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 49 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 5 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 14 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 7 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 12 + + .../amd/display/dc/gpio/dce60/hw_factory_dce60.c | 175 +++ + .../amd/display/dc/gpio/dce60/hw_factory_dce60.h | 32 + + .../amd/display/dc/gpio/dce60/hw_translate_dce60.c | 411 ++++++ + .../amd/display/dc/gpio/dce60/hw_translate_dce60.h | 32 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 10 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 10 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 11 + + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 11 + + .../amd/display/dc/irq/dce60/irq_service_dce60.c | 395 +++++ + .../amd/display/dc/irq/dce60/irq_service_dce60.h | 40 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 40 + + drivers/gpu/drm/amd/display/include/dal_types.h | 3 + + .../drm/amd/display/include/link_service_types.h | 2 + + .../drm/amd/display/modules/freesync/freesync.c | 5 +- + .../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 | 104 ++ + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 2 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 25 + + .../amd/include/asic_reg/umc/umc_8_7_0_offset.h | 33 + + .../amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h | 79 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 29 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 15 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 16 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 2 +- + .../amd/powerplay/hwmgr/vega20_processpptables.c | 2 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + + .../powerplay/inc/smu11_driver_if_sienna_cichlid.h | 21 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 4 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 14 - + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 94 +- + drivers/gpu/drm/amd/powerplay/smu_cmn.c | 10 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 + + drivers/gpu/drm/radeon/radeon_gart.c | 10 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + include/uapi/linux/kfd_ioctl.h | 3 +- + sound/pci/hda/hda_intel.c | 3 + + 160 files changed, 9024 insertions(+), 1108 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_7.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_7.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h +Merging drm-intel/for-linux-next (6bd0b413618f drm/i915: Filter wake_flags passed to default_wake_function) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gt/intel_lrc.c | 15 ++- + drivers/gpu/drm/i915/i915_pmu.c | 7 +- + drivers/gpu/drm/i915/i915_request.c | 146 +++++++++++++++-------- + drivers/gpu/drm/i915/i915_sw_fence.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 + + 5 files changed, 117 insertions(+), 64 deletions(-) +Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (f369bc3f9096 vgaarb: mark vga_tryget static) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_drv.c | 3 +-- + drivers/gpu/drm/omapdrm/omap_connector.c | 2 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 33 +++++++++++++++++--------------- + drivers/gpu/vga/vgaarb.c | 3 +-- + include/linux/vgaarb.h | 6 ------ + include/uapi/drm/drm_fourcc.h | 2 +- + 6 files changed, 22 insertions(+), 27 deletions(-) +Merging drm-msm/msm-next (1041dee2178f drm/msm: use kthread_create_worker instead of kthread_run) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/dsi.txt | 1 + + .../devicetree/bindings/display/msm/gpu.txt | 28 + + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 1102 +++++- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 102 +- + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 125 +- + drivers/gpu/drm/msm/adreno/a5xx.xml.h | 403 ++- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 5 +- + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 3624 ++++++++++++++++---- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 107 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 5 + + drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 147 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 191 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 25 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 12 +- + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 74 + + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 230 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 3 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 70 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 8 + + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 933 ++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 49 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 297 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 48 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 29 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 62 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 28 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 16 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 18 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 7 - + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 54 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 84 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 6 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h | 26 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h | 26 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 198 ++ + drivers/gpu/drm/msm/disp/mdp_common.xml.h | 26 +- + drivers/gpu/drm/msm/dsi/dsi.c | 2 + + drivers/gpu/drm/msm/dsi/dsi.xml.h | 230 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 21 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 41 +- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 26 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 18 + + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 26 +- + drivers/gpu/drm/msm/edp/edp.xml.h | 26 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 26 +- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 26 +- + drivers/gpu/drm/msm/msm_drv.c | 107 +- + drivers/gpu/drm/msm/msm_drv.h | 5 +- + drivers/gpu/drm/msm/msm_gem.c | 36 +- + drivers/gpu/drm/msm/msm_gpu.c | 7 +- + drivers/gpu/drm/msm/msm_gpu.h | 3 +- + 61 files changed, 7205 insertions(+), 1609 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 (408a85e31e3e drm/imx: imx-tve: Delete an error message in imx_tve_bind()) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (c5d5a32ead1e drm/etnaviv: fix ref count leak via pm_runtime_get_sync) +$ git merge etnaviv/etnaviv/next +Already up to date. +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 (2ac82e20e237 ALSA: docs: fix typo) +$ 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/usb/endpoint.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 +Auto-merging sound/pci/hda/hda_controller.h +Auto-merging sound/pci/hda/hda_codec.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/designs/procfile.rst | 2 +- + Documentation/sound/hd-audio/notes.rst | 6 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 2 +- + include/sound/control.h | 45 ++-- + include/sound/gus.h | 4 + + include/sound/hda_codec.h | 2 +- + 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/core/vmaster.c | 263 +++++++++++---------- + 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 | 34 +-- + 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/ca0106/ca0106_mixer.c | 18 +- + 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_codec.c | 96 ++++---- + sound/pci/hda/hda_controller.c | 11 +- + sound/pci/hda/hda_controller.h | 2 +- + sound/pci/hda/hda_generic.c | 154 +++++++----- + sound/pci/hda/hda_generic.h | 15 +- + sound/pci/hda/hda_intel.c | 44 ++-- + sound/pci/hda/hda_local.h | 10 +- + sound/pci/hda/hda_tegra.c | 1 + + sound/pci/hda/patch_ca0132.c | 10 +- + 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 | 24 +- + sound/pci/hda/thinkpad_helper.c | 19 +- + sound/pci/ice1712/delta.c | 2 +- + sound/pci/ice1712/juli.c | 20 +- + sound/pci/ice1712/quartet.c | 14 +- + 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/ppc/awacs.c | 12 +- + sound/sparc/dbri.c | 10 +- + sound/usb/6fire/control.c | 2 +- + sound/usb/caiaq/audio.c | 2 +- + sound/usb/caiaq/device.c | 2 +- + sound/usb/card.c | 2 +- + sound/usb/clock.c | 2 +- + sound/usb/endpoint.c | 5 +- + 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 - + 122 files changed, 1264 insertions(+), 841 deletions(-) +Merging sound-asoc/for-next (84569f329f7f 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 +Auto-merging sound/pci/hda/hda_codec.c +Removing include/sound/rt5670.h +Auto-merging include/sound/hdmi-codec.h +Auto-merging include/sound/hda_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/tas2770.txt +Removing Documentation/devicetree/bindings/sound/sgtl5000.txt +Removing Documentation/devicetree/bindings/sound/rohm,bd28623.txt +Removing Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.txt +Removing Documentation/devicetree/bindings/sound/everest,es8316.txt +Removing Documentation/devicetree/bindings/sound/ak4642.txt +Removing Documentation/devicetree/bindings/sound/ak4613.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,adau1977.txt | 6 +- + Documentation/devicetree/bindings/sound/ak4613.txt | 27 - + .../devicetree/bindings/sound/ak4613.yaml | 49 ++ + Documentation/devicetree/bindings/sound/ak4642.txt | 37 - + .../devicetree/bindings/sound/ak4642.yaml | 58 ++ + .../devicetree/bindings/sound/everest,es8316.txt | 23 - + .../devicetree/bindings/sound/everest,es8316.yaml | 50 ++ + .../devicetree/bindings/sound/fsl,spdif.txt | 6 +- + .../devicetree/bindings/sound/fsl-asoc-card.txt | 20 +- + .../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 | 8 +- + .../bindings/sound/nvidia,tegra186-dspk.yaml | 83 ++ + .../bindings/sound/nvidia,tegra210-admaif.yaml | 111 +++ + .../bindings/sound/nvidia,tegra210-ahub.yaml | 136 ++++ + .../bindings/sound/nvidia,tegra210-dmic.yaml | 83 ++ + .../bindings/sound/nvidia,tegra210-i2s.yaml | 101 +++ + .../devicetree/bindings/sound/qcom,q6asm.txt | 9 +- + .../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 ++ + .../devicetree/bindings/sound/rohm,bd28623.txt | 29 - + .../devicetree/bindings/sound/rohm,bd28623.yaml | 67 ++ + .../bindings/sound/samsung,aries-wm8994.yaml | 147 ++++ + .../bindings/sound/samsung,midas-audio.yaml | 108 +++ + .../devicetree/bindings/sound/sgtl5000.txt | 60 -- + .../devicetree/bindings/sound/sgtl5000.yaml | 103 +++ + .../bindings/sound/socionext,uniphier-aio.yaml | 81 ++ + .../bindings/sound/socionext,uniphier-evea.yaml | 70 ++ + .../devicetree/bindings/sound/tas2552.txt | 2 +- + .../devicetree/bindings/sound/tas2562.txt | 7 +- + .../devicetree/bindings/sound/tas2562.yaml | 69 ++ + .../devicetree/bindings/sound/tas2770.txt | 37 - + .../devicetree/bindings/sound/tas2770.yaml | 76 ++ + .../devicetree/bindings/sound/tas5720.txt | 6 +- + .../bindings/sound/ti,j721e-cpb-audio.yaml | 95 +++ + .../bindings/sound/ti,j721e-cpb-ivi-audio.yaml | 150 ++++ + .../devicetree/bindings/sound/ti,tas6424.txt | 2 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 34 +- + .../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/trivial-devices.yaml | 2 - + .../devicetree/bindings/vendor-prefixes.yaml | 2 +- + Documentation/sound/kernel-api/alsa-driver-api.rst | 2 +- + Documentation/sound/soc/dai.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/dt-bindings/sound/qcom,q6asm.h | 4 + + 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 | 30 +- + include/sound/soc-dai.h | 14 +- + include/sound/soc-dapm.h | 20 + + include/sound/soc-link.h | 1 + + include/sound/soc.h | 34 +- + include/sound/wm8960.h | 17 + + sound/pci/hda/hda_codec.c | 3 +- + sound/soc/Makefile | 2 +- + sound/soc/amd/Kconfig | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 14 +- + sound/soc/amd/acp-pcm-dma.c | 2 +- + sound/soc/amd/acp-rt5645.c | 4 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 236 ++++-- + sound/soc/amd/raven/acp3x-i2s.c | 14 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 12 +- + sound/soc/amd/raven/pci-acp3x.c | 21 +- + sound/soc/amd/renoir/rn-pci-acp3x.c | 33 + + sound/soc/amd/renoir/rn_acp3x.h | 2 + + sound/soc/atmel/atmel-classd.c | 141 ++-- + sound/soc/atmel/atmel-pcm-dma.c | 6 +- + sound/soc/atmel/atmel-pcm-pdc.c | 2 +- + sound/soc/atmel/atmel-pdmic.c | 124 ++- + sound/soc/atmel/atmel_ssc_dai.c | 1 + + sound/soc/atmel/atmel_wm8904.c | 2 +- + sound/soc/au1x/db1200.c | 2 +- + sound/soc/au1x/dbdma2.c | 2 +- + sound/soc/au1x/dma.c | 2 +- + sound/soc/bcm/bcm2835-i2s.c | 9 +- + sound/soc/bcm/bcm63xx-pcm-whistler.c | 12 +- + sound/soc/bcm/cygnus-pcm.c | 16 +- + sound/soc/cirrus/edb93xx.c | 2 +- + sound/soc/cirrus/ep93xx-ac97.c | 2 +- + sound/soc/cirrus/snappercl15.c | 2 +- + 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/cs47l15.c | 36 +- + sound/soc/codecs/cs47l35.c | 58 +- + sound/soc/codecs/cs47l85.c | 102 ++- + sound/soc/codecs/cs47l90.c | 92 +-- + sound/soc/codecs/cs47l92.c | 96 +-- + 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/hdac_hda.c | 30 +- + sound/soc/codecs/hdmi-codec.c | 27 +- + 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 | 38 +- + sound/soc/codecs/max98390.h | 2 +- + sound/soc/codecs/max9850.c | 4 +- + sound/soc/codecs/max9860.c | 2 +- + sound/soc/codecs/max9867.c | 5 +- + sound/soc/codecs/mc13783.c | 2 +- + 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/pcm186x-i2c.c | 2 +- + sound/soc/codecs/pcm186x-spi.c | 2 +- + sound/soc/codecs/pcm186x.c | 2 +- + sound/soc/codecs/pcm186x.h | 2 +- + 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 | 6 +- + 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 | 13 +- + sound/soc/codecs/tas2552.h | 2 +- + sound/soc/codecs/tas2562.c | 166 +++- + sound/soc/codecs/tas2562.h | 7 +- + sound/soc/codecs/tas2770.c | 10 +- + sound/soc/codecs/tas2770.h | 2 +- + sound/soc/codecs/tas571x.c | 5 +- + sound/soc/codecs/tas5720.c | 11 +- + sound/soc/codecs/tas5720.h | 2 +- + sound/soc/codecs/tas6424.c | 7 +- + sound/soc/codecs/tas6424.h | 2 +- + sound/soc/codecs/tda7419.c | 9 +- + sound/soc/codecs/tfa9879.c | 5 +- + sound/soc/codecs/tlv320adcx140.c | 124 ++- + sound/soc/codecs/tlv320adcx140.h | 16 +- + sound/soc/codecs/tlv320aic23.c | 21 +- + sound/soc/codecs/tlv320aic26.c | 11 +- + sound/soc/codecs/tlv320aic31xx.c | 13 +- + sound/soc/codecs/tlv320aic31xx.h | 2 +- + 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/wcd9335.h | 6 +- + 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 | 49 +- + 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 | 11 +- + sound/soc/codecs/wm_hubs.c | 30 +- + sound/soc/codecs/wmfw.h | 1 + + sound/soc/dwc/dwc-pcm.c | 2 +- + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/eukrea-tlv320.c | 2 +- + sound/soc/fsl/fsl-asoc-card.c | 216 ++++- + sound/soc/fsl/fsl_asrc.c | 103 ++- + sound/soc/fsl/fsl_asrc_dma.c | 4 +- + sound/soc/fsl/fsl_audmix.c | 10 +- + sound/soc/fsl/fsl_dma.c | 2 +- + sound/soc/fsl/fsl_easrc.c | 49 +- + sound/soc/fsl/fsl_esai.c | 34 +- + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/fsl/fsl_spdif.c | 233 ++++-- + sound/soc/fsl/fsl_ssi.c | 78 +- + sound/soc/fsl/fsl_ssi_dbg.c | 4 +- + sound/soc/fsl/imx-audmix.c | 10 +- + sound/soc/fsl/imx-audmux.c | 2 +- + sound/soc/fsl/imx-mc13783.c | 2 +- + sound/soc/fsl/mpc5200_dma.c | 8 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- + sound/soc/fsl/mpc8610_hpcd.c | 4 +- + sound/soc/fsl/mx27vis-aic32x4.c | 2 +- + sound/soc/fsl/p1022_ds.c | 2 +- + sound/soc/fsl/p1022_rdk.c | 2 +- + sound/soc/fsl/wm1133-ev1.c | 2 +- + sound/soc/generic/simple-card-utils.c | 13 +- + 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-mfld-platform-pcm.c | 6 +- + sound/soc/intel/atom/sst/sst_loader.c | 14 +- + sound/soc/intel/atom/sst/sst_stream.c | 43 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 16 +- + sound/soc/intel/boards/Kconfig | 15 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bdw-rt5650.c | 14 +- + sound/soc/intel/boards/bdw-rt5677.c | 34 +- + sound/soc/intel/boards/broadwell.c | 14 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 117 ++- + sound/soc/intel/boards/bxt_rt298.c | 4 +- + sound/soc/intel/boards/byt-rt5640.c | 2 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 12 +- + sound/soc/intel/boards/bytcht_da7213.c | 16 +- + sound/soc/intel/boards/bytcht_es8316.c | 17 +- + sound/soc/intel/boards/bytcr_rt5640.c | 18 +- + sound/soc/intel/boards/bytcr_rt5651.c | 18 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 14 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 14 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 19 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 32 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 102 +-- + sound/soc/intel/boards/ehl_rt5660.c | 2 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 8 +- + sound/soc/intel/boards/kbl_rt5660.c | 19 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 4 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- + sound/soc/intel/boards/skl_rt286.c | 2 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 2 +- + sound/soc/intel/boards/sof_maxim_common.c | 57 +- + sound/soc/intel/boards/sof_maxim_common.h | 3 + + sound/soc/intel/boards/sof_pcm512x.c | 4 +- + sound/soc/intel/boards/sof_rt5682.c | 69 +- + sound/soc/intel/boards/sof_sdw.c | 103 ++- + sound/soc/intel/boards/sof_sdw_common.h | 17 + + sound/soc/intel/boards/sof_sdw_hdmi.c | 6 + + sound/soc/intel/boards/sof_sdw_max98373.c | 86 ++ + sound/soc/intel/boards/sof_sdw_rt1308.c | 2 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 17 +- + sound/soc/intel/boards/sof_wm8804.c | 2 +- + 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/haswell/sst-haswell-pcm.c | 12 +- + sound/soc/intel/keembay/Makefile | 4 + + sound/soc/intel/keembay/kmb_platform.c | 668 +++++++++++++++ + sound/soc/intel/keembay/kmb_platform.h | 146 ++++ + sound/soc/intel/skylake/skl-pcm.c | 16 +- + sound/soc/intel/skylake/skl-topology.c | 5 +- + sound/soc/intel/skylake/skl-topology.h | 2 +- + sound/soc/kirkwood/armada-370-db.c | 2 +- + sound/soc/mediatek/Kconfig | 12 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 12 +- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 2 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 4 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 4 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 321 ++++++-- + sound/soc/mediatek/mt8183/mt8183-dai-i2s.c | 59 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 230 +++++- + 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-card.c | 2 +- + sound/soc/meson/axg-spdifout.c | 5 +- + sound/soc/meson/gx-card.c | 2 +- + sound/soc/meson/meson-card-utils.c | 4 +- + sound/soc/meson/meson-codec-glue.c | 2 +- + sound/soc/mxs/mxs-sgtl5000.c | 2 +- + sound/soc/pxa/brownstone.c | 2 +- + sound/soc/pxa/corgi.c | 4 +- + sound/soc/pxa/hx4700.c | 2 +- + sound/soc/pxa/imote2.c | 2 +- + sound/soc/pxa/magician.c | 6 +- + sound/soc/pxa/mioa701_wm9713.c | 8 +- + sound/soc/pxa/mmp-pcm.c | 2 +- + sound/soc/pxa/poodle.c | 4 +- + sound/soc/pxa/pxa-ssp.c | 2 +- + sound/soc/pxa/pxa2xx-i2s.c | 2 +- + sound/soc/pxa/spitz.c | 4 +- + sound/soc/pxa/tosa.c | 2 +- + sound/soc/pxa/z2.c | 2 +- + sound/soc/pxa/zylonite.c | 2 +- + sound/soc/qcom/Kconfig | 5 +- + sound/soc/qcom/apq8016_sbc.c | 120 +-- + sound/soc/qcom/apq8096.c | 30 +- + sound/soc/qcom/common.c | 58 +- + sound/soc/qcom/lpass-platform.c | 14 +- + sound/soc/qcom/qdsp6/q6adm.c | 7 +- + sound/soc/qcom/qdsp6/q6afe.c | 8 - + sound/soc/qcom/qdsp6/q6afe.h | 1 - + sound/soc/qcom/qdsp6/q6asm-dai.c | 36 +- + sound/soc/qcom/qdsp6/q6asm.c | 6 +- + sound/soc/qcom/qdsp6/q6routing.c | 2 +- + sound/soc/qcom/sdm845.c | 54 +- + sound/soc/qcom/storm.c | 2 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 2 +- + sound/soc/rockchip/rk3399_gru_sound.c | 25 +- + sound/soc/rockchip/rockchip_i2s.c | 2 +- + sound/soc/rockchip/rockchip_max98090.c | 2 +- + sound/soc/rockchip/rockchip_rt5645.c | 2 +- + sound/soc/rockchip/rockchip_spdif.c | 59 +- + sound/soc/samsung/Kconfig | 23 +- + sound/soc/samsung/Makefile | 4 + + sound/soc/samsung/aries_wm8994.c | 695 ++++++++++++++++ + sound/soc/samsung/arndale.c | 4 +- + sound/soc/samsung/h1940_uda1380.c | 2 +- + sound/soc/samsung/i2s.c | 2 +- + sound/soc/samsung/jive_wm8750.c | 2 +- + sound/soc/samsung/littlemill.c | 2 +- + sound/soc/samsung/midas_wm1811.c | 543 +++++++++++++ + sound/soc/samsung/neo1973_wm8753.c | 8 +- + sound/soc/samsung/odroid.c | 6 +- + sound/soc/samsung/pcm.c | 9 +- + sound/soc/samsung/rx1950_uda1380.c | 2 +- + sound/soc/samsung/s3c-i2s-v2.c | 2 +- + sound/soc/samsung/s3c24xx_simtec.c | 2 +- + sound/soc/samsung/s3c24xx_uda134x.c | 6 +- + sound/soc/samsung/smartq_wm8987.c | 2 +- + sound/soc/samsung/smdk_spdif.c | 2 +- + sound/soc/samsung/smdk_wm8580.c | 2 +- + sound/soc/samsung/smdk_wm8994.c | 2 +- + sound/soc/samsung/smdk_wm8994pcm.c | 2 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/samsung/spdif.c | 12 +- + sound/soc/samsung/tm2_wm5110.c | 8 +- + sound/soc/sh/Kconfig | 2 +- + sound/soc/sh/dma-sh7760.c | 12 +- + sound/soc/sh/fsi.c | 6 +- + sound/soc/sh/migor.c | 4 +- + sound/soc/sh/rcar/core.c | 8 +- + 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 | 670 ++++++++++----- + sound/soc/soc-compress.c | 4 +- + sound/soc/soc-core.c | 153 ++-- + sound/soc/soc-dai.c | 20 +- + sound/soc/soc-dapm.c | 41 +- + sound/soc/soc-generic-dmaengine-pcm.c | 18 +- + sound/soc/soc-io.c | 202 ----- + sound/soc/soc-link.c | 18 +- + sound/soc/soc-ops.c | 43 +- + sound/soc/soc-pcm.c | 190 ++--- + sound/soc/soc-topology.c | 73 +- + sound/soc/soc-utils.c | 5 +- + sound/soc/sof/imx/imx8.c | 24 +- + sound/soc/sof/imx/imx8m.c | 7 +- + sound/soc/sof/intel/hda-dai.c | 10 +- + sound/soc/sof/intel/hda-dsp.c | 50 +- + sound/soc/sof/intel/hda-pcm.c | 2 +- + sound/soc/sof/nocodec.c | 1 + + sound/soc/sof/pcm.c | 26 +- + sound/soc/sof/sof-acpi-dev.c | 8 +- + sound/soc/sof/topology.c | 2 + + sound/soc/spear/spdif_out.c | 8 +- + sound/soc/sprd/sprd-pcm-dma.c | 2 +- + sound/soc/sti/uniperif.h | 2 +- + sound/soc/stm/stm32_adfsdm.c | 21 +- + sound/soc/stm/stm32_sai_sub.c | 2 +- + sound/soc/sunxi/sun4i-codec.c | 12 +- + sound/soc/sunxi/sun4i-i2s.c | 10 +- + sound/soc/sunxi/sun4i-spdif.c | 4 +- + sound/soc/tegra/Kconfig | 56 ++ + sound/soc/tegra/Makefile | 10 + + sound/soc/tegra/tegra186_dspk.c | 442 ++++++++++ + sound/soc/tegra/tegra186_dspk.h | 70 ++ + sound/soc/tegra/tegra20_das.c | 3 +- + sound/soc/tegra/tegra20_das.h | 4 +- + sound/soc/tegra/tegra210_admaif.c | 800 ++++++++++++++++++ + sound/soc/tegra/tegra210_admaif.h | 162 ++++ + sound/soc/tegra/tegra210_ahub.c | 676 ++++++++++++++++ + sound/soc/tegra/tegra210_ahub.h | 127 +++ + sound/soc/tegra/tegra210_dmic.c | 456 +++++++++++ + sound/soc/tegra/tegra210_dmic.h | 82 ++ + sound/soc/tegra/tegra210_i2s.c | 812 +++++++++++++++++++ + sound/soc/tegra/tegra210_i2s.h | 126 +++ + sound/soc/tegra/tegra30_ahub.c | 4 +- + sound/soc/tegra/tegra30_i2s.c | 4 +- + sound/soc/tegra/tegra_alc5632.c | 2 +- + sound/soc/tegra/tegra_cif.h | 65 ++ + sound/soc/tegra/tegra_max98090.c | 2 +- + sound/soc/tegra/tegra_pcm.c | 235 +++++- + sound/soc/tegra/tegra_pcm.h | 21 +- + sound/soc/tegra/tegra_rt5640.c | 2 +- + sound/soc/tegra/tegra_rt5677.c | 2 +- + sound/soc/tegra/tegra_sgtl5000.c | 2 +- + sound/soc/tegra/tegra_wm8753.c | 2 +- + sound/soc/tegra/tegra_wm8903.c | 2 +- + sound/soc/tegra/trimslice.c | 2 +- + sound/soc/ti/Kconfig | 9 + + sound/soc/ti/Makefile | 2 + + sound/soc/ti/ams-delta.c | 9 +- + sound/soc/ti/davinci-evm.c | 6 +- + sound/soc/ti/davinci-mcasp.c | 3 + + sound/soc/ti/davinci-vcif.c | 4 +- + sound/soc/ti/j721e-evm.c | 896 +++++++++++++++++++++ + sound/soc/ti/n810.c | 4 +- + sound/soc/ti/omap-abe-twl6040.c | 4 +- + sound/soc/ti/omap-hdmi.c | 2 +- + sound/soc/ti/omap-mcbsp-st.c | 3 - + sound/soc/ti/omap-mcbsp.c | 4 +- + sound/soc/ti/omap-twl4030.c | 4 +- + sound/soc/ti/omap3pandora.c | 2 +- + sound/soc/ti/osk5912.c | 2 +- + sound/soc/ti/rx51.c | 4 +- + sound/soc/ti/sdma-pcm.c | 2 +- + sound/soc/ti/sdma-pcm.h | 2 +- + sound/soc/ti/udma-pcm.c | 2 +- + sound/soc/ti/udma-pcm.h | 2 +- + sound/soc/uniphier/aio-core.c | 7 +- + sound/soc/uniphier/aio-dma.c | 6 +- + sound/soc/ux500/mop500_ab8500.c | 8 +- + sound/soc/ux500/ux500_msp_i2s.c | 8 +- + sound/soc/ux500/ux500_pcm.c | 2 +- + sound/soc/xtensa/xtfpga-i2s.c | 2 +- + 550 files changed, 16283 insertions(+), 4808 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 + delete mode 100644 Documentation/devicetree/bindings/sound/everest,es8316.txt + create mode 100644 Documentation/devicetree/bindings/sound/everest,es8316.yaml + create mode 100644 Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98390.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rohm,bd28623.txt + create mode 100644 Documentation/devicetree/bindings/sound/rohm,bd28623.yaml + create mode 100644 Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml + create mode 100644 Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/sgtl5000.txt + create mode 100644 Documentation/devicetree/bindings/sound/sgtl5000.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/tas2562.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/tas2770.txt + create mode 100644 Documentation/devicetree/bindings/sound/tas2770.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 + create mode 100644 sound/soc/samsung/midas_wm1811.c + delete mode 100644 sound/soc/soc-io.c + create mode 100644 sound/soc/tegra/tegra186_dspk.c + create mode 100644 sound/soc/tegra/tegra186_dspk.h + create mode 100644 sound/soc/tegra/tegra210_admaif.c + create mode 100644 sound/soc/tegra/tegra210_admaif.h + create mode 100644 sound/soc/tegra/tegra210_ahub.c + create mode 100644 sound/soc/tegra/tegra210_ahub.h + create mode 100644 sound/soc/tegra/tegra210_dmic.c + create mode 100644 sound/soc/tegra/tegra210_dmic.h + create mode 100644 sound/soc/tegra/tegra210_i2s.c + create mode 100644 sound/soc/tegra/tegra210_i2s.h + create mode 100644 sound/soc/tegra/tegra_cif.h + create mode 100644 sound/soc/ti/j721e-evm.c +Merging modules/modules-next (d062557a3319 modules: inherit TAINT_PROPRIETARY_MODULE) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + include/linux/module.h | 26 +++----------------- + include/linux/moduleparam.h | 2 +- + kernel/module.c | 60 ++++++++++++++++++++++++++++++++------------- + 3 files changed, 47 insertions(+), 41 deletions(-) +Merging input/next (873a3a14a47e Input: elan_i2c - add ic type 0x15) +$ git merge input/next +Merge made by the 'recursive' strategy. + Documentation/input/uinput.rst | 6 +- + 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/ati_remote2.c | 4 +- + 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/elan_i2c.h | 20 +++- + drivers/input/mouse/elan_i2c_core.c | 195 ++++++++++++++++++++----------- + drivers/input/mouse/elan_i2c_i2c.c | 165 ++++++++++++++++++-------- + drivers/input/mouse/elan_i2c_smbus.c | 35 ++++-- + drivers/input/mouse/elantech.c | 12 +- + drivers/input/mouse/hgpk.c | 4 +- + drivers/input/mouse/navpoint.c | 2 +- + drivers/input/mouse/psmouse-base.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/atmel_mxt_ts.c | 56 ++++++++- + 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 +- + include/linux/rmi.h | 2 +- + 42 files changed, 413 insertions(+), 222 deletions(-) +Merging block/for-next (c0117e681d7e Merge branch 'for-5.9/io_uring' into for-next) +$ git merge block/for-next +Auto-merging include/linux/fs.h +Auto-merging include/linux/device-mapper.h +Auto-merging fs/xfs/xfs_file.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/nvme/host/tcp.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/nvme.h +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/md.c +CONFLICT (content): Merge conflict in drivers/md/md.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/acpi/property.c +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'drivers/md/md.c' using previous resolution. +Resolved 'fs/btrfs/disk-io.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d3b1a6aea34b] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 3 +- + Documentation/cdrom/cdrom-standard.rst | 18 +- + Documentation/filesystems/locking.rst | 4 +- + arch/xtensa/platforms/iss/simdisk.c | 2 - + block/bfq-iosched.c | 2 +- + block/bio.c | 4 +- + block/blk-cgroup.c | 218 +-- + block/blk-core.c | 6 + + block/blk-flush.c | 23 +- + block/blk-ioc.c | 42 +- + block/blk-iocost.c | 2 +- + block/blk-lib.c | 31 +- + block/blk-mq-sched.c | 6 +- + block/blk-mq-tag.h | 12 - + block/blk-mq.c | 64 +- + block/blk-rq-qos.c | 2 + + block/blk-settings.c | 37 +- + block/blk-timeout.c | 24 +- + block/blk.h | 19 +- + block/elevator.c | 4 +- + block/genhd.c | 18 +- + block/partitions/core.c | 2 - + drivers/acpi/property.c | 3 + + drivers/block/drbd/drbd_main.c | 59 - + drivers/block/drbd/drbd_nl.c | 4 +- + drivers/block/drbd/drbd_proc.c | 1 - + drivers/block/loop.c | 7 +- + drivers/cdrom/cdrom.c | 28 +- + drivers/md/bcache/Kconfig | 2 +- + drivers/md/bcache/Makefile | 2 +- + drivers/md/bcache/alloc.c | 2 +- + drivers/md/bcache/bcache.h | 31 +- + drivers/md/bcache/bset.c | 2 +- + drivers/md/bcache/btree.c | 12 +- + drivers/md/bcache/features.c | 75 + + drivers/md/bcache/features.h | 86 + + drivers/md/bcache/io.c | 2 +- + drivers/md/bcache/journal.c | 9 +- + drivers/md/bcache/movinggc.c | 8 +- + drivers/md/bcache/request.c | 61 +- + drivers/md/bcache/super.c | 278 ++-- + drivers/md/bcache/sysfs.c | 14 + + drivers/md/bcache/writeback.c | 22 +- + drivers/md/bcache/writeback.h | 19 +- + drivers/md/dm-cache-target.c | 19 - + drivers/md/dm-clone-target.c | 15 - + drivers/md/dm-era-target.c | 15 - + drivers/md/dm-raid.c | 12 - + drivers/md/dm-table.c | 59 +- + drivers/md/dm-thin.c | 16 - + drivers/md/dm.c | 33 - + drivers/md/dm.h | 1 - + drivers/md/md-linear.c | 24 - + drivers/md/md-multipath.c | 23 - + drivers/md/md.c | 66 +- + drivers/md/md.h | 4 - + drivers/md/raid0.c | 16 - + drivers/md/raid1.c | 31 - + drivers/md/raid10.c | 44 +- + drivers/md/raid5-cache.c | 12 +- + drivers/md/raid5-ppl.c | 11 +- + drivers/md/raid5.c | 365 +++-- + drivers/md/raid5.h | 53 +- + drivers/mmc/core/block.c | 3 - + drivers/nvme/host/core.c | 297 ++-- + drivers/nvme/host/fabrics.c | 2 +- + drivers/nvme/host/fabrics.h | 3 +- + drivers/nvme/host/fc.c | 6 +- + drivers/nvme/host/hwmon.c | 3 +- + drivers/nvme/host/multipath.c | 35 +- + drivers/nvme/host/nvme.h | 36 +- + drivers/nvme/host/pci.c | 133 +- + drivers/nvme/host/rdma.c | 99 +- + drivers/nvme/host/tcp.c | 27 +- + drivers/nvme/target/Kconfig | 12 + + drivers/nvme/target/Makefile | 1 + + drivers/nvme/target/admin-cmd.c | 24 +- + drivers/nvme/target/configfs.c | 103 ++ + drivers/nvme/target/core.c | 77 +- + drivers/nvme/target/fc.c | 30 +- + drivers/nvme/target/loop.c | 13 +- + drivers/nvme/target/nvmet.h | 55 +- + drivers/nvme/target/passthru.c | 544 +++++++ + drivers/nvme/target/rdma.c | 14 +- + fs/block_dev.c | 264 +--- + fs/btrfs/disk-io.c | 23 - + fs/btrfs/file.c | 2 +- + fs/io-wq.c | 14 +- + fs/io-wq.h | 11 +- + fs/io_uring.c | 2588 +++++++++++++++++-------------- + fs/isofs/inode.c | 3 - + fs/xfs/xfs_file.c | 2 +- + include/linux/backing-dev-defs.h | 43 +- + include/linux/backing-dev.h | 22 +- + include/linux/blk-cgroup.h | 6 - + include/linux/blk-mq.h | 50 +- + include/linux/blk_types.h | 8 +- + include/linux/blkdev.h | 18 +- + include/linux/cdrom.h | 2 - + include/linux/device-mapper.h | 11 - + include/linux/fs.h | 26 +- + include/linux/genhd.h | 1 + + include/linux/nvme-fc-driver.h | 2 +- + include/linux/nvme.h | 4 + + include/linux/pagemap.h | 75 + + include/linux/sched/task.h | 6 + + include/uapi/linux/bcache.h | 38 +- + include/uapi/linux/io_uring.h | 4 +- + include/uapi/linux/raid/md_p.h | 2 +- + mm/backing-dev.c | 157 +- + mm/filemap.c | 107 +- + tools/cgroup/iocost_monitor.py | 2 +- + tools/io_uring/liburing.h | 6 +- + 113 files changed, 4062 insertions(+), 3041 deletions(-) + create mode 100644 drivers/md/bcache/features.c + create mode 100644 drivers/md/bcache/features.h + create mode 100644 drivers/nvme/target/passthru.c +Merging device-mapper/for-next (4861f596091f Merge branch 'dm-5.9' into for-next) +$ 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 23d06477600f] 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 (ac42e4e906b6 dt-bindings: mmc: mediatek: Add document for mt6779) +$ git merge mmc/next +Auto-merging include/linux/mmc/sdio_ids.h +Removing Documentation/devicetree/bindings/mmc/renesas,sdhi.txt +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 +Removing Documentation/devicetree/bindings/mmc/arasan,sdhci.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.txt | 192 ------------- + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 299 +++++++++++++++++++++ + .../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 +++++ + Documentation/devicetree/bindings/mmc/mtk-sd.txt | 1 + + .../devicetree/bindings/mmc/renesas,sdhi.txt | 114 -------- + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 191 +++++++++++++ + .../devicetree/bindings/mmc/sdhci-am654.txt | 1 + + .../devicetree/bindings/mmc/sdhci-msm.txt | 18 ++ + arch/arm/mach-omap2/mmc.h | 4 - + drivers/memstick/host/jmb38x_ms.c | 38 +-- + 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/Kconfig | 1 + + drivers/mmc/host/atmel-mci.c | 4 +- + drivers/mmc/host/cqhci.c | 4 +- + drivers/mmc/host/dw_mmc-exynos.c | 4 +- + drivers/mmc/host/mmci.c | 2 + + drivers/mmc/host/mtk-sd.c | 163 ++++++++++- + 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-cadence.c | 123 ++++----- + 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 | 32 ++- + drivers/mmc/host/sdhci-pci-gli.c | 220 ++++++++++++++- + drivers/mmc/host/sdhci-pci-o2micro.c | 39 ++- + drivers/mmc/host/sdhci-s3c.c | 4 + + drivers/mmc/host/sdhci-tegra.c | 9 + + drivers/mmc/host/sdhci.c | 24 +- + 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/mmc/host/via-sdmmc.c | 33 +-- + 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 + + 55 files changed, 1654 insertions(+), 626 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/arasan,sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml + 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 + delete mode 100644 Documentation/devicetree/bindings/mmc/renesas,sdhi.txt + create mode 100644 Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml +Merging mfd/for-mfd-next (3ce0baa5b7d8 mfd: syscon: Use a unique name with regmap_config) +$ 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/mfd/twl-family.txt | 2 +- + .../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/dln2.c | 4 + + drivers/mfd/hi6421-pmic-core.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 19 ++ + drivers/mfd/intel_soc_pmic_mrfld.c | 7 +- + drivers/mfd/kempld-core.c | 30 +-- + drivers/mfd/khadas-mcu.c | 142 +++++++++++ + drivers/mfd/lm3533-ctrlbank.c | 94 ++++--- + drivers/mfd/lp873x.c | 2 +- + drivers/mfd/lp87565.c | 2 +- + drivers/mfd/madera-core.c | 33 ++- + drivers/mfd/madera-i2c.c | 1 - + drivers/mfd/max14577.c | 2 +- + drivers/mfd/mfd-core.c | 129 +++++++++- + drivers/mfd/motorola-cpcap.c | 23 ++ + drivers/mfd/omap-usb-host.c | 6 +- + drivers/mfd/omap-usb-tll.c | 4 +- + drivers/mfd/rave-sp.c | 2 +- + drivers/mfd/rn5t618.c | 46 +++- + 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/syscon.c | 4 +- + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/ti_am335x_tscadc.c | 2 +- + drivers/mfd/tps65010.c | 5 +- + drivers/mfd/tps65086.c | 2 +- + drivers/mfd/tps65217.c | 6 +- + drivers/mfd/tps65218.c | 6 +- + drivers/mfd/tps6586x.c | 7 +- + drivers/mfd/tps65912-core.c | 2 +- + drivers/mfd/tps65912-i2c.c | 2 +- + drivers/mfd/tps65912-spi.c | 2 +- + 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 | 42 +++- + include/linux/mfd/da9055/pdata.h | 2 +- + include/linux/mfd/da9063/core.h | 1 + + include/linux/mfd/da9063/registers.h | 15 +- + include/linux/mfd/hi6421-pmic.h | 2 +- + include/linux/mfd/khadas-mcu.h | 91 +++++++ + include/linux/mfd/lp873x.h | 2 +- + include/linux/mfd/lp87565.h | 2 +- + include/linux/mfd/madera/pdata.h | 1 - + include/linux/mfd/max77693-private.h | 2 +- + include/linux/mfd/smsc.h | 104 -------- + include/linux/mfd/stm32-lptimer.h | 5 + + include/linux/mfd/ti_am335x_tscadc.h | 2 +- + include/linux/mfd/tps65086.h | 2 +- + include/linux/mfd/tps65217.h | 2 +- + include/linux/mfd/tps65218.h | 2 +- + include/linux/mfd/tps65912.h | 2 +- + 86 files changed, 1733 insertions(+), 846 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 (7eb99a39ef76 video: backlight: cr_bllcd: Remove unused variable 'intensity') +$ git merge backlight/for-backlight-next +Removing include/linux/platform_data/sky81452-backlight.h +Removing drivers/video/backlight/ot200_bl.c +Removing drivers/video/backlight/generic_bl.c +Merge made by the 'recursive' strategy. + Documentation/gpu/backlight.rst | 12 + + Documentation/gpu/index.rst | 1 + + drivers/mfd/sky81452.c | 2 - + drivers/video/backlight/88pm860x_bl.c | 13 +- + drivers/video/backlight/Kconfig | 15 - + drivers/video/backlight/Makefile | 2 - + drivers/video/backlight/adp5520_bl.c | 10 +- + drivers/video/backlight/adp8860_bl.c | 10 +- + drivers/video/backlight/adp8870_bl.c | 10 +- + drivers/video/backlight/as3711_bl.c | 11 +- + drivers/video/backlight/backlight.c | 206 +++++++----- + drivers/video/backlight/bd6107.c | 7 +- + drivers/video/backlight/corgi_lcd.c | 8 +- + drivers/video/backlight/cr_bllcd.c | 26 +- + drivers/video/backlight/da903x_bl.c | 13 +- + drivers/video/backlight/ep93xx_bl.c | 8 +- + drivers/video/backlight/generic_bl.c | 110 ------- + drivers/video/backlight/gpio_backlight.c | 17 +- + drivers/video/backlight/hp680_bl.c | 6 +- + drivers/video/backlight/ili922x.c | 8 +- + drivers/video/backlight/jornada720_bl.c | 2 +- + drivers/video/backlight/kb3886_bl.c | 6 +- + drivers/video/backlight/lcd.c | 1 + + drivers/video/backlight/led_bl.c | 7 +- + drivers/video/backlight/lm3533_bl.c | 10 +- + drivers/video/backlight/lm3630a_bl.c | 4 +- + drivers/video/backlight/lms501kf03.c | 9 - + drivers/video/backlight/locomolcd.c | 6 +- + drivers/video/backlight/lv5207lp.c | 7 +- + drivers/video/backlight/max8925_bl.c | 13 +- + drivers/video/backlight/ot200_bl.c | 162 --------- + drivers/video/backlight/pwm_bl.c | 7 +- + drivers/video/backlight/qcom-wled.c | 15 +- + drivers/video/backlight/sky81452-backlight.c | 52 +-- + drivers/video/backlight/tps65217_bl.c | 10 +- + drivers/video/backlight/wm831x_bl.c | 13 +- + include/linux/backlight.h | 399 ++++++++++++++++++----- + include/linux/mfd/sky81452.h | 2 - + include/linux/platform_data/sky81452-backlight.h | 35 -- + 39 files changed, 538 insertions(+), 717 deletions(-) + create mode 100644 Documentation/gpu/backlight.rst + delete mode 100644 drivers/video/backlight/generic_bl.c + delete mode 100644 drivers/video/backlight/ot200_bl.c + delete mode 100644 include/linux/platform_data/sky81452-backlight.h +Merging battery/for-next (46cbd0b05799 power: supply: wilco_ec: Add long life charging mode) +$ git merge battery/for-next +Auto-merging drivers/power/supply/power_supply_core.c +Removing Documentation/devicetree/bindings/power/supply/gpio-charger.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 3 +- + Documentation/ABI/testing/sysfs-class-power-wilco | 4 + + .../devicetree/bindings/power/supply/battery.txt | 86 +- + .../devicetree/bindings/power/supply/battery.yaml | 144 +++ + .../devicetree/bindings/power/supply/bq2515x.yaml | 93 ++ + .../devicetree/bindings/power/supply/bq25890.txt | 30 +- + .../devicetree/bindings/power/supply/bq27xxx.yaml | 2 + + .../bindings/power/supply/gpio-charger.txt | 31 - + .../bindings/power/supply/gpio-charger.yaml | 63 ++ + drivers/power/reset/Kconfig | 11 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/keystone-reset.c | 2 +- + drivers/power/reset/linkstation-poweroff.c | 136 +++ + drivers/power/supply/88pm860x_battery.c | 6 +- + drivers/power/supply/Kconfig | 13 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/axp20x_usb_power.c | 2 +- + drivers/power/supply/bq2415x_charger.c | 16 +- + drivers/power/supply/bq24190_charger.c | 4 +- + drivers/power/supply/bq24257_charger.c | 6 +- + drivers/power/supply/bq2515x_charger.c | 1169 ++++++++++++++++++++ + drivers/power/supply/bq27xxx_battery.c | 160 ++- + drivers/power/supply/bq27xxx_battery_hdq.c | 2 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 6 +- + drivers/power/supply/cpcap-battery.c | 2 +- + drivers/power/supply/da9030_battery.c | 12 +- + drivers/power/supply/gpio-charger.c | 38 +- + drivers/power/supply/max17040_battery.c | 51 +- + drivers/power/supply/max8998_charger.c | 25 +- + drivers/power/supply/power_supply_core.c | 2 +- + drivers/power/supply/power_supply_sysfs.c | 6 +- + drivers/power/supply/rt5033_battery.c | 2 +- + drivers/power/supply/sbs-battery.c | 89 +- + drivers/power/supply/sc27xx_fuel_gauge.c | 9 +- + drivers/power/supply/test_power.c | 2 +- + drivers/power/supply/wilco-charger.c | 5 + + include/linux/math64.h | 19 + + include/linux/power/bq2415x_charger.h | 4 +- + include/linux/power/bq27xxx_battery.h | 2 + + include/linux/power_supply.h | 4 + + 40 files changed, 2044 insertions(+), 219 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/battery.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/bq2515x.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.yaml + create mode 100644 drivers/power/reset/linkstation-poweroff.c + create mode 100644 drivers/power/supply/bq2515x_charger.c +Merging regulator/for-next (3f0279488821 Merge remote-tracking branch 'regulator/for-5.9' into regulator-next) +$ git merge regulator/for-next +Removing Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/da9211.txt | 4 + + .../regulator/google,cros-ec-regulator.yaml | 51 ++ + .../devicetree/bindings/regulator/lp872x.txt | 4 +- + .../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 | 320 -------- + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 108 +++ + .../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 | 115 ++- + drivers/regulator/cpcap-regulator.c | 18 +- + drivers/regulator/cros-ec-regulator.c | 252 +++++++ + 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 | 9 +- + drivers/regulator/hi6421-regulator.c | 2 +- + drivers/regulator/hi6421v530-regulator.c | 2 +- + drivers/regulator/lp873x-regulator.c | 2 +- + drivers/regulator/lp87565-regulator.c | 23 +- + 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/pbias-regulator.c | 2 +- + drivers/regulator/pca9450-regulator.c | 833 +++++++++++++++++++++ + 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/tps65023-regulator.c | 2 +- + drivers/regulator/tps6507x-regulator.c | 2 +- + drivers/regulator/tps65086-regulator.c | 2 +- + drivers/regulator/tps65217-regulator.c | 9 +- + drivers/regulator/tps65218-regulator.c | 6 +- + drivers/regulator/tps65912-regulator.c | 2 +- + 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 | 83 ++ + include/linux/regulator/consumer.h | 10 + + include/linux/regulator/driver.h | 7 +- + include/linux/regulator/machine.h | 1 + + include/linux/regulator/pca9450.h | 219 ++++++ + 64 files changed, 3042 insertions(+), 487 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 + delete mode 100644 Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.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-Revert-Wire-UFFD-up-to-SELinux.patch +Applying: Revert "Wire UFFD up to SELinux" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/userfaultfd.c +$ git add -A . +$ git commit -v -a --amend +[master 954f30f91ba5] Merge remote-tracking branch 'security/next-testing' + Date: Mon Aug 3 14:39:25 2020 +1000 +$ git am -3 ../patches/0002-Revert-Teach-SELinux-about-anonymous-inodes.patch +Applying: Revert "Teach SELinux about anonymous inodes" +$ git reset HEAD^ +Unstaged changes after reset: +M security/selinux/hooks.c +M security/selinux/include/classmap.h +$ git add -A . +$ git commit -v -a --amend +[master 238b6e0dd791] Merge remote-tracking branch 'security/next-testing' + Date: Mon Aug 3 14:39:25 2020 +1000 +$ git am -3 ../patches/0003-Revert-Add-a-new-LSM-supporting-anonymous-inode-inte.patch +Applying: Revert "Add a new LSM-supporting anonymous inode interface" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/anon_inodes.c +M include/linux/anon_inodes.h +M include/linux/lsm_hook_defs.h +M include/linux/lsm_hooks.h +M include/linux/security.h +M security/security.c +$ git add -A . +$ git commit -v -a --amend +[master 7d6b40b69706] Merge remote-tracking branch 'security/next-testing' + Date: Mon Aug 3 14:39:25 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 (3db0d0c276a7 integrity: remove redundant initialization of variable ret) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/Kconfig +Auto-merging kernel/kexec_file.c +Merge made by the 'recursive' strategy. + include/linux/ima.h | 4 +- + kernel/kexec_file.c | 2 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/ima/Kconfig | 4 +- + security/integrity/ima/ima.h | 73 ++++---- + security/integrity/ima/ima_api.c | 2 +- + security/integrity/ima/ima_appraise.c | 8 +- + security/integrity/ima/ima_asymmetric_keys.c | 2 +- + security/integrity/ima/ima_main.c | 41 +++-- + security/integrity/ima/ima_modsig.c | 20 --- + security/integrity/ima/ima_policy.c | 240 +++++++++++++++++++-------- + security/integrity/ima/ima_queue_keys.c | 7 +- + security/integrity/integrity.h | 13 ++ + security/integrity/integrity_audit.c | 11 +- + 14 files changed, 286 insertions(+), 143 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 +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 (42a2df3e829f Smack: prevent underflow in smk_set_cipso()) +$ git merge smack/next +Merge made by the 'recursive' strategy. + security/smack/smackfs.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) +Merging tomoyo/master (bcf876870b95 Linux 5.8) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (85467f63a05c tpm: Add support for event log pointer found in TPM2 ACPI table) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/eventlog/acpi.c | 63 ++++++++++++++++++++++++++-------------- + drivers/char/tpm/tpm-chip.c | 9 ++---- + drivers/char/tpm/tpm.h | 5 +++- + drivers/char/tpm/tpm2-space.c | 26 ++++++++++------- + drivers/char/tpm/tpmrm-dev.c | 2 +- + include/acpi/actbl3.h | 7 +++++ + include/linux/tpm.h | 1 + + include/linux/tpm_eventlog.h | 11 +++++-- + 8 files changed, 82 insertions(+), 42 deletions(-) +Merging watchdog/master (92ed30191993 Linux 5.8-rc7) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (e46b3c0d011e Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next) +$ git merge iommu/next +Auto-merging drivers/memory/mtk-smi.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/iommu/Kconfig +CONFLICT (content): Merge conflict in drivers/iommu/Kconfig +Auto-merging drivers/gpu/drm/panfrost/panfrost_mmu.c +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +Auto-merging arch/powerpc/include/asm/device.h +Auto-merging MAINTAINERS +Resolved 'drivers/iommu/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 62541b774a86] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm64/silicon-errata.rst | 3 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 31 +- + .../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 | 5 +- + 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/gpu/drm/panfrost/panfrost_mmu.c | 2 +- + drivers/iommu/Kconfig | 146 +-------- + drivers/iommu/Makefile | 15 +- + drivers/iommu/amd/Kconfig | 44 +++ + drivers/iommu/amd/Makefile | 4 + + drivers/iommu/amd/init.c | 13 +- + drivers/iommu/amd/iommu.c | 31 +- + drivers/iommu/arm/Makefile | 2 + + drivers/iommu/arm/arm-smmu-v3/Makefile | 2 + + drivers/iommu/{ => arm/arm-smmu-v3}/arm-smmu-v3.c | 4 +- + drivers/iommu/arm/arm-smmu/Makefile | 4 + + drivers/iommu/{ => arm/arm-smmu}/arm-smmu-impl.c | 60 +++- + drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 278 +++++++++++++++++ + drivers/iommu/{ => arm/arm-smmu}/arm-smmu-qcom.c | 0 + drivers/iommu/{ => arm/arm-smmu}/arm-smmu.c | 42 ++- + drivers/iommu/{ => arm/arm-smmu}/arm-smmu.h | 6 + + drivers/iommu/{ => arm/arm-smmu}/qcom_iommu.c | 66 ++-- + drivers/iommu/exynos-iommu.c | 32 +- + drivers/iommu/fsl_pamu.c | 5 +- + drivers/iommu/fsl_pamu_domain.c | 8 +- + drivers/iommu/intel/Kconfig | 86 ++++++ + drivers/iommu/intel/Makefile | 7 + + drivers/iommu/intel/debugfs.c | 2 +- + drivers/iommu/intel/dmar.c | 26 +- + drivers/iommu/intel/iommu.c | 141 +++++---- + drivers/iommu/intel/pasid.c | 13 +- + drivers/iommu/intel/{intel-pasid.h => pasid.h} | 2 +- + drivers/iommu/intel/svm.c | 335 ++++++++++++++++----- + drivers/iommu/io-pgtable-arm-v7s.c | 18 +- + drivers/iommu/io-pgtable-arm.c | 21 +- + drivers/iommu/iommu.c | 37 ++- + drivers/iommu/iova.c | 4 +- + drivers/iommu/ipmmu-vmsa.c | 14 +- + drivers/iommu/msm_iommu.c | 6 +- + drivers/iommu/mtk_iommu.c | 112 +++++-- + drivers/iommu/mtk_iommu.h | 23 +- + drivers/iommu/mtk_iommu_v1.c | 10 +- + drivers/iommu/omap-iommu-debug.c | 3 + + drivers/iommu/omap-iommu.c | 22 +- + 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/dmar.h | 1 + + include/linux/intel-iommu.h | 13 +- + include/linux/io-pgtable.h | 2 +- + include/linux/iommu.h | 38 +-- + include/uapi/linux/iommu.h | 6 +- + 63 files changed, 1465 insertions(+), 572 deletions(-) + create mode 100644 drivers/iommu/amd/Kconfig + create mode 100644 drivers/iommu/amd/Makefile + create mode 100644 drivers/iommu/arm/Makefile + create mode 100644 drivers/iommu/arm/arm-smmu-v3/Makefile + rename drivers/iommu/{ => arm/arm-smmu-v3}/arm-smmu-v3.c (99%) + create mode 100644 drivers/iommu/arm/arm-smmu/Makefile + rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu-impl.c (72%) + create mode 100644 drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c + rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu-qcom.c (100%) + rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu.c (98%) + rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu.h (98%) + rename drivers/iommu/{ => arm/arm-smmu}/qcom_iommu.c (95%) + create mode 100644 drivers/iommu/intel/Kconfig + create mode 100644 drivers/iommu/intel/Makefile + rename drivers/iommu/intel/{intel-pasid.h => pasid.h} (98%) + create mode 100644 include/dt-bindings/memory/mt6779-larb-port.h +$ git am -3 ../patches/0001-merge-fix-for-dma-mapping-make-support-for-dma-ops-o.patch +Applying: merge fix for "dma-mapping: make support for dma ops optional" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iommu/intel/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 0eb6dc7f0c50] Merge remote-tracking branch 'iommu/next' + Date: Mon Aug 3 14:50:19 2020 +1000 +Merging vfio/next (ccd59dce1a21 vfio/type1: Refactor vfio_iommu_type1_ioctl()) +$ git merge vfio/next +Auto-merging include/linux/pci_ids.h +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 54 ++++- + drivers/vfio/vfio.c | 13 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 4 +- + drivers/vfio/vfio_iommu_type1.c | 398 +++++++++++++++++++----------------- + include/linux/pci_ids.h | 6 + + 5 files changed, 282 insertions(+), 193 deletions(-) +Merging audit/next (b43870c74f3f audit: report audit wait metric in audit status reply) +$ 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/auditsc.c +Auto-merging kernel/audit_tree.c +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + include/linux/audit.h | 46 +++++++++++------ + include/uapi/linux/audit.h | 18 ++++--- + kernel/audit.c | 39 +++++++++----- + 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/apparmor/audit.c | 10 ++-- + security/apparmor/file.c | 25 +++------ + security/apparmor/ipc.c | 46 ++++++++--------- + security/apparmor/net.c | 14 ++--- + security/lsm_audit.c | 9 +++- + 13 files changed, 273 insertions(+), 106 deletions(-) +Merging devicetree/for-next (fb820b494acb of: property: Add device link support for pinctrl-0 through pinctrl-8) +$ git merge devicetree/for-next +Auto-merging include/linux/device.h +Auto-merging drivers/of/property.c +Auto-merging drivers/of/address.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 +Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +Removing Documentation/devicetree/bindings/rtc/sa1100-rtc.txt +Removing Documentation/devicetree/bindings/rtc/imxdi-rtc.txt +Removing Documentation/devicetree/bindings/phy/ti-phy-gmii-sel.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/misc/olpc,xo1.75-ec.txt +Auto-merging Documentation/devicetree/bindings/mfd/syscon.yaml +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 +Auto-merging Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml +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 +CONFLICT (modify/delete): Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt deleted in HEAD and modified in devicetree/for-next. Version devicetree/for-next of Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt left in tree. +Removing Documentation/devicetree/bindings/clock/imx7ulp-clock.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt +rm 'Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt' +$ git commit --no-edit -v -a +[master 233b13424dca] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + .../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/display/tilcdc/tilcdc.txt | 2 +- + .../devicetree/bindings/fpga/fpga-region.txt | 2 +- + .../devicetree/bindings/gpio/mrvl-gpio.txt | 48 ------ + .../devicetree/bindings/gpio/mrvl-gpio.yaml | 173 +++++++++++++++++++ + .../devicetree/bindings/i2c/i2c-gpio.yaml | 8 +- + .../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 ++++++ + .../interrupt-controller/loongson,liointc.yaml | 4 +- + .../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/iommu/renesas,ipmmu-vmsa.yaml | 1 + + .../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 +++++++++++++++++++++ + .../devicetree/bindings/media/i2c/imx274.txt | 5 + + .../devicetree/bindings/media/xilinx/video.txt | 2 +- + .../devicetree/bindings/mfd/aspeed-lpc.txt | 2 +- + Documentation/devicetree/bindings/mfd/da9062.txt | 4 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 3 +- + .../devicetree/bindings/misc/olpc,xo1.75-ec.txt | 23 --- + .../devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 52 ++++++ + .../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/phy/ti,phy-gmii-sel.yaml | 104 ++++++++++++ + .../devicetree/bindings/phy/ti-phy-gmii-sel.txt | 69 -------- + .../devicetree/bindings/property-units.txt | 1 + + .../devicetree/bindings/pwm/pwm-samsung.yaml | 23 ++- + .../bindings/reset/socionext,uniphier-reset.yaml | 112 +++++++++++++ + .../devicetree/bindings/reset/uniphier-reset.txt | 121 +------------- + .../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/qcom-tsens.yaml | 2 +- + .../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 -- + Documentation/devicetree/bindings/virtio/mmio.txt | 2 +- + MAINTAINERS | 5 +- + drivers/base/core.c | 2 +- + drivers/of/address.c | 2 +- + drivers/of/of_reserved_mem.c | 2 +- + drivers/of/property.c | 89 +++++++++- + include/dt-bindings/mux/mux.h | 2 +- + include/linux/device.h | 1 + + 75 files changed, 2387 insertions(+), 1124 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/misc/olpc,xo1.75-ec.txt + create mode 100644 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.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 + create mode 100644 Documentation/devicetree/bindings/phy/ti,phy-gmii-sel.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/ti-phy-gmii-sel.txt + create mode 100644 Documentation/devicetree/bindings/reset/socionext,uniphier-reset.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 +$ git am -3 ../patches/0001-fix-for-dt-bindings-drm-bridge-Replace-HTTP-links-wi.patch +Applying: fix for "dt-bindings: drm/bridge: Replace HTTP links with HTTPS ones" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml +$ git add -A . +$ git commit -v -a --amend +[master 45e86d3c34ef] Merge remote-tracking branch 'devicetree/for-next' + Date: Mon Aug 3 15:08:46 2020 +1000 +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 (11ba28229f82 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-lantiq-ssc.c +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 +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 a5c48178059c] 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 | 2 + + .../devicetree/bindings/spi/spi-davinci.txt | 4 +- + .../devicetree/bindings/spi/spi-fsl-lpspi.txt | 29 - + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 67 +++ + .../devicetree/bindings/spi/spi-lantiq-ssc.txt | 21 +- + .../devicetree/bindings/spi/spi-mt65xx.txt | 1 + + 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/gpio/gpiolib-of.c | 10 +- + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 1 + + drivers/memory/renesas-rpc-if.c | 603 +++++++++++++++++++++ + drivers/spi/Kconfig | 27 +- + drivers/spi/Makefile | 1 + + drivers/spi/atmel-quadspi.c | 8 +- + drivers/spi/spi-altera.c | 179 +++++- + drivers/spi/spi-amd.c | 2 + + drivers/spi/spi-at91-usart.c | 7 - + 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-bitbang.c | 6 +- + drivers/spi/spi-cadence.c | 2 +- + drivers/spi/spi-cavium-thunderx.c | 1 + + drivers/spi/spi-coldfire-qspi.c | 4 +- + drivers/spi/spi-davinci.c | 7 +- + drivers/spi/spi-ep93xx.c | 4 +- + drivers/spi/spi-fsl-lpspi.c | 79 +-- + 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 | 248 ++++----- + drivers/spi/spi-lantiq-ssc.c | 177 ++++-- + drivers/spi/spi-loopback-test.c | 16 +- + drivers/spi/spi-meson-spicc.c | 4 +- + drivers/spi/spi-meson-spifc.c | 2 +- + drivers/spi/spi-mt65xx.c | 3 + + 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-pl022.c | 12 +- + drivers/spi/spi-ppc4xx.c | 106 +--- + drivers/spi/spi-pxa2xx.c | 2 + + drivers/spi/spi-rockchip.c | 46 +- + drivers/spi/spi-rpc-if.c | 216 ++++++++ + drivers/spi/spi-s3c64xx.c | 9 +- + drivers/spi/spi-sun4i.c | 2 +- + drivers/spi/spi-sun6i.c | 77 ++- + drivers/spi/spi-ti-qspi.c | 2 +- + drivers/spi/spi-topcliff-pch.c | 59 +- + drivers/spi/spi-zynq-qspi.c | 3 +- + drivers/spi/spi-zynqmp-gqspi.c | 6 +- + drivers/spi/spi.c | 73 ++- + drivers/spi/spidev.c | 21 +- + include/linux/platform_data/spi-imx.h | 33 -- + include/linux/spi/altera.h | 29 + + include/linux/spi/spi.h | 29 +- + include/memory/renesas-rpc-if.h | 87 +++ + 80 files changed, 2223 insertions(+), 1000 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 (2d0dc9721208 Merge branch 'core/debugobjects') +$ git merge tip/auto-latest +Auto-merging tools/testing/selftests/Makefile +Auto-merging tools/memory-model/Documentation/explanation.txt +Auto-merging scripts/Makefile.lib +Auto-merging net/core/sock.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/fork.c +Auto-merging kernel/events/core.c +Auto-merging kernel/Makefile +Auto-merging init/do_mounts_initrd.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/perf_event.h +Auto-merging include/linux/sched/task.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/math64.h +Auto-merging include/linux/compiler.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging fs/btrfs/extent_io.c +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/pci/controller/vmd.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/acpi/acpi_pad.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/fpu/xstate.c +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/x86/include/asm/inst.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/inst.h +Auto-merging arch/x86/include/asm/fpu/xstate.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/fpu/xstate.h +Auto-merging arch/x86/include/asm/fpu/internal.h +Auto-merging arch/x86/boot/compressed/Makefile +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/s390/include/asm/smp.h +Auto-merging arch/powerpc/platforms/pseries/setup.c +Auto-merging arch/powerpc/platforms/pseries/lpar.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/include/asm/paca.h +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/locking/mutex-design.rst +Removing Documentation/devicetree/bindings/mfd/atmel-tcb.txt +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Removing Documentation/RCU/rculist_nulls.txt +Auto-merging Documentation/RCU/Design/Requirements/Requirements.rst +Resolved 'arch/x86/include/asm/fpu/xstate.h' using previous resolution. +Resolved 'arch/x86/include/asm/inst.h' using previous resolution. +Resolved 'drivers/gpu/drm/msm/msm_drv.c' using previous resolution. +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 3fe455fd11d3] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + Documentation/ABI/testing/sysfs-devices-mapping | 33 + + .../RCU/Design/Requirements/Requirements.rst | 7 +- + 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/admin-guide/kernel-parameters.txt | 70 ++ + Documentation/admin-guide/sysctl/kernel.rst | 54 + + Documentation/atomic_t.txt | 24 +- + Documentation/dev-tools/kcsan.rst | 3 +- + .../devicetree/bindings/mfd/atmel-tcb.txt | 56 - + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 155 +++ + .../devicetree/bindings/timer/ingenic,sysost.yaml | 63 ++ + .../bindings/timer/ti,keystone-timer.txt | 2 +- + Documentation/dontdiff | 1 + + 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/index.rst | 1 + + Documentation/locking/locktorture.rst | 2 +- + Documentation/locking/seqlock.rst | 170 +++ + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-capacity.rst | 439 ++++++++ + Documentation/scheduler/sched-energy.rst | 12 +- + Documentation/x86/boot.rst | 6 +- + Documentation/x86/x86_64/fsgs.rst | 199 ++++ + Documentation/x86/x86_64/index.rst | 1 + + MAINTAINERS | 6 +- + Makefile | 3 +- + arch/Kconfig | 3 + + arch/arm/boot/dts/sama5d2.dtsi | 12 +- + arch/arm/common/bL_switcher.c | 3 +- + arch/arm/include/asm/percpu.h | 2 +- + arch/arm/include/asm/thread_info.h | 5 - + arch/arm/include/asm/topology.h | 3 +- + arch/arm64/include/asm/topology.h | 3 +- + arch/mips/pci/pci-xtalk-bridge.c | 3 + + 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 | 5 +- + arch/x86/Kconfig.debug | 3 + + arch/x86/Makefile | 32 +- + arch/x86/boot/compressed/Makefile | 6 +- + arch/x86/boot/compressed/kaslr.c | 7 - + arch/x86/boot/compressed/misc.c | 4 + + arch/x86/boot/header.S | 8 +- + arch/x86/configs/i386_defconfig | 92 +- + arch/x86/configs/x86_64_defconfig | 93 +- + arch/x86/entry/calling.h | 40 + + arch/x86/entry/common.c | 638 ++--------- + arch/x86/entry/entry_32.S | 2 +- + arch/x86/entry/entry_64.S | 141 ++- + 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/events/rapl.c | 3 +- + arch/x86/events/zhaoxin/core.c | 2 +- + arch/x86/include/asm/asm.h | 6 +- + arch/x86/include/asm/boot.h | 11 +- + arch/x86/include/asm/bug.h | 1 + + arch/x86/include/asm/cmpxchg_32.h | 2 +- + arch/x86/include/asm/cpufeatures.h | 4 + + arch/x86/include/asm/div64.h | 14 +- + arch/x86/include/asm/efi.h | 20 +- + arch/x86/include/asm/entry-common.h | 76 ++ + 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 | 42 +- + arch/x86/include/asm/inst.h | 15 + + arch/x86/include/asm/io_apic.h | 1 - + arch/x86/include/asm/kdebug.h | 5 +- + 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/percpu.h | 510 +++------ + arch/x86/include/asm/perf_event.h | 82 +- + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/include/asm/pgtable_64.h | 13 +- + arch/x86/include/asm/pgtable_64_types.h | 2 - + arch/x86/include/asm/processor.h | 70 +- + arch/x86/include/asm/ptrace.h | 5 + + arch/x86/include/asm/signal.h | 1 - + arch/x86/include/asm/sparsemem.h | 6 +- + arch/x86/include/asm/special_insns.h | 1 - + arch/x86/include/asm/stackprotector.h | 12 + + arch/x86/include/asm/sync_core.h | 72 ++ + arch/x86/include/asm/thread_info.h | 5 - + arch/x86/include/asm/topology.h | 2 +- + arch/x86/include/asm/tsc.h | 3 - + arch/x86/include/asm/uaccess.h | 5 +- + arch/x86/include/asm/uv/bios.h | 2 +- + arch/x86/include/asm/uv/uv.h | 2 +- + arch/x86/include/asm/uv/uv_bau.h | 118 +-- + arch/x86/include/asm/uv/uv_hub.h | 36 +- + arch/x86/include/asm/uv/uv_mmrs.h | 712 ------------- + arch/x86/include/uapi/asm/bootparam.h | 2 +- + arch/x86/include/uapi/asm/hwcap2.h | 3 + + arch/x86/kernel/alternative.c | 44 +- + arch/x86/kernel/apic/io_apic.c | 5 + + arch/x86/kernel/apic/vector.c | 4 + + arch/x86/kernel/apic/x2apic_uv_x.c | 122 +-- + arch/x86/kernel/cpu/bugs.c | 19 +- + arch/x86/kernel/cpu/common.c | 22 + + arch/x86/kernel/cpu/intel.c | 2 + + arch/x86/kernel/cpu/mce/core.c | 9 +- + 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/dumpstack.c | 23 +- + arch/x86/kernel/fpu/core.c | 39 + + arch/x86/kernel/fpu/xstate.c | 89 +- + arch/x86/kernel/idt.c | 2 +- + arch/x86/kernel/kexec-bzimage64.c | 9 - + 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_32.c | 29 +- + arch/x86/kernel/process_64.c | 190 +++- + arch/x86/kernel/ptrace.c | 60 +- + arch/x86/kernel/signal.c | 3 +- + arch/x86/kernel/smpboot.c | 64 +- + arch/x86/kernel/traps.c | 41 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/vmx/vmx.c | 13 +- + arch/x86/kvm/x86.c | 15 +- + arch/x86/mm/fault.c | 6 +- + arch/x86/mm/init.c | 3 +- + arch/x86/mm/init_64.c | 59 +- + arch/x86/mm/mem_encrypt.c | 2 +- + arch/x86/mm/pat/set_memory.c | 2 +- + arch/x86/platform/efi/efi.c | 16 +- + arch/x86/platform/efi/efi_64.c | 38 +- + arch/x86/platform/efi/quirks.c | 31 - + arch/x86/platform/uv/bios_uv.c | 173 +-- + arch/x86/platform/uv/tlb_uv.c | 243 +---- + arch/x86/platform/uv/uv_time.c | 16 +- + arch/x86/xen/enlighten_pv.c | 2 +- + arch/x86/xen/smp_pv.c | 2 - + arch/x86/xen/time.c | 1 + + crypto/crypto_engine.c | 3 +- + drivers/acpi/acpi_pad.c | 3 +- + drivers/base/arch_topology.c | 11 + + drivers/block/drbd/drbd_receiver.c | 5 +- + drivers/clocksource/Kconfig | 15 +- + drivers/clocksource/Makefile | 1 + + drivers/clocksource/ingenic-sysost.c | 539 ++++++++++ + drivers/clocksource/ingenic-timer.c | 182 +++- + drivers/clocksource/nomadik-mtu.c | 11 +- + drivers/clocksource/sh_cmt.c | 2 +- + drivers/clocksource/timer-atmel-tcb.c | 103 +- + drivers/clocksource/timer-ti-32k.c | 2 +- + drivers/clocksource/timer-ti-dm.c | 2 +- + 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/iommu/intel/irq_remapping.c | 8 + + drivers/irqchip/irq-gic-v3-its.c | 5 +- + drivers/media/pci/ivtv/ivtv-driver.c | 4 +- + drivers/mfd/ioc3.c | 6 + + drivers/misc/sgi-gru/grufault.c | 1 + + drivers/misc/sgi-gru/gruhandles.c | 1 + + drivers/misc/sgi-gru/grukservices.c | 1 + + drivers/mmc/core/sdio_irq.c | 3 +- + drivers/pci/controller/vmd.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 +- + fs/btrfs/extent_io.c | 2 + + include/asm-generic/bug.h | 1 + + include/asm-generic/vmlinux.lds.h | 24 +- + include/dt-bindings/clock/ingenic,sysost.h | 12 + + include/linux/arch_topology.h | 4 +- + include/linux/compiler.h | 53 - + include/linux/context_tracking.h | 2 + + include/linux/cpu.h | 1 + + include/linux/decompress/unzstd.h | 11 + + include/linux/entry-common.h | 372 +++++++ + include/linux/entry-kvm.h | 80 ++ + include/linux/ftrace.h | 12 +- + include/linux/hardirq.h | 28 +- + include/linux/instrumentation.h | 57 + + include/linux/irq.h | 13 + + include/linux/irqdesc.h | 15 - + include/linux/irqflags.h | 36 +- + include/linux/irqhandler.h | 1 - + include/linux/kprobes.h | 15 + + include/linux/kvm_host.h | 8 + + include/linux/lockdep.h | 53 +- + include/linux/math64.h | 2 + + include/linux/perf_event.h | 15 +- + include/linux/psi_types.h | 7 +- + include/linux/rculist.h | 4 +- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 53 +- + include/linux/rcupdate_trace.h | 4 +- + include/linux/rcutiny.h | 20 +- + include/linux/rcutree.h | 2 +- + include/linux/rwsem.h | 20 +- + include/linux/sched.h | 45 +- + include/linux/sched/isolation.h | 1 + + include/linux/sched/loadavg.h | 2 +- + include/linux/sched/mm.h | 8 +- + include/linux/sched/sysctl.h | 4 + + include/linux/sched/task.h | 1 + + include/linux/sched/topology.h | 17 + + include/linux/seccomp.h | 2 + + include/linux/seqlock.h | 756 ++++++++----- + include/linux/torture.h | 5 + + include/soc/at91/atmel_tcb.h | 5 + + include/trace/events/rcu.h | 19 +- + include/trace/events/sched.h | 14 +- + include/uapi/linux/perf_event.h | 26 +- + init/Kconfig | 32 +- + init/do_mounts_initrd.c | 5 - + kernel/Makefile | 1 + + kernel/entry/Makefile | 13 + + kernel/entry/common.c | 374 +++++++ + kernel/entry/kvm.c | 51 + + kernel/events/core.c | 115 +- + kernel/fork.c | 29 +- + kernel/futex.c | 114 +- + kernel/irq/Kconfig | 4 - + kernel/irq/chip.c | 13 - + kernel/irq/debugfs.c | 5 + + kernel/irq/manage.c | 12 +- + kernel/kallsyms.c | 42 +- + kernel/kcsan/Makefile | 9 +- + kernel/kcsan/atomic.h | 6 +- + kernel/kcsan/core.c | 37 +- + kernel/kcsan/kcsan-test.c | 1107 ++++++++++++++++++++ + kernel/kcsan/kcsan.h | 7 + + kernel/kcsan/report.c | 12 +- + kernel/kcsan/{test.c => selftest.c} | 0 + kernel/kprobes.c | 60 +- + kernel/kthread.c | 6 +- + kernel/locking/lockdep.c | 146 ++- + kernel/locking/lockdep_proc.c | 2 +- + kernel/locking/locktorture.c | 24 +- + kernel/locking/osq_lock.c | 6 +- + kernel/rcu/Kconfig.debug | 19 + + kernel/rcu/Makefile | 1 + + kernel/rcu/rcuperf.c | 33 +- + kernel/rcu/rcutorture.c | 126 ++- + kernel/rcu/refscale.c | 717 +++++++++++++ + kernel/rcu/srcutree.c | 16 +- + kernel/rcu/tasks.h | 37 +- + kernel/rcu/tiny.c | 7 +- + kernel/rcu/tree.c | 407 ++++--- + kernel/rcu/tree.h | 15 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 4 +- + kernel/rcu/tree_stall.h | 9 +- + kernel/rcu/update.c | 16 +- + kernel/sched/core.c | 516 +++++++-- + 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 | 93 +- + kernel/sched/idle.c | 11 +- + kernel/sched/isolation.c | 3 +- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.c | 6 +- + kernel/sched/pelt.h | 5 + + kernel/sched/psi.c | 110 +- + kernel/sched/rt.c | 4 +- + kernel/sched/sched.h | 126 ++- + kernel/sched/stop_task.c | 12 +- + kernel/sched/topology.c | 2 +- + kernel/smp.c | 3 +- + kernel/softirq.c | 8 +- + kernel/sysctl.c | 21 + + kernel/time/tick-sched.c | 22 +- + kernel/time/timekeeping.c | 2 +- + kernel/time/timer.c | 253 ++--- + kernel/torture.c | 6 +- + kernel/trace/ftrace.c | 101 +- + kernel/trace/ring_buffer_benchmark.c | 48 +- + lib/Kconfig | 4 + + lib/Kconfig.debug | 18 + + lib/Kconfig.kcsan | 26 +- + lib/Makefile | 25 + + lib/cpumask.c | 16 +- + lib/debugobjects.c | 13 +- + lib/decompress.c | 5 + + lib/decompress_unzstd.c | 345 ++++++ + lib/math/div64.c | 41 + + lib/test_fpu.c | 89 ++ + lib/test_vmalloc.c | 103 +- + lib/zstd/fse_decompress.c | 9 +- + lib/zstd/zstd_internal.h | 14 +- + mm/list_lru.c | 6 +- + mm/mmap.c | 1 + + net/core/net-sysfs.c | 10 +- + net/core/sock.c | 4 +- + scripts/Makefile.kcsan | 2 +- + scripts/Makefile.lib | 22 + + tools/include/linux/irqflags.h | 4 +- + tools/memory-model/Documentation/explanation.txt | 83 +- + tools/memory-model/Documentation/recipes.txt | 2 +- + tools/memory-model/Documentation/references.txt | 21 +- + tools/memory-model/README | 40 +- + 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 ++ + .../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.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 | 19 +- + .../selftests/rcutorture/bin/parse-console.sh | 27 +- + .../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 + + 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 + + usr/Kconfig | 20 + + usr/Makefile | 1 + + virt/kvm/Kconfig | 3 + + 378 files changed, 13409 insertions(+), 5572 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-mapping + 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%) + delete mode 100644 Documentation/devicetree/bindings/mfd/atmel-tcb.txt + create mode 100644 Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml + create mode 100644 Documentation/devicetree/bindings/timer/ingenic,sysost.yaml + 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 Documentation/locking/seqlock.rst + create mode 100644 Documentation/scheduler/sched-capacity.rst + 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/entry-common.h + create mode 100644 drivers/clocksource/ingenic-sysost.c + create mode 100644 include/dt-bindings/clock/ingenic,sysost.h + create mode 100644 include/linux/decompress/unzstd.h + create mode 100644 include/linux/entry-common.h + create mode 100644 include/linux/entry-kvm.h + create mode 100644 include/linux/instrumentation.h + create mode 100644 kernel/entry/Makefile + create mode 100644 kernel/entry/common.c + create mode 100644 kernel/entry/kvm.c + 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 lib/decompress_unzstd.c + 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 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-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/x86/fsgsbase_restore.c +$ 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 72eaa4b59069] Merge remote-tracking branch 'tip/auto-latest' + Date: Mon Aug 3 15:22:41 2020 +1000 +Merging clockevents/timers/drivers/next (9fba22584e54 clocksource: Ingenic: Add support for the Ingenic X1000 OST.) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Merge made by the 'recursive' strategy. +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 (ac62460c2412 irqchip/loongson-pch-pic: Fix the misused irq flow handler) +$ git merge irqchip/irq/irqchip-next +Auto-merging kernel/irq/chip.c +Auto-merging include/linux/acpi.h +Auto-merging drivers/irqchip/irq-ti-sci-inta.c +Auto-merging drivers/irqchip/irq-gic.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/brcm,l2-intc.txt | 5 +- + .../interrupt-controller/loongson,htvec.yaml | 4 +- + drivers/irqchip/Kconfig | 3 +- + drivers/irqchip/irq-ativic32.c | 2 +- + drivers/irqchip/irq-atmel-aic5.c | 8 +- + drivers/irqchip/irq-bcm7038-l1.c | 11 ++ + drivers/irqchip/irq-bcm7120-l2.c | 8 +- + drivers/irqchip/irq-brcmstb-l2.c | 5 + + drivers/irqchip/irq-gic-v3-its.c | 14 +- + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-gic.c | 2 +- + drivers/irqchip/irq-imx-intmux.c | 70 ++++++++- + drivers/irqchip/irq-loongson-htpic.c | 6 +- + drivers/irqchip/irq-loongson-htvec.c | 32 ++-- + drivers/irqchip/irq-loongson-liointc.c | 11 +- + drivers/irqchip/irq-loongson-pch-msi.c | 7 +- + drivers/irqchip/irq-loongson-pch-pic.c | 30 ++-- + drivers/irqchip/irq-mips-gic.c | 10 +- + drivers/irqchip/irq-mtk-cirq.c | 4 +- + drivers/irqchip/irq-mtk-sysirq.c | 12 +- + drivers/irqchip/irq-stm32-exti.c | 166 +++++++++++---------- + drivers/irqchip/irq-ti-sci-inta.c | 6 +- + drivers/irqchip/irq-vic.c | 26 +--- + drivers/irqchip/irqchip.c | 29 ++++ + drivers/irqchip/qcom-pdc.c | 8 +- + include/linux/acpi.h | 23 ++- + include/linux/irqchip.h | 29 +++- + include/linux/irqchip/arm-gic-v3.h | 4 - + include/linux/irqchip/arm-vic.h | 11 -- + include/linux/irqchip/irq-bcm2836.h | 2 +- + kernel/irq/chip.c | 3 +- + kernel/irq/irqdomain.c | 3 +- + 32 files changed, 346 insertions(+), 210 deletions(-) +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/trace.c +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 (c86409b6f860 rcu: Move rcu_cpu_started per-CPU variable to rcu_data) +$ git merge rcu/rcu/next +Auto-merging tools/objtool/check.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/smp.c +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/locking/locktorture.c +Auto-merging kernel/kcsan/report.c +Auto-merging kernel/kcsan/core.c +Auto-merging kernel/Makefile +Auto-merging include/linux/kcsan-checks.h +Auto-merging arch/x86/entry/common.c +CONFLICT (content): Merge conflict in arch/x86/entry/common.c +Auto-merging Documentation/memory-barriers.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/RCU/Design/Requirements/Requirements.rst +Resolved 'arch/x86/entry/common.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2db2a4275297] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Data-Structures/Data-Structures.rst | 2 +- + .../RCU/Design/Requirements/Requirements.rst | 4 +- + Documentation/RCU/whatisRCU.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 96 ++++ + Documentation/memory-barriers.txt | 6 +- + arch/x86/kvm/mmu/page_track.c | 6 +- + include/asm-generic/atomic-instrumented.h | 330 ++++++------ + include/asm-generic/bitops/instrumented-atomic.h | 6 +- + include/asm-generic/bitops/instrumented-lock.h | 2 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 6 +- + include/linux/instrumented.h | 30 ++ + include/linux/kcsan-checks.h | 45 +- + include/linux/rculist.h | 48 ++ + include/linux/rcupdate.h | 12 +- + include/linux/rcutiny.h | 1 - + include/linux/rcutree.h | 1 - + include/linux/smp.h | 3 + + include/linux/smp_types.h | 3 + + include/trace/events/rcu.h | 54 +- + kernel/Makefile | 2 + + kernel/kcsan/core.c | 151 +++++- + kernel/kcsan/kcsan-test.c | 128 ++++- + kernel/kcsan/report.c | 4 + + kernel/locking/locktorture.c | 2 +- + kernel/rcu/rcu_segcblist.c | 10 +- + kernel/rcu/rcutorture.c | 57 +- + kernel/rcu/refscale.c | 8 +- + kernel/rcu/srcutree.c | 13 - + kernel/rcu/tree.c | 52 +- + kernel/rcu/tree.h | 1 + + kernel/rcu/tree_exp.h | 6 +- + kernel/rcu/tree_plugin.h | 7 +- + kernel/rcu/tree_stall.h | 8 +- + kernel/rcu/update.c | 13 - + kernel/scftorture.c | 575 +++++++++++++++++++++ + kernel/smp.c | 134 +++++ + kernel/time/tick-sched.c | 2 +- + lib/Kconfig.debug | 21 + + lib/Kconfig.kcsan | 5 + + lib/nmi_backtrace.c | 6 +- + scripts/Makefile.kcsan | 2 +- + scripts/atomic/gen-atomic-instrumented.sh | 21 +- + tools/memory-model/Documentation/recipes.txt | 4 +- + tools/memory-model/Documentation/references.txt | 2 +- + 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 | 55 ++ + .../selftests/rcutorture/bin/kvm-recheck-scf.sh | 38 ++ + tools/testing/selftests/rcutorture/bin/kvm.sh | 11 +- + .../selftests/rcutorture/bin/parse-console.sh | 7 +- + .../selftests/rcutorture/configs/rcu/TREE05 | 1 + + .../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 +- + 73 files changed, 2133 insertions(+), 488 deletions(-) + 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/kvm-recheck-scf.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/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/mmu/page_track.c +Auto-merging arch/x86/kvm/lapic.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/powerpc/include/asm/Kbuild +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 arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/include/asm/kvm_host.h +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 83a46f76f665] 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 68691409f4aa] Merge remote-tracking branch 'kvm/linux-next' + Date: Mon Aug 3 16:06:05 2020 +1000 +Merging kvm-arm/next (16314874b12b Merge branch 'kvm-arm64/misc-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 +Auto-merging arch/arm64/kvm/mmio.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/kernel/cpu_errata.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 670cab8fb5f2] Merge remote-tracking branch 'kvm-arm/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/Kconfig | 20 +- + arch/arm64/include/asm/kvm_asm.h | 75 +- + arch/arm64/include/asm/kvm_coproc.h | 8 - + arch/arm64/include/asm/kvm_emulate.h | 75 +- + 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/cpu_errata.c | 4 +- + arch/arm64/kernel/image-vars.h | 54 ++ + arch/arm64/kvm/Kconfig | 2 +- + 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 | 62 ++ + 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 | 154 ++++ + 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/mmio.c | 6 - + arch/arm64/kvm/mmu.c | 312 ++++--- + 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/va_layout.c | 2 +- + 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 +- + include/trace/events/kvm.h | 2 +- + scripts/kallsyms.c | 1 + + 62 files changed, 2814 insertions(+), 2376 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 (81ab595ddd3c KVM: PPC: Book3S HV: Rework secure mem slot dropping) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/book3s_interrupts.S +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_radix.c +Auto-merging arch/powerpc/include/asm/reg.h +Merge made by the 'recursive' strategy. + Documentation/powerpc/ultravisor.rst | 3 + + arch/powerpc/include/asm/kvm_book3s_uvmem.h | 14 + + arch/powerpc/include/asm/kvm_ppc.h | 2 +- + arch/powerpc/include/asm/reg.h | 4 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 8 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 4 + + arch/powerpc/kvm/book3s_hv.c | 26 +- + arch/powerpc/kvm/book3s_hv_nested.c | 30 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 698 +++++++++++++++++++++------- + arch/powerpc/kvm/book3s_interrupts.S | 56 ++- + arch/powerpc/kvm/book3s_pr.c | 9 +- + arch/powerpc/kvm/book3s_rtas.c | 2 + + arch/powerpc/kvm/booke.c | 9 +- + arch/powerpc/kvm/booke_interrupts.S | 9 +- + arch/powerpc/kvm/bookehv_interrupts.S | 10 +- + arch/powerpc/kvm/powerpc.c | 5 +- + 16 files changed, 646 insertions(+), 243 deletions(-) +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 20f82d1e37d2] 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 (4fa640dc5230 Merge tag 'vfio-v5.8-rc7' of git://github.com/awilliam/linux-vfio into master) +$ git merge percpu/for-next +Already up to date. +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 (67186653c903 platform/x86: asus-nb-wmi: Drop duplicate DMI quirk structures) +$ 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 | 32 +++++ + 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 | 77 ++++++++++ + 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 | 157 ++++++++++++++++++--- + include/linux/platform_data/mlxreg.h | 4 + + include/linux/string_helpers.h | 15 ++ + include/uapi/linux/isst_if.h | 2 +- + lib/test-string_helpers.c | 67 +++++++++ + tools/power/x86/intel-speed-select/isst-config.c | 81 ++++++++--- + 25 files changed, 846 insertions(+), 135 deletions(-) + create mode 100644 drivers/platform/x86/intel_atomisp2_led.c +Merging chrome-platform/for-next (fc8cacf3fc68 platform/chrome: cros_ec_proto: check for missing EC_CMD_HOST_EVENT_GET_WAKE_MASK) +$ 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_proto.c | 42 ++- + drivers/platform/chrome/cros_ec_rpmsg.c | 3 + + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 98 ++---- + drivers/platform/chrome/cros_ec_spi.c | 4 + + drivers/platform/chrome/cros_ec_typec.c | 399 ++++++++++++++++++++--- + include/linux/platform_data/cros_ec_commands.h | 33 +- + include/linux/platform_data/cros_ec_proto.h | 3 - + 10 files changed, 483 insertions(+), 128 deletions(-) +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (2742b4192a27 Make LEDS_LP55XX_COMMON depend on I2C to fix build errors:) +$ git merge leds/for-next +Removing Documentation/devicetree/bindings/leds/leds-lp55xx.txt +Merge made by the 'recursive' strategy. + .../testing/sysfs-class-led-driver-turris-omnia | 14 + + .../ABI/testing/sysfs-class-led-multicolor | 35 +++ + .../bindings/leds/cznic,turris-omnia-leds.yaml | 90 +++++++ + .../bindings/leds/leds-class-multicolor.yaml | 37 +++ + .../devicetree/bindings/leds/leds-lm3532.txt | 2 +- + .../devicetree/bindings/leds/leds-lm3601x.txt | 4 +- + .../devicetree/bindings/leds/leds-lm36274.txt | 2 +- + .../devicetree/bindings/leds/leds-lm3692x.txt | 2 +- + .../devicetree/bindings/leds/leds-lm3697.txt | 2 +- + .../devicetree/bindings/leds/leds-lp55xx.txt | 228 ---------------- + .../devicetree/bindings/leds/leds-lp55xx.yaml | 220 +++++++++++++++ + .../devicetree/bindings/leds/leds-lp8860.txt | 2 +- + .../devicetree/bindings/leds/leds-pca955x.txt | 6 +- + Documentation/leds/index.rst | 1 + + Documentation/leds/leds-class-multicolor.rst | 86 ++++++ + drivers/leds/Kconfig | 33 ++- + drivers/leds/Makefile | 2 + + drivers/leds/led-class-multicolor.c | 203 ++++++++++++++ + drivers/leds/led-class.c | 1 + + drivers/leds/led-core.c | 1 + + drivers/leds/led-triggers.c | 28 +- + 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-lm3532.c | 4 +- + drivers/leds/leds-lm3533.c | 12 +- + drivers/leds/leds-lm355x.c | 16 +- + drivers/leds/leds-lm3601x.c | 2 +- + drivers/leds/leds-lm36274.c | 17 +- + drivers/leds/leds-lm3642.c | 9 +- + drivers/leds/leds-lm3692x.c | 2 +- + drivers/leds/leds-lm3697.c | 2 +- + drivers/leds/leds-lp5521.c | 43 ++- + drivers/leds/leds-lp5523.c | 62 +++-- + drivers/leds/leds-lp5562.c | 22 +- + drivers/leds/leds-lp55xx-common.c | 239 ++++++++++++----- + drivers/leds/leds-lp55xx-common.h | 16 +- + drivers/leds/leds-lp8501.c | 23 +- + drivers/leds/leds-ns2.c | 9 +- + drivers/leds/leds-pca955x.c | 2 +- + drivers/leds/leds-turris-omnia.c | 295 +++++++++++++++++++++ + drivers/leds/leds-wm831x-status.c | 14 +- + drivers/leds/trigger/ledtrig-gpio.c | 3 +- + drivers/leds/trigger/ledtrig-pattern.c | 6 +- + include/dt-bindings/leds/common.h | 3 +- + include/linux/led-class-multicolor.h | 121 +++++++++ + include/linux/leds.h | 10 + + include/linux/platform_data/leds-lp55xx.h | 13 +- + 49 files changed, 1633 insertions(+), 451 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-led-driver-turris-omnia + create mode 100644 Documentation/ABI/testing/sysfs-class-led-multicolor + create mode 100644 Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml + create mode 100644 Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.yaml + create mode 100644 Documentation/leds/leds-class-multicolor.rst + create mode 100644 drivers/leds/led-class-multicolor.c + create mode 100644 drivers/leds/leds-turris-omnia.c + create mode 100644 include/linux/led-class-multicolor.h +Merging ipmi/for-next (634b06def11c ipmi/watchdog: add missing newlines when printing parameters by sysfs) +$ 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_msghandler.c | 2 -- + drivers/char/ipmi/ipmi_ssif.c | 5 ----- + drivers/char/ipmi/ipmi_watchdog.c | 9 +++++++-- + 4 files changed, 11 insertions(+), 9 deletions(-) +Merging driver-core/driver-core-next (76acb5ee76b1 drm/bridge: lvds-codec: simplify error handling) +$ git merge driver-core/driver-core-next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/trace.c +Auto-merging include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Auto-merging fs/debugfs/file.c +Auto-merging drivers/gpu/drm/bridge/sil-sii8620.c +Auto-merging drivers/base/core.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +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 2836409247e0] 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/admin-guide/kernel-parameters.txt | 15 + + Documentation/driver-api/driver-model/platform.rst | 2 +- + drivers/base/base.h | 3 + + drivers/base/core.c | 324 +++++++++++++++++++-- + drivers/base/dd.c | 63 +++- + drivers/base/devres.c | 25 +- + drivers/base/driver.c | 4 +- + drivers/base/firmware_loader/fallback_platform.c | 5 +- + 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 +- + drivers/gpu/drm/bridge/lvds-codec.c | 10 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 21 +- + fs/debugfs/file.c | 2 +- + fs/debugfs/inode.c | 39 +++ + fs/debugfs/internal.h | 14 + + include/linux/device.h | 290 +++++++++--------- + include/linux/kobject.h | 1 - + include/linux/sysfs.h | 7 + + kernel/trace/trace.c | 4 +- + lib/Kconfig.debug | 40 ++- + lib/devres.c | 17 +- + lib/kobject.c | 33 ++- + scripts/coccinelle/misc/add_namespace.cocci | 8 +- + scripts/nsdeps | 2 +- + tools/testing/selftests/firmware/settings | 8 + + tools/testing/selftests/kselftest/runner.sh | 6 +- + 35 files changed, 946 insertions(+), 255 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 + create mode 100644 tools/testing/selftests/firmware/settings +Merging usb/usb-next (e3ee0e740c38 usb: common: usb-conn-gpio: Register charger) +$ git merge usb/usb-next +Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c +Auto-merging drivers/net/thunderbolt.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 57 +- + Documentation/admin-guide/thunderbolt.rst | 11 +- + Documentation/devicetree/bindings/usb/brcm,bdc.txt | 4 +- + .../bindings/usb/ingenic,jz4770-phy.yaml | 6 +- + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 51 +- + Documentation/driver-api/usb/URB.rst | 2 +- + Documentation/usb/gadget_hid.rst | 2 +- + Documentation/usb/gadget_multi.rst | 10 +- + Documentation/usb/linux.inf | 2 +- + MAINTAINERS | 7 + + arch/arm/mach-omap1/board-osk.c | 17 + + arch/mips/configs/fuloong2e_defconfig | 2 +- + arch/mips/configs/gcw0_defconfig | 2 +- + arch/mips/configs/lemote2f_defconfig | 2 +- + 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 +- + 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/cdns3-ti.c | 2 +- + drivers/usb/cdns3/core.c | 50 +- + drivers/usb/cdns3/drd.c | 165 +- + drivers/usb/cdns3/drd.h | 13 +- + drivers/usb/cdns3/ep0.c | 40 +- + drivers/usb/cdns3/gadget.c | 33 +- + drivers/usb/cdns3/host.c | 4 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 4 + + drivers/usb/chipidea/ci_hdrc_imx.h | 1 + + drivers/usb/chipidea/ci_hdrc_pci.c | 2 +- + drivers/usb/chipidea/core.c | 28 + + drivers/usb/chipidea/debug.c | 10 +- + drivers/usb/chipidea/otg.c | 6 +- + drivers/usb/chipidea/udc.c | 67 +- + drivers/usb/chipidea/usbmisc_imx.c | 6 +- + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/common/Kconfig | 1 + + drivers/usb/common/debug.c | 16 +- + drivers/usb/common/ulpi.c | 5 +- + drivers/usb/common/usb-conn-gpio.c | 47 +- + drivers/usb/core/Kconfig | 8 +- + drivers/usb/core/config.c | 10 +- + drivers/usb/core/devices.c | 4 + + drivers/usb/core/devio.c | 126 +- + drivers/usb/core/generic.c | 2 - + drivers/usb/core/hcd-pci.c | 14 +- + 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 | 34 +- + 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/dwc2/platform.c | 4 +- + 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-meson-g12a.c | 15 +- + 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/dwc3-st.c | 4 +- + drivers/usb/dwc3/ep0.c | 12 +- + drivers/usb/dwc3/gadget.c | 42 +- + drivers/usb/dwc3/gadget.h | 4 +- + 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 | 42 +- + drivers/usb/gadget/function/f_rndis.c | 2 +- + drivers/usb/gadget/function/f_tcm.c | 2 +- + drivers/usb/gadget/function/f_uac2.c | 7 +- + 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 | 23 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 16 +- + drivers/usb/gadget/udc/bdc/bdc.h | 2 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 53 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 26 +- + drivers/usb/gadget/udc/core.c | 21 +- + 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 | 4 +- + drivers/usb/gadget/udc/net2272.h | 5 - + drivers/usb/gadget/udc/net2280.c | 4 +- + 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/r8a66597-udc.c | 6 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 4 +- + drivers/usb/gadget/udc/snps_udc_core.c | 2 +- + drivers/usb/gadget/udc/tegra-xudc.c | 9 +- + 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 | 12 +- + 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-omap.c | 144 +- + 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 | 393 +++-- + drivers/usb/host/xhci-dbgcap.h | 69 +- + drivers/usb/host/xhci-dbgtty.c | 221 ++- + drivers/usb/host/xhci-debugfs.c | 1 + + drivers/usb/host/xhci-hub.c | 48 +- + drivers/usb/host/xhci-mem.c | 37 +- + drivers/usb/host/xhci-pci.c | 10 +- + drivers/usb/host/xhci-plat.c | 4 +- + drivers/usb/host/xhci-tegra.c | 8 - + drivers/usb/host/xhci.c | 2 +- + drivers/usb/host/xhci.h | 2 + + drivers/usb/image/mdc800.c | 2 +- + drivers/usb/isp1760/isp1760-hcd.c | 4 +- + drivers/usb/misc/Kconfig | 4 +- + drivers/usb/misc/adutux.c | 6 +- + drivers/usb/misc/appledisplay.c | 5 +- + drivers/usb/misc/ehset.c | 8 +- + drivers/usb/misc/iowarrior.c | 51 +- + 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 | 18 +- + drivers/usb/misc/yurex.c | 2 +- + drivers/usb/mtu3/mtu3.h | 6 +- + drivers/usb/mtu3/mtu3_core.c | 208 +-- + drivers/usb/mtu3/mtu3_debug.h | 2 + + drivers/usb/mtu3/mtu3_gadget.c | 79 +- + drivers/usb/mtu3/mtu3_gadget_ep0.c | 18 +- + drivers/usb/mtu3/mtu3_hw_regs.h | 4 +- + drivers/usb/mtu3/mtu3_plat.c | 4 +- + 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 | 12 +- + 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/Kconfig | 4 +- + drivers/usb/phy/phy-ab8500-usb.c | 12 +- + drivers/usb/phy/phy-am335x-control.c | 7 +- + 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-jz4770.c | 284 +++- + 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/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/ftdi_sio.h | 4 +- + 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 | 26 +- + 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/qcserial.c | 6 +- + drivers/usb/serial/quatech2.c | 18 +- + drivers/usb/serial/sierra.c | 88 +- + drivers/usb/serial/ssu100.c | 7 +- + drivers/usb/serial/upd78f0730.c | 2 +- + 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/class.c | 2 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 74 +- + drivers/usb/typec/tcpm/fusb302.c | 1 + + drivers/usb/typec/tcpm/tcpci.c | 9 + + drivers/usb/typec/tcpm/tcpci.h | 1 + + drivers/usb/typec/tcpm/tcpm.c | 212 ++- + 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/thunderbolt.h | 2 - + include/linux/usb.h | 14 +- + include/linux/usb/ch9.h | 8 +- + include/linux/usb/chipidea.h | 2 + + include/linux/usb/gadget.h | 9 +- + include/linux/usb/pd.h | 1 + + include/linux/usb/pd_vdo.h | 2 +- + include/linux/usb/phy_companion.h | 2 +- + include/linux/usb/quirks.h | 4 +- + include/linux/usb/serial.h | 97 +- + include/linux/usb/tcpm.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 +- + 297 files changed, 7847 insertions(+), 3089 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 + 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 (f5e46aa4a124 usb: dwc3: gadget: when the started list is empty stop the active xfer) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (d2a4309c1ab6 USB: serial: qcserial: add EM7305 QDL product ID) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (d6f93d21001e usb: chipidea: imx: get available runtime dr mode for wakeup setting) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (3d7b0ca5300b phy: qualcomm: fix setting of tx_deamp_3_5db when device property read fails) +$ 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 MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 70b5492cb933] Merge remote-tracking branch 'phy-next/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/phy/brcm,bcm63xx-usbh-phy.yaml | 79 ++ + .../bindings/phy/phy-armada38x-comphy.txt | 10 +- + .../bindings/phy/qcom,ipq806x-usb-phy-hs.yaml | 55 ++ + .../bindings/phy/qcom,ipq806x-usb-phy-ss.yaml | 73 ++ + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 2 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 1 + + .../devicetree/bindings/phy/renesas,usb3-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/broadcom/Kconfig | 8 + + drivers/phy/broadcom/Makefile | 1 + + drivers/phy/broadcom/phy-bcm63xx-usbh.c | 457 ++++++++++ + drivers/phy/cadence/phy-cadence-salvo.c | 2 +- + drivers/phy/marvell/phy-armada38x-comphy.c | 45 +- + 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 | 34 +- + drivers/phy/qualcomm/Makefile | 4 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 571 ++++++++++++ + 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/renesas/phy-rcar-gen3-usb2.c | 63 +- + 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 + + 58 files changed, 3789 insertions(+), 1694 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/brcm,bcm63xx-usbh-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,ufs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml + create mode 100644 drivers/phy/broadcom/phy-bcm63xx-usbh.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c + 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 (81f0f78965eb Revert "serial: 8250: Let serial core initialise spin lock") +$ git merge tty/tty-next +Auto-merging drivers/video/fbdev/core/fbcon.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/console/newport_con.c +Auto-merging drivers/usb/misc/sisusbvga/sisusb_con.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/qcom_geni_serial.c +CONFLICT (content): Merge conflict in drivers/tty/serial/qcom_geni_serial.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 9e9320217443] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/serial/st,stm32-uart.yaml | 4 +- + Documentation/driver-api/serial/n_gsm.rst | 2 +- + 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_dw.c | 120 ++- + 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 | 41 + + drivers/tty/serial/8250/8250_pxa.c | 14 +- + drivers/tty/serial/8250/Kconfig | 4 +- + drivers/tty/serial/Kconfig | 17 +- + drivers/tty/serial/altera_jtaguart.c | 2 +- + drivers/tty/serial/amba-pl011.c | 1 - + drivers/tty/serial/fsl_lpuart.c | 3 + + drivers/tty/serial/imx.c | 207 ++-- + drivers/tty/serial/imx_earlycon.c | 50 + + drivers/tty/serial/jsm/jsm_driver.c | 2 +- + drivers/tty/serial/kgdboc.c | 3 +- + drivers/tty/serial/msm_serial.c | 2 + + drivers/tty/serial/pch_uart.c | 34 +- + drivers/tty/serial/pmac_zilog.c | 1 + + 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 | 5 +- + drivers/tty/serial/sh-sci.c | 3 - + drivers/tty/serial/sifive.c | 1 - + drivers/tty/serial/stm32-usart.c | 13 +- + drivers/tty/serial/sunhv.c | 3 - + drivers/tty/serial/uartlite.c | 2 +- + drivers/tty/synclink.c | 350 ++---- + drivers/tty/tty_io.c | 52 +- + drivers/tty/vt/consolemap.c | 2 +- + drivers/tty/vt/keyboard.c | 3 +- + drivers/tty/vt/selection.c | 2 +- + drivers/tty/vt/vt.c | 982 +++++++++-------- + drivers/tty/vt/vt_ioctl.c | 1109 ++++++++++---------- + drivers/usb/misc/sisusbvga/sisusb_con.c | 11 +- + drivers/video/console/mdacon.c | 20 +- + drivers/video/console/newport_con.c | 10 +- + 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_8250.h | 2 + + include/linux/serial_core.h | 2 +- + include/linux/vt_kern.h | 3 - + include/uapi/linux/serial_core.h | 14 - + 62 files changed, 1837 insertions(+), 1613 deletions(-) + create mode 100644 drivers/tty/serial/imx_earlycon.c +Merging char-misc/char-misc-next (22362aa30bad habanalabs: remove unused but set variable 'ctx_asid') +$ git merge char-misc/char-misc-next +Auto-merging scripts/headers_install.sh +Auto-merging kernel/module.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/mmc/host/rtsx_pci_sdmmc.c +Auto-merging drivers/misc/uacce/uacce.c +Auto-merging drivers/misc/ocxl/config.c +CONFLICT (content): Merge conflict in drivers/misc/ocxl/config.c +Auto-merging drivers/misc/genwqe/card_base.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Auto-merging drivers/bus/fsl-mc/dprc-driver.c +Auto-merging MAINTAINERS +Auto-merging Documentation/fpga/dfl.rst +Removing Documentation/devicetree/bindings/nvmem/qfprom.txt +Recorded preimage for 'drivers/misc/ocxl/config.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/misc/ocxl/config.c'. +[master bbdf00d80325] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-mei | 13 + + .../testing/sysfs-devices-platform-stratix10-rsu | 36 + + Documentation/admin-guide/dynamic-debug-howto.rst | 29 +- + .../devicetree/bindings/arm/coresight.txt | 13 + + .../bindings/fpga/xilinx-slave-serial.txt | 16 +- + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 19 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 96 +++ + Documentation/devicetree/bindings/nvmem/qfprom.txt | 35 - + 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/soundwire/stream.rst | 11 +- + Documentation/driver-api/uio-howto.rst | 2 +- + Documentation/driver-api/xillybus.rst | 2 +- + Documentation/fpga/dfl.rst | 19 + + MAINTAINERS | 8 +- + drivers/android/binder.c | 23 +- + drivers/android/binder_alloc.c | 1 + + drivers/android/binderfs.c | 3 +- + drivers/bus/fsl-mc/dprc-driver.c | 57 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 30 + + drivers/bus/fsl-mc/mc-io.c | 2 +- + drivers/bus/fsl-mc/mc-sys.c | 4 +- + drivers/char/Kconfig | 6 +- + 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/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 +- + drivers/greybus/es2.c | 2 +- + drivers/greybus/interface.c | 2 +- + 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 ++++ + drivers/interconnect/core.c | 16 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/c2port/core.c | 2 +- + drivers/misc/cardreader/Makefile | 2 +- + drivers/misc/cardreader/rtl8411.c | 8 +- + drivers/misc/cardreader/rts5209.c | 5 +- + drivers/misc/cardreader/rts5227.c | 5 +- + drivers/misc/cardreader/rts5228.c | 747 +++++++++++++++++ + drivers/misc/cardreader/rts5228.h | 168 ++++ + drivers/misc/cardreader/rts5229.c | 5 +- + drivers/misc/cardreader/rts5249.c | 28 +- + drivers/misc/cardreader/rts5260.c | 23 +- + drivers/misc/cardreader/rts5261.c | 32 +- + drivers/misc/cardreader/rtsx_pcr.c | 129 +-- + 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/echo/echo.c | 6 +- + 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/Makefile | 11 +- + drivers/misc/habanalabs/common/Makefile | 7 + + drivers/misc/habanalabs/{ => common}/asid.c | 0 + .../misc/habanalabs/{ => common}/command_buffer.c | 82 +- + .../habanalabs/{ => common}/command_submission.c | 92 ++- + drivers/misc/habanalabs/{ => common}/context.c | 39 +- + drivers/misc/habanalabs/{ => common}/debugfs.c | 2 +- + drivers/misc/habanalabs/{ => common}/device.c | 88 +- + drivers/misc/habanalabs/{ => common}/firmware_if.c | 104 +-- + drivers/misc/habanalabs/{ => common}/habanalabs.h | 172 ++-- + .../misc/habanalabs/{ => common}/habanalabs_drv.c | 1 - + .../habanalabs/{ => common}/habanalabs_ioctl.c | 24 + + drivers/misc/habanalabs/{ => common}/hw_queue.c | 165 ++-- + drivers/misc/habanalabs/{ => common}/hwmon.c | 0 + drivers/misc/habanalabs/{ => common}/irq.c | 38 +- + drivers/misc/habanalabs/{ => common}/memory.c | 5 +- + drivers/misc/habanalabs/{ => common}/mmu.c | 3 +- + drivers/misc/habanalabs/{ => common}/pci.c | 151 ++-- + drivers/misc/habanalabs/{ => common}/sysfs.c | 3 + + drivers/misc/habanalabs/gaudi/Makefile | 2 - + drivers/misc/habanalabs/gaudi/gaudi.c | 909 ++++++++------------- + drivers/misc/habanalabs/gaudi/gaudiP.h | 24 +- + drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 12 +- + drivers/misc/habanalabs/gaudi/gaudi_hwmgr.c | 2 +- + drivers/misc/habanalabs/gaudi/gaudi_security.c | 5 +- + drivers/misc/habanalabs/goya/Makefile | 2 - + drivers/misc/habanalabs/goya/goya.c | 196 +++-- + drivers/misc/habanalabs/goya/goyaP.h | 24 +- + drivers/misc/habanalabs/goya/goya_coresight.c | 15 +- + drivers/misc/habanalabs/goya/goya_security.c | 2 +- + .../habanalabs/include/{ => common}/armcp_if.h | 14 +- + .../habanalabs/include/{ => common}/hl_boot_if.h | 14 + + .../misc/habanalabs/include/{ => common}/qman_if.h | 0 + .../habanalabs/include/gaudi/asic_reg/gaudi_regs.h | 21 +- + .../include/gaudi/asic_reg/psoc_cpu_pll_regs.h | 114 +++ + .../misc/habanalabs/include/gaudi/gaudi_masks.h | 3 + + .../misc/habanalabs/include/gaudi/gaudi_packets.h | 4 +- + drivers/misc/hpilo.c | 11 +- + 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/Kconfig | 2 +- + drivers/misc/mei/bus-fixup.c | 23 +- + drivers/misc/mei/bus.c | 2 +- + drivers/misc/mei/client.c | 8 +- + drivers/misc/mei/hbm.c | 74 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 4 +- + drivers/misc/mei/hdcp/mei_hdcp.h | 2 +- + drivers/misc/mei/hw-me-regs.h | 4 + + drivers/misc/mei/hw-me.c | 66 +- + drivers/misc/mei/hw-me.h | 9 +- + drivers/misc/mei/hw-txe.c | 5 +- + drivers/misc/mei/hw.h | 8 +- + drivers/misc/mei/main.c | 31 +- + drivers/misc/mei/mei_dev.h | 4 + + drivers/misc/mei/pci-me.c | 10 +- + 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 | 4 +- + 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/sram-exec.c | 2 +- + 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/nvmem/Kconfig | 3 - + drivers/nvmem/core.c | 43 +- + drivers/nvmem/qcom-spmi-sdam.c | 4 +- + drivers/nvmem/qfprom.c | 315 ++++++- + drivers/nvmem/sc27xx-efuse.c | 27 +- + drivers/nvmem/sprd-efuse.c | 4 +- + drivers/soundwire/Makefile | 10 +- + drivers/soundwire/bus.c | 130 ++- + drivers/soundwire/bus_type.c | 19 +- + drivers/soundwire/cadence_master.c | 70 +- + drivers/soundwire/cadence_master.h | 4 + + drivers/soundwire/intel.c | 549 ++++++++----- + drivers/soundwire/intel.h | 22 + + drivers/soundwire/intel_init.c | 356 ++++++-- + drivers/soundwire/qcom.c | 4 +- + drivers/soundwire/stream.c | 98 +++ + 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/asm-generic/vmlinux.lds.h | 6 +- + include/linux/coresight.h | 6 +- + include/linux/dynamic_debug.h | 4 +- + include/linux/firmware/intel/stratix10-smc.h | 43 + + .../linux/firmware/intel/stratix10-svc-client.h | 17 +- + include/linux/fsl/mc.h | 32 +- + include/linux/interconnect-provider.h | 16 +- + include/linux/mic_bus.h | 2 +- + include/linux/mod_devicetable.h | 2 + + include/linux/nvmem-consumer.h | 1 + + include/linux/nvmem-provider.h | 3 + + include/linux/rtsx_pci.h | 33 +- + include/linux/soundwire/sdw.h | 33 +- + include/linux/soundwire/sdw_intel.h | 2 + + include/linux/soundwire/sdw_registers.h | 117 ++- + include/linux/vbox_utils.h | 1 + + include/linux/vmw_vmci_defs.h | 2 +- + include/uapi/linux/android/binder.h | 2 +- + include/uapi/linux/fpga-dfl.h | 82 ++ + include/uapi/linux/raw.h | 2 - + include/uapi/linux/vbox_vmmdev_types.h | 3 + + include/uapi/linux/vboxguest.h | 24 + + include/uapi/misc/habanalabs.h | 27 +- + kernel/module.c | 2 +- + lib/dynamic_debug.c | 269 +++--- + scripts/headers_install.sh | 1 - + scripts/mod/devicetable-offsets.c | 2 + + scripts/mod/file2alias.c | 6 +- + tools/testing/selftests/lkdtm/run.sh | 6 + + tools/testing/selftests/lkdtm/tests.txt | 1 + + 234 files changed, 6573 insertions(+), 2427 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/qfprom.txt + create mode 100644 drivers/misc/cardreader/rts5228.c + create mode 100644 drivers/misc/cardreader/rts5228.h + create mode 100644 drivers/misc/habanalabs/common/Makefile + rename drivers/misc/habanalabs/{ => common}/asid.c (100%) + rename drivers/misc/habanalabs/{ => common}/command_buffer.c (85%) + rename drivers/misc/habanalabs/{ => common}/command_submission.c (92%) + rename drivers/misc/habanalabs/{ => common}/context.c (84%) + rename drivers/misc/habanalabs/{ => common}/debugfs.c (99%) + rename drivers/misc/habanalabs/{ => common}/device.c (94%) + rename drivers/misc/habanalabs/{ => common}/firmware_if.c (89%) + rename drivers/misc/habanalabs/{ => common}/habanalabs.h (94%) + rename drivers/misc/habanalabs/{ => common}/habanalabs_drv.c (99%) + rename drivers/misc/habanalabs/{ => common}/habanalabs_ioctl.c (95%) + rename drivers/misc/habanalabs/{ => common}/hw_queue.c (86%) + rename drivers/misc/habanalabs/{ => common}/hwmon.c (100%) + rename drivers/misc/habanalabs/{ => common}/irq.c (91%) + rename drivers/misc/habanalabs/{ => common}/memory.c (99%) + rename drivers/misc/habanalabs/{ => common}/mmu.c (99%) + rename drivers/misc/habanalabs/{ => common}/pci.c (72%) + rename drivers/misc/habanalabs/{ => common}/sysfs.c (99%) + rename drivers/misc/habanalabs/include/{ => common}/armcp_if.h (98%) + rename drivers/misc/habanalabs/include/{ => common}/hl_boot_if.h (84%) + rename drivers/misc/habanalabs/include/{ => common}/qman_if.h (100%) + create mode 100644 drivers/misc/habanalabs/include/gaudi/asic_reg/psoc_cpu_pll_regs.h +Merging extcon/extcon-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (a81844034e5b Soundwire: intel_init: save Slave(s) _ADR info in sdw_intel_ctx) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (ef7e12078ab8 thunderbolt: Fix old style declaration warning) +$ git merge thunderbolt/next +Already up to date. +$ 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 759b5b13fd4a] Merge remote-tracking branch 'char-misc/char-misc-next' + Date: Mon Aug 3 16:53:56 2020 +1000 +Merging staging/staging-next (5bbd90550da8 staging: most: fix up movement of USB driver) +$ 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/speakup/TODO +Removing drivers/staging/rtl8192u/copying +Auto-merging drivers/staging/qlge/qlge_main.c +Removing drivers/staging/most/usb/Makefile +Removing drivers/staging/most/usb/Kconfig +Auto-merging drivers/staging/android/ion/ion_heap.c +Auto-merging MAINTAINERS +CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml +Auto-merging Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml +Removing Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-ads8688.txt +Removing Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt +Removing Documentation/devicetree/bindings/iio/adc/ingenic,adc.txt +Removing Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.txt +Resolved 'Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 50c7ac4cdbe0] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/stable}/sysfs-driver-speakup | 0 + Documentation/ABI/testing/sysfs-bus-iio | 3 +- + Documentation/ABI/testing/sysfs-bus-iio-icm42600 | 20 + + Documentation/ABI/testing/sysfs-bus-iio-scd30 | 34 + + .../admin-guide}/spkguide.txt | 2 +- + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 4 +- + .../devicetree/bindings/iio/accel/kionix,kxsd9.txt | 22 - + .../bindings/iio/accel/kionix,kxsd9.yaml | 65 ++ + .../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 +++++++ + .../devicetree/bindings/iio/adc/ti,ads8688.yaml | 45 ++ + .../devicetree/bindings/iio/adc/ti-ads8688.txt | 20 - + .../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 +- + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 32 +- + Documentation/driver-api/generic-counter.rst | 2 +- + Documentation/driver-api/iio/buffers.rst | 2 +- + MAINTAINERS | 38 +- + drivers/accessibility/Kconfig | 2 + + drivers/accessibility/Makefile | 1 + + .../speakup/DefaultKeyAssignments | 0 + drivers/{staging => accessibility}/speakup/Kconfig | 0 + .../{staging => accessibility}/speakup/Makefile | 0 + drivers/accessibility/speakup/TODO | 22 + + .../{staging => accessibility}/speakup/buffers.c | 0 + .../{staging => accessibility}/speakup/devsynth.c | 0 + .../{staging => accessibility}/speakup/fakekey.c | 0 + drivers/{staging => accessibility}/speakup/i18n.c | 0 + drivers/{staging => accessibility}/speakup/i18n.h | 0 + .../{staging => accessibility}/speakup/keyhelp.c | 0 + .../{staging => accessibility}/speakup/kobjects.c | 0 + drivers/{staging => accessibility}/speakup/main.c | 0 + .../{staging => accessibility}/speakup/selection.c | 0 + .../{staging => accessibility}/speakup/serialio.c | 0 + .../{staging => accessibility}/speakup/serialio.h | 0 + .../{staging => accessibility}/speakup/speakup.h | 0 + .../speakup/speakup_acnt.h | 0 + .../speakup/speakup_acntpc.c | 0 + .../speakup/speakup_acntsa.c | 0 + .../speakup/speakup_apollo.c | 0 + .../speakup/speakup_audptr.c | 0 + .../speakup/speakup_bns.c | 0 + .../speakup/speakup_decext.c | 0 + .../speakup/speakup_decpc.c | 0 + .../speakup/speakup_dectlk.c | 0 + .../speakup/speakup_dtlk.c | 0 + .../speakup/speakup_dtlk.h | 0 + .../speakup/speakup_dummy.c | 0 + .../speakup/speakup_keypc.c | 0 + .../speakup/speakup_ltlk.c | 0 + .../speakup/speakup_soft.c | 0 + .../speakup/speakup_spkout.c | 0 + .../speakup/speakup_txprt.c | 0 + .../speakup/speakupmap.h | 0 + .../speakup/speakupmap.map | 0 + .../{staging => accessibility}/speakup/spk_priv.h | 0 + .../speakup/spk_priv_keyinfo.h | 0 + .../{staging => accessibility}/speakup/spk_ttyio.c | 0 + .../{staging => accessibility}/speakup/spk_types.h | 0 + drivers/{staging => accessibility}/speakup/synth.c | 0 + .../{staging => accessibility}/speakup/thread.c | 0 + .../speakup/varhandlers.c | 0 + drivers/counter/104-quad-8.c | 1 - + drivers/counter/Kconfig | 11 + + drivers/counter/Makefile | 1 + + drivers/counter/microchip-tcb-capture.c | 397 ++++++++++ + 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 | 3 +- + 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 | 13 +- + 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 | 3 +- + drivers/iio/adc/ab8500-gpadc.c | 2 - + drivers/iio/adc/ad7091r-base.c | 1 - + drivers/iio/adc/ad7124.c | 74 +- + drivers/iio/adc/ad7192.c | 19 +- + drivers/iio/adc/ad7266.c | 4 - + drivers/iio/adc/ad7291.c | 2 - + drivers/iio/adc/ad7292.c | 1 - + drivers/iio/adc/ad7298.c | 10 +- + 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 | 7 +- + drivers/iio/adc/ad7923.c | 10 +- + drivers/iio/adc/ad7949.c | 4 +- + drivers/iio/adc/ad799x.c | 4 +- + drivers/iio/adc/ad_sigma_delta.c | 12 +- + drivers/iio/adc/adi-axi-adc.c | 1 - + drivers/iio/adc/aspeed_adc.c | 1 - + drivers/iio/adc/at91-sama5d2_adc.c | 53 +- + drivers/iio/adc/at91_adc.c | 33 +- + 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 | 30 +- + 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 | 397 ++++++++-- + 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 | 17 +- + drivers/iio/adc/max9611.c | 6 +- + 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 | 4 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 5 +- + 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 | 221 ++++-- + 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 | 46 +- + drivers/iio/adc/twl4030-madc.c | 18 +- + drivers/iio/adc/twl6030-gpadc.c | 5 +- + 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/ms_sensors/ms_sensors_i2c.c | 2 +- + 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 | 3 +- + drivers/iio/dac/ad5360.c | 3 +- + drivers/iio/dac/ad5380.c | 5 +- + drivers/iio/dac/ad5421.c | 3 +- + drivers/iio/dac/ad5446.c | 13 +- + drivers/iio/dac/ad5449.c | 3 +- + drivers/iio/dac/ad5504.c | 8 +- + drivers/iio/dac/ad5592r-base.c | 13 +- + drivers/iio/dac/ad5624r_spi.c | 1 - + drivers/iio/dac/ad5686.c | 1 - + drivers/iio/dac/ad5755.c | 3 +- + drivers/iio/dac/ad5758.c | 19 +- + drivers/iio/dac/ad5761.c | 3 +- + drivers/iio/dac/ad5764.c | 6 +- + drivers/iio/dac/ad5770r.c | 1 - + drivers/iio/dac/ad5791.c | 11 +- + 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 | 7 +- + 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 | 21 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 18 +- + drivers/iio/dummy/iio_simple_dummy_events.c | 4 +- + 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.h | 66 -- + drivers/iio/gyro/fxas21002c_core.c | 67 +- + 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 | 15 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 2 +- + drivers/iio/imu/kmx61.c | 15 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 8 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 23 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 9 +- + drivers/iio/industrialio-buffer.c | 58 +- + drivers/iio/industrialio-core.c | 130 ++-- + 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 | 9 +- + 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 | 9 +- + drivers/iio/light/st_uvis25_core.c | 3 - + drivers/iio/light/stk3310.c | 5 +- + 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 | 9 +- + 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 | 2 +- + 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.h | 6 +- + drivers/iio/magnetometer/hmc5843_core.c | 1 - + drivers/iio/magnetometer/mag3110.c | 1 - + drivers/iio/magnetometer/mmc35240.c | 5 +- + 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 | 5 +- + 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/Kconfig | 11 + + drivers/most/Makefile | 2 + + drivers/most/core.c | 4 +- + .../{staging/most/usb/usb.c => most/most_usb.c} | 0 + drivers/platform/x86/toshiba_acpi.c | 3 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/android/ashmem.c | 12 + + 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/clocking-wizard/dt-binding.txt | 2 +- + drivers/staging/comedi/comedi_fops.c | 9 +- + drivers/staging/comedi/comedi_pci.c | 2 +- + drivers/staging/comedi/comedi_pcmcia.c | 2 +- + drivers/staging/comedi/comedi_usb.c | 2 +- + drivers/staging/comedi/drivers/8255.c | 2 +- + drivers/staging/comedi/drivers/8255_pci.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1032.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_2032.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3501.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 2 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 2 +- + drivers/staging/comedi/drivers/adq12b.c | 2 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 2 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 2 +- + drivers/staging/comedi/drivers/adv_pci1760.c | 2 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 2 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 2 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 4 +- + drivers/staging/comedi/drivers/amplc_dio200.h | 2 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 4 +- + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 4 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 4 +- + drivers/staging/comedi/drivers/amplc_pc236.h | 2 +- + .../staging/comedi/drivers/amplc_pc236_common.c | 4 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 4 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 4 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci236.c | 4 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 4 +- + drivers/staging/comedi/drivers/c6xdigio.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 2 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- + drivers/staging/comedi/drivers/comedi_8255.c | 2 +- + drivers/staging/comedi/drivers/comedi_parport.c | 2 +- + drivers/staging/comedi/drivers/comedi_test.c | 2 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 2 +- + drivers/staging/comedi/drivers/daqboard2000.c | 4 +- + drivers/staging/comedi/drivers/das08.c | 2 +- + drivers/staging/comedi/drivers/das08_isa.c | 2 +- + drivers/staging/comedi/drivers/das08_pci.c | 2 +- + drivers/staging/comedi/drivers/das16.c | 2 +- + drivers/staging/comedi/drivers/das16m1.c | 2 +- + drivers/staging/comedi/drivers/das1800.c | 2 +- + drivers/staging/comedi/drivers/das800.c | 2 +- + drivers/staging/comedi/drivers/dmm32at.c | 2 +- + drivers/staging/comedi/drivers/dt2801.c | 2 +- + drivers/staging/comedi/drivers/dt2811.c | 2 +- + drivers/staging/comedi/drivers/dt2814.c | 2 +- + drivers/staging/comedi/drivers/dt2815.c | 2 +- + drivers/staging/comedi/drivers/dt2817.c | 2 +- + drivers/staging/comedi/drivers/dt282x.c | 2 +- + drivers/staging/comedi/drivers/dt3000.c | 2 +- + drivers/staging/comedi/drivers/fl512.c | 2 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 2 +- + drivers/staging/comedi/drivers/icp_multi.c | 2 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 2 +- + drivers/staging/comedi/drivers/jr3_pci.c | 4 +- + drivers/staging/comedi/drivers/ke_counter.c | 2 +- + drivers/staging/comedi/drivers/me4000.c | 4 +- + drivers/staging/comedi/drivers/me_daq.c | 2 +- + drivers/staging/comedi/drivers/mite.c | 2 +- + drivers/staging/comedi/drivers/mpc624.c | 2 +- + drivers/staging/comedi/drivers/multiq3.c | 2 +- + drivers/staging/comedi/drivers/ni_6527.c | 2 +- + drivers/staging/comedi/drivers/ni_65xx.c | 2 +- + drivers/staging/comedi/drivers/ni_660x.c | 2 +- + drivers/staging/comedi/drivers/ni_670x.c | 2 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 2 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 2 +- + drivers/staging/comedi/drivers/ni_atmio.c | 2 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 2 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 4 +- + drivers/staging/comedi/drivers/ni_labpc.c | 4 +- + drivers/staging/comedi/drivers/ni_labpc_common.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc_isadma.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 4 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 2 +- + drivers/staging/comedi/drivers/ni_routes.c | 2 +- + drivers/staging/comedi/drivers/ni_usb6501.c | 2 +- + drivers/staging/comedi/drivers/pcl711.c | 2 +- + drivers/staging/comedi/drivers/pcl724.c | 2 +- + drivers/staging/comedi/drivers/pcl726.c | 2 +- + drivers/staging/comedi/drivers/pcl730.c | 2 +- + drivers/staging/comedi/drivers/pcl812.c | 2 +- + drivers/staging/comedi/drivers/pcl816.c | 2 +- + drivers/staging/comedi/drivers/pcl818.c | 2 +- + drivers/staging/comedi/drivers/pcm3724.c | 2 +- + drivers/staging/comedi/drivers/pcmad.c | 2 +- + drivers/staging/comedi/drivers/pcmda12.c | 2 +- + drivers/staging/comedi/drivers/pcmmio.c | 2 +- + drivers/staging/comedi/drivers/pcmuio.c | 2 +- + drivers/staging/comedi/drivers/plx9052.h | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/comedi/drivers/rtd520.c | 2 +- + drivers/staging/comedi/drivers/rti800.c | 2 +- + drivers/staging/comedi/drivers/rti802.c | 2 +- + drivers/staging/comedi/drivers/s526.c | 4 +- + drivers/staging/comedi/drivers/s626.c | 18 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 2 +- + .../staging/comedi/drivers/tests/ni_routes_test.c | 2 +- + 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 | 216 +++++- + 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/gdm724x/gdm_lte.c | 2 +- + drivers/staging/greybus/Kconfig | 14 +- + drivers/staging/greybus/Makefile | 6 +- + drivers/staging/greybus/audio_codec.c | 178 +++-- + drivers/staging/greybus/audio_codec.h | 12 +- + drivers/staging/greybus/audio_helper.c | 198 +++++ + drivers/staging/greybus/audio_helper.h | 17 + + drivers/staging/greybus/audio_module.c | 15 +- + drivers/staging/greybus/audio_topology.c | 131 ++-- + drivers/staging/greybus/gpio.c | 19 +- + drivers/staging/gs_fpgaboot/README | 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_hostif.c | 11 +- + drivers/staging/ks7010/ks_wlan_net.c | 22 +- + drivers/staging/most/Kconfig | 2 - + drivers/staging/most/Makefile | 1 - + drivers/staging/most/cdev/cdev.c | 49 +- + drivers/staging/most/net/net.c | 6 +- + drivers/staging/most/sound/sound.c | 58 +- + drivers/staging/most/usb/Kconfig | 14 - + drivers/staging/most/usb/Makefile | 4 - + drivers/staging/netlogic/xlr_net.c | 2 +- + drivers/staging/nvec/README | 2 +- + drivers/staging/octeon/ethernet-defines.h | 10 +- + drivers/staging/octeon/octeon-stubs.h | 1 + + drivers/staging/qlge/qlge.h | 7 +- + drivers/staging/qlge/qlge_dbg.c | 590 +++++++-------- + drivers/staging/qlge/qlge_ethtool.c | 8 +- + drivers/staging/qlge/qlge_main.c | 69 +- + drivers/staging/qlge/qlge_mpi.c | 59 +- + 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 | 16 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 50 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 125 ++-- + drivers/staging/rtl8188eu/core/rtw_security.c | 157 ++-- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 74 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 20 +- + 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 | 16 +- + drivers/staging/rtl8188eu/include/hal_com.h | 3 +- + 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/odm_types.h | 6 +- + drivers/staging/rtl8188eu/include/osdep_service.h | 9 +- + 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 | 19 +- + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 1 - + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 13 +- + drivers/staging/rtl8188eu/include/rtw_cmd.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_debug.h | 1 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 2 +- + 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_pwrctrl.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_recv.h | 5 +- + drivers/staging/rtl8188eu/include/rtw_rf.h | 1 - + drivers/staging/rtl8188eu/include/rtw_security.h | 25 +- + drivers/staging/rtl8188eu/include/rtw_xmit.h | 18 +- + drivers/staging/rtl8188eu/include/wifi.h | 57 +- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 5 +- + drivers/staging/rtl8188eu/include/xmit_osdep.h | 3 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 58 +- + 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/rtl8192e/rtllib_crypt_ccmp.c | 4 +- + drivers/staging/rtl8192e/rtllib_wx.c | 2 +- + 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 | 22 +- + 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/usb_ops_linux.c | 2 +- + drivers/staging/rtl8712/wifi.h | 76 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 6 +- + drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h | 6 +- + drivers/staging/rtl8723bs/include/HalVerDef.h | 18 +- + drivers/staging/rtl8723bs/include/drv_types.h | 6 +- + drivers/staging/rtl8723bs/include/drv_types_sdio.h | 3 +- + drivers/staging/rtl8723bs/include/hal_btcoex.h | 3 +- + drivers/staging/rtl8723bs/include/hal_com.h | 3 +- + drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 116 +-- + drivers/staging/rtl8723bs/include/ieee80211.h | 3 +- + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 3 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 3 - + drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 3 +- + drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 6 +- + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 3 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 30 +- + drivers/staging/rtl8723bs/include/rtw_eeprom.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_event.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_ht.h | 3 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 51 +- + drivers/staging/rtl8723bs/include/rtw_mp.h | 15 +- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 12 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 12 +- + drivers/staging/rtl8723bs/include/rtw_security.h | 9 +- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 12 +- + drivers/staging/rtl8723bs/include/wifi.h | 29 +- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 9 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 70 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 11 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 2 +- + drivers/staging/rts5208/ms.c | 6 +- + drivers/staging/rts5208/rtsx.c | 43 +- + drivers/staging/rts5208/rtsx_chip.c | 12 +- + drivers/staging/rts5208/rtsx_transport.c | 2 +- + drivers/staging/sm750fb/sm750.c | 91 +-- + drivers/staging/speakup/TODO | 47 -- + drivers/staging/unisys/visorhba/visorhba_main.c | 4 +- + 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 | 121 +++- + .../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 | 276 ++++--- + .../{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 | 22 +- + drivers/staging/wfx/hif_rx.c | 22 +- + drivers/staging/wfx/hif_tx_mib.c | 2 +- + 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 - + drivers/staging/wlan-ng/cfg80211.c | 19 +- + include/dt-bindings/iio/adc/ingenic,adc.h | 6 + + 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 - + 829 files changed, 12193 insertions(+), 7174 deletions(-) + rename {drivers/staging/speakup => Documentation/ABI/stable}/sysfs-driver-speakup (100%) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-icm42600 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-scd30 + rename {drivers/staging/speakup => Documentation/admin-guide}/spkguide.txt (99%) + delete mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.txt + create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.yaml + 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/adc/ti,ads8688.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads8688.txt + 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 + rename drivers/{staging => accessibility}/speakup/DefaultKeyAssignments (100%) + rename drivers/{staging => accessibility}/speakup/Kconfig (100%) + rename drivers/{staging => accessibility}/speakup/Makefile (100%) + create mode 100644 drivers/accessibility/speakup/TODO + rename drivers/{staging => accessibility}/speakup/buffers.c (100%) + rename drivers/{staging => accessibility}/speakup/devsynth.c (100%) + rename drivers/{staging => accessibility}/speakup/fakekey.c (100%) + rename drivers/{staging => accessibility}/speakup/i18n.c (100%) + rename drivers/{staging => accessibility}/speakup/i18n.h (100%) + rename drivers/{staging => accessibility}/speakup/keyhelp.c (100%) + rename drivers/{staging => accessibility}/speakup/kobjects.c (100%) + rename drivers/{staging => accessibility}/speakup/main.c (100%) + rename drivers/{staging => accessibility}/speakup/selection.c (100%) + rename drivers/{staging => accessibility}/speakup/serialio.c (100%) + rename drivers/{staging => accessibility}/speakup/serialio.h (100%) + rename drivers/{staging => accessibility}/speakup/speakup.h (100%) + rename drivers/{staging => accessibility}/speakup/speakup_acnt.h (100%) + rename drivers/{staging => accessibility}/speakup/speakup_acntpc.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_acntsa.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_apollo.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_audptr.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_bns.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_decext.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_decpc.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_dectlk.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_dtlk.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_dtlk.h (100%) + rename drivers/{staging => accessibility}/speakup/speakup_dummy.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_keypc.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_ltlk.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_soft.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_spkout.c (100%) + rename drivers/{staging => accessibility}/speakup/speakup_txprt.c (100%) + rename drivers/{staging => accessibility}/speakup/speakupmap.h (100%) + rename drivers/{staging => accessibility}/speakup/speakupmap.map (100%) + rename drivers/{staging => accessibility}/speakup/spk_priv.h (100%) + rename drivers/{staging => accessibility}/speakup/spk_priv_keyinfo.h (100%) + rename drivers/{staging => accessibility}/speakup/spk_ttyio.c (100%) + rename drivers/{staging => accessibility}/speakup/spk_types.h (100%) + rename drivers/{staging => accessibility}/speakup/synth.c (100%) + rename drivers/{staging => accessibility}/speakup/thread.c (100%) + rename drivers/{staging => accessibility}/speakup/varhandlers.c (100%) + create mode 100644 drivers/counter/microchip-tcb-capture.c + 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 + rename drivers/{staging/most/usb/usb.c => most/most_usb.c} (100%) + create mode 100644 drivers/staging/greybus/audio_helper.c + create mode 100644 drivers/staging/greybus/audio_helper.h + delete mode 100644 drivers/staging/most/usb/Kconfig + delete mode 100644 drivers/staging/most/usb/Makefile + delete mode 100644 drivers/staging/rtl8192u/copying + delete mode 100644 drivers/staging/speakup/TODO + 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 (12a400b016ab interconnect: Mark all dummy functions as static inline) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (fe541ee394a7 Merge branch 'for-linus' into next) +$ git merge dmaengine/next +Auto-merging include/uapi/linux/idxd.h +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/dma/ti/k3-udma-private.c +Auto-merging drivers/dma/ti/k3-udma-glue.c +Auto-merging drivers/dma/ioat/init.c +Auto-merging drivers/dma/ioat/dma.c +Auto-merging drivers/dma/imx-sdma.c +Auto-merging drivers/dma/idxd/sysfs.c +CONFLICT (content): Merge conflict in drivers/dma/idxd/sysfs.c +Auto-merging drivers/dma/idxd/irq.c +Auto-merging drivers/dma/idxd/idxd.h +Auto-merging drivers/dma/idxd/device.c +Auto-merging drivers/dma/idxd/cdev.c +Auto-merging drivers/dma/dw/core.c +Auto-merging drivers/dma/dmatest.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/driver-api/dmaengine/provider.rst +Removing Documentation/devicetree/bindings/dma/snps-dma.txt +Removing Documentation/devicetree/bindings/dma/owl-dma.txt +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/dma/idxd/sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8bfcb025c302] 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 + + Documentation/devicetree/bindings/dma/owl-dma.txt | 47 ---- + Documentation/devicetree/bindings/dma/owl-dma.yaml | 79 ++++++ + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 1 + + .../devicetree/bindings/dma/renesas,usb-dmac.yaml | 2 + + .../bindings/dma/snps,dma-spear1340.yaml | 176 ++++++++++++ + Documentation/devicetree/bindings/dma/snps-dma.txt | 69 ----- + 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/dmaengine.c | 12 + + drivers/dma/dmatest.c | 11 +- + drivers/dma/dw/Makefile | 6 +- + drivers/dma/dw/acpi.c | 2 + + drivers/dma/dw/core.c | 48 +++- + drivers/dma/dw/of.c | 5 + + drivers/dma/dw/pci.c | 4 + + drivers/dma/dw/regs.h | 3 + + 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 | 20 +- + 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/owl-dma.c | 139 +++++---- + 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 | 309 +++++++++------------ + drivers/dma/ti/k3-udma.h | 69 ++--- + drivers/dma/xgene-dma.c | 2 + + drivers/dma/xilinx/xilinx_dpdma.c | 4 +- + include/linux/dmaengine.h | 20 +- + include/linux/platform_data/dma-dw.h | 10 +- + include/uapi/linux/idxd.h | 6 + + 56 files changed, 1072 insertions(+), 813 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/owl-dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/owl-dma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/snps,dma-spear1340.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/snps-dma.txt +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 (700f3d4333d9 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/sym53c8xx_2/sym_glue.c +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/qedf/qedf_main.c +Auto-merging drivers/scsi/aacraid/linit.c +Auto-merging drivers/firmware/qcom_scm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 136 +++ + Documentation/scsi/advansys.rst | 2 +- + Documentation/scsi/scsi-parameters.rst | 2 +- + MAINTAINERS | 2 +- + block/blk-pm.c | 41 +- + drivers/firmware/qcom_scm.c | 101 +++ + drivers/firmware/qcom_scm.h | 4 + + 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 | 16 +- + 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/nark.c | 1 + + drivers/scsi/aacraid/rkt.c | 5 +- + drivers/scsi/aacraid/rx.c | 12 +- + drivers/scsi/aacraid/sa.c | 19 +- + drivers/scsi/aacraid/src.c | 13 +- + drivers/scsi/aha152x.c | 3 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 20 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 33 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 13 +- + drivers/scsi/aic94xx/aic94xx_dev.c | 4 +- + 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/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 18 +- + 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/bfa/bfa_core.c | 2 +- + drivers/scsi/bfa/bfa_fcpim.c | 10 +- + drivers/scsi/bfa/bfa_fcs_rport.c | 3 - + drivers/scsi/bfa/bfa_ioc.c | 57 +- + drivers/scsi/bfa/bfa_ioc_ct.c | 6 +- + drivers/scsi/bfa/bfa_port.c | 4 +- + drivers/scsi/bfa/bfa_svc.c | 4 +- + drivers/scsi/bfa/bfad_bsg.c | 222 ++--- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 18 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 22 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 7 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 53 +- + drivers/scsi/bnx2i/bnx2i_init.c | 2 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 19 +- + drivers/scsi/bnx2i/bnx2i_sysfs.c | 4 + + drivers/scsi/csiostor/csio_hw.c | 2 +- + drivers/scsi/csiostor/csio_hw_t5.c | 6 +- + drivers/scsi/csiostor/csio_init.c | 2 +- + drivers/scsi/csiostor/csio_lnode.c | 3 +- + drivers/scsi/csiostor/csio_rnode.c | 2 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 17 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 242 +++-- + drivers/scsi/cxgbi/libcxgbi.c | 672 ++++++++++---- + drivers/scsi/cxgbi/libcxgbi.h | 46 +- + drivers/scsi/dpt_i2o.c | 4 - + drivers/scsi/esas2r/esas2r.h | 3 +- + drivers/scsi/esas2r/esas2r_log.c | 10 +- + drivers/scsi/fcoe/fcoe.c | 10 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 30 +- + drivers/scsi/fcoe/fcoe_transport.c | 4 +- + drivers/scsi/fdomain.h | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 3 +- + 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/hpsa.c | 35 +- + drivers/scsi/hpsa.h | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/imm.c | 3 - + drivers/scsi/ipr.c | 90 +- + drivers/scsi/ipr.h | 4 +- + drivers/scsi/ips.c | 34 +- + drivers/scsi/isci/request.c | 2 +- + 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/libsas/sas_ata.c | 17 +- + drivers/scsi/libsas/sas_expander.c | 2 +- + 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 | 26 +- + drivers/scsi/lpfc/lpfc_els.c | 143 +-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 231 ++--- + drivers/scsi/lpfc/lpfc_hw4.h | 5 +- + drivers/scsi/lpfc/lpfc_init.c | 739 +++++++++------ + drivers/scsi/lpfc/lpfc_logmsg.h | 24 +- + drivers/scsi/lpfc/lpfc_mbox.c | 12 +- + drivers/scsi/lpfc/lpfc_mem.c | 4 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 68 +- + 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 | 683 ++++++++------ + 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 | 184 ++-- + drivers/scsi/megaraid/megaraid_sas_fp.c | 11 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 93 +- + drivers/scsi/mesh.c | 8 +- + 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/mvsas/mv_init.c | 8 +- + drivers/scsi/myrs.c | 34 +- + drivers/scsi/pcmcia/nsp_cs.c | 5 +- + drivers/scsi/pm8001/pm8001_ctl.c | 23 +- + drivers/scsi/pm8001/pm8001_hwi.c | 27 +- + drivers/scsi/pm8001/pm8001_init.c | 30 +- + drivers/scsi/pm8001/pm8001_sas.c | 9 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 23 +- + drivers/scsi/ppa.c | 3 - + drivers/scsi/qedf/qedf_debugfs.c | 18 +- + drivers/scsi/qedf/qedf_io.c | 30 +- + drivers/scsi/qedf/qedf_main.c | 10 +- + drivers/scsi/qedi/qedi_fw.c | 5 +- + drivers/scsi/qedi/qedi_iscsi.c | 2 +- + drivers/scsi/qedi/qedi_main.c | 9 +- + 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_83xx.c | 34 +- + drivers/scsi/qla4xxx/ql4_83xx.h | 17 - + drivers/scsi/qla4xxx/ql4_bsg.c | 4 +- + drivers/scsi/qla4xxx/ql4_init.c | 13 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- + drivers/scsi/qla4xxx/ql4_isr.c | 6 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 7 +- + drivers/scsi/qla4xxx/ql4_nx.c | 18 +- + drivers/scsi/qla4xxx/ql4_nx.h | 17 - + drivers/scsi/qla4xxx/ql4_os.c | 58 +- + drivers/scsi/scsi.c | 3 - + drivers/scsi/scsi_debug.c | 500 +++++++---- + drivers/scsi/scsi_lib.c | 62 +- + drivers/scsi/scsi_logging.c | 8 +- + drivers/scsi/scsi_pm.c | 10 +- + drivers/scsi/scsi_priv.h | 1 - + drivers/scsi/scsi_transport_iscsi.c | 31 +- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/scsi_transport_srp.c | 12 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/sd.h | 6 - + drivers/scsi/sd_zbc.c | 3 +- + drivers/scsi/storvsc_drv.c | 13 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 1 + + drivers/scsi/sym53c8xx_2/sym_hipd.c | 8 + + drivers/scsi/ufs/Kconfig | 22 + + drivers/scsi/ufs/Makefile | 6 +- + drivers/scsi/ufs/ufs-exynos.c | 1297 +++++++++++++++++++++++++++ + drivers/scsi/ufs/ufs-exynos.h | 287 ++++++ + drivers/scsi/ufs/ufs-mediatek.c | 140 ++- + drivers/scsi/ufs/ufs-mediatek.h | 4 +- + drivers/scsi/ufs/ufs-qcom-ice.c | 245 +++++ + drivers/scsi/ufs/ufs-qcom.c | 21 +- + drivers/scsi/ufs/ufs-qcom.h | 27 + + drivers/scsi/ufs/ufs.h | 38 +- + drivers/scsi/ufs/ufs_bsg.c | 5 +- + drivers/scsi/ufs/ufs_quirks.h | 10 +- + drivers/scsi/ufs/ufshcd-crypto.c | 245 +++++ + 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 | 541 +++++------ + drivers/scsi/ufs/ufshcd.h | 105 ++- + drivers/scsi/ufs/ufshci.h | 94 +- + drivers/scsi/ufs/unipro.h | 33 + + drivers/scsi/virtio_scsi.c | 22 +- + 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/iscsi/iscsi_target_nego.c | 36 +- + 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_tmr.c | 36 +- + drivers/target/target_core_transport.c | 8 +- + drivers/target/target_core_user.c | 397 ++++++-- + drivers/target/target_core_xcopy.c | 11 +- + include/linux/qcom_scm.h | 19 + + include/scsi/fc/fc_ms.h | 4 +- + include/scsi/scsi_tcq.h | 2 +- + include/scsi/scsi_transport_iscsi.h | 2 +- + include/target/iscsi/iscsi_target_core.h | 9 +- + include/target/target_core_backend.h | 2 + + include/target/target_core_base.h | 1 + + include/trace/events/ufs.h | 31 + + include/uapi/linux/target_core_user.h | 25 + + include/uapi/scsi/fc/fc_els.h | 2 + + 221 files changed, 7777 insertions(+), 3384 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/ufs-qcom-ice.c + create mode 100644 drivers/scsi/ufs/ufshcd-crypto.c + create mode 100644 drivers/scsi/ufs/ufshcd-crypto.h +Merging scsi-mkp/for-next (bf1a28f92a8b scsi: scsi_transport_srp: Sanitize scsi_target_block/unblock sequences) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (0adbeeb13028 vhost: fix copy & paste bug in documentation) +$ git merge vhost/linux-next +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_object.c +Merge made by the 'recursive' strategy. + arch/um/drivers/virtio_uml.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 4 +-- + drivers/platform/mellanox/mlxbf-tmfifo.c | 13 ++++++-- + drivers/scsi/virtio_scsi.c | 4 +-- + drivers/vdpa/ifcvf/ifcvf_base.h | 2 +- + drivers/vdpa/vdpa.c | 1 + + drivers/vdpa/vdpa_sim/vdpa_sim.c | 35 ++++++++++++++++---- + drivers/vhost/iotlb.c | 6 ++-- + drivers/vhost/net.c | 4 +-- + drivers/vhost/vdpa.c | 10 +++--- + drivers/virtio/virtio_balloon.c | 4 +-- + drivers/virtio/virtio_ring.c | 4 +-- + drivers/virtio/virtio_vdpa.c | 9 ++---- + include/linux/vdpa.h | 34 ++++++++++++++++++++ + include/linux/virtio_config.h | 55 +++++++++++++++++++++++++++++--- + include/linux/virtio_ring.h | 19 ++++++----- + include/uapi/linux/virtio_9p.h | 4 +-- + include/uapi/linux/virtio_balloon.h | 10 +++--- + include/uapi/linux/virtio_blk.h | 26 +++++++-------- + include/uapi/linux/virtio_config.h | 10 ++++-- + include/uapi/linux/virtio_console.h | 8 ++--- + include/uapi/linux/virtio_crypto.h | 26 +++++++-------- + include/uapi/linux/virtio_fs.h | 2 +- + include/uapi/linux/virtio_gpu.h | 8 ++--- + include/uapi/linux/virtio_input.h | 18 +++++------ + include/uapi/linux/virtio_iommu.h | 12 +++---- + include/uapi/linux/virtio_mem.h | 14 ++++---- + include/uapi/linux/virtio_net.h | 8 ++--- + include/uapi/linux/virtio_pmem.h | 4 +-- + include/uapi/linux/virtio_scsi.h | 20 ++++++------ + tools/virtio/linux/virtio_config.h | 6 ++-- + 32 files changed, 245 insertions(+), 139 deletions(-) +Merging rpmsg/for-next (f6cac270d142 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Removing include/linux/remoteproc/qcom_q6v5_ipa_notify.h +Auto-merging drivers/remoteproc/qcom_q6v5_mss.c +Removing drivers/remoteproc/qcom_q6v5_ipa_notify.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/keystone/ti,k3-sci-common.yaml | 44 ++ + .../devicetree/bindings/hwlock/qcom-hwspinlock.txt | 39 - + .../bindings/hwlock/qcom-hwspinlock.yaml | 65 ++ + .../bindings/remoteproc/qcom,pil-info.yaml | 44 ++ + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 184 +++++ + Documentation/staging/rpmsg.rst | 6 +- + MAINTAINERS | 1 + + drivers/hwspinlock/Kconfig | 10 +- + drivers/hwspinlock/qcom_hwspinlock.c | 70 +- + drivers/net/ipa/ipa.h | 3 + + drivers/net/ipa/ipa_modem.c | 56 +- + drivers/remoteproc/Kconfig | 25 +- + drivers/remoteproc/Makefile | 4 +- + 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.c | 2 + + drivers/remoteproc/qcom_q6v5_adsp.c | 16 +- + drivers/remoteproc/qcom_q6v5_ipa_notify.c | 85 --- + drivers/remoteproc/qcom_q6v5_mss.c | 157 ++-- + 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 | 450 ++++++------ + drivers/remoteproc/remoteproc_coredump.c | 325 +++++++++ + drivers/remoteproc/remoteproc_debugfs.c | 90 +++ + drivers/remoteproc/remoteproc_internal.h | 14 + + drivers/remoteproc/remoteproc_sysfs.c | 17 +- + drivers/remoteproc/stm32_rproc.c | 214 +++++- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 787 +++++++++++++++++++++ + drivers/remoteproc/ti_sci_proc.h | 104 +++ + drivers/rpmsg/virtio_rpmsg_bus.c | 63 +- + include/linux/remoteproc.h | 31 +- + include/linux/remoteproc/qcom_q6v5_ipa_notify.h | 82 --- + include/linux/remoteproc/qcom_rproc.h | 36 +- + 38 files changed, 2740 insertions(+), 691 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml + 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 Documentation/devicetree/bindings/remoteproc/ti,k3-dsp-rproc.yaml + create mode 100644 drivers/remoteproc/qcom_pil_info.c + create mode 100644 drivers/remoteproc/qcom_pil_info.h + delete mode 100644 drivers/remoteproc/qcom_q6v5_ipa_notify.c + create mode 100644 drivers/remoteproc/remoteproc_coredump.c + create mode 100644 drivers/remoteproc/ti_k3_dsp_remoteproc.c + create mode 100644 drivers/remoteproc/ti_sci_proc.h + delete mode 100644 include/linux/remoteproc/qcom_q6v5_ipa_notify.h +Merging gpio/for-next (b470cef1ffac gpio: rcar: Use irqchip template) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpiolib-of.c +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 + + drivers/gpio/Kconfig | 12 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/TODO | 2 +- + drivers/gpio/gpio-104-dio-48e.c | 35 +- + drivers/gpio/gpio-104-idi-48.c | 33 +- + drivers/gpio/gpio-104-idio-16.c | 33 +- + drivers/gpio/gpio-adnp.c | 95 +- + drivers/gpio/gpio-adp5588.c | 39 +- + drivers/gpio/gpio-aggregator.c | 63 +- + drivers/gpio/gpio-altera.c | 3 +- + drivers/gpio/gpio-crystalcove.c | 34 +- + drivers/gpio/gpio-dln2.c | 17 +- + drivers/gpio/gpio-ich.c | 26 +- + drivers/gpio/gpio-it87.c | 14 +- + drivers/gpio/gpio-max732x.c | 2 +- + drivers/gpio/gpio-max77620.c | 71 +- + drivers/gpio/gpio-ml-ioh.c | 2 +- + 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 | 45 +- + drivers/gpio/gpio-pca953x.c | 27 +- + drivers/gpio/gpio-pca9570.c | 146 +++ + drivers/gpio/gpio-pcf857x.c | 47 +- + drivers/gpio/gpio-pch.c | 14 +- + drivers/gpio/gpio-pci-idio-16.c | 33 +- + drivers/gpio/gpio-pcie-idio-24.c | 17 +- + drivers/gpio/gpio-pmic-eic-sprd.c | 2 +- + drivers/gpio/gpio-rcar.c | 17 +- + drivers/gpio/gpio-sama5d2-piobu.c | 16 +- + drivers/gpio/gpio-sch.c | 23 +- + drivers/gpio/gpio-stmpe.c | 24 +- + drivers/gpio/gpio-syscon.c | 12 +- + drivers/gpio/gpio-tc3589x.c | 26 +- + drivers/gpio/gpio-wcove.c | 30 +- + drivers/gpio/gpio-ws16c48.c | 39 +- + 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 | 24 +- + include/linux/gpio/regmap.h | 2 +- + include/uapi/linux/gpio.h | 2 +- + tools/gpio/gpio-event-mon.c | 3 +- + tools/gpio/gpio-utils.c | 4 +- + tools/gpio/lsgpio.c | 3 +- + 58 files changed, 1996 insertions(+), 1545 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 (4941b8dedb3f gpio: sch: Add a blank line between declaration and code) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (43dd0f2fff0e 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/intel/pinctrl-baytrail.c +CONFLICT (content): Merge conflict in drivers/pinctrl/intel/pinctrl-baytrail.c +Auto-merging drivers/pinctrl/freescale/pinctrl-imx.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/intel/pinctrl-baytrail.c' using previous resolution. +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 356e814b4486] Merge remote-tracking branch 'pinctrl/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/pinctrl/ingenic,pinctrl.txt | 81 - + .../bindings/pinctrl/ingenic,pinctrl.yaml | 176 ++ + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 197 ++ + .../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/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 | 33 +- + 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/intel/Kconfig | 8 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 7 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 418 ++-- + drivers/pinctrl/intel/pinctrl-emmitsburg.c | 387 ++++ + 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 ++++ + drivers/pinctrl/mediatek/Kconfig | 12 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-mt6779.c | 785 ++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 26 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 3 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt6779.h | 2085 ++++++++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-paris.c | 7 + + 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 | 34 +- + 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-mcp23s08.c | 44 +- + drivers/pinctrl/pinctrl-ocelot.c | 430 +++- + drivers/pinctrl/pinctrl-rockchip.c | 24 +- + drivers/pinctrl/pinctrl-rza1.c | 24 +- + drivers/pinctrl/pinctrl-single.c | 37 +- + drivers/pinctrl/pinctrl-stmfx.c | 32 +- + drivers/pinctrl/pinctrl-sx150x.c | 44 +- + drivers/pinctrl/pinmux.c | 5 +- + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 1 + + drivers/pinctrl/qcom/pinctrl-ipq8074.c | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 19 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 2 + + drivers/pinctrl/qcom/pinctrl-msm8976.c | 3 - + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 8 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 58 +- + 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 | 138 +- + drivers/pinctrl/tegra/pinctrl-tegra194.c | 1 - + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 2 +- + include/dt-bindings/pinctrl/mt6779-pinfunc.h | 1242 ++++++++++++ + include/dt-bindings/pinctrl/omap.h | 2 +- + 86 files changed, 7288 insertions(+), 1188 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.yaml + create mode 100644 drivers/pinctrl/intel/pinctrl-emmitsburg.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6779.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6779.h + create mode 100644 include/dt-bindings/pinctrl/mt6779-pinfunc.h +Merging pinctrl-intel/for-next (b4f2fcb53487 pinctrl: intel: Add Intel Emmitsburg pin controller support) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (6ced5ff0be8e pwm: bcm-iproc: handle clk_get_rate() return) +$ git merge pwm/for-next +Auto-merging drivers/video/backlight/pwm_bl.c +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-bcm-iproc.c | 12 ++++++++---- + drivers/pwm/pwm-bcm-kona.c | 2 +- + 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-mediatek.c | 1 + + drivers/pwm/pwm-omap-dmtimer.c | 4 ++-- + drivers/pwm/pwm-sifive.c | 2 +- + drivers/pwm/pwm-stm32-lp.c | 2 +- + drivers/pwm/pwm-sun4i.c | 2 +- + drivers/pwm/pwm-tiecap.c | 2 +- + drivers/pwm/pwm-tiehrpwm.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 ++++++------ + 21 files changed, 56 insertions(+), 44 deletions(-) +Merging userns/for-next (7fce69dff8db Implement kernel_execve) +$ git merge userns/for-next +Auto-merging init/main.c +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/entry/entry_32.S +Merge made by the 'recursive' strategy. + arch/x86/entry/entry_32.S | 2 +- + arch/x86/entry/entry_64.S | 2 +- + arch/x86/kernel/unwind_frame.c | 2 +- + fs/exec.c | 301 ++++++++++++++++++++++++++++------------- + include/linux/binfmts.h | 20 ++- + init/main.c | 4 +- + kernel/umh.c | 6 +- + security/tomoyo/common.h | 2 +- + security/tomoyo/domain.c | 4 +- + security/tomoyo/tomoyo.c | 4 +- + 10 files changed, 224 insertions(+), 123 deletions(-) +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/runner.sh +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 (342c8a1d1d9e coresight: etm4x: Fix save/restore during cpu idle) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (3d6cfb36ed71 rtc: ds1374: remove unused define) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 3 +- + 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 | 262 ++++++++++--------------------------------- + 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, 92 insertions(+), 215 deletions(-) +Merging nvdimm/libnvdimm-for-next (49688e654e48 dax: Fix incorrect argument passed to xas_set_err()) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging kernel/power/hibernate.c +Auto-merging include/linux/device.h +Auto-merging drivers/nvdimm/region_devs.c +Auto-merging drivers/dax/super.c +Auto-merging drivers/acpi/nfit/nfit.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-nfit | 19 + + Documentation/ABI/testing/sysfs-bus-nvdimm | 2 + + .../driver-api/nvdimm/firmware-activate.rst | 86 +++++ + drivers/acpi/nfit/core.c | 142 ++++++-- + drivers/acpi/nfit/intel.c | 386 +++++++++++++++++++++ + drivers/acpi/nfit/intel.h | 61 ++++ + drivers/acpi/nfit/nfit.h | 38 +- + drivers/dax/super.c | 13 +- + drivers/nvdimm/bus.c | 16 + + drivers/nvdimm/core.c | 149 ++++++++ + drivers/nvdimm/dimm_devs.c | 119 ++++++- + drivers/nvdimm/namespace_devs.c | 2 +- + drivers/nvdimm/nd-core.h | 1 + + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/nvdimm/region_devs.c | 2 +- + fs/dax.c | 15 +- + include/linux/libnvdimm.h | 52 ++- + include/linux/suspend.h | 6 + + include/uapi/linux/ndctl.h | 5 + + kernel/power/hibernate.c | 97 ++++++ + tools/testing/nvdimm/test/nfit.c | 367 ++++++++++++++++---- + 21 files changed, 1452 insertions(+), 128 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-nvdimm + create mode 100644 Documentation/driver-api/nvdimm/firmware-activate.rst +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 net/compat.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging init/init_task.c +Auto-merging include/net/sock.h +Auto-merging include/linux/seccomp.h +Auto-merging fs/file.c +Resolved 'tools/testing/selftests/seccomp/seccomp_bpf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 54b481b17d38] 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 sound/usb/endpoint.c +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/ipv6/ip6_flowlabel.c +CONFLICT (content): Merge conflict in net/ipv6/ip6_flowlabel.c +Auto-merging net/dccp/options.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/ksm.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/softirq.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/futex.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/events/core.c +Auto-merging kernel/dma/debug.c +Auto-merging kernel/audit.c +Auto-merging kernel/Makefile +Auto-merging init/main.c +Auto-merging include/net/flow_offload.h +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/ubifs/journal.c +Auto-merging fs/overlayfs/copy_up.c +Auto-merging fs/fuse/file.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/erofs/zdata.c +Auto-merging fs/erofs/data.c +Auto-merging drivers/virtio/virtio_ring.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/usb/host/fhci-sched.c +Auto-merging drivers/usb/gadget/udc/snps_udc_core.c +Auto-merging drivers/tty/vt/keyboard.c +Auto-merging drivers/ssb/driver_chipcommon.c +Auto-merging drivers/spi/spi-davinci.c +Auto-merging drivers/scsi/pm8001/pm80xx_hwi.c +Auto-merging drivers/scsi/pm8001/pm8001_hwi.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/net/ethernet/mellanox/mlx5/core/pagealloc.c +Auto-merging drivers/mtd/nand/raw/s3c2410.c +Auto-merging drivers/mmc/host/sdhci.c +Auto-merging drivers/memstick/host/jmb38x_ms.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/wr.c +Auto-merging drivers/infiniband/hw/mlx5/devx.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +CONFLICT (content): Merge conflict in 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/block/drbd/drbd_nl.c +Auto-merging drivers/atm/zatm.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 arch/powerpc/kvm/powerpc.c +Auto-merging arch/powerpc/kvm/book3s_pr.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_radix.c +Auto-merging Makefile +Auto-merging Documentation/process/deprecated.rst +Resolved 'drivers/gpu/drm/drm_edid.c' using previous resolution. +Resolved 'drivers/infiniband/core/uverbs_cmd.c' using previous resolution. +Resolved 'net/ipv6/ip6_flowlabel.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6ca65348541b] 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/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 - + 223 files changed, 669 insertions(+), 407 deletions(-) +Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (e1059cacc408 fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-fsi | 8 ++ + .../devicetree/bindings/fsi/fsi-master-aspeed.txt | 12 ++ + drivers/fsi/fsi-core.c | 31 ++++- + drivers/fsi/fsi-master-aspeed.c | 134 ++++++++++++++++++--- + drivers/fsi/fsi-master-ast-cf.c | 7 +- + drivers/fsi/fsi-master-gpio.c | 5 +- + drivers/fsi/fsi-master-hub.c | 13 +- + drivers/fsi/fsi-master.h | 3 +- + drivers/fsi/fsi-occ.c | 2 +- + drivers/fsi/fsi-sbefifo.c | 10 +- + 10 files changed, 191 insertions(+), 34 deletions(-) +Merging slimbus/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (a24ef5be460b nvmem: qcom-spmi-sdam: Enable multiple devices) +$ git merge nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +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 (3245b7b959d5 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/net/hyperv/hyperv_net.h +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + drivers/hv/channel.c | 177 ++++++++++++++++++++++++++++++++++++-- + 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 ++++++---- + include/uapi/linux/hyperv.h | 2 +- + tools/hv/hv_kvp_daemon.c | 2 +- + 11 files changed, 378 insertions(+), 92 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 (da83d0cb9237 Merge branch 'cap_checkpoint_restore' 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/pid.c +Auto-merging kernel/fork.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/sched/task.h +Auto-merging fs/open.c +Auto-merging fs/file.c +CONFLICT (content): Merge conflict in fs/file.c +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/x86/kernel/unwind_frame.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/x86/Kconfig +Auto-merging arch/um/Kconfig +CONFLICT (content): Merge conflict in arch/um/Kconfig +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/process_32.c +CONFLICT (content): Merge conflict in arch/sh/kernel/process_32.c +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +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/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/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/include/asm/unistd32.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Recorded preimage for 'arch/csky/Kconfig' +Resolved 'arch/csky/kernel/process.c' using previous resolution. +Resolved 'arch/riscv/Kconfig' using previous resolution. +Resolved 'arch/sh/kernel/process_32.c' using previous resolution. +Resolved 'arch/um/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 +Recorded resolution for 'arch/csky/Kconfig'. +[master 03fc6d06ceab] 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 | 4 +- + 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 ++ + fs/proc/base.c | 8 +- + include/linux/capability.h | 6 + + 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/capability.h | 9 +- + include/uapi/linux/close_range.h | 9 + + kernel/fork.c | 78 ++----- + kernel/nsproxy.c | 21 +- + kernel/pid.c | 2 +- + kernel/pid_namespace.c | 2 +- + kernel/sys.c | 13 +- + kernel/time/namespace.c | 22 +- + security/selinux/include/classmap.h | 5 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/clone3/.gitignore | 1 + + tools/testing/selftests/clone3/Makefile | 4 +- + .../clone3/clone3_cap_checkpoint_restore.c | 182 +++++++++++++++++ + 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 +++++++ + 96 files changed, 1013 insertions(+), 340 deletions(-) + create mode 100644 arch/sparc/kernel/process.c + create mode 100644 include/uapi/linux/close_range.h + create mode 100644 tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c + 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 hmm/hmm (7d17e83abec1 mm/hmm/test: use the new migration invalidation) +$ git merge hmm/hmm +Auto-merging mm/migrate.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_svm.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c +Auto-merging arch/powerpc/kvm/book3s_hv_uvmem.c +CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_hv_uvmem.c +Resolved 'arch/powerpc/kvm/book3s_hv_uvmem.c' using previous resolution. +Resolved 'drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 83734a6306d0] Merge remote-tracking branch 'hmm/hmm' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/kvm/book3s_hv_uvmem.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 257 +++++++++------------ + drivers/gpu/drm/nouveau/nouveau_svm.h | 13 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 13 +- + include/linux/hmm.h | 24 +- + include/linux/migrate.h | 16 +- + include/linux/mmu_notifier.h | 6 + + lib/test_hmm.c | 47 ++-- + lib/test_hmm_uapi.h | 4 + + mm/hmm.c | 16 +- + mm/migrate.c | 14 +- + tools/testing/selftests/vm/hmm-tests.c | 94 +++++++- + 13 files changed, 328 insertions(+), 199 deletions(-) +Merging fpga/for-next (eacfbf589c90 fpga: dfl: pci: add device id for Intel FPGA PAC N3000) +$ git merge fpga/for-next +Already up to date. +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 (d0dc371b39a7 bus: 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 (55cfafc50262 watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging fs/namespace.c +Auto-merging fs/Makefile +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 | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/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 | 9 ++ + fs/Makefile | 1 + + fs/mount.h | 21 +++ + fs/mount_notify.c | 228 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + include/linux/dcache.h | 1 + + include/linux/lsm_hook_defs.h | 3 + + include/linux/lsm_hooks.h | 6 + + include/linux/sched/user.h | 3 + + include/linux/security.h | 8 + + include/linux/syscalls.h | 2 + + include/linux/watch_queue.h | 7 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/watch_queue.h | 36 ++++- + kernel/sys_ni.c | 3 + + kernel/watch_queue.c | 8 + + samples/watch_queue/watch_test.c | 44 +++++- + security/security.c | 7 + + 37 files changed, 439 insertions(+), 6 deletions(-) + create mode 100644 fs/mount_notify.c +Merging fsinfo/fsinfo-core (4c5a79e9b772 samples: add error state information to test-fsinfo.c) +$ 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 +CONFLICT (content): Merge conflict in fs/internal.h +Auto-merging fs/ext4/super.c +Auto-merging fs/Makefile +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 +Recorded preimage for 'fs/internal.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/internal.h'. +[master eba176a9a61f] Merge remote-tracking branch 'fsinfo/fsinfo-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/fsinfo.rst | 574 ++++++++++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/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 | 748 +++++++++++++++++++++++ + fs/internal.h | 16 + + fs/mount.h | 3 + + fs/mount_notify.c | 2 + + fs/namespace.c | 427 +++++++++++++- + fs/super.c | 2 + + include/linux/errseq.h | 1 + + include/linux/fs.h | 7 + + include/linux/fsinfo.h | 112 ++++ + include/linux/syscalls.h | 4 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/fsinfo.h | 345 +++++++++++ + include/uapi/linux/mount.h | 13 +- + kernel/sys_ni.c | 1 + + lib/errseq.c | 33 +- + samples/vfs/Makefile | 6 +- + samples/vfs/test-fsinfo.c | 881 ++++++++++++++++++++++++++++ + samples/vfs/test-mntinfo.c | 277 +++++++++ + 46 files changed, 3798 insertions(+), 12 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 +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/seccomp/seccomp-filter/arch-support.txt +Auto-merging Documentation/features/sched/membarrier-sync-core/arch-support.txt +Auto-merging Documentation/features/debug/kgdb/arch-support.txt +Auto-merging Documentation/features/debug/debug-vm-pgtable/arch-support.txt +Auto-merging Documentation/features/core/jump-labels/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 e511d723a9a7] 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 security/smack/smackfs.c +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging net/l2tp/l2tp_debugfs.c +Auto-merging net/ipv4/netfilter/ipt_CLUSTERIP.c +Auto-merging net/hsr/hsr_debugfs.c +Auto-merging net/bluetooth/6lowpan.c +Auto-merging mm/swapfile.c +Auto-merging mm/slab_common.c +Auto-merging mm/shmem.c +Auto-merging lib/dynamic_debug.c +Auto-merging lib/debugobjects.c +CONFLICT (content): Merge conflict in lib/debugobjects.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/sched/psi.c +Auto-merging kernel/module.c +Auto-merging kernel/locking/lockdep_proc.c +Auto-merging kernel/kallsyms.c +Auto-merging kernel/irq/debugfs.c +Auto-merging kernel/bpf/cgroup.c +Auto-merging include/linux/proc_fs.h +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/read_write.c +Auto-merging fs/proc/proc_net.c +Auto-merging fs/proc/base.c +Auto-merging fs/proc/array.c +Auto-merging fs/omfs/file.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfs4state.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/cifs/dfs_cache.c +Auto-merging 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/cio/qdio_debug.c +Auto-merging drivers/s390/block/dasd.c +Auto-merging drivers/pwm/core.c +Auto-merging drivers/power/supply/da9030_battery.c +CONFLICT (content): Merge conflict in drivers/power/supply/da9030_battery.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/nvme/host/fabrics.c +Auto-merging drivers/net/xen-netback/xenbus.c +Auto-merging drivers/net/wireless/realtek/rtw88/debug.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7915/debugfs.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/common/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/memory/emif.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/nouveau/nouveau_debugfs.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/platform/uv/tlb_uv.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/ptdump.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 'drivers/power/supply/da9030_battery.c' using previous resolution. +Resolved 'lib/debugobjects.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e68c6b9645f2] 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/common/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/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/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 +- + 301 files changed, 666 insertions(+), 730 deletions(-) +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging akpm-current/current (59b3299ce728 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 tools/testing/selftests/Makefile +Auto-merging security/keys/encrypted-keys/encrypted.c +Auto-merging scripts/checkpatch.pl +Auto-merging net/wireless/util.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/sctp/socket.c +CONFLICT (content): Merge conflict in net/sctp/socket.c +Auto-merging net/mac80211/key.c +Auto-merging net/core/sock.c +Auto-merging net/bluetooth/smp.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/nommu.c +Auto-merging mm/mmap.c +Auto-merging mm/migrate.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.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 +Auto-merging lib/Kconfig.debug +Auto-merging kernel/umh.c +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/uprobes.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/main.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/usb/ch9.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/soc/ti/k3-ringacc.h +Auto-merging include/linux/sched/task.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/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/crash_core.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/compiler-clang.h +Auto-merging include/crypto/skcipher.h +Auto-merging include/crypto/hash.h +Auto-merging include/asm-generic/tlb.h +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/base.c +Auto-merging fs/open.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ntfs/dir.c +Auto-merging fs/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/misc.c +Auto-merging fs/cifs/dfs_cache.c +Auto-merging fs/cifs/connect.c +Auto-merging fs/buffer.c +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/Kconfig +Auto-merging drivers/staging/rtl8723bs/core/rtw_security.c +Auto-merging drivers/staging/ks7010/ks_hostif.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/ecc.c +Auto-merging crypto/api.c +Auto-merging crypto/adiantum.c +Auto-merging arch/x86/platform/uv/bios_uv.c +Auto-merging arch/x86/mm/numa.c +Auto-merging arch/x86/mm/init_64.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/x86/include/asm/uaccess.h +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/kernel/process_32.c +Auto-merging arch/sh/mm/ioremap_fixed.c +Auto-merging arch/sh/mm/init.c +Auto-merging arch/sh/include/asm/sparsemem.h +Auto-merging arch/s390/mm/cmm.c +Auto-merging arch/s390/kernel/ptrace.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/mem.c +Auto-merging arch/powerpc/mm/init_64.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/openrisc/include/asm/uaccess.h +Auto-merging arch/nds32/kernel/process.c +Auto-merging arch/mips/kernel/setup.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/csky/kernel/smp.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 arch/arm64/kernel/setup.c +Auto-merging arch/arm64/include/asm/uaccess.h +Auto-merging arch/arm/mm/mmu.c +Auto-merging arch/arm/include/asm/uaccess.h +Auto-merging Makefile +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 +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/cpumask.c' using previous resolution. +Resolved 'mm/cma.h' using previous resolution. +Resolved 'net/sctp/socket.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fb9b2c0d1f07] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + 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/dlmfs.rst | 2 +- + Documentation/filesystems/ocfs2.rst | 2 +- + Documentation/filesystems/proc.rst | 11 +- + Documentation/filesystems/tmpfs.rst | 11 + + Documentation/vm/arch_pgtable_helpers.rst | 258 +++++++ + Documentation/vm/memory-model.rst | 9 +- + Documentation/vm/page_migration.rst | 27 + + Documentation/vm/slub.rst | 37 +- + Makefile | 4 + + arch/alpha/include/asm/io.h | 8 +- + 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 | 1 - + arch/alpha/kernel/core_titan.c | 1 - + 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/signal.c | 2 + + 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/setup.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 | 59 +- + 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 | 4 +- + 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 | 6 +- + 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/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/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/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/init_64.c | 4 +- + 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 | 3 +- + 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/include/asm/sparsemem.h | 4 +- + arch/sh/kernel/idle.c | 1 - + arch/sh/kernel/machine_kexec.c | 1 - + arch/sh/kernel/traps_32.c | 12 +- + 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/sparsemem.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 | 21 +- + 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 +- + 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/xen/balloon.c | 1 - + drivers/xen/privcmd.c | 1 - + fs/Kconfig | 15 + + fs/aio.c | 15 +- + 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 | 8 +- + 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/nilfs2/alloc.c | 38 +- + fs/nilfs2/btree.c | 42 +- + fs/nilfs2/cpfile.c | 10 +- + fs/nilfs2/dat.c | 14 +- + fs/nilfs2/direct.c | 14 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/ifile.c | 4 +- + fs/nilfs2/inode.c | 32 +- + fs/nilfs2/ioctl.c | 37 +- + fs/nilfs2/mdt.c | 2 +- + fs/nilfs2/namei.c | 6 +- + fs/nilfs2/nilfs.h | 18 +- + fs/nilfs2/page.c | 11 +- + fs/nilfs2/recovery.c | 32 +- + fs/nilfs2/segbuf.c | 2 +- + fs/nilfs2/segment.c | 38 +- + fs/nilfs2/sufile.c | 29 +- + fs/nilfs2/super.c | 73 +- + fs/nilfs2/sysfs.c | 29 +- + fs/nilfs2/the_nilfs.c | 85 ++- + fs/ntfs/dir.c | 2 +- + fs/ntfs/inode.c | 27 +- + fs/ntfs/inode.h | 4 +- + fs/ntfs/mft.c | 4 +- + fs/ocfs2/Kconfig | 6 +- + fs/ocfs2/acl.c | 2 + + fs/ocfs2/blockcheck.c | 2 +- + fs/ocfs2/dlmglue.c | 8 +- + fs/ocfs2/namei.c | 17 +- + fs/ocfs2/ocfs2.h | 4 +- + fs/ocfs2/suballoc.c | 4 +- + fs/ocfs2/suballoc.h | 2 +- + 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/proc/task_mmu.c | 4 +- + fs/ramfs/inode.c | 12 + + fs/signalfd.c | 10 +- + fs/ufs/super.c | 2 +- + include/asm-generic/pgalloc.h | 80 +++ + include/asm-generic/tlb.h | 1 - + include/asm-generic/uaccess.h | 4 +- + include/clocksource/timer-ti-dm.h | 2 +- + 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/async_tx.h | 2 +- + include/linux/btree.h | 2 +- + include/linux/compaction.h | 2 + + include/linux/compiler-clang.h | 2 +- + include/linux/compiler_types.h | 44 +- + include/linux/crash_core.h | 6 + + include/linux/delay.h | 2 +- + include/linux/dma/k3-psil.h | 2 +- + include/linux/dma/k3-udma-glue.h | 2 +- + include/linux/dma/ti-cppi5.h | 2 +- + include/linux/exportfs.h | 2 +- + include/linux/frontswap.h | 2 +- + include/linux/fs.h | 17 +- + include/linux/generic-radix-tree.h | 2 +- + include/linux/highmem.h | 2 +- + include/linux/huge_mm.h | 67 +- + include/linux/irqchip/irq-omap-intc.h | 2 +- + include/linux/jhash.h | 2 +- + include/linux/kasan.h | 4 +- + include/linux/kernel.h | 8 +- + include/linux/leds-ti-lmu-common.h | 2 +- + include/linux/memcontrol.h | 215 +++++- + include/linux/memremap.h | 6 + + include/linux/mm.h | 100 +-- + include/linux/mm_inline.h | 6 +- + include/linux/mm_types.h | 6 +- + include/linux/mman.h | 4 + + include/linux/mmzone.h | 69 +- + 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/platform_data/davinci-cpufreq.h | 2 +- + include/linux/platform_data/davinci_asp.h | 2 +- + include/linux/platform_data/elm.h | 2 +- + include/linux/platform_data/gpio-davinci.h | 2 +- + include/linux/platform_data/gpmc-omap.h | 2 +- + include/linux/platform_data/mtd-davinci-aemif.h | 2 +- + include/linux/platform_data/omap-twl4030.h | 2 +- + include/linux/platform_data/uio_pruss.h | 2 +- + include/linux/platform_data/usb-omap.h | 2 +- + include/linux/poison.h | 4 - + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 14 +- + include/linux/sched/task.h | 1 + + 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/soc/ti/k3-ringacc.h | 2 +- + include/linux/soc/ti/knav_qmss.h | 2 +- + include/linux/soc/ti/ti-msgmgr.h | 2 +- + include/linux/swap.h | 27 +- + 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/wkup_m3_ipc.h | 2 +- + include/linux/xxhash.h | 2 +- + include/linux/xz.h | 4 +- + include/linux/zlib.h | 2 +- + include/ras/ras_event.h | 3 + + include/soc/arc/aux.h | 2 +- + include/trace/events/migrate.h | 17 +- + include/uapi/linux/auto_dev-ioctl.h | 2 +- + include/uapi/linux/elf.h | 2 +- + include/uapi/linux/map_to_7segment.h | 2 +- + include/uapi/linux/types.h | 2 +- + include/uapi/linux/usb/ch9.h | 2 +- + init/Kconfig | 9 +- + init/main.c | 2 +- + ipc/sem.c | 3 +- + ipc/shm.c | 6 +- + kernel/Makefile | 2 +- + kernel/crash_core.c | 50 ++ + kernel/events/callchain.c | 5 +- + kernel/events/core.c | 5 +- + kernel/events/uprobes.c | 2 +- + kernel/exit.c | 18 +- + kernel/fork.c | 55 +- + kernel/hung_task.c | 44 ++ + kernel/kcov.c | 6 +- + kernel/kmod.c | 5 +- + kernel/kthread.c | 13 +- + kernel/panic.c | 4 +- + kernel/power/snapshot.c | 2 +- + kernel/rcu/tree.c | 6 +- + kernel/scs.c | 2 +- + kernel/stacktrace.c | 5 +- + kernel/sysctl.c | 19 +- + kernel/umh.c | 29 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 33 +- + lib/Kconfig.kasan | 39 +- + lib/Makefile | 2 +- + lib/bitmap.c | 4 +- + lib/cpumask.c | 102 ++- + lib/crc64.c | 2 +- + lib/decompress_bunzip2.c | 2 +- + lib/decompress_unlzma.c | 6 +- + lib/kstrtox.c | 12 +- + lib/math/rational.c | 2 +- + lib/mpi/mpiutil.c | 6 +- + lib/percpu_counter.c | 19 + + lib/rbtree.c | 2 +- + lib/test_bitmap.c | 58 ++ + lib/test_bitops.c | 18 +- + lib/test_bits.c | 75 ++ + lib/test_kasan.c | 87 ++- + lib/test_kmod.c | 2 +- + lib/test_lockup.c | 6 +- + lib/ts_bm.c | 2 +- + lib/xxhash.c | 2 +- + lib/xz/xz_crc32.c | 2 +- + lib/xz/xz_dec_bcj.c | 2 +- + lib/xz/xz_dec_lzma2.c | 2 +- + lib/xz/xz_lzma2.h | 2 +- + lib/xz/xz_stream.h | 2 +- + mm/Kconfig | 6 +- + mm/Makefile | 2 +- + mm/cma.c | 40 +- + mm/cma.h | 4 +- + mm/compaction.c | 187 ++++- + mm/debug.c | 83 +-- + mm/debug_vm_pgtable.c | 666 ++++++++++++++++- + mm/filemap.c | 11 +- + mm/gup.c | 5 +- + mm/huge_memory.c | 37 +- + mm/hugetlb.c | 40 +- + 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/khugepaged.c | 2 +- + mm/maccess.c | 22 +- + mm/madvise.c | 39 +- + mm/memcontrol.c | 794 +++++++++++++-------- + mm/memory-failure.c | 331 ++++----- + mm/memory.c | 35 +- + mm/memory_hotplug.c | 33 +- + mm/mempolicy.c | 4 +- + mm/memremap.c | 20 + + mm/migrate.c | 97 ++- + mm/mlock.c | 9 +- + mm/mm_init.c | 22 +- + mm/mmap.c | 88 ++- + mm/mmu_notifier.c | 9 +- + mm/mremap.c | 17 +- + mm/nommu.c | 6 +- + mm/oom_kill.c | 26 +- + mm/page-writeback.c | 6 +- + mm/page_alloc.c | 289 ++++---- + 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 | 132 +++- + mm/shuffle.c | 46 +- + mm/shuffle.h | 17 - + mm/slab.c | 101 +-- + mm/slab.h | 395 +++++----- + mm/slab_common.c | 703 ++---------------- + mm/slob.c | 12 +- + mm/slub.c | 588 +++++---------- + mm/sparse-vmemmap.c | 56 +- + mm/sparse.c | 31 +- + mm/swap.c | 29 +- + mm/swap_slots.c | 45 +- + mm/swap_state.c | 86 ++- + mm/swapfile.c | 6 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 52 +- + mm/vmalloc.c | 176 ++--- + mm/vmscan.c | 71 +- + mm/vmstat.c | 100 ++- + mm/workingset.c | 35 +- + 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/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/Makefile.kasan | 3 +- + scripts/bloat-o-meter | 2 + + scripts/checkpatch.pl | 103 ++- + 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/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/include/linux/jhash.h | 2 +- + tools/lib/rbtree.c | 2 +- + tools/lib/traceevent/event-parse.h | 2 +- + tools/testing/ktest/examples/README | 2 +- + tools/testing/ktest/examples/crosstests.conf | 2 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/cgroup_util.c | 2 +- + tools/testing/selftests/cgroup/test_kmem.c | 450 ++++++++++++ + tools/testing/selftests/kmod/kmod.sh | 4 +- + tools/testing/selftests/mincore/.gitignore | 2 + + tools/testing/selftests/mincore/Makefile | 6 + + tools/testing/selftests/mincore/mincore_selftest.c | 361 ++++++++++ + tools/testing/selftests/vm/hmm-tests.c | 35 + + 601 files changed, 7469 insertions(+), 4622 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 tools/cgroup/memcg_slabinfo.py + create mode 100644 tools/testing/selftests/cgroup/test_kmem.c + create mode 100644 tools/testing/selftests/mincore/.gitignore + create mode 100644 tools/testing/selftests/mincore/Makefile + create mode 100644 tools/testing/selftests/mincore/mincore_selftest.c +$ 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/69)
Rebasing (2/69)
Rebasing (3/69)
Rebasing (4/69)
Rebasing (5/69)
Rebasing (6/69)
Rebasing (7/69)
Rebasing (8/69)
Rebasing (9/69)
Rebasing (10/69)
Rebasing (11/69)
Rebasing (12/69)
Rebasing (13/69)
Rebasing (14/69)
Rebasing (15/69)
Rebasing (16/69)
Rebasing (17/69)
Rebasing (18/69)
Rebasing (19/69)
Rebasing (20/69)
Rebasing (21/69)
Rebasing (22/69)
Rebasing (23/69)
Rebasing (24/69)
Rebasing (25/69)
Rebasing (26/69)
Rebasing (27/69)
Rebasing (28/69)
Rebasing (29/69)
Rebasing (30/69)
Rebasing (31/69)
Rebasing (32/69)
Rebasing (33/69)
Rebasing (34/69)
Rebasing (35/69)
Rebasing (36/69)
Rebasing (37/69)
Rebasing (38/69)
Rebasing (39/69)
Rebasing (40/69)
Rebasing (41/69)
Rebasing (42/69)
Rebasing (43/69)
Rebasing (44/69)
Rebasing (45/69)
Rebasing (46/69)
Rebasing (47/69)
Rebasing (48/69)
Rebasing (49/69)
Rebasing (50/69)
Rebasing (51/69)
Rebasing (52/69)
Rebasing (53/69)
Rebasing (54/69)
Rebasing (55/69)
Rebasing (56/69)
Rebasing (57/69)
Rebasing (58/69)
Rebasing (59/69)
Rebasing (60/69)
Rebasing (61/69)
Rebasing (62/69)
Rebasing (63/69)
Rebasing (64/69)
Rebasing (65/69)
Rebasing (66/69)
Rebasing (67/69)
Rebasing (68/69)
Rebasing (69/69)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 921632de9f1a...933c67936bf2 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (933c67936bf2 virtio: pci: constify ioreadX() iomem argument (as in generic implementation)) +$ git merge --no-ff akpm/master +Removing kernel/sysctl_binary.c +Merge made by the 'recursive' strategy. + 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 | 12 +- + arch/alpha/include/asm/io_trivial.h | 16 +- + arch/alpha/include/asm/jensen.h | 2 +- + arch/alpha/include/asm/machvec.h | 6 +- + arch/alpha/kernel/core_marvel.c | 2 +- + arch/alpha/kernel/io.c | 12 +- + 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/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/include/asm/io.h | 4 +- + arch/parisc/kernel/syscalls/syscall.tbl | 3 +- + arch/parisc/lib/iomap.c | 72 ++++---- + arch/parisc/mm/fault.c | 8 +- + arch/powerpc/kernel/iomap.c | 28 +-- + 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/iomap.c | 22 +-- + arch/sh/kernel/syscalls/syscall.tbl | 3 +- + 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 +- + .../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/sh/clk/cpg.c | 21 +-- + drivers/vfio/vfio_iommu_type1.c | 4 +- + drivers/virtio/virtio_pci_modern.c | 6 +- + fs/exec.c | 2 +- + fs/io_uring.c | 2 +- + include/asm-generic/iomap.h | 28 +-- + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/compat.h | 5 +- + include/linux/hugetlb.h | 45 +++-- + include/linux/io-64-nonatomic-hi-lo.h | 4 +- + include/linux/io-64-nonatomic-lo-hi.h | 4 +- + 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 ------------------- + lib/iomap.c | 30 ++-- + mm/filemap.c | 20 ++- + mm/frontswap.c | 8 +- + mm/gup.c | 181 ++++++-------------- + mm/hmm.c | 3 +- + mm/hugetlb.c | 46 ++--- + 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 ++-- + 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 +- + 155 files changed, 825 insertions(+), 1056 deletions(-) + delete mode 100644 kernel/sysctl_binary.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..d06a9e2ece4a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200803 |