diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-09-08 20:54:35 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-09-08 20:54:35 +1000 |
| commit | dff9f829e5b0181d4ed9d35aa62d695292399b54 (patch) | |
| tree | 68aff23326951f5bc136c22e1e714430347dd686 | |
| parent | 89e18b3cf2d082dede235d468b9b0d3c78e7837a (diff) | |
| download | linux-next-dff9f829e5b0181d4ed9d35aa62d695292399b54.tar.gz | |
Add linux-next specific files for 20200908next-20200908
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 329 | ||||
| -rw-r--r-- | Next/Trees | 331 | ||||
| -rw-r--r-- | Next/merge.log | 10433 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 11094 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..9be8b273b9e7 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,329 @@ +Name SHA1 +---- ---- +origin f4d51dffc6c01a9e94650d95ce0104964f8ae822 +fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +kbuild-current f4d51dffc6c01a9e94650d95ce0104964f8ae822 +arc-current 26907eb605fbc3ba9dbf888f21d9d8d04471271d +arm-current 5c6360ee4a0e7f62de34341ad5d3c936f49b391d +arm64-fixes e0328feda79d9681b3e3245e6e180295550c8ee9 +arm-soc-fixes 9c8b0a9c37b757ae06f382668d5a80eae4921339 +uniphier-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +drivers-memory-fixes 7ff3a2a626f7161c94fb58a0058dbdaedaa9d166 +m68k-current 382f429bb559fe991b1ece2e5e58c812e28b3ad8 +powerpc-fixes 4c62285439f80f8996c38e0bda79b1125a192365 +s390-fixes 5c60ed283e1d87e161441bb273541a948ee96f6a +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net e1f469cd5866499ac40bfdca87411e1c525a10c7 +bpf e6135df45e21f1815a5948f452593124b1544a3e +ipsec 45a36a18d01907710bad5258d81f76c18882ad88 +netfilter 6b6382a857d824c0866056d5736bbcb597a922ed +ipvs 7c7ab580db49cc7befe5f4b91bb1920cd6b07575 +wireless-drivers 1264c1e0cfe55e2d6c35e869244093195529af37 +mac80211 c8146fe292a726d71e302719df90b53e2f84f7a5 +rdma-fixes 28b0865714b315e318ac45c4fc9156f3d4649646 +sound-current c3cdf189276c2a63da62ee250615bd55e3fb680d +sound-asoc-fixes e81118864f25a65a9e974de5f99317ccb53e87f1 +regmap-fixes f75aef392f869018f78cfedf3c320a6b3fcfda6b +regulator-fixes b40d843b2186b6cbd23bfb6664cfc1385f3c6028 +spi-fixes 0b49be756fa822d31cb82d76052dd5fbe18f6477 +pci-current 7c2308f79fc81ba0bf24ccd2429fb483a91bcd51 +driver-core.current 1c30474826682bc970c3200700d8bcfa2b771278 +tty.current f75aef392f869018f78cfedf3c320a6b3fcfda6b +usb.current 7c6bbdf086ac7f1374bcf1ef0994b15109ecaf48 +usb-gadget-fixes bc9a2e226ea95e1699f7590845554de095308b75 +usb-serial-fixes 2bb70f0a4b238323e4e2f392fc3ddeb5b7208c9e +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy ad7a7acaedcf45071c822b6c983f9c1e084041c9 +staging.current a139ffa40f0c24b753838b8ef3dcf6ad10eb7854 +char-misc.current bd018a6a75cebb511bb55a0e7690024be975fe93 +soundwire-fixes 3fbbf2148a406b3e350fe91e6fdd78eb42ecad24 +thunderbolt-fixes 813050e0a9b871ac575abfd3d321f74916df609d +input-current 9e8238020c5beba64e7ffafbb7ea0fb02fe68270 +crypto-current 1b0df11fde0f14a269a181b3b7f5122415bc5ed7 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes aae7a75a821a793ed6b8ad502a5890fb8e8f172d +kselftest-fixes 5c1e4f7e9e49b6925b1fb5c507d2c614f3edb292 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes f4d51dffc6c01a9e94650d95ce0104964f8ae822 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes f7e6b19bc76471ba03725fe58e0c218a3d6266c3 +mfd-fixes 22380b65dc70f5b132c5afdf6b4011e2a84ec34a +v4l-dvb-fixes ddecfc76979d5585847c76c4c489dcac389f86dd +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes baf5cb30fbd1c22f6aa03c081794c2ee0f5be4da +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 6542e2b613c2b1952e83973dc434831332ce8e27 +kvm-fixes b5331379bc62611d1026173a09c73573384201d9 +kvms390-fixes 774911290c589e98e3638e73b24b0a4d4530e97c +hwmon-fixes d50e0d75000410249090297ca55ee895f518ee27 +nvdimm-fixes 6180bb446ab624b9ab8bf201ed251ca87f07b413 +btrfs-fixes 667cc3d206b5c4d94217eb30f5b1c78d9e93e6ac +vfs-fixes 9d682ea6bcc76b8b2691c79add59f7d99c881635 +dma-mapping-fixes 892fc9f6835ecf075efac20789b012c5c9997fcc +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +samsung-krzk-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pinctrl-samsung-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +devicetree-fixes 5cd841d2676a702e5f79a8bacbfbae3bfc2411f7 +scsi-fixes 9a382f2fd2a1a9f93518522d9697fb8af7fe1552 +drm-fixes d37d56920004cae612fa32d1f92aaacca5e145f7 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes f4d51dffc6c01a9e94650d95ce0104964f8ae822 +mmc-fixes f0c393e2104e48c8a881719a8bd37996f71b0aee +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes b46b4a8a57c377b72a98c7930a9f6969d2d4784e +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 29d9f9dd44801a9d24a5e61f8ffb8bbade5c0b13 +pidfd-fixes bda4c60d02e9ceeee726f73250b808fad0663dd6 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gpio-intel-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pinctrl-intel-fixes 3488737093e7f60c7764b9a3cc66648adcbddca4 +erofs-fixes 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 21a6d1780d5bbfca0ce9b8104ca6233502fcbf86 +ubifs-fixes f37e99aca03f63aa3f2bd13ceaf769455d12c4b0 +memblock-fixes 5f7b81c18366c38446f6eedab570b98dbdc07cff +drm-misc-fixes fc7f148feb8975784bd40e41fff875d33f698be8 +kspp-gustavo cb0938372de0016cb264d87ef862d07868d8dff2 +kbuild 8e2271d630d8a962490fc86a5a48139caa62f228 +compiler-attributes e5fc436f06eef54ef512ea55a9db8eb9f2e76959 +dma-mapping 135ba11a7a07b4ce9197d9fa4b196329a57f1e06 +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 4dffbda6a996813bc2760f021e1edf669cf84805 +arm64 f75aef392f869018f78cfedf3c320a6b3fcfda6b +arm-perf f75aef392f869018f78cfedf3c320a6b3fcfda6b +arm-soc 210ecbc29884d1281cac17995bd0c26f340ada5b +amlogic c943b84fab78170fcdf60d960ea8d82d2cedbdbb +aspeed 393d812b5ec1501ecde7851c7d84e477f2912376 +at91 b68f43873b72e2a0ddbd6770172b8797772e3615 +drivers-memory dd85345abca60a8916617e8d75c0f9ce334336dd +imx-mxs dcb7078ce243e2de428fa31d5ea3dca49b1e5d4b +keystone 50c950e2c8b6c11fc7bb2f23856bd541f1b55a16 +mediatek 63424bbb31b765d2577b57f0375bf9e039e774a3 +mvebu 29bd9d8c2ac147964552b1bbfaf2b43fe53fd10c +omap cf4173c2defa7996eb94ae44475359615047b27e +qcom 4c7f2d50c2e3ddedcd6a636c1e60b4f5b5cbd4c5 +raspberrypi 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 8f140ba19f7615381b1c6305788cb163d6a361b3 +reset 2983e2385ff6addd31de6f5b27f1ad0bec26aab6 +rockchip 5b54a6a5703f1891c8f6738f4632a141589119d0 +samsung-krzk 991ead47630f707b2ed55676b48bdc131a80146f +scmi 02c210a7e42c437fe19fd35c3f768e29c896a0ab +sunxi 4fc958d5a0c6a50e03461876940b9250472da465 +tegra 05ccc6eebf8e30aabaff79dfcc7883d636f605c8 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new e5c956c4f36cdd59e775f2285af9a1683374c5a5 +uniphier 4f8fb65af5299d138f57e6d62f88d2d5964d40eb +clk 24907ec547022f4e31b85e45e7f9d99a2939af11 +clk-samsung 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +csky bdcd93ef9afb42a6051e472fa62c693b1f9edbd8 +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +ia64 1a9d3c34c593f7ce3c6673e9e015b3253330eab2 +m68k 352e04291115af2a74c271e0cd3643a632af6b7a +m68knommu f4d51dffc6c01a9e94650d95ce0104964f8ae822 +microblaze 4a17e8513376bb23f814d3e340a5692a12c69369 +mips 601637e42df045ca2d1a9324d56765f044d46866 +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 55b2662ec665cc8b592809a011fe807b05370ab8 +parisc-hd 685cbf6616cee5f6bc6ac2d3d814f7afff4ebc3b +powerpc 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e9e4ef9116b12951eaee3f8447ba9bbb40ab3620 +risc-v 1fc0583c7d4634031a019038472860c960e952db +s390 4bff8cb5450287e246d365b719148b2d9364c292 +sh 0c64a0dce51faa9c706fdf1f957d6f19878f4b81 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f6e8c474390be2e6f5bd0b8966e19958214609ff +xtensa 4ca4c562efb67cd4e224ff560f4b1f2c86314906 +fscrypt 5e895bd4d5233cb054447d0491d4e63c8496d419 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs d7f5b2deba2d524abb19e3f089594fd68c5a4bb4 +ceph f44d04e696feaf13d192d942c4f14ad2e117065a +cifs 01ec372cef1e5afa4ab843bbaf88a6fcb64dc14c +configfs 059ccbfff8a826c0e7bfe5d69a55e1179672d8f8 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs cfcedfe21820f425ddb40a75ad660e21249fdb91 +exfat 9764d7e25a9f32ff272ac444db48d6dce2d50029 +ext3 b5bc31eaba8760a41e5a95b123c50d9c83cf2627 +ext4 27bc446e2def38db3244a6eb4bb1d6312936610a +f2fs 2cf1646e15fe47505a4bcdef3eda1452424e18f2 +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse ddca99b70295881e50fd18f7e3774bf92bbc4c69 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 3d7a9520f0c3e6a68b6de8c5812fc8b6d7a52626 +nfs-anna 65caafd0d2145d1dd02072c4ced540624daeab40 +nfsd 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +cel 9fe8cbb3e9ba09b3389c14c7ebec9f1253d9bc37 +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs 8f6ee74c27860d4a4c6e0f8cf772bb2afc184bcb +ubifs 798b7347e4f29553db4b996393caf12f5b233daf +v9fs 2ed0b7578170c3bab10cde09d4440897b305e40c +xfs d0c20d38af135b2b4b90aa59df7878ef0c8fbef4 +zonefs d012a7190fc1fd72ed48911e77ca97ba4521bccd +iomap 60263d5889e6dc5987dc51b801be4955ff2e4aa7 +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks 1ad5f100e3ba73fe75615f720fa721f039759ee6 +vfs d0da22c90ead6c72fdd398aad1a6f74f1e157f8c +printk 04cfbfe5b1b18979e0a9c4e0ae1de74dd48daa5b +pci 88f66c6817809ce9705efe376b65b93fdbdb7f35 +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid 390dda244b619e36952db65f6251ee4b2f0d06e4 +i2c 4323405f424e299a5dce7fb33e054dedc109f528 +i3c 9da36a7ec42135428e1d41621e3703429bda3b2e +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging 3f73dc9deb13f6a15ad8720b00cd91abc3846643 +jc_docs 9f364b605f34e1c0b9847943f55db061d5a26bcb +v4l-dvb cfe9e707c5640c28ab168cabe91aea5d0b3f9195 +v4l-dvb-next 0d6db85131e014c128e57649793aff5aa96e065f +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 7eada1ae101b2de8a32fb7125db0162b00965d48 +cpufreq-arm b981e97306ef704b71f814f37474f00a15e3dfa7 +cpupower 527b7779e5ecabb057089b760140309bdcacc16a +devfreq 4b1e767350fb650640fa1d3eb0bf36c9b7a25b58 +opp 257eba525a2e95245a05036ba7cd6b0da333dc72 +thermal 6f55be9fd5eed1239ab2639688a889c7e922c5e9 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 7ae0451e2e6c29ff9fc17754b1129d9491177634 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 524d8ffd07f0ca10b24011487339f836ed859b32 +net-next 81365af13a5630673c49bfad9b24cf415e9576f6 +bpf-next 1ba5fe2facf7f66ead1d3509c38f2bbc2bdc4378 +ipsec-next 02a20d4fef3da0278bd2d95c86f48318a9902b76 +mlx5-next 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +netfilter-next 144b0a0e608690d46e9a77819249bdd8d23bdcb6 +ipvs-next bfdd5aaa54b0a44d9df550fe4c9db7e1470a11b8 +wireless-drivers-next cc95fa81524a95358a7bc1d29e9e3c314753486c +bluetooth 0e9952804ec9c8ba60f131225eab80634339f042 +mac80211-next 0f091e43310f5c292b7094f9f115e651358e8053 +gfs2 2928eebec009f7c9051917752dba0096af294350 +mtd 3fbe507ebd828bc8ce747181a204ddafbe5cce2f +nand da151e3458c825fa9d57c2db6e37748166e4d129 +spi-nor e93a977367b2aefff3c1fb426bbdfc6e2980815f +crypto c68e418c603f011ff0e7f4e1fb0f7edc48a04f7e +drm 3393649977f9a8847c659e282ea290d4b703295c +amdgpu 1b7eca59ceb0474343f040a063cf828213c9fac4 +drm-intel f8bd54d2190469e2244ade66cc1551b2a8f4f138 +drm-tegra 4fba6d22ca9ad28b8871d763b35a4da2e1ca272e +drm-misc dbd9d80c1b2e033d5ec2d00add89a4f18f6899eb +drm-msm f6828e0c4045f03f9cf2df6c2a768102641183f4 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm efd5a93d2a894a1efde45ed12c17cb32f1740812 +etnaviv c5d5a32ead1e3a61a07a1e59eb52a53e4a6b2a7f +regmap b89102f28d2926325d4c10ae3e53e0b1851604de +sound b248b9dd5975c1e16b7918c1dc7eaef7eccfde5f +sound-asoc 45eee0e8a0247730ec41c0b2c886f85387b0b76a +modules 14721add58ef267344bee254bc276c9139b7b665 +input 9b5fbad1dcee0607300d08f888c71c8ef97a06a0 +block bc02a81e145ffd99ec207ae03b878e59b0e0d0e7 +device-mapper 3a653b205f29b3f9827a01a0c88bfbcb0d169494 +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 31ae403513be3aa464c28a5544ecb2beb20f32c6 +mfd c563a66537d2a8c7baa9ca63574d5604d290ccc8 +backlight 7eb99a39ef767644bbfd2b3f12f139d13e3ee8b3 +battery d8483f31487c8c8f87fec59c5ee106dd213b177a +regulator a727d5f996ed7e330539793ceaa0a24e7607a791 +security bc62d68e2a0a69fcdcf28aca8edb01abf306b698 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity d012a7190fc1fd72ed48911e77ca97ba4521bccd +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 0476c865ded6180f9b3b68325b9bb5aa7f3babdb +selinux 66ccd2560affc6e653ef7372ea36fb825743d186 +smack d012a7190fc1fd72ed48911e77ca97ba4521bccd +tomoyo 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +tpmdd 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +watchdog 18445bf405cb331117bc98427b1ba6f12418ad17 +iommu c59bc95e9144b2b7f9d06a21e15436fe5b76ef79 +vfio ccd59dce1a21f473518bf273bdf5b182bab955b3 +audit c07203516439b9cd9f7b3cbed82a77164de5af40 +devicetree 282d66289d583dbe53802c1329bb47c767ded7bb +mailbox 884996986347dbe3b735cfa9bc041dd98a533796 +spi b1f556c2e2be5d0b09277f6bbe975529f07cac40 +tip 7f6aae3e054f8d36ac90812db4ffd78796a487d1 +clockevents 9fba22584e54340365c611987c451e384bc4a96f +edac 8d5d94603eafae03c851f59b36a11b437db43a33 +irqchip 821fc9e261f3af235752f46e59084467cfd440c4 +ftrace 38ce2a9e33db61a3041840310077072d6210ead4 +rcu 60fd60941f88ef4dd448ecdf3e664986974639e6 +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 66793484fdb6a9036296690684ed712318a9325e +kvm-ppc 5706d14d2a9472aae6d6e3023a9f37b1eee718ea +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip 9e2369c06c8a181478039258a4598c1ddd2cadfa +percpu 4fa640dc52302b5e62b01b05c755b055549633ae +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +chrome-platform dd92f7dfe1ba3bad556c8a529edacce7c6fd0195 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 242b81170fb8a4a9d84ae183a8e0b1aaf2554d89 +ipmi e829295c9baeda3e71343b7127785e85ef0a941c +driver-core 51fae39bd5018e4f6d3e65a1a1a8ad40b5ee3662 +usb 5df7ef7d32fec1d6d1c34dbec019b461a12ce870 +usb-gadget f5e46aa4a124bfac34a770c4cfe5023de99380d4 +usb-serial 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +usb-chipidea-next 71ac680e6339e744d87647a1ca27b2e87dba2eac +phy-next 23bea1be4eea435af42d9971aef8205b71cf7cd3 +tty 71a174b39f10b4b93223d374722aa894b5d8a82e +char-misc 99f667352f6c938440d9043d0f66f859d6f3d50d +extcon b49959fcfb2dac6f8c8b9c9ab768e3a36ea23c2f +soundwire 8564551eec8afdc7aaf68853fbcae559426c9fe7 +thunderbolt 54e418106c765c5f3c378c770b0f8518632830da +staging e2664d0870bbbf9df2513ed9870003a70bdb0e8e +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 91e045b93db79a2ef66e045ad0d1f8f9d348e1f4 +dmaengine 78e7a522693b5f5b1c8b8a7b8bd066e4dddb3d3c +cgroup 936f2a70f2077f64fab1dcb3eca71879e82ecd3f +scsi 5da7eb801d500a2c9e37108ba6d30fb464bd4b19 +scsi-mkp 8c6572356646f700e1679d8f7eb2ab3a4eab678c +vhost 8a7c3213db068135e816a6a517157de6443290d6 +rpmsg ca69dba7f13a293f83b08f003cd935c6abfee249 +gpio feeaefd378cae2f6840f879d6123ef265f8aee79 +gpio-brgl 805a6ef8ac28579a6fb2d8e6505c100bc9bf5395 +gpio-intel 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pinctrl ebc2599144b610a7e6e967ee89a769d908a3eeef +pinctrl-intel a0bf06dc51dbbc5ad182b1bcf4d879db8d297c5e +pinctrl-samsung 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pwm 6ced5ff0be8e94871ba846dfbddf69d21363f3d7 +userns 7fce69dff8db30cb93aace0bbebda09972027af7 +ktest ff131efff141fc679cccde28bc265f4c79cbe329 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest f69237e1e954b469175de4af8487c303d36c5467 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 59fc1e476962eff9ef259355a9daf912b563aac0 +coresight ac8b9037ea2c4e5549396613fdb7585ed2b520da +rtc 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +nvdimm 03b68d5d7d4b7551ca445dfb84cb05786d70ae90 +at24 99363d1c26c825055f8a879d9d5c2b78168cf655 +ntb b8e2c8bbdf7778c6e3c65db21ababb1dfa794282 +seccomp 16b89f695313d91c99bdaf6898f28a51d0af1b17 +kspp 55dde35fdb7f3646f9aa534f56a2599e2aef6b31 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 4ca8b73f16f0a9ea773a706fe4a3fd91e667aab9 +slimbus 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +nvmem c368763c4b01b67a8d5314f9a7b55d5dc027b8c7 +xarray 27586ca786a729cda6c807621a1494900a56e7bc +hyperv 49971e6bad2da980686368baa34039907f62b516 +auxdisplay 46d4a403a04c0ba46641452367b6a04bcf918a06 +kgdb 2c308ef41351372a5c23a1047d71db3015ed7a9c +pidfd f2e9aec45e9e16e12b5e47f3e913389ab2138740 +hmm 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +fpga c71e805083af55e0c8eae33bb0653d0105556625 +kunit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 11399346ac39a26ade2a90303d38ad318163c665 +kunit-next abe83f7621eebd1ad68725b8f6f2e07a7b435041 +trivial 2a9b29b289833e42e13fdfb7e082499c1464f25c +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 18e9533ac877f3828e080ffc799ab2b67ee8500b +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 762d4d1a174c2b2f1181ef284769e4cba7d2b11c +init 38b082236e77d403fed23ac2d30d570598744ec3 +akpm-current 8fc02284173a359b2969a463fc6e95096e512cc1 +akpm 74c51179bf583a6d6108638f7fb87fbf85cfebfb diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..ae25a251df86 --- /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#fixes +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 +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.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 +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/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 +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-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 +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 +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +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..1545916a38d7 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10433 @@ +$ date -R +Tue, 08 Sep 2020 08:43:39 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 97% (5445/5570)
Updating files: 98% (5459/5570)
Updating files: 99% (5515/5570)
Updating files: 100% (5570/5570)
Updating files: 100% (5570/5570), done. +HEAD is now at fc3abb53250a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid +Merging origin/master (f4d51dffc6c0 Linux 5.9-rc4) +$ git merge origin/master +Updating fc3abb53250a..f4d51dffc6c0 +Fast-forward + .clang-format | 12 ++ + Documentation/admin-guide/pm/intel_pstate.rst | 4 +- + Documentation/devicetree/bindings/net/dsa/dsa.txt | 2 +- + Documentation/filesystems/affs.rst | 16 +- + Documentation/kbuild/llvm.rst | 26 +-- + Documentation/kbuild/makefiles.rst | 18 +- + Documentation/networking/dsa/configuration.rst | 2 +- + Documentation/sound/cards/audigy-mixer.rst | 2 +- + Documentation/sound/cards/sb-live-mixer.rst | 2 +- + Documentation/sound/designs/timestamping.rst | 2 +- + MAINTAINERS | 51 +++-- + Makefile | 2 +- + arch/arc/boot/dts/hsdk.dts | 6 +- + arch/arc/include/asm/pgalloc.h | 4 +- + arch/arc/kernel/perf_event.c | 14 +- + arch/arc/kernel/troubleshoot.c | 77 +++---- + arch/arc/mm/init.c | 27 ++- + arch/arc/plat-eznps/include/plat/ctop.h | 1 - + arch/arm64/kernel/module-plts.c | 3 +- + arch/arm64/kernel/setup.c | 1 - + arch/ia64/kernel/ia64_ksyms.c | 2 +- + arch/microblaze/mm/init.c | 3 + + .../asm/mach-loongson64/cpu-feature-overrides.h | 2 - + arch/mips/include/asm/mach-loongson64/irq.h | 2 - + arch/mips/include/asm/mach-loongson64/mmzone.h | 1 - + arch/mips/kernel/perf_event_mipsxx.c | 4 +- + arch/mips/kernel/smp-bmips.c | 2 + + arch/mips/kernel/traps.c | 12 ++ + arch/mips/mm/c-r4k.c | 4 + + arch/mips/oprofile/op_model_mipsxx.c | 4 +- + arch/mips/sni/a20r.c | 4 +- + arch/s390/Kconfig | 2 +- + arch/s390/configs/debug_defconfig | 4 + + arch/s390/configs/defconfig | 3 + + arch/s390/configs/zfcpdump_defconfig | 1 + + arch/x86/entry/common.c | 29 ++- + arch/x86/include/asm/entry-common.h | 12 +- + arch/x86/include/asm/ptrace.h | 2 +- + arch/x86/kernel/traps.c | 65 +++--- + arch/x86/lib/Makefile | 2 +- + arch/x86/mm/fault.c | 78 +++++++ + arch/x86/mm/numa_emulation.c | 2 +- + block/blk-core.c | 1 + + block/blk-iocost.c | 5 +- + block/blk-stat.c | 17 +- + block/partitions/core.c | 37 ++-- + drivers/ata/ahci.c | 3 +- + drivers/ata/libata-core.c | 5 +- + drivers/ata/libata-scsi.c | 8 +- + drivers/atm/firestream.c | 1 + + drivers/auxdisplay/arm-charlcd.c | 2 +- + drivers/cpufreq/intel_pstate.c | 236 +++++++++++++-------- + drivers/dax/device.c | 2 +- + drivers/dma/acpi-dma.c | 4 +- + drivers/dma/at_hdmac.c | 11 +- + drivers/dma/dma-jz4780.c | 38 ++-- + drivers/dma/dw-edma/dw-edma-core.c | 11 +- + drivers/dma/idxd/device.c | 26 +++ + drivers/dma/idxd/irq.c | 12 -- + drivers/dma/of-dma.c | 8 +- + drivers/dma/pl330.c | 2 +- + drivers/dma/ti/k3-udma.c | 10 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 10 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 14 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 10 +- + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 14 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 + + drivers/gpu/drm/i915/display/intel_combo_phy.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 32 ++- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 8 - + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 6 + + drivers/gpu/drm/nouveau/include/nvif/push507c.h | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 9 +- + drivers/iommu/amd/Kconfig | 2 +- + drivers/iommu/amd/init.c | 21 +- + drivers/iommu/amd/iommu.c | 26 ++- + drivers/iommu/amd/iommu_v2.c | 7 + + drivers/iommu/intel/iommu.c | 114 +++++----- + drivers/iommu/intel/irq_remapping.c | 10 +- + drivers/media/i2c/Kconfig | 4 +- + drivers/media/platform/ti-vpe/cal.h | 2 +- + drivers/media/rc/gpio-ir-tx.c | 16 +- + drivers/media/rc/mceusb.c | 2 +- + drivers/media/rc/rc-main.c | 44 ++-- + drivers/media/test-drivers/vicodec/vicodec-core.c | 1 + + drivers/media/v4l2-core/v4l2-ioctl.c | 50 +++-- + drivers/net/dsa/mt7530.c | 7 +- + drivers/net/dsa/ocelot/felix.c | 1 + + drivers/net/dsa/sja1105/sja1105_main.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 13 ++ + drivers/net/ethernet/arc/emac_mdio.c | 1 + + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 90 +++++--- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 16 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 17 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 8 +- + drivers/net/ethernet/cortina/gemini.c | 34 +-- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 9 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 6 +- + drivers/net/ethernet/ibm/ibmvnic.c | 15 +- + drivers/net/ethernet/mellanox/mlx4/mr.c | 2 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 + + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 13 +- + drivers/net/ethernet/renesas/ravb_main.c | 110 +++++----- + drivers/net/ethernet/sfc/ef100_rx.c | 8 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 + + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/cpsw_new.c | 29 ++- + drivers/net/gtp.c | 1 + + drivers/net/phy/dp83867.c | 4 +- + drivers/net/phy/dp83869.c | 12 +- + drivers/net/usb/Kconfig | 1 + + drivers/net/usb/asix_common.c | 2 +- + drivers/net/usb/dm9601.c | 4 + + drivers/net/wan/hdlc.c | 2 +- + drivers/net/wan/hdlc_cisco.c | 1 + + drivers/net/wan/lapbether.c | 3 + + drivers/nfc/st95hf/core.c | 2 +- + drivers/nvme/host/core.c | 56 ++++- + drivers/nvme/host/fabrics.c | 1 - + drivers/nvme/host/nvme.h | 2 +- + drivers/nvme/host/pci.c | 4 +- + drivers/nvme/host/rdma.c | 68 ++++-- + drivers/nvme/host/tcp.c | 80 +++++-- + drivers/nvme/target/fc.c | 4 +- + drivers/nvme/target/tcp.c | 10 +- + drivers/opp/core.c | 22 +- + drivers/opp/opp.h | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 7 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 4 +- + drivers/thermal/thermal_core.c | 5 +- + .../thermal/ti-soc-thermal/omap4-thermal-data.c | 23 +- + drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h | 10 +- + drivers/vhost/vhost.c | 2 +- + drivers/xen/Kconfig | 10 + + drivers/xen/Makefile | 1 + + drivers/xen/balloon.c | 4 +- + drivers/xen/grant-table.c | 4 +- + drivers/xen/privcmd.c | 4 +- + drivers/xen/unpopulated-alloc.c | 183 ++++++++++++++++ + drivers/xen/xenbus/xenbus_client.c | 6 +- + drivers/xen/xlate_mmu.c | 4 +- + fs/affs/amigaffs.c | 27 +++ + fs/affs/file.c | 26 ++- + fs/afs/fs_probe.c | 4 +- + fs/afs/internal.h | 14 +- + fs/afs/proc.c | 5 + + fs/afs/vl_list.c | 1 + + fs/afs/vl_probe.c | 82 ++++--- + fs/afs/vl_rotate.c | 7 +- + fs/ext2/file.c | 6 +- + fs/io_uring.c | 68 +++++- + fs/xfs/libxfs/xfs_bmap.c | 2 +- + fs/xfs/xfs_file.c | 12 +- + include/drm/drm_hdcp.h | 3 + + include/linux/bvec.h | 9 +- + include/linux/compiler_attributes.h | 8 +- + include/linux/compiler_types.h | 4 +- + include/linux/entry-common.h | 51 ++++- + include/linux/ksm.h | 7 - + include/linux/libata.h | 1 + + include/linux/log2.h | 2 +- + include/linux/memremap.h | 9 +- + include/linux/netfilter/nf_conntrack_sctp.h | 2 + + include/linux/netfilter/nfnetlink.h | 3 +- + include/linux/skbuff.h | 13 +- + include/linux/vm_event_item.h | 1 + + include/net/af_rxrpc.h | 2 +- + include/net/ndisc.h | 2 +- + include/net/netfilter/nf_tables.h | 2 + + include/soc/nps/common.h | 6 + + include/trace/events/rxrpc.h | 27 ++- + include/uapi/linux/in.h | 2 +- + include/uapi/linux/netfilter/nf_tables.h | 2 +- + include/xen/balloon.h | 4 + + include/xen/xen.h | 9 + + init/initramfs.c | 2 +- + ipc/ipc_sysctl.c | 2 +- + kernel/bpf/syscall.c | 2 +- + kernel/entry/common.c | 35 ++- + kernel/fork.c | 2 +- + kernel/gcov/Kconfig | 1 + + kernel/sysctl.c | 3 +- + mm/gup.c | 42 +--- + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 49 +++-- + mm/khugepaged.c | 2 +- + mm/ksm.c | 25 --- + mm/madvise.c | 2 +- + mm/memcontrol.c | 6 + + mm/memory.c | 97 ++++----- + mm/memremap.c | 2 +- + mm/migrate.c | 29 ++- + mm/rmap.c | 9 +- + mm/slub.c | 12 +- + mm/vmscan.c | 8 + + mm/vmstat.c | 1 + + net/batman-adv/bat_v_ogm.c | 11 +- + net/batman-adv/bridge_loop_avoidance.c | 5 +- + net/batman-adv/gateway_client.c | 6 +- + net/caif/cfrfml.c | 4 +- + net/core/dev.c | 3 +- + net/core/netpoll.c | 2 +- + net/core/pktgen.c | 2 +- + net/core/skbuff.c | 2 + + net/core/sock.c | 2 +- + net/ipv4/fib_trie.c | 3 +- + net/ipv4/netfilter/nf_nat_pptp.c | 2 +- + net/ipv4/raw.c | 2 +- + net/ipv6/sysctl_net_ipv6.c | 3 +- + net/l3mdev/l3mdev.c | 2 +- + net/mac80211/airtime.c | 202 +++++++++++++----- + net/mac80211/sta_info.h | 5 +- + net/mac80211/status.c | 43 ++-- + net/mptcp/protocol.c | 3 +- + net/netfilter/nf_conntrack_pptp.c | 2 +- + net/netfilter/nf_conntrack_proto_sctp.c | 39 +++- + net/netfilter/nf_conntrack_proto_tcp.c | 2 +- + net/netfilter/nf_conntrack_proto_udp.c | 26 +-- + net/netfilter/nf_tables_api.c | 64 +++--- + net/netfilter/nfnetlink.c | 11 +- + net/netfilter/nfnetlink_log.c | 3 +- + net/netfilter/nfnetlink_queue.c | 2 +- + net/netfilter/nft_flow_offload.c | 2 +- + net/netfilter/nft_payload.c | 4 +- + net/netfilter/nft_set_rbtree.c | 57 ++++- + net/netfilter/xt_recent.c | 2 +- + net/netlabel/netlabel_domainhash.c | 59 +++--- + net/netlink/af_netlink.c | 2 +- + net/packet/af_packet.c | 7 +- + net/rxrpc/ar-internal.h | 13 +- + net/rxrpc/call_object.c | 1 + + net/rxrpc/input.c | 123 ++++++----- + net/rxrpc/output.c | 82 +++++-- + net/rxrpc/peer_object.c | 16 +- + net/rxrpc/rtt.c | 3 +- + net/rxrpc/rxkad.c | 3 +- + net/sched/sch_red.c | 20 +- + net/sched/sch_taprio.c | 30 ++- + net/sctp/socket.c | 16 +- + net/smc/smc_close.c | 15 +- + net/smc/smc_core.c | 3 + + net/smc/smc_llc.c | 15 +- + net/socket.c | 4 +- + net/tipc/crypto.c | 12 +- + net/tipc/socket.c | 9 +- + net/wireless/chan.c | 15 +- + net/wireless/nl80211.c | 2 +- + net/wireless/reg.c | 3 + + net/wireless/util.c | 8 +- + scripts/checkpatch.pl | 4 +- + scripts/kconfig/nconf.c | 1 - + scripts/kconfig/streamline_config.pl | 5 +- + sound/core/oss/mulaw.c | 4 +- + sound/core/timer.c | 7 +- + sound/firewire/amdtp-stream.c | 8 +- + sound/firewire/digi00x/digi00x.c | 5 + + sound/firewire/tascam/tascam.c | 33 ++- + sound/hda/hdac_device.c | 2 + + sound/hda/intel-dsp-config.c | 10 +- + sound/pci/asihpi/asihpi.c | 9 +- + sound/pci/ca0106/ca0106_main.c | 3 +- + sound/pci/hda/hda_intel.c | 7 +- + sound/pci/hda/hda_tegra.c | 7 + + sound/pci/hda/patch_hdmi.c | 7 + + sound/pci/hda/patch_realtek.c | 46 +++- + sound/pci/riptide/riptide.c | 6 +- + sound/pci/rme9652/hdsp.c | 6 +- + sound/pci/rme9652/hdspm.c | 7 +- + sound/soc/fsl/fsl_esai.c | 7 +- + sound/soc/sh/siu_pcm.c | 10 +- + sound/soc/txx9/txx9aclc.c | 7 +- + sound/usb/midi.c | 7 +- + sound/usb/misc/ua101.c | 7 +- + sound/usb/pcm.c | 2 + + sound/usb/quirks-table.h | 78 ++++++- + sound/usb/quirks.c | 11 + + sound/usb/usbaudio.h | 1 + + sound/x86/Kconfig | 2 +- + tools/lib/traceevent/event-parse.c | 2 +- + tools/perf/Documentation/perf-record.txt | 4 + + tools/perf/Documentation/perf-stat.txt | 7 + + tools/perf/bench/synthesize.c | 4 +- + tools/perf/builtin-stat.c | 8 +- + tools/perf/pmu-events/jevents.c | 2 +- + tools/perf/util/machine.c | 6 - + tools/perf/util/map.c | 16 ++ + tools/perf/util/map.h | 9 +- + tools/perf/util/parse-events.y | 8 +- + tools/perf/util/stat.h | 1 + + tools/testing/selftests/bpf/test_maps.c | 2 + + tools/testing/selftests/bpf/test_progs.c | 4 +- + tools/testing/selftests/netfilter/nft_flowtable.sh | 67 +++--- + tools/testing/selftests/x86/test_vsyscall.c | 22 +- + 299 files changed, 3020 insertions(+), 1505 deletions(-) + create mode 100644 drivers/xen/unpopulated-alloc.c +Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (f4d51dffc6c0 Linux 5.9-rc4) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (26907eb605fb ARC: [plat-hsdk]: Switch ethernet phy-mode to rgmii-id) +$ 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 (e0328feda79d arm64/module: set trampoline section flags regardless of CONFIG_DYNAMIC_FTRACE) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (9c8b0a9c37b7 Merge tag 'imx-fixes-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx6q-logicpd.dts | 2 +- + arch/arm/boot/dts/imx6q-prtwd2.dts | 2 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 2 -- + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +- + arch/arm/boot/dts/imx7ulp.dtsi | 8 ++++---- + arch/arm/boot/dts/ls1021a.dtsi | 2 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +- + arch/arm/boot/dts/vfxxx.dtsi | 2 +- + arch/arm/configs/integrator_defconfig | 16 ++++++++-------- + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 12 +++++++++++- + arch/arm64/configs/defconfig | 12 ++++++++++++ + 12 files changed, 42 insertions(+), 21 deletions(-) +Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2) +$ git merge uniphier-fixes/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (7ff3a2a626f7 memory: jz4780_nemc: Fix an error pointer vs NULL check in probe()) +$ git merge drivers-memory-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/memory/jz4780-nemc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging m68k-current/for-linus (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (4c62285439f8 Revert "powerpc/build: vdso linker warning for orphan sections") +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + .../features/debug/debug-vm-pgtable/arch-support.txt | 2 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/book3s/64/mmu.h | 10 +++++----- + arch/powerpc/kernel/vdso32/Makefile | 2 +- + arch/powerpc/kernel/vdso32/vdso32.lds.S | 1 - + arch/powerpc/kernel/vdso64/Makefile | 2 +- + arch/powerpc/kernel/vdso64/vdso64.lds.S | 3 +-- + arch/powerpc/mm/book3s64/radix_pgtable.c | 15 --------------- + arch/powerpc/mm/init_64.c | 11 +++++++++-- + tools/testing/selftests/powerpc/mm/prot_sao.c | 9 +++++++-- + 10 files changed, 25 insertions(+), 31 deletions(-) +Merging s390-fixes/fixes (5c60ed283e1d s390: update defconfigs) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/Kconfig +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/pci.c | 3 +-- + arch/sparc/kernel/viohs.c | 6 ++---- + arch/sparc/lib/memset.S | 1 + + arch/sparc/mm/srmmu.c | 18 +++++++++--------- + 8 files changed, 20 insertions(+), 18 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 (e1f469cd5866 Revert "netns: don't disable BHs when locking "nsid_lock"") +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/atm/eni.c | 2 +- + drivers/net/dsa/rtl8366.c | 20 +++++++---- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 +++---- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 +++ + drivers/net/ethernet/cadence/macb_main.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 9 +++-- + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 20 ++++++++--- + drivers/net/ethernet/ibm/ibmvnic.c | 6 ++-- + drivers/net/wan/hdlc_fr.c | 3 +- + include/linux/netdevice.h | 2 ++ + net/core/net_namespace.c | 22 ++++++------ + net/sched/act_ife.c | 44 +++++++++++++++++------ + 12 files changed, 100 insertions(+), 48 deletions(-) +Merging bpf/master (e6135df45e21 Merge branch 'hashmap_iter_bucket_lock_fix') +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/hashtab.c | 15 ++++----------- + tools/bpf/Makefile | 4 ++-- + tools/bpf/resolve_btfids/Makefile | 1 + + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/libbpf.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_iter_bpf_hash_map.c | 15 +++++++++++++++ + 6 files changed, 24 insertions(+), 15 deletions(-) +Merging ipsec/master (45a36a18d019 xfrmi: drop ignore_df check before updating pmtu) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/ip_vti.c | 2 ++ + net/xfrm/espintcp.c | 6 +++++- + net/xfrm/xfrm_interface.c | 2 +- + 3 files changed, 8 insertions(+), 2 deletions(-) +Merging netfilter/master (6b6382a857d8 cxgb4: fix thermal zone device registration) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (1264c1e0cfe5 Revert "wlcore: Adding suppoprt for IGTK key in wlcore driver") +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 12 +++++++++--- + drivers/net/wireless/marvell/mwifiex/fw.h | 2 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 4 ++-- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 3 ++- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 8 ++++++-- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- + drivers/net/wireless/ti/wlcore/cmd.h | 1 - + drivers/net/wireless/ti/wlcore/main.c | 4 ---- + 8 files changed, 21 insertions(+), 15 deletions(-) +Merging mac80211/master (c8146fe292a7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (28b0865714b3 RDMA/core: Fix reported speed and width) +$ git merge rdma-fixes/for-rc +Auto-merging drivers/infiniband/sw/rxe/rxe_verbs.c +Auto-merging drivers/infiniband/hw/bnxt_re/qplib_fp.c +Auto-merging drivers/infiniband/hw/bnxt_re/ib_verbs.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cq.c | 4 +-- + drivers/infiniband/core/verbs.c | 2 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 43 +++++++++++++++++++--------- + drivers/infiniband/hw/bnxt_re/main.c | 3 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 26 ++++++++++------- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 10 ++++--- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 5 ++++ + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 1 + + drivers/infiniband/hw/mlx4/main.c | 3 +- + drivers/infiniband/sw/rxe/rxe.c | 4 +++ + drivers/infiniband/sw/rxe/rxe.h | 2 ++ + drivers/infiniband/sw/rxe/rxe_mr.c | 1 + + drivers/infiniband/sw/rxe/rxe_sysfs.c | 5 ++++ + drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 8 +++--- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 1 + + 17 files changed, 82 insertions(+), 40 deletions(-) +Merging sound-current/for-linus (c3cdf189276c ALSA: hda: fixup headset for ASUS GX502 laptop) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 65 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 65 insertions(+) +Merging sound-asoc-fixes/for-linus (e81118864f25 Merge remote-tracking branch 'asoc/for-5.9' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc.h | 4 + + sound/soc/codecs/max98373-sdw.c | 4 +- + sound/soc/codecs/pcm3168a.c | 7 + + sound/soc/codecs/rt1308-sdw.c | 4 +- + sound/soc/codecs/rt700-sdw.c | 4 +- + sound/soc/codecs/rt711-sdw.c | 4 +- + sound/soc/codecs/rt715-sdw.c | 4 +- + sound/soc/codecs/tlv320adcx140.c | 4 +- + sound/soc/codecs/wm8994.c | 10 ++ + sound/soc/codecs/wm_hubs.c | 3 + + sound/soc/codecs/wm_hubs.h | 1 + + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 11 ++ + sound/soc/intel/boards/bytcr_rt5640.c | 10 ++ + sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 +- + sound/soc/intel/boards/sof_maxim_common.c | 7 +- + sound/soc/intel/haswell/sst-haswell-dsp.c | 185 ++++++++++++--------------- + sound/soc/meson/axg-toddr.c | 24 +++- + sound/soc/qcom/apq8016_sbc.c | 1 + + sound/soc/qcom/apq8096.c | 1 + + sound/soc/qcom/common.c | 6 +- + sound/soc/qcom/sdm845.c | 1 + + sound/soc/qcom/storm.c | 1 + + sound/soc/soc-core.c | 13 ++ + sound/soc/soc-dai.c | 4 +- + sound/soc/soc-pcm.c | 2 +- + sound/soc/ti/ams-delta.c | 4 +- + 26 files changed, 194 insertions(+), 127 deletions(-) +Merging regmap-fixes/for-linus (f75aef392f86 Linux 5.9-rc3) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (b40d843b2186 Merge remote-tracking branch 'regulator/for-5.9' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 179 ++++++++++++++++++---------------- + drivers/regulator/cros-ec-regulator.c | 3 + + drivers/regulator/fixed.c | 2 +- + drivers/regulator/pwm-regulator.c | 2 +- + 4 files changed, 101 insertions(+), 85 deletions(-) +Merging spi-fixes/for-linus (0b49be756fa8 Merge remote-tracking branch 'spi/for-5.9' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++++++++ + drivers/spi/spi-cadence-quadspi.c | 9 +++++++++ + drivers/spi/spi-loopback-test.c | 2 +- + drivers/spi/spi-stm32.c | 6 +++++- + 4 files changed, 23 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (7c2308f79fc8 PCI/P2PDMA: Fix build without DMA ops) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (1c3047482668 PM: <linux/device.h>: fix @em_pd kernel-doc warning) +$ git merge driver-core.current/driver-core-linus +Auto-merging drivers/base/core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/base/core.c | 8 ++------ + drivers/base/firmware_loader/firmware.h | 2 ++ + drivers/base/firmware_loader/main.c | 17 +++++++++++------ + fs/debugfs/file.c | 4 ++-- + include/linux/device.h | 1 + + lib/kobject.c | 9 +++++---- + 7 files changed, 24 insertions(+), 18 deletions(-) +Merging tty.current/tty-linus (f75aef392f86 Linux 5.9-rc3) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (7c6bbdf086ac usb: typec: intel_pmc_mux: Do not configure SBU and HSL Orientation in Alternate modes) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/thunderbolt/switch.c | 1 + + drivers/thunderbolt/tb.h | 2 +- + drivers/thunderbolt/tunnel.c | 12 ++++- + drivers/usb/core/message.c | 91 ++++++++++++++++------------------- + drivers/usb/core/sysfs.c | 5 ++ + drivers/usb/dwc3/dwc3-meson-g12a.c | 15 +++--- + drivers/usb/typec/mux/intel_pmc_mux.c | 14 +----- + drivers/usb/typec/ucsi/ucsi_acpi.c | 4 ++ + 8 files changed, 71 insertions(+), 73 deletions(-) +Merging usb-gadget-fixes/fixes (bc9a2e226ea9 usb: dwc3: gadget: Handle ZLP for sg requests) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (2bb70f0a4b23 USB: serial: option: support dynamic Quectel USB compositions) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 1 + + drivers/usb/serial/option.c | 22 ++++++++++++++-------- + 3 files changed, 16 insertions(+), 8 deletions(-) +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 +Auto-merging drivers/usb/chipidea/core.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (ad7a7acaedcf phy: omap-usb2-phy: disable PHY charger detect) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 5 ++- + drivers/phy/qualcomm/phy-qcom-qmp.c | 16 +++++----- + drivers/phy/qualcomm/phy-qcom-qmp.h | 2 ++ + drivers/phy/ti/phy-omap-usb2.c | 47 ++++++++++++++++++++++++----- + 4 files changed, 53 insertions(+), 17 deletions(-) +Merging staging.current/staging-linus (a139ffa40f0c iio: adc: mcp3422: fix locking on error path) +$ git merge staging.current/staging-linus +Auto-merging drivers/iio/accel/mma8452.c +Merge made by the 'recursive' strategy. + drivers/counter/microchip-tcb-capture.c | 4 +-- + drivers/iio/accel/bmc150-accel-core.c | 15 ++++++++--- + drivers/iio/accel/kxsd9.c | 16 ++++++++---- + drivers/iio/accel/mma7455_core.c | 16 +++++++++--- + drivers/iio/accel/mma8452.c | 11 +++++--- + drivers/iio/adc/Kconfig | 2 ++ + drivers/iio/adc/ina2xx-adc.c | 11 +++++--- + drivers/iio/adc/max1118.c | 10 +++++--- + drivers/iio/adc/mcp3422.c | 16 +++++++----- + drivers/iio/adc/meson_saradc.c | 2 +- + drivers/iio/adc/ti-adc081c.c | 11 +++++--- + drivers/iio/adc/ti-adc084s021.c | 10 +++++--- + drivers/iio/adc/ti-ads1015.c | 10 ++++++++ + drivers/iio/chemical/ccs811.c | 13 +++++++--- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 5 +++- + drivers/iio/light/ltr501.c | 15 ++++++----- + drivers/iio/light/max44000.c | 12 ++++++--- + drivers/iio/magnetometer/ak8975.c | 16 ++++++++---- + drivers/iio/proximity/mb1232.c | 17 +++++++------ + drivers/staging/greybus/audio_helper.c | 3 +-- + drivers/staging/greybus/audio_topology.c | 29 +++++++++++----------- + drivers/staging/wlan-ng/hfa384x_usb.c | 5 ---- + drivers/staging/wlan-ng/prism2usb.c | 19 +++++--------- + 23 files changed, 169 insertions(+), 99 deletions(-) +Merging char-misc.current/char-misc-linus (bd018a6a75ce video: fbdev: fix OOB read in vga_8planes_imageblit()) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/interconnect/core.c | 10 +++- + drivers/interconnect/qcom/bcm-voter.c | 27 ++++++--- + drivers/misc/habanalabs/common/debugfs.c | 2 +- + .../misc/habanalabs/include/gaudi/gaudi_masks.h | 32 +++++------ + drivers/soundwire/bus.c | 2 +- + drivers/soundwire/stream.c | 8 ++- + drivers/video/fbdev/vga16fb.c | 2 +- + include/linux/dynamic_debug.h | 20 +++++-- + lib/dynamic_debug.c | 67 ++++++++++++++-------- + 9 files changed, 110 insertions(+), 60 deletions(-) +Merging soundwire-fixes/fixes (3fbbf2148a40 soundwire: fix double free of dangling pointer) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (813050e0a9b8 thunderbolt: Use maximum USB3 link rate when reclaiming if link is not up) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (9e8238020c5b Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (1b0df11fde0f padata: fix possible padata_works_lock deadlock) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + kernel/padata.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) +$ git merge ide/master +Auto-merging drivers/ide/sis5513.c +Auto-merging drivers/ide/ide-acpi.c +Auto-merging drivers/ide/hpt366.c +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 2 +- + drivers/ide/aec62xx.c | 3 +-- + drivers/ide/alim15x3.c | 3 +-- + drivers/ide/amd74xx.c | 3 +-- + drivers/ide/atiixp.c | 3 +-- + drivers/ide/cmd64x.c | 3 +-- + drivers/ide/cs5520.c | 3 +-- + drivers/ide/cs5530.c | 3 +-- + drivers/ide/cs5535.c | 3 +-- + drivers/ide/cs5536.c | 3 +-- + drivers/ide/cy82c693.c | 3 +-- + drivers/ide/delkin_cb.c | 32 ++++++-------------------------- + drivers/ide/hpt366.c | 5 ++--- + drivers/ide/ide-acpi.c | 5 +---- + drivers/ide/ide-pci-generic.c | 3 +-- + drivers/ide/it8172.c | 3 +-- + drivers/ide/it8213.c | 3 +-- + drivers/ide/it821x.c | 3 +-- + drivers/ide/jmicron.c | 3 +-- + drivers/ide/ns87415.c | 3 +-- + drivers/ide/opti621.c | 3 +-- + drivers/ide/pdc202xx_new.c | 3 +-- + drivers/ide/pdc202xx_old.c | 3 +-- + drivers/ide/piix.c | 3 +-- + drivers/ide/sc1200.c | 43 ++++++++++++++----------------------------- + drivers/ide/serverworks.c | 3 +-- + drivers/ide/setup-pci.c | 29 ++++++----------------------- + drivers/ide/siimage.c | 3 +-- + drivers/ide/sis5513.c | 3 +-- + drivers/ide/sl82c105.c | 3 +-- + drivers/ide/slc90e66.c | 3 +-- + drivers/ide/triflex.c | 24 ++++++++---------------- + drivers/ide/via82cxxx.c | 3 +-- + include/linux/ide.h | 8 +------- + 34 files changed, 65 insertions(+), 161 deletions(-) +Merging vfio-fixes/for-linus (aae7a75a821a vfio/type1: Add proper error unwind for vfio_iommu_replay()) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (5c1e4f7e9e49 selftests/timers: Turn off timeout setting) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/timers/Makefile | 1 + + tools/testing/selftests/timers/settings | 1 + + 2 files changed, 2 insertions(+) + create mode 100644 tools/testing/selftests/timers/settings +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 (f4d51dffc6c0 Linux 5.9-rc4) +$ 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 +Already up to date. +Merging mfd-fixes/for-mfd-fixes (22380b65dc70 mfd: mfd-core: Ensure disabled devices are ignored without error) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (ddecfc76979d media: mceusb: Avoid GFP_ATOMIC where it is not needed) +$ 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 (baf5cb30fbd1 MIPS: SNI: Fix SCSI interrupt) +$ 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 (6542e2b613c2 ARM: dts: omap5: Fix DSI base address and clocks) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi | 29 ++++++------------------ + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 ++ + arch/arm/boot/dts/omap5.dtsi | 20 ++++++++-------- + arch/arm/mach-omap2/omap-iommu.c | 2 +- + 4 files changed, 21 insertions(+), 32 deletions(-) +Merging kvm-fixes/master (b5331379bc62 KVM: arm64: Only reschedule if MMU_NOTIFIER_RANGE_BLOCKABLE is not set) +$ 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 (d50e0d750004 hwmon: (sparx5) Fix initial reading of temperature) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/sparx5-temp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (6180bb446ab6 dax: fix detection of dax support for non-persistent memory block devices) +$ git merge nvdimm-fixes/libnvdimm-fixes +Merge made by the 'recursive' strategy. + drivers/dax/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging btrfs-fixes/next-fixes (667cc3d206b5 Merge branch 'misc-5.9' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/disk-io.c | 2 ++ + fs/btrfs/extent-tree.c | 19 +++++++++---------- + fs/btrfs/print-tree.c | 12 +++++++----- + fs/btrfs/transaction.c | 1 + + fs/btrfs/volumes.c | 10 ++++++++++ + 5 files changed, 29 insertions(+), 15 deletions(-) +Merging vfs-fixes/fixes (9d682ea6bcc7 vboxsf: Fix the check for the old binary mount-arguments struct) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/vboxsf/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (5cd841d2676a dt-bindings: vendor-prefixes: Remove trailing whitespace) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (9a382f2fd2a1 scsi: mpt3sas: Don't call disable_irq from IRQ poll handler) +$ git merge scsi-fixes/fixes +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/libsas/sas_ata.c +Merge made by the 'recursive' strategy. + drivers/scsi/libfc/fc_disc.c | 2 -- + drivers/scsi/libsas/sas_ata.c | 5 ++++- + drivers/scsi/lpfc/lpfc_els.c | 7 ++++++- + drivers/scsi/lpfc/lpfc_hw4.h | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 1 - + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/pm8001/pm8001_sas.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 6 +++--- + drivers/target/iscsi/iscsi_target.c | 17 +++++++++++++++-- + drivers/target/iscsi/iscsi_target_login.c | 6 +++--- + drivers/target/iscsi/iscsi_target_login.h | 3 +-- + drivers/target/iscsi/iscsi_target_nego.c | 3 +-- + 15 files changed, 39 insertions(+), 23 deletions(-) +Merging drm-fixes/drm-fixes (d37d56920004 Merge branch 'linux-5.9' of git://github.com/skeggsb/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 (f4d51dffc6c0 Linux 5.9-rc4) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (f0c393e2104e mmc: sdio: Use mmc_pre_req() / mmc_post_req()) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/core/sdio_ops.c | 39 ++++++++++-------- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/mmc_spi.c | 86 +++++++++++++++++++++++---------------- + drivers/mmc/host/sdhci-acpi.c | 31 ++++++++++---- + drivers/mmc/host/sdhci-msm.c | 18 +++++++- + drivers/mmc/host/sdhci-of-esdhc.c | 10 +++-- + 6 files changed, 123 insertions(+), 63 deletions(-) +Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-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 (b46b4a8a57c3 hv_utils: drain the timesync packets on onchannelcallback) +$ 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 (29d9f9dd4480 RISC-V: Take text_mutex in ftrace_init_nop()) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/include/asm/ftrace.h | 7 +++++++ + arch/riscv/kernel/ftrace.c | 19 +++++++++++++++++++ + arch/riscv/mm/fault.c | 20 +++++++++----------- + 3 files changed, 35 insertions(+), 11 deletions(-) +Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation) +$ git merge pidfd-fixes/fixes +Auto-merging net/core/net_namespace.c +Merge made by the 'recursive' strategy. + fs/mount.h | 3 +-- + fs/namespace.c | 4 ++-- + include/linux/cgroup.h | 5 ++--- + include/linux/ipc_namespace.h | 3 +-- + include/linux/ns_common.h | 3 +++ + include/linux/pid_namespace.h | 4 +--- + include/linux/time_namespace.h | 9 ++++----- + include/linux/user_namespace.h | 5 ++--- + include/linux/utsname.h | 9 ++++----- + include/net/net_namespace.h | 11 ++++------- + include/uapi/linux/ptrace.h | 3 ++- + init/version.c | 2 +- + ipc/msgutil.c | 2 +- + ipc/namespace.c | 4 ++-- + kernel/cgroup/cgroup.c | 2 +- + kernel/cgroup/namespace.c | 2 +- + kernel/pid.c | 2 +- + kernel/pid_namespace.c | 13 +++---------- + kernel/time/namespace.c | 9 +++------ + kernel/user.c | 2 +- + kernel/user_namespace.c | 4 ++-- + kernel/utsname.c | 7 ++----- + net/core/net-sysfs.c | 6 +++--- + net/core/net_namespace.c | 6 +++--- + net/ipv4/inet_timewait_sock.c | 4 ++-- + net/ipv4/tcp_metrics.c | 2 +- + 26 files changed, 53 insertions(+), 73 deletions(-) +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 (9123e3a74ec7 Linux 5.9-rc1) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (3488737093e7 pinctrl: cherryview: Preserve CHV_PADCTRL1_INVRXTX_TXDATA flag on GPIOs) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-cherryview.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) +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 (21a6d1780d5b kunit: tool: allow generating test results in JSON) +$ git merge kunit-fixes/kunit-fixes +Merge made by the 'recursive' strategy. + tools/testing/kunit/kunit.py | 48 ++++++++++++++++++-------- + tools/testing/kunit/kunit_json.py | 63 ++++++++++++++++++++++++++++++++++ + tools/testing/kunit/kunit_tool_test.py | 33 ++++++++++++++++++ + 3 files changed, 130 insertions(+), 14 deletions(-) + create mode 100644 tools/testing/kunit/kunit_json.py +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 memblock-fixes/fixes (5f7b81c18366 ia64: fix min_low_pfn/max_low_pfn build errors) +$ git merge memblock-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (fc7f148feb89 drm/virtio: drop virtio_gpu_output->enabled) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/dma-buf.rst | 2 +- + drivers/dma-buf/dma-buf.c | 6 +++--- + drivers/dma-buf/dma-fence-chain.c | 1 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 20 ++++++++++++-------- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +--- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 8 ++++++-- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 ++-- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 +- + drivers/gpu/drm/tve200/tve200_display.c | 22 +++++++++++++++++++++- + drivers/gpu/drm/virtio/virtgpu_display.c | 15 +++++++++++---- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 8 +++++++- + drivers/gpu/drm/virtio/virtgpu_plane.c | 6 ++++-- + 13 files changed, 71 insertions(+), 29 deletions(-) +Merging kspp-gustavo/for-next/kspp (cb0938372de0 Merge branch 'for-next/clang' into for-next/kspp) +$ git merge kspp-gustavo/for-next/kspp +Merge made by the 'recursive' strategy. + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 2 +- + drivers/target/target_core_user.c | 2 +- + fs/binfmt_elf.c | 2 +- + fs/hfs/btree.h | 2 +- + fs/hfsplus/hfsplus_fs.h | 2 +- + fs/isofs/rock.h | 8 ++++---- + fs/select.c | 4 ++-- + include/linux/dma/ti-cppi5.h | 4 ++-- + include/linux/fs.h | 2 +- + include/linux/jhash.h | 2 ++ + include/linux/mailbox/zynqmp-ipi-message.h | 2 +- + include/linux/platform_data/cros_ec_commands.h | 14 +++++++------- + include/linux/platform_data/cros_ec_proto.h | 2 +- + include/linux/signal.h | 2 ++ + kernel/params.c | 2 +- + kernel/tracepoint.c | 2 +- + net/bluetooth/msft.c | 3 ++- + security/integrity/ima/ima.h | 2 +- + 18 files changed, 32 insertions(+), 27 deletions(-) +Merging kbuild/for-next (8e2271d630d8 Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Removing scripts/gen_compile_commands.py +Auto-merging arch/powerpc/kernel/vdso64/Makefile +Auto-merging arch/powerpc/kernel/vdso32/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + Makefile | 57 +++- + arch/arm/Makefile | 4 - + .../module.lds => include/asm/module.lds.h} | 2 + + arch/arm64/Makefile | 4 - + .../module.lds => include/asm/module.lds.h} | 2 + + arch/arm64/kernel/vdso/Makefile | 2 +- + arch/arm64/kernel/vdso32/Makefile | 2 +- + arch/ia64/Makefile | 1 - + arch/ia64/{module.lds => include/asm/module.lds.h} | 0 + arch/m68k/Makefile | 1 - + .../module.lds => include/asm/module.lds.h} | 0 + arch/nds32/kernel/vdso/Makefile | 2 +- + arch/powerpc/Makefile | 1 - + .../module.lds => include/asm/module.lds.h} | 0 + arch/powerpc/kernel/vdso32/Makefile | 2 +- + arch/powerpc/kernel/vdso64/Makefile | 2 +- + arch/riscv/Makefile | 3 - + .../module.lds => include/asm/module.lds.h} | 3 +- + arch/s390/kernel/vdso64/Makefile | 2 +- + arch/um/include/asm/Kbuild | 1 + + include/asm-generic/Kbuild | 1 + + include/asm-generic/module.lds.h | 10 + + lib/Kconfig.debug | 10 +- + scripts/.gitignore | 1 + + scripts/Makefile | 2 + + scripts/Makefile.modfinal | 5 +- + scripts/clang-tools/gen_compile_commands.py | 236 +++++++++++++ + scripts/clang-tools/run-clang-tools.py | 74 +++++ + scripts/gen_compile_commands.py | 151 --------- + scripts/kconfig/Makefile | 16 +- + scripts/kconfig/qconf.cc | 368 ++++++++------------- + scripts/kconfig/qconf.h | 77 ++--- + scripts/{module-common.lds => module.lds.S} | 3 + + scripts/package/builddeb | 2 +- + 35 files changed, 576 insertions(+), 472 deletions(-) + rename arch/arm/{kernel/module.lds => include/asm/module.lds.h} (72%) + rename arch/arm64/{kernel/module.lds => include/asm/module.lds.h} (76%) + rename arch/ia64/{module.lds => include/asm/module.lds.h} (100%) + rename arch/m68k/{kernel/module.lds => include/asm/module.lds.h} (100%) + rename arch/powerpc/{kernel/module.lds => include/asm/module.lds.h} (100%) + rename arch/riscv/{kernel/module.lds => include/asm/module.lds.h} (84%) + create mode 100644 include/asm-generic/module.lds.h + create mode 100755 scripts/clang-tools/gen_compile_commands.py + create mode 100755 scripts/clang-tools/run-clang-tools.py + delete mode 100755 scripts/gen_compile_commands.py + rename scripts/{module-common.lds => module.lds.S} (93%) +Merging compiler-attributes/compiler-attributes (e5fc436f06ee sparse: use static inline for __chk_{user,io}_ptr()) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (135ba11a7a07 dma-mapping: set default segment_boundary_mask to ULONG_MAX) +$ git merge dma-mapping/for-next +Auto-merging mm/hugetlb.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 11 +++ + arch/alpha/kernel/pci_iommu.c | 7 +- + arch/arm64/mm/init.c | 2 + + arch/ia64/hp/common/sba_iommu.c | 3 +- + arch/powerpc/kernel/iommu.c | 11 +-- + arch/s390/pci/pci_dma.c | 6 +- + arch/sparc/kernel/iommu-common.c | 10 +-- + arch/sparc/kernel/iommu.c | 3 +- + arch/sparc/kernel/pci_sun4v.c | 3 +- + arch/x86/kernel/amd_gart_64.c | 3 +- + drivers/parisc/ccio-dma.c | 3 +- + drivers/parisc/sba_iommu.c | 3 +- + include/linux/cma.h | 2 + + include/linux/dma-contiguous.h | 6 ++ + include/linux/dma-mapping.h | 21 ++++- + kernel/dma/Kconfig | 11 +++ + kernel/dma/contiguous.c | 100 +++++++++++++++++++++--- + mm/Kconfig | 3 +- + mm/cma.h | 2 - + mm/hugetlb.c | 4 +- + 20 files changed, 160 insertions(+), 54 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (f75aef392f86 Linux 5.9-rc3) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (f75aef392f86 Linux 5.9-rc3) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (210ecbc29884 ARM: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 28 ++++++++++ + drivers/tee/optee/core.c | 7 +++ + drivers/tee/optee/optee_msg.h | 21 ++++++++ + drivers/tee/optee/optee_private.h | 1 + + drivers/tee/optee/optee_smc.h | 3 ++ + drivers/tee/optee/rpc.c | 95 ++++++++++++++++++++++++++++++++++ + drivers/tee/tee_core.c | 49 +++++++++++------- + drivers/tee/tee_shm.c | 32 +++++++----- + include/linux/tee_drv.h | 3 ++ + include/uapi/linux/tee.h | 13 +++++ + 10 files changed, 221 insertions(+), 31 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (c943b84fab78 Merge branch 'v5.10/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 88 -------------------- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 94 +++++++++++++++++++++- + 2 files changed, 92 insertions(+), 90 deletions(-) +Merging aspeed/for-next (393d812b5ec1 ARM: config: aspeed: Fix selection of media drivers) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 17 + + arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 47 ++- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 5 +- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts | 420 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 17 + + .../boot/dts/ast2500-facebook-netbmc-common.dtsi | 13 - + arch/arm/configs/aspeed_g4_defconfig | 3 +- + arch/arm/configs/aspeed_g5_defconfig | 3 +- + 9 files changed, 507 insertions(+), 19 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts +Merging at91/at91-next (b68f43873b72 Merge branch 'at91-soc' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/mach-at91/pm.c | 97 ++++++++++++++++++++++++++++++++++++----- + arch/arm/mach-at91/pm.h | 5 ++- + arch/arm/mach-at91/pm_suspend.S | 41 +++++++++++++++-- + 3 files changed, 126 insertions(+), 17 deletions(-) +Merging drivers-memory/for-next (dd85345abca6 memory: fsl-corenet-cf: Fix handling of platform_get_irq() error) +$ git merge drivers-memory/for-next +Auto-merging drivers/memory/omap-gpmc.c +Merge made by the 'recursive' strategy. + drivers/memory/Kconfig | 51 +++-- + drivers/memory/Makefile | 2 +- + drivers/memory/brcmstb_dpfe.c | 46 +++-- + drivers/memory/emif.c | 33 +--- + drivers/memory/fsl-corenet-cf.c | 6 +- + drivers/memory/omap-gpmc.c | 272 +++++++++++++++----------- + drivers/memory/renesas-rpc-if.c | 4 +- + drivers/memory/samsung/exynos5422-dmc.c | 108 ++++++---- + drivers/memory/tegra/tegra124.c | 1 - + drivers/memory/tegra/tegra186-emc.c | 10 +- + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 2 +- + drivers/memory/tegra/tegra210.c | 2 +- + 12 files changed, 305 insertions(+), 232 deletions(-) +Merging imx-mxs/for-next (dcb7078ce243 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm/mach-imx/mx31moboard-smartbot.c +Removing arch/arm/mach-imx/mx31moboard-marxbot.c +Removing arch/arm/mach-imx/mx31moboard-devboard.c +Removing arch/arm/mach-imx/mx31lilly-db.c +Removing arch/arm/mach-imx/mm-imx21.c +Removing arch/arm/mach-imx/mach-vpr200.c +Removing arch/arm/mach-imx/mach-qong.c +Removing arch/arm/mach-imx/mach-pcm043.c +Removing arch/arm/mach-imx/mach-pcm037_eet.c +Removing arch/arm/mach-imx/mach-pcm037.c +Removing arch/arm/mach-imx/mach-pca100.c +Removing arch/arm/mach-imx/mach-mx35_3ds.c +Removing arch/arm/mach-imx/mach-mx31moboard.c +Removing arch/arm/mach-imx/mach-mx31lite.c +Removing arch/arm/mach-imx/mach-mx31lilly.c +Removing arch/arm/mach-imx/mach-mx31_3ds.c +Removing arch/arm/mach-imx/mach-mx27ads.c +Removing arch/arm/mach-imx/mach-mx27_3ds.c +Removing arch/arm/mach-imx/mach-mx21ads.c +Removing arch/arm/mach-imx/mach-kzm_arm11_01.c +Removing arch/arm/mach-imx/mach-imx27_visstrim_m10.c +Removing arch/arm/mach-imx/mach-bug.c +Removing arch/arm/mach-imx/mach-armadillo5x0.c +Removing arch/arm/mach-imx/ehci.h +Removing arch/arm/mach-imx/ehci-imx35.c +Removing arch/arm/mach-imx/ehci-imx31.c +Removing arch/arm/mach-imx/ehci-imx27.c +Removing arch/arm/mach-imx/devices-imx21.h +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 27 + + .../devicetree/bindings/nvmem/vf610-ocotp.txt | 4 +- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/imx23-evk.dts | 2 +- + arch/arm/boot/dts/imx23.dtsi | 2 +- + arch/arm/boot/dts/imx25-pinfunc.h | 28 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 4 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 2 +- + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx28-apf28.dts | 2 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +- + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-m28.dtsi | 2 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/imx50-evk.dts | 2 +- + arch/arm/boot/dts/imx51-apf51dev.dts | 4 +- + arch/arm/boot/dts/imx53-m53menlo.dts | 2 +- + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 8 +- + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 3 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 4 +- + arch/arm/boot/dts/imx6dl-prtrvt.dts | 4 +- + arch/arm/boot/dts/imx6dl-prtvt7.dts | 2 +- + arch/arm/boot/dts/imx6dl-tqma6a.dtsi | 16 + + arch/arm/boot/dts/imx6dl-tqma6b.dtsi | 16 + + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 38 +- + arch/arm/boot/dts/imx6dl-yapp4-hydra.dts | 6 +- + arch/arm/boot/dts/imx6dl-yapp4-orion.dts | 54 + + arch/arm/boot/dts/imx6dl-yapp4-ursa.dts | 4 + + arch/arm/boot/dts/imx6dl.dtsi | 8 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 19 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 2 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dms-ba16.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 7 +- + arch/arm/boot/dts/imx6q-prti6q.dts | 6 +- + arch/arm/boot/dts/imx6q-tqma6a.dtsi | 16 + + arch/arm/boot/dts/imx6q-tqma6b.dtsi | 15 + + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 4 +- + arch/arm/boot/dts/imx6q.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-emcon.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-pico.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 202 ++++ + arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 28 + + arch/arm/boot/dts/imx6qdl-tqma6b.dtsi | 28 + + arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 5 +- + arch/arm/boot/dts/imx6qp-sabreauto.dts | 3 +- + arch/arm/boot/dts/imx6qp-tqma6b.dtsi | 16 + + arch/arm/boot/dts/imx6sl-evk.dts | 11 +- + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 588 +++++++++++ + arch/arm/boot/dts/imx6sl.dtsi | 2 + + arch/arm/boot/dts/imx6sll-evk.dts | 73 ++ + arch/arm/boot/dts/imx6sll.dtsi | 7 + + arch/arm/boot/dts/imx6sx-pinfunc.h | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 9 + + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 2 +- + .../boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx6ull.dtsi | 7 + + arch/arm/boot/dts/imx7-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 83 +- + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +- + arch/arm/boot/dts/imx7s.dtsi | 15 +- + arch/arm/boot/dts/vf610-zii-cfu1.dts | 3 +- + arch/arm/boot/dts/vf610-zii-spb4.dts | 2 - + arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 2 - + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 2 - + arch/arm/configs/imx_v4_v5_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 22 +- + arch/arm/configs/multi_v5_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm/mach-imx/Kconfig | 366 +------ + arch/arm/mach-imx/Makefile | 40 +- + arch/arm/mach-imx/devices-imx21.h | 56 - + arch/arm/mach-imx/ehci-imx27.c | 74 -- + arch/arm/mach-imx/ehci-imx31.c | 74 -- + arch/arm/mach-imx/ehci-imx35.c | 89 -- + arch/arm/mach-imx/ehci.h | 44 - + arch/arm/mach-imx/mach-armadillo5x0.c | 562 ---------- + arch/arm/mach-imx/mach-bug.c | 54 - + arch/arm/mach-imx/{imx27-dt.c => mach-imx27.c} | 0 + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 562 ---------- + arch/arm/mach-imx/{imx31-dt.c => mach-imx31.c} | 0 + arch/arm/mach-imx/{imx35-dt.c => mach-imx35.c} | 0 + arch/arm/mach-imx/mach-kzm_arm11_01.c | 291 ------ + arch/arm/mach-imx/mach-mx21ads.c | 338 ------ + arch/arm/mach-imx/mach-mx27_3ds.c | 470 --------- + arch/arm/mach-imx/mach-mx27ads.c | 407 ------- + arch/arm/mach-imx/mach-mx31_3ds.c | 615 ----------- + arch/arm/mach-imx/mach-mx31lilly.c | 312 ------ + arch/arm/mach-imx/mach-mx31lite.c | 290 ----- + arch/arm/mach-imx/mach-mx31moboard.c | 581 ---------- + arch/arm/mach-imx/mach-mx35_3ds.c | 516 --------- + arch/arm/mach-imx/mach-pca100.c | 426 -------- + arch/arm/mach-imx/mach-pcm037.c | 585 ----------- + arch/arm/mach-imx/mach-pcm037_eet.c | 166 --- + arch/arm/mach-imx/mach-pcm043.c | 412 -------- + arch/arm/mach-imx/mach-qong.c | 262 ----- + arch/arm/mach-imx/mach-vpr200.c | 306 ------ + arch/arm/mach-imx/mm-imx21.c | 84 -- + arch/arm/mach-imx/mx31lilly-db.c | 182 ---- + arch/arm/mach-imx/mx31moboard-devboard.c | 238 ----- + arch/arm/mach-imx/mx31moboard-marxbot.c | 270 ----- + arch/arm/mach-imx/mx31moboard-smartbot.c | 124 --- + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 110 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 157 ++- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 16 +- + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 36 +- + arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk.dts | 57 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 553 ++-------- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 474 +++++++++ + .../boot/dts/freescale/imx8mm-var-som-symphony.dts | 246 +++++ + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 557 ++++++++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 24 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 18 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 2 - + arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h | 360 ++----- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 8 +- + .../dts/freescale/imx8mq-hummingboard-pulse.dts | 8 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 46 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r2.dts | 29 + + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 27 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 1105 ++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts | 18 +- + arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 12 +- + arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 2 +- + .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 54 +- + arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi | 8 +- + arch/arm64/configs/defconfig | 6 +- + drivers/clk/clk-composite.c | 1 + + drivers/clk/imx/Kconfig | 94 +- + drivers/clk/imx/Makefile | 79 +- + drivers/clk/imx/clk-busy.c | 1 + + drivers/clk/imx/clk-composite-7ulp.c | 1 + + drivers/clk/imx/clk-composite-8m.c | 3 + + drivers/clk/imx/clk-cpu.c | 2 + + drivers/clk/imx/clk-fixup-mux.c | 1 + + drivers/clk/imx/clk-frac-pll.c | 2 + + drivers/clk/imx/clk-gate2.c | 2 + + drivers/clk/imx/clk-imx6q.c | 1 + + drivers/clk/imx/clk-imx6sl.c | 15 +- + drivers/clk/imx/clk-imx6sx.c | 1 + + drivers/clk/imx/clk-imx7d.c | 132 +-- + drivers/clk/imx/clk-imx8mm.c | 4 + + drivers/clk/imx/clk-imx8mn.c | 4 + + drivers/clk/imx/clk-imx8mp.c | 28 +- + drivers/clk/imx/clk-imx8mq.c | 4 + + drivers/clk/imx/clk-imx8qxp-lpcg.c | 4 + + drivers/clk/imx/clk-imx8qxp.c | 4 + + drivers/clk/imx/clk-lpcg-scu.c | 1 + + drivers/clk/imx/clk-pfd.c | 2 +- + drivers/clk/imx/clk-pfdv2.c | 2 +- + drivers/clk/imx/clk-pll14xx.c | 7 +- + drivers/clk/imx/clk-pllv1.c | 1 + + drivers/clk/imx/clk-pllv3.c | 5 +- + drivers/clk/imx/clk-pllv4.c | 1 + + drivers/clk/imx/clk-sscg-pll.c | 2 + + drivers/clk/imx/clk-vf610.c | 2 + + drivers/clk/imx/clk.c | 18 +- + drivers/clk/imx/clk.h | 7 + + drivers/soc/imx/gpcv2.c | 15 +- + include/dt-bindings/clock/imx8mp-clock.h | 2 +- + include/dt-bindings/clock/vf610-clock.h | 3 +- + 205 files changed, 4803 insertions(+), 9984 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-tqma6a.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-tqma6b.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-orion.dts + create mode 100644 arch/arm/boot/dts/imx6q-tqma6a.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-tqma6b.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-tqma6.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-tqma6a.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-tqma6b.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-tqma6b.dtsi + create mode 100644 arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts + delete mode 100644 arch/arm/mach-imx/devices-imx21.h + delete mode 100644 arch/arm/mach-imx/ehci-imx27.c + delete mode 100644 arch/arm/mach-imx/ehci-imx31.c + delete mode 100644 arch/arm/mach-imx/ehci-imx35.c + delete mode 100644 arch/arm/mach-imx/ehci.h + delete mode 100644 arch/arm/mach-imx/mach-armadillo5x0.c + delete mode 100644 arch/arm/mach-imx/mach-bug.c + rename arch/arm/mach-imx/{imx27-dt.c => mach-imx27.c} (100%) + delete mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c + rename arch/arm/mach-imx/{imx31-dt.c => mach-imx31.c} (100%) + rename arch/arm/mach-imx/{imx35-dt.c => mach-imx35.c} (100%) + delete mode 100644 arch/arm/mach-imx/mach-kzm_arm11_01.c + delete mode 100644 arch/arm/mach-imx/mach-mx21ads.c + delete mode 100644 arch/arm/mach-imx/mach-mx27_3ds.c + delete mode 100644 arch/arm/mach-imx/mach-mx27ads.c + delete mode 100644 arch/arm/mach-imx/mach-mx31_3ds.c + delete mode 100644 arch/arm/mach-imx/mach-mx31lilly.c + delete mode 100644 arch/arm/mach-imx/mach-mx31lite.c + delete mode 100644 arch/arm/mach-imx/mach-mx31moboard.c + delete mode 100644 arch/arm/mach-imx/mach-mx35_3ds.c + delete mode 100644 arch/arm/mach-imx/mach-pca100.c + delete mode 100644 arch/arm/mach-imx/mach-pcm037.c + delete mode 100644 arch/arm/mach-imx/mach-pcm037_eet.c + delete mode 100644 arch/arm/mach-imx/mach-pcm043.c + delete mode 100644 arch/arm/mach-imx/mach-qong.c + delete mode 100644 arch/arm/mach-imx/mach-vpr200.c + delete mode 100644 arch/arm/mach-imx/mm-imx21.c + delete mode 100644 arch/arm/mach-imx/mx31lilly-db.c + delete mode 100644 arch/arm/mach-imx/mx31moboard-devboard.c + delete mode 100644 arch/arm/mach-imx/mx31moboard-marxbot.c + delete mode 100644 arch/arm/mach-imx/mx31moboard-smartbot.c + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-r2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi +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 (63424bbb31b7 Merge branch 'v5.9-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/mediatek/devapc.yaml | 58 ++++ + arch/arm/boot/dts/mt2701.dtsi | 13 + + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 11 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 12 + + drivers/soc/mediatek/Kconfig | 9 + + drivers/soc/mediatek/Makefile | 1 + + drivers/soc/mediatek/mtk-devapc.c | 372 +++++++++++++++++++++ + drivers/soc/mediatek/mtk-devapc.h | 54 +++ + drivers/soc/mediatek/mtk-infracfg.c | 4 +- + 9 files changed, 532 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/devapc.yaml + create mode 100644 drivers/soc/mediatek/mtk-devapc.c + create mode 100644 drivers/soc/mediatek/mtk-devapc.h +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 (cf4173c2defa Merge branch 'omap-for-v5.10/ti-sysc-drop-pdata' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/prm-inst.txt | 2 + + arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 427 +++++++++++++++++++++ + arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 404 +------------------ + arch/arm/boot/dts/am33xx-l4.dtsi | 1 - + arch/arm/boot/dts/am33xx.dtsi | 4 +- + arch/arm/boot/dts/am4372.dtsi | 2 + + arch/arm/boot/dts/am437x-l4.dtsi | 3 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 4 + + arch/arm/boot/dts/dra7-l4.dtsi | 1 - + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 6 +- + arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 21 + + arch/arm/boot/dts/omap3-n950.dts | 3 +- + arch/arm/boot/dts/omap3.dtsi | 3 + + arch/arm/boot/dts/omap34xx.dtsi | 1 + + arch/arm/boot/dts/omap36xx.dtsi | 1 + + arch/arm/boot/dts/omap4-l4-abe.dtsi | 6 +- + arch/arm/boot/dts/omap4-sdp.dts | 6 +- + arch/arm/boot/dts/omap4.dtsi | 14 +- + arch/arm/boot/dts/omap443x.dtsi | 10 + + arch/arm/boot/dts/omap5-l4-abe.dtsi | 6 +- + arch/arm/boot/dts/omap5.dtsi | 6 + + arch/arm/mach-omap1/include/mach/mux.h | 2 +- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/am33xx.h | 2 +- + arch/arm/mach-omap2/board-generic.c | 2 +- + arch/arm/mach-omap2/clockdomains33xx_data.c | 2 +- + arch/arm/mach-omap2/clockdomains81xx_data.c | 2 +- + arch/arm/mach-omap2/cm-regbits-33xx.h | 2 +- + arch/arm/mach-omap2/cm-regbits-54xx.h | 2 +- + arch/arm/mach-omap2/cm-regbits-7xx.h | 2 +- + arch/arm/mach-omap2/cm1_54xx.h | 2 +- + arch/arm/mach-omap2/cm1_7xx.h | 2 +- + arch/arm/mach-omap2/cm2_54xx.h | 2 +- + arch/arm/mach-omap2/cm2_7xx.h | 2 +- + arch/arm/mach-omap2/cm33xx.c | 2 +- + arch/arm/mach-omap2/cm33xx.h | 2 +- + arch/arm/mach-omap2/cm81xx.h | 2 +- + arch/arm/mach-omap2/display.c | 2 +- + arch/arm/mach-omap2/dma.c | 2 +- + arch/arm/mach-omap2/l3_2xxx.h | 2 +- + arch/arm/mach-omap2/l3_3xxx.h | 2 +- + arch/arm/mach-omap2/l4_2xxx.h | 2 +- + arch/arm/mach-omap2/omap-iommu.c | 2 +- + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 2 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 24 -- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 77 ---- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 5 +- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 10 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 33 -- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 33 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 46 +-- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 +- + arch/arm/mach-omap2/omap_opp_data.h | 2 +- + arch/arm/mach-omap2/omap_phy_internal.c | 2 +- + arch/arm/mach-omap2/opp3xxx_data.c | 2 +- + arch/arm/mach-omap2/opp4xxx_data.c | 2 +- + arch/arm/mach-omap2/pm33xx-core.c | 27 +- + arch/arm/mach-omap2/powerdomains33xx_data.c | 2 +- + arch/arm/mach-omap2/prcm43xx.h | 2 +- + arch/arm/mach-omap2/prcm_mpu54xx.h | 2 +- + arch/arm/mach-omap2/prcm_mpu7xx.h | 2 +- + arch/arm/mach-omap2/prm-regbits-33xx.h | 2 +- + arch/arm/mach-omap2/prm33xx.c | 2 +- + arch/arm/mach-omap2/prm33xx.h | 2 +- + arch/arm/mach-omap2/prm54xx.h | 2 +- + arch/arm/mach-omap2/prm7xx.h | 2 +- + arch/arm/mach-omap2/scrm54xx.h | 2 +- + arch/arm/mach-omap2/sleep33xx.S | 2 +- + arch/arm/mach-omap2/sleep43xx.S | 2 +- + arch/arm/mach-omap2/ti81xx.h | 2 +- + arch/arm/mach-omap2/voltagedomains54xx_data.c | 2 +- + drivers/soc/ti/omap_prm.c | 274 ++++++++++++- + drivers/soc/ti/pm33xx.c | 47 ++- + include/linux/platform_data/pm33xx.h | 3 - + 74 files changed, 871 insertions(+), 722 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi +Merging qcom/for-next (4c7f2d50c2e3 Merge branches 'arm64-for-5.10' and 'arm64-defconfig-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/boot/dts/qcom/Makefile | 5 + + arch/arm64/boot/dts/qcom/msm8992.dtsi | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 24 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 18 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 15 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 192 +++ + .../boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 15 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1-lte.dts | 14 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 191 +++ + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1348 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sc7180.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 12 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 19 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 15 +- + arch/arm64/configs/defconfig | 3 + + 15 files changed, 1864 insertions(+), 24 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +Merging raspberrypi/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ 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 (8f140ba19f76 Merge branch 'renesas-arm-dt-for-v5.10' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 58 + + arch/arm/boot/dts/r8a7742-iwg21m.dtsi | 79 +- + arch/arm/boot/dts/r8a7742.dtsi | 303 +++++ + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 112 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 5 +- + arch/arm64/boot/dts/renesas/Makefile | 1 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 38 + + .../boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts | 5 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 38 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 19 + + .../r8a774e1-hihope-rzg2h-ex-idk-1110wr.dts | 15 + + .../boot/dts/renesas/r8a774e1-hihope-rzg2h.dts | 15 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1332 +++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 483 ++++++- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + + arch/arm64/configs/defconfig | 7 + + drivers/soc/renesas/Kconfig | 114 +- + 18 files changed, 2473 insertions(+), 154 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-idk-1110wr.dts +Merging reset/reset/next (2983e2385ff6 reset: imx7: add the cm4 reset for i.MX8MQ) +$ git merge reset/reset/next +Auto-merging drivers/reset/reset-imx7.c +CONFLICT (content): Merge conflict in drivers/reset/reset-imx7.c +Resolved 'drivers/reset/reset-imx7.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 527df692cfab] Merge remote-tracking branch 'reset/reset/next' into master +$ git diff -M --stat --summary HEAD^.. + .../bindings/reset/xlnx,zynqmp-reset.txt | 11 ++- + drivers/reset/Kconfig | 5 +- + drivers/reset/core.c | 3 +- + drivers/reset/reset-imx7.c | 13 ++- + drivers/reset/reset-zynqmp.c | 50 ++++++++-- + include/dt-bindings/reset/imx8mq-reset.h | 5 +- + include/dt-bindings/reset/xlnx-versal-resets.h | 105 +++++++++++++++++++++ + 7 files changed, 176 insertions(+), 16 deletions(-) + create mode 100644 include/dt-bindings/reset/xlnx-versal-resets.h +Merging rockchip/for-next (5b54a6a5703f Merge branch 'v5.10-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 11 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 6 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 6 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 6 +- + arch/arm/boot/dts/rk3066a.dtsi | 2 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +- + arch/arm/boot/dts/rk3288-miqi.dts | 16 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 16 +- + arch/arm/boot/dts/rk3288-r89.dts | 16 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 2 +- + arch/arm/boot/dts/rk3288-tinker.dtsi | 2 +- + arch/arm/boot/dts/rk3288-vyasa.dts | 14 +- + arch/arm64/boot/dts/rockchip/Makefile | 5 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 374 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 2 +- + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 4 +- + .../boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 12 +- + ...{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 26 -- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 13 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 42 +++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 51 +++ + 28 files changed, 615 insertions(+), 53 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts + rename arch/arm64/boot/dts/rockchip/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (95%) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts +Merging samsung-krzk/for-next (991ead47630f Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/mmc/host/Kconfig +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm/plat-samsung/watchdog-reset.c +Removing arch/arm/plat-samsung/include/plat/samsung-time.h +Removing arch/arm/mach-s3c64xx/watchdog-reset.h +Removing arch/arm/mach-s3c64xx/include/mach/hardware.h +Removing arch/arm/mach-s3c24xx/setup-camif.c +Removing arch/arm/mach-s3c24xx/include/mach/io.h +Removing arch/arm/mach-s3c24xx/include/mach/fb.h +Removing arch/arm/mach-exynos/include/mach/map.h +Auto-merging arch/arm/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/samsung/pmu.yaml | 22 ++- + .../devicetree/bindings/gpio/fsl-imx-gpio.yaml | 43 ++++- + MAINTAINERS | 24 +-- + arch/arm/Kconfig | 8 +- + arch/arm/Kconfig.debug | 18 +- + arch/arm/Makefile | 7 +- + arch/arm/boot/dts/exynos3250-monk.dts | 2 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 44 ++--- + arch/arm/boot/dts/exynos4210-i9100.dts | 56 ++++-- + arch/arm/boot/dts/exynos4210-origen.dts | 27 +++ + arch/arm/boot/dts/exynos4210-smdkv310.dts | 25 +++ + arch/arm/boot/dts/exynos4210-trats.dts | 186 ++++++++++-------- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 36 +++- + arch/arm/boot/dts/exynos4210.dtsi | 38 ++-- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 42 +++- + arch/arm/boot/dts/exynos4412-i9300.dts | 6 +- + arch/arm/boot/dts/exynos4412-i9305.dts | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 116 +++++++---- + arch/arm/boot/dts/exynos4412-n710x.dts | 39 +++- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 34 ++-- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 46 ++--- + arch/arm/boot/dts/exynos4412-origen.dts | 25 +++ + arch/arm/boot/dts/exynos4412-smdk4412.dts | 27 +++ + arch/arm/boot/dts/exynos4412-tiny4412.dts | 24 +++ + arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- + arch/arm/boot/dts/exynos4412.dtsi | 2 + + arch/arm/boot/dts/exynos5.dtsi | 10 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 20 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 +- + arch/arm/boot/dts/exynos5250-spring.dts | 41 ++-- + arch/arm/boot/dts/exynos5250.dtsi | 52 ++--- + arch/arm/boot/dts/exynos5260.dtsi | 4 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 8 +- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 12 ++ + arch/arm/boot/dts/exynos5410.dtsi | 12 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 3 + + arch/arm/boot/dts/exynos5420.dtsi | 16 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 4 +- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 60 +++--- + arch/arm/boot/dts/s5pv210-aries.dtsi | 10 + + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 98 ++++++++++ + arch/arm/boot/dts/s5pv210-galaxys.dts | 85 +++++++++ + arch/arm/configs/exynos_defconfig | 8 +- + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-exynos/Makefile | 4 - + arch/arm/mach-exynos/common.h | 6 +- + arch/arm/mach-exynos/exynos.c | 25 ++- + arch/arm/mach-exynos/include/mach/map.h | 18 -- + arch/arm/mach-exynos/platsmp.c | 4 +- + arch/arm/mach-exynos/pm.c | 8 +- + arch/arm/{plat-samsung => mach-s3c}/Kconfig | 72 +------ + .../Kconfig => mach-s3c/Kconfig.s3c24xx} | 13 -- + .../Kconfig => mach-s3c/Kconfig.s3c64xx} | 5 +- + arch/arm/{plat-samsung => mach-s3c}/Makefile | 16 +- + arch/arm/{mach-s3c24xx => mach-s3c}/Makefile.boot | 0 + .../Makefile => mach-s3c/Makefile.s3c24xx} | 22 ++- + .../Makefile => mach-s3c/Makefile.s3c64xx} | 36 ++-- + .../include/plat => mach-s3c}/adc-core.h | 0 + arch/arm/{plat-samsung => mach-s3c}/adc.c | 4 +- + arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h | 0 + .../ata-core.h => mach-s3c/ata-core-s3c64xx.h} | 6 +- + .../backlight.h => mach-s3c/backlight-s3c64xx.h} | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c | 3 +- + arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c | 8 +- + arch/arm/{mach-s3c24xx => mach-s3c}/bast.h | 0 + .../common-smdk-s3c24xx.c} | 13 +- + .../common-smdk-s3c24xx.h} | 0 + arch/arm/{plat-samsung => mach-s3c}/cpu.c | 21 +- + .../{plat-samsung/include/plat => mach-s3c}/cpu.h | 12 -- + .../cpufreq-utils-s3c24xx.c} | 40 +++- + .../cpuidle.c => mach-s3c/cpuidle-s3c64xx.c} | 8 +- + arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h | 2 +- + .../dev-audio.c => mach-s3c/dev-audio-s3c64xx.c} | 9 +- + .../dev-backlight-s3c64xx.c} | 6 +- + .../dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} | 5 +- + arch/arm/{plat-samsung => mach-s3c}/dev-uart.c | 2 +- + arch/arm/{plat-samsung => mach-s3c}/devs.c | 57 ++++-- + .../{plat-samsung/include/plat => mach-s3c}/devs.h | 0 + .../include/mach/dma.h => mach-s3c/dma-s3c24xx.h} | 0 + .../include/mach/dma.h => mach-s3c/dma-s3c64xx.h} | 0 + arch/arm/mach-s3c/dma.h | 9 + + .../fb-core.h => mach-s3c/fb-core-s3c24xx.h} | 6 +- + .../{plat-samsung/include/plat => mach-s3c}/fb.h | 0 + .../include/plat => mach-s3c}/gpio-cfg-helpers.h | 0 + .../include/plat => mach-s3c}/gpio-cfg.h | 0 + .../include/plat => mach-s3c}/gpio-core.h | 2 +- + .../gpio-samsung-s3c24xx.h} | 2 + + .../gpio-samsung-s3c64xx.h} | 0 + arch/arm/{plat-samsung => mach-s3c}/gpio-samsung.c | 18 +- + arch/arm/mach-s3c/gpio-samsung.h | 9 + + arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h | 2 +- + .../{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c | 7 +- + arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h | 0 + .../hardware.h => mach-s3c/hardware-s3c24xx.h} | 13 +- + .../include/plat => mach-s3c}/iic-core.h | 0 + arch/arm/mach-s3c/include/mach/io-s3c24xx.h | 50 +++++ + arch/arm/mach-s3c/include/mach/io.h | 8 + + .../include/mach/irqs-s3c24xx.h} | 0 + .../include/mach/irqs-s3c64xx.h} | 0 + arch/arm/mach-s3c/include/mach/irqs.h | 9 + + .../plat => mach-s3c/include/mach}/map-base.h | 0 + arch/arm/{plat-samsung => mach-s3c}/init.c | 4 +- + .../{mach-s3c24xx => mach-s3c}/iotiming-s3c2410.c | 14 +- + .../{mach-s3c24xx => mach-s3c}/iotiming-s3c2412.c | 6 +- + .../irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} | 16 +- + .../irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} | 8 +- + arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c | 9 + + .../arm/mach-s3c/irq-s3c24xx-fiq.S | 10 +- + .../irqchip => arch/arm/mach-s3c}/irq-s3c24xx.c | 23 ++- + .../irq-uart.h => mach-s3c/irq-uart-s3c64xx.h} | 0 + .../include/plat => mach-s3c}/keypad.h | 0 + .../arm/{mach-s3c24xx => mach-s3c}/mach-amlm5900.c | 41 ++-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c | 17 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c | 23 +-- + .../{mach-s3c24xx => mach-s3c}/mach-at2440evb.c | 31 +-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c | 25 ++- + .../mach-crag6410-module.c | 7 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c | 37 ++-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c | 60 ++++-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c | 73 +++++-- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c | 19 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c | 30 +-- + .../arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c | 45 +++-- + .../arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c | 30 ++- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c | 39 ++-- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c | 17 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c | 23 ++- + .../{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c | 4 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c | 27 ++- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c | 19 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c | 41 ++-- + .../arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c | 26 ++- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c | 60 ++++-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c | 29 +-- + .../{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c | 8 +- + .../{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c | 23 +-- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c | 21 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h | 0 + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c | 20 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c | 20 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c | 19 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c | 30 +-- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c | 28 ++- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c | 30 +-- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c | 19 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c | 17 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c | 35 ++-- + .../{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c | 27 ++- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c | 18 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c | 23 +-- + .../include/plat => mach-s3c}/map-s3c.h | 12 +- + .../include/mach/map.h => mach-s3c/map-s3c24xx.h} | 6 +- + .../include/mach/map.h => mach-s3c/map-s3c64xx.h} | 4 +- + .../include/plat => mach-s3c}/map-s5p.h | 4 +- + arch/arm/mach-s3c/map.h | 9 + + .../nand-core.h => mach-s3c/nand-core-s3c24xx.h} | 6 +- + .../onenand-core-s3c64xx.h} | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/osiris.h | 0 + arch/arm/{mach-s3c24xx => mach-s3c}/otom.h | 0 + arch/arm/{mach-s3c64xx => mach-s3c}/pl080.c | 6 +- + arch/arm/{plat-samsung => mach-s3c}/platformdata.c | 4 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c | 4 +- + .../pll-s3c2440-12000000.c | 4 +- + .../pll-s3c2440-16934400.c | 4 +- + arch/arm/{plat-samsung => mach-s3c}/pm-common.c | 4 +- + arch/arm/mach-s3c/pm-common.h | 40 ++++ + .../mach/pm-core.h => mach-s3c/pm-core-s3c24xx.h} | 10 +- + .../mach/pm-core.h => mach-s3c/pm-core-s3c64xx.h} | 50 +---- + arch/arm/mach-s3c/pm-core.h | 9 + + arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S | 5 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c | 11 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c | 12 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c | 6 +- + .../{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} | 14 +- + .../{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} | 74 +++++-- + arch/arm/{plat-samsung => mach-s3c}/pm.c | 20 +- + .../{plat-samsung/include/plat => mach-s3c}/pm.h | 2 +- + .../include/plat => mach-s3c}/pwm-core.h | 0 + .../include/plat => mach-s3c}/regs-adc.h | 0 + .../regs-clock.h => mach-s3c/regs-clock-s3c24xx.h} | 2 + + .../regs-clock.h => mach-s3c/regs-clock-s3c64xx.h} | 0 + arch/arm/mach-s3c/regs-clock.h | 9 + + .../regs-dsc.h => mach-s3c/regs-dsc-s3c24xx.h} | 6 +- + .../regs-gpio-memport-s3c64xx.h} | 0 + .../regs-gpio.h => mach-s3c/regs-gpio-s3c24xx.h} | 2 + + .../regs-gpio.h => mach-s3c/regs-gpio-s3c64xx.h} | 0 + arch/arm/mach-s3c/regs-gpio.h | 9 + + .../regs-irq.h => mach-s3c/regs-irq-s3c24xx.h} | 2 + + .../regs-irq.h => mach-s3c/regs-irq-s3c64xx.h} | 0 + arch/arm/mach-s3c/regs-irq.h | 9 + + .../include/plat => mach-s3c}/regs-irqtype.h | 0 + .../regs-mem.h => mach-s3c/regs-mem-s3c24xx.h} | 2 + + .../regs-modem.h => mach-s3c/regs-modem-s3c64xx.h} | 0 + .../include/mach => mach-s3c}/regs-s3c2443-clock.h | 50 +++++ + .../regs-srom.h => mach-s3c/regs-srom-s3c64xx.h} | 0 + .../regs-sys.h => mach-s3c/regs-sys-s3c64xx.h} | 0 + .../regs-syscon-power-s3c64xx.h} | 0 + .../regs-usb-hsotg-phy-s3c64xx.h} | 0 + .../rtc-core.h => mach-s3c/rtc-core-s3c24xx.h} | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c | 21 +- + .../arm/{mach-s3c24xx => mach-s3c}/s3c2412-power.h | 0 + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c | 24 ++- + .../include/mach => mach-s3c}/s3c2412.h | 2 + + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c | 34 ++-- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c | 17 +- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c | 17 +- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c | 28 +-- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c | 20 +- + .../{mach-s3c24xx/common.c => mach-s3c/s3c24xx.c} | 31 +-- + .../{mach-s3c24xx/common.h => mach-s3c/s3c24xx.h} | 26 ++- + arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c | 16 +- + arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c | 21 +- + .../{mach-s3c64xx/common.c => mach-s3c/s3c64xx.c} | 47 ++--- + .../{mach-s3c64xx/common.h => mach-s3c/s3c64xx.h} | 17 +- + .../include/plat => mach-s3c}/sdhci.h | 2 +- + .../setup-fb-24bpp-s3c64xx.c} | 6 +- + .../setup-i2c.c => mach-s3c/setup-i2c-s3c24xx.c} | 8 +- + .../setup-i2c0.c => mach-s3c/setup-i2c0-s3c64xx.c} | 4 +- + .../setup-i2c1.c => mach-s3c/setup-i2c1-s3c64xx.c} | 4 +- + .../setup-ide.c => mach-s3c/setup-ide-s3c64xx.c} | 9 +- + .../setup-keypad-s3c64xx.c} | 6 +- + .../setup-sdhci-gpio-s3c24xx.c} | 7 +- + .../setup-sdhci-gpio-s3c64xx.c} | 6 +- + .../setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} | 6 +- + .../setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} | 5 +- + .../setup-ts.c => mach-s3c/setup-ts-s3c24xx.c} | 8 +- + .../setup-usb-phy-s3c64xx.c} | 12 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec-audio.c | 11 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c | 2 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c | 10 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h | 0 + .../arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S | 9 +- + .../arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S | 5 +- + .../sleep.S => mach-s3c/sleep-s3c24xx.S} | 7 +- + .../sleep.S => mach-s3c/sleep-s3c64xx.S} | 4 +- + .../spi-core.h => mach-s3c/spi-core-s3c24xx.h} | 6 +- + .../include/plat => mach-s3c}/usb-phy.h | 0 + arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h | 0 + arch/arm/{plat-samsung => mach-s3c}/wakeup-mask.c | 4 +- + .../include/plat => mach-s3c}/wakeup-mask.h | 0 + arch/arm/mach-s3c24xx/include/mach/fb.h | 2 - + arch/arm/mach-s3c24xx/include/mach/io.h | 212 --------------------- + arch/arm/mach-s3c24xx/setup-camif.c | 67 ------- + arch/arm/mach-s3c64xx/include/mach/hardware.h | 17 -- + arch/arm/mach-s3c64xx/watchdog-reset.h | 16 -- + arch/arm/mach-s5pv210/Kconfig | 2 +- + arch/arm/mach-s5pv210/Makefile | 7 - + arch/arm/mach-s5pv210/pm.c | 51 ++++- + arch/arm/mach-s5pv210/regs-clock.h | 4 +- + arch/arm/mach-s5pv210/s5pv210.c | 2 - + arch/arm/plat-samsung/include/plat/samsung-time.h | 26 --- + arch/arm/plat-samsung/watchdog-reset.c | 93 --------- + arch/arm64/Kconfig.platforms | 1 - + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +- + arch/arm64/configs/defconfig | 1 + + drivers/clk/samsung/clk-s3c2410-dclk.c | 15 +- + drivers/clk/samsung/clk-s3c2410.c | 1 + + drivers/clk/samsung/clk-s3c2412.c | 1 + + drivers/clk/samsung/clk-s3c2443.c | 1 + + drivers/clk/samsung/clk-s3c64xx.c | 1 + + drivers/cpufreq/Kconfig.arm | 2 - + drivers/cpufreq/s3c2410-cpufreq.c | 10 +- + drivers/cpufreq/s3c2412-cpufreq.c | 44 ++--- + drivers/cpufreq/s3c2440-cpufreq.c | 29 ++- + drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 2 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 14 +- + drivers/cpuidle/cpuidle-big_little.c | 3 +- + drivers/hwmon/s3c-hwmon.c | 2 +- + drivers/input/touchscreen/s3c2410_ts.c | 37 +++- + drivers/irqchip/Makefile | 1 - + drivers/leds/leds-s3c24xx.c | 2 - + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/s3cmci.c | 72 ++----- + drivers/power/supply/s3c_adc_battery.c | 2 +- + drivers/pwm/Kconfig | 2 +- + drivers/soc/samsung/Kconfig | 48 ++++- + drivers/soc/samsung/Makefile | 3 + + .../soc/samsung/s3c-pm-check.c | 2 +- + .../soc/samsung/s3c-pm-debug.c | 26 +-- + drivers/spi/Kconfig | 2 +- + drivers/spi/Makefile | 1 - + .../regs-spi.h => drivers/spi/spi-s3c24xx-regs.h | 9 +- + drivers/spi/spi-s3c24xx.c | 28 +-- + drivers/tty/serial/Kconfig | 2 +- + drivers/usb/gadget/udc/s3c-hsudc.c | 55 +----- + drivers/usb/gadget/udc/s3c2410_udc.c | 34 ++-- + drivers/usb/gadget/udc/s3c2410_udc.h | 1 + + .../usb/gadget/udc/s3c2410_udc_regs.h | 0 + .../video/fbdev/s3c2410fb-regs-lcd.h | 28 +-- + drivers/video/fbdev/s3c2410fb.c | 16 +- + drivers/watchdog/Kconfig | 10 +- + include/linux/clk/samsung.h | 56 ++++++ + include/linux/platform_data/clk-s3c2410.h | 19 ++ + .../linux/platform_data}/fb-s3c2410.h | 33 +++- + include/linux/platform_data/mmc-s3cmci.h | 2 + + include/linux/platform_data/s3c-hsudc.h | 2 + + .../adc.h => include/linux/soc/samsung/s3c-adc.h | 6 +- + .../linux/soc/samsung/s3c-cpu-freq.h | 4 + + .../linux/soc/samsung/s3c-cpufreq-core.h | 14 +- + .../linux/soc/samsung/s3c-pm.h | 69 +++---- + .../linux/spi/s3c24xx-fiq.h | 10 + + include/linux/spi/s3c24xx.h | 2 +- + include/media/drv-intf/s3c_camif.h | 4 - + sound/soc/samsung/Kconfig | 2 +- + sound/soc/samsung/h1940_uda1380.c | 71 +++---- + sound/soc/samsung/neo1973_wm8753.c | 85 +++------ + sound/soc/samsung/rx1950_uda1380.c | 72 +++---- + sound/soc/samsung/s3c-i2s-v2.c | 3 +- + sound/soc/samsung/s3c-i2s-v2.h | 3 +- + sound/soc/samsung/s3c2412-i2s.c | 9 +- + sound/soc/samsung/s3c24xx-i2s.c | 7 - + 315 files changed, 2956 insertions(+), 2513 deletions(-) + delete mode 100644 arch/arm/mach-exynos/include/mach/map.h + rename arch/arm/{plat-samsung => mach-s3c}/Kconfig (69%) + rename arch/arm/{mach-s3c24xx/Kconfig => mach-s3c/Kconfig.s3c24xx} (97%) + rename arch/arm/{mach-s3c64xx/Kconfig => mach-s3c/Kconfig.s3c64xx} (98%) + rename arch/arm/{plat-samsung => mach-s3c}/Makefile (62%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/Makefile.boot (100%) + rename arch/arm/{mach-s3c24xx/Makefile => mach-s3c/Makefile.s3c24xx} (81%) + rename arch/arm/{mach-s3c64xx/Makefile => mach-s3c/Makefile.s3c64xx} (56%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/adc-core.h (100%) + rename arch/arm/{plat-samsung => mach-s3c}/adc.c (99%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h (100%) + rename arch/arm/{mach-s3c64xx/ata-core.h => mach-s3c/ata-core-s3c64xx.h} (78%) + rename arch/arm/{mach-s3c64xx/backlight.h => mach-s3c/backlight-s3c64xx.h} (78%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c (95%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/bast.h (100%) + rename arch/arm/{mach-s3c24xx/common-smdk.c => mach-s3c/common-smdk-s3c24xx.c} (96%) + rename arch/arm/{mach-s3c24xx/common-smdk.h => mach-s3c/common-smdk-s3c24xx.h} (100%) + rename arch/arm/{plat-samsung => mach-s3c}/cpu.c (62%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/cpu.h (89%) + rename arch/arm/{mach-s3c24xx/cpufreq-utils.c => mach-s3c/cpufreq-utils-s3c24xx.c} (68%) + rename arch/arm/{mach-s3c64xx/cpuidle.c => mach-s3c/cpuidle-s3c64xx.c} (92%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h (95%) + rename arch/arm/{mach-s3c64xx/dev-audio.c => mach-s3c/dev-audio-s3c64xx.c} (97%) + rename arch/arm/{mach-s3c64xx/dev-backlight.c => mach-s3c/dev-backlight-s3c64xx.c} (98%) + rename arch/arm/{mach-s3c64xx/dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} (95%) + rename arch/arm/{plat-samsung => mach-s3c}/dev-uart.c (97%) + rename arch/arm/{plat-samsung => mach-s3c}/devs.c (96%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/devs.h (100%) + rename arch/arm/{mach-s3c24xx/include/mach/dma.h => mach-s3c/dma-s3c24xx.h} (100%) + rename arch/arm/{mach-s3c64xx/include/mach/dma.h => mach-s3c/dma-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/dma.h + rename arch/arm/{mach-s3c24xx/fb-core.h => mach-s3c/fb-core-s3c24xx.h} (78%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/fb.h (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-cfg-helpers.h (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-cfg.h (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-core.h (99%) + rename arch/arm/{mach-s3c24xx/include/mach/gpio-samsung.h => mach-s3c/gpio-samsung-s3c24xx.h} (99%) + rename arch/arm/{mach-s3c64xx/include/mach/gpio-samsung.h => mach-s3c/gpio-samsung-s3c64xx.h} (100%) + rename arch/arm/{plat-samsung => mach-s3c}/gpio-samsung.c (99%) + create mode 100644 arch/arm/mach-s3c/gpio-samsung.h + rename arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h (94%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h (100%) + rename arch/arm/{mach-s3c24xx/include/mach/hardware.h => mach-s3c/hardware-s3c24xx.h} (54%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/iic-core.h (100%) + create mode 100644 arch/arm/mach-s3c/include/mach/io-s3c24xx.h + create mode 100644 arch/arm/mach-s3c/include/mach/io.h + rename arch/arm/{mach-s3c24xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c24xx.h} (100%) + rename arch/arm/{mach-s3c64xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/include/mach/irqs.h + rename arch/arm/{plat-samsung/include/plat => mach-s3c/include/mach}/map-base.h (100%) + rename arch/arm/{plat-samsung => mach-s3c}/init.c (98%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2410.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2412.c (98%) + rename arch/arm/{mach-s3c24xx/irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} (93%) + rename arch/arm/{mach-s3c64xx/irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} (97%) + create mode 100644 arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c + rename drivers/spi/spi-s3c24xx-fiq.S => arch/arm/mach-s3c/irq-s3c24xx-fiq.S (94%) + rename {drivers/irqchip => arch/arm/mach-s3c}/irq-s3c24xx.c (99%) + rename arch/arm/{mach-s3c64xx/irq-uart.h => mach-s3c/irq-uart-s3c64xx.h} (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/keypad.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-amlm5900.c (83%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c (97%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c (93%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-at2440evb.c (87%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c (97%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410-module.c (98%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c (89%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c (92%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c (95%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c (94%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c (95%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c (94%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c (87%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c (90%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c (98%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c (88%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c (88%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c (95%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c (92%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c (89%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c (92%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c (70%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c (96%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h (100%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c (91%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c (92%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c (86%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c (86%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c (93%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c (87%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c (90%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c (87%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c (81%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c (88%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/map-s3c.h (87%) + rename arch/arm/{mach-s3c24xx/include/mach/map.h => mach-s3c/map-s3c24xx.h} (97%) + rename arch/arm/{mach-s3c64xx/include/mach/map.h => mach-s3c/map-s3c64xx.h} (98%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/map-s5p.h (85%) + create mode 100644 arch/arm/mach-s3c/map.h + rename arch/arm/{mach-s3c24xx/nand-core.h => mach-s3c/nand-core-s3c24xx.h} (77%) + rename arch/arm/{mach-s3c64xx/onenand-core.h => mach-s3c/onenand-core-s3c64xx.h} (82%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/osiris.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/otom.h (100%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/pl080.c (98%) + rename arch/arm/{plat-samsung => mach-s3c}/platformdata.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-12000000.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-16934400.c (98%) + rename arch/arm/{plat-samsung => mach-s3c}/pm-common.c (95%) + create mode 100644 arch/arm/mach-s3c/pm-common.h + rename arch/arm/{mach-s3c24xx/include/mach/pm-core.h => mach-s3c/pm-core-s3c24xx.h} (94%) + rename arch/arm/{mach-s3c64xx/include/mach/pm-core.h => mach-s3c/pm-core-s3c64xx.h} (58%) + create mode 100644 arch/arm/mach-s3c/pm-core.h + rename arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c (99%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S (80%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c (94%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c (95%) + rename arch/arm/{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} (93%) + rename arch/arm/{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} (81%) + rename arch/arm/{plat-samsung => mach-s3c}/pm.c (94%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/pm.h (98%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/pwm-core.h (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/regs-adc.h (100%) + rename arch/arm/{mach-s3c24xx/include/mach/regs-clock.h => mach-s3c/regs-clock-s3c24xx.h} (99%) + rename arch/arm/{mach-s3c64xx/include/mach/regs-clock.h => mach-s3c/regs-clock-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/regs-clock.h + rename arch/arm/{mach-s3c24xx/regs-dsc.h => mach-s3c/regs-dsc-s3c24xx.h} (77%) + rename arch/arm/{mach-s3c64xx/regs-gpio-memport.h => mach-s3c/regs-gpio-memport-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c24xx/include/mach/regs-gpio.h => mach-s3c/regs-gpio-s3c24xx.h} (99%) + rename arch/arm/{mach-s3c64xx/include/mach/regs-gpio.h => mach-s3c/regs-gpio-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/regs-gpio.h + rename arch/arm/{mach-s3c24xx/include/mach/regs-irq.h => mach-s3c/regs-irq-s3c24xx.h} (98%) + rename arch/arm/{mach-s3c64xx/include/mach/regs-irq.h => mach-s3c/regs-irq-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/regs-irq.h + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/regs-irqtype.h (100%) + rename arch/arm/{mach-s3c24xx/regs-mem.h => mach-s3c/regs-mem-s3c24xx.h} (98%) + rename arch/arm/{mach-s3c64xx/regs-modem.h => mach-s3c/regs-modem-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/regs-s3c2443-clock.h (81%) + rename arch/arm/{mach-s3c64xx/regs-srom.h => mach-s3c/regs-srom-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c64xx/regs-sys.h => mach-s3c/regs-sys-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c64xx/regs-syscon-power.h => mach-s3c/regs-syscon-power-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c64xx/regs-usb-hsotg-phy.h => mach-s3c/regs-usb-hsotg-phy-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c24xx/include/mach/rtc-core.h => mach-s3c/rtc-core-s3c24xx.h} (81%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c (90%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412-power.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c (93%) + rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/s3c2412.h (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c (86%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c (85%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c (82%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c (86%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c (91%) + rename arch/arm/{mach-s3c24xx/common.c => mach-s3c/s3c24xx.c} (97%) + rename arch/arm/{mach-s3c24xx/common.h => mach-s3c/s3c24xx.h} (85%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c (88%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c (87%) + rename arch/arm/{mach-s3c64xx/common.c => mach-s3c/s3c64xx.c} (92%) + rename arch/arm/{mach-s3c64xx/common.h => mach-s3c/s3c64xx.h} (80%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/sdhci.h (99%) + rename arch/arm/{mach-s3c64xx/setup-fb-24bpp.c => mach-s3c/setup-fb-24bpp-s3c64xx.c} (86%) + rename arch/arm/{mach-s3c24xx/setup-i2c.c => mach-s3c/setup-i2c-s3c24xx.c} (79%) + rename arch/arm/{mach-s3c64xx/setup-i2c0.c => mach-s3c/setup-i2c0-s3c64xx.c} (90%) + rename arch/arm/{mach-s3c64xx/setup-i2c1.c => mach-s3c/setup-i2c1-s3c64xx.c} (90%) + rename arch/arm/{mach-s3c64xx/setup-ide.c => mach-s3c/setup-ide-s3c64xx.c} (89%) + rename arch/arm/{mach-s3c64xx/setup-keypad.c => mach-s3c/setup-keypad-s3c64xx.c} (86%) + rename arch/arm/{mach-s3c24xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c24xx.c} (89%) + rename arch/arm/{mach-s3c64xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c64xx.c} (95%) + rename arch/arm/{mach-s3c24xx/setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} (85%) + rename arch/arm/{mach-s3c64xx/setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} (83%) + rename arch/arm/{mach-s3c24xx/setup-ts.c => mach-s3c/setup-ts-s3c24xx.c} (81%) + rename arch/arm/{mach-s3c64xx/setup-usb-phy.c => mach-s3c/setup-usb-phy-s3c64xx.c} (92%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-audio.c (86%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c (98%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c (91%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S (90%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S (93%) + rename arch/arm/{mach-s3c24xx/sleep.S => mach-s3c/sleep-s3c24xx.S} (92%) + rename arch/arm/{mach-s3c64xx/sleep.S => mach-s3c/sleep-s3c64xx.S} (97%) + rename arch/arm/{mach-s3c24xx/spi-core.h => mach-s3c/spi-core-s3c24xx.h} (81%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/usb-phy.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h (100%) + rename arch/arm/{plat-samsung => mach-s3c}/wakeup-mask.c (94%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/wakeup-mask.h (100%) + delete mode 100644 arch/arm/mach-s3c24xx/include/mach/fb.h + delete mode 100644 arch/arm/mach-s3c24xx/include/mach/io.h + delete mode 100644 arch/arm/mach-s3c24xx/setup-camif.c + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-s3c64xx/watchdog-reset.h + delete mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h + delete mode 100644 arch/arm/plat-samsung/watchdog-reset.c + rename arch/arm/plat-samsung/pm-check.c => drivers/soc/samsung/s3c-pm-check.c (99%) + rename arch/arm/plat-samsung/pm-debug.c => drivers/soc/samsung/s3c-pm-debug.c (78%) + rename arch/arm/plat-samsung/include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h (89%) + rename arch/arm/plat-samsung/include/plat/regs-udc.h => drivers/usb/gadget/udc/s3c2410_udc_regs.h (100%) + rename arch/arm/mach-s3c24xx/include/mach/regs-lcd.h => drivers/video/fbdev/s3c2410fb-regs-lcd.h (84%) + create mode 100644 include/linux/clk/samsung.h + create mode 100644 include/linux/platform_data/clk-s3c2410.h + rename {arch/arm/plat-samsung/include/plat => include/linux/platform_data}/fb-s3c2410.h (57%) + rename arch/arm/plat-samsung/include/plat/adc.h => include/linux/soc/samsung/s3c-adc.h (85%) + rename arch/arm/plat-samsung/include/plat/cpu-freq.h => include/linux/soc/samsung/s3c-cpu-freq.h (97%) + rename arch/arm/plat-samsung/include/plat/cpu-freq-core.h => include/linux/soc/samsung/s3c-cpufreq-core.h (95%) + rename arch/arm/plat-samsung/include/plat/pm-common.h => include/linux/soc/samsung/s3c-pm.h (55%) + rename drivers/spi/spi-s3c24xx-fiq.h => include/linux/spi/s3c24xx-fiq.h (66%) +Merging scmi/for-linux-next (02c210a7e42c Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +- + arch/arm/boot/dts/arm-realview-pb11mp.dts | 20 ++++++++++---------- + arch/arm/boot/dts/arm-realview-pbx.dtsi | 4 ++-- + arch/arm/boot/dts/mps2.dtsi | 10 ++++++---- + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 2 +- + arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- + arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 4 ++-- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 2 +- + arch/arm/boot/dts/vexpress-v2p-ca9.dts | 6 +++--- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 6 +++--- + drivers/firmware/arm_scmi/clock.c | 2 +- + drivers/firmware/arm_scmi/common.h | 2 +- + drivers/firmware/arm_scmi/mailbox.c | 2 +- + drivers/firmware/arm_scmi/notify.c | 2 +- + drivers/firmware/arm_scmi/perf.c | 2 +- + drivers/firmware/arm_scmi/power.c | 2 +- + drivers/firmware/arm_scmi/reset.c | 2 +- + drivers/firmware/arm_scmi/sensors.c | 2 +- + drivers/firmware/arm_scmi/smc.c | 2 +- + include/linux/scmi_protocol.h | 12 ++++++------ + 22 files changed, 47 insertions(+), 45 deletions(-) +Merging sunxi/sunxi/for-next (4fc958d5a0c6 Merge branches 'sunxi/clk-for-5.10', 'sunxi/dt-for-5.10' and 'sunxi/fixes-for-5.9' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/staging/media/sunxi/cedrus/cedrus.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 7 +- + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 9 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 2 + + .../allwinner,sun7i-a20-sc-nmi.yaml | 5 +- + .../bindings/media/allwinner,sun4i-a10-ir.yaml | 5 +- + .../media/allwinner,sun4i-a10-video-engine.yaml | 1 + + .../sram/allwinner,sun4i-a10-system-control.yaml | 6 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 25 + + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 4 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 14 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 104 ++ + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../dts/allwinner/sun50i-a100-allwinner-perf1.dts | 180 +++ + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 364 ++++++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 8 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 8 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 8 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 8 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 7 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 1 + + drivers/clk/sunxi-ng/Kconfig | 10 + + drivers/clk/sunxi-ng/Makefile | 2 + + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 214 ++++ + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.h | 21 + + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 1276 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun50i-a100.h | 56 + + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 37 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 9 + + include/dt-bindings/clock/sun50i-a100-ccu.h | 116 ++ + include/dt-bindings/clock/sun50i-a100-r-ccu.h | 23 + + include/dt-bindings/reset/sun50i-a100-ccu.h | 68 ++ + include/dt-bindings/reset/sun50i-a100-r-ccu.h | 18 + + 39 files changed, 2605 insertions(+), 73 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a100-allwinner-perf1.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a100-r.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a100.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a100.h + create mode 100644 include/dt-bindings/clock/sun50i-a100-ccu.h + create mode 100644 include/dt-bindings/clock/sun50i-a100-r-ccu.h + create mode 100644 include/dt-bindings/reset/sun50i-a100-ccu.h + create mode 100644 include/dt-bindings/reset/sun50i-a100-r-ccu.h +Merging tegra/for-next (05ccc6eebf8e Merge branch for-5.10/arm64/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/nvidia/tegra210.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra194.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra186.dtsi +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 217 +++++++++++++++++- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 15 ++ + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 13 ++ + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 247 ++++++++++++++++++++- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 27 ++- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 150 ++++++++++++- + arch/arm64/configs/defconfig | 8 + + 8 files changed, 667 insertions(+), 12 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 ti-k3-new/ti-k3-next (e5c956c4f36c arm64: dts: ti: k3-*: Fix up node_name_chars_strict warnings) +$ git merge ti-k3-new/ti-k3-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 52 +++++-- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 18 +-- + .../boot/dts/ti/k3-am654-industrial-thermal.dtsi | 12 +- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 111 ++------------- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 69 ++++++++- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 155 ++++++++++++++++++++- + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 6 +- + 11 files changed, 293 insertions(+), 150 deletions(-) +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 (24907ec54702 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/davinci/pll.c | 2 +- + drivers/clk/rockchip/clk-rk3228.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +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 +Already up to date. +Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + 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 +-- + 15 files changed, 123 insertions(+), 62 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. +Merging m68k/for-next (352e04291115 m68k: Replace HTTP links with HTTPS ones) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig | 24 ++++---- + arch/m68k/amiga/config.c | 118 ++++++++++++++++++------------------ + arch/m68k/include/asm/thread_info.h | 8 +++ + arch/m68k/kernel/head.S | 16 ++--- + arch/m68k/kernel/traps.c | 5 +- + arch/m68k/mac/macboing.c | 2 +- + arch/m68k/mm/mcfmmu.c | 2 +- + arch/m68k/mm/motorola.c | 9 ++- + drivers/zorro/zorro.c | 2 +- + 9 files changed, 94 insertions(+), 92 deletions(-) +Merging m68knommu/for-next (f4d51dffc6c0 Linux 5.9-rc4) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file warning) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/Kbuild | 1 - + 1 file changed, 1 deletion(-) +Merging mips/mips-next (601637e42df0 MIPS: Remove mach-*/war.h) +$ git merge mips/mips-next +Removing arch/mips/pnx833x/stb22x/board.c +Removing arch/mips/pnx833x/stb22x/Makefile +Removing arch/mips/pnx833x/common/setup.c +Removing arch/mips/pnx833x/common/reset.c +Removing arch/mips/pnx833x/common/prom.c +Removing arch/mips/pnx833x/common/platform.c +Removing arch/mips/pnx833x/common/interrupts.c +Removing arch/mips/pnx833x/common/Makefile +Removing arch/mips/pnx833x/Platform +Removing arch/mips/pnx833x/Makefile +Auto-merging arch/mips/mm/c-r4k.c +Removing arch/mips/include/asm/mach-tx49xx/war.h +Removing arch/mips/include/asm/mach-sibyte/war.h +Removing arch/mips/include/asm/mach-rm/war.h +Removing arch/mips/include/asm/mach-rc32434/war.h +Removing arch/mips/include/asm/mach-pnx833x/pnx833x.h +Removing arch/mips/include/asm/mach-pnx833x/irq.h +Removing arch/mips/include/asm/mach-pnx833x/irq-mapping.h +Removing arch/mips/include/asm/mach-pnx833x/gpio.h +Removing arch/mips/include/asm/mach-paravirt/kernel-entry-init.h +Removing arch/mips/include/asm/mach-paravirt/irq.h +Removing arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h +Removing arch/mips/include/asm/mach-malta/war.h +Removing arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h +Removing arch/mips/include/asm/mach-ip32/war.h +Removing arch/mips/include/asm/mach-ip30/war.h +Removing arch/mips/include/asm/mach-ip28/war.h +Removing arch/mips/include/asm/mach-ip27/war.h +Removing arch/mips/include/asm/mach-ip27/kmalloc.h +Removing arch/mips/include/asm/mach-ip22/war.h +Removing arch/mips/include/asm/mach-generic/war.h +Removing arch/mips/include/asm/mach-cavium-octeon/war.h +Removing arch/mips/include/asm/m48t37.h +Removing arch/mips/configs/pnx8335_stb225_defconfig +Merge made by the 'recursive' strategy. + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 112 +++- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 625 ++++++++++----------- + arch/mips/boot/compressed/Makefile | 3 +- + arch/mips/boot/compressed/decompress.c | 4 + + arch/mips/boot/compressed/string.c | 17 + + arch/mips/boot/dts/ingenic/qi_lb60.dts | 137 +++-- + arch/mips/cavium-octeon/setup.c | 2 +- + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/pnx8335_stb225_defconfig | 77 --- + arch/mips/include/asm/futex.h | 4 +- + arch/mips/include/asm/llsc.h | 2 +- + arch/mips/include/asm/local.h | 4 +- + arch/mips/include/asm/m48t37.h | 36 -- + arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 +- + arch/mips/include/asm/mach-cavium-octeon/war.h | 27 - + arch/mips/include/asm/mach-generic/war.h | 23 - + arch/mips/include/asm/mach-ip22/war.h | 27 - + arch/mips/include/asm/mach-ip27/kmalloc.h | 8 - + arch/mips/include/asm/mach-ip27/war.h | 23 - + arch/mips/include/asm/mach-ip28/war.h | 23 - + arch/mips/include/asm/mach-ip30/war.h | 24 - + arch/mips/include/asm/mach-ip32/war.h | 23 - + .../include/asm/mach-loongson2ef/mc146818rtc.h | 36 -- + arch/mips/include/asm/mach-malta/war.h | 23 - + .../asm/mach-paravirt/cpu-feature-overrides.h | 35 -- + arch/mips/include/asm/mach-paravirt/irq.h | 19 - + .../include/asm/mach-paravirt/kernel-entry-init.h | 52 -- + arch/mips/include/asm/mach-pnx833x/gpio.h | 159 ------ + arch/mips/include/asm/mach-pnx833x/irq-mapping.h | 112 ---- + arch/mips/include/asm/mach-pnx833x/irq.h | 40 -- + arch/mips/include/asm/mach-pnx833x/pnx833x.h | 189 ------- + arch/mips/include/asm/mach-rc32434/war.h | 23 - + arch/mips/include/asm/mach-rm/war.h | 27 - + arch/mips/include/asm/mach-sibyte/war.h | 38 -- + arch/mips/include/asm/mach-tx49xx/war.h | 23 - + arch/mips/include/asm/mipsregs.h | 16 +- + arch/mips/include/asm/war.h | 150 ----- + arch/mips/kernel/ftrace.c | 4 - + arch/mips/kernel/mips-mt-fpaff.c | 4 +- + arch/mips/kernel/signal.c | 8 +- + arch/mips/kernel/syscall.c | 2 +- + arch/mips/lantiq/xway/sysctrl.c | 10 +- + arch/mips/loongson64/reset.c | 5 - + arch/mips/mm/c-r4k.c | 17 +- + arch/mips/mm/page.c | 16 +- + arch/mips/mm/tlbex.c | 8 +- + arch/mips/mm/uasm.c | 2 +- + arch/mips/pnx833x/Makefile | 4 - + arch/mips/pnx833x/Platform | 4 - + arch/mips/pnx833x/common/Makefile | 2 - + arch/mips/pnx833x/common/interrupts.c | 303 ---------- + arch/mips/pnx833x/common/platform.c | 224 -------- + arch/mips/pnx833x/common/prom.c | 51 -- + arch/mips/pnx833x/common/reset.c | 31 - + arch/mips/pnx833x/common/setup.c | 48 -- + arch/mips/pnx833x/stb22x/Makefile | 2 - + arch/mips/pnx833x/stb22x/board.c | 120 ---- + arch/mips/sgi-ip32/ip32-setup.c | 2 - + drivers/firmware/broadcom/bcm47xx_sprom.c | 1 + + drivers/tty/serial/sb1250-duart.c | 9 +- + include/linux/bcm47xx_sprom.h | 10 + + lib/decompress_unzstd.c | 7 +- + 63 files changed, 553 insertions(+), 2490 deletions(-) + delete mode 100644 arch/mips/configs/pnx8335_stb225_defconfig + delete mode 100644 arch/mips/include/asm/m48t37.h + delete mode 100644 arch/mips/include/asm/mach-cavium-octeon/war.h + delete mode 100644 arch/mips/include/asm/mach-generic/war.h + delete mode 100644 arch/mips/include/asm/mach-ip22/war.h + delete mode 100644 arch/mips/include/asm/mach-ip27/kmalloc.h + delete mode 100644 arch/mips/include/asm/mach-ip27/war.h + delete mode 100644 arch/mips/include/asm/mach-ip28/war.h + delete mode 100644 arch/mips/include/asm/mach-ip30/war.h + delete mode 100644 arch/mips/include/asm/mach-ip32/war.h + delete mode 100644 arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h + delete mode 100644 arch/mips/include/asm/mach-malta/war.h + delete mode 100644 arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h + delete mode 100644 arch/mips/include/asm/mach-paravirt/irq.h + delete mode 100644 arch/mips/include/asm/mach-paravirt/kernel-entry-init.h + delete mode 100644 arch/mips/include/asm/mach-pnx833x/gpio.h + delete mode 100644 arch/mips/include/asm/mach-pnx833x/irq-mapping.h + delete mode 100644 arch/mips/include/asm/mach-pnx833x/irq.h + delete mode 100644 arch/mips/include/asm/mach-pnx833x/pnx833x.h + delete mode 100644 arch/mips/include/asm/mach-rc32434/war.h + delete mode 100644 arch/mips/include/asm/mach-rm/war.h + delete mode 100644 arch/mips/include/asm/mach-sibyte/war.h + delete mode 100644 arch/mips/include/asm/mach-tx49xx/war.h + delete mode 100644 arch/mips/pnx833x/Makefile + delete mode 100644 arch/mips/pnx833x/Platform + delete mode 100644 arch/mips/pnx833x/common/Makefile + delete mode 100644 arch/mips/pnx833x/common/interrupts.c + delete mode 100644 arch/mips/pnx833x/common/platform.c + delete mode 100644 arch/mips/pnx833x/common/prom.c + delete mode 100644 arch/mips/pnx833x/common/reset.c + delete mode 100644 arch/mips/pnx833x/common/setup.c + delete mode 100644 arch/mips/pnx833x/stb22x/Makefile + delete mode 100644 arch/mips/pnx833x/stb22x/board.c +Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/setup.c | 2 +- + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 4 files changed, 5 insertions(+), 50 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 (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (685cbf6616ce parisc/stifb: Convert STI core driver to dynamic printk) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/kernel/smp.c +Auto-merging arch/parisc/Kconfig +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/socket.h | 4 +- + arch/parisc/include/uapi/asm/fcntl.h | 7 +- + arch/parisc/include/uapi/asm/signal.h | 13 +--- + arch/parisc/kernel/inventory.c | 30 +++++++++ + arch/parisc/kernel/smp.c | 9 ++- + drivers/firmware/Kconfig | 2 +- + drivers/firmware/qemu_fw_cfg.c | 3 + + drivers/video/console/sticore.c | 122 ++++++++++++++++------------------ + drivers/video/fbdev/sticore.h | 6 -- + 10 files changed, 106 insertions(+), 91 deletions(-) +Merging powerpc/next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (1fc0583c7d46 riscv: Add cache information in AUX vector) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + arch/riscv/include/asm/cacheinfo.h | 5 + + arch/riscv/include/asm/elf.h | 13 ++ + arch/riscv/include/uapi/asm/auxvec.h | 24 +++ + arch/riscv/kernel/cacheinfo.c | 98 ++++++++-- + arch/riscv/mm/fault.c | 337 ++++++++++++++++++++--------------- + 5 files changed, 313 insertions(+), 164 deletions(-) +Merging s390/features (4bff8cb54502 s390: convert to GENERIC_VDSO) +$ git merge s390/features +Removing arch/s390/kernel/vdso64/gettimeofday.S +Removing arch/s390/kernel/vdso64/clock_gettime.S +Removing arch/s390/kernel/vdso64/clock_getres.S +Auto-merging arch/s390/kernel/vdso64/Makefile +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 3 + + arch/s390/include/asm/checksum.h | 111 +++++++++++-------- + arch/s390/include/asm/clocksource.h | 7 ++ + arch/s390/include/asm/vdso.h | 25 +---- + arch/s390/include/asm/vdso/clocksource.h | 8 ++ + arch/s390/include/asm/vdso/data.h | 13 +++ + arch/s390/include/asm/vdso/gettimeofday.h | 71 ++++++++++++ + arch/s390/include/asm/vdso/processor.h | 7 ++ + arch/s390/include/asm/vdso/vdso.h | 0 + arch/s390/include/asm/vdso/vsyscall.h | 26 +++++ + arch/s390/kernel/asm-offsets.c | 20 ---- + arch/s390/kernel/entry.S | 6 - + arch/s390/kernel/setup.c | 1 - + arch/s390/kernel/time.c | 66 ++--------- + arch/s390/kernel/vdso.c | 29 +---- + arch/s390/kernel/vdso64/Makefile | 19 +++- + arch/s390/kernel/vdso64/clock_getres.S | 50 --------- + arch/s390/kernel/vdso64/clock_gettime.S | 163 ---------------------------- + arch/s390/kernel/vdso64/gettimeofday.S | 71 ------------ + arch/s390/kernel/vdso64/vdso64_generic.c | 18 +++ + arch/s390/kernel/vdso64/vdso_user_wrapper.S | 38 +++++++ + 21 files changed, 285 insertions(+), 467 deletions(-) + create mode 100644 arch/s390/include/asm/clocksource.h + create mode 100644 arch/s390/include/asm/vdso/clocksource.h + create mode 100644 arch/s390/include/asm/vdso/data.h + create mode 100644 arch/s390/include/asm/vdso/gettimeofday.h + create mode 100644 arch/s390/include/asm/vdso/processor.h + create mode 100644 arch/s390/include/asm/vdso/vdso.h + create mode 100644 arch/s390/include/asm/vdso/vsyscall.h + delete mode 100644 arch/s390/kernel/vdso64/clock_getres.S + delete mode 100644 arch/s390/kernel/vdso64/clock_gettime.S + delete mode 100644 arch/s390/kernel/vdso64/gettimeofday.S + create mode 100644 arch/s390/kernel/vdso64/vdso64_generic.c + create mode 100644 arch/s390/kernel/vdso64/vdso_user_wrapper.S +Merging sh/for-next (0c64a0dce51f sh: landisk: Add missing initialization of sh_io_port_base) +$ git merge sh/for-next +Already up to date. +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 (4ca4c562efb6 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/uaccess.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fscrypt/master (5e895bd4d523 fscrypt: restrict IV_INO_LBLK_32 to ino_bits <= 32) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + fs/crypto/fname.c | 5 +---- + fs/crypto/hooks.c | 2 +- + fs/crypto/policy.c | 9 +++++++-- + fs/ext4/dir.c | 2 +- + fs/ext4/namei.c | 7 +++---- + fs/f2fs/dir.c | 2 +- + fs/ubifs/dir.c | 2 +- + include/linux/fscrypt.h | 5 ++--- + 8 files changed, 17 insertions(+), 17 deletions(-) +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 (d7f5b2deba2d Merge branch 'for-next-next-v5.9-20200907' into for-next-20200907) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/backref.c | 1 - + fs/btrfs/block-group.c | 41 ++- + fs/btrfs/btrfs_inode.h | 10 + + fs/btrfs/compression.c | 35 --- + fs/btrfs/compression.h | 35 +++ + fs/btrfs/ctree.c | 164 +++++++++--- + fs/btrfs/ctree.h | 47 ++-- + fs/btrfs/delalloc-space.c | 123 +-------- + fs/btrfs/delayed-inode.c | 3 +- + fs/btrfs/dev-replace.c | 12 +- + fs/btrfs/disk-io.c | 68 +++-- + fs/btrfs/extent-io-tree.h | 1 + + fs/btrfs/extent-tree.c | 206 +++++++++++++-- + fs/btrfs/extent_io.c | 124 +++++---- + fs/btrfs/extent_io.h | 23 +- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 178 +++++++++---- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode.c | 613 ++++++++++++++++++++----------------------- + fs/btrfs/ioctl.c | 56 ++-- + fs/btrfs/locking.c | 403 ++++++---------------------- + fs/btrfs/locking.h | 80 +++++- + fs/btrfs/ordered-data.c | 97 +++++-- + fs/btrfs/ordered-data.h | 19 +- + fs/btrfs/print-tree.c | 11 +- + fs/btrfs/qgroup.c | 2 +- + fs/btrfs/reada.c | 25 +- + fs/btrfs/reflink.c | 36 +-- + fs/btrfs/relocation.c | 11 +- + fs/btrfs/root-tree.c | 13 +- + fs/btrfs/scrub.c | 8 +- + fs/btrfs/send.c | 11 +- + fs/btrfs/space-info.c | 304 +++++++++++++++------ + fs/btrfs/space-info.h | 2 + + fs/btrfs/super.c | 1 + + fs/btrfs/sysfs.c | 82 +++++- + fs/btrfs/sysfs.h | 5 +- + fs/btrfs/transaction.c | 15 +- + fs/btrfs/transaction.h | 8 + + fs/btrfs/tree-log.c | 276 ++++++++++--------- + fs/btrfs/tree-log.h | 32 ++- + fs/btrfs/volumes.c | 282 ++++++++++---------- + fs/btrfs/volumes.h | 9 +- + include/trace/events/btrfs.h | 27 +- + 45 files changed, 1932 insertions(+), 1574 deletions(-) +Merging ceph/master (f44d04e696fe rbd: require global CAP_SYS_ADMIN for mapping and unmapping) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) +Merging cifs/for-next (01ec372cef1e cifs: fix DFS mount with cifsacl/modefromsid) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/inode.c | 4 ++++ + 1 file changed, 4 insertions(+) +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 (cfcedfe21820 erofs: avoid duplicated permission check for "trusted." xattrs) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/xattr.c | 2 -- + 1 file changed, 2 deletions(-) +Merging exfat/dev (9764d7e25a9f exfat: eliminate dead code in exfat_find()) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/dir.c | 1 - + fs/exfat/exfat_fs.h | 2 +- + fs/exfat/file.c | 2 +- + fs/exfat/namei.c | 135 +++++++++++++++++++++------------------------------- + fs/exfat/nls.c | 2 +- + 5 files changed, 57 insertions(+), 85 deletions(-) +Merging ext3/for_next (b5bc31eaba87 quota: widen timestamps for the fs_disk_quota structure) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/inode.c | 1 - + fs/quota/quota.c | 43 +++++++++++++++++++++++++++++++++++++----- + fs/reiserfs/super.c | 8 ++++---- + fs/udf/super.c | 14 +++----------- + include/uapi/linux/dqblk_xfs.h | 11 ++++++++++- + 5 files changed, 55 insertions(+), 22 deletions(-) +Merging ext4/dev (27bc446e2def ext4: limit the length of per-inode prealloc list) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (2cf1646e15fe f2fs: trace: fix typo) +$ git merge f2fs/dev +Auto-merging include/linux/fs.h +Auto-merging fs/f2fs/dir.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 3 +- + Documentation/filesystems/f2fs.rst | 82 +++++- + fs/f2fs/checkpoint.c | 7 +- + fs/f2fs/compress.c | 63 ++-- + fs/f2fs/data.c | 36 ++- + fs/f2fs/debug.c | 16 +- + fs/f2fs/dir.c | 84 +----- + fs/f2fs/extent_cache.c | 37 ++- + fs/f2fs/f2fs.h | 79 ++++-- + fs/f2fs/file.c | 50 ++-- + fs/f2fs/gc.c | 409 ++++++++++++++++++++++++-- + fs/f2fs/gc.h | 69 ++++- + fs/f2fs/node.c | 3 + + fs/f2fs/segment.c | 489 ++++++++++++++++++++++++++------ + fs/f2fs/segment.h | 66 +++-- + fs/f2fs/super.c | 98 +++++-- + fs/f2fs/sysfs.c | 21 +- + fs/libfs.c | 87 ++++++ + fs/unicode/utf8-core.c | 23 +- + include/linux/f2fs_fs.h | 3 - + include/linux/fs.h | 16 ++ + include/linux/unicode.h | 3 + + include/trace/events/f2fs.h | 10 +- + 23 files changed, 1411 insertions(+), 343 deletions(-) +Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (ddca99b70295 virtiofs: add logic to free up a memory range) +$ git merge fuse/for-next +Auto-merging drivers/dax/super.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/fuse.rst | 2 +- + MAINTAINERS | 2 +- + drivers/dax/super.c | 3 +- + drivers/virtio/virtio_mmio.c | 31 + + drivers/virtio/virtio_pci_modern.c | 95 +++ + fs/dax.c | 29 +- + fs/fuse/Kconfig | 16 +- + fs/fuse/Makefile | 6 +- + fs/fuse/dax.c | 1365 ++++++++++++++++++++++++++++++++++++ + fs/fuse/dir.c | 32 +- + fs/fuse/file.c | 50 +- + fs/fuse/fuse_i.h | 47 +- + fs/fuse/inode.c | 85 ++- + fs/fuse/virtio_fs.c | 276 +++++++- + include/linux/dax.h | 6 + + include/linux/virtio_config.h | 17 + + include/uapi/linux/fuse.h | 34 +- + include/uapi/linux/virtio_fs.h | 3 + + include/uapi/linux/virtio_mmio.h | 11 + + include/uapi/linux/virtio_pci.h | 11 +- + 20 files changed, 2037 insertions(+), 84 deletions(-) + create mode 100644 fs/fuse/dax.c +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 (3d7a9520f0c3 NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging fs/nfs/nfs4proc.c +Merge made by the 'recursive' strategy. + fs/nfs/nfs4proc.c | 7 ++++++- + net/sunrpc/xprtrdma/verbs.c | 2 ++ + 2 files changed, 8 insertions(+), 1 deletion(-) +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 (9123e3a74ec7 Linux 5.9-rc1) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/cel-next (9fe8cbb3e9ba NFSD: Correct type annotations in user xattr helpers) +$ git merge cel/cel-next +Merge made by the 'recursive' strategy. + fs/nfsd/vfs.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (8f6ee74c2786 ovl: rearrange ovl_can_list()) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 19 ++++++ + fs/overlayfs/copy_up.c | 59 ++++++++++++---- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/export.c | 2 +- + fs/overlayfs/file.c | 10 ++- + fs/overlayfs/inode.c | 32 +++++---- + fs/overlayfs/namei.c | 57 ++++++++-------- + fs/overlayfs/overlayfs.h | 89 +++++++++++++++--------- + fs/overlayfs/ovl_entry.h | 6 ++ + fs/overlayfs/readdir.c | 38 +++++++++-- + fs/overlayfs/super.c | 117 +++++++++++++++++++++++++++----- + fs/overlayfs/util.c | 96 +++++++++++++------------- + 12 files changed, 368 insertions(+), 159 deletions(-) +Merging ubifs/next (798b7347e4f2 jffs2: fix UAF problem) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory allocation) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (d0c20d38af13 xfs: fix xfs_bmap_validate_extent_raw when checking attr fork of rt files) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (d012a7190fc1 Linux 5.9-rc2) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (60263d5889e6 iomap: fall back to buffered writes for invalidation failures) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate()) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (1ad5f100e3ba locks: Remove extra "0x" in tracepoint format specifier) +$ git merge file-locks/locks-next +Merge made by the 'recursive' strategy. + include/trace/events/filelock.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging vfs/for-next (d0da22c90ead Merge branches 'fixes', 'work.misc', 'work.sparc', 'base.set_fs' and 'work.csum_and_copy', remote-tracking branch 'vfs/work.epoll' into for-next) +$ git merge vfs/for-next +Auto-merging net/ipv4/raw.c +Auto-merging net/core/skbuff.c +Auto-merging kernel/bpf/cgroup.c +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/fs.h +Auto-merging fs/namespace.c +Auto-merging arch/sparc/Kconfig +Auto-merging arch/s390/include/asm/checksum.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/checksum.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig +CONFLICT (content): Merge conflict in arch/m68k/Kconfig +Auto-merging arch/arm/Kconfig +Recorded preimage for 'arch/m68k/Kconfig' +Recorded preimage for 'arch/s390/include/asm/checksum.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/m68k/Kconfig'. +Recorded resolution for 'arch/s390/include/asm/checksum.h'. +[master 609655e2e36a] Merge remote-tracking branch 'vfs/for-next' into master +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 3 + + arch/alpha/Kconfig | 1 + + arch/alpha/include/asm/checksum.h | 5 +- + arch/alpha/lib/csum_partial_copy.c | 164 ++++++------- + arch/arc/Kconfig | 1 + + arch/arm/Kconfig | 1 + + arch/arm/include/asm/checksum.h | 17 +- + arch/arm/lib/csumpartialcopy.S | 4 +- + arch/arm/lib/csumpartialcopygeneric.S | 1 + + arch/arm/lib/csumpartialcopyuser.S | 26 +- + arch/arm64/Kconfig | 1 + + arch/c6x/Kconfig | 1 + + arch/c6x/include/asm/checksum.h | 3 + + arch/c6x/lib/csum_64plus.S | 4 +- + arch/csky/Kconfig | 1 + + arch/h8300/Kconfig | 1 + + arch/hexagon/Kconfig | 1 + + arch/hexagon/include/asm/checksum.h | 11 - + arch/hexagon/lib/checksum.c | 11 - + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/checksum.h | 3 - + arch/ia64/lib/csum_partial_copy.c | 15 -- + arch/m68k/Kconfig | 1 + + arch/m68k/include/asm/checksum.h | 7 +- + arch/m68k/lib/checksum.c | 88 ++----- + arch/microblaze/Kconfig | 1 + + arch/mips/Kconfig | 1 + + arch/mips/include/asm/checksum.h | 68 ++---- + arch/mips/lib/csum_partial.S | 261 +++++++-------------- + arch/nds32/Kconfig | 1 + + arch/nios2/Kconfig | 1 + + arch/nios2/include/asm/checksum.h | 4 - + arch/openrisc/Kconfig | 1 + + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/checksum.h | 28 --- + arch/parisc/lib/checksum.c | 17 -- + arch/powerpc/include/asm/checksum.h | 13 +- + arch/powerpc/include/asm/processor.h | 7 - + arch/powerpc/include/asm/thread_info.h | 5 +- + arch/powerpc/include/asm/uaccess.h | 67 ++---- + arch/powerpc/kernel/signal.c | 3 - + arch/powerpc/lib/checksum_32.S | 74 +++--- + arch/powerpc/lib/checksum_64.S | 37 +-- + arch/powerpc/lib/checksum_wrappers.c | 74 ++---- + arch/powerpc/lib/sstep.c | 6 +- + arch/riscv/Kconfig | 1 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/checksum.h | 7 - + arch/sh/Kconfig | 1 + + arch/sh/include/asm/checksum_32.h | 36 +-- + arch/sh/lib/checksum.S | 119 +++------- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/checksum.h | 2 + + arch/sparc/include/asm/checksum_32.h | 70 +----- + arch/sparc/include/asm/checksum_64.h | 39 +-- + arch/sparc/include/asm/processor_32.h | 6 +- + arch/sparc/include/asm/thread_info_64.h | 1 + + arch/sparc/kernel/head_32.S | 2 +- + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/process_32.c | 12 - + arch/sparc/kernel/setup_32.c | 3 - + arch/sparc/kernel/setup_64.c | 4 - + arch/sparc/kernel/unaligned_32.c | 96 +------- + arch/sparc/lib/checksum_32.S | 202 +++------------- + arch/sparc/lib/csum_copy.S | 3 +- + arch/sparc/lib/csum_copy_from_user.S | 4 +- + arch/sparc/lib/csum_copy_to_user.S | 4 +- + arch/sparc/mm/fault_32.c | 6 +- + arch/um/Kconfig | 1 + + arch/x86/ia32/ia32_aout.c | 1 - + arch/x86/include/asm/checksum.h | 1 + + arch/x86/include/asm/checksum_32.h | 40 +--- + arch/x86/include/asm/checksum_64.h | 14 +- + arch/x86/include/asm/page_32_types.h | 11 + + arch/x86/include/asm/page_64_types.h | 38 +++ + arch/x86/include/asm/processor.h | 60 +---- + arch/x86/include/asm/thread_info.h | 2 - + arch/x86/include/asm/uaccess.h | 26 +- + arch/x86/kernel/asm-offsets.c | 3 - + arch/x86/lib/checksum_32.S | 117 ++++----- + arch/x86/lib/csum-copy_64.S | 140 ++++++----- + arch/x86/lib/csum-wrappers_64.c | 86 +------ + arch/x86/lib/getuser.S | 47 ++-- + arch/x86/lib/putuser.S | 25 +- + arch/x86/um/asm/checksum.h | 16 -- + arch/x86/um/asm/checksum_32.h | 23 -- + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/checksum.h | 34 +-- + arch/xtensa/lib/checksum.S | 67 ++---- + drivers/misc/lkdtm/bugs.c | 10 - + drivers/misc/lkdtm/core.c | 2 - + drivers/misc/lkdtm/lkdtm.h | 2 - + drivers/misc/lkdtm/usercopy.c | 15 -- + drivers/net/ethernet/3com/typhoon.c | 3 +- + drivers/net/ethernet/sun/sunvnet_common.c | 2 +- + fs/namei.c | 3 +- + fs/namespace.c | 2 + + fs/proc/inode.c | 119 +++++++--- + fs/proc/proc_sysctl.c | 46 ++-- + fs/proc_namespace.c | 1 + + fs/read_write.c | 69 ++++-- + fs/splice.c | 130 ++-------- + fs/statfs.c | 2 + + include/asm-generic/checksum.h | 12 - + include/linux/bpf-cgroup.h | 2 +- + include/linux/fs.h | 2 - + include/linux/mount.h | 3 +- + include/linux/proc_fs.h | 1 + + include/linux/skbuff.h | 2 +- + include/linux/statfs.h | 1 + + include/linux/uaccess.h | 18 ++ + include/net/checksum.h | 22 +- + include/uapi/linux/mount.h | 1 + + kernel/bpf/cgroup.c | 2 +- + lib/checksum.c | 11 - + lib/iov_iter.c | 21 +- + lib/test_bitmap.c | 91 ++----- + net/core/skbuff.c | 13 +- + net/ipv4/icmp.c | 10 +- + net/ipv4/ip_output.c | 6 +- + net/ipv4/raw.c | 2 +- + net/ipv6/icmp.c | 4 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/raw.c | 2 +- + net/sunrpc/socklib.c | 2 +- + tools/testing/selftests/lkdtm/tests.txt | 2 - + tools/testing/selftests/mount/.gitignore | 1 + + tools/testing/selftests/mount/Makefile | 4 +- + tools/testing/selftests/mount/nosymfollow-test.c | 218 +++++++++++++++++ + tools/testing/selftests/mount/run_nosymfollow.sh | 4 + + .../{run_tests.sh => run_unprivileged_remount.sh} | 0 + 131 files changed, 1196 insertions(+), 2086 deletions(-) + create mode 100644 tools/testing/selftests/mount/nosymfollow-test.c + create mode 100755 tools/testing/selftests/mount/run_nosymfollow.sh + rename tools/testing/selftests/mount/{run_tests.sh => run_unprivileged_remount.sh} (100%) +$ git am -3 xxx +fatal: could not open 'xxx' for reading: No such file or directory +$ git am -3 ../patches/0001-Revert-kbuild-preprocess-module-linker-script.patch +Applying: Revert "kbuild: preprocess module linker script" +Merging printk/for-next (04cfbfe5b1b1 Merge branch 'printk-rework' into for-next) +$ git merge printk/for-next +Auto-merging init/Kconfig +Auto-merging include/linux/crash_core.h +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kdump/gdbmacros.txt | 153 ++- + Documentation/admin-guide/kdump/vmcoreinfo.rst | 131 +- + MAINTAINERS | 1 + + include/linux/crash_core.h | 3 + + init/Kconfig | 3 +- + kernel/printk/Makefile | 1 + + kernel/printk/printk.c | 954 +++++++------- + kernel/printk/printk_ringbuffer.c | 1685 ++++++++++++++++++++++++ + kernel/printk/printk_ringbuffer.h | 400 ++++++ + scripts/gdb/linux/dmesg.py | 139 +- + scripts/gdb/linux/utils.py | 7 + + 11 files changed, 2908 insertions(+), 569 deletions(-) + create mode 100644 kernel/printk/printk_ringbuffer.c + create mode 100644 kernel/printk/printk_ringbuffer.h +Merging pci/next (88f66c681780 Merge branch 'pci/pm') +$ git merge pci/next +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/p2pdma.c +Merge made by the 'recursive' strategy. + arch/x86/pci/intel_mid_pci.c | 1 + + drivers/pci/access.c | 9 ++++++--- + drivers/pci/p2pdma.c | 8 ++++---- + drivers/pci/pci-driver.c | 26 -------------------------- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.c | 5 +---- + include/linux/pci.h | 5 +---- + 7 files changed, 14 insertions(+), 42 deletions(-) +Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao) +$ git merge pstore/for-next/pstore +Auto-merging .mailmap +CONFLICT (content): Merge conflict in .mailmap +Resolved '.mailmap' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2f0827a08c96] Merge remote-tracking branch 'pstore/for-next/pstore' into master +$ git diff -M --stat --summary HEAD^.. +Merging hid/for-next (390dda244b61 Merge branch 'for-5.10/wiimote' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-apple.c | 2 ++ + drivers/hid/hid-cp2112.c | 19 ++++++++++--------- + drivers/hid/hid-wiimote-core.c | 10 ++++------ + drivers/hid/i2c-hid/i2c-hid-core.c | 12 ++++++++++++ + 4 files changed, 28 insertions(+), 15 deletions(-) +Merging i2c/i2c/for-next (4323405f424e Merge branch 'i2c/for-5.10' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/Kconfig | 1 - + drivers/i2c/busses/Kconfig | 4 +-- + drivers/i2c/busses/i2c-xiic.c | 62 ++++++++++++++++++++++++++----------------- + 3 files changed, 39 insertions(+), 28 deletions(-) +Merging i3c/i3c/next (9da36a7ec421 i3c: master add i3c_master_attach_boardinfo to preserve boardinfo) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) +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 (3f73dc9deb13 hwmon: (gsc-hwmon) add fan sensor) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/adi,adm1266.yaml | 51 ++ + .../devicetree/bindings/hwmon/sensirion,shtc1.yaml | 61 +++ + Documentation/hwmon/adm1266.rst | 37 ++ + Documentation/hwmon/drivetemp.rst | 18 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/pmbus-core.rst | 3 +- + Documentation/hwmon/pmbus.rst | 22 +- + Documentation/hwmon/sysfs-interface.rst | 70 +++ + drivers/hwmon/ad7414.c | 5 +- + drivers/hwmon/ad7418.c | 9 +- + drivers/hwmon/adc128d818.c | 5 +- + drivers/hwmon/adm1021.c | 9 +- + drivers/hwmon/adm1025.c | 5 +- + drivers/hwmon/adm1026.c | 5 +- + drivers/hwmon/adm1029.c | 5 +- + drivers/hwmon/adm1031.c | 9 +- + drivers/hwmon/adm1177.c | 5 +- + drivers/hwmon/adm9240.c | 5 +- + drivers/hwmon/ads7828.c | 9 +- + drivers/hwmon/adt7410.c | 5 +- + drivers/hwmon/adt7411.c | 5 +- + drivers/hwmon/adt7462.c | 5 +- + drivers/hwmon/adt7470.c | 5 +- + drivers/hwmon/adt7475.c | 6 +- + drivers/hwmon/amc6821.c | 5 +- + drivers/hwmon/asb100.c | 8 +- + drivers/hwmon/asc7621.c | 4 +- + drivers/hwmon/atxp1.c | 5 +- + drivers/hwmon/dme1737.c | 9 +- + drivers/hwmon/ds1621.c | 9 +- + drivers/hwmon/ds620.c | 5 +- + drivers/hwmon/emc1403.c | 8 +- + drivers/hwmon/emc2103.c | 4 +- + drivers/hwmon/emc6w201.c | 5 +- + drivers/hwmon/f75375s.c | 10 +- + drivers/hwmon/fschmd.c | 10 +- + drivers/hwmon/ftsteutates.c | 4 +- + drivers/hwmon/g760a.c | 5 +- + drivers/hwmon/g762.c | 4 +- + drivers/hwmon/gl518sm.c | 5 +- + drivers/hwmon/gl520sm.c | 5 +- + drivers/hwmon/gsc-hwmon.c | 32 +- + drivers/hwmon/hih6130.c | 5 +- + drivers/hwmon/hwmon.c | 10 + + drivers/hwmon/ina209.c | 5 +- + drivers/hwmon/ina2xx.c | 9 +- + drivers/hwmon/ina3221.c | 5 +- + drivers/hwmon/jc42.c | 4 +- + drivers/hwmon/k10temp.c | 64 +-- + drivers/hwmon/lineage-pem.c | 5 +- + drivers/hwmon/lm63.c | 9 +- + drivers/hwmon/lm73.c | 4 +- + drivers/hwmon/lm75.c | 9 +- + drivers/hwmon/lm77.c | 4 +- + drivers/hwmon/lm78.c | 9 +- + drivers/hwmon/lm80.c | 5 +- + drivers/hwmon/lm83.c | 9 +- + drivers/hwmon/lm85.c | 8 +- + drivers/hwmon/lm87.c | 4 +- + drivers/hwmon/lm90.c | 7 +- + drivers/hwmon/lm92.c | 5 +- + drivers/hwmon/lm93.c | 5 +- + drivers/hwmon/lm95234.c | 9 +- + drivers/hwmon/lm95241.c | 5 +- + drivers/hwmon/lm95245.c | 5 +- + drivers/hwmon/ltc2945.c | 5 +- + drivers/hwmon/ltc2947-i2c.c | 5 +- + drivers/hwmon/ltc2990.c | 5 +- + drivers/hwmon/ltc4151.c | 5 +- + drivers/hwmon/ltc4215.c | 5 +- + drivers/hwmon/ltc4222.c | 5 +- + drivers/hwmon/ltc4245.c | 5 +- + drivers/hwmon/ltc4260.c | 5 +- + drivers/hwmon/ltc4261.c | 5 +- + drivers/hwmon/max16065.c | 8 +- + drivers/hwmon/max1619.c | 5 +- + drivers/hwmon/max1668.c | 9 +- + drivers/hwmon/max31730.c | 4 +- + drivers/hwmon/max31790.c | 5 +- + drivers/hwmon/max6621.c | 5 +- + drivers/hwmon/max6639.c | 5 +- + drivers/hwmon/max6642.c | 5 +- + drivers/hwmon/max6650.c | 10 +- + drivers/hwmon/max6697.c | 9 +- + drivers/hwmon/mcp3021.c | 9 +- + drivers/hwmon/nct7802.c | 5 +- + drivers/hwmon/nct7904.c | 5 +- + drivers/hwmon/occ/p8_i2c.c | 5 +- + drivers/hwmon/pcf8591.c | 5 +- + drivers/hwmon/pmbus/Kconfig | 11 + + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/adm1266.c | 513 +++++++++++++++++++++ + drivers/hwmon/pmbus/adm1275.c | 11 +- + drivers/hwmon/pmbus/bel-pfe.c | 11 +- + drivers/hwmon/pmbus/ibm-cffps.c | 19 +- + drivers/hwmon/pmbus/inspur-ipsps.c | 7 +- + drivers/hwmon/pmbus/ir35221.c | 7 +- + drivers/hwmon/pmbus/ir38064.c | 7 +- + drivers/hwmon/pmbus/irps5401.c | 7 +- + drivers/hwmon/pmbus/isl68137.c | 11 +- + drivers/hwmon/pmbus/lm25066.c | 11 +- + drivers/hwmon/pmbus/ltc2978.c | 14 +- + drivers/hwmon/pmbus/ltc3815.c | 7 +- + drivers/hwmon/pmbus/max16064.c | 7 +- + drivers/hwmon/pmbus/max16601.c | 7 +- + drivers/hwmon/pmbus/max20730.c | 11 +- + drivers/hwmon/pmbus/max20751.c | 7 +- + drivers/hwmon/pmbus/max31785.c | 9 +- + drivers/hwmon/pmbus/max34440.c | 13 +- + drivers/hwmon/pmbus/max8688.c | 7 +- + drivers/hwmon/pmbus/pmbus.c | 11 +- + drivers/hwmon/pmbus/pmbus.h | 16 +- + drivers/hwmon/pmbus/pmbus_core.c | 52 ++- + drivers/hwmon/pmbus/pxe1610.c | 7 +- + drivers/hwmon/pmbus/tps40422.c | 7 +- + drivers/hwmon/pmbus/tps53679.c | 11 +- + drivers/hwmon/pmbus/ucd9000.c | 13 +- + drivers/hwmon/pmbus/ucd9200.c | 13 +- + drivers/hwmon/pmbus/xdpe12284.c | 7 +- + drivers/hwmon/pmbus/zl6100.c | 11 +- + drivers/hwmon/powr1220.c | 5 +- + drivers/hwmon/pwm-fan.c | 10 +- + drivers/hwmon/scmi-hwmon.c | 6 +- + drivers/hwmon/sht21.c | 5 +- + drivers/hwmon/sht3x.c | 9 +- + drivers/hwmon/shtc1.c | 34 +- + drivers/hwmon/smm665.c | 9 +- + drivers/hwmon/smsc47m192.c | 5 +- + drivers/hwmon/stts751.c | 5 +- + drivers/hwmon/tc654.c | 5 +- + drivers/hwmon/tc74.c | 5 +- + drivers/hwmon/thmc50.c | 9 +- + drivers/hwmon/tmp102.c | 5 +- + drivers/hwmon/tmp103.c | 5 +- + drivers/hwmon/tmp108.c | 5 +- + drivers/hwmon/tmp401.c | 7 +- + drivers/hwmon/tmp421.c | 7 +- + drivers/hwmon/tmp513.c | 9 +- + drivers/hwmon/w83773g.c | 5 +- + drivers/hwmon/w83781d.c | 9 +- + drivers/hwmon/w83791d.c | 8 +- + drivers/hwmon/w83792d.c | 7 +- + drivers/hwmon/w83793.c | 8 +- + drivers/hwmon/w83795.c | 9 +- + drivers/hwmon/w83l785ts.c | 8 +- + drivers/hwmon/w83l786ng.c | 4 +- + include/linux/hwmon.h | 20 + + include/linux/platform_data/gsc_hwmon.h | 1 + + 148 files changed, 1380 insertions(+), 530 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,adm1266.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/sensirion,shtc1.yaml + create mode 100644 Documentation/hwmon/adm1266.rst + create mode 100644 drivers/hwmon/pmbus/adm1266.c +Merging jc_docs/docs-next (9f364b605f34 submitting-patches.rst: presume git will be used) +$ git merge jc_docs/docs-next +Auto-merging Documentation/kbuild/llvm.rst +Removing Documentation/ia64/xen.rst +Merge made by the 'recursive' strategy. + Documentation/doc-guide/kernel-doc.rst | 33 +-- + Documentation/ia64/index.rst | 1 - + Documentation/ia64/xen.rst | 206 ---------------- + Documentation/kbuild/llvm.rst | 4 + + Documentation/maintainer/index.rst | 1 + + Documentation/maintainer/modifying-patches.rst | 50 ++++ + Documentation/memory-barriers.txt | 8 +- + Documentation/process/2.Process.rst | 2 +- + Documentation/process/changes.rst | 15 ++ + Documentation/process/deprecated.rst | 18 -- + Documentation/process/email-clients.rst | 5 + + Documentation/process/submitting-drivers.rst | 9 +- + Documentation/process/submitting-patches.rst | 260 ++++----------------- + Documentation/sphinx/automarkup.py | 37 +-- + Documentation/translations/ko_KR/howto.rst | 9 +- + .../translations/ko_KR/memory-barriers.txt | 32 ++- + 16 files changed, 202 insertions(+), 488 deletions(-) + delete mode 100644 Documentation/ia64/xen.rst + create mode 100644 Documentation/maintainer/modifying-patches.rst +Merging v4l-dvb/master (d13ee586e026 Merge tag 'v5.9-rc4' into patchwork) +$ git merge v4l-dvb/master +Auto-merging drivers/staging/media/sunxi/cedrus/cedrus.c +Removing drivers/staging/media/atomisp/pci/isp2401_system_global.h +Removing drivers/staging/media/atomisp/pci/isp2400_system_global.h +Removing drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_dma.h +Removing drivers/staging/media/atomisp/pci/hive_isp_css_include/ibuf_ctrl.h +Removing drivers/staging/media/atomisp/pci/hive_isp_css_include/host/ibuf_ctrl_public.h +Removing drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma_local.h +Removing drivers/staging/media/atomisp/pci/css_2401_system/host/ibuf_ctrl_private.h +Removing drivers/staging/media/atomisp/i2c/ov5693/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/i2c/ov5647.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/media/ipu3.rst | 104 +-- + .../display/tegra/nvidia,tegra20-host1x.txt | 92 +- + .../devicetree/bindings/media/i2c/ov5647.txt | 35 - + .../devicetree/bindings/media/i2c/ov5647.yaml | 88 ++ + .../bindings/media/mediatek-jpeg-encoder.txt | 35 + + .../devicetree/bindings/media/samsung-fimc.txt | 6 +- + Documentation/driver-api/media/camera-sensor.rst | 134 +++ + Documentation/driver-api/media/csi2.rst | 2 + + Documentation/driver-api/media/index.rst | 1 + + Documentation/userspace-api/media/cec/cec-api.rst | 10 +- + .../userspace-api/media/cec/cec-func-close.rst | 9 +- + .../userspace-api/media/cec/cec-func-ioctl.rst | 9 +- + .../userspace-api/media/cec/cec-func-open.rst | 9 +- + .../userspace-api/media/cec/cec-func-poll.rst | 9 +- + .../userspace-api/media/cec/cec-funcs.rst | 9 +- + .../userspace-api/media/cec/cec-header.rst | 9 +- + .../userspace-api/media/cec/cec-intro.rst | 9 +- + .../media/cec/cec-ioc-adap-g-caps.rst | 9 +- + .../media/cec/cec-ioc-adap-g-log-addrs.rst | 9 +- + .../media/cec/cec-ioc-adap-g-phys-addr.rst | 9 +- + .../userspace-api/media/cec/cec-ioc-dqevent.rst | 9 +- + .../userspace-api/media/cec/cec-ioc-g-mode.rst | 9 +- + .../userspace-api/media/cec/cec-ioc-receive.rst | 9 +- + .../userspace-api/media/cec/cec-pin-error-inj.rst | 9 +- + .../media/dvb/audio-bilingual-channel-select.rst | 9 +- + .../media/dvb/audio-channel-select.rst | 9 +- + .../userspace-api/media/dvb/audio-clear-buffer.rst | 9 +- + .../userspace-api/media/dvb/audio-continue.rst | 9 +- + .../userspace-api/media/dvb/audio-fclose.rst | 9 +- + .../userspace-api/media/dvb/audio-fopen.rst | 9 +- + .../userspace-api/media/dvb/audio-fwrite.rst | 9 +- + .../media/dvb/audio-get-capabilities.rst | 9 +- + .../userspace-api/media/dvb/audio-get-status.rst | 9 +- + .../userspace-api/media/dvb/audio-pause.rst | 9 +- + .../userspace-api/media/dvb/audio-play.rst | 9 +- + .../media/dvb/audio-select-source.rst | 9 +- + .../userspace-api/media/dvb/audio-set-av-sync.rst | 9 +- + .../media/dvb/audio-set-bypass-mode.rst | 9 +- + .../userspace-api/media/dvb/audio-set-id.rst | 9 +- + .../userspace-api/media/dvb/audio-set-mixer.rst | 9 +- + .../userspace-api/media/dvb/audio-set-mute.rst | 9 +- + .../media/dvb/audio-set-streamtype.rst | 9 +- + .../userspace-api/media/dvb/audio-stop.rst | 9 +- + Documentation/userspace-api/media/dvb/audio.rst | 9 +- + .../userspace-api/media/dvb/audio_data_types.rst | 9 +- + .../media/dvb/audio_function_calls.rst | 9 +- + .../userspace-api/media/dvb/ca-fclose.rst | 9 +- + Documentation/userspace-api/media/dvb/ca-fopen.rst | 9 +- + .../userspace-api/media/dvb/ca-get-cap.rst | 9 +- + .../userspace-api/media/dvb/ca-get-descr-info.rst | 9 +- + .../userspace-api/media/dvb/ca-get-msg.rst | 9 +- + .../userspace-api/media/dvb/ca-get-slot-info.rst | 9 +- + Documentation/userspace-api/media/dvb/ca-reset.rst | 9 +- + .../userspace-api/media/dvb/ca-send-msg.rst | 9 +- + .../userspace-api/media/dvb/ca-set-descr.rst | 9 +- + Documentation/userspace-api/media/dvb/ca.rst | 9 +- + .../userspace-api/media/dvb/ca_data_types.rst | 9 +- + .../userspace-api/media/dvb/ca_function_calls.rst | 9 +- + Documentation/userspace-api/media/dvb/demux.rst | 9 +- + .../userspace-api/media/dvb/dmx-add-pid.rst | 9 +- + .../userspace-api/media/dvb/dmx-expbuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-fclose.rst | 9 +- + .../userspace-api/media/dvb/dmx-fopen.rst | 9 +- + .../userspace-api/media/dvb/dmx-fread.rst | 9 +- + .../userspace-api/media/dvb/dmx-fwrite.rst | 9 +- + .../userspace-api/media/dvb/dmx-get-pes-pids.rst | 9 +- + .../userspace-api/media/dvb/dmx-get-stc.rst | 9 +- + Documentation/userspace-api/media/dvb/dmx-mmap.rst | 9 +- + .../userspace-api/media/dvb/dmx-munmap.rst | 9 +- + Documentation/userspace-api/media/dvb/dmx-qbuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-querybuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-remove-pid.rst | 9 +- + .../userspace-api/media/dvb/dmx-reqbufs.rst | 9 +- + .../media/dvb/dmx-set-buffer-size.rst | 9 +- + .../userspace-api/media/dvb/dmx-set-filter.rst | 9 +- + .../userspace-api/media/dvb/dmx-set-pes-filter.rst | 9 +- + .../userspace-api/media/dvb/dmx-start.rst | 9 +- + Documentation/userspace-api/media/dvb/dmx-stop.rst | 9 +- + .../userspace-api/media/dvb/dmx_fcalls.rst | 9 +- + .../userspace-api/media/dvb/dmx_types.rst | 9 +- + .../userspace-api/media/dvb/dvb-fe-read-status.rst | 9 +- + .../userspace-api/media/dvb/dvb-frontend-event.rst | 9 +- + .../media/dvb/dvb-frontend-parameters.rst | 9 +- + Documentation/userspace-api/media/dvb/dvbapi.rst | 10 +- + .../userspace-api/media/dvb/dvbproperty.rst | 9 +- + Documentation/userspace-api/media/dvb/dvbstb.svg | 28 +- + Documentation/userspace-api/media/dvb/examples.rst | 9 +- + .../userspace-api/media/dvb/fe-bandwidth-t.rst | 9 +- + .../media/dvb/fe-diseqc-recv-slave-reply.rst | 9 +- + .../media/dvb/fe-diseqc-reset-overload.rst | 9 +- + .../media/dvb/fe-diseqc-send-burst.rst | 9 +- + .../media/dvb/fe-diseqc-send-master-cmd.rst | 9 +- + .../media/dvb/fe-dishnetwork-send-legacy-cmd.rst | 9 +- + .../media/dvb/fe-enable-high-lnb-voltage.rst | 9 +- + .../userspace-api/media/dvb/fe-get-event.rst | 9 +- + .../userspace-api/media/dvb/fe-get-frontend.rst | 9 +- + .../userspace-api/media/dvb/fe-get-info.rst | 9 +- + .../userspace-api/media/dvb/fe-get-property.rst | 9 +- + .../userspace-api/media/dvb/fe-read-ber.rst | 9 +- + .../media/dvb/fe-read-signal-strength.rst | 9 +- + .../userspace-api/media/dvb/fe-read-snr.rst | 9 +- + .../userspace-api/media/dvb/fe-read-status.rst | 9 +- + .../media/dvb/fe-read-uncorrected-blocks.rst | 9 +- + .../media/dvb/fe-set-frontend-tune-mode.rst | 9 +- + .../userspace-api/media/dvb/fe-set-frontend.rst | 9 +- + .../userspace-api/media/dvb/fe-set-tone.rst | 9 +- + .../userspace-api/media/dvb/fe-set-voltage.rst | 9 +- + .../userspace-api/media/dvb/fe-type-t.rst | 9 +- + .../media/dvb/fe_property_parameters.rst | 9 +- + .../userspace-api/media/dvb/frontend-header.rst | 9 +- + .../media/dvb/frontend-property-cable-systems.rst | 9 +- + .../dvb/frontend-property-satellite-systems.rst | 9 +- + .../dvb/frontend-property-terrestrial-systems.rst | 9 +- + .../media/dvb/frontend-stat-properties.rst | 9 +- + Documentation/userspace-api/media/dvb/frontend.rst | 9 +- + .../userspace-api/media/dvb/frontend_f_close.rst | 9 +- + .../userspace-api/media/dvb/frontend_f_open.rst | 9 +- + .../userspace-api/media/dvb/frontend_fcalls.rst | 9 +- + .../media/dvb/frontend_legacy_api.rst | 9 +- + .../media/dvb/frontend_legacy_dvbv3_api.rst | 9 +- + Documentation/userspace-api/media/dvb/headers.rst | 9 +- + Documentation/userspace-api/media/dvb/intro.rst | 9 +- + .../userspace-api/media/dvb/legacy_dvb_apis.rst | 9 +- + .../userspace-api/media/dvb/net-add-if.rst | 9 +- + .../userspace-api/media/dvb/net-get-if.rst | 9 +- + .../userspace-api/media/dvb/net-remove-if.rst | 9 +- + .../userspace-api/media/dvb/net-types.rst | 9 +- + Documentation/userspace-api/media/dvb/net.rst | 9 +- + .../media/dvb/query-dvb-frontend-info.rst | 9 +- + .../userspace-api/media/dvb/video-clear-buffer.rst | 9 +- + .../userspace-api/media/dvb/video-command.rst | 9 +- + .../userspace-api/media/dvb/video-continue.rst | 9 +- + .../userspace-api/media/dvb/video-fast-forward.rst | 9 +- + .../userspace-api/media/dvb/video-fclose.rst | 9 +- + .../userspace-api/media/dvb/video-fopen.rst | 9 +- + .../userspace-api/media/dvb/video-freeze.rst | 9 +- + .../userspace-api/media/dvb/video-fwrite.rst | 9 +- + .../media/dvb/video-get-capabilities.rst | 9 +- + .../userspace-api/media/dvb/video-get-event.rst | 9 +- + .../media/dvb/video-get-frame-count.rst | 9 +- + .../userspace-api/media/dvb/video-get-pts.rst | 9 +- + .../userspace-api/media/dvb/video-get-size.rst | 9 +- + .../userspace-api/media/dvb/video-get-status.rst | 9 +- + .../userspace-api/media/dvb/video-play.rst | 9 +- + .../media/dvb/video-select-source.rst | 9 +- + .../userspace-api/media/dvb/video-set-blank.rst | 9 +- + .../media/dvb/video-set-display-format.rst | 9 +- + .../userspace-api/media/dvb/video-set-format.rst | 9 +- + .../media/dvb/video-set-streamtype.rst | 9 +- + .../userspace-api/media/dvb/video-slowmotion.rst | 9 +- + .../userspace-api/media/dvb/video-stillpicture.rst | 9 +- + .../userspace-api/media/dvb/video-stop.rst | 9 +- + .../userspace-api/media/dvb/video-try-command.rst | 9 +- + Documentation/userspace-api/media/dvb/video.rst | 9 +- + .../media/dvb/video_function_calls.rst | 9 +- + .../userspace-api/media/dvb/video_types.rst | 9 +- + Documentation/userspace-api/media/fdl-appendix.rst | 9 +- + Documentation/userspace-api/media/gen-errors.rst | 9 +- + Documentation/userspace-api/media/glossary.rst | 205 +++++ + Documentation/userspace-api/media/index.rst | 3 + + .../media/mediactl/media-controller-intro.rst | 9 +- + .../media/mediactl/media-controller-model.rst | 9 +- + .../media/mediactl/media-controller.rst | 10 +- + .../media/mediactl/media-func-close.rst | 9 +- + .../media/mediactl/media-func-ioctl.rst | 9 +- + .../media/mediactl/media-func-open.rst | 9 +- + .../userspace-api/media/mediactl/media-funcs.rst | 9 +- + .../userspace-api/media/mediactl/media-header.rst | 9 +- + .../media/mediactl/media-ioc-device-info.rst | 9 +- + .../media/mediactl/media-ioc-enum-entities.rst | 9 +- + .../media/mediactl/media-ioc-enum-links.rst | 9 +- + .../media/mediactl/media-ioc-g-topology.rst | 9 +- + .../media/mediactl/media-ioc-request-alloc.rst | 26 +- + .../media/mediactl/media-ioc-setup-link.rst | 9 +- + .../media/mediactl/media-request-ioc-queue.rst | 26 +- + .../media/mediactl/media-request-ioc-reinit.rst | 26 +- + .../userspace-api/media/mediactl/media-types.rst | 9 +- + .../userspace-api/media/mediactl/request-api.rst | 26 +- + .../media/mediactl/request-func-close.rst | 26 +- + .../media/mediactl/request-func-ioctl.rst | 26 +- + .../media/mediactl/request-func-poll.rst | 26 +- + .../userspace-api/media/rc/keytable.c.rst | 9 +- + .../userspace-api/media/rc/lirc-dev-intro.rst | 9 +- + Documentation/userspace-api/media/rc/lirc-dev.rst | 9 +- + Documentation/userspace-api/media/rc/lirc-func.rst | 9 +- + .../userspace-api/media/rc/lirc-get-features.rst | 9 +- + .../userspace-api/media/rc/lirc-get-rec-mode.rst | 9 +- + .../media/rc/lirc-get-rec-resolution.rst | 9 +- + .../userspace-api/media/rc/lirc-get-send-mode.rst | 9 +- + .../userspace-api/media/rc/lirc-get-timeout.rst | 9 +- + .../userspace-api/media/rc/lirc-header.rst | 9 +- + Documentation/userspace-api/media/rc/lirc-read.rst | 9 +- + .../media/rc/lirc-set-measure-carrier-mode.rst | 9 +- + .../media/rc/lirc-set-rec-carrier-range.rst | 9 +- + .../media/rc/lirc-set-rec-carrier.rst | 9 +- + .../media/rc/lirc-set-rec-timeout-reports.rst | 9 +- + .../media/rc/lirc-set-rec-timeout.rst | 9 +- + .../media/rc/lirc-set-send-carrier.rst | 9 +- + .../media/rc/lirc-set-send-duty-cycle.rst | 9 +- + .../media/rc/lirc-set-transmitter-mask.rst | 9 +- + .../media/rc/lirc-set-wideband-receiver.rst | 9 +- + .../userspace-api/media/rc/lirc-write.rst | 9 +- + Documentation/userspace-api/media/rc/rc-intro.rst | 9 +- + Documentation/userspace-api/media/rc/rc-protos.rst | 4 +- + .../userspace-api/media/rc/rc-sysfs-nodes.rst | 9 +- + .../userspace-api/media/rc/rc-table-change.rst | 9 +- + Documentation/userspace-api/media/rc/rc-tables.rst | 9 +- + .../userspace-api/media/rc/remote_controllers.rst | 10 +- + .../userspace-api/media/typical_media_device.svg | 11 +- + Documentation/userspace-api/media/v4l/app-pri.rst | 9 +- + Documentation/userspace-api/media/v4l/async.rst | 9 +- + Documentation/userspace-api/media/v4l/audio.rst | 9 +- + Documentation/userspace-api/media/v4l/bayer.svg | 28 +- + Documentation/userspace-api/media/v4l/biblio.rst | 9 +- + Documentation/userspace-api/media/v4l/buffer.rst | 9 +- + .../userspace-api/media/v4l/capture-example.rst | 9 +- + .../userspace-api/media/v4l/capture.c.rst | 9 +- + .../userspace-api/media/v4l/colorspaces-defs.rst | 18 +- + .../media/v4l/colorspaces-details.rst | 14 +- + .../userspace-api/media/v4l/colorspaces.rst | 9 +- + .../userspace-api/media/v4l/common-defs.rst | 9 +- + Documentation/userspace-api/media/v4l/common.rst | 9 +- + Documentation/userspace-api/media/v4l/compat.rst | 9 +- + .../userspace-api/media/v4l/constraints.svg | 28 +- + Documentation/userspace-api/media/v4l/control.rst | 9 +- + Documentation/userspace-api/media/v4l/crop.rst | 9 +- + Documentation/userspace-api/media/v4l/crop.svg | 11 +- + .../userspace-api/media/v4l/depth-formats.rst | 9 +- + .../userspace-api/media/v4l/dev-capture.rst | 9 +- + .../userspace-api/media/v4l/dev-encoder.rst | 26 +- + .../userspace-api/media/v4l/dev-event.rst | 9 +- + .../userspace-api/media/v4l/dev-mem2mem.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-meta.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-osd.rst | 9 +- + .../userspace-api/media/v4l/dev-output.rst | 9 +- + .../userspace-api/media/v4l/dev-overlay.rst | 9 +- + .../userspace-api/media/v4l/dev-radio.rst | 9 +- + .../userspace-api/media/v4l/dev-raw-vbi.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-rds.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 9 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 11 +- + .../userspace-api/media/v4l/dev-subdev.rst | 9 +- + .../userspace-api/media/v4l/dev-touch.rst | 9 +- + Documentation/userspace-api/media/v4l/devices.rst | 9 +- + Documentation/userspace-api/media/v4l/diff-v4l.rst | 9 +- + Documentation/userspace-api/media/v4l/dmabuf.rst | 9 +- + .../userspace-api/media/v4l/dv-timings.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 295 ++++--- + .../userspace-api/media/v4l/ext-ctrls-detect.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-dv.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-flash.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-fm-rx.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-fm-tx.rst | 9 +- + .../media/v4l/ext-ctrls-image-process.rst | 9 +- + .../media/v4l/ext-ctrls-image-source.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-jpeg.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-rf-tuner.rst | 9 +- + .../userspace-api/media/v4l/extended-controls.rst | 9 +- + .../userspace-api/media/v4l/field-order.rst | 9 +- + .../userspace-api/media/v4l/fieldseq_bt.svg | 11 +- + .../userspace-api/media/v4l/fieldseq_tb.svg | 11 +- + Documentation/userspace-api/media/v4l/format.rst | 9 +- + .../userspace-api/media/v4l/func-close.rst | 9 +- + .../userspace-api/media/v4l/func-ioctl.rst | 9 +- + .../userspace-api/media/v4l/func-mmap.rst | 9 +- + .../userspace-api/media/v4l/func-munmap.rst | 9 +- + .../userspace-api/media/v4l/func-open.rst | 9 +- + .../userspace-api/media/v4l/func-poll.rst | 9 +- + .../userspace-api/media/v4l/func-read.rst | 9 +- + .../userspace-api/media/v4l/func-select.rst | 9 +- + .../userspace-api/media/v4l/func-write.rst | 9 +- + .../userspace-api/media/v4l/hist-v4l2.rst | 9 +- + .../userspace-api/media/v4l/hsv-formats.rst | 9 +- + Documentation/userspace-api/media/v4l/io.rst | 9 +- + .../media/v4l/libv4l-introduction.rst | 9 +- + Documentation/userspace-api/media/v4l/libv4l.rst | 9 +- + .../userspace-api/media/v4l/meta-formats.rst | 9 +- + Documentation/userspace-api/media/v4l/mmap.rst | 9 +- + Documentation/userspace-api/media/v4l/nv12mt.svg | 28 +- + .../userspace-api/media/v4l/nv12mt_example.svg | 28 +- + Documentation/userspace-api/media/v4l/open.rst | 120 ++- + .../userspace-api/media/v4l/pixfmt-bayer.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-compressed.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-grey.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-indexed.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-intro.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-inzi.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-m420.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-meta-d4xx.rst | 9 +- + .../media/v4l/pixfmt-meta-intel-ipu3.rst | 25 +- + .../userspace-api/media/v4l/pixfmt-meta-uvc.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-meta-vivid.rst | 26 +- + .../media/v4l/pixfmt-meta-vsp1-hgo.rst | 9 +- + .../media/v4l/pixfmt-meta-vsp1-hgt.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv12.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv12m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv12mt.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv16m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv24.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-packed-hsv.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-packed-yuv.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-reserved.rst | 26 +- + .../userspace-api/media/v4l/pixfmt-rgb.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cs08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cs14le.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cu08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cu16le.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-pcu16be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-pcu18be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-pcu20be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-ru12le.rst | 9 +- + .../media/v4l/pixfmt-srggb10-ipu3.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb10.rst | 9 +- + .../media/v4l/pixfmt-srggb10alaw8.rst | 9 +- + .../media/v4l/pixfmt-srggb10dpcm8.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb10p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb12.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb12p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb14.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb8.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-td08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-td16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-tu08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-tu16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-uv8.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-uyvy.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-v4l2-mplane.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-v4l2.rst | 26 +- + .../userspace-api/media/v4l/pixfmt-vyuy.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y10.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y10b.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y10p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y12.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y12i.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y14.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y16-be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y41p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y8i.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv410.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv411p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv420.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv420m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv422m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv422p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv444m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuyv.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yvyu.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-z16.rst | 9 +- + Documentation/userspace-api/media/v4l/pixfmt.rst | 9 +- + .../userspace-api/media/v4l/planar-apis.rst | 9 +- + Documentation/userspace-api/media/v4l/querycap.rst | 9 +- + Documentation/userspace-api/media/v4l/rw.rst | 9 +- + .../userspace-api/media/v4l/sdr-formats.rst | 9 +- + .../media/v4l/selection-api-configuration.rst | 9 +- + .../media/v4l/selection-api-examples.rst | 9 +- + .../media/v4l/selection-api-intro.rst | 9 +- + .../media/v4l/selection-api-targets.rst | 9 +- + .../media/v4l/selection-api-vs-crop-api.rst | 9 +- + .../userspace-api/media/v4l/selection-api.rst | 9 +- + .../userspace-api/media/v4l/selection.svg | 28 +- + .../userspace-api/media/v4l/selections-common.rst | 9 +- + Documentation/userspace-api/media/v4l/standard.rst | 9 +- + .../userspace-api/media/v4l/streaming-par.rst | 9 +- + .../userspace-api/media/v4l/subdev-formats.rst | 9 +- + .../media/v4l/subdev-image-processing-crop.svg | 11 +- + .../media/v4l/subdev-image-processing-full.svg | 11 +- + ...ubdev-image-processing-scaling-multi-source.svg | 11 +- + .../userspace-api/media/v4l/tch-formats.rst | 9 +- + Documentation/userspace-api/media/v4l/tuner.rst | 9 +- + .../userspace-api/media/v4l/user-func.rst | 9 +- + Documentation/userspace-api/media/v4l/userp.rst | 9 +- + .../media/v4l/v4l2-selection-flags.rst | 9 +- + .../media/v4l/v4l2-selection-targets.rst | 9 +- + Documentation/userspace-api/media/v4l/v4l2.rst | 11 +- + .../userspace-api/media/v4l/v4l2grab-example.rst | 9 +- + .../userspace-api/media/v4l/v4l2grab.c.rst | 9 +- + Documentation/userspace-api/media/v4l/vbi_525.svg | 11 +- + Documentation/userspace-api/media/v4l/vbi_625.svg | 11 +- + .../userspace-api/media/v4l/vbi_hsync.svg | 11 +- + Documentation/userspace-api/media/v4l/video.rst | 9 +- + Documentation/userspace-api/media/v4l/videodev.rst | 9 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 9 +- + .../userspace-api/media/v4l/vidioc-cropcap.rst | 9 +- + .../media/v4l/vidioc-dbg-g-chip-info.rst | 9 +- + .../media/v4l/vidioc-dbg-g-register.rst | 9 +- + .../userspace-api/media/v4l/vidioc-decoder-cmd.rst | 9 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 9 +- + .../media/v4l/vidioc-dv-timings-cap.rst | 9 +- + .../userspace-api/media/v4l/vidioc-encoder-cmd.rst | 9 +- + .../media/v4l/vidioc-enum-dv-timings.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 9 +- + .../media/v4l/vidioc-enum-frameintervals.rst | 9 +- + .../media/v4l/vidioc-enum-framesizes.rst | 9 +- + .../media/v4l/vidioc-enum-freq-bands.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enumaudio.rst | 9 +- + .../media/v4l/vidioc-enumaudioout.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enuminput.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enumoutput.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enumstd.rst | 9 +- + .../userspace-api/media/v4l/vidioc-expbuf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-audio.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-audioout.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-crop.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 9 +- + .../media/v4l/vidioc-g-dv-timings.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-edid.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-enc-index.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-fbuf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-fmt.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-frequency.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-input.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-jpegcomp.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-modulator.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-output.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-parm.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-priority.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-selection.rst | 9 +- + .../media/v4l/vidioc-g-sliced-vbi-cap.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-std.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-tuner.rst | 9 +- + .../userspace-api/media/v4l/vidioc-log-status.rst | 9 +- + .../userspace-api/media/v4l/vidioc-overlay.rst | 9 +- + .../userspace-api/media/v4l/vidioc-prepare-buf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-qbuf.rst | 9 +- + .../media/v4l/vidioc-query-dv-timings.rst | 9 +- + .../userspace-api/media/v4l/vidioc-querybuf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-querycap.rst | 9 +- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 9 +- + .../userspace-api/media/v4l/vidioc-querystd.rst | 9 +- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 9 +- + .../media/v4l/vidioc-s-hw-freq-seek.rst | 9 +- + .../userspace-api/media/v4l/vidioc-streamon.rst | 9 +- + .../v4l/vidioc-subdev-enum-frame-interval.rst | 9 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 9 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 9 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 9 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 9 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 9 +- + .../media/v4l/vidioc-subdev-g-selection.rst | 9 +- + .../media/v4l/vidioc-subdev-querycap.rst | 9 +- + .../media/v4l/vidioc-subscribe-event.rst | 9 +- + .../userspace-api/media/v4l/yuv-formats.rst | 9 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 2 +- + MAINTAINERS | 18 +- + drivers/gpu/drm/tegra/dsi.c | 4 +- + drivers/gpu/host1x/mipi.c | 22 +- + drivers/hid/hid-picolcd_cir.c | 10 +- + drivers/media/cec/core/cec-adap.c | 2 +- + drivers/media/cec/core/cec-core.c | 29 +- + drivers/media/cec/core/cec-pin.c | 6 +- + drivers/media/cec/platform/seco/seco-cec.c | 2 +- + drivers/media/cec/usb/pulse8/pulse8-cec.c | 2 +- + drivers/media/common/siano/smsir.c | 4 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 53 +- + drivers/media/dvb-frontends/af9013.c | 2 +- + drivers/media/dvb-frontends/lg2160.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/mb86a16.c | 7 +- + drivers/media/dvb-frontends/mxl5xx.c | 1 - + drivers/media/dvb-frontends/tda10021.c | 40 +- + drivers/media/dvb-frontends/tda10086.c | 22 +- + drivers/media/i2c/Kconfig | 2 +- + drivers/media/i2c/adv7180.c | 9 +- + drivers/media/i2c/adv748x/adv748x-core.c | 31 +- + drivers/media/i2c/adv748x/adv748x-csi2.c | 31 + + drivers/media/i2c/adv748x/adv748x.h | 1 + + drivers/media/i2c/adv7511-v4l2.c | 4 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/i2c/imx219.c | 2 +- + drivers/media/i2c/imx274.c | 8 +- + drivers/media/i2c/m5mols/m5mols_core.c | 3 +- + drivers/media/i2c/max9286.c | 3 +- + drivers/media/i2c/ml86v7667.c | 7 +- + drivers/media/i2c/msp3400-kthreads.c | 2 +- + drivers/media/i2c/mt9m001.c | 7 +- + drivers/media/i2c/mt9m111.c | 7 +- + drivers/media/i2c/ov2740.c | 24 +- + drivers/media/i2c/ov5640.c | 4 +- + drivers/media/i2c/ov5675.c | 15 +- + drivers/media/i2c/ov6650.c | 57 +- + drivers/media/i2c/ov7740.c | 10 +- + drivers/media/i2c/ov9640.c | 9 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 2 +- + drivers/media/i2c/smiapp/smiapp-core.c | 6 +- + drivers/media/i2c/tc358743.c | 7 +- + drivers/media/i2c/tda1997x.c | 16 +- + drivers/media/i2c/tvp5150.c | 9 +- + drivers/media/mc/mc-device.c | 7 +- + drivers/media/pci/bt8xx/bttv-driver.c | 2 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 7 +- + drivers/media/pci/cobalt/cobalt-i2c.c | 8 +- + drivers/media/pci/cobalt/cobalt-omnitek.c | 2 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 7 +- + drivers/media/pci/cx23885/cx23885-video.c | 2 +- + drivers/media/pci/cx23885/cx23885.h | 4 +- + drivers/media/pci/cx23885/cx23888-ir.c | 2 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 11 +- + drivers/media/pci/cx88/cx88-alsa.c | 13 +- + drivers/media/pci/cx88/cx88-cards.c | 2 +- + drivers/media/pci/cx88/cx88-input.c | 4 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/dt3155/dt3155.c | 3 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 9 +- + drivers/media/pci/mantis/mantis_dma.c | 4 +- + drivers/media/pci/mantis/mantis_dma.h | 2 +- + drivers/media/pci/mantis/mantis_dvb.c | 2 +- + drivers/media/pci/ngene/ngene-core.c | 12 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 7 +- + drivers/media/pci/saa7134/saa7134-cards.c | 4 +- + drivers/media/pci/saa7134/saa7134-core.c | 20 +- + drivers/media/pci/saa7134/saa7134-empress.c | 3 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 2 +- + drivers/media/pci/saa7134/saa7134-tvaudio.c | 3 +- + drivers/media/pci/saa7134/saa7134-video.c | 2 - + drivers/media/pci/saa7134/saa7134.h | 2 +- + drivers/media/pci/saa7164/saa7164-buffer.c | 8 +- + drivers/media/pci/saa7164/saa7164-core.c | 12 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 7 +- + drivers/media/pci/saa7164/saa7164-vbi.c | 6 +- + drivers/media/pci/smipcie/smipcie-ir.c | 7 +- + drivers/media/pci/smipcie/smipcie-main.c | 6 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-i2c.c | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 6 +- + drivers/media/pci/ttpci/av7110.c | 20 +- + drivers/media/pci/ttpci/av7110_v4l.c | 4 +- + drivers/media/pci/ttpci/budget-ci.c | 15 +- + drivers/media/pci/ttpci/budget-core.c | 6 +- + drivers/media/pci/tw5864/tw5864-video.c | 19 +- + drivers/media/platform/Kconfig | 4 +- + drivers/media/platform/aspeed-video.c | 5 +- + drivers/media/platform/coda/coda-bit.c | 4 +- + drivers/media/platform/coda/coda-common.c | 15 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 27 +- + drivers/media/platform/exynos4-is/fimc-core.c | 67 +- + drivers/media/platform/exynos4-is/fimc-core.h | 5 - + drivers/media/platform/exynos4-is/fimc-is.c | 17 +- + drivers/media/platform/exynos4-is/fimc-reg.c | 9 +- + drivers/media/platform/exynos4-is/media-dev.c | 85 +- + drivers/media/platform/exynos4-is/media-dev.h | 11 - + drivers/media/platform/fsl-viu.c | 2 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 10 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 40 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 133 ++- + drivers/media/platform/mtk-jpeg/Makefile | 5 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 930 ++++++++++++++------- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 106 ++- + .../mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} | 10 +- + .../mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} | 12 +- + .../{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} | 2 +- + .../{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} | 2 +- + .../{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} | 19 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 154 ++++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 91 ++ + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 11 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 8 + + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 8 + + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 2 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 - + drivers/media/platform/omap3isp/isp.c | 2 +- + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/platform/pxa_camera.c | 195 ++--- + drivers/media/platform/qcom/camss/camss-vfe.c | 8 - + drivers/media/platform/qcom/camss/camss-vfe.h | 2 - + drivers/media/platform/qcom/camss/camss-video.c | 124 ++- + drivers/media/platform/qcom/camss/camss-video.h | 2 - + drivers/media/platform/qcom/camss/camss.c | 5 - + drivers/media/platform/qcom/venus/Makefile | 2 +- + drivers/media/platform/qcom/venus/core.c | 50 +- + drivers/media/platform/qcom/venus/core.h | 17 + + drivers/media/platform/qcom/venus/dbgfs.c | 19 + + drivers/media/platform/qcom/venus/dbgfs.h | 12 + + drivers/media/platform/qcom/venus/helpers.c | 2 +- + drivers/media/platform/qcom/venus/hfi.c | 5 + + drivers/media/platform/qcom/venus/hfi.h | 1 + + drivers/media/platform/qcom/venus/hfi_cmds.c | 37 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 10 +- + drivers/media/platform/qcom/venus/hfi_msgs.c | 18 +- + drivers/media/platform/qcom/venus/hfi_parser.c | 3 + + drivers/media/platform/qcom/venus/hfi_venus.c | 72 +- + drivers/media/platform/qcom/venus/hfi_venus.h | 1 + + drivers/media/platform/qcom/venus/pm_helpers.c | 94 ++- + drivers/media/platform/qcom/venus/vdec.c | 26 +- + drivers/media/platform/qcom/venus/venc.c | 40 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 21 +- + drivers/media/platform/rcar-vin/rcar-core.c | 22 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 75 +- + drivers/media/platform/renesas-ceu.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 6 + + drivers/media/platform/sti/bdisp/bdisp-debug.c | 29 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 7 +- + drivers/media/platform/sti/bdisp/bdisp.h | 2 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 10 +- + drivers/media/platform/sti/hva/hva-debugfs.c | 22 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 1 + + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 7 +- + .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 5 +- + drivers/media/radio/radio-si476x.c | 66 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/radio/wl128x/fmdrv_common.c | 28 +- + drivers/media/rc/ene_ir.c | 18 +- + drivers/media/rc/fintek-cir.c | 8 +- + drivers/media/rc/igorplugusb.c | 6 +- + drivers/media/rc/iguanair.c | 6 +- + drivers/media/rc/imon_raw.c | 2 +- + drivers/media/rc/ir-hix5hd2.c | 8 +- + drivers/media/rc/ir-imon-decoder.c | 10 +- + drivers/media/rc/ir-jvc-decoder.c | 6 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 8 +- + drivers/media/rc/ir-nec-decoder.c | 6 +- + drivers/media/rc/ir-rc5-decoder.c | 6 +- + drivers/media/rc/ir-rc6-decoder.c | 6 +- + drivers/media/rc/ir-rcmm-decoder.c | 18 +- + drivers/media/rc/ir-sanyo-decoder.c | 6 +- + drivers/media/rc/ir-sharp-decoder.c | 6 +- + drivers/media/rc/ir-sony-decoder.c | 6 +- + drivers/media/rc/ir-xmp-decoder.c | 15 +- + drivers/media/rc/ir_toy.c | 14 +- + drivers/media/rc/ite-cir.c | 10 +- + drivers/media/rc/ite-cir.h | 4 +- + drivers/media/rc/lirc_dev.c | 95 +-- + drivers/media/rc/mceusb.c | 12 +- + drivers/media/rc/meson-ir.c | 4 +- + drivers/media/rc/mtk-cir.c | 4 +- + drivers/media/rc/nuvoton-cir.c | 10 +- + drivers/media/rc/nuvoton-cir.h | 2 +- + drivers/media/rc/rc-core-priv.h | 21 +- + drivers/media/rc/rc-ir-raw.c | 16 +- + drivers/media/rc/rc-loopback.c | 8 +- + drivers/media/rc/rc-main.c | 10 +- + drivers/media/rc/redrat3.c | 17 +- + drivers/media/rc/serial_ir.c | 12 +- + drivers/media/rc/sir_ir.c | 2 +- + drivers/media/rc/st_rc.c | 6 +- + drivers/media/rc/streamzap.c | 10 +- + drivers/media/rc/sunxi-cir.c | 4 +- + drivers/media/rc/ttusbir.c | 18 +- + drivers/media/rc/winbond-cir.c | 10 +- + drivers/media/rc/xbox_remote.c | 2 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 6 +- + drivers/media/test-drivers/vimc/vimc-capture.c | 7 +- + drivers/media/test-drivers/vivid/vivid-core.c | 673 ++++++++------- + drivers/media/test-drivers/vivid/vivid-meta-out.c | 9 +- + drivers/media/test-drivers/vivid/vivid-vbi-gen.c | 2 +- + drivers/media/tuners/fc0011.c | 2 +- + drivers/media/tuners/qt1010.c | 25 +- + drivers/media/tuners/tda18271-fe.c | 2 +- + drivers/media/tuners/tuner-simple.c | 5 +- + drivers/media/usb/au0828/au0828-input.c | 8 +- + drivers/media/usb/au0828/au0828-video.c | 12 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 16 +- + drivers/media/usb/dvb-usb-v2/af9015.c | 2 +- + drivers/media/usb/dvb-usb-v2/gl861.c | 2 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 8 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c | 4 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 +- + drivers/media/usb/dvb-usb/Kconfig | 1 + + drivers/media/usb/dvb-usb/cxusb-analog.c | 13 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 11 +- + drivers/media/usb/dvb-usb/pctv452e.c | 26 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 4 +- + drivers/media/usb/em28xx/em28xx-audio.c | 8 +- + drivers/media/usb/em28xx/em28xx-cards.c | 22 + + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/go7007/go7007-driver.c | 2 +- + drivers/media/usb/gspca/mr97310a.c | 10 +- + drivers/media/usb/gspca/nw80x.c | 2 +- + drivers/media/usb/gspca/ov519.c | 6 +- + drivers/media/usb/gspca/sn9c20x.c | 2 +- + drivers/media/usb/gspca/sunplus.c | 4 +- + drivers/media/usb/gspca/xirlink_cit.c | 4 +- + drivers/media/usb/gspca/zc3xx.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 5 +- + drivers/media/usb/pwc/pwc-v4l.c | 2 +- + drivers/media/usb/siano/smsusb.c | 2 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 8 +- + drivers/media/usb/tm6000/tm6000-core.c | 24 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 197 ++--- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 7 +- + drivers/media/usb/usbtv/usbtv-video.c | 4 +- + drivers/media/usb/uvc/uvc_video.c | 4 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 40 + + drivers/media/v4l2-core/v4l2-h264.c | 12 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 41 + + drivers/media/v4l2-core/v4l2-subdev.c | 16 + + drivers/media/v4l2-core/videobuf-dma-sg.c | 22 +- + drivers/staging/media/atomisp/Makefile | 12 +- + drivers/staging/media/atomisp/i2c/Kconfig | 74 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 4 +- + drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 12 - + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 24 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 20 +- + .../media/atomisp/pci/atomisp_compat_ioctl32.c | 84 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 10 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 49 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 6 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 9 +- + .../atomisp/pci/css_2401_system/host/csi_rx.c | 1 + + .../atomisp/pci/css_2401_system/host/ibuf_ctrl.c | 1 + + .../pci/css_2401_system/host/ibuf_ctrl_local.h | 1 + + .../pci/css_2401_system/host/ibuf_ctrl_private.h | 268 ------ + .../atomisp/pci/css_2401_system/host/isys_dma.c | 10 +- + .../pci/css_2401_system/host/isys_dma_local.h | 21 - + .../pci/css_2401_system/host/isys_dma_private.h | 12 +- + .../atomisp/pci/css_2401_system/host/isys_irq.c | 3 +- + .../pci/css_2401_system/host/isys_irq_local.h | 4 +- + .../pci/css_2401_system/host/isys_irq_private.h | 12 +- + .../pci/css_2401_system/host/pixelgen_private.h | 73 +- + .../atomisp/pci/css_2401_system/ibuf_ctrl_global.h | 6 +- + .../atomisp/pci/css_2401_system/isys_irq_global.h | 4 +- + .../atomisp/pci/css_2401_system/pixelgen_global.h | 8 +- + .../pci/hive_isp_css_common/host/input_formatter.c | 6 +- + .../host/input_formatter_local.h | 4 - + .../pci/hive_isp_css_common/host/input_system.c | 70 +- + .../pci/hive_isp_css_include/host/csi_rx_public.h | 4 +- + .../hive_isp_css_include/host/ibuf_ctrl_public.h | 94 --- + .../hive_isp_css_include/host/isys_dma_public.h | 8 +- + .../hive_isp_css_include/host/isys_irq_public.h | 29 +- + .../pci/hive_isp_css_include/host/isys_public.h | 4 +- + .../hive_isp_css_include/host/pixelgen_public.h | 4 +- + .../atomisp/pci/hive_isp_css_include/ibuf_ctrl.h | 47 -- + .../atomisp/pci/hive_isp_css_include/isys_dma.h | 47 -- + .../atomisp/pci/hive_isp_css_include/isys_irq.h | 16 +- + .../pci/hive_isp_css_include/print_support.h | 3 +- + drivers/staging/media/atomisp/pci/hmm/hmm.c | 6 +- + drivers/staging/media/atomisp/pci/ia_css_env.h | 4 +- + drivers/staging/media/atomisp/pci/ia_css_mipi.h | 2 - + drivers/staging/media/atomisp/pci/ia_css_stream.h | 4 +- + .../media/atomisp/pci/input_system_global.h | 29 +- + .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h | 7 - + .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c | 145 ---- + .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 3 - + .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c | 144 ---- + .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.c | 53 -- + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 4 +- + .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 3 - + .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 7 +- + .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 7 - + .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c | 31 - + .../atomisp/pci/isp2400_input_system_global.h | 21 +- + .../media/atomisp/pci/isp2400_input_system_local.h | 17 +- + .../atomisp/pci/isp2400_input_system_public.h | 26 +- + .../media/atomisp/pci/isp2400_system_global.h | 16 - + .../atomisp/pci/isp2401_input_system_global.h | 30 +- + .../media/atomisp/pci/isp2401_input_system_local.h | 3 - + .../atomisp/pci/isp2401_input_system_private.h | 224 ++++- + .../media/atomisp/pci/isp2401_system_global.h | 19 - + .../media/atomisp/pci/runtime/binary/src/binary.c | 863 ++++++++++--------- + .../pci/runtime/bufq/interface/ia_css_bufq_comm.h | 10 - + .../media/atomisp/pci/runtime/bufq/src/bufq.c | 26 +- + .../pci/runtime/debug/interface/ia_css_debug.h | 6 - + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 193 +---- + .../media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 2 +- + .../atomisp/pci/runtime/inputfifo/src/inputfifo.c | 10 - + .../pci/runtime/isys/interface/ia_css_isys.h | 18 +- + .../pci/runtime/isys/interface/ia_css_isys_comm.h | 4 +- + .../atomisp/pci/runtime/isys/src/csi_rx_rmgr.c | 2 +- + .../atomisp/pci/runtime/isys/src/isys_dma_rmgr.c | 2 +- + .../media/atomisp/pci/runtime/isys/src/isys_init.c | 20 +- + .../pci/runtime/isys/src/isys_stream2mmio_rmgr.c | 2 +- + .../media/atomisp/pci/runtime/isys/src/rx.c | 24 +- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 58 +- + .../runtime/pipeline/interface/ia_css_pipeline.h | 2 +- + .../atomisp/pci/runtime/pipeline/src/pipeline.c | 4 +- + .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 4 +- + drivers/staging/media/atomisp/pci/sh_css.c | 345 +++----- + drivers/staging/media/atomisp/pci/sh_css_defs.h | 4 - + .../staging/media/atomisp/pci/sh_css_firmware.c | 62 +- + drivers/staging/media/atomisp/pci/sh_css_hrt.c | 4 - + .../staging/media/atomisp/pci/sh_css_internal.h | 36 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 46 +- + .../media/atomisp/pci/sh_css_param_shading.c | 25 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 541 +----------- + .../staging/media/atomisp/pci/sh_css_properties.c | 10 - + drivers/staging/media/atomisp/pci/sh_css_sp.c | 39 +- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 8 +- + drivers/staging/media/atomisp/pci/sh_css_struct.h | 2 - + drivers/staging/media/atomisp/pci/system_global.h | 23 - + drivers/staging/media/hantro/hantro_drv.c | 5 - + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 26 +- + drivers/staging/media/hantro/hantro_h264.c | 14 +- + drivers/staging/media/hantro/hantro_hw.h | 2 - + drivers/staging/media/hantro/hantro_postproc.c | 4 +- + drivers/staging/media/imx/TODO | 4 + + drivers/staging/media/ipu3/include/intel-ipu3.h | 14 +- + drivers/staging/media/meson/vdec/vdec.c | 8 +- + drivers/staging/media/omap4iss/iss.c | 2 +- + drivers/staging/media/rkisp1/TODO | 1 - + drivers/staging/media/rkisp1/rkisp1-capture.c | 2 +- + drivers/staging/media/rkisp1/rkisp1-common.h | 267 ++++-- + drivers/staging/media/rkisp1/rkisp1-dev.c | 15 +- + drivers/staging/media/rkisp1/rkisp1-isp.c | 17 +- + drivers/staging/media/rkisp1/rkisp1-params.c | 107 +-- + drivers/staging/media/rkisp1/rkisp1-regs.h | 1 - + drivers/staging/media/rkisp1/rkisp1-stats.c | 24 +- + drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 247 ++++-- + drivers/staging/media/rkvdec/rkvdec-h264.c | 37 +- + drivers/staging/media/rkvdec/rkvdec.c | 14 +- + drivers/staging/media/rkvdec/rkvdec.h | 1 - + drivers/staging/media/sunxi/cedrus/cedrus.c | 9 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 1 + + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 61 +- + drivers/staging/media/tegra-vde/vde.c | 4 +- + drivers/staging/media/tegra-video/Kconfig | 7 + + drivers/staging/media/tegra-video/TODO | 6 - + drivers/staging/media/tegra-video/csi.c | 314 ++++++- + drivers/staging/media/tegra-video/csi.h | 8 + + drivers/staging/media/tegra-video/tegra210.c | 25 +- + drivers/staging/media/tegra-video/vi.c | 848 +++++++++++++++++-- + drivers/staging/media/tegra-video/vi.h | 25 +- + drivers/staging/media/tegra-video/video.c | 23 +- + include/linux/host1x.h | 4 +- + include/media/cec.h | 2 - + include/media/h264-ctrls.h | 87 +- + include/media/rc-core.h | 11 +- + include/media/tpg/v4l2-tpg.h | 1 + + include/media/v4l2-ctrls.h | 2 + + include/media/v4l2-h264.h | 3 +- + include/media/v4l2-mediabus.h | 33 +- + include/media/v4l2-mem2mem.h | 22 + + include/media/v4l2-subdev.h | 38 +- + include/media/videobuf-dma-sg.h | 2 +- + include/media/videobuf2-v4l2.h | 17 + + include/uapi/linux/v4l2-controls.h | 8 + + include/uapi/linux/videodev2.h | 17 +- + 833 files changed, 7593 insertions(+), 9812 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt + create mode 100644 Documentation/driver-api/media/camera-sensor.rst + create mode 100644 Documentation/userspace-api/media/glossary.rst + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} (98%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} (91%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} (98%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} (92%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} (77%) + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h + create mode 100644 drivers/media/platform/qcom/venus/dbgfs.c + create mode 100644 drivers/media/platform/qcom/venus/dbgfs.h + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Kconfig + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/ibuf_ctrl_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/ibuf_ctrl_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/ibuf_ctrl.h + delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_dma.h + delete mode 100644 drivers/staging/media/atomisp/pci/isp2400_system_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/isp2401_system_global.h +$ git reset --hard HEAD^ +HEAD is now at a5752b16852e Merge remote-tracking branch 'jc_docs/docs-next' into master +Merging next-20200903 version of v4l-dvb +$ git merge -m next-20200903/v4l-dvb cfe9e707c5640c28ab168cabe91aea5d0b3f9195 +Auto-merging drivers/staging/media/sunxi/cedrus/cedrus.c +Auto-merging drivers/media/v4l2-core/v4l2-ctrls.c +Auto-merging drivers/media/usb/dvb-usb/dib0700_devices.c +Auto-merging drivers/media/test-drivers/vicodec/vicodec-core.c +Auto-merging drivers/media/radio/radio-si476x.c +Auto-merging drivers/media/pci/ttpci/av7110.c +Auto-merging drivers/media/i2c/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/i2c/ov5647.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/media/ipu3.rst | 104 +-- + .../display/tegra/nvidia,tegra20-host1x.txt | 92 +- + .../devicetree/bindings/media/i2c/ov5647.txt | 35 - + .../devicetree/bindings/media/i2c/ov5647.yaml | 88 ++ + .../bindings/media/mediatek-jpeg-encoder.txt | 35 + + .../devicetree/bindings/media/samsung-fimc.txt | 6 +- + Documentation/driver-api/media/camera-sensor.rst | 134 +++ + Documentation/driver-api/media/csi2.rst | 2 + + Documentation/driver-api/media/index.rst | 1 + + Documentation/userspace-api/media/cec/cec-api.rst | 10 +- + .../userspace-api/media/cec/cec-func-close.rst | 9 +- + .../userspace-api/media/cec/cec-func-ioctl.rst | 9 +- + .../userspace-api/media/cec/cec-func-open.rst | 9 +- + .../userspace-api/media/cec/cec-func-poll.rst | 9 +- + .../userspace-api/media/cec/cec-funcs.rst | 9 +- + .../userspace-api/media/cec/cec-header.rst | 9 +- + .../userspace-api/media/cec/cec-intro.rst | 9 +- + .../media/cec/cec-ioc-adap-g-caps.rst | 9 +- + .../media/cec/cec-ioc-adap-g-log-addrs.rst | 9 +- + .../media/cec/cec-ioc-adap-g-phys-addr.rst | 9 +- + .../userspace-api/media/cec/cec-ioc-dqevent.rst | 9 +- + .../userspace-api/media/cec/cec-ioc-g-mode.rst | 9 +- + .../userspace-api/media/cec/cec-ioc-receive.rst | 9 +- + .../userspace-api/media/cec/cec-pin-error-inj.rst | 9 +- + .../media/dvb/audio-bilingual-channel-select.rst | 9 +- + .../media/dvb/audio-channel-select.rst | 9 +- + .../userspace-api/media/dvb/audio-clear-buffer.rst | 9 +- + .../userspace-api/media/dvb/audio-continue.rst | 9 +- + .../userspace-api/media/dvb/audio-fclose.rst | 9 +- + .../userspace-api/media/dvb/audio-fopen.rst | 9 +- + .../userspace-api/media/dvb/audio-fwrite.rst | 9 +- + .../media/dvb/audio-get-capabilities.rst | 9 +- + .../userspace-api/media/dvb/audio-get-status.rst | 9 +- + .../userspace-api/media/dvb/audio-pause.rst | 9 +- + .../userspace-api/media/dvb/audio-play.rst | 9 +- + .../media/dvb/audio-select-source.rst | 9 +- + .../userspace-api/media/dvb/audio-set-av-sync.rst | 9 +- + .../media/dvb/audio-set-bypass-mode.rst | 9 +- + .../userspace-api/media/dvb/audio-set-id.rst | 9 +- + .../userspace-api/media/dvb/audio-set-mixer.rst | 9 +- + .../userspace-api/media/dvb/audio-set-mute.rst | 9 +- + .../media/dvb/audio-set-streamtype.rst | 9 +- + .../userspace-api/media/dvb/audio-stop.rst | 9 +- + Documentation/userspace-api/media/dvb/audio.rst | 9 +- + .../userspace-api/media/dvb/audio_data_types.rst | 9 +- + .../media/dvb/audio_function_calls.rst | 9 +- + .../userspace-api/media/dvb/ca-fclose.rst | 9 +- + Documentation/userspace-api/media/dvb/ca-fopen.rst | 9 +- + .../userspace-api/media/dvb/ca-get-cap.rst | 9 +- + .../userspace-api/media/dvb/ca-get-descr-info.rst | 9 +- + .../userspace-api/media/dvb/ca-get-msg.rst | 9 +- + .../userspace-api/media/dvb/ca-get-slot-info.rst | 9 +- + Documentation/userspace-api/media/dvb/ca-reset.rst | 9 +- + .../userspace-api/media/dvb/ca-send-msg.rst | 9 +- + .../userspace-api/media/dvb/ca-set-descr.rst | 9 +- + Documentation/userspace-api/media/dvb/ca.rst | 9 +- + .../userspace-api/media/dvb/ca_data_types.rst | 9 +- + .../userspace-api/media/dvb/ca_function_calls.rst | 9 +- + Documentation/userspace-api/media/dvb/demux.rst | 9 +- + .../userspace-api/media/dvb/dmx-add-pid.rst | 9 +- + .../userspace-api/media/dvb/dmx-expbuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-fclose.rst | 9 +- + .../userspace-api/media/dvb/dmx-fopen.rst | 9 +- + .../userspace-api/media/dvb/dmx-fread.rst | 9 +- + .../userspace-api/media/dvb/dmx-fwrite.rst | 9 +- + .../userspace-api/media/dvb/dmx-get-pes-pids.rst | 9 +- + .../userspace-api/media/dvb/dmx-get-stc.rst | 9 +- + Documentation/userspace-api/media/dvb/dmx-mmap.rst | 9 +- + .../userspace-api/media/dvb/dmx-munmap.rst | 9 +- + Documentation/userspace-api/media/dvb/dmx-qbuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-querybuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-remove-pid.rst | 9 +- + .../userspace-api/media/dvb/dmx-reqbufs.rst | 9 +- + .../media/dvb/dmx-set-buffer-size.rst | 9 +- + .../userspace-api/media/dvb/dmx-set-filter.rst | 9 +- + .../userspace-api/media/dvb/dmx-set-pes-filter.rst | 9 +- + .../userspace-api/media/dvb/dmx-start.rst | 9 +- + Documentation/userspace-api/media/dvb/dmx-stop.rst | 9 +- + .../userspace-api/media/dvb/dmx_fcalls.rst | 9 +- + .../userspace-api/media/dvb/dmx_types.rst | 9 +- + .../userspace-api/media/dvb/dvb-fe-read-status.rst | 9 +- + .../userspace-api/media/dvb/dvb-frontend-event.rst | 9 +- + .../media/dvb/dvb-frontend-parameters.rst | 9 +- + Documentation/userspace-api/media/dvb/dvbapi.rst | 10 +- + .../userspace-api/media/dvb/dvbproperty.rst | 9 +- + Documentation/userspace-api/media/dvb/dvbstb.svg | 28 +- + Documentation/userspace-api/media/dvb/examples.rst | 9 +- + .../userspace-api/media/dvb/fe-bandwidth-t.rst | 9 +- + .../media/dvb/fe-diseqc-recv-slave-reply.rst | 9 +- + .../media/dvb/fe-diseqc-reset-overload.rst | 9 +- + .../media/dvb/fe-diseqc-send-burst.rst | 9 +- + .../media/dvb/fe-diseqc-send-master-cmd.rst | 9 +- + .../media/dvb/fe-dishnetwork-send-legacy-cmd.rst | 9 +- + .../media/dvb/fe-enable-high-lnb-voltage.rst | 9 +- + .../userspace-api/media/dvb/fe-get-event.rst | 9 +- + .../userspace-api/media/dvb/fe-get-frontend.rst | 9 +- + .../userspace-api/media/dvb/fe-get-info.rst | 9 +- + .../userspace-api/media/dvb/fe-get-property.rst | 9 +- + .../userspace-api/media/dvb/fe-read-ber.rst | 9 +- + .../media/dvb/fe-read-signal-strength.rst | 9 +- + .../userspace-api/media/dvb/fe-read-snr.rst | 9 +- + .../userspace-api/media/dvb/fe-read-status.rst | 9 +- + .../media/dvb/fe-read-uncorrected-blocks.rst | 9 +- + .../media/dvb/fe-set-frontend-tune-mode.rst | 9 +- + .../userspace-api/media/dvb/fe-set-frontend.rst | 9 +- + .../userspace-api/media/dvb/fe-set-tone.rst | 9 +- + .../userspace-api/media/dvb/fe-set-voltage.rst | 9 +- + .../userspace-api/media/dvb/fe-type-t.rst | 9 +- + .../media/dvb/fe_property_parameters.rst | 9 +- + .../userspace-api/media/dvb/frontend-header.rst | 9 +- + .../media/dvb/frontend-property-cable-systems.rst | 9 +- + .../dvb/frontend-property-satellite-systems.rst | 9 +- + .../dvb/frontend-property-terrestrial-systems.rst | 9 +- + .../media/dvb/frontend-stat-properties.rst | 9 +- + Documentation/userspace-api/media/dvb/frontend.rst | 9 +- + .../userspace-api/media/dvb/frontend_f_close.rst | 9 +- + .../userspace-api/media/dvb/frontend_f_open.rst | 9 +- + .../userspace-api/media/dvb/frontend_fcalls.rst | 9 +- + .../media/dvb/frontend_legacy_api.rst | 9 +- + .../media/dvb/frontend_legacy_dvbv3_api.rst | 9 +- + Documentation/userspace-api/media/dvb/headers.rst | 9 +- + Documentation/userspace-api/media/dvb/intro.rst | 9 +- + .../userspace-api/media/dvb/legacy_dvb_apis.rst | 9 +- + .../userspace-api/media/dvb/net-add-if.rst | 9 +- + .../userspace-api/media/dvb/net-get-if.rst | 9 +- + .../userspace-api/media/dvb/net-remove-if.rst | 9 +- + .../userspace-api/media/dvb/net-types.rst | 9 +- + Documentation/userspace-api/media/dvb/net.rst | 9 +- + .../media/dvb/query-dvb-frontend-info.rst | 9 +- + .../userspace-api/media/dvb/video-clear-buffer.rst | 9 +- + .../userspace-api/media/dvb/video-command.rst | 9 +- + .../userspace-api/media/dvb/video-continue.rst | 9 +- + .../userspace-api/media/dvb/video-fast-forward.rst | 9 +- + .../userspace-api/media/dvb/video-fclose.rst | 9 +- + .../userspace-api/media/dvb/video-fopen.rst | 9 +- + .../userspace-api/media/dvb/video-freeze.rst | 9 +- + .../userspace-api/media/dvb/video-fwrite.rst | 9 +- + .../media/dvb/video-get-capabilities.rst | 9 +- + .../userspace-api/media/dvb/video-get-event.rst | 9 +- + .../media/dvb/video-get-frame-count.rst | 9 +- + .../userspace-api/media/dvb/video-get-pts.rst | 9 +- + .../userspace-api/media/dvb/video-get-size.rst | 9 +- + .../userspace-api/media/dvb/video-get-status.rst | 9 +- + .../userspace-api/media/dvb/video-play.rst | 9 +- + .../media/dvb/video-select-source.rst | 9 +- + .../userspace-api/media/dvb/video-set-blank.rst | 9 +- + .../media/dvb/video-set-display-format.rst | 9 +- + .../userspace-api/media/dvb/video-set-format.rst | 9 +- + .../media/dvb/video-set-streamtype.rst | 9 +- + .../userspace-api/media/dvb/video-slowmotion.rst | 9 +- + .../userspace-api/media/dvb/video-stillpicture.rst | 9 +- + .../userspace-api/media/dvb/video-stop.rst | 9 +- + .../userspace-api/media/dvb/video-try-command.rst | 9 +- + Documentation/userspace-api/media/dvb/video.rst | 9 +- + .../media/dvb/video_function_calls.rst | 9 +- + .../userspace-api/media/dvb/video_types.rst | 9 +- + Documentation/userspace-api/media/fdl-appendix.rst | 9 +- + Documentation/userspace-api/media/gen-errors.rst | 9 +- + Documentation/userspace-api/media/glossary.rst | 205 +++++ + Documentation/userspace-api/media/index.rst | 3 + + .../media/mediactl/media-controller-intro.rst | 9 +- + .../media/mediactl/media-controller-model.rst | 9 +- + .../media/mediactl/media-controller.rst | 10 +- + .../media/mediactl/media-func-close.rst | 9 +- + .../media/mediactl/media-func-ioctl.rst | 9 +- + .../media/mediactl/media-func-open.rst | 9 +- + .../userspace-api/media/mediactl/media-funcs.rst | 9 +- + .../userspace-api/media/mediactl/media-header.rst | 9 +- + .../media/mediactl/media-ioc-device-info.rst | 9 +- + .../media/mediactl/media-ioc-enum-entities.rst | 9 +- + .../media/mediactl/media-ioc-enum-links.rst | 9 +- + .../media/mediactl/media-ioc-g-topology.rst | 9 +- + .../media/mediactl/media-ioc-request-alloc.rst | 26 +- + .../media/mediactl/media-ioc-setup-link.rst | 9 +- + .../media/mediactl/media-request-ioc-queue.rst | 26 +- + .../media/mediactl/media-request-ioc-reinit.rst | 26 +- + .../userspace-api/media/mediactl/media-types.rst | 9 +- + .../userspace-api/media/mediactl/request-api.rst | 26 +- + .../media/mediactl/request-func-close.rst | 26 +- + .../media/mediactl/request-func-ioctl.rst | 26 +- + .../media/mediactl/request-func-poll.rst | 26 +- + .../userspace-api/media/rc/keytable.c.rst | 9 +- + .../userspace-api/media/rc/lirc-dev-intro.rst | 9 +- + Documentation/userspace-api/media/rc/lirc-dev.rst | 9 +- + Documentation/userspace-api/media/rc/lirc-func.rst | 9 +- + .../userspace-api/media/rc/lirc-get-features.rst | 9 +- + .../userspace-api/media/rc/lirc-get-rec-mode.rst | 9 +- + .../media/rc/lirc-get-rec-resolution.rst | 9 +- + .../userspace-api/media/rc/lirc-get-send-mode.rst | 9 +- + .../userspace-api/media/rc/lirc-get-timeout.rst | 9 +- + .../userspace-api/media/rc/lirc-header.rst | 9 +- + Documentation/userspace-api/media/rc/lirc-read.rst | 9 +- + .../media/rc/lirc-set-measure-carrier-mode.rst | 9 +- + .../media/rc/lirc-set-rec-carrier-range.rst | 9 +- + .../media/rc/lirc-set-rec-carrier.rst | 9 +- + .../media/rc/lirc-set-rec-timeout-reports.rst | 9 +- + .../media/rc/lirc-set-rec-timeout.rst | 9 +- + .../media/rc/lirc-set-send-carrier.rst | 9 +- + .../media/rc/lirc-set-send-duty-cycle.rst | 9 +- + .../media/rc/lirc-set-transmitter-mask.rst | 9 +- + .../media/rc/lirc-set-wideband-receiver.rst | 9 +- + .../userspace-api/media/rc/lirc-write.rst | 9 +- + Documentation/userspace-api/media/rc/rc-intro.rst | 9 +- + Documentation/userspace-api/media/rc/rc-protos.rst | 4 +- + .../userspace-api/media/rc/rc-sysfs-nodes.rst | 9 +- + .../userspace-api/media/rc/rc-table-change.rst | 9 +- + Documentation/userspace-api/media/rc/rc-tables.rst | 9 +- + .../userspace-api/media/rc/remote_controllers.rst | 10 +- + .../userspace-api/media/typical_media_device.svg | 11 +- + Documentation/userspace-api/media/v4l/app-pri.rst | 9 +- + Documentation/userspace-api/media/v4l/async.rst | 9 +- + Documentation/userspace-api/media/v4l/audio.rst | 9 +- + Documentation/userspace-api/media/v4l/bayer.svg | 28 +- + Documentation/userspace-api/media/v4l/biblio.rst | 9 +- + Documentation/userspace-api/media/v4l/buffer.rst | 9 +- + .../userspace-api/media/v4l/capture-example.rst | 9 +- + .../userspace-api/media/v4l/capture.c.rst | 9 +- + .../userspace-api/media/v4l/colorspaces-defs.rst | 18 +- + .../media/v4l/colorspaces-details.rst | 14 +- + .../userspace-api/media/v4l/colorspaces.rst | 9 +- + .../userspace-api/media/v4l/common-defs.rst | 9 +- + Documentation/userspace-api/media/v4l/common.rst | 9 +- + Documentation/userspace-api/media/v4l/compat.rst | 9 +- + .../userspace-api/media/v4l/constraints.svg | 28 +- + Documentation/userspace-api/media/v4l/control.rst | 9 +- + Documentation/userspace-api/media/v4l/crop.rst | 9 +- + Documentation/userspace-api/media/v4l/crop.svg | 11 +- + .../userspace-api/media/v4l/depth-formats.rst | 9 +- + .../userspace-api/media/v4l/dev-capture.rst | 9 +- + .../userspace-api/media/v4l/dev-encoder.rst | 26 +- + .../userspace-api/media/v4l/dev-event.rst | 9 +- + .../userspace-api/media/v4l/dev-mem2mem.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-meta.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-osd.rst | 9 +- + .../userspace-api/media/v4l/dev-output.rst | 9 +- + .../userspace-api/media/v4l/dev-overlay.rst | 9 +- + .../userspace-api/media/v4l/dev-radio.rst | 9 +- + .../userspace-api/media/v4l/dev-raw-vbi.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-rds.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 9 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 11 +- + .../userspace-api/media/v4l/dev-subdev.rst | 9 +- + .../userspace-api/media/v4l/dev-touch.rst | 9 +- + Documentation/userspace-api/media/v4l/devices.rst | 9 +- + Documentation/userspace-api/media/v4l/diff-v4l.rst | 9 +- + Documentation/userspace-api/media/v4l/dmabuf.rst | 9 +- + .../userspace-api/media/v4l/dv-timings.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 295 ++++--- + .../userspace-api/media/v4l/ext-ctrls-detect.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-dv.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-flash.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-fm-rx.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-fm-tx.rst | 9 +- + .../media/v4l/ext-ctrls-image-process.rst | 9 +- + .../media/v4l/ext-ctrls-image-source.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-jpeg.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-rf-tuner.rst | 9 +- + .../userspace-api/media/v4l/extended-controls.rst | 9 +- + .../userspace-api/media/v4l/field-order.rst | 9 +- + .../userspace-api/media/v4l/fieldseq_bt.svg | 11 +- + .../userspace-api/media/v4l/fieldseq_tb.svg | 11 +- + Documentation/userspace-api/media/v4l/format.rst | 9 +- + .../userspace-api/media/v4l/func-close.rst | 9 +- + .../userspace-api/media/v4l/func-ioctl.rst | 9 +- + .../userspace-api/media/v4l/func-mmap.rst | 9 +- + .../userspace-api/media/v4l/func-munmap.rst | 9 +- + .../userspace-api/media/v4l/func-open.rst | 9 +- + .../userspace-api/media/v4l/func-poll.rst | 9 +- + .../userspace-api/media/v4l/func-read.rst | 9 +- + .../userspace-api/media/v4l/func-select.rst | 9 +- + .../userspace-api/media/v4l/func-write.rst | 9 +- + .../userspace-api/media/v4l/hist-v4l2.rst | 9 +- + .../userspace-api/media/v4l/hsv-formats.rst | 9 +- + Documentation/userspace-api/media/v4l/io.rst | 9 +- + .../media/v4l/libv4l-introduction.rst | 9 +- + Documentation/userspace-api/media/v4l/libv4l.rst | 9 +- + .../userspace-api/media/v4l/meta-formats.rst | 9 +- + Documentation/userspace-api/media/v4l/mmap.rst | 9 +- + Documentation/userspace-api/media/v4l/nv12mt.svg | 28 +- + .../userspace-api/media/v4l/nv12mt_example.svg | 28 +- + Documentation/userspace-api/media/v4l/open.rst | 120 ++- + .../userspace-api/media/v4l/pixfmt-bayer.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-compressed.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-grey.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-indexed.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-intro.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-inzi.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-m420.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-meta-d4xx.rst | 9 +- + .../media/v4l/pixfmt-meta-intel-ipu3.rst | 25 +- + .../userspace-api/media/v4l/pixfmt-meta-uvc.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-meta-vivid.rst | 26 +- + .../media/v4l/pixfmt-meta-vsp1-hgo.rst | 9 +- + .../media/v4l/pixfmt-meta-vsp1-hgt.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv12.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv12m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv12mt.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv16m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv24.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-packed-hsv.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-packed-yuv.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-reserved.rst | 26 +- + .../userspace-api/media/v4l/pixfmt-rgb.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cs08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cs14le.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cu08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cu16le.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-pcu16be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-pcu18be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-pcu20be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-ru12le.rst | 9 +- + .../media/v4l/pixfmt-srggb10-ipu3.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb10.rst | 9 +- + .../media/v4l/pixfmt-srggb10alaw8.rst | 9 +- + .../media/v4l/pixfmt-srggb10dpcm8.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb10p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb12.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb12p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb14.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb8.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-td08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-td16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-tu08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-tu16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-uv8.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-uyvy.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-v4l2-mplane.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-v4l2.rst | 26 +- + .../userspace-api/media/v4l/pixfmt-vyuy.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y10.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y10b.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y10p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y12.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y12i.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y14.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y16-be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y41p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y8i.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv410.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv411p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv420.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv420m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv422m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv422p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv444m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuyv.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yvyu.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-z16.rst | 9 +- + Documentation/userspace-api/media/v4l/pixfmt.rst | 9 +- + .../userspace-api/media/v4l/planar-apis.rst | 9 +- + Documentation/userspace-api/media/v4l/querycap.rst | 9 +- + Documentation/userspace-api/media/v4l/rw.rst | 9 +- + .../userspace-api/media/v4l/sdr-formats.rst | 9 +- + .../media/v4l/selection-api-configuration.rst | 9 +- + .../media/v4l/selection-api-examples.rst | 9 +- + .../media/v4l/selection-api-intro.rst | 9 +- + .../media/v4l/selection-api-targets.rst | 9 +- + .../media/v4l/selection-api-vs-crop-api.rst | 9 +- + .../userspace-api/media/v4l/selection-api.rst | 9 +- + .../userspace-api/media/v4l/selection.svg | 28 +- + .../userspace-api/media/v4l/selections-common.rst | 9 +- + Documentation/userspace-api/media/v4l/standard.rst | 9 +- + .../userspace-api/media/v4l/streaming-par.rst | 9 +- + .../userspace-api/media/v4l/subdev-formats.rst | 9 +- + .../media/v4l/subdev-image-processing-crop.svg | 11 +- + .../media/v4l/subdev-image-processing-full.svg | 11 +- + ...ubdev-image-processing-scaling-multi-source.svg | 11 +- + .../userspace-api/media/v4l/tch-formats.rst | 9 +- + Documentation/userspace-api/media/v4l/tuner.rst | 9 +- + .../userspace-api/media/v4l/user-func.rst | 9 +- + Documentation/userspace-api/media/v4l/userp.rst | 9 +- + .../media/v4l/v4l2-selection-flags.rst | 9 +- + .../media/v4l/v4l2-selection-targets.rst | 9 +- + Documentation/userspace-api/media/v4l/v4l2.rst | 11 +- + .../userspace-api/media/v4l/v4l2grab-example.rst | 9 +- + .../userspace-api/media/v4l/v4l2grab.c.rst | 9 +- + Documentation/userspace-api/media/v4l/vbi_525.svg | 11 +- + Documentation/userspace-api/media/v4l/vbi_625.svg | 11 +- + .../userspace-api/media/v4l/vbi_hsync.svg | 11 +- + Documentation/userspace-api/media/v4l/video.rst | 9 +- + Documentation/userspace-api/media/v4l/videodev.rst | 9 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 9 +- + .../userspace-api/media/v4l/vidioc-cropcap.rst | 9 +- + .../media/v4l/vidioc-dbg-g-chip-info.rst | 9 +- + .../media/v4l/vidioc-dbg-g-register.rst | 9 +- + .../userspace-api/media/v4l/vidioc-decoder-cmd.rst | 9 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 9 +- + .../media/v4l/vidioc-dv-timings-cap.rst | 9 +- + .../userspace-api/media/v4l/vidioc-encoder-cmd.rst | 9 +- + .../media/v4l/vidioc-enum-dv-timings.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 9 +- + .../media/v4l/vidioc-enum-frameintervals.rst | 9 +- + .../media/v4l/vidioc-enum-framesizes.rst | 9 +- + .../media/v4l/vidioc-enum-freq-bands.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enumaudio.rst | 9 +- + .../media/v4l/vidioc-enumaudioout.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enuminput.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enumoutput.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enumstd.rst | 9 +- + .../userspace-api/media/v4l/vidioc-expbuf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-audio.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-audioout.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-crop.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 9 +- + .../media/v4l/vidioc-g-dv-timings.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-edid.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-enc-index.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-fbuf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-fmt.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-frequency.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-input.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-jpegcomp.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-modulator.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-output.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-parm.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-priority.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-selection.rst | 9 +- + .../media/v4l/vidioc-g-sliced-vbi-cap.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-std.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-tuner.rst | 9 +- + .../userspace-api/media/v4l/vidioc-log-status.rst | 9 +- + .../userspace-api/media/v4l/vidioc-overlay.rst | 9 +- + .../userspace-api/media/v4l/vidioc-prepare-buf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-qbuf.rst | 9 +- + .../media/v4l/vidioc-query-dv-timings.rst | 9 +- + .../userspace-api/media/v4l/vidioc-querybuf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-querycap.rst | 9 +- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 9 +- + .../userspace-api/media/v4l/vidioc-querystd.rst | 9 +- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 9 +- + .../media/v4l/vidioc-s-hw-freq-seek.rst | 9 +- + .../userspace-api/media/v4l/vidioc-streamon.rst | 9 +- + .../v4l/vidioc-subdev-enum-frame-interval.rst | 9 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 9 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 9 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 9 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 9 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 9 +- + .../media/v4l/vidioc-subdev-g-selection.rst | 9 +- + .../media/v4l/vidioc-subdev-querycap.rst | 9 +- + .../media/v4l/vidioc-subscribe-event.rst | 9 +- + .../userspace-api/media/v4l/yuv-formats.rst | 9 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 2 +- + MAINTAINERS | 18 +- + drivers/gpu/drm/tegra/dsi.c | 4 +- + drivers/gpu/host1x/mipi.c | 22 +- + drivers/media/cec/core/cec-adap.c | 2 +- + drivers/media/cec/core/cec-core.c | 27 +- + drivers/media/cec/core/cec-pin.c | 6 +- + drivers/media/cec/usb/pulse8/pulse8-cec.c | 2 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 53 +- + drivers/media/dvb-frontends/af9013.c | 2 +- + drivers/media/dvb-frontends/lg2160.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/mb86a16.c | 7 +- + drivers/media/i2c/Kconfig | 2 +- + drivers/media/i2c/adv7180.c | 9 +- + drivers/media/i2c/adv748x/adv748x-core.c | 31 +- + drivers/media/i2c/adv748x/adv748x-csi2.c | 31 + + drivers/media/i2c/adv748x/adv748x.h | 1 + + drivers/media/i2c/adv7511-v4l2.c | 4 +- + drivers/media/i2c/imx219.c | 2 +- + drivers/media/i2c/imx274.c | 8 +- + drivers/media/i2c/m5mols/m5mols_core.c | 3 +- + drivers/media/i2c/max9286.c | 3 +- + drivers/media/i2c/ml86v7667.c | 7 +- + drivers/media/i2c/msp3400-kthreads.c | 2 +- + drivers/media/i2c/mt9m001.c | 7 +- + drivers/media/i2c/mt9m111.c | 7 +- + drivers/media/i2c/ov2740.c | 24 +- + drivers/media/i2c/ov5640.c | 4 +- + drivers/media/i2c/ov5675.c | 15 +- + drivers/media/i2c/ov6650.c | 57 +- + drivers/media/i2c/ov7740.c | 10 +- + drivers/media/i2c/ov9640.c | 9 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 2 +- + drivers/media/i2c/smiapp/smiapp-core.c | 6 +- + drivers/media/i2c/tc358743.c | 7 +- + drivers/media/i2c/tda1997x.c | 16 +- + drivers/media/i2c/tvp5150.c | 9 +- + drivers/media/mc/mc-device.c | 7 +- + drivers/media/pci/bt8xx/bttv-driver.c | 2 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 7 +- + drivers/media/pci/cobalt/cobalt-i2c.c | 8 +- + drivers/media/pci/cobalt/cobalt-omnitek.c | 2 +- + drivers/media/pci/cx23885/cx23885-video.c | 2 +- + drivers/media/pci/cx88/cx88-cards.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/dt3155/dt3155.c | 3 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 9 +- + drivers/media/pci/mantis/mantis_dma.c | 4 +- + drivers/media/pci/mantis/mantis_dma.h | 2 +- + drivers/media/pci/mantis/mantis_dvb.c | 2 +- + drivers/media/pci/ngene/ngene-core.c | 12 +- + drivers/media/pci/saa7134/saa7134-cards.c | 4 +- + drivers/media/pci/saa7134/saa7134-core.c | 20 +- + drivers/media/pci/saa7134/saa7134-empress.c | 3 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 2 +- + drivers/media/pci/saa7134/saa7134-video.c | 2 - + drivers/media/pci/saa7164/saa7164-buffer.c | 8 +- + drivers/media/pci/saa7164/saa7164-core.c | 12 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 7 +- + drivers/media/pci/saa7164/saa7164-vbi.c | 6 +- + drivers/media/pci/smipcie/smipcie-main.c | 6 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-i2c.c | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 6 +- + drivers/media/pci/ttpci/av7110.c | 20 +- + drivers/media/pci/ttpci/budget-ci.c | 15 +- + drivers/media/pci/ttpci/budget-core.c | 6 +- + drivers/media/pci/tw5864/tw5864-video.c | 19 +- + drivers/media/platform/Kconfig | 4 +- + drivers/media/platform/aspeed-video.c | 5 +- + drivers/media/platform/coda/coda-bit.c | 4 +- + drivers/media/platform/coda/coda-common.c | 15 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 27 +- + drivers/media/platform/exynos4-is/fimc-core.c | 67 +- + drivers/media/platform/exynos4-is/fimc-core.h | 5 - + drivers/media/platform/exynos4-is/fimc-is.c | 17 +- + drivers/media/platform/exynos4-is/fimc-reg.c | 9 +- + drivers/media/platform/exynos4-is/media-dev.c | 85 +- + drivers/media/platform/exynos4-is/media-dev.h | 11 - + drivers/media/platform/fsl-viu.c | 2 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 10 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 40 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 133 ++- + drivers/media/platform/mtk-jpeg/Makefile | 5 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 930 ++++++++++++++------- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 106 ++- + .../mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} | 10 +- + .../mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} | 12 +- + .../{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} | 2 +- + .../{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} | 2 +- + .../{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} | 19 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 154 ++++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 91 ++ + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 11 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 8 + + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 8 + + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 2 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 - + drivers/media/platform/omap3isp/isp.c | 2 +- + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/platform/pxa_camera.c | 195 ++--- + drivers/media/platform/qcom/camss/camss-vfe.c | 8 - + drivers/media/platform/qcom/camss/camss-vfe.h | 2 - + drivers/media/platform/qcom/camss/camss-video.c | 124 ++- + drivers/media/platform/qcom/camss/camss-video.h | 2 - + drivers/media/platform/qcom/camss/camss.c | 5 - + drivers/media/platform/qcom/venus/Makefile | 2 +- + drivers/media/platform/qcom/venus/core.c | 50 +- + drivers/media/platform/qcom/venus/core.h | 15 + + drivers/media/platform/qcom/venus/dbgfs.c | 21 + + drivers/media/platform/qcom/venus/dbgfs.h | 12 + + drivers/media/platform/qcom/venus/helpers.c | 2 +- + drivers/media/platform/qcom/venus/hfi.c | 5 + + drivers/media/platform/qcom/venus/hfi.h | 1 + + drivers/media/platform/qcom/venus/hfi_cmds.c | 37 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 10 +- + drivers/media/platform/qcom/venus/hfi_msgs.c | 18 +- + drivers/media/platform/qcom/venus/hfi_parser.c | 3 + + drivers/media/platform/qcom/venus/hfi_venus.c | 72 +- + drivers/media/platform/qcom/venus/hfi_venus.h | 1 + + drivers/media/platform/qcom/venus/pm_helpers.c | 94 ++- + drivers/media/platform/qcom/venus/vdec.c | 26 +- + drivers/media/platform/qcom/venus/venc.c | 40 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 21 +- + drivers/media/platform/rcar-vin/rcar-core.c | 22 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 75 +- + drivers/media/platform/renesas-ceu.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 6 + + drivers/media/platform/sti/bdisp/bdisp-debug.c | 29 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 7 +- + drivers/media/platform/sti/bdisp/bdisp.h | 2 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 10 +- + drivers/media/platform/sti/hva/hva-debugfs.c | 22 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 1 + + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 7 +- + .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 5 +- + drivers/media/radio/radio-si476x.c | 66 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/radio/wl128x/fmdrv_common.c | 12 +- + drivers/media/rc/iguanair.c | 2 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 6 +- + drivers/media/test-drivers/vimc/vimc-capture.c | 7 +- + drivers/media/test-drivers/vivid/vivid-core.c | 32 +- + drivers/media/test-drivers/vivid/vivid-meta-out.c | 9 +- + drivers/media/test-drivers/vivid/vivid-vbi-gen.c | 2 +- + drivers/media/tuners/fc0011.c | 2 +- + drivers/media/tuners/tda18271-fe.c | 2 +- + drivers/media/tuners/tuner-simple.c | 5 +- + drivers/media/usb/au0828/au0828-video.c | 12 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 16 +- + drivers/media/usb/dvb-usb-v2/af9015.c | 2 +- + drivers/media/usb/dvb-usb-v2/gl861.c | 2 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 8 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c | 4 +- + drivers/media/usb/dvb-usb/cxusb-analog.c | 13 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 11 +- + drivers/media/usb/em28xx/em28xx-audio.c | 8 +- + drivers/media/usb/em28xx/em28xx-cards.c | 22 + + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/go7007/go7007-driver.c | 2 +- + drivers/media/usb/gspca/mr97310a.c | 10 +- + drivers/media/usb/gspca/nw80x.c | 2 +- + drivers/media/usb/gspca/ov519.c | 6 +- + drivers/media/usb/gspca/sn9c20x.c | 2 +- + drivers/media/usb/gspca/sunplus.c | 4 +- + drivers/media/usb/gspca/xirlink_cit.c | 4 +- + drivers/media/usb/gspca/zc3xx.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 5 +- + drivers/media/usb/pwc/pwc-v4l.c | 2 +- + drivers/media/usb/siano/smsusb.c | 2 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 8 +- + drivers/media/usb/tm6000/tm6000-core.c | 24 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 7 +- + drivers/media/usb/usbtv/usbtv-video.c | 4 +- + drivers/media/usb/uvc/uvc_video.c | 4 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 40 + + drivers/media/v4l2-core/v4l2-h264.c | 12 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 41 + + drivers/media/v4l2-core/v4l2-subdev.c | 16 + + drivers/staging/media/hantro/hantro_drv.c | 5 - + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 26 +- + drivers/staging/media/hantro/hantro_h264.c | 14 +- + drivers/staging/media/hantro/hantro_hw.h | 2 - + drivers/staging/media/hantro/hantro_postproc.c | 4 +- + drivers/staging/media/imx/TODO | 4 + + drivers/staging/media/ipu3/include/intel-ipu3.h | 14 +- + drivers/staging/media/meson/vdec/vdec.c | 8 +- + drivers/staging/media/omap4iss/iss.c | 2 +- + drivers/staging/media/rkisp1/TODO | 1 - + drivers/staging/media/rkisp1/rkisp1-capture.c | 2 +- + drivers/staging/media/rkisp1/rkisp1-common.h | 267 ++++-- + drivers/staging/media/rkisp1/rkisp1-dev.c | 15 +- + drivers/staging/media/rkisp1/rkisp1-isp.c | 17 +- + drivers/staging/media/rkisp1/rkisp1-params.c | 107 +-- + drivers/staging/media/rkisp1/rkisp1-regs.h | 1 - + drivers/staging/media/rkisp1/rkisp1-stats.c | 24 +- + drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 247 ++++-- + drivers/staging/media/rkvdec/rkvdec-h264.c | 37 +- + drivers/staging/media/rkvdec/rkvdec.c | 14 +- + drivers/staging/media/rkvdec/rkvdec.h | 1 - + drivers/staging/media/sunxi/cedrus/cedrus.c | 9 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 1 + + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 61 +- + drivers/staging/media/tegra-vde/vde.c | 4 +- + drivers/staging/media/tegra-video/Kconfig | 7 + + drivers/staging/media/tegra-video/TODO | 6 - + drivers/staging/media/tegra-video/csi.c | 314 ++++++- + drivers/staging/media/tegra-video/csi.h | 8 + + drivers/staging/media/tegra-video/tegra210.c | 25 +- + drivers/staging/media/tegra-video/vi.c | 848 +++++++++++++++++-- + drivers/staging/media/tegra-video/vi.h | 25 +- + drivers/staging/media/tegra-video/video.c | 23 +- + include/linux/host1x.h | 4 +- + include/media/cec.h | 2 - + include/media/h264-ctrls.h | 87 +- + include/media/tpg/v4l2-tpg.h | 1 + + include/media/v4l2-ctrls.h | 2 + + include/media/v4l2-h264.h | 3 +- + include/media/v4l2-mediabus.h | 33 +- + include/media/v4l2-mem2mem.h | 22 + + include/media/v4l2-subdev.h | 38 +- + include/media/videobuf2-v4l2.h | 17 + + include/uapi/linux/v4l2-controls.h | 8 + + include/uapi/linux/videodev2.h | 17 +- + 675 files changed, 5526 insertions(+), 6081 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt + create mode 100644 Documentation/driver-api/media/camera-sensor.rst + create mode 100644 Documentation/userspace-api/media/glossary.rst + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} (98%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} (91%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} (98%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} (92%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} (77%) + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h + create mode 100644 drivers/media/platform/qcom/venus/dbgfs.c + create mode 100644 drivers/media/platform/qcom/venus/dbgfs.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 (7eada1ae101b Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (b981e97306ef cpufreq: s5pv210: Use dev_err instead of pr_err in probe) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging drivers/opp/core.c +Merge made by the 'recursive' strategy. + drivers/base/power/domain.c | 14 +- + drivers/cpufreq/cpufreq-dt.c | 286 ++++++++++++++++++------------------- + drivers/cpufreq/s5pv210-cpufreq.c | 31 ++-- + drivers/cpufreq/tegra186-cpufreq.c | 30 ++++ + drivers/opp/core.c | 53 ++++--- + drivers/opp/of.c | 22 +-- + drivers/soc/samsung/exynos-asv.c | 2 +- + 7 files changed, 238 insertions(+), 200 deletions(-) +Merging cpupower/cpupower (527b7779e5ec cpupower: speed up generating git version string) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/Makefile | 2 +- + tools/power/cpupower/debug/i386/intel_gsic.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging devfreq/devfreq-next (4b1e767350fb devfreq: rk3399_dmc: Simplify with dev_err_probe()) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/rk3399_dmc.c | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) +Merging opp/opp/linux-next (257eba525a2e opp: Prevent memory leak in dev_pm_opp_attach_genpd()) +$ git merge opp/opp/linux-next +Auto-merging drivers/opp/opp.h +Auto-merging drivers/opp/core.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/opp/opp.txt | 53 +- + arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi | 36 - + arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 67 +- + arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi | 512 ------------ + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 984 ++++------------------- + drivers/opp/core.c | 175 ++-- + drivers/opp/cpu.c | 2 +- + drivers/opp/of.c | 49 +- + drivers/opp/opp.h | 5 +- + 9 files changed, 306 insertions(+), 1577 deletions(-) +Merging thermal/thermal/linux-next (6f55be9fd5ee Merge branch 'thermal/fixes' into thermal/linux-next) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + drivers/thermal/imx8mm_thermal.c | 10 +++------- + drivers/thermal/imx_thermal.c | 22 ++++++---------------- + drivers/thermal/rcar_thermal.c | 4 ++-- + drivers/thermal/st/Kconfig | 2 +- + drivers/thermal/thermal_sysfs.c | 2 +- + 5 files changed, 13 insertions(+), 27 deletions(-) +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 (7ae0451e2e6c fs: dlm: use free_con to free connection) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/Kconfig | 1 + + fs/dlm/config.c | 3 ++ + fs/dlm/lowcomms.c | 122 +++++++++++++++++++++++++----------------------------- + 3 files changed, 60 insertions(+), 66 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 +CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c +Resolved 'drivers/xen/swiotlb-xen.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9b612492ebc7] Merge remote-tracking branch 'swiotlb/linux-next' into master +$ git diff -M --stat --summary HEAD^.. +Merging rdma/for-next (524d8ffd07f0 RDMA/qib: Tidy up process_cc()) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/sw/rxe/rxe_verbs.c +Auto-merging drivers/infiniband/sw/rxe/rxe_sysfs.c +Auto-merging drivers/infiniband/sw/rxe/rxe_mr.c +Auto-merging drivers/infiniband/sw/rxe/rxe.h +Auto-merging drivers/infiniband/sw/rxe/rxe.c +Auto-merging drivers/infiniband/hw/mlx4/main.c +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-class-infiniband | 17 - + drivers/infiniband/core/Makefile | 2 +- + drivers/infiniband/core/cm.c | 126 +++---- + drivers/infiniband/core/cm_trace.c | 15 + + drivers/infiniband/core/cm_trace.h | 414 ++++++++++++++++++++++ + drivers/infiniband/core/cma.c | 25 +- + drivers/infiniband/core/cma_trace.h | 40 --- + drivers/infiniband/core/rdma_core.c | 3 +- + drivers/infiniband/core/ucma.c | 444 +++++++++++------------- + drivers/infiniband/core/uverbs_cmd.c | 4 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 39 ++- + drivers/infiniband/hw/efa/efa_com_cmd.c | 2 + + drivers/infiniband/hw/efa/efa_com_cmd.h | 2 + + drivers/infiniband/hw/efa/efa_verbs.c | 171 +++++++-- + drivers/infiniband/hw/hns/hns_roce_ah.c | 18 + + drivers/infiniband/hw/hns/hns_roce_device.h | 23 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 13 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 6 +- + drivers/infiniband/hw/mlx4/cm.c | 148 +++++++- + drivers/infiniband/hw/mlx4/mad.c | 158 +++++---- + drivers/infiniband/hw/mlx4/main.c | 31 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 8 +- + drivers/infiniband/hw/mlx5/ah.c | 4 +- + drivers/infiniband/hw/mlx5/fs.c | 148 ++++---- + drivers/infiniband/hw/mlx5/mr.c | 4 +- + drivers/infiniband/hw/mlx5/qp.c | 73 ++-- + drivers/infiniband/hw/qib/qib_mad.c | 52 +-- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 - + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 11 - + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 2 - + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 1 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 7 +- + drivers/infiniband/sw/rxe/rxe.c | 43 +-- + drivers/infiniband/sw/rxe/rxe.h | 29 +- + drivers/infiniband/sw/rxe/rxe_av.c | 29 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 32 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 29 +- + drivers/infiniband/sw/rxe/rxe_hdr.h | 29 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.c | 29 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.h | 29 +- + drivers/infiniband/sw/rxe/rxe_icrc.c | 29 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 29 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 29 +- + drivers/infiniband/sw/rxe/rxe_mmap.c | 29 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 29 +- + drivers/infiniband/sw/rxe/rxe_net.c | 31 +- + drivers/infiniband/sw/rxe/rxe_net.h | 29 +- + drivers/infiniband/sw/rxe/rxe_opcode.c | 29 +- + drivers/infiniband/sw/rxe/rxe_opcode.h | 29 +- + drivers/infiniband/sw/rxe/rxe_param.h | 29 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 89 +---- + drivers/infiniband/sw/rxe/rxe_pool.h | 36 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 32 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 29 +- + drivers/infiniband/sw/rxe/rxe_queue.h | 29 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 29 +- + drivers/infiniband/sw/rxe/rxe_req.c | 29 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 29 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 29 +- + drivers/infiniband/sw/rxe/rxe_sysfs.c | 35 +- + drivers/infiniband/sw/rxe/rxe_task.c | 29 +- + drivers/infiniband/sw/rxe/rxe_task.h | 31 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 29 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 29 +- + drivers/infiniband/ulp/isert/ib_isert.c | 15 +- + include/linux/mlx5/mlx5_ifc.h | 3 +- + include/rdma/ib_cm.h | 3 - + include/rdma/ib_umem.h | 9 +- + include/rdma/ib_verbs.h | 14 +- + include/rdma/rdma_cm.h | 5 + + include/trace/events/rdma.h | 41 ++- + include/trace/events/rpcrdma.h | 1 + + include/uapi/rdma/efa-abi.h | 1 + + include/uapi/rdma/rdma_user_rxe.h | 6 +- + 76 files changed, 1443 insertions(+), 1697 deletions(-) + create mode 100644 drivers/infiniband/core/cm_trace.c + create mode 100644 drivers/infiniband/core/cm_trace.h +Merging net-next/master (81365af13a56 rxrpc: Remove unused macro rxrpc_min_rtt_wlen) +$ git merge net-next/master +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/lib/bpf/Makefile +Removing tools/build/feature/test-libelf-mmap.c +Auto-merging net/ipv4/raw.c +Auto-merging net/ipv4/ip_output.c +Auto-merging net/ipv4/icmp.c +Auto-merging net/core/skbuff.c +Auto-merging kernel/bpf/hashtab.c +Auto-merging init/Kconfig +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/bpf-cgroup.h +Auto-merging fs/io_uring.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +Removing drivers/net/ethernet/mellanox/mlx5/core/en/xsk/umem.h +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c +Auto-merging drivers/net/ethernet/3com/typhoon.c +Auto-merging drivers/net/dsa/rtl8366.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/admin-guide/sysctl/net.rst | 20 +- + Documentation/bpf/bpf_devel_QA.rst | 19 +- + Documentation/bpf/btf.rst | 25 + + Documentation/bpf/index.rst | 1 + + Documentation/bpf/prog_sk_lookup.rst | 98 ++ + .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 7 + + .../devicetree/bindings/net/brcm,systemport.txt | 5 + + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 130 ++ + .../devicetree/bindings/net/ti,dp83822.yaml | 80 + + Documentation/networking/af_xdp.rst | 68 +- + Documentation/networking/l2tp.rst | 939 +++++++---- + MAINTAINERS | 28 +- + arch/x86/net/bpf_jit_comp.c | 32 +- + drivers/crypto/chelsio/Kconfig | 21 - + drivers/crypto/chelsio/Makefile | 2 - + drivers/crypto/chelsio/chcr_algo.h | 33 - + drivers/crypto/chelsio/chcr_core.c | 42 +- + drivers/crypto/chelsio/chcr_core.h | 84 - + drivers/net/Kconfig | 4 + + drivers/net/Makefile | 2 + + drivers/net/dsa/b53/b53_common.c | 15 +- + drivers/net/dsa/bcm_sf2.c | 115 +- + drivers/net/dsa/bcm_sf2.h | 4 + + drivers/net/dsa/dsa_loop.c | 56 +- + drivers/net/dsa/mv88e6xxx/chip.c | 11 +- + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 59 +- + drivers/net/dsa/ocelot/Kconfig | 1 + + drivers/net/dsa/ocelot/felix.c | 28 +- + drivers/net/dsa/ocelot/felix.h | 20 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 374 +---- + drivers/net/dsa/ocelot/seville_vsc9953.c | 21 +- + drivers/net/dsa/realtek-smi-core.h | 4 +- + drivers/net/dsa/rtl8366.c | 277 +-- + drivers/net/dsa/rtl8366rb.c | 82 +- + drivers/net/ethernet/3com/typhoon.c | 61 +- + drivers/net/ethernet/8390/axnet_cs.c | 17 +- + drivers/net/ethernet/8390/lib8390.c | 14 +- + drivers/net/ethernet/8390/pcnet_cs.c | 6 +- + drivers/net/ethernet/adaptec/starfire.c | 77 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 48 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 57 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 48 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 12 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 40 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 2 + + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 9 +- + drivers/net/ethernet/chelsio/Kconfig | 2 + + drivers/net/ethernet/chelsio/Makefile | 1 + + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 10 +- + drivers/net/ethernet/chelsio/cxgb/sge.c | 64 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 7 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 17 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 8 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 8 + + drivers/net/ethernet/chelsio/inline_crypto/Kconfig | 37 + + .../net/ethernet/chelsio/inline_crypto/Makefile | 3 + + .../chelsio/inline_crypto/ch_ipsec/Makefile | 8 + + .../chelsio/inline_crypto/ch_ipsec}/chcr_ipsec.c | 111 +- + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h | 58 + + .../ethernet/chelsio/inline_crypto}/chtls/Makefile | 0 + .../ethernet/chelsio/inline_crypto}/chtls/chtls.h | 88 + + .../chelsio/inline_crypto}/chtls/chtls_cm.c | 0 + .../chelsio/inline_crypto}/chtls/chtls_cm.h | 0 + .../chelsio/inline_crypto}/chtls/chtls_hw.c | 0 + .../chelsio/inline_crypto}/chtls/chtls_io.c | 0 + .../chelsio/inline_crypto}/chtls/chtls_main.c | 2 +- + drivers/net/ethernet/cirrus/cs89x0.h | 4 - + drivers/net/ethernet/cisco/enic/enic_main.c | 76 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 66 +- + drivers/net/ethernet/cortina/gemini.c | 32 +- + drivers/net/ethernet/dlink/dl2k.c | 1 - + drivers/net/ethernet/dnet.c | 5 +- + .../net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c | 8 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 400 ++--- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 89 +- + drivers/net/ethernet/freescale/fec_main.c | 3 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 11 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 - + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 5 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +- + drivers/net/ethernet/huawei/hinic/Makefile | 3 +- + drivers/net/ethernet/huawei/hinic/hinic_debugfs.c | 318 ++++ + drivers/net/ethernet/huawei/hinic/hinic_debugfs.h | 114 ++ + drivers/net/ethernet/huawei/hinic/hinic_dev.h | 20 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 1 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_io.h | 1 + + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h | 6 + + drivers/net/ethernet/huawei/hinic/hinic_main.c | 83 +- + drivers/net/ethernet/ibm/ibmvnic.c | 187 +-- + drivers/net/ethernet/ibm/ibmvnic.h | 2 + + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 29 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 22 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 81 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.h | 4 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 11 +- + drivers/net/ethernet/intel/ice/ice.h | 18 +- + drivers/net/ethernet/intel/ice/ice_base.c | 16 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 2 +- + drivers/net/ethernet/intel/ice/ice_main.c | 10 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 18 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 2 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 138 +- + drivers/net/ethernet/intel/ice/ice_xsk.h | 7 +- + drivers/net/ethernet/intel/igb/igb_main.c | 10 +- + drivers/net/ethernet/intel/igc/igc_main.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 45 +- + .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 63 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 11 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 1 + + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 466 ++++-- + drivers/net/ethernet/marvell/octeontx2/af/Makefile | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 29 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 4 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 21 + + drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 275 +++ + drivers/net/ethernet/marvell/octeontx2/af/ptp.h | 25 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 29 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 5 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 39 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 43 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 31 + + .../net/ethernet/marvell/octeontx2/nic/Makefile | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 96 ++ + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 24 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 28 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 174 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 212 +++ + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.h | 13 + + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 112 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 9 +- + .../mellanox/mlx5/core/en/xsk/{umem.c => pool.c} | 110 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/pool.h | 27 + + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.h | 10 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 14 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.h | 6 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/umem.h | 29 - + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 49 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 29 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 152 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 6 - + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 38 - + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 32 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 22 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 25 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 17 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 6 +- + drivers/net/ethernet/netronome/nfp/flower/match.c | 73 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 85 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 7 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 32 +- + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 29 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 79 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 71 +- + .../net/ethernet/pensando/ionic/ionic_devlink.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 131 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 829 +++++---- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 108 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 52 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 48 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 149 +- + drivers/net/ethernet/qlogic/Kconfig | 5 +- + drivers/net/ethernet/qlogic/qed/Makefile | 1 + + drivers/net/ethernet/qlogic/qed/qed.h | 3 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 9 + + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 259 +++ + drivers/net/ethernet/qlogic/qed/qed_devlink.h | 20 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 116 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 1 - + drivers/net/ethernet/qlogic/qede/qede.h | 2 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 38 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 10 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/sfc/ef10.c | 4 +- + drivers/net/ethernet/sfc/ef100_ethtool.c | 41 + + drivers/net/ethernet/sfc/ef100_netdev.c | 4 + + drivers/net/ethernet/sfc/ef100_nic.c | 19 +- + drivers/net/ethernet/sfc/ef100_tx.c | 34 +- + drivers/net/ethernet/sfc/ef100_tx.h | 1 - + drivers/net/ethernet/sfc/efx.c | 20 +- + drivers/net/ethernet/sfc/efx_common.c | 38 +- + drivers/net/ethernet/sfc/ethtool.c | 3 +- + drivers/net/ethernet/sfc/ethtool_common.c | 45 +- + drivers/net/ethernet/sfc/farch.c | 11 +- + drivers/net/ethernet/sfc/mcdi.c | 6 +- + drivers/net/ethernet/sfc/mcdi.h | 3 +- + drivers/net/ethernet/sfc/mcdi_port.c | 593 +------ + drivers/net/ethernet/sfc/mcdi_port_common.c | 604 ++++++- + drivers/net/ethernet/sfc/mcdi_port_common.h | 15 +- + drivers/net/ethernet/sfc/net_driver.h | 73 +- + drivers/net/ethernet/sfc/nic_common.h | 40 +- + drivers/net/ethernet/sfc/selftest.c | 14 +- + drivers/net/ethernet/sfc/siena.c | 1 - + drivers/net/ethernet/sfc/tx.c | 99 +- + drivers/net/ethernet/sfc/tx_common.c | 9 +- + drivers/net/ethernet/smsc/epic100.c | 71 +- + drivers/net/ethernet/smsc/smsc9420.c | 51 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 3 +- + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 191 +++ + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- + drivers/net/ethernet/sun/sungem.c | 5 +- + drivers/net/ethernet/ti/am65-cpts.c | 43 +- + drivers/net/ethernet/ti/cpts.c | 42 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +- + drivers/net/gtp.c | 60 +- + drivers/net/ipa/ipa.h | 1 - + drivers/net/ipvlan/ipvlan_main.c | 8 + + drivers/net/macsec.c | 2 +- + drivers/net/mdio/Kconfig | 241 +++ + drivers/net/mdio/Makefile | 27 + + drivers/net/{phy => mdio}/mdio-aspeed.c | 0 + drivers/net/{phy => mdio}/mdio-bcm-iproc.c | 0 + drivers/net/{phy => mdio}/mdio-bcm-unimac.c | 0 + drivers/net/{phy => mdio}/mdio-bitbang.c | 0 + drivers/net/{phy => mdio}/mdio-cavium.c | 0 + drivers/net/{phy => mdio}/mdio-cavium.h | 0 + drivers/net/{phy => mdio}/mdio-gpio.c | 0 + drivers/net/{phy => mdio}/mdio-hisi-femac.c | 0 + drivers/net/{phy => mdio}/mdio-i2c.c | 3 +- + drivers/net/{phy => mdio}/mdio-ipq4019.c | 0 + drivers/net/{phy => mdio}/mdio-ipq8064.c | 0 + drivers/net/{phy => mdio}/mdio-moxart.c | 0 + drivers/net/{phy => mdio}/mdio-mscc-miim.c | 0 + drivers/net/{phy => mdio}/mdio-mux-bcm-iproc.c | 0 + drivers/net/{phy => mdio}/mdio-mux-gpio.c | 0 + drivers/net/{phy => mdio}/mdio-mux-meson-g12a.c | 0 + drivers/net/{phy => mdio}/mdio-mux-mmioreg.c | 0 + drivers/net/{phy => mdio}/mdio-mux-multiplexer.c | 0 + drivers/net/{phy => mdio}/mdio-mux.c | 0 + drivers/net/{phy => mdio}/mdio-mvusb.c | 0 + drivers/net/{phy => mdio}/mdio-octeon.c | 0 + drivers/net/{phy => mdio}/mdio-sun4i.c | 0 + drivers/net/{phy => mdio}/mdio-thunder.c | 0 + drivers/net/{phy => mdio}/mdio-xgene.c | 2 +- + drivers/net/pcs/Kconfig | 22 + + drivers/net/pcs/Makefile | 5 + + drivers/net/pcs/pcs-lynx.c | 312 ++++ + drivers/net/{phy/mdio-xpcs.c => pcs/pcs-xpcs.c} | 2 +- + drivers/net/phy/Kconfig | 404 +---- + drivers/net/phy/Makefile | 37 +- + drivers/net/phy/at803x.c | 4 +- + drivers/net/phy/dp83640.c | 70 +- + drivers/net/phy/dp83822.c | 225 ++- + drivers/net/phy/dp83867.c | 45 +- + drivers/net/phy/mscc/mscc_macsec.c | 2 +- + drivers/net/phy/phylink.c | 48 +- + drivers/net/phy/sfp.c | 2 +- + drivers/net/phy/smsc.c | 67 + + drivers/net/tun.c | 18 - + drivers/net/usb/Kconfig | 2 + + drivers/net/usb/smsc95xx.c | 475 ++---- + drivers/net/veth.c | 6 +- + drivers/net/wan/fsl_ucc_hdlc.c | 1 + + drivers/net/wan/sbni.c | 101 +- + drivers/net/wan/slic_ds26522.c | 2 - + drivers/net/wireguard/netlink.c | 14 +- + drivers/net/wireless/ath/ath10k/mac.c | 4 +- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + drivers/net/wireless/ath/ath11k/thermal.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 4 +- + drivers/net/wireless/ath/ath9k/beacon.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 6 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 8 +- + drivers/nfc/st-nci/se.c | 3 +- + drivers/nfc/st21nfca/se.c | 3 +- + drivers/of/base.c | 1 + + drivers/ptp/ptp_ines.c | 91 +- + drivers/s390/net/qeth_core.h | 14 +- + drivers/s390/net/qeth_core_main.c | 85 +- + drivers/s390/net/qeth_core_mpc.h | 14 +- + drivers/s390/net/qeth_l2_main.c | 96 +- + drivers/s390/net/qeth_l2_sys.c | 1 + + drivers/s390/net/qeth_l3_main.c | 3 +- + fs/io_uring.c | 6 + + include/linux/bpf-cgroup.h | 25 + + include/linux/bpf.h | 52 + + include/linux/bpf_local_storage.h | 163 ++ + include/linux/bpf_lsm.h | 29 + + include/linux/bpf_types.h | 3 + + include/linux/btf.h | 3 +- + include/linux/btf_ids.h | 51 +- + include/linux/filter.h | 8 +- + include/linux/if_tun.h | 19 +- + include/linux/inet_diag.h | 2 + + include/linux/ipv6.h | 22 - + include/linux/mdio.h | 6 + + {drivers/net/phy => include/linux/mdio}/mdio-i2c.h | 0 + .../net/phy => include/linux/mdio}/mdio-xgene.h | 0 + include/linux/net.h | 3 + + include/linux/netdevice.h | 34 +- + include/linux/of.h | 5 + + include/linux/pcs-lynx.h | 21 + + include/linux/{mdio-xpcs.h => pcs/pcs-xpcs.h} | 8 +- + include/linux/phylink.h | 3 + + include/linux/ptp_classify.h | 70 +- + include/linux/qed/qed_if.h | 82 +- + include/linux/rcupdate_trace.h | 9 +- + include/linux/skmsg.h | 17 - + include/linux/tcp.h | 20 +- + include/net/bpf_sk_storage.h | 14 + + include/net/cfg80211.h | 3 + + include/net/dst.h | 2 +- + include/net/inet_connection_sock.h | 2 + + include/net/inet_sock.h | 7 - + include/net/ipv6_stubs.h | 3 + + include/net/mac80211.h | 35 +- + include/net/netlink.h | 58 +- + include/net/request_sock.h | 9 +- + include/net/sock.h | 6 +- + include/net/tcp.h | 69 +- + include/net/xdp_sock.h | 30 +- + include/net/xdp_sock_drv.h | 122 +- + include/net/xsk_buff_pool.h | 53 +- + include/uapi/linux/bpf.h | 398 ++++- + include/uapi/linux/gtp.h | 2 + + include/uapi/linux/if_bridge.h | 21 + + include/uapi/linux/if_pppol2tp.h | 2 +- + include/uapi/linux/inet_diag.h | 18 + + include/uapi/linux/l2tp.h | 6 +- + include/uapi/linux/nl80211.h | 76 +- + init/Kconfig | 3 + + kernel/Makefile | 2 +- + kernel/bpf/Makefile | 3 + + kernel/bpf/arraymap.c | 17 + + kernel/bpf/bpf_inode_storage.c | 274 +++ + kernel/bpf/bpf_iter.c | 58 + + kernel/bpf/bpf_local_storage.c | 600 +++++++ + kernel/bpf/bpf_lsm.c | 21 +- + kernel/bpf/bpf_struct_ops.c | 6 +- + kernel/bpf/btf.c | 163 +- + kernel/bpf/cpumap.c | 12 +- + kernel/bpf/devmap.c | 17 +- + kernel/bpf/hashtab.c | 16 +- + kernel/bpf/helpers.c | 22 + + kernel/bpf/inode.c | 116 +- + kernel/bpf/lpm_trie.c | 1 + + kernel/bpf/map_in_map.c | 24 +- + kernel/bpf/map_in_map.h | 2 - + kernel/bpf/map_iter.c | 15 + + kernel/bpf/preload/Kconfig | 26 + + kernel/bpf/preload/Makefile | 23 + + kernel/bpf/preload/bpf_preload.h | 16 + + kernel/bpf/preload/bpf_preload_kern.c | 91 + + kernel/bpf/preload/bpf_preload_umd_blob.S | 7 + + kernel/bpf/preload/iterators/.gitignore | 2 + + kernel/bpf/preload/iterators/Makefile | 57 + + kernel/bpf/preload/iterators/README | 4 + + kernel/bpf/preload/iterators/bpf_preload_common.h | 13 + + kernel/bpf/preload/iterators/iterators.bpf.c | 114 ++ + kernel/bpf/preload/iterators/iterators.c | 94 ++ + kernel/bpf/preload/iterators/iterators.skel.h | 410 +++++ + kernel/bpf/queue_stack_maps.c | 2 + + kernel/bpf/reuseport_array.c | 1 + + kernel/bpf/ringbuf.c | 1 + + kernel/bpf/stackmap.c | 1 + + kernel/bpf/syscall.c | 68 +- + kernel/bpf/trampoline.c | 29 +- + kernel/bpf/verifier.c | 283 +++- + kernel/trace/bpf_trace.c | 50 + + lib/nlattr.c | 63 +- + mm/filemap.c | 8 +- + mm/page_alloc.c | 2 +- + net/batman-adv/bat_iv_ogm.c | 1 + + net/batman-adv/bat_v_elp.c | 1 + + net/batman-adv/bat_v_ogm.c | 1 + + net/batman-adv/bridge_loop_avoidance.c | 2 +- + net/batman-adv/fragmentation.c | 2 +- + net/batman-adv/hard-interface.c | 19 +- + net/batman-adv/hard-interface.h | 1 - + net/batman-adv/main.c | 1 - + net/batman-adv/main.h | 2 +- + net/batman-adv/multicast.c | 2 +- + net/batman-adv/network-coding.c | 4 +- + net/batman-adv/send.c | 2 +- + net/batman-adv/soft-interface.c | 4 +- + net/batman-adv/types.h | 4 +- + net/bpfilter/Kconfig | 1 + + net/bridge/br_mdb.c | 256 ++- + net/bridge/br_multicast.c | 1290 ++++++++++++-- + net/bridge/br_netlink.c | 4 +- + net/bridge/br_private.h | 70 +- + net/bridge/br_vlan.c | 4 +- + net/caif/cfsrvl.c | 1 - + net/core/bpf_sk_storage.c | 833 ++------- + net/core/datagram.c | 33 +- + net/core/dev.c | 2 +- + net/core/devlink.c | 11 +- + net/core/filter.c | 416 ++++- + net/core/ptp_classifier.c | 30 + + net/core/skbuff.c | 3 +- + net/core/skmsg.c | 34 +- + net/core/sock.c | 14 - + net/core/sock_map.c | 91 +- + net/core/sysctl_net_core.c | 17 +- + net/dccp/ackvec.c | 2 +- + net/dccp/ipv4.c | 2 +- + net/dccp/timer.c | 2 +- + net/ethtool/channels.c | 2 +- + net/ethtool/ioctl.c | 30 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/fou.c | 4 +- + net/ipv4/icmp.c | 6 +- + net/ipv4/inet_diag.c | 17 + + net/ipv4/inet_hashtables.c | 6 +- + net/ipv4/ip_options.c | 35 +- + net/ipv4/ip_output.c | 6 +- + net/ipv4/ip_sockglue.c | 5 +- + net/ipv4/nexthop.c | 49 +- + net/ipv4/ping.c | 29 +- + net/ipv4/raw.c | 5 +- + net/ipv4/route.c | 19 +- + net/ipv4/tcp.c | 16 +- + net/ipv4/tcp_bpf.c | 13 +- + net/ipv4/tcp_fastopen.c | 2 +- + net/ipv4/tcp_input.c | 127 +- + net/ipv4/tcp_ipv4.c | 7 +- + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/tcp_output.c | 193 ++- + net/ipv4/tcp_scalable.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv4/udp_bpf.c | 9 +- + net/ipv6/addrconf_core.c | 8 + + net/ipv6/af_inet6.c | 2 + + net/ipv6/inet6_hashtables.c | 6 +- + net/ipv6/ip6_fib.c | 12 +- + net/ipv6/tcp_ipv6.c | 5 +- + net/l2tp/Makefile | 2 + + net/l2tp/l2tp_core.c | 324 ++-- + net/l2tp/l2tp_core.h | 33 +- + net/l2tp/l2tp_debugfs.c | 4 +- + net/l2tp/l2tp_eth.c | 13 +- + net/l2tp/l2tp_ip.c | 17 +- + net/l2tp/l2tp_ip6.c | 17 +- + net/l2tp/l2tp_netlink.c | 18 +- + net/l2tp/l2tp_ppp.c | 70 +- + net/l2tp/trace.h | 211 +++ + net/mac80211/agg-rx.c | 2 +- + net/mac80211/cfg.c | 14 +- + net/mac80211/ibss.c | 4 +- + net/mac80211/ieee80211_i.h | 6 +- + net/mac80211/main.c | 2 +- + net/mac80211/mesh.c | 6 +- + net/mac80211/offchannel.c | 2 +- + net/mac80211/tx.c | 73 +- + net/mptcp/pm_netlink.c | 4 +- + net/mptcp/protocol.c | 2 - + net/netlabel/netlabel_domainhash.c | 5 +- + net/netlink/af_netlink.c | 8 +- + net/netlink/genetlink.c | 2 +- + net/netlink/policy.c | 33 +- + net/nfc/digital_dep.c | 3 - + net/openvswitch/actions.c | 12 +- + net/openvswitch/datapath.c | 46 +- + net/openvswitch/flow_table.c | 70 +- + net/openvswitch/flow_table.h | 1 - + net/openvswitch/vport.c | 7 +- + net/packet/af_packet.c | 1 - + net/rxrpc/rtt.c | 1 - + net/sched/act_ct.c | 8 +- + net/sched/act_ctinfo.c | 5 +- + net/sched/act_gate.c | 4 +- + net/sctp/associola.c | 4 +- + net/sctp/auth.c | 4 +- + net/sctp/bind_addr.c | 2 +- + net/sctp/chunk.c | 2 +- + net/sctp/protocol.c | 8 +- + net/sctp/sm_make_chunk.c | 6 +- + net/sctp/ulpqueue.c | 2 +- + net/socket.c | 8 +- + net/sunrpc/sysctl.c | 6 +- + net/tipc/core.c | 6 + + net/tipc/core.h | 8 + + net/tipc/link.c | 5 - + net/tipc/net.c | 20 +- + net/tipc/net.h | 1 + + net/tipc/socket.c | 1 - + net/tls/tls_main.c | 25 +- + net/wireless/core.h | 4 +- + net/wireless/nl80211.c | 270 ++- + net/wireless/reg.c | 257 ++- + net/wireless/scan.c | 4 +- + net/wireless/sme.c | 2 +- + net/wireless/wext-compat.c | 2 +- + net/xdp/xdp_umem.c | 225 +-- + net/xdp/xdp_umem.h | 6 - + net/xdp/xsk.c | 213 ++- + net/xdp/xsk.h | 10 +- + net/xdp/xsk_buff_pool.c | 380 ++++- + net/xdp/xsk_diag.c | 16 +- + net/xdp/xsk_queue.h | 12 +- + net/xdp/xskmap.c | 8 + + samples/bpf/Makefile | 21 +- + samples/bpf/cpustat_kern.c | 36 +- + samples/bpf/cpustat_user.c | 47 +- + samples/bpf/lathist_kern.c | 24 +- + samples/bpf/lathist_user.c | 42 +- + samples/bpf/offwaketime_kern.c | 52 +- + samples/bpf/offwaketime_user.c | 66 +- + samples/bpf/spintest_kern.c | 36 +- + samples/bpf/spintest_user.c | 68 +- + samples/bpf/syscall_tp_kern.c | 24 +- + samples/bpf/syscall_tp_user.c | 54 +- + samples/bpf/task_fd_query_kern.c | 2 +- + samples/bpf/task_fd_query_user.c | 2 +- + samples/bpf/test_current_task_under_cgroup_kern.c | 27 +- + samples/bpf/test_current_task_under_cgroup_user.c | 52 +- + samples/bpf/test_probe_write_user_kern.c | 12 +- + samples/bpf/test_probe_write_user_user.c | 49 +- + samples/bpf/trace_output_kern.c | 15 +- + samples/bpf/trace_output_user.c | 55 +- + samples/bpf/tracex3_kern.c | 2 +- + samples/bpf/xdpsock_user.c | 32 +- + samples/bpf/xsk_fwd.c | 1085 ++++++++++++ + scripts/bpf_helpers_doc.py | 2 + + security/bpf/hooks.c | 6 + + tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- + tools/bpf/bpftool/Makefile | 6 +- + tools/bpf/bpftool/bash-completion/bpftool | 3 +- + tools/bpf/bpftool/gen.c | 2 - + tools/bpf/bpftool/link.c | 44 +- + tools/bpf/bpftool/map.c | 3 +- + tools/bpf/bpftool/net.c | 299 +++- + tools/bpf/resolve_btfids/main.c | 29 +- + tools/build/Makefile | 2 + + tools/build/Makefile.feature | 1 - + tools/build/feature/Makefile | 4 - + tools/build/feature/test-all.c | 4 - + tools/build/feature/test-libelf-mmap.c | 9 - + tools/include/linux/btf_ids.h | 51 +- + tools/include/uapi/linux/bpf.h | 398 ++++- + tools/lib/bpf/Makefile | 23 +- + tools/lib/bpf/bpf.c | 3 - + tools/lib/bpf/bpf_core_read.h | 120 +- + tools/lib/bpf/bpf_helpers.h | 3 + + tools/lib/bpf/bpf_prog_linfo.c | 3 - + tools/lib/bpf/bpf_tracing.h | 4 +- + tools/lib/bpf/btf.c | 31 +- + tools/lib/bpf/btf.h | 38 - + tools/lib/bpf/btf_dump.c | 9 +- + tools/lib/bpf/hashmap.c | 3 + + tools/lib/bpf/libbpf.c | 1759 ++++++++++++++------ + tools/lib/bpf/libbpf.h | 4 + + tools/lib/bpf/libbpf.map | 9 + + tools/lib/bpf/libbpf_internal.h | 138 +- + tools/lib/bpf/libbpf_probes.c | 8 +- + tools/lib/bpf/netlink.c | 128 +- + tools/lib/bpf/nlattr.c | 9 +- + tools/lib/bpf/ringbuf.c | 8 +- + tools/lib/bpf/xsk.c | 379 +++-- + tools/lib/bpf/xsk.h | 9 + + tools/perf/Makefile.config | 4 - + tools/perf/util/symbol.h | 2 +- + tools/testing/selftests/bpf/Makefile | 2 +- + tools/testing/selftests/bpf/README.rst | 21 + + tools/testing/selftests/bpf/bench.c | 2 + + tools/testing/selftests/bpf/benchs/bench_trigger.c | 17 + + tools/testing/selftests/bpf/network_helpers.c | 37 + + tools/testing/selftests/bpf/network_helpers.h | 2 + + .../selftests/bpf/prog_tests/btf_map_in_map.c | 35 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 350 +++- + tools/testing/selftests/bpf/prog_tests/d_path.c | 147 ++ + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 68 + + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 65 +- + .../selftests/bpf/prog_tests/resolve_btfids.c | 39 +- + tools/testing/selftests/bpf/prog_tests/sk_assign.c | 5 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 76 + + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 622 +++++++ + .../testing/selftests/bpf/prog_tests/test_bpffs.c | 94 ++ + .../selftests/bpf/prog_tests/test_local_storage.c | 60 + + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 9 + + .../selftests/bpf/progs/btf__core_reloc_enumval.c | 3 + + .../bpf/progs/btf__core_reloc_enumval___diff.c | 3 + + .../progs/btf__core_reloc_enumval___err_missing.c | 3 + + .../progs/btf__core_reloc_enumval___val3_missing.c | 3 + + .../progs/btf__core_reloc_size___err_ambiguous.c | 4 + + .../bpf/progs/btf__core_reloc_type_based.c | 3 + + .../btf__core_reloc_type_based___all_missing.c | 3 + + .../progs/btf__core_reloc_type_based___diff_sz.c | 3 + + .../btf__core_reloc_type_based___fn_wrong_args.c | 3 + + .../progs/btf__core_reloc_type_based___incompat.c | 3 + + .../selftests/bpf/progs/btf__core_reloc_type_id.c | 3 + + .../btf__core_reloc_type_id___missing_targets.c | 3 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 352 +++- + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 27 + + .../selftests/bpf/progs/freplace_attach_probe.c | 40 + + .../selftests/bpf/progs/freplace_cls_redirect.c | 34 + + .../selftests/bpf/progs/freplace_connect_v4_prog.c | 19 + + tools/testing/selftests/bpf/progs/local_storage.c | 140 ++ + tools/testing/selftests/bpf/progs/lsm.c | 64 +- + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 6 +- + .../selftests/bpf/progs/test_btf_map_in_map.c | 31 + + .../selftests/bpf/progs/test_core_reloc_enumval.c | 72 + + .../selftests/bpf/progs/test_core_reloc_kernel.c | 2 + + .../bpf/progs/test_core_reloc_type_based.c | 110 ++ + .../selftests/bpf/progs/test_core_reloc_type_id.c | 115 ++ + tools/testing/selftests/bpf/progs/test_d_path.c | 58 + + .../bpf/progs/test_misc_tcp_hdr_options.c | 325 ++++ + .../testing/selftests/bpf/progs/test_pkt_access.c | 20 + + .../bpf/progs/test_sockmap_invalid_update.c | 23 + + .../selftests/bpf/progs/test_sockmap_update.c | 48 + + .../selftests/bpf/progs/test_tcp_hdr_options.c | 623 +++++++ + tools/testing/selftests/bpf/progs/test_vmlinux.c | 12 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 7 + + .../selftests/bpf/test_current_pid_tgid_new_ns.c | 1 + + tools/testing/selftests/bpf/test_tcp_hdr_options.h | 151 ++ + tools/testing/selftests/bpf/test_verifier.c | 19 +- + tools/testing/selftests/bpf/verifier/bounds.c | 146 ++ + tools/testing/selftests/bpf/verifier/d_path.c | 37 + + .../drivers/net/mlxsw/devlink_trap_policer.sh | 33 +- + .../selftests/drivers/net/mlxsw/tc_police_scale.sh | 12 +- + tools/testing/selftests/net/fib_nexthops.sh | 30 + + .../testing/selftests/net/forwarding/mirror_lib.sh | 2 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 +- + tools/testing/selftests/net/psock_snd.sh | 16 +- + tools/testing/selftests/net/tcp_mmap.c | 42 +- + 648 files changed, 25507 insertions(+), 9438 deletions(-) + create mode 100644 Documentation/bpf/prog_sk_lookup.rst + create mode 100644 Documentation/devicetree/bindings/net/intel,dwmac-plat.yaml + create mode 100644 Documentation/devicetree/bindings/net/ti,dp83822.yaml + create mode 100644 drivers/net/ethernet/chelsio/inline_crypto/Kconfig + create mode 100644 drivers/net/ethernet/chelsio/inline_crypto/Makefile + create mode 100644 drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/Makefile + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto/ch_ipsec}/chcr_ipsec.c (88%) + create mode 100644 drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/Makefile (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls.h (81%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_cm.c (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_cm.h (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_hw.c (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_io.c (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_main.c (99%) + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_debugfs.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_debugfs.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/ptp.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/ptp.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.h + rename drivers/net/ethernet/mellanox/mlx5/core/en/xsk/{umem.c => pool.c} (51%) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/umem.h + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_devlink.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_devlink.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c + create mode 100644 drivers/net/mdio/Kconfig + create mode 100644 drivers/net/mdio/Makefile + rename drivers/net/{phy => mdio}/mdio-aspeed.c (100%) + rename drivers/net/{phy => mdio}/mdio-bcm-iproc.c (100%) + rename drivers/net/{phy => mdio}/mdio-bcm-unimac.c (100%) + rename drivers/net/{phy => mdio}/mdio-bitbang.c (100%) + rename drivers/net/{phy => mdio}/mdio-cavium.c (100%) + rename drivers/net/{phy => mdio}/mdio-cavium.h (100%) + rename drivers/net/{phy => mdio}/mdio-gpio.c (100%) + rename drivers/net/{phy => mdio}/mdio-hisi-femac.c (100%) + rename drivers/net/{phy => mdio}/mdio-i2c.c (98%) + rename drivers/net/{phy => mdio}/mdio-ipq4019.c (100%) + rename drivers/net/{phy => mdio}/mdio-ipq8064.c (100%) + rename drivers/net/{phy => mdio}/mdio-moxart.c (100%) + rename drivers/net/{phy => mdio}/mdio-mscc-miim.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-bcm-iproc.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-gpio.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-meson-g12a.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-mmioreg.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-multiplexer.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux.c (100%) + rename drivers/net/{phy => mdio}/mdio-mvusb.c (100%) + rename drivers/net/{phy => mdio}/mdio-octeon.c (100%) + rename drivers/net/{phy => mdio}/mdio-sun4i.c (100%) + rename drivers/net/{phy => mdio}/mdio-thunder.c (100%) + rename drivers/net/{phy => mdio}/mdio-xgene.c (99%) + create mode 100644 drivers/net/pcs/Kconfig + create mode 100644 drivers/net/pcs/Makefile + create mode 100644 drivers/net/pcs/pcs-lynx.c + rename drivers/net/{phy/mdio-xpcs.c => pcs/pcs-xpcs.c} (99%) + create mode 100644 include/linux/bpf_local_storage.h + rename {drivers/net/phy => include/linux/mdio}/mdio-i2c.h (100%) + rename {drivers/net/phy => include/linux/mdio}/mdio-xgene.h (100%) + create mode 100644 include/linux/pcs-lynx.h + rename include/linux/{mdio-xpcs.h => pcs/pcs-xpcs.h} (88%) + create mode 100644 kernel/bpf/bpf_inode_storage.c + create mode 100644 kernel/bpf/bpf_local_storage.c + create mode 100644 kernel/bpf/preload/Kconfig + create mode 100644 kernel/bpf/preload/Makefile + create mode 100644 kernel/bpf/preload/bpf_preload.h + create mode 100644 kernel/bpf/preload/bpf_preload_kern.c + create mode 100644 kernel/bpf/preload/bpf_preload_umd_blob.S + create mode 100644 kernel/bpf/preload/iterators/.gitignore + create mode 100644 kernel/bpf/preload/iterators/Makefile + create mode 100644 kernel/bpf/preload/iterators/README + create mode 100644 kernel/bpf/preload/iterators/bpf_preload_common.h + create mode 100644 kernel/bpf/preload/iterators/iterators.bpf.c + create mode 100644 kernel/bpf/preload/iterators/iterators.c + create mode 100644 kernel/bpf/preload/iterators/iterators.skel.h + create mode 100644 net/l2tp/trace.h + create mode 100644 samples/bpf/xsk_fwd.c + delete mode 100644 tools/build/feature/test-libelf-mmap.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/d_path.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpffs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enumval.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enumval___diff.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enumval___err_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enumval___val3_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_size___err_ambiguous.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___all_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___diff_sz.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___fn_wrong_args.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___incompat.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_id.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_id___missing_targets.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_attach_probe.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_cls_redirect.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_enumval.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_type_based.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_type_id.c + create mode 100644 tools/testing/selftests/bpf/progs/test_d_path.c + create mode 100644 tools/testing/selftests/bpf/progs/test_misc_tcp_hdr_options.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_invalid_update.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_update.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c + create mode 100644 tools/testing/selftests/bpf/test_tcp_hdr_options.h + create mode 100644 tools/testing/selftests/bpf/verifier/d_path.c +Merging bpf-next/master (bc0b5a03079b tools, bpf: Synchronise BPF UAPI header with tools) +$ git merge bpf-next/master +Auto-merging tools/lib/bpf/libbpf.c +Merge made by the 'recursive' strategy. + include/uapi/linux/bpf.h | 87 +- + kernel/bpf/task_iter.c | 15 +- + net/xdp/xsk.c | 7 +- + net/xdp/xsk.h | 1 - + net/xdp/xsk_buff_pool.c | 2 +- + net/xdp/xsk_diag.c | 14 +- + net/xdp/xskmap.c | 5 - + samples/bpf/.gitignore | 1 + + samples/bpf/sockex3_user.c | 6 +- + samples/bpf/spintest_user.c | 6 +- + samples/bpf/tracex5_user.c | 6 +- + samples/bpf/xdp_redirect_cpu_user.c | 2 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 2 +- + tools/bpf/bpftool/prog.c | 4 +- + tools/include/uapi/linux/bpf.h | 87 +- + tools/lib/bpf/btf.h | 18 +- + tools/lib/bpf/libbpf.c | 1287 +++++++++++++------- + tools/lib/bpf/libbpf.h | 5 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_common.h | 2 + + tools/testing/selftests/bpf/flow_dissector_load.h | 8 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 21 + + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 4 + + .../selftests/bpf/prog_tests/cls_redirect.c | 72 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 21 +- + .../selftests/bpf/prog_tests/global_data_init.c | 3 +- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 9 +- + .../selftests/bpf/prog_tests/reference_tracking.c | 2 +- + tools/testing/selftests/bpf/prog_tests/subprogs.c | 31 + + .../selftests/bpf/prog_tests/xdp_noinline.c | 49 +- + .../selftests/bpf/progs/bpf_iter_task_file.c | 10 +- + tools/testing/selftests/bpf/progs/pyperf.h | 11 +- + .../testing/selftests/bpf/progs/pyperf_subprogs.c | 5 + + tools/testing/selftests/bpf/progs/strobemeta.h | 30 +- + .../selftests/bpf/progs/strobemeta_subprogs.c | 10 + + .../selftests/bpf/progs/test_cls_redirect.c | 105 +- + .../bpf/progs/test_cls_redirect_subprogs.c | 2 + + .../selftests/bpf/progs/test_l4lb_noinline.c | 41 +- + tools/testing/selftests/bpf/progs/test_subprogs.c | 103 ++ + .../selftests/bpf/progs/test_xdp_noinline.c | 36 +- + tools/testing/selftests/bpf/test_socket_cookie.c | 2 +- + 41 files changed, 1400 insertions(+), 733 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/subprogs.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf_subprogs.c + create mode 100644 tools/testing/selftests/bpf/progs/strobemeta_subprogs.c + create mode 100644 tools/testing/selftests/bpf/progs/test_cls_redirect_subprogs.c + create mode 100644 tools/testing/selftests/bpf/progs/test_subprogs.c +$ git reset --hard HEAD^ +HEAD is now at cf88752412ba Merge remote-tracking branch 'net-next/master' into master +Merging next-20200903 version of bpf-next +$ git merge -m next-20200903/bpf-next 1ba5fe2facf7f66ead1d3509c38f2bbc2bdc4378 +Merge made by the 'recursive' strategy. + kernel/bpf/task_iter.c | 15 +++++++++++---- + net/xdp/xsk.c | 7 +------ + net/xdp/xsk.h | 1 - + net/xdp/xsk_buff_pool.c | 2 +- + net/xdp/xsk_diag.c | 14 ++++++-------- + net/xdp/xskmap.c | 5 ----- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 21 +++++++++++++++++++++ + .../selftests/bpf/progs/bpf_iter_task_file.c | 10 +++++++++- + 8 files changed, 49 insertions(+), 26 deletions(-) +Merging ipsec-next/master (02a20d4fef3d enic: switch from 'pci_' to 'dma_' API) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (144b0a0e6086 ipvs: remove dependency on ip6_tables) +$ git merge netfilter-next/master +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging include/uapi/linux/netfilter/nf_tables.h +Auto-merging include/net/netfilter/nf_tables.h +Merge made by the 'recursive' strategy. + include/linux/netfilter/nf_conntrack_common.h | 2 +- + include/net/ip_vs.h | 3 -- + include/net/netfilter/nf_tables.h | 2 ++ + include/uapi/linux/netfilter/nf_tables.h | 4 +++ + include/uapi/linux/netfilter/nfnetlink_conntrack.h | 3 +- + net/ipv6/netfilter/ip6t_NPT.c | 39 ++++++++++++++++++++++ + net/netfilter/ipvs/Kconfig | 1 - + net/netfilter/ipvs/ip_vs_ctl.c | 7 ++-- + net/netfilter/nf_conntrack_core.c | 25 ++++++-------- + net/netfilter/nf_conntrack_netlink.c | 5 +-- + net/netfilter/nf_conntrack_standalone.c | 4 +-- + net/netfilter/nf_tables_api.c | 22 +++++++++++- + net/netfilter/nft_socket.c | 27 +++++++++++++++ + net/netfilter/xt_HMARK.c | 2 +- + 14 files changed, 116 insertions(+), 30 deletions(-) +Merging ipvs-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (cc95fa81524a brcmfmac: set F2 SDIO block size to 128 bytes for BCM4329) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/marvell/mwifiex/fw.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +Auto-merging drivers/net/wireless/ath/ath11k/wmi.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/admtek/adm8211.c | 83 +- + drivers/net/wireless/ath/ath10k/bmi.c | 8 - + drivers/net/wireless/ath/ath10k/ce.c | 32 +- + drivers/net/wireless/ath/ath10k/core.c | 10 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 26 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 6 +- + drivers/net/wireless/ath/ath10k/mac.c | 70 +- + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/ath10k/sdio.c | 4 + + drivers/net/wireless/ath/ath10k/snoc.c | 9 + + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 2 + + drivers/net/wireless/ath/ath10k/wow.c | 2 +- + drivers/net/wireless/ath/ath11k/Kconfig | 18 +- + drivers/net/wireless/ath/ath11k/Makefile | 10 +- + drivers/net/wireless/ath/ath11k/ahb.c | 151 +-- + drivers/net/wireless/ath/ath11k/ce.c | 144 ++- + drivers/net/wireless/ath/ath11k/ce.h | 12 +- + drivers/net/wireless/ath/ath11k/core.c | 207 +++- + drivers/net/wireless/ath/ath11k/core.h | 58 +- + drivers/net/wireless/ath/ath11k/dbring.c | 2 +- + drivers/net/wireless/ath/ath11k/debug.c | 46 +- + drivers/net/wireless/ath/ath11k/debug.h | 1 + + drivers/net/wireless/ath/ath11k/dp.c | 216 +++- + drivers/net/wireless/ath/ath11k/dp.h | 13 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 219 +++- + drivers/net/wireless/ath/ath11k/dp_tx.c | 67 +- + drivers/net/wireless/ath/ath11k/hal.c | 169 +-- + drivers/net/wireless/ath/ath11k/hal.h | 179 +-- + drivers/net/wireless/ath/ath11k/hal_rx.c | 10 +- + drivers/net/wireless/ath/ath11k/hal_tx.c | 2 +- + drivers/net/wireless/ath/ath11k/hif.h | 30 + + drivers/net/wireless/ath/ath11k/htc.c | 4 +- + drivers/net/wireless/ath/ath11k/hw.c | 378 +++++++ + drivers/net/wireless/ath/ath11k/hw.h | 143 ++- + drivers/net/wireless/ath/ath11k/mac.c | 131 ++- + drivers/net/wireless/ath/ath11k/mhi.c | 467 ++++++++ + drivers/net/wireless/ath/ath11k/mhi.h | 39 + + drivers/net/wireless/ath/ath11k/pci.c | 1173 ++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/pci.h | 65 ++ + drivers/net/wireless/ath/ath11k/peer.c | 3 - + drivers/net/wireless/ath/ath11k/qmi.c | 314 +++++- + drivers/net/wireless/ath/ath11k/qmi.h | 27 +- + drivers/net/wireless/ath/ath11k/reg.c | 2 +- + drivers/net/wireless/ath/ath11k/spectral.c | 8 +- + drivers/net/wireless/ath/ath11k/wmi.c | 103 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 2 +- + drivers/net/wireless/ath/ath5k/base.c | 2 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/pcu.c | 6 +- + drivers/net/wireless/ath/ath5k/phy.c | 6 +- + drivers/net/wireless/ath/ath5k/reset.c | 2 +- + drivers/net/wireless/ath/ath5k/rfbuffer.h | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 6 +- + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/ath6kl/main.c | 5 +- + drivers/net/wireless/ath/ath9k/ani.c | 2 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/channel.c | 4 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 2 + + drivers/net/wireless/ath/ath9k/hw.c | 6 +- + drivers/net/wireless/ath/ath9k/init.c | 1 + + drivers/net/wireless/ath/ath9k/main.c | 14 +- + drivers/net/wireless/ath/ath9k/pci.c | 5 +- + drivers/net/wireless/ath/ath9k/wmi.c | 2 +- + drivers/net/wireless/ath/ath9k/wmi.h | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 15 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 57 +- + drivers/net/wireless/ath/wcn36xx/main.c | 13 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 36 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 4 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 151 ++- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 11 +- + drivers/net/wireless/atmel/atmel.c | 4 +- + drivers/net/wireless/broadcom/b43/dma.c | 2 +- + drivers/net/wireless/broadcom/b43/main.c | 14 +- + drivers/net/wireless/broadcom/b43/phy_common.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_ht.c | 3 - + drivers/net/wireless/broadcom/b43/phy_n.c | 21 +- + drivers/net/wireless/broadcom/b43/pio.c | 2 +- + drivers/net/wireless/broadcom/b43/tables_nphy.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/dma.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 15 +- + drivers/net/wireless/broadcom/b43legacy/pio.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c | 12 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 13 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 20 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 + + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 31 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 +- + .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 35 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 17 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.h | 2 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 38 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 6 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 40 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 47 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c | 13 - + .../broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 268 ----- + drivers/net/wireless/cisco/airo.c | 898 ++++++++------- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 9 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 52 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 34 +- + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 8 +- + drivers/net/wireless/intel/iwlegacy/3945.c | 46 +- + drivers/net/wireless/intel/iwlegacy/4965-calib.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 67 +- + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 10 +- + drivers/net/wireless/intel/iwlegacy/4965.c | 25 +- + drivers/net/wireless/intel/iwlegacy/common.c | 76 +- + drivers/net/wireless/intel/iwlegacy/debug.c | 3 +- + drivers/net/wireless/intersil/hostap/hostap.h | 6 +- + drivers/net/wireless/intersil/hostap/hostap_ap.c | 2 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 21 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 3 +- + drivers/net/wireless/intersil/orinoco/main.c | 11 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 14 +- + drivers/net/wireless/intersil/p54/p54pci.c | 12 +- + drivers/net/wireless/intersil/prism54/isl_38xx.c | 2 +- + drivers/net/wireless/intersil/prism54/isl_ioctl.c | 5 +- + drivers/net/wireless/intersil/prism54/islpci_dev.c | 2 +- + drivers/net/wireless/marvell/libertas/firmware.c | 4 +- + drivers/net/wireless/marvell/libertas/main.c | 6 +- + drivers/net/wireless/marvell/libertas_tf/cmd.c | 22 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 37 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 7 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 4 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 8 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 + + drivers/net/wireless/marvell/mwifiex/pcie.c | 323 ++++-- + drivers/net/wireless/marvell/mwifiex/pcie.h | 149 --- + drivers/net/wireless/marvell/mwifiex/scan.c | 4 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 427 +++++++ + drivers/net/wireless/marvell/mwifiex/sdio.h | 427 ------- + drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- + drivers/net/wireless/marvell/mwifiex/wmm.c | 15 + + drivers/net/wireless/marvell/mwifiex/wmm.h | 18 +- + drivers/net/wireless/marvell/mwl8k.c | 16 +- + drivers/net/wireless/mediatek/mt7601u/dma.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/mac.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 4 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 5 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 5 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 7 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 16 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 16 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 42 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 25 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.h | 10 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 - + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 10 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 23 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 1 - + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 70 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 146 +-- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 712 ++++++------ + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 354 +++--- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 720 ++++++------ + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 668 +++++------ + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 756 ++++++------- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 28 +- + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/cam.c | 82 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 263 ++--- + drivers/net/wireless/realtek/rtlwifi/debug.c | 10 +- + drivers/net/wireless/realtek/rtlwifi/debug.h | 14 +- + drivers/net/wireless/realtek/rtlwifi/efuse.c | 72 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 303 +++-- + drivers/net/wireless/realtek/rtlwifi/ps.c | 98 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 192 ++-- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 90 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 194 ++-- + .../net/wireless/realtek/rtlwifi/rtl8188ee/led.c | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 385 ++++--- + .../net/wireless/realtek/rtlwifi/rtl8188ee/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 24 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 224 ++-- + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 88 +- + .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 261 +++-- + .../net/wireless/realtek/rtlwifi/rtl8192ce/dm.c | 40 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 176 +-- + .../net/wireless/realtek/rtlwifi/rtl8192ce/led.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 121 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/dm.c | 38 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 152 +-- + .../net/wireless/realtek/rtlwifi/rtl8192cu/led.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 64 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 134 +-- + .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 58 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 312 +++--- + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 116 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 206 ++-- + .../net/wireless/realtek/rtlwifi/rtl8192de/led.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 414 +++---- + .../net/wireless/realtek/rtlwifi/rtl8192de/rf.c | 30 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/dm.c | 66 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 102 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 208 ++-- + .../net/wireless/realtek/rtlwifi/rtl8192ee/led.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 358 +++--- + .../net/wireless/realtek/rtlwifi/rtl8192ee/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 32 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/dm.c | 42 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 40 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 157 ++- + .../net/wireless/realtek/rtlwifi/rtl8192se/led.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 211 ++-- + .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 70 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/dm.c | 162 +-- + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 64 +- + .../realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c | 150 +-- + .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 649 +++++------ + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 232 ++-- + .../net/wireless/realtek/rtlwifi/rtl8723ae/led.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 357 +++--- + .../net/wireless/realtek/rtlwifi/rtl8723ae/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 118 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 66 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 202 ++-- + .../net/wireless/realtek/rtlwifi/rtl8723be/led.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 310 +++--- + .../net/wireless/realtek/rtlwifi/rtl8723be/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 24 +- + .../realtek/rtlwifi/rtl8723com/fw_common.c | 22 +- + .../realtek/rtlwifi/rtl8723com/phy_common.c | 36 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 821 +++++++------- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 134 +-- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 456 ++++---- + .../net/wireless/realtek/rtlwifi/rtl8821ae/led.c | 32 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 529 ++++----- + .../net/wireless/realtek/rtlwifi/rtl8821ae/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 59 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 28 +- + drivers/net/wireless/realtek/rtw88/debug.c | 6 +- + drivers/net/wireless/realtek/rtw88/mac.c | 13 +- + drivers/net/wireless/realtek/rtw88/main.c | 7 +- + drivers/net/wireless/realtek/rtw88/pci.c | 33 +- + drivers/net/wireless/realtek/rtw88/phy.c | 11 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 4 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 4 +- + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 32 +- + drivers/net/wireless/realtek/rtw88/tx.c | 4 +- + drivers/net/wireless/realtek/rtw88/tx.h | 2 +- + drivers/net/wireless/rndis_wlan.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_coex.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_debugfs.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_main.c | 5 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 33 +- + drivers/net/wireless/rsi/rsi_91x_ps.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 7 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 2 +- + drivers/net/wireless/st/cw1200/wsm.c | 6 +- + drivers/net/wireless/ti/wl1251/main.c | 2 +- + drivers/net/wireless/ti/wlcore/cmd.c | 7 +- + drivers/net/wireless/ti/wlcore/debugfs.h | 6 +- + drivers/net/wireless/wl3501_cs.c | 22 +- + drivers/net/wireless/zydas/zd1211rw/zd_chip.c | 4 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 15 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 9 +- + 288 files changed, 12808 insertions(+), 9707 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath11k/hw.c + create mode 100644 drivers/net/wireless/ath/ath11k/mhi.c + create mode 100644 drivers/net/wireless/ath/ath11k/mhi.h + create mode 100644 drivers/net/wireless/ath/ath11k/pci.c + create mode 100644 drivers/net/wireless/ath/ath11k/pci.h +Merging bluetooth/master (0e9952804ec9 Bluetooth: Clear suspend tasks on unregister) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_sdio.c | 54 +++-------------------------------------- + drivers/bluetooth/btusb.c | 9 ++++--- + drivers/bluetooth/hci_h5.c | 2 -- + drivers/bluetooth/hci_ldisc.c | 1 + + drivers/bluetooth/hci_serdev.c | 2 ++ + net/bluetooth/hci_core.c | 11 +++++++++ + 6 files changed, 23 insertions(+), 56 deletions(-) +Merging mac80211-next/master (0f091e43310f netlabel: remove unused param from audit_log_format()) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (2928eebec009 gfs2: Fix bad comment for trans_drain) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/log.c | 63 +++++++++++++++++++++++++++++---------------------------- + fs/gfs2/super.c | 2 ++ + fs/gfs2/util.h | 10 +++++++++ + 3 files changed, 44 insertions(+), 31 deletions(-) +Merging mtd/mtd/next (3fbe507ebd82 mtd: mtdconcat: map through panic write handler) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/devices/lart.c | 10 ++++++++-- + drivers/mtd/lpddr/lpddr2_nvm.c | 35 +++++++++++++++++--------------- + drivers/mtd/lpddr/lpddr_cmds.c | 28 ++++++++++++++++++++++++++ + drivers/mtd/maps/physmap-core.c | 3 ++- + drivers/mtd/mtdconcat.c | 44 +++++++++++++++++++++++++++++++++++++++++ + drivers/mtd/mtdcore.c | 28 ++++---------------------- + include/linux/mtd/pfow.h | 33 ------------------------------- + 7 files changed, 105 insertions(+), 76 deletions(-) +Merging nand/nand/next (3d53274a44dc mtd: rawnand: vf610: disable clk on error handling path in probe) +$ git merge nand/nand/next +Auto-merging arch/arm/mach-s3c/mach-vstms.c +Auto-merging arch/arm/mach-s3c/mach-rx3715.c +Auto-merging arch/arm/mach-s3c/mach-rx1950.c +Auto-merging arch/arm/mach-s3c/mach-real6410.c +Auto-merging arch/arm/mach-s3c/mach-qt2410.c +Auto-merging arch/arm/mach-s3c/mach-osiris.c +Auto-merging arch/arm/mach-s3c/mach-mini6410.c +Auto-merging arch/arm/mach-s3c/mach-mini2440.c +Auto-merging arch/arm/mach-s3c/mach-jive.c +Auto-merging arch/arm/mach-s3c/mach-hmt.c +Auto-merging arch/arm/mach-s3c/mach-gta02.c +Auto-merging arch/arm/mach-s3c/mach-bast.c +Auto-merging arch/arm/mach-s3c/mach-at2440evb.c +Auto-merging arch/arm/mach-s3c/mach-anubis.c +Auto-merging arch/arm/mach-s3c/common-smdk-s3c24xx.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/nand-controller.yaml | 31 ++ + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 3 +- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- + 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-s3c/common-smdk-s3c24xx.c | 2 +- + arch/arm/mach-s3c/mach-anubis.c | 2 +- + arch/arm/mach-s3c/mach-at2440evb.c | 2 +- + arch/arm/mach-s3c/mach-bast.c | 2 +- + arch/arm/mach-s3c/mach-gta02.c | 2 +- + arch/arm/mach-s3c/mach-hmt.c | 2 +- + arch/arm/mach-s3c/mach-jive.c | 2 +- + arch/arm/mach-s3c/mach-mini2440.c | 2 +- + arch/arm/mach-s3c/mach-mini6410.c | 2 +- + arch/arm/mach-s3c/mach-osiris.c | 2 +- + arch/arm/mach-s3c/mach-qt2410.c | 2 +- + arch/arm/mach-s3c/mach-real6410.c | 2 +- + arch/arm/mach-s3c/mach-rx1950.c | 2 +- + arch/arm/mach-s3c/mach-rx3715.c | 2 +- + arch/arm/mach-s3c/mach-vstms.c | 2 +- + drivers/mtd/nand/Kconfig | 8 + + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/ecc.c | 484 ++++++++++++++++++ + drivers/mtd/nand/raw/Kconfig | 1 + + drivers/mtd/nand/raw/ams-delta.c | 4 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 16 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 441 +++++++++------- + drivers/mtd/nand/raw/au1550nd.c | 4 +- + drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 3 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 28 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 4 +- + drivers/mtd/nand/raw/cafe_nand.c | 3 +- + drivers/mtd/nand/raw/cs553x_nand.c | 2 +- + drivers/mtd/nand/raw/davinci_nand.c | 38 +- + drivers/mtd/nand/raw/denali.c | 3 +- + drivers/mtd/nand/raw/denali_pci.c | 2 +- + drivers/mtd/nand/raw/diskonchip.c | 3 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 20 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 12 +- + drivers/mtd/nand/raw/fsl_upm.c | 4 +- + drivers/mtd/nand/raw/fsmc_nand.c | 14 +- + drivers/mtd/nand/raw/gpio.c | 4 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 15 +- + drivers/mtd/nand/raw/hisi504_nand.c | 6 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 20 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 2 +- + drivers/mtd/nand/raw/lpc32xx_slc.c | 3 +- + drivers/mtd/nand/raw/marvell_nand.c | 35 +- + drivers/mtd/nand/raw/meson_nand.c | 2 +- + drivers/mtd/nand/raw/mpc5121_nfc.c | 4 +- + drivers/mtd/nand/raw/mtk_nand.c | 12 +- + drivers/mtd/nand/raw/mxc_nand.c | 25 +- + drivers/mtd/nand/raw/nand_base.c | 553 ++++++++------------- + drivers/mtd/nand/raw/nand_esmt.c | 15 +- + drivers/mtd/nand/raw/nand_hynix.c | 44 +- + drivers/mtd/nand/raw/nand_jedec.c | 9 +- + drivers/mtd/nand/raw/nand_micron.c | 23 +- + drivers/mtd/nand/raw/nand_onfi.c | 17 +- + drivers/mtd/nand/raw/nand_samsung.c | 22 +- + drivers/mtd/nand/raw/nand_toshiba.c | 19 +- + drivers/mtd/nand/raw/nandsim.c | 8 +- + drivers/mtd/nand/raw/ndfc.c | 2 +- + drivers/mtd/nand/raw/omap2.c | 22 +- + drivers/mtd/nand/raw/orion_nand.c | 4 +- + drivers/mtd/nand/raw/oxnas_nand.c | 3 +- + drivers/mtd/nand/raw/pasemi_nand.c | 6 +- + drivers/mtd/nand/raw/plat_nand.c | 4 +- + drivers/mtd/nand/raw/qcom_nandc.c | 2 +- + drivers/mtd/nand/raw/r852.c | 3 +- + drivers/mtd/nand/raw/s3c2410.c | 20 +- + drivers/mtd/nand/raw/sh_flctl.c | 6 +- + drivers/mtd/nand/raw/sharpsl.c | 2 +- + drivers/mtd/nand/raw/socrates_nand.c | 5 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 11 +- + drivers/mtd/nand/raw/sunxi_nand.c | 27 +- + drivers/mtd/nand/raw/tango_nand.c | 4 +- + drivers/mtd/nand/raw/tegra_nand.c | 37 +- + drivers/mtd/nand/raw/tmio_nand.c | 2 +- + drivers/mtd/nand/raw/txx9ndfmc.c | 2 +- + drivers/mtd/nand/raw/vf610_nfc.c | 12 +- + drivers/mtd/nand/raw/xway_nand.c | 4 +- + drivers/mtd/nand/spi/core.c | 12 +- + drivers/mtd/nand/spi/macronix.c | 27 +- + drivers/mtd/nand/spi/toshiba.c | 6 +- + include/linux/mtd/nand.h | 188 ++++++- + include/linux/mtd/rawnand.h | 34 +- + include/linux/platform_data/mtd-davinci.h | 9 +- + include/linux/platform_data/mtd-nand-s3c2410.h | 2 +- + 94 files changed, 1572 insertions(+), 900 deletions(-) + create mode 100644 drivers/mtd/nand/ecc.c +$ git reset --hard HEAD^ +HEAD is now at de841836af52 Merge remote-tracking branch 'mtd/mtd/next' into master +Merging next-20200903 version of nand +$ git merge -m next-20200903/nand da151e3458c825fa9d57c2db6e37748166e4d129 +Already up to date. +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 (c68e418c603f crypto: amlogic - Fix endianness marker) +$ git merge crypto/master +Auto-merging crypto/tcrypt.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + arch/arm/crypto/curve25519-glue.c | 1 + + arch/arm/crypto/poly1305-glue.c | 1 + + arch/arm64/crypto/ghash-ce-glue.c | 4 +- + arch/arm64/crypto/sha1-ce-glue.c | 3 + + arch/arm64/crypto/sha2-ce-glue.c | 3 + + arch/powerpc/crypto/crc-vpmsum_test.c | 6 +- + arch/x86/crypto/blake2s-glue.c | 1 + + arch/x86/crypto/chacha_glue.c | 1 + + arch/x86/crypto/crc32c-intel_glue.c | 18 +- + arch/x86/crypto/curve25519-x86_64.c | 1 + + arch/x86/crypto/nhpoly1305-avx2-glue.c | 1 + + arch/x86/crypto/nhpoly1305-sse2-glue.c | 1 + + arch/x86/crypto/poly1305_glue.c | 1 + + crypto/ahash.c | 54 ++-- + crypto/algif_aead.c | 9 +- + crypto/algif_skcipher.c | 2 +- + crypto/crc32c_generic.c | 4 +- + crypto/crct10dif_generic.c | 2 +- + crypto/crypto_engine.c | 3 +- + crypto/ecrdsa.c | 1 + + crypto/internal.h | 16 +- + crypto/jitterentropy-kcapi.c | 2 +- + crypto/rsa-pkcs1pad.c | 1 + + crypto/tcrypt.c | 18 +- + crypto/tcrypt.h | 29 --- + crypto/testmgr.c | 1 + + drivers/char/hw_random/cctrng.c | 9 +- + drivers/char/hw_random/intel-rng.c | 2 +- + drivers/char/hw_random/optee-rng.c | 6 +- + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 15 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 16 +- + drivers/crypto/amcc/crypto4xx_core.h | 1 + + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 12 +- + drivers/crypto/caam/Makefile | 2 + + drivers/crypto/caam/ctrl.c | 77 +----- + drivers/crypto/caam/debugfs.c | 96 +++++++ + drivers/crypto/caam/debugfs.h | 26 ++ + drivers/crypto/caam/intern.h | 17 -- + drivers/crypto/caam/qi.c | 20 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 1 + + drivers/crypto/ccp/ccp-ops.c | 1 + + drivers/crypto/ccree/cc_cipher.c | 282 +-------------------- + drivers/crypto/ccree/cc_crypto_ctx.h | 1 - + drivers/crypto/ccree/cc_driver.c | 7 +- + drivers/crypto/ccree/cc_driver.h | 1 - + drivers/crypto/ccree/cc_pm.c | 6 +- + drivers/crypto/hifn_795x.c | 24 +- + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 36 +-- + drivers/crypto/hisilicon/hpre/hpre_main.c | 28 +- + drivers/crypto/hisilicon/qm.c | 224 ++++++++++++++-- + drivers/crypto/hisilicon/qm.h | 27 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 35 +-- + drivers/crypto/hisilicon/sec2/sec_main.c | 34 +-- + drivers/crypto/hisilicon/zip/zip_crypto.c | 2 +- + drivers/crypto/hisilicon/zip/zip_main.c | 49 ++-- + drivers/crypto/img-hash.c | 1 + + drivers/crypto/inside-secure/safexcel_hash.c | 3 +- + drivers/crypto/ixp4xx_crypto.c | 2 +- + drivers/crypto/marvell/cesa/cesa.h | 20 +- + drivers/crypto/marvell/cesa/cipher.c | 5 +- + drivers/crypto/marvell/cesa/hash.c | 24 +- + drivers/crypto/marvell/cesa/tdma.c | 16 +- + drivers/crypto/mediatek/mtk-aes.c | 57 ++--- + drivers/crypto/mediatek/mtk-platform.c | 4 +- + drivers/crypto/mediatek/mtk-sha.c | 2 +- + drivers/crypto/padlock-aes.c | 1 + + drivers/crypto/picoxcell_crypto.c | 9 +- + drivers/crypto/qce/core.c | 1 + + drivers/crypto/qce/sha.c | 1 + + drivers/crypto/qce/skcipher.c | 1 + + drivers/crypto/qcom-rng.c | 1 + + drivers/crypto/rockchip/rk3288_crypto.c | 1 + + drivers/crypto/rockchip/rk3288_crypto.h | 1 + + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 1 + + drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 1 + + drivers/crypto/sa2ul.c | 22 +- + drivers/crypto/sahara.c | 2 +- + drivers/crypto/stm32/stm32-crc32.c | 7 +- + drivers/crypto/stm32/stm32-cryp.c | 47 ++-- + drivers/crypto/stm32/stm32-hash.c | 5 +- + drivers/crypto/ux500/cryp/cryp_core.c | 4 +- + drivers/crypto/ux500/hash/hash_core.c | 31 ++- + drivers/crypto/virtio/Kconfig | 1 - + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 1 + + include/crypto/algapi.h | 8 +- + include/crypto/hash.h | 18 +- + include/crypto/internal/hash.h | 19 +- + 88 files changed, 716 insertions(+), 844 deletions(-) + create mode 100644 drivers/crypto/caam/debugfs.c + create mode 100644 drivers/crypto/caam/debugfs.h +Merging drm/drm-next (3393649977f9 Merge tag 'drm-intel-next-2020-08-24-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging kernel/params.c +Auto-merging drivers/video/fbdev/savage/savagefb_driver.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/savage/savagefb_driver.c +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/video/fbdev/controlfb.c +Auto-merging drivers/video/fbdev/atmel_lcdfb.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/atmel_lcdfb.c +Auto-merging drivers/video/fbdev/arcfb.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/arcfb.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_display.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/tegra/dsi.c +Auto-merging drivers/gpu/drm/sun4i/sun8i_vi_layer.c +Auto-merging drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_backend.c +Auto-merging drivers/gpu/drm/omapdrm/dss/venc.c +Removing drivers/gpu/drm/mxsfb/mxsfb_out.c +Removing drivers/gpu/drm/mxsfb/mxsfb_crtc.c +Auto-merging drivers/gpu/drm/ingenic/ingenic-drm-drv.c +Auto-merging drivers/gpu/drm/i915/display/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dsi.c +Auto-merging drivers/gpu/drm/drm_dp_helper.c +Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi86.c +Auto-merging drivers/gpu/drm/ast/ast_main.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Resolved 'drivers/video/fbdev/arcfb.c' using previous resolution. +Resolved 'drivers/video/fbdev/atmel_lcdfb.c' using previous resolution. +Resolved 'drivers/video/fbdev/savage/savagefb_driver.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master efc13ad8de41] Merge remote-tracking branch 'drm/drm-next' into master +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/lontium,lt9611.yaml | 176 +++ + .../bindings/display/bridge/toshiba,tc358762.yaml | 127 ++ + .../bindings/display/bridge/toshiba,tc358775.yaml | 215 ++++ + .../bindings/display/panel/ilitek,ili9881c.yaml | 4 +- + .../display/panel/mantix,mlaf057we51-x.yaml | 70 ++ + .../bindings/display/panel/panel-simple.yaml | 6 + + .../display/panel/rocktech,jh057n00900.yaml | 40 +- + .../devicetree/bindings/vendor-prefixes.yaml | 8 + + Documentation/gpu/drm-uapi.rst | 114 +- + Documentation/gpu/pl111.rst | 8 +- + Documentation/gpu/todo.rst | 46 + + MAINTAINERS | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 92 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 171 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 112 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 18 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 41 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 + + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/ast/ast_cursor.c | 11 +- + drivers/gpu/drm/ast/ast_dp501.c | 23 +- + drivers/gpu/drm/ast/ast_drv.c | 82 +- + drivers/gpu/drm/ast/ast_drv.h | 43 +- + drivers/gpu/drm/ast/ast_main.c | 74 +- + drivers/gpu/drm/ast/ast_mm.c | 2 +- + drivers/gpu/drm/ast/ast_mode.c | 40 +- + drivers/gpu/drm/ast/ast_post.c | 6 +- + drivers/gpu/drm/bridge/Kconfig | 31 + + drivers/gpu/drm/bridge/Makefile | 3 + + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 12 - + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 - + drivers/gpu/drm/bridge/lontium-lt9611.c | 1230 ++++++++++++++++++++ + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 109 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 101 +- + drivers/gpu/drm/bridge/panel.c | 7 - + drivers/gpu/drm/bridge/parade-ps8622.c | 100 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 29 +- + drivers/gpu/drm/bridge/tc358762.c | 280 +++++ + drivers/gpu/drm/bridge/tc358764.c | 109 +- + drivers/gpu/drm/bridge/tc358767.c | 123 +- + drivers/gpu/drm/bridge/tc358775.c | 749 ++++++++++++ + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 3 - + drivers/gpu/drm/drm_bridge_connector.c | 1 + + drivers/gpu/drm/drm_connector.c | 49 +- + drivers/gpu/drm/drm_dp_helper.c | 71 ++ + drivers/gpu/drm/drm_gem_vram_helper.c | 49 +- + drivers/gpu/drm/drm_panel.c | 85 +- + drivers/gpu/drm/drm_syncobj.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 - + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 9 - + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gma500/mdfld_device.c | 20 + + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 55 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.h | 2 +- + drivers/gpu/drm/gma500/mdfld_output.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 - + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 70 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 33 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 3 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 11 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 2 +- + drivers/gpu/drm/i915/display/intel_csr.c | 8 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 111 +- + drivers/gpu/drm/i915/display/intel_display.c | 88 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 3 + + drivers/gpu/drm/i915/display/intel_display_power.c | 16 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 6 + + drivers/gpu/drm/i915/display/intel_dp.c | 8 + + .../gpu/drm/i915/display/intel_dp_link_training.c | 19 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 52 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 17 + + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/display/intel_psr.c | 110 +- + drivers/gpu/drm/i915/display/intel_psr.h | 5 + + drivers/gpu/drm/i915/display/intel_sprite.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 367 ++++-- + drivers/gpu/drm/i915/gt/intel_lrc.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 113 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 24 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 4 +- + drivers/gpu/drm/i915/i915_active.c | 7 +- + drivers/gpu/drm/i915/i915_drv.c | 5 +- + drivers/gpu/drm/i915/i915_drv.h | 54 +- + drivers/gpu/drm/i915/i915_getparam.c | 1 + + drivers/gpu/drm/i915/i915_params.c | 5 + + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_reg.h | 32 +- + drivers/gpu/drm/i915/i915_request.c | 7 +- + drivers/gpu/drm/i915/intel_device_info.c | 19 + + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 14 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 2 +- + drivers/gpu/drm/imx/imx-ldb.c | 10 - + drivers/gpu/drm/imx/parallel-display.c | 6 - + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 41 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 38 +- + drivers/gpu/drm/mcde/mcde_display.c | 218 +++- + drivers/gpu/drm/mcde/mcde_drm.h | 67 +- + drivers/gpu/drm/mcde/mcde_drv.c | 81 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 276 +++-- + drivers/gpu/drm/mgag200/Kconfig | 12 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 227 +++- + drivers/gpu/drm/mgag200/mgag200_drv.h | 19 +- + drivers/gpu/drm/mgag200/mgag200_mm.c | 8 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 153 ++- + drivers/gpu/drm/mgag200/mgag200_reg.h | 4 + + .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 7 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 - + drivers/gpu/drm/mxsfb/Kconfig | 8 +- + drivers/gpu/drm/mxsfb/Makefile | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 343 ------ + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 252 ++-- + drivers/gpu/drm/mxsfb/mxsfb_drv.h | 42 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 571 +++++++++ + drivers/gpu/drm/mxsfb/mxsfb_out.c | 99 -- + drivers/gpu/drm/mxsfb/mxsfb_regs.h | 107 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 137 +-- + drivers/gpu/drm/nouveau/nouveau_bo.h | 14 +- + drivers/gpu/drm/nouveau/nouveau_bo0039.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo5039.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo74c1.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo85b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo9039.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo90b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_boa0b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 10 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 176 ++- + drivers/gpu/drm/nouveau/nouveau_ttm.h | 6 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 2 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 - + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 - + drivers/gpu/drm/omapdrm/dss/venc.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 17 - + drivers/gpu/drm/panel/Kconfig | 11 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 4 +- + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 6 +- + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 48 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 12 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 51 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 23 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 25 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 7 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 277 ++++- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 35 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 37 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 58 +- + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 49 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +- + drivers/gpu/drm/panel/panel-lvds.c | 13 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 328 ++++++ + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 60 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 46 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 4 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 13 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 4 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 4 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 6 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 37 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 18 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 20 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 7 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 27 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 9 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 9 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 26 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 7 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 201 +++- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 14 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 61 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +- + drivers/gpu/drm/panel/panel-sony-acx424akp.c | 85 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 7 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 6 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 42 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 63 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 41 +- + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 51 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 175 ++- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 30 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 61 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 14 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 16 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 14 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 10 +- + drivers/gpu/drm/pl111/pl111_drv.c | 20 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 21 +- + drivers/gpu/drm/qxl/qxl_drv.c | 6 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 2 +- + drivers/gpu/drm/qxl/qxl_object.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.h | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 75 +- + drivers/gpu/drm/radeon/radeon.h | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 123 +- + drivers/gpu/drm/radeon/radeon_vm.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 9 - + drivers/gpu/drm/sti/sti_dvo.c | 2 - + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 13 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 6 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 5 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 +- + drivers/gpu/drm/tegra/dsi.c | 4 +- + drivers/gpu/drm/tegra/output.c | 10 - + drivers/gpu/drm/tidss/tidss_dispc.c | 32 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 4 + + drivers/gpu/drm/ttm/Makefile | 3 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 347 ++---- + drivers/gpu/drm/ttm/ttm_bo_util.c | 104 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 12 +- + .../ttm/{ttm_bo_manager.c => ttm_range_manager.c} | 89 +- + drivers/gpu/drm/ttm/ttm_resource.c | 151 +++ + drivers/gpu/drm/ttm/ttm_tt.c | 6 +- + drivers/gpu/drm/v3d/v3d_drv.c | 13 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/gpu/drm/virtio/Kconfig | 1 + + drivers/gpu/drm/virtio/virtgpu_display.c | 2 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 3 + + drivers/gpu/drm/virtio/virtgpu_drv.h | 21 + + drivers/gpu/drm/virtio/virtgpu_gem.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 4 + + drivers/gpu/drm/virtio/virtgpu_prime.c | 96 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 55 + + drivers/gpu/drm/vkms/vkms_composer.c | 22 +- + drivers/gpu/drm/vkms/vkms_drv.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 73 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 75 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 60 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 73 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 121 +- + drivers/video/fbdev/arcfb.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 10 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +- + drivers/video/fbdev/pvr2fb.c | 2 + + drivers/video/fbdev/savage/savagefb_driver.c | 1 - + drivers/virtio/Kconfig | 7 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio.c | 6 + + drivers/virtio/virtio_dma_buf.c | 88 ++ + include/drm/drm_connector.h | 3 + + include/drm/drm_dp_helper.h | 8 + + include/drm/drm_mode_config.h | 6 + + include/drm/drm_panel.h | 15 +- + include/drm/i915_pciids.h | 4 +- + include/drm/ttm/ttm_bo_api.h | 109 +- + include/drm/ttm/ttm_bo_driver.h | 355 ++---- + include/drm/ttm/ttm_resource.h | 261 +++++ + include/drm/ttm/ttm_tt.h | 10 +- + include/linux/fb.h | 18 +- + include/linux/moduleparam.h | 7 +- + include/linux/virtio.h | 1 + + include/linux/virtio_dma_buf.h | 37 + + include/uapi/drm/drm_mode.h | 21 +- + include/uapi/drm/i915_drm.h | 59 +- + include/uapi/linux/virtio_gpu.h | 19 + + kernel/params.c | 17 +- + 310 files changed, 9627 insertions(+), 4594 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/lontium,lt9611.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358775.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml + create mode 100644 drivers/gpu/drm/bridge/lontium-lt9611.c + create mode 100644 drivers/gpu/drm/bridge/tc358762.c + create mode 100644 drivers/gpu/drm/bridge/tc358775.c + delete mode 100644 drivers/gpu/drm/mxsfb/mxsfb_crtc.c + create mode 100644 drivers/gpu/drm/mxsfb/mxsfb_kms.c + delete mode 100644 drivers/gpu/drm/mxsfb/mxsfb_out.c + create mode 100644 drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c + rename drivers/gpu/drm/ttm/{ttm_bo_manager.c => ttm_range_manager.c} (61%) + create mode 100644 drivers/gpu/drm/ttm/ttm_resource.c + create mode 100644 drivers/virtio/virtio_dma_buf.c + create mode 100644 include/drm/ttm/ttm_resource.h + create mode 100644 include/linux/virtio_dma_buf.h +$ git am -3 ../patches/0001-fix-interaction-with-drm-misc-fix-commit.patch +Applying: fix interaction with drm-misc-fix commit +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/qxl/qxl_display.c +$ git add -A . +$ git commit -v -a --amend +[master 361c081229ea] Merge remote-tracking branch 'drm/drm-next' into master + Date: Tue Sep 8 13:37:48 2020 +1000 +Merging amdgpu/drm-next (1b7eca59ceb0 Revert "drm/radeon: handle PCIe root ports with addressing limitations") +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging include/drm/gpu_scheduler.h +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_internal.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_thermal.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +Auto-merging drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h +Auto-merging drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_link_encoder.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_types.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_stream.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_stream.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/bios/command_table2.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/bios/command_table2.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.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/vcn_v3_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/atombios_dp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/bios/command_table2.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/inc/smu_v11_0.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 276bd556af16] Merge remote-tracking branch 'amdgpu/drm-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu.rst | 28 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 4 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 214 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 271 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 65 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 62 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 191 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 127 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 252 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 138 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 78 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 221 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 17 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 22 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 6 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 36 +- + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 7 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 94 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 96 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 104 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 94 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 40 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 78 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 61 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 8 +- + 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 | 240 ++- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 207 +-- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 26 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 14 - + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 87 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 11 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 24 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 12 - + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 20 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 21 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 48 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/si.c | 109 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 15 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 13 +- + drivers/gpu/drm/amd/amdgpu/ta_rap_if.h | 84 ++ + 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 | 31 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 28 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 174 +-- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 22 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 28 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 8 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 105 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 53 +- + drivers/gpu/drm/amd/display/Kconfig | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 734 +++++----- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 13 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 601 +++++++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 4 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 41 +- + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/bios/Makefile | 9 + + .../gpu/drm/amd/display/dc/bios/command_table.c | 4 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 33 +- + .../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/calcs/Makefile | 7 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 18 + + 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 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 49 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 14 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 29 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 12 +- + 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 + + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 8 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 330 +++++ + drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 178 +++ + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 9 + + .../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 + + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 7 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 154 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 81 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 2 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 5 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 33 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 13 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 5 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 20 +- + 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/panel_cntl.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + + 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/dc/os_types.h | 4 + + .../display/dc/virtual/virtual_stream_encoder.c | 13 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 16 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 40 + + drivers/gpu/drm/amd/display/include/dal_types.h | 3 + + .../drm/amd/display/modules/inc/mod_info_packet.h | 2 +- + .../amd/display/modules/info_packet/info_packet.c | 16 +- + .../drm/amd/display/modules/power/power_helpers.c | 19 +- + .../drm/amd/display/modules/power/power_helpers.h | 4 +- + .../drm/amd/include/asic_reg/dce/dce_12_0_offset.h | 2 - + .../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 ++ + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 0 + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 22 + + .../amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h | 0 + .../amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h | 0 + .../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/include/kgd_kfd_interface.h | 7 - + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 109 ++ + drivers/gpu/drm/amd/pm/Makefile | 46 + + drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_dpm.c | 479 +++++- + drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_pm.c | 945 ++++-------- + .../drm/amd/{powerplay => pm}/inc/amd_powerplay.h | 0 + .../gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_dpm.h | 33 +- + drivers/gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_pm.h | 8 - + .../gpu/drm/amd/{powerplay => pm}/inc/amdgpu_smu.h | 18 +- + .../drm/amd/{powerplay => pm}/inc/arcturus_ppsmc.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/cz_ppsmc.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/fiji_ppsmc.h | 0 + .../amd/{powerplay => pm}/inc/hardwaremanager.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/hwmgr.h | 1 + + .../amd/{powerplay => pm}/inc/polaris10_pwrvirus.h | 0 + .../drm/amd/{powerplay => pm}/inc/power_state.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/pp_debug.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/pp_endian.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/pp_thermal.h | 0 + .../drm/amd/{powerplay => pm}/inc/ppinterrupt.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/rv_ppsmc.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu10.h | 0 + .../amd/{powerplay => pm}/inc/smu10_driver_if.h | 0 + .../amd/{powerplay => pm}/inc/smu11_driver_if.h | 0 + .../inc/smu11_driver_if_arcturus.h | 0 + .../{powerplay => pm}/inc/smu11_driver_if_navi10.h | 39 + + .../inc/smu11_driver_if_sienna_cichlid.h | 6 +- + .../amd/{powerplay => pm}/inc/smu12_driver_if.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu71.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu71_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu72.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu72_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu73.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu73_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu74.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu74_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu75.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu75_discrete.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu7_common.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu7_discrete.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu7_fusion.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu7_ppsmc.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu8.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu8_fusion.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu9.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu9_driver_if.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu_types.h | 0 + .../amd/{powerplay => pm}/inc/smu_ucode_xfer_cz.h | 0 + .../amd/{powerplay => pm}/inc/smu_ucode_xfer_vi.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0.h | 28 +- + .../amd/{powerplay => pm}/inc/smu_v11_0_7_ppsmc.h | 0 + .../{powerplay => pm}/inc/smu_v11_0_7_pptable.h | 0 + .../amd/{powerplay => pm}/inc/smu_v11_0_ppsmc.h | 4 +- + .../amd/{powerplay => pm}/inc/smu_v11_0_pptable.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu_v12_0.h | 2 + + .../amd/{powerplay => pm}/inc/smu_v12_0_ppsmc.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smumgr.h | 0 + .../drm/amd/{powerplay => pm}/inc/tonga_ppsmc.h | 0 + .../drm/amd/{powerplay => pm}/inc/vega10_ppsmc.h | 0 + .../{powerplay => pm}/inc/vega12/smu9_driver_if.h | 0 + .../drm/amd/{powerplay => pm}/inc/vega12_ppsmc.h | 0 + .../drm/amd/{powerplay => pm}/inc/vega20_ppsmc.h | 0 + drivers/gpu/drm/amd/{ => pm}/powerplay/Makefile | 23 +- + .../gpu/drm/amd/{ => pm}/powerplay/amd_powerplay.c | 19 + + .../gpu/drm/amd/{amdgpu => pm/powerplay}/cik_dpm.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/Makefile | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.c | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/common_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/common_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/hardwaremanager.c | 5 +- + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/hwmgr.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/hwmgr_ppt.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/polaris_baco.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/polaris_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/pp_overdriver.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/pp_overdriver.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.c | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.h | 9 - + .../amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/ppevvmath.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/pptable_v1_0.h | 0 + .../powerplay/hwmgr/process_pptables_v1_0.c | 0 + .../powerplay/hwmgr/process_pptables_v1_0.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/processpptables.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/processpptables.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu10_inc.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.h | 0 + .../powerplay/hwmgr/smu7_clockpowergating.c | 0 + .../powerplay/hwmgr/smu7_clockpowergating.h | 0 + .../{ => pm}/powerplay/hwmgr/smu7_dyn_defaults.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.c | 16 +- + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_powertune.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_powertune.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_thermal.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega10_inc.h | 0 + .../{ => pm}/powerplay/hwmgr/vega10_powertune.c | 0 + .../{ => pm}/powerplay/hwmgr/vega10_powertune.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_pptable.h | 0 + .../powerplay/hwmgr/vega10_processpptables.c | 0 + .../powerplay/hwmgr/vega10_processpptables.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_thermal.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.c | 138 +- + .../amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.h | 1 + + .../drm/amd/{ => pm}/powerplay/hwmgr/vega12_inc.h | 1 - + .../amd/{ => pm}/powerplay/hwmgr/vega12_pptable.h | 0 + .../powerplay/hwmgr/vega12_processpptables.c | 2 +- + .../powerplay/hwmgr/vega12_processpptables.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_thermal.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.c | 154 +- + .../amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.h | 1 + + .../drm/amd/{ => pm}/powerplay/hwmgr/vega20_inc.h | 0 + .../{ => pm}/powerplay/hwmgr/vega20_powertune.c | 0 + .../{ => pm}/powerplay/hwmgr/vega20_powertune.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_pptable.h | 0 + .../powerplay/hwmgr/vega20_processpptables.c | 8 +- + .../powerplay/hwmgr/vega20_processpptables.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_thermal.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.c | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/kv_smc.c | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/ppsmc.h | 0 + .../drm/amd/{amdgpu => pm/powerplay}/r600_dpm.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.c | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/si_smc.c | 0 + .../amd/{amdgpu => pm/powerplay}/sislands_smc.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/smumgr/Makefile | 0 + .../drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.c | 0 + .../drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/fiji_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/fiji_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/iceland_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/iceland_smumgr.h | 0 + .../{ => pm}/powerplay/smumgr/polaris10_smumgr.c | 0 + .../{ => pm}/powerplay/smumgr/polaris10_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu10_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu10_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu7_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu7_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu8_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu8_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu9_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu9_smumgr.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/smumgr/smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/tonga_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/tonga_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vega10_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vega10_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vega12_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vega12_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vega20_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vega20_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vegam_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vegam_smumgr.h | 0 + drivers/gpu/drm/amd/pm/swsmu/Makefile | 36 + + .../drm/amd/{powerplay => pm/swsmu}/amdgpu_smu.c | 67 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 33 + + .../{powerplay => pm/swsmu/smu11}/arcturus_ppt.c | 143 +- + .../{powerplay => pm/swsmu/smu11}/arcturus_ppt.h | 0 + .../amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.c | 188 ++- + .../amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.h | 3 - + .../swsmu/smu11}/sienna_cichlid_ppt.c | 148 +- + .../swsmu/smu11}/sienna_cichlid_ppt.h | 3 - + .../amd/{powerplay => pm/swsmu/smu11}/smu_v11_0.c | 168 ++- + drivers/gpu/drm/amd/pm/swsmu/smu12/Makefile | 31 + + .../amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.c | 162 ++- + .../amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.h | 0 + .../amd/{powerplay => pm/swsmu/smu12}/smu_v12_0.c | 12 + + .../gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.c | 47 +- + .../gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.h | 8 + + .../drm/amd/{powerplay => pm/swsmu}/smu_internal.h | 3 + + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_device.c | 13 +- + drivers/gpu/drm/radeon/radeon_gart.c | 10 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + include/drm/gpu_scheduler.h | 13 +- + include/uapi/drm/amdgpu_drm.h | 1 + + include/uapi/linux/kfd_ioctl.h | 11 +- + sound/pci/hda/hda_intel.c | 3 + + 459 files changed, 13657 insertions(+), 3186 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rap.h + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_rap_if.h + 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 + mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h + mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h + mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h + mode change 100755 => 100644 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/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 + create mode 100644 drivers/gpu/drm/amd/pm/Makefile + rename drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_dpm.c (76%) + rename drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_pm.c (81%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/amd_powerplay.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_dpm.h (94%) + rename drivers/gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_pm.h (84%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/amdgpu_smu.h (97%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/arcturus_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/cz_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/fiji_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/hardwaremanager.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/hwmgr.h (99%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/polaris10_pwrvirus.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/power_state.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/pp_debug.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/pp_endian.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/pp_thermal.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/ppinterrupt.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/rv_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu10.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu10_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if_arcturus.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if_navi10.h (97%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if_sienna_cichlid.h (99%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu12_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu71.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu71_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu72.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu72_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu73.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu73_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu74.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu74_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu75.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu75_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_common.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_fusion.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu8.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu8_fusion.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu9.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_types.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_ucode_xfer_cz.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_ucode_xfer_vi.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0.h (91%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_7_pptable.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_ppsmc.h (98%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_pptable.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v12_0.h (96%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v12_0_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smumgr.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/tonga_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega10_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega12/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega12_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega20_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/Makefile (70%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/amd_powerplay.c (98%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/cik_dpm.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/Makefile (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/common_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/common_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/hardwaremanager.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/hwmgr_ppt.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/polaris_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/polaris_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_overdriver.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_overdriver.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.h (98%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppevvmath.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pptable_v1_0.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/process_pptables_v1_0.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/process_pptables_v1_0.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/processpptables.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu10_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_clockpowergating.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_clockpowergating.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_dyn_defaults.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_powertune.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_powertune.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_thermal.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_powertune.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_powertune.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_pptable.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_processpptables.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_thermal.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.c (95%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.h (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_inc.h (97%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_pptable.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_processpptables.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_thermal.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.c (96%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.h (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_powertune.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_powertune.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_pptable.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_processpptables.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_thermal.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/kv_smc.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/ppsmc.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/r600_dpm.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/si_smc.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/sislands_smc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/Makefile (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/fiji_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/fiji_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/iceland_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/iceland_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/polaris10_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/polaris10_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu10_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu10_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu7_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu7_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu8_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu8_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu9_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu9_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/tonga_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/tonga_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega10_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega10_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega12_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega12_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega20_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega20_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vegam_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vegam_smumgr.h (100%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/Makefile + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/amdgpu_smu.c (97%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/arcturus_ppt.c (95%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/arcturus_ppt.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.c (94%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.h (96%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/sienna_cichlid_ppt.c (96%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/sienna_cichlid_ppt.h (92%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/smu_v11_0.c (92%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu12/Makefile + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.c (89%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu12}/smu_v12_0.c (95%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.c (93%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.h (92%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/smu_internal.h (96%) +Merging drm-intel/for-linux-next (f8bd54d21904 drm/i915: panel: Use atomic PWM API for devs with an external PWM controller) +$ git merge drm-intel/for-linux-next +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/i915/display/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/display/intel_panel.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_panel.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_combo_phy.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Resolved 'drivers/gpu/drm/i915/display/intel_hdcp.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_panel.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_panel.c'. +[master 635b875e2206] Merge remote-tracking branch 'drm-intel/for-linux-next' into master +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/acpi_lpss.c | 22 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 150 ++++ + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/intel_ddi.c | 115 +-- + drivers/gpu/drm/i915/display/intel_ddi.h | 2 + + drivers/gpu/drm/i915/display/intel_display.c | 87 ++- + drivers/gpu/drm/i915/display/intel_display.h | 2 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 33 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 32 +- + drivers/gpu/drm/i915/display/intel_dp.c | 769 +++------------------ + drivers/gpu/drm/i915/display/intel_dp.h | 11 + + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 703 +++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_dp_mst.c | 19 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 208 ++++-- + drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 30 +- + drivers/gpu/drm/i915/display/intel_panel.c | 95 +-- + drivers/gpu/drm/i915/display/intel_psr.c | 4 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 2 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 30 +- + drivers/gpu/drm/i915/i915_drv.c | 135 +--- + drivers/gpu/drm/i915/i915_drv.h | 39 +- + drivers/gpu/drm/i915/i915_reg.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 2 +- + drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 17 + + drivers/pwm/pwm-crc.c | 128 +++- + drivers/pwm/pwm-lpss-platform.c | 1 - + drivers/pwm/pwm-lpss.c | 85 +-- + drivers/pwm/pwm-lpss.h | 3 - + include/drm/drm_dp_helper.h | 3 + + include/drm/drm_dp_mst_helper.h | 44 ++ + include/drm/i915_pciids.h | 14 +- + 34 files changed, 1721 insertions(+), 1072 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_hdcp.c +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 (dbd9d80c1b2e drm/vkms: Add support for writeback) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Merge made by the 'recursive' strategy. + .../bindings/display/brcm,bcm2711-hdmi.yaml | 117 ++ + .../bindings/display/brcm,bcm2835-hvs.yaml | 18 +- + .../bindings/display/brcm,bcm2835-pixelvalve0.yaml | 5 + + .../bindings/display/brcm,bcm2835-vc4.yaml | 1 + + .../bindings/display/panel/panel-simple.yaml | 2 + + Documentation/driver-api/driver-model/devres.rst | 2 +- + drivers/dma-buf/dma-fence.c | 1 + + drivers/dma-buf/udmabuf.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 48 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 132 +- + drivers/gpu/drm/drm_connector.c | 45 +- + drivers/gpu/drm/drm_debugfs_crc.c | 4 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 106 +- + drivers/gpu/drm/drm_drv.c | 78 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- + drivers/gpu/drm/drm_managed.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 117 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 3 + + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 44 +- + drivers/gpu/drm/panel/Kconfig | 23 +- + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 139 ++ + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 101 ++ + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 158 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.h | 13 + + drivers/gpu/drm/panel/panel-simple.c | 31 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 9 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 44 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 17 +- + drivers/gpu/drm/ttm/ttm_bo.c | 51 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 131 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 39 +- + drivers/gpu/drm/ttm/ttm_resource.c | 3 - + drivers/gpu/drm/ttm/ttm_tt.c | 45 +- + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_crtc.c | 354 ++++- + drivers/gpu/drm/vc4/vc4_drv.c | 5 + + drivers/gpu/drm/vc4/vc4_drv.h | 43 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 1650 ++++++++++++-------- + drivers/gpu/drm/vc4/vc4_hdmi.h | 184 +++ + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 521 ++++++ + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 442 ++++++ + drivers/gpu/drm/vc4/vc4_hvs.c | 269 ++-- + drivers/gpu/drm/vc4/vc4_kms.c | 229 ++- + drivers/gpu/drm/vc4/vc4_plane.c | 222 ++- + drivers/gpu/drm/vc4/vc4_regs.h | 177 ++- + drivers/gpu/drm/vc4/vc4_txp.c | 4 +- + drivers/gpu/drm/virtio/Kconfig | 2 +- + drivers/gpu/drm/vkms/Makefile | 9 +- + drivers/gpu/drm/vkms/vkms_composer.c | 153 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 5 + + drivers/gpu/drm/vkms/vkms_drv.h | 10 +- + drivers/gpu/drm/vkms/vkms_output.c | 4 + + drivers/gpu/drm/vkms/vkms_writeback.c | 142 ++ + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 16 +- + include/drm/drm_device.h | 2 +- + include/drm/drm_drv.h | 16 +- + include/drm/drm_modes.h | 26 +- + include/drm/ttm/ttm_bo_api.h | 1 - + include/drm/ttm/ttm_bo_driver.h | 12 +- + include/drm/ttm/ttm_resource.h | 16 - + include/drm/ttm/ttm_tt.h | 25 +- + include/linux/dma-buf.h | 3 +- + 71 files changed, 4503 insertions(+), 1609 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63m0.h + create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi.h + create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi_phy.c + create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi_regs.h + create mode 100644 drivers/gpu/drm/vkms/vkms_writeback.c +Merging drm-msm/msm-next (f6828e0c4045 drm/msm: Disable the RPTR shadow) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gpu.c +Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5 +++++ + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 10 ++++++++++ + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 10 ++++++++++ + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 14 +++++++++++--- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 1 + + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 25 ++++++++++++++++++++----- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 13 ++++++++++++- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 27 ++------------------------- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.h | 11 +++++++++++ + drivers/gpu/drm/msm/msm_ringbuffer.c | 4 ++-- + 11 files changed, 85 insertions(+), 37 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 (efd5a93d2a89 drm/imx: drop explicit drm_mode_config_cleanup) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/dw_hdmi-imx.c | 12 ++----- + drivers/gpu/drm/imx/imx-drm-core.c | 10 +++--- + drivers/gpu/drm/imx/imx-tve.c | 38 +++------------------ + drivers/gpu/ipu-v3/ipu-common.c | 67 -------------------------------------- + include/video/imx-ipu-v3.h | 3 -- + 5 files changed, 13 insertions(+), 117 deletions(-) +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 (b89102f28d29 Merge remote-tracking branch 'regmap/for-5.10' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 6 +- + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/internal.h | 3 + + drivers/base/regmap/regmap-sdw.c | 1 - + drivers/base/regmap/regmap-spi-avmm.c | 719 ++++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap.c | 19 +- + include/linux/regmap.h | 39 ++ + 7 files changed, 782 insertions(+), 6 deletions(-) + create mode 100644 drivers/base/regmap/regmap-spi-avmm.c +Merging sound/for-next (b248b9dd5975 ALSA: vx: vx_pcm: remove redundant assignment) +$ git merge sound/for-next +Auto-merging sound/usb/quirks-table.h +Auto-merging sound/core/timer.c +Merge made by the 'recursive' strategy. + sound/ac97/ac97_core.h | 2 +- + sound/aoa/soundbus/i2sbus/pcm.c | 3 +- + sound/atmel/ac97c.c | 22 +- + sound/core/compress_offload.c | 5 +- + sound/core/init.c | 3 +- + sound/core/memalloc.c | 2 +- + sound/core/pcm.c | 8 +- + sound/core/pcm_memory.c | 3 +- + sound/core/rawmidi.c | 2 +- + sound/core/timer.c | 6 +- + sound/drivers/vx/vx_core.c | 4 +- + sound/drivers/vx/vx_pcm.c | 2 - + sound/pci/hda/hda_auto_parser.c | 2 +- + sound/pci/hda/hda_jack.h | 2 +- + sound/pci/hda/hda_local.h | 8 +- + sound/pci/hda/patch_ca0132.c | 1794 +++++++++++++++++++++++++++++++-------- + sound/usb/card.c | 133 ++- + sound/usb/mixer_scarlett_gen2.c | 2 +- + sound/usb/quirks-table.h | 262 +----- + sound/usb/usbaudio.h | 1 - + 20 files changed, 1622 insertions(+), 644 deletions(-) +Merging sound-asoc/for-next (45eee0e8a024 Merge remote-tracking branch 'asoc/for-5.10' into asoc-next) +$ git merge sound-asoc/for-next +Removing Documentation/devicetree/bindings/sound/tas2562.txt +Removing Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt +Removing Documentation/devicetree/bindings/sound/fsl,spdif.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4458.txt | 2 + + Documentation/devicetree/bindings/sound/ak5558.txt | 2 + + .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 6 +- + .../devicetree/bindings/sound/fsl,spdif.txt | 68 - + .../devicetree/bindings/sound/fsl,spdif.yaml | 110 + + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 + + .../bindings/sound/intel,keembay-i2s.yaml | 1 + + .../devicetree/bindings/sound/mt6359.yaml | 61 + + .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 79 - + .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 189 ++ + .../devicetree/bindings/sound/rockchip-spdif.yaml | 1 + + .../bindings/sound/samsung,midas-audio.yaml | 6 +- + .../devicetree/bindings/sound/samsung,odroid.yaml | 5 + + .../devicetree/bindings/sound/samsung-i2s.yaml | 15 + + .../devicetree/bindings/sound/tas2562.txt | 37 - + .../devicetree/bindings/sound/tas2562.yaml | 4 + + include/dt-bindings/sound/sc7180-lpass.h | 10 + + include/sound/hda_register.h | 2 +- + include/sound/soc-acpi.h | 2 +- + include/sound/soc-dai.h | 3 +- + include/sound/soc.h | 1 + + include/sound/sof/ext_manifest.h | 7 + + include/sound/sof/info.h | 2 +- + include/sound/sof/topology.h | 12 +- + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 2 + + sound/soc/amd/acp3x-rt5682-max9836.c | 11 +- + sound/soc/codecs/Kconfig | 8 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4458.c | 31 +- + sound/soc/codecs/ak5558.c | 30 + + sound/soc/codecs/da7219-aad.c | 85 +- + sound/soc/codecs/da7219-aad.h | 3 + + sound/soc/codecs/da7219.c | 494 ++-- + sound/soc/codecs/da7219.h | 1 + + sound/soc/codecs/hdac_hdmi.c | 138 + + sound/soc/codecs/max98373-sdw.c | 3 + + sound/soc/codecs/max9867.c | 131 +- + sound/soc/codecs/max9867.h | 4 +- + sound/soc/codecs/mt6359.c | 2753 ++++++++++++++++++++ + sound/soc/codecs/mt6359.h | 2640 +++++++++++++++++++ + sound/soc/codecs/nau8825.c | 2 +- + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt5682-i2c.c | 1 + + sound/soc/codecs/rt5682-sdw.c | 2 +- + sound/soc/codecs/rt5682.c | 73 +- + sound/soc/codecs/rt5682.h | 2 - + sound/soc/codecs/rt700-sdw.c | 2 +- + sound/soc/codecs/rt711-sdw.c | 2 +- + sound/soc/codecs/rt715-sdw.c | 2 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tlv320adcx140.c | 37 + + sound/soc/codecs/tlv320aic32x4.c | 60 +- + sound/soc/codecs/wm0010.c | 3 +- + sound/soc/codecs/wm8962.c | 2 + + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm_adsp.c | 8 +- + sound/soc/fsl/Kconfig | 2 +- + sound/soc/fsl/fsl-asoc-card.c | 15 + + sound/soc/fsl/fsl_dma.c | 2 +- + sound/soc/fsl/fsl_sai.c | 213 +- + sound/soc/fsl/fsl_sai.h | 4 +- + sound/soc/generic/simple-card.c | 33 +- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/atom/sst-atom-controls.c | 4 +- + sound/soc/intel/atom/sst-mfld-platform-compress.c | 3 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 4 +- + sound/soc/intel/atom/sst-mfld-platform.h | 4 +- + sound/soc/intel/atom/sst/sst.c | 5 +- + sound/soc/intel/atom/sst/sst.h | 34 +- + sound/soc/intel/atom/sst/sst_loader.c | 3 +- + sound/soc/intel/atom/sst/sst_pvt.c | 4 +- + sound/soc/intel/baytrail/sst-baytrail-ipc.h | 3 +- + sound/soc/intel/boards/Kconfig | 3 + + sound/soc/intel/boards/Makefile | 7 +- + sound/soc/intel/boards/bdw-rt5650.c | 10 +- + sound/soc/intel/boards/bdw-rt5677.c | 8 +- + sound/soc/intel/boards/broadwell.c | 8 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 13 + + sound/soc/intel/boards/sof_sdw.c | 210 +- + sound/soc/intel/boards/sof_sdw_common.h | 23 +- + sound/soc/intel/boards/sof_sdw_dmic.c | 1 + + sound/soc/intel/boards/sof_sdw_max98373.c | 2 + + sound/soc/intel/boards/sof_sdw_rt1308.c | 2 + + sound/soc/intel/boards/sof_sdw_rt1316.c | 113 + + sound/soc/intel/boards/sof_sdw_rt5682.c | 2 + + sound/soc/intel/boards/sof_sdw_rt700.c | 2 + + sound/soc/intel/boards/sof_sdw_rt711.c | 2 + + sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 174 ++ + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 42 + + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 79 +- + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 33 +- + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 10 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 165 +- + sound/soc/intel/common/sst-dsp-priv.h | 2 +- + sound/soc/intel/common/sst-dsp.h | 15 +- + sound/soc/intel/common/sst-firmware.c | 4 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 10 +- + sound/soc/intel/haswell/sst-haswell-ipc.h | 2 +- + sound/soc/intel/keembay/kmb_platform.c | 145 +- + sound/soc/intel/skylake/cnl-sst-dsp.h | 4 +- + sound/soc/intel/skylake/skl-nhlt.c | 2 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 2 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 16 +- + sound/soc/intel/skylake/skl-sst-utils.c | 2 +- + sound/soc/intel/skylake/skl-sst.c | 2 +- + sound/soc/intel/skylake/skl-topology.c | 8 +- + sound/soc/intel/skylake/skl-topology.h | 8 +- + sound/soc/intel/skylake/skl.c | 6 +- + sound/soc/intel/skylake/skl.h | 2 +- + sound/soc/meson/axg-tdm-formatter.c | 2 +- + sound/soc/meson/meson-card-utils.c | 33 +- + sound/soc/qcom/Kconfig | 13 +- + sound/soc/qcom/Makefile | 2 + + sound/soc/qcom/lpass-apq8016.c | 88 +- + sound/soc/qcom/lpass-cpu.c | 204 +- + sound/soc/qcom/lpass-ipq806x.c | 67 + + sound/soc/qcom/lpass-lpaif-reg.h | 157 +- + sound/soc/qcom/lpass-platform.c | 155 +- + sound/soc/qcom/lpass-sc7180.c | 216 ++ + sound/soc/qcom/lpass.h | 63 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 414 ++- + sound/soc/qcom/qdsp6/q6asm.c | 169 +- + sound/soc/qcom/qdsp6/q6asm.h | 49 +- + sound/soc/soc-core.c | 64 +- + sound/soc/sof/Kconfig | 2 +- + sound/soc/sof/imx/Kconfig | 2 + + sound/soc/sof/imx/imx8.c | 17 +- + sound/soc/sof/imx/imx8m.c | 10 +- + sound/soc/sof/intel/Kconfig | 31 +- + sound/soc/sof/intel/Makefile | 2 +- + sound/soc/sof/intel/cnl.c | 25 +- + sound/soc/sof/intel/hda-codec.c | 11 +- + sound/soc/sof/intel/hda-ipc.h | 4 + + sound/soc/sof/intel/hda-loader.c | 183 +- + sound/soc/sof/intel/hda-stream.c | 69 + + sound/soc/sof/intel/hda.c | 35 +- + sound/soc/sof/intel/hda.h | 6 + + sound/soc/sof/intel/tgl.c | 137 + + sound/soc/sof/ipc.c | 16 +- + sound/soc/sof/loader.c | 34 +- + sound/soc/sof/pcm.c | 8 +- + sound/soc/sof/pm.c | 1 + + sound/soc/sof/sof-acpi-dev.c | 2 + + sound/soc/sof/sof-audio.c | 50 +- + sound/soc/sof/sof-audio.h | 8 + + sound/soc/sof/sof-pci-dev.c | 32 +- + sound/soc/sof/sof-priv.h | 14 +- + sound/soc/sof/topology.c | 426 +-- + sound/soc/sprd/sprd-pcm-compress.c | 2 +- + sound/soc/sunxi/sun4i-codec.c | 2 +- + sound/soc/sunxi/sun50i-codec-analog.c | 176 +- + sound/soc/sunxi/sun8i-codec.c | 232 +- + sound/soc/ti/davinci-mcasp.c | 2 +- + sound/soc/xilinx/Kconfig | 4 +- + 156 files changed, 10145 insertions(+), 1737 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,spdif.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,spdif.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mt6359.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/tas2562.txt + create mode 100644 include/dt-bindings/sound/sc7180-lpass.h + create mode 100644 sound/soc/codecs/mt6359.c + create mode 100644 sound/soc/codecs/mt6359.h + create mode 100644 sound/soc/intel/boards/sof_sdw_rt1316.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt711_sdca.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt715_sdca.c + create mode 100644 sound/soc/qcom/lpass-sc7180.c + create mode 100644 sound/soc/sof/intel/tgl.c +Merging modules/modules-next (14721add58ef module: Add more error message for failed kernel module loading) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging input/next (9b5fbad1dcee Input: MT - avoid comma separated statements) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/input-mt.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) +Merging block/for-next (bc02a81e145f Merge branch 'for-5.10/block' into for-next) +$ git merge block/for-next +Auto-merging net/socket.c +Auto-merging fs/io_uring.c +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/locking.rst | 3 - + block/Kconfig | 2 - + block/bfq-iosched.c | 9 +- + block/blk-cgroup.c | 23 +- + block/blk-core.c | 197 +---- + block/blk-iocost.c | 1535 +++++++++++++++++++++++++-------- + block/blk-map.c | 176 ++-- + block/blk-merge.c | 201 +++++ + block/blk-mq-debugfs.c | 10 +- + block/blk-mq-sched.c | 124 +-- + block/blk-mq-sched.h | 3 - + block/blk-mq-tag.c | 149 +++- + block/blk-mq-tag.h | 56 +- + block/blk-mq.c | 81 +- + block/blk-mq.h | 76 +- + block/blk.h | 25 +- + block/genhd.c | 96 +-- + block/ioctl.c | 16 +- + block/ioprio.c | 2 +- + block/kyber-iosched.c | 6 +- + block/mq-deadline.c | 6 + + block/partitions/core.c | 27 +- + drivers/block/aoe/aoecmd.c | 4 +- + drivers/block/loop.c | 4 +- + drivers/block/nbd.c | 15 +- + drivers/block/pktcdvd.c | 2 +- + drivers/block/rbd.c | 2 +- + drivers/block/rnbd/rnbd-clt.c | 12 +- + drivers/block/virtio_blk.c | 4 +- + drivers/block/zram/zram_drv.c | 4 +- + drivers/char/raw.c | 5 + + drivers/md/dm-raid.c | 2 +- + drivers/md/dm.c | 15 +- + drivers/md/md-cluster.c | 6 +- + drivers/md/md-linear.c | 2 +- + drivers/md/md.c | 10 +- + drivers/md/md.h | 2 +- + drivers/nvdimm/blk.c | 3 +- + drivers/nvdimm/btt.c | 3 +- + drivers/nvdimm/bus.c | 9 +- + drivers/nvdimm/nd.h | 2 +- + drivers/nvdimm/pmem.c | 3 +- + drivers/nvme/host/core.c | 49 +- + drivers/nvme/host/nvme.h | 13 - + drivers/s390/block/dasd_ioctl.c | 9 +- + drivers/scsi/sd.c | 6 +- + fs/block_dev.c | 142 +-- + fs/buffer.c | 16 - + fs/io-wq.c | 52 +- + fs/io_uring.c | 971 +++++++++++++++------ + include/linux/blk-mq.h | 15 +- + include/linux/blk_types.h | 9 +- + include/linux/blkdev.h | 22 +- + include/linux/genhd.h | 10 +- + include/linux/socket.h | 1 + + include/trace/events/iocost.h | 26 +- + include/uapi/linux/capability.h | 2 + + include/uapi/linux/io_uring.h | 63 +- + kernel/trace/blktrace.c | 2 +- + net/socket.c | 15 +- + tools/cgroup/iocost_monitor.py | 54 +- + 61 files changed, 2923 insertions(+), 1486 deletions(-) +Merging device-mapper/for-next (3a653b205f29 dm thin metadata: Fix use-after-free in dm_bm_set_read_only) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (31ae403513be mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that are newer than 5.4) +$ git merge mmc/next +Auto-merging drivers/mmc/host/s3cmci.c +Auto-merging drivers/mmc/host/Kconfig +CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig +Recorded preimage for 'drivers/mmc/host/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/mmc/host/Kconfig'. +[master 79fec43d09bb] Merge remote-tracking branch 'mmc/next' into master +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 2 +- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 37 +-- + .../bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 65 +++++ + .../devicetree/bindings/mmc/mmc-controller.yaml | 4 + + .../devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-am654.txt | 6 +- + drivers/memstick/core/ms_block.c | 2 +- + drivers/mmc/core/bus.c | 12 + + drivers/mmc/core/host.c | 26 +- + drivers/mmc/core/mmc.c | 16 +- + drivers/mmc/core/mmc_test.c | 8 +- + drivers/mmc/core/sd.c | 38 ++- + drivers/mmc/core/sdio.c | 24 ++ + drivers/mmc/core/sdio_bus.c | 54 +++-- + drivers/mmc/core/sdio_cis.c | 11 + + drivers/mmc/host/Kconfig | 54 +++-- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/alcor.c | 1 + + drivers/mmc/host/android-goldfish.c | 1 + + drivers/mmc/host/atmel-mci.c | 1 + + drivers/mmc/host/au1xmmc.c | 1 + + drivers/mmc/host/bcm2835.c | 5 +- + drivers/mmc/host/cavium-octeon.c | 1 + + drivers/mmc/host/cqhci.c | 6 + + drivers/mmc/host/cqhci.h | 2 + + drivers/mmc/host/davinci_mmc.c | 8 +- + drivers/mmc/host/dw_mmc-bluefield.c | 1 + + drivers/mmc/host/dw_mmc-exynos.c | 1 + + drivers/mmc/host/dw_mmc-hi3798cv200.c | 1 + + drivers/mmc/host/dw_mmc-k3.c | 1 + + drivers/mmc/host/dw_mmc-pltfm.c | 1 + + drivers/mmc/host/dw_mmc-rockchip.c | 1 + + drivers/mmc/host/dw_mmc-zx.c | 12 +- + drivers/mmc/host/dw_mmc.c | 9 +- + drivers/mmc/host/jz4740_mmc.c | 5 +- + drivers/mmc/host/meson-gx-mmc.c | 19 +- + drivers/mmc/host/meson-mx-sdhc-mmc.c | 1 + + drivers/mmc/host/meson-mx-sdio.c | 1 + + drivers/mmc/host/mmc_spi.c | 4 +- + drivers/mmc/host/moxart-mmc.c | 1 + + drivers/mmc/host/mtk-sd.c | 23 ++ + drivers/mmc/host/mvsdio.c | 1 + + drivers/mmc/host/mxcmmc.c | 1 + + drivers/mmc/host/mxs-mmc.c | 1 + + drivers/mmc/host/omap.c | 1 + + drivers/mmc/host/omap_hsmmc.c | 19 +- + drivers/mmc/host/owl-mmc.c | 1 + + drivers/mmc/host/pxamci.c | 1 + + drivers/mmc/host/renesas_sdhi_core.c | 66 ++--- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 5 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 1 + + drivers/mmc/host/rtsx_pci_sdmmc.c | 1 + + drivers/mmc/host/rtsx_usb_sdmmc.c | 1 + + drivers/mmc/host/s3cmci.c | 14 +- + drivers/mmc/host/sdhci-acpi.c | 1 + + drivers/mmc/host/sdhci-bcm-kona.c | 1 + + drivers/mmc/host/sdhci-brcmstb.c | 13 +- + drivers/mmc/host/sdhci-cadence.c | 1 + + drivers/mmc/host/sdhci-cns3xxx.c | 1 + + drivers/mmc/host/sdhci-dove.c | 1 + + drivers/mmc/host/sdhci-esdhc-imx.c | 15 +- + drivers/mmc/host/sdhci-esdhc-mcf.c | 1 + + drivers/mmc/host/sdhci-iproc.c | 2 + + drivers/mmc/host/sdhci-milbeaut.c | 1 + + drivers/mmc/host/sdhci-msm.c | 2 + + drivers/mmc/host/sdhci-of-arasan.c | 8 +- + drivers/mmc/host/sdhci-of-aspeed.c | 2 + + drivers/mmc/host/sdhci-of-at91.c | 1 + + drivers/mmc/host/sdhci-of-dwcmshc.c | 1 + + drivers/mmc/host/sdhci-of-esdhc.c | 1 + + drivers/mmc/host/sdhci-of-hlwd.c | 1 + + drivers/mmc/host/sdhci-of-sparx5.c | 270 +++++++++++++++++++++ + drivers/mmc/host/sdhci-omap.c | 1 + + drivers/mmc/host/sdhci-pci-core.c | 154 ++++++++++++ + drivers/mmc/host/sdhci-pic32.c | 1 + + drivers/mmc/host/sdhci-pxav2.c | 1 + + drivers/mmc/host/sdhci-pxav3.c | 1 + + drivers/mmc/host/sdhci-s3c.c | 1 + + drivers/mmc/host/sdhci-sirf.c | 1 + + drivers/mmc/host/sdhci-spear.c | 1 + + drivers/mmc/host/sdhci-sprd.c | 1 + + drivers/mmc/host/sdhci-st.c | 1 + + drivers/mmc/host/sdhci-tegra.c | 8 +- + drivers/mmc/host/sdhci-xenon.c | 1 + + drivers/mmc/host/sdhci_am654.c | 27 ++- + drivers/mmc/host/sdhci_f_sdh30.c | 1 + + drivers/mmc/host/sh_mmcif.c | 1 + + drivers/mmc/host/sunxi-mmc.c | 1 + + drivers/mmc/host/tmio_mmc.c | 9 +- + drivers/mmc/host/tmio_mmc.h | 7 - + drivers/mmc/host/tmio_mmc_core.c | 45 +--- + drivers/mmc/host/uniphier-sd.c | 6 +- + drivers/mmc/host/usdhi6rol0.c | 1 + + drivers/mmc/host/via-sdmmc.c | 3 + + drivers/mmc/host/wbsd.c | 1 + + drivers/mmc/host/wmt-sdmmc.c | 1 + + include/linux/mmc/card.h | 2 + + include/linux/mmc/host.h | 9 +- + include/linux/mmc/sdio_func.h | 2 + + 100 files changed, 955 insertions(+), 239 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/microchip,dw-sparx5-sdhci.yaml + create mode 100644 drivers/mmc/host/sdhci-of-sparx5.c +Merging mfd/for-mfd-next (c563a66537d2 mfd: rn5t618: Add a power supply subdevice) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/Kconfig | 2 +- + drivers/mfd/rn5t618.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging backlight/for-backlight-next (7eb99a39ef76 video: backlight: cr_bllcd: Remove unused variable 'intensity') +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (d8483f31487c dt-bindings: power: supply: Cleanup charger-manager bindings) +$ git merge battery/for-next +Removing include/linux/power/smb347-charger.h +Removing Documentation/devicetree/bindings/power/reset/reboot-mode.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 2 +- + .../bindings/power/reset/reboot-mode.txt | 25 - + .../bindings/power/reset/reboot-mode.yaml | 47 ++ + .../devicetree/bindings/power/supply/battery.yaml | 24 + + .../bindings/power/supply/charger-manager.txt | 30 +- + .../bindings/power/supply/gpio-charger.yaml | 31 + + .../power/supply/summit,smb347-charger.yaml | 152 +++++ + arch/arm/mach-pxa/tosa.c | 12 +- + arch/arm/mach-sa1100/collie.c | 14 +- + drivers/power/supply/Kconfig | 16 +- + drivers/power/supply/Makefile | 1 + + drivers/power/supply/bq2515x_charger.c | 12 +- + drivers/power/supply/bq27xxx_battery.c | 19 +- + drivers/power/supply/bq27xxx_battery_hdq.c | 9 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 10 +- + drivers/power/supply/charger-manager.c | 571 +++++------------ + drivers/power/supply/cpcap-battery.c | 7 +- + drivers/power/supply/gpio-charger.c | 172 ++++- + drivers/power/supply/ingenic-battery.c | 8 +- + drivers/power/supply/lego_ev3_battery.c | 24 +- + drivers/power/supply/pm2301_charger.c | 2 +- + drivers/power/supply/power_supply_core.c | 19 + + drivers/power/supply/power_supply_sysfs.c | 1 + + drivers/power/supply/rn5t618_power.c | 556 +++++++++++++++++ + drivers/power/supply/sbs-battery.c | 107 ++-- + drivers/power/supply/smb347-charger.c | 692 +++++++++++---------- + include/dt-bindings/power/summit,smb347-charger.h | 19 + + include/linux/power/charger-manager.h | 41 +- + include/linux/power/gpio-charger.h | 6 - + include/linux/power/smb347-charger.h | 114 ---- + include/linux/power_supply.h | 7 + + 31 files changed, 1667 insertions(+), 1083 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/reboot-mode.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/reboot-mode.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml + create mode 100644 drivers/power/supply/rn5t618_power.c + create mode 100644 include/dt-bindings/power/summit,smb347-charger.h + delete mode 100644 include/linux/power/smb347-charger.h +Merging regulator/for-next (a727d5f996ed Merge remote-tracking branch 'regulator/for-5.10' into regulator-next) +$ git merge regulator/for-next +Removing Documentation/devicetree/bindings/regulator/sy8824x.txt +Removing Documentation/devicetree/bindings/regulator/pfuze100.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/mp886x.txt | 4 + + .../bindings/regulator/mt6360-regulator.yaml | 113 +++++ + .../devicetree/bindings/regulator/pfuze100.txt | 394 ------------------ + .../devicetree/bindings/regulator/pfuze100.yaml | 186 +++++++++ + ...pberrypi,7inch-touchscreen-panel-regulator.yaml | 44 ++ + .../regulator/richtek,rt4801-regulator.yaml | 79 ++++ + .../bindings/regulator/rohm,bd71837-regulator.yaml | 11 + + .../bindings/regulator/rohm,bd71847-regulator.yaml | 11 + + .../bindings/regulator/silergy,sy8824x.yaml | 45 ++ + .../devicetree/bindings/regulator/sy8824x.txt | 24 -- + drivers/regulator/88pg86x.c | 2 +- + drivers/regulator/Kconfig | 27 ++ + drivers/regulator/Makefile | 3 + + drivers/regulator/bd718x7-regulator.c | 422 ++++++++++++------- + drivers/regulator/core.c | 90 ++-- + drivers/regulator/da9055-regulator.c | 2 - + drivers/regulator/da9062-regulator.c | 2 - + drivers/regulator/da9063-regulator.c | 2 - + drivers/regulator/da9210-regulator.c | 6 +- + drivers/regulator/da9211-regulator.c | 18 +- + drivers/regulator/dbx500-prcmu.c | 26 +- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/fixed.c | 16 +- + drivers/regulator/lochnagar-regulator.c | 1 + + drivers/regulator/lp8755.c | 88 +--- + drivers/regulator/ltc3589.c | 12 +- + drivers/regulator/ltc3676.c | 12 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max77826-regulator.c | 2 +- + drivers/regulator/mp886x.c | 109 ++++- + drivers/regulator/mt6360-regulator.c | 459 +++++++++++++++++++++ + drivers/regulator/pv88060-regulator.c | 10 +- + drivers/regulator/pv88080-regulator.c | 10 +- + drivers/regulator/pv88090-regulator.c | 10 +- + drivers/regulator/pwm-regulator.c | 2 +- + drivers/regulator/qcom-rpmh-regulator.c | 2 +- + drivers/regulator/qcom_spmi-regulator.c | 70 ++-- + drivers/regulator/qcom_usb_vbus-regulator.c | 1 + + drivers/regulator/rpi-panel-attiny-regulator.c | 214 ++++++++++ + drivers/regulator/rt4801-regulator.c | 223 ++++++++++ + drivers/regulator/slg51000-regulator.c | 4 - + drivers/regulator/stm32-booster.c | 2 +- + drivers/regulator/stm32-pwr.c | 2 +- + drivers/regulator/stm32-vrefbuf.c | 2 +- + drivers/regulator/stpmic1_regulator.c | 4 - + drivers/regulator/sy8106a-regulator.c | 2 +- + drivers/regulator/sy8827n.c | 2 + + drivers/regulator/tps51632-regulator.c | 2 +- + drivers/regulator/tps6105x-regulator.c | 2 +- + drivers/regulator/tps62360-regulator.c | 2 +- + drivers/regulator/tps65023-regulator.c | 2 +- + drivers/regulator/tps65086-regulator.c | 4 +- + drivers/regulator/tps65090-regulator.c | 8 +- + drivers/regulator/tps6586x-regulator.c | 8 +- + drivers/regulator/tps65910-regulator.c | 10 +- + drivers/regulator/tps65912-regulator.c | 4 +- + drivers/regulator/wm831x-dcdc.c | 4 - + drivers/regulator/wm831x-isink.c | 2 - + drivers/regulator/wm831x-ldo.c | 2 - + drivers/regulator/wm8350-regulator.c | 2 - + .../regulator/mediatek,mt6360-regulator.h | 16 + + 61 files changed, 1999 insertions(+), 843 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mt6360-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/pfuze100.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pfuze100.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/raspberrypi,7inch-touchscreen-panel-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/silergy,sy8824x.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/sy8824x.txt + create mode 100644 drivers/regulator/mt6360-regulator.c + create mode 100644 drivers/regulator/rpi-panel-attiny-regulator.c + create mode 100644 drivers/regulator/rt4801-regulator.c + create mode 100644 include/dt-bindings/regulator/mediatek,mt6360-regulator.h +Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list debugging warning) +$ git merge security/next-testing +Merge made by the 'recursive' strategy. + security/device_cgroup.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +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 (d012a7190fc1 Linux 5.9-rc2) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) +$ git merge keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (0476c865ded6 LSM: SafeSetID: Fix warnings reported by test bot) +$ git merge safesetid/safesetid-next +Auto-merging kernel/sys.c +Auto-merging kernel/capability.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/SafeSetID.rst | 29 +++-- + kernel/capability.c | 2 +- + kernel/groups.c | 2 +- + kernel/sys.c | 10 +- + security/safesetid/lsm.c | 190 +++++++++++++++++++++------- + security/safesetid/lsm.h | 38 ++++-- + security/safesetid/securityfs.c | 190 ++++++++++++++++++++-------- + 7 files changed, 336 insertions(+), 125 deletions(-) +Merging selinux/next (66ccd2560aff selinux: simplify away security_policydb_len()) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/trace/events/avc.h | 53 ++ + scripts/selinux/mdp/mdp.c | 7 + + security/selinux/avc.c | 29 +- + security/selinux/hooks.c | 11 +- + security/selinux/include/conditional.h | 2 +- + security/selinux/include/policycap.h | 20 + + security/selinux/include/policycap_names.h | 18 + + security/selinux/include/security.h | 39 +- + security/selinux/selinuxfs.c | 254 ++++++--- + security/selinux/ss/avtab.c | 49 +- + security/selinux/ss/avtab.h | 1 + + security/selinux/ss/conditional.c | 155 +++++ + security/selinux/ss/conditional.h | 2 + + security/selinux/ss/hashtab.c | 53 ++ + security/selinux/ss/hashtab.h | 6 + + security/selinux/ss/services.c | 872 +++++++++++++++++------------ + security/selinux/ss/services.h | 5 +- + security/selinux/ss/sidtab.c | 10 + + security/selinux/ss/sidtab.h | 2 + + 20 files changed, 1104 insertions(+), 485 deletions(-) + create mode 100644 include/trace/events/avc.h + create mode 100644 security/selinux/include/policycap.h + create mode 100644 security/selinux/include/policycap_names.h +Merging smack/next (d012a7190fc1 Linux 5.9-rc2) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (9123e3a74ec7 Linux 5.9-rc1) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (18445bf405cb Merge tag 'spi-fix-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (c59bc95e9144 Merge branches 'iommu/fixes', 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm/qcom', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Auto-merging arch/arm/boot/dts/r8a7742.dtsi +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 3 +- + drivers/iommu/amd/amd_iommu.h | 9 ++ + drivers/iommu/amd/init.c | 4 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 4 +- + drivers/iommu/dma-iommu.c | 15 ++- + drivers/iommu/intel/dmar.c | 2 +- + drivers/iommu/iommu.c | 4 +- + drivers/iommu/iova.c | 2 +- + drivers/iommu/mtk_iommu.c | 35 +++++-- + drivers/iommu/sun50i-iommu.c | 15 ++- + drivers/iommu/tegra-smmu.c | 113 ++++++++++++++++++--- + drivers/vfio/vfio_iommu_type1.c | 2 +- + include/drm/intel-gtt.h | 5 +- + include/linux/intel-iommu.h | 1 + + include/linux/io-pgtable.h | 2 +- + include/linux/iommu.h | 10 +- + include/linux/soc/mediatek/infracfg.h | 3 + + 17 files changed, 174 insertions(+), 55 deletions(-) +Merging vfio/next (ccd59dce1a21 vfio/type1: Refactor vfio_iommu_type1_ioctl()) +$ git merge vfio/next +Already up to date. +Merging audit/next (c07203516439 audit: Remove redundant null check) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.c | 9 ++++----- + kernel/audit.h | 4 ---- + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging devicetree/for-next (282d66289d58 dt-bindings: interrupt-controller: Remove obsolete 'img,meta-intc') +$ git merge devicetree/for-next +Removing Documentation/devicetree/bindings/w1/fsl-imx-owire.txt +Removing Documentation/devicetree/bindings/sound/hdmi.txt +Removing Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt +Removing Documentation/devicetree/bindings/serial/fsl-lpuart.txt +Removing Documentation/devicetree/bindings/serial/fsl-imx-uart.txt +Removing Documentation/devicetree/bindings/rng/imx-rng.txt +Removing Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt +Removing Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt +Removing Documentation/devicetree/bindings/nvmem/snvs-lpgpr.txt +Removing Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt +Removing Documentation/devicetree/bindings/gpio/gpio-vf610.txt +Removing Documentation/devicetree/bindings/eeprom/at25.txt +Removing Documentation/devicetree/bindings/crypto/fsl-imx-scc.txt +Removing Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt +Removing Documentation/devicetree/bindings/crypto/fsl-dcp.txt +Auto-merging Documentation/devicetree/bindings/clock/imx28-clock.yaml +Auto-merging Documentation/devicetree/bindings/clock/imx23-clock.yaml +Removing Documentation/devicetree/bindings/ata/imx-sata.txt +Removing Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.txt +Removing Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/.gitignore | 1 + + Documentation/devicetree/bindings/Makefile | 45 ++++--- + .../bindings/arm/freescale/fsl,imx7ulp-pm.txt | 23 ---- + .../bindings/arm/freescale/fsl,imx7ulp-pm.yaml | 42 +++++++ + .../bindings/arm/freescale/fsl,imx7ulp-sim.txt | 16 --- + .../bindings/arm/freescale/fsl,imx7ulp-sim.yaml | 38 ++++++ + Documentation/devicetree/bindings/ata/imx-sata.txt | 37 ------ + .../devicetree/bindings/ata/imx-sata.yaml | 83 +++++++++++++ + .../devicetree/bindings/clock/imx23-clock.yaml | 4 +- + .../devicetree/bindings/clock/imx28-clock.yaml | 6 +- + .../devicetree/bindings/crypto/fsl-dcp.txt | 18 --- + .../devicetree/bindings/crypto/fsl-dcp.yaml | 51 ++++++++ + .../devicetree/bindings/crypto/fsl-imx-sahara.txt | 15 --- + .../devicetree/bindings/crypto/fsl-imx-sahara.yaml | 37 ++++++ + .../devicetree/bindings/crypto/fsl-imx-scc.txt | 21 ---- + .../devicetree/bindings/crypto/fsl-imx-scc.yaml | 54 +++++++++ + Documentation/devicetree/bindings/eeprom/at25.txt | 45 ------- + Documentation/devicetree/bindings/eeprom/at25.yaml | 129 +++++++++++++++++++++ + .../devicetree/bindings/gpio/gpio-vf610.txt | 63 ---------- + .../devicetree/bindings/gpio/gpio-vf610.yaml | 81 +++++++++++++ + .../interrupt-controller/img,meta-intc.txt | 82 ------------- + .../devicetree/bindings/nvmem/snvs-lpgpr.txt | 21 ---- + .../devicetree/bindings/nvmem/snvs-lpgpr.yaml | 33 ++++++ + .../devicetree/bindings/perf/fsl-imx-ddr.txt | 22 ---- + .../devicetree/bindings/perf/fsl-imx-ddr.yaml | 41 +++++++ + .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---- + Documentation/devicetree/bindings/rng/imx-rng.txt | 23 ---- + Documentation/devicetree/bindings/rng/imx-rng.yaml | 52 +++++++++ + .../devicetree/bindings/serial/fsl-imx-uart.txt | 40 ------- + .../devicetree/bindings/serial/fsl-imx-uart.yaml | 92 +++++++++++++++ + .../devicetree/bindings/serial/fsl-lpuart.txt | 43 ------- + .../devicetree/bindings/serial/fsl-lpuart.yaml | 79 +++++++++++++ + .../devicetree/bindings/serial/fsl-mxs-auart.txt | 53 --------- + .../devicetree/bindings/serial/fsl-mxs-auart.yaml | 91 +++++++++++++++ + Documentation/devicetree/bindings/sound/hdmi.txt | 16 --- + .../devicetree/bindings/w1/fsl-imx-owire.txt | 18 --- + .../devicetree/bindings/w1/fsl-imx-owire.yaml | 44 +++++++ + drivers/of/platform.c | 2 +- + scripts/Makefile.lib | 2 +- + scripts/dtc/dtx_diff | 3 +- + 40 files changed, 986 insertions(+), 604 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.txt + create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.txt + create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/imx-sata.txt + create mode 100644 Documentation/devicetree/bindings/ata/imx-sata.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-dcp.txt + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-dcp.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-sahara.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-scc.txt + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-scc.yaml + delete mode 100644 Documentation/devicetree/bindings/eeprom/at25.txt + create mode 100644 Documentation/devicetree/bindings/eeprom/at25.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-vf610.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-vf610.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt + delete mode 100644 Documentation/devicetree/bindings/nvmem/snvs-lpgpr.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/snvs-lpgpr.yaml + delete mode 100644 Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt + create mode 100644 Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt + delete mode 100644 Documentation/devicetree/bindings/rng/imx-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/imx-rng.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/fsl-lpuart.txt + create mode 100644 Documentation/devicetree/bindings/serial/fsl-lpuart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt + create mode 100644 Documentation/devicetree/bindings/serial/fsl-mxs-auart.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/hdmi.txt + delete mode 100644 Documentation/devicetree/bindings/w1/fsl-imx-owire.txt + create mode 100644 Documentation/devicetree/bindings/w1/fsl-imx-owire.yaml +Merging mailbox/mailbox-for-next (884996986347 mailbox: mediatek: cmdq: clear task in channel before shutdown) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (b1f556c2e2be Merge remote-tracking branch 'spi/for-5.10' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-s3c24xx.c +Auto-merging drivers/spi/Kconfig +Removing Documentation/devicetree/bindings/spi/spi-mtk-nor.txt +Merge made by the 'recursive' strategy. + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 85 +++++++++++ + .../devicetree/bindings/spi/renesas,rspi.yaml | 1 + + .../devicetree/bindings/spi/spi-mtk-nor.txt | 47 ------ + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-armada-3700.c | 1 - + drivers/spi/spi-fsl-dspi.c | 58 +------- + drivers/spi/spi-fsl-espi.c | 2 +- + drivers/spi/spi-fsl-lpspi.c | 6 +- + drivers/spi/spi-imx.c | 4 +- + drivers/spi/spi-rspi.c | 81 ++++++---- + drivers/spi/spi-s3c24xx.c | 2 +- + include/linux/pxa2xx_ssp.h | 165 +++++++++++---------- + 12 files changed, 236 insertions(+), 218 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/mediatek,spi-mtk-nor.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-mtk-nor.txt +Merging tip/auto-latest (7f6aae3e054f Merge branch 'core/build') +$ git merge tip/auto-latest +Auto-merging kernel/tracepoint.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/module.c +Auto-merging kernel/Makefile +Removing drivers/firmware/efi/libstub/hidden.h +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/arm/Makefile +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/locking/lockdep-design.rst | 258 ++++++++ + Documentation/x86/cpuinfo.rst | 155 +++++ + Documentation/x86/index.rst | 1 + + Documentation/x86/resctrl_ui.rst | 18 +- + MAINTAINERS | 1 + + arch/Kconfig | 13 + + arch/alpha/kernel/vmlinux.lds.S | 1 + + arch/arc/kernel/vmlinux.lds.S | 1 + + arch/arm/Makefile | 4 + + arch/arm/boot/compressed/Makefile | 2 + + arch/arm/boot/compressed/vmlinux.lds.S | 20 +- + arch/arm/{kernel => include/asm}/vmlinux.lds.h | 30 +- + arch/arm/kernel/topology.c | 26 - + arch/arm/kernel/vmlinux-xip.lds.S | 8 +- + arch/arm/kernel/vmlinux.lds.S | 8 +- + arch/arm64/Makefile | 9 +- + arch/arm64/kernel/smccc-call.S | 2 - + arch/arm64/kernel/vmlinux.lds.S | 28 +- + arch/arm64/mm/mmu.c | 2 +- + arch/csky/kernel/vmlinux.lds.S | 1 + + arch/hexagon/kernel/vmlinux.lds.S | 1 + + arch/ia64/kernel/vmlinux.lds.S | 1 + + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/nds32/kernel/vmlinux.lds.S | 1 + + arch/nios2/kernel/vmlinux.lds.S | 1 + + arch/openrisc/kernel/vmlinux.lds.S | 1 + + arch/parisc/boot/compressed/vmlinux.lds.S | 1 + + arch/parisc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/riscv/kernel/vmlinux.lds.S | 1 + + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/sh/kernel/vmlinux.lds.S | 1 + + arch/sparc/kernel/vmlinux.lds.S | 1 + + arch/um/kernel/dyn.lds.S | 2 +- + arch/um/kernel/uml.lds.S | 2 +- + arch/x86/Kconfig | 4 +- + arch/x86/Makefile | 4 + + arch/x86/boot/compressed/Makefile | 41 +- + arch/x86/boot/compressed/head_32.S | 99 +-- + arch/x86/boot/compressed/head_64.S | 165 ++--- + arch/x86/boot/compressed/kaslr.c | 238 ++++--- + arch/x86/boot/compressed/misc.h | 4 +- + arch/x86/boot/compressed/mkpiggy.c | 6 + + arch/x86/boot/compressed/vmlinux.lds.S | 50 +- + arch/x86/boot/setup.ld | 2 +- + arch/x86/boot/tools/build.c | 4 - + arch/x86/entry/calling.h | 1 - + arch/x86/entry/entry_64.S | 9 +- + arch/x86/entry/vdso/vdso32/vclock_gettime.c | 1 + + arch/x86/events/core.c | 214 +++++-- + arch/x86/events/intel/core.c | 350 ++++++++++- + arch/x86/events/perf_event.h | 52 +- + arch/x86/include/asm/asm.h | 6 +- + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/debugreg.h | 2 - + arch/x86/include/asm/fixmap.h | 2 +- + arch/x86/include/asm/fpu/internal.h | 7 +- + arch/x86/include/asm/fsgsbase.h | 4 +- + arch/x86/include/asm/idtentry.h | 4 +- + arch/x86/include/asm/kprobes.h | 4 + + arch/x86/include/asm/mce.h | 9 +- + arch/x86/include/asm/msr-index.h | 3 + + arch/x86/include/asm/paravirt.h | 151 +---- + arch/x86/include/asm/paravirt_types.h | 23 - + arch/x86/include/asm/perf_event.h | 97 ++- + arch/x86/include/asm/pgtable-3level_types.h | 5 - + arch/x86/include/asm/pgtable.h | 7 +- + arch/x86/include/asm/pgtable_64_types.h | 2 - + arch/x86/include/asm/processor.h | 2 +- + arch/x86/include/asm/required-features.h | 2 +- + arch/x86/include/asm/segment.h | 4 - + arch/x86/include/asm/special_insns.h | 6 + + arch/x86/include/asm/static_call.h | 40 ++ + arch/x86/include/asm/sync_core.h | 34 +- + arch/x86/include/asm/text-patching.h | 19 + + arch/x86/include/asm/uaccess.h | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/alternative.c | 5 + + arch/x86/kernel/cpu/common.c | 8 - + arch/x86/kernel/cpu/cpuid-deps.c | 1 + + arch/x86/kernel/cpu/mce/amd.c | 44 +- + arch/x86/kernel/cpu/mce/core.c | 9 +- + arch/x86/kernel/cpu/resctrl/core.c | 60 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 92 +-- + arch/x86/kernel/cpu/resctrl/internal.h | 49 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 16 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 85 ++- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/hw_breakpoint.c | 58 +- + arch/x86/kernel/kgdb.c | 5 +- + arch/x86/kernel/kprobes/core.c | 1 - + arch/x86/kernel/kprobes/opt.c | 5 +- + arch/x86/kernel/mpparse.c | 1 - + arch/x86/kernel/msr.c | 18 +- + arch/x86/kernel/paravirt.c | 19 - + arch/x86/kernel/paravirt_patch.c | 17 - + arch/x86/kernel/process_64.c | 8 +- + arch/x86/kernel/ptrace.c | 6 +- + arch/x86/kernel/setup.c | 2 + + arch/x86/kernel/static_call.c | 98 +++ + arch/x86/kernel/traps.c | 146 ++--- + arch/x86/kernel/umip.c | 40 +- + arch/x86/kernel/vmlinux.lds.S | 40 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/mm/init_64.c | 20 +- + arch/x86/xen/enlighten_pv.c | 6 - + arch/x86/xen/mmu_pv.c | 8 - + drivers/edac/mce_amd.c | 4 +- + drivers/firmware/efi/libstub/Makefile | 11 +- + drivers/firmware/efi/libstub/hidden.h | 6 - + drivers/oprofile/buffer_sync.c | 4 +- + drivers/ras/cec.c | 9 +- + include/asm-generic/vmlinux.lds.h | 62 +- + include/linux/cacheinfo.h | 21 + + include/linux/compiler.h | 2 +- + include/linux/hidden.h | 19 + + include/linux/lockdep.h | 29 +- + include/linux/module.h | 5 + + include/linux/notifier.h | 15 +- + include/linux/perf_event.h | 33 +- + include/linux/refcount.h | 65 +- + include/linux/resctrl.h | 2 + + include/linux/sched.h | 4 +- + include/linux/sched/sd_flags.h | 156 +++++ + include/linux/sched/topology.h | 37 +- + include/linux/seqlock.h | 8 +- + include/linux/static_call.h | 298 +++++++++ + include/linux/static_call_types.h | 35 ++ + include/linux/timekeeping.h | 15 + + include/linux/tracepoint-defs.h | 5 + + include/linux/tracepoint.h | 86 ++- + include/trace/define_trace.h | 14 +- + include/trace/events/xen.h | 20 - + kernel/Makefile | 1 + + kernel/cpu_pm.c | 48 +- + kernel/events/core.c | 38 +- + kernel/jump_label.c | 10 +- + kernel/kprobes.c | 2 + + kernel/locking/lockdep.c | 824 ++++++++++++++++++------- + kernel/locking/lockdep_internals.h | 2 + + kernel/module.c | 15 +- + kernel/notifier.c | 144 +++-- + kernel/power/hibernate.c | 39 +- + kernel/power/main.c | 8 +- + kernel/power/power.h | 3 +- + kernel/power/suspend.c | 14 +- + kernel/power/user.c | 14 +- + kernel/sched/core.c | 7 +- + kernel/sched/debug.c | 62 +- + kernel/sched/fair.c | 11 +- + kernel/sched/topology.c | 59 +- + kernel/static_call.c | 481 +++++++++++++++ + kernel/time/alarmtimer.c | 2 +- + kernel/time/timekeeping.c | 109 +++- + kernel/trace/bpf_trace.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/trace/trace_events.c | 2 +- + kernel/trace/trace_printk.c | 4 +- + kernel/tracepoint.c | 27 +- + lib/locking-selftest.c | 445 ++++++++++++- + scripts/tags.sh | 2 + + tools/include/linux/static_call_types.h | 35 ++ + tools/objtool/check.c | 138 +++++ + tools/objtool/check.h | 1 + + tools/objtool/elf.c | 8 +- + tools/objtool/elf.h | 3 +- + tools/objtool/objtool.h | 1 + + tools/objtool/orc_gen.c | 4 +- + tools/objtool/sync-check.sh | 1 + + tools/power/pm-graph/sleepgraph.py | 2 +- + tools/testing/selftests/x86/fsgsbase.c | 68 ++ + 171 files changed, 5085 insertions(+), 1682 deletions(-) + create mode 100644 Documentation/x86/cpuinfo.rst + rename arch/arm/{kernel => include/asm}/vmlinux.lds.h (84%) + create mode 100644 arch/x86/include/asm/static_call.h + create mode 100644 arch/x86/kernel/static_call.c + delete mode 100644 drivers/firmware/efi/libstub/hidden.h + create mode 100644 include/linux/hidden.h + create mode 100644 include/linux/sched/sd_flags.h + create mode 100644 include/linux/static_call.h + create mode 100644 include/linux/static_call_types.h + create mode 100644 kernel/static_call.c + create mode 100644 tools/include/linux/static_call_types.h +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 (8d5d94603eaf Merge branch 'edac-misc' into edac-for-next) +$ git merge edac/edac-for-next +Auto-merging drivers/edac/mce_amd.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/edac/amazon,al-mc-edac.yaml | 67 ++++ + MAINTAINERS | 11 +- + drivers/edac/Kconfig | 7 + + drivers/edac/Makefile | 1 + + drivers/edac/al_mc_edac.c | 354 +++++++++++++++++++++ + drivers/edac/aspeed_edac.c | 4 +- + drivers/edac/e752x_edac.c | 2 +- + drivers/edac/ghes_edac.c | 2 +- + drivers/edac/i5100_edac.c | 11 +- + drivers/edac/i5400_edac.c | 4 +- + drivers/edac/i7300_edac.c | 4 +- + drivers/edac/i7core_edac.c | 4 +- + drivers/edac/ie31200_edac.c | 6 +- + drivers/edac/mce_amd.c | 11 +- + drivers/edac/sb_edac.c | 2 +- + drivers/edac/thunderx_edac.c | 2 +- + drivers/edac/ti_edac.c | 5 +- + 17 files changed, 471 insertions(+), 26 deletions(-) + create mode 100644 Documentation/devicetree/bindings/edac/amazon,al-mc-edac.yaml + create mode 100644 drivers/edac/al_mc_edac.c +Merging irqchip/irq/irqchip-next (821fc9e261f3 irqchip/ingenic: Leave parent IRQ unmasked on suspend) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (38ce2a9e33db tracing: Add trace_array_init_printk() to initialize instance trace_printk() buffers) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (60fd60941f88 rcu: Panic after fixed number of stalls) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon +Auto-merging tools/objtool/check.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/entry/common.c +Auto-merging kernel/Makefile +Auto-merging include/linux/kernel.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../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 | 153 ++- + .../litmus-tests/locking/DCL-broken.litmus | 55 + + .../litmus-tests/locking/DCL-fixed.litmus | 56 + + .../litmus-tests/locking/RM-broken.litmus | 42 + + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 + + MAINTAINERS | 3 +- + arch/x86/kernel/cpu/aperfmperf.c | 13 +- + 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 | 30 +- + include/linux/instrumented.h | 30 + + include/linux/kcsan-checks.h | 45 +- + include/linux/kernel.h | 1 + + include/linux/rculist.h | 48 + + include/linux/rcupdate.h | 19 +- + include/linux/rcutiny.h | 3 +- + include/linux/rcutree.h | 2 +- + include/linux/smp.h | 3 + + include/linux/smp_types.h | 3 + + include/trace/events/rcu.h | 54 +- + kernel/Makefile | 2 + + kernel/entry/common.c | 2 +- + kernel/kcsan/core.c | 210 +++- + kernel/kcsan/debugfs.c | 130 +-- + kernel/kcsan/kcsan-test.c | 128 ++- + kernel/kcsan/kcsan.h | 12 +- + kernel/kcsan/report.c | 10 +- + kernel/kcsan/selftest.c | 8 +- + kernel/locking/locktorture.c | 4 +- + kernel/rcu/Kconfig | 8 +- + kernel/rcu/Kconfig.debug | 17 +- + kernel/rcu/Makefile | 2 +- + kernel/rcu/rcu_segcblist.c | 10 +- + kernel/rcu/{rcuperf.c => rcuscale.c} | 330 +++--- + kernel/rcu/rcutorture.c | 61 +- + kernel/rcu/refscale.c | 14 +- + kernel/rcu/srcutree.c | 13 - + kernel/rcu/tasks.h | 2 +- + kernel/rcu/tree.c | 173 +++- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_exp.h | 6 +- + kernel/rcu/tree_plugin.h | 40 +- + kernel/rcu/tree_stall.h | 14 +- + kernel/rcu/update.c | 13 - + kernel/scftorture.c | 593 +++++++++++ + kernel/sched/core.c | 9 +- + kernel/smp.c | 134 +++ + kernel/sysctl.c | 11 + + kernel/time/tick-sched.c | 2 +- + kernel/torture.c | 33 +- + 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/README | 82 ++ + tools/memory-model/Documentation/cheatsheet.txt | 33 +- + .../Documentation/control-dependencies.txt | 256 +++++ + tools/memory-model/Documentation/litmus-tests.txt | 1074 ++++++++++++++++++++ + tools/memory-model/Documentation/locking.txt | 320 ++++++ + tools/memory-model/Documentation/ordering.txt | 461 +++++++++ + tools/memory-model/Documentation/recipes.txt | 4 +- + tools/memory-model/Documentation/references.txt | 2 +- + tools/memory-model/Documentation/simple.txt | 271 +++++ + tools/memory-model/README | 164 +-- + 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 + + ...rf-ftrace.sh => kvm-recheck-rcuscale-ftrace.sh} | 6 +- + ...-recheck-rcuperf.sh => kvm-recheck-rcuscale.sh} | 14 +- + .../selftests/rcutorture/bin/kvm-recheck-scf.sh | 38 + + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 38 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 36 +- + .../selftests/rcutorture/bin/parse-console.sh | 11 +- + .../selftests/rcutorture/configs/rcu/TREE05 | 1 + + .../selftests/rcutorture/configs/rcuperf/CFcommon | 2 - + .../configs/{rcuperf => rcuscale}/CFLIST | 0 + .../selftests/rcutorture/configs/rcuscale/CFcommon | 2 + + .../rcutorture/configs/{rcuperf => rcuscale}/TINY | 0 + .../rcutorture/configs/{rcuperf => rcuscale}/TREE | 0 + .../configs/{rcuperf => rcuscale}/TREE54 | 0 + .../configs/{rcuperf => rcuscale}/ver_functions.sh | 4 +- + .../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 +- + 109 files changed, 5478 insertions(+), 1016 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + rename kernel/rcu/{rcuperf.c => rcuscale.c} (64%) + create mode 100644 kernel/scftorture.c + create mode 100644 tools/memory-model/Documentation/README + create mode 100644 tools/memory-model/Documentation/control-dependencies.txt + create mode 100644 tools/memory-model/Documentation/litmus-tests.txt + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100644 tools/memory-model/Documentation/ordering.txt + create mode 100644 tools/memory-model/Documentation/simple.txt + 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 + rename tools/testing/selftests/rcutorture/bin/{kvm-recheck-rcuperf-ftrace.sh => kvm-recheck-rcuscale-ftrace.sh} (92%) + rename tools/testing/selftests/rcutorture/bin/{kvm-recheck-rcuperf.sh => kvm-recheck-rcuscale.sh} (84%) + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-scf.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/CFLIST (100%) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuscale/CFcommon + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/TINY (100%) + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/TREE (100%) + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/TREE54 (100%) + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/ver_functions.sh (88%) + 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 +$ git am -3 ../patches/0001-Revert-scftorture-Add-an-alternative-IPI-vector.patch +Applying: Revert "scftorture: Add an alternative IPI vector" +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/scftorture.c +$ git add -A . +$ git commit -v -a --amend +[master c22725d8f658] Merge remote-tracking branch 'rcu/rcu/next' into master + Date: Tue Sep 8 15:20:32 2020 +1000 +Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (66793484fdb6 Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next) +$ git merge kvm-arm/next +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 22 +- + arch/arm64/include/asm/kvm_host.h | 4 +- + arch/arm64/include/asm/kvm_mmu.h | 251 +---- + arch/arm64/include/asm/kvm_pgtable.h | 281 +++++ + arch/arm64/include/asm/pgtable-hwdef.h | 23 - + arch/arm64/include/asm/pgtable-prot.h | 19 - + arch/arm64/include/asm/stage2_pgtable.h | 215 ---- + arch/arm64/kvm/arm.c | 5 +- + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/pgtable.c | 880 ++++++++++++++++ + arch/arm64/kvm/mmu.c | 1746 +++++-------------------------- + arch/arm64/kvm/pvtime.c | 29 +- + arch/arm64/kvm/reset.c | 38 +- + arch/arm64/kvm/trace_arm.h | 16 +- + arch/arm64/kvm/trace_handle_exit.h | 6 +- + arch/x86/kvm/x86.c | 3 + + include/linux/kvm_host.h | 31 +- + include/uapi/linux/kvm.h | 1 + + 18 files changed, 1521 insertions(+), 2051 deletions(-) + create mode 100644 arch/arm64/include/asm/kvm_pgtable.h + create mode 100644 arch/arm64/kvm/hyp/pgtable.c +Merging kvm-ppc/kvm-ppc-next (5706d14d2a94 KVM: PPC: Book3S HV: XICS: Replace the 'destroy' method by a 'release' method) +$ git merge kvm-ppc/kvm-ppc-next +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/kvm_host.h | 1 + + arch/powerpc/kvm/book3s.c | 4 +- + arch/powerpc/kvm/book3s_xics.c | 86 +++++++++++++++++++++++++++++-------- + 3 files changed, 72 insertions(+), 19 deletions(-) +Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (9e2369c06c8a xen: add helpers to allocate unpopulated memory) +$ 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 (9123e3a74ec7 Linux 5.9-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (dd92f7dfe1ba platform/chrome: Kconfig: Remove the transitional MFD_CROS_EC config) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 2 +- + drivers/platform/chrome/Kconfig | 10 ---- + drivers/platform/chrome/cros_ec_lightbar.c | 12 ++--- + drivers/platform/chrome/cros_ec_proto.c | 57 +++++++++++++++++----- + drivers/platform/chrome/cros_ec_sysfs.c | 24 ++++----- + drivers/platform/chrome/cros_ec_trace.h | 27 +++++++--- + drivers/platform/chrome/cros_ec_typec.c | 42 ++++++++++++++-- + drivers/pwm/pwm-cros-ec.c | 37 +++++++------- + 9 files changed, 140 insertions(+), 73 deletions(-) +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (242b81170fb8 leds: lp50xx: Add the LP50XX family of the RGB LED driver) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lp50xx.yaml | 130 +++++ + .../devicetree/bindings/leds/leds-pca955x.txt | 1 + + Documentation/leds/ledtrig-transient.rst | 7 - + drivers/leds/Kconfig | 12 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-lp50xx.c | 634 +++++++++++++++++++++ + drivers/leds/leds-mt6323.c | 18 +- + drivers/leds/leds-pca955x.c | 8 + + drivers/leds/leds-sgm3140.c | 2 +- + 9 files changed, 796 insertions(+), 17 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-lp50xx.yaml + create mode 100644 drivers/leds/leds-lp50xx.c +Merging ipmi/for-next (e829295c9bae ipmi: Reset response handler when failing to send the command) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) +Merging driver-core/driver-core-next (51fae39bd501 scripts/dev-needs: Add script to list device dependencies) +$ git merge driver-core/driver-core-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + scripts/dev-needs.sh | 315 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 321 insertions(+) + create mode 100755 scripts/dev-needs.sh +Merging usb/usb-next (5df7ef7d32fe uas: bump hw_max_sectors to 2048 blocks for SS or faster drives) +$ git merge usb/usb-next +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/firmware/Kconfig +Merge made by the 'recursive' strategy. + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 21 ++++ + .../devicetree/bindings/usb/renesas,usb-xhci.yaml | 1 + + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 22 ++++ + drivers/firmware/Kconfig | 3 +- + drivers/firmware/raspberrypi.c | 61 ---------- + drivers/pci/controller/pcie-brcmstb.c | 17 --- + drivers/reset/Kconfig | 11 ++ + drivers/reset/Makefile | 1 + + drivers/reset/reset-raspberrypi.c | 122 +++++++++++++++++++ + drivers/usb/atm/cxacru.c | 27 ++--- + drivers/usb/atm/usbatm.c | 14 ++- + drivers/usb/c67x00/c67x00-sched.c | 7 +- + drivers/usb/common/usb-conn-gpio.c | 32 +++-- + drivers/usb/core/driver.c | 8 +- + drivers/usb/core/generic.c | 4 +- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/urb.c | 89 ++++++++------ + drivers/usb/gadget/function/f_midi.c | 6 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 7 +- + drivers/usb/host/ehci-npcm7xx.c | 8 +- + drivers/usb/host/ehci-platform.c | 8 +- + drivers/usb/host/ehci-spear.c | 8 +- + drivers/usb/host/pci-quirks.c | 22 ++-- + drivers/usb/host/xhci-dbgtty.c | 6 +- + drivers/usb/host/xhci-mtk.c | 6 +- + drivers/usb/host/xhci-pci.c | 10 ++ + drivers/usb/host/xhci-tegra.c | 1 - + drivers/usb/host/xhci.h | 2 + + drivers/usb/misc/usb3503.c | 18 ++- + drivers/usb/misc/usb4604.c | 8 +- + drivers/usb/misc/usblcd.c | 1 - + drivers/usb/misc/yurex.c | 6 +- + drivers/usb/mtu3/mtu3.h | 6 - + drivers/usb/serial/mos7720.c | 8 +- + drivers/usb/storage/isd200.c | 2 +- + drivers/usb/storage/scsiglue.c | 2 +- + drivers/usb/storage/uas.c | 19 ++- + drivers/usb/storage/usb.c | 5 +- + drivers/usb/typec/tcpm/tcpm.c | 133 ++++++++++++++------- + .../dt-bindings/reset/raspberrypi,firmware-reset.h | 13 ++ + include/linux/usb/pd.h | 7 +- + include/soc/bcm2835/raspberrypi-firmware.h | 7 -- + 42 files changed, 475 insertions(+), 290 deletions(-) + create mode 100644 drivers/reset/reset-raspberrypi.c + create mode 100644 include/dt-bindings/reset/raspberrypi,firmware-reset.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 (9123e3a74ec7 Linux 5.9-rc1) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (71ac680e6339 usb: chipidea: ci_hdrc_imx: restore pinctrl) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 9 +++++++++ + drivers/usb/chipidea/ci_hdrc_imx.c | 13 ++++++++++++- + drivers/usb/chipidea/ci_hdrc_imx.h | 2 ++ + drivers/usb/chipidea/usbmisc_imx.c | 21 +++++++++++++++++++++ + 4 files changed, 44 insertions(+), 1 deletion(-) +Merging phy-next/next (23bea1be4eea phy: qcom-ipq4019-usb: Constify static phy_ops structs) +$ git merge phy-next/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt | 2 +- + drivers/phy/cadence/phy-cadence-salvo.c | 2 +- + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 79 ++++- + drivers/phy/hisilicon/phy-hi3660-usb3.c | 2 +- + drivers/phy/lantiq/phy-lantiq-rcu-usb2.c | 2 +- + drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 2 +- + drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c | 4 +- + drivers/phy/ralink/phy-ralink-usb.c | 2 +- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 39 +-- + drivers/phy/samsung/phy-samsung-ufs.c | 2 +- + drivers/phy/ti/phy-am654-serdes.c | 325 +++++++++++++-------- + drivers/phy/ti/phy-j721e-wiz.c | 1 - + drivers/phy/ti/phy-omap-usb2.c | 36 ++- + 13 files changed, 320 insertions(+), 178 deletions(-) +Merging tty/tty-next (71a174b39f10 pty: do tty_flip_buffer_push without port->lock in pty_write) +$ git merge tty/tty-next +Auto-merging drivers/tty/serial/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + drivers/accessibility/speakup/main.c | 4 +- + drivers/tty/hvc/hvcs.c | 14 +- + drivers/tty/ipwireless/hardware.c | 6 +- + drivers/tty/ipwireless/network.c | 4 +- + drivers/tty/ipwireless/tty.c | 2 +- + drivers/tty/n_gsm.c | 38 +- + drivers/tty/n_hdlc.c | 72 +-- + drivers/tty/n_tty.c | 4 +- + drivers/tty/pty.c | 4 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 12 +- + drivers/tty/serial/8250/8250_fsl.c | 108 ++++- + drivers/tty/serial/8250/8250_ingenic.c | 20 +- + drivers/tty/serial/8250/8250_pci.c | 56 +++ + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/atmel_serial.c | 20 +- + drivers/tty/serial/fsl_lpuart.c | 4 +- + drivers/tty/serial/icom.c | 32 +- + drivers/tty/serial/ifx6x60.c | 15 +- + drivers/tty/serial/imx.c | 3 +- + drivers/tty/serial/men_z135_uart.c | 8 +- + drivers/tty/serial/qcom_geni_serial.c | 13 +- + drivers/tty/serial/sa1100.c | 22 +- + drivers/tty/serial/sc16is7xx.c | 1 + + drivers/tty/serial/serial_core.c | 30 +- + drivers/tty/serial/stm32-usart.c | 33 +- + drivers/tty/serial/timbuart.c | 6 +- + drivers/tty/synclink.c | 82 ++-- + drivers/tty/synclink_gt.c | 95 ++-- + drivers/tty/synclinkmp.c | 83 ++-- + drivers/tty/tty_baudrate.c | 6 +- + drivers/tty/tty_buffer.c | 14 +- + drivers/tty/tty_io.c | 26 +- + drivers/tty/tty_jobctrl.c | 4 +- + drivers/tty/tty_ldisc.c | 3 +- + drivers/tty/vt/consolemap.c | 4 +- + drivers/tty/vt/selection.c | 2 +- + drivers/tty/vt/vc_screen.c | 532 ++++++++++++--------- + drivers/tty/vt/vt.c | 42 +- + drivers/tty/vt/vt_ioctl.c | 3 +- + drivers/video/console/newport_con.c | 16 +- + drivers/video/console/sticon.c | 2 +- + drivers/video/fbdev/core/fbcon.c | 2 +- + include/linux/console.h | 2 +- + include/linux/consolemap.h | 3 +- + include/linux/selection.h | 18 +- + 47 files changed, 839 insertions(+), 634 deletions(-) +Merging char-misc/char-misc-next (99f667352f6c /dev/zero: also implement ->read) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-mei | 7 + + Documentation/driver-api/mei/mei.rst | 37 ++ + drivers/android/binder.c | 4 +- + drivers/android/binder_alloc.c | 57 +- + drivers/android/binder_alloc.h | 5 +- + drivers/android/binder_alloc_selftest.c | 2 +- + drivers/android/binderfs.c | 2 +- + drivers/char/lp.c | 6 +- + drivers/char/mem.c | 22 + + drivers/char/mspec.c | 5 +- + drivers/misc/cardreader/rtsx_pcr.c | 4 - + drivers/misc/eeprom/at25.c | 4 +- + drivers/misc/fastrpc.c | 4 +- + drivers/misc/mei/Kconfig | 10 + + drivers/misc/mei/Makefile | 3 + + drivers/misc/mei/bus-fixup.c | 12 + + drivers/misc/mei/bus.c | 89 +++- + drivers/misc/mei/client.c | 423 ++++++++++++--- + drivers/misc/mei/client.h | 22 +- + drivers/misc/mei/debugfs.c | 9 +- + drivers/misc/mei/hbm.c | 101 +++- + drivers/misc/mei/hbm.h | 2 + + drivers/misc/mei/hw-virtio.c | 874 +++++++++++++++++++++++++++++++ + drivers/misc/mei/hw.h | 150 +++++- + drivers/misc/mei/interrupt.c | 113 +++- + drivers/misc/mei/main.c | 284 +++++++++- + drivers/misc/mei/mei_dev.h | 34 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 10 +- + drivers/virt/vboxguest/vboxguest_linux.c | 2 +- + include/linux/miscdevice.h | 10 +- + include/linux/spi/eeprom.h | 2 +- + include/uapi/linux/mei.h | 49 ++ + 32 files changed, 2188 insertions(+), 170 deletions(-) + create mode 100644 drivers/misc/mei/hw-virtio.c +Merging extcon/extcon-next (b49959fcfb2d extcon: palmas: Simplify with dev_err_probe()) +$ git merge extcon/extcon-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/extcon/extcon-ptn5150.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-ptn5150.txt | 27 --- + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 60 ++++++ + MAINTAINERS | 7 + + drivers/extcon/extcon-max14577.c | 2 +- + drivers/extcon/extcon-max77693.c | 2 +- + drivers/extcon/extcon-max77843.c | 2 +- + drivers/extcon/extcon-max8997.c | 2 +- + drivers/extcon/extcon-palmas.c | 20 +- + drivers/extcon/extcon-ptn5150.c | 205 ++++++++++----------- + drivers/extcon/extcon-usb-gpio.c | 2 +- + 10 files changed, 175 insertions(+), 154 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-ptn5150.txt + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml +Merging soundwire/next (8564551eec8a soundwire: qcom: add v1.5.1 compatible) +$ git merge soundwire/next +Auto-merging sound/soc/codecs/rt715-sdw.c +Auto-merging sound/soc/codecs/rt711-sdw.c +Auto-merging sound/soc/codecs/rt700-sdw.c +Auto-merging sound/soc/codecs/rt5682-sdw.c +Auto-merging sound/soc/codecs/rt1308-sdw.c +Auto-merging sound/soc/codecs/max98373-sdw.c +Auto-merging drivers/soundwire/stream.c +Auto-merging drivers/soundwire/bus.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soundwire/qcom,sdw.txt | 1 + + drivers/soundwire/Kconfig | 2 +- + drivers/soundwire/bus.c | 6 +- + drivers/soundwire/cadence_master.c | 61 +- + drivers/soundwire/cadence_master.h | 4 + + drivers/soundwire/intel.c | 758 ++++++++++++++++++--- + drivers/soundwire/intel.h | 4 + + drivers/soundwire/intel_init.c | 22 +- + drivers/soundwire/master.c | 2 + + drivers/soundwire/mipi_disco.c | 18 +- + drivers/soundwire/qcom.c | 60 +- + drivers/soundwire/slave.c | 6 +- + drivers/soundwire/stream.c | 30 +- + include/linux/soundwire/sdw.h | 30 +- + include/linux/soundwire/sdw_registers.h | 7 - + sound/soc/codecs/max98373-sdw.c | 15 +- + sound/soc/codecs/rt1308-sdw.c | 14 +- + sound/soc/codecs/rt5682-sdw.c | 15 +- + sound/soc/codecs/rt700-sdw.c | 15 +- + sound/soc/codecs/rt711-sdw.c | 15 +- + sound/soc/codecs/rt715-sdw.c | 33 +- + 21 files changed, 808 insertions(+), 310 deletions(-) +Merging thunderbolt/next (54e418106c76 thunderbolt: Add debugfs interface) +$ git merge thunderbolt/next +Auto-merging drivers/thunderbolt/tb.h +Auto-merging drivers/thunderbolt/switch.c +Merge made by the 'recursive' strategy. + drivers/acpi/bus.c | 1 + + drivers/pci/quirks.c | 57 ---- + drivers/thunderbolt/Kconfig | 10 + + drivers/thunderbolt/Makefile | 3 + + drivers/thunderbolt/acpi.c | 117 +++++++ + drivers/thunderbolt/cap.c | 136 +++++--- + drivers/thunderbolt/ctl.c | 5 +- + drivers/thunderbolt/debugfs.c | 700 ++++++++++++++++++++++++++++++++++++++++++ + drivers/thunderbolt/domain.c | 17 +- + drivers/thunderbolt/icm.c | 5 +- + drivers/thunderbolt/lc.c | 151 +++++++-- + drivers/thunderbolt/nhi.c | 69 +++++ + drivers/thunderbolt/nhi_ops.c | 31 +- + drivers/thunderbolt/switch.c | 216 +++++++++++-- + drivers/thunderbolt/tb.c | 189 +++++++++++- + drivers/thunderbolt/tb.h | 144 ++++++--- + drivers/thunderbolt/tb_regs.h | 34 +- + drivers/thunderbolt/usb4.c | 251 +++++++++++---- + 18 files changed, 1856 insertions(+), 280 deletions(-) + create mode 100644 drivers/thunderbolt/acpi.c + create mode 100644 drivers/thunderbolt/debugfs.c +Merging staging/staging-next (e2664d0870bb Merge tag 'iio-for-5.10a-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) +$ git merge staging/staging-next +Auto-merging drivers/iio/magnetometer/ak8974.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/iio/health/max30102.c +Auto-merging drivers/iio/dac/dpot-dac.c +Auto-merging drivers/iio/adc/ti-adc081c.c +Auto-merging drivers/iio/adc/meson_saradc.c +Auto-merging drivers/iio/adc/Kconfig +Auto-merging drivers/iio/accel/mma8452.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/iio/dac/ltc2632.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc108s102.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc0832.txt +Removing Documentation/devicetree/bindings/iio/adc/mcp3422.txt +Removing Documentation/devicetree/bindings/iio/adc/mcp320x.txt +Removing Documentation/devicetree/bindings/iio/adc/max9611.txt +Removing Documentation/devicetree/bindings/iio/adc/max1118.txt +Removing Documentation/devicetree/bindings/iio/adc/max11100.txt +Removing Documentation/devicetree/bindings/iio/adc/ltc2497.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 82 ++- + .../ABI/testing/sysfs-bus-iio-accel-adxl372 | 7 + + .../ABI/testing/sysfs-bus-iio-humidity-hdc2010 | 9 + + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 44 ++ + .../devicetree/bindings/iio/adc/ltc2497.txt | 13 - + .../devicetree/bindings/iio/adc/max11100.txt | 18 - + .../devicetree/bindings/iio/adc/max1118.txt | 21 - + .../devicetree/bindings/iio/adc/max9611.txt | 27 - + .../bindings/iio/adc/maxim,max11100.yaml | 49 ++ + .../devicetree/bindings/iio/adc/maxim,max1118.yaml | 62 ++ + .../devicetree/bindings/iio/adc/maxim,max9611.yaml | 51 ++ + .../devicetree/bindings/iio/adc/mcp320x.txt | 57 -- + .../devicetree/bindings/iio/adc/mcp3422.txt | 19 - + .../bindings/iio/adc/microchip,mcp3201.yaml | 77 ++ + .../devicetree/bindings/iio/adc/ti,adc0832.yaml | 56 ++ + .../devicetree/bindings/iio/adc/ti,adc108s102.yaml | 47 ++ + .../devicetree/bindings/iio/adc/ti,adc128s052.yaml | 59 ++ + .../devicetree/bindings/iio/adc/ti,adc161s626.yaml | 51 ++ + .../devicetree/bindings/iio/adc/ti,ads8344.yaml | 51 ++ + .../devicetree/bindings/iio/adc/ti,tlc4541.yaml | 52 ++ + .../devicetree/bindings/iio/adc/ti-adc0832.txt | 19 - + .../devicetree/bindings/iio/adc/ti-adc108s102.txt | 18 - + .../devicetree/bindings/iio/adc/ti-adc128s052.txt | 25 - + .../devicetree/bindings/iio/adc/ti-adc161s626.txt | 18 - + .../devicetree/bindings/iio/adc/ti-ads8344.txt | 19 - + .../bindings/iio/chemical/atlas,sensor.yaml | 4 + + .../devicetree/bindings/iio/dac/lltc,ltc2632.yaml | 77 ++ + .../devicetree/bindings/iio/dac/ltc2632.txt | 49 -- + .../bindings/iio/gyroscope/adi,adxrs290.yaml | 53 ++ + .../bindings/iio/humidity/ti,hdc2010.yaml | 45 ++ + .../devicetree/bindings/iio/light/ams,as73211.yaml | 54 ++ + .../bindings/iio/proximity/semtech,sx9310.yaml | 65 ++ + .../devicetree/bindings/trivial-devices.yaml | 16 + + MAINTAINERS | 20 + + drivers/iio/accel/adxl372.c | 311 +++++++- + drivers/iio/accel/adxl372_i2c.c | 8 + + drivers/iio/accel/adxl372_spi.c | 4 +- + drivers/iio/accel/bma180.c | 20 +- + drivers/iio/accel/bma220_spi.c | 85 ++- + drivers/iio/accel/mma8452.c | 20 +- + drivers/iio/adc/Kconfig | 2 +- + drivers/iio/adc/adi-axi-adc.c | 2 +- + drivers/iio/adc/axp20x_adc.c | 14 +- + drivers/iio/adc/bcm_iproc_adc.c | 4 +- + drivers/iio/adc/envelope-detector.c | 16 +- + drivers/iio/adc/exynos_adc.c | 10 +- + drivers/iio/adc/ltc2497-core.c | 10 +- + drivers/iio/adc/meson_saradc.c | 7 +- + drivers/iio/adc/rcar-gyroadc.c | 9 +- + drivers/iio/adc/stm32-adc-core.c | 75 +- + drivers/iio/adc/stm32-adc.c | 10 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 10 +- + drivers/iio/adc/stm32-dfsdm-core.c | 9 +- + drivers/iio/adc/ti-adc081c.c | 24 +- + drivers/iio/adc/ti-adc108s102.c | 5 +- + drivers/iio/adc/ti-adc128s052.c | 3 +- + drivers/iio/afe/iio-rescale.c | 8 +- + drivers/iio/amplifiers/Kconfig | 1 + + drivers/iio/amplifiers/hmc425a.c | 9 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 6 +- + drivers/iio/chemical/atlas-ezo-sensor.c | 88 ++- + drivers/iio/chemical/scd30_core.c | 9 +- + drivers/iio/dac/ad5686.c | 8 +- + drivers/iio/dac/ad5686.h | 2 +- + drivers/iio/dac/dpot-dac.c | 16 +- + drivers/iio/dac/stm32-dac-core.c | 5 +- + drivers/iio/dac/ti-dac5571.c | 29 +- + drivers/iio/frequency/ad9523.c | 60 +- + drivers/iio/gyro/Kconfig | 10 + + drivers/iio/gyro/Makefile | 1 + + drivers/iio/gyro/adxrs290.c | 446 ++++++++++++ + drivers/iio/health/max30102.c | 4 +- + drivers/iio/humidity/Kconfig | 10 + + drivers/iio/humidity/Makefile | 1 + + drivers/iio/humidity/hdc2010.c | 353 +++++++++ + drivers/iio/iio_core_trigger.h | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 20 +- + drivers/iio/industrialio-core.c | 1 + + drivers/iio/light/Kconfig | 15 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/as73211.c | 801 +++++++++++++++++++++ + drivers/iio/light/isl29018.c | 9 +- + drivers/iio/light/tsl2772.c | 10 +- + drivers/iio/magnetometer/ak8974.c | 11 +- + drivers/iio/magnetometer/mag3110.c | 20 +- + drivers/iio/multiplexer/iio-mux.c | 8 +- + drivers/iio/proximity/sx9310.c | 420 +++++------ + drivers/iio/temperature/mlx90632.c | 274 ++++++- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/android/ion/ion.c | 6 +- + drivers/staging/comedi/comedi.h | 4 +- + drivers/staging/comedi/comedidev.h | 2 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 4 +- + drivers/staging/comedi/drivers/comedi_8255.c | 2 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 2 +- + drivers/staging/comedi/drivers/pcl726.c | 2 +- + drivers/staging/comedi/drivers/pcmuio.c | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/emxx_udc/Kconfig | 2 +- + drivers/staging/emxx_udc/emxx_udc.c | 13 +- + drivers/staging/emxx_udc/emxx_udc.h | 456 ++++++------ + drivers/staging/greybus/gbphy.h | 4 +- + drivers/staging/hikey9xx/Kconfig | 38 + + drivers/staging/hikey9xx/Makefile | 5 + + drivers/staging/hikey9xx/TODO | 5 + + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 342 +++++++++ + drivers/staging/hikey9xx/hi6421v600-regulator.c | 479 ++++++++++++ + drivers/staging/hikey9xx/hisi-spmi-controller.c | 357 +++++++++ + .../hikey9xx/hisilicon,hi6421-spmi-pmic.yaml | 159 ++++ + .../hikey9xx/hisilicon,hisi-spmi-controller.yaml | 62 ++ + drivers/staging/iio/Documentation/overview.txt | 4 +- + drivers/staging/iio/frequency/ad9834.c | 1 - + drivers/staging/kpc2000/kpc_dma/fileops.c | 4 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 68 +- + .../staging/media/atomisp/include/media/lm3554.h | 7 +- + drivers/staging/media/tegra-vde/iommu.c | 4 +- + drivers/staging/most/dim2/dim2.c | 6 +- + drivers/staging/pi433/pi433_if.h | 26 +- + drivers/staging/qlge/qlge_mpi.c | 15 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 168 ++--- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 46 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 6 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 14 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- + drivers/staging/rtl8192e/rtllib_tx.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 15 +- + .../rtl8723bs/include/osdep_service_linux.h | 8 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 4 +- + drivers/staging/sm750fb/sm750.c | 3 +- + drivers/staging/wfx/bh.c | 23 +- + drivers/staging/wfx/data_rx.c | 2 +- + drivers/staging/wfx/data_tx.c | 21 +- + drivers/staging/wfx/data_tx.h | 3 +- + drivers/staging/wfx/debug.c | 8 +- + drivers/staging/wfx/hif_rx.c | 2 +- + drivers/staging/wfx/hif_tx.c | 9 +- + drivers/staging/wfx/hif_tx.h | 3 +- + drivers/staging/wfx/key.c | 10 +- + drivers/staging/wfx/main.c | 4 +- + drivers/staging/wfx/main.h | 2 +- + drivers/staging/wfx/scan.c | 4 - + drivers/staging/wfx/sta.c | 113 ++- + drivers/staging/wlan-ng/prism2mgmt.c | 24 +- + drivers/staging/wlan-ng/prism2mib.c | 2 +- + drivers/staging/wlan-ng/prism2sta.c | 4 +- + include/linux/mfd/hi6421-spmi-pmic.h | 53 ++ + include/linux/platform_data/ad7793.h | 2 +- + include/uapi/linux/iio/types.h | 1 + + tools/iio/iio_event_monitor.c | 2 + + 154 files changed, 5757 insertions(+), 1555 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-accel-adxl372 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc2010 + create mode 100644 Documentation/devicetree/bindings/iio/adc/lltc,ltc2497.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ltc2497.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/max11100.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/max1118.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/max9611.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max11100.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max1118.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max9611.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/mcp320x.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/mcp3422.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/microchip,mcp3201.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc0832.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc108s102.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc128s052.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc161s626.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads8344.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,tlc4541.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc0832.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc108s102.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/lltc,ltc2632.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ltc2632.txt + create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml + create mode 100644 Documentation/devicetree/bindings/iio/humidity/ti,hdc2010.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/ams,as73211.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/semtech,sx9310.yaml + create mode 100644 drivers/iio/gyro/adxrs290.c + create mode 100644 drivers/iio/humidity/hdc2010.c + create mode 100644 drivers/iio/light/as73211.c + create mode 100644 drivers/staging/hikey9xx/Kconfig + create mode 100644 drivers/staging/hikey9xx/Makefile + create mode 100644 drivers/staging/hikey9xx/TODO + create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c + create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c + create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c + create mode 100644 drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml + create mode 100644 drivers/staging/hikey9xx/hisilicon,hisi-spmi-controller.yaml + create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h +Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) +$ git merge mux/for-next +Auto-merging drivers/mux/adgs1408.c +Merge made by the 'recursive' strategy. +Merging icc/icc-next (91e045b93db7 interconnect: qcom: Fix small BW votes being truncated to zero) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (78e7a522693b dt-bindings: renesas,rcar-dmac: Document r8a7742 support) +$ git merge dmaengine/next +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/dma/pl330.c +Auto-merging drivers/dma/idxd/irq.c +Auto-merging drivers/dma/idxd/device.c +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 20 ++ + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 1 + + .../bindings/dma/snps,dma-spear1340.yaml | 7 +- + drivers/dma/dma-axi-dmac.c | 138 +++++++++++--- + drivers/dma/dmaengine.c | 24 +-- + drivers/dma/dw-edma/dw-edma-v0-regs.h | 2 +- + drivers/dma/dw/core.c | 6 +- + drivers/dma/dw/dw.c | 7 +- + drivers/dma/dw/idma32.c | 5 +- + drivers/dma/dw/of.c | 7 +- + drivers/dma/idxd/device.c | 10 +- + drivers/dma/idxd/idxd.h | 3 + + drivers/dma/idxd/init.c | 2 + + drivers/dma/idxd/irq.c | 2 +- + drivers/dma/idxd/sysfs.c | 95 ++++++++++ + drivers/dma/pch_dma.c | 35 +--- + drivers/dma/pl330.c | 11 +- + drivers/dma/stm32-dma.c | 8 +- + drivers/dma/stm32-dmamux.c | 9 +- + drivers/dma/stm32-mdma.c | 9 +- + drivers/dma/ti/Makefile | 5 +- + drivers/dma/ti/k3-psil-j7200.c | 175 +++++++++++++++++ + drivers/dma/ti/k3-psil-j721e.c | 3 + + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 19 +- + drivers/dma/ti/k3-udma.c | 10 - + drivers/dma/ti/omap-dma.c | 2 +- + drivers/dma/xilinx/xilinx_dma.c | 36 +--- + drivers/dma/xilinx/xilinx_dpdma.c | 209 +++++++++++++++++++++ + include/linux/dmaengine.h | 17 +- + include/linux/platform_data/dma-dw.h | 2 + + 31 files changed, 708 insertions(+), 172 deletions(-) + create mode 100644 drivers/dma/ti/k3-psil-j7200.c +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 (5da7eb801d50 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging drivers/scsi/qla4xxx/ql4_os.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_ctl.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/megaraid.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/csiostor/csio_hw.c +Auto-merging drivers/scsi/aic7xxx/aic79xx_osm.c +Auto-merging drivers/scsi/aacraid/linit.c +Auto-merging drivers/scsi/aacraid/commsup.c +Auto-merging drivers/scsi/aacraid/aachba.c +Merge made by the 'recursive' strategy. + drivers/message/fusion/mptctl.c | 5 +- + drivers/message/fusion/mptfc.c | 6 +- + drivers/scsi/aacraid/aachba.c | 4 +- + drivers/scsi/aacraid/commctrl.c | 20 +- + drivers/scsi/aacraid/commsup.c | 8 +- + drivers/scsi/aacraid/linit.c | 4 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 7 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 6 +- + drivers/scsi/csiostor/csio_hw.c | 2 +- + drivers/scsi/csiostor/csio_scsi.c | 6 +- + drivers/scsi/cxgbi/libcxgbi.c | 8 +- + drivers/scsi/cxgbi/libcxgbi.h | 16 - + drivers/scsi/dc395x.c | 16 +- + drivers/scsi/esas2r/esas2r_ioctl.c | 28 +- + drivers/scsi/hpsa.c | 16 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 2 +- + drivers/scsi/megaraid.c | 192 ++++++------ + drivers/scsi/mpt3sas/mpt3sas_base.c | 51 ++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 21 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 16 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 245 +++++++++++++-- + drivers/scsi/mvsas/mv_init.c | 4 - + drivers/scsi/pmcraid.c | 1 - + drivers/scsi/qedf/qedf_els.c | 32 +- + drivers/scsi/qedf/qedf_io.c | 11 +- + drivers/scsi/qedf/qedf_main.c | 11 + + drivers/scsi/qla2xxx/qla_mbx.c | 4 +- + drivers/scsi/qla2xxx/qla_nvme.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 4 +- + drivers/scsi/qla2xxx/qla_target.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/smartpqi/smartpqi.h | 5 +- + drivers/scsi/smartpqi/smartpqi_init.c | 474 ++++++++++++++++------------ + drivers/scsi/snic/snic_scsi.c | 4 +- + drivers/scsi/ufs/ufs-mediatek.h | 4 +- + drivers/scsi/ufs/ufs-qcom.c | 262 +--------------- + drivers/scsi/ufs/ufs-qcom.h | 11 - + drivers/scsi/ufs/ufs-sysfs.c | 1 + + drivers/scsi/ufs/ufshcd.c | 573 +++++++++++++++++++++------------- + drivers/scsi/ufs/ufshcd.h | 14 + + 42 files changed, 1156 insertions(+), 952 deletions(-) +Merging scsi-mkp/for-next (8c6572356646 scsi: scsi_debug: Make sdebug_build_parts() respect virtual_gb) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.h +CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.h +Auto-merging drivers/scsi/ufs/ufshcd.c +CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_main.c +Auto-merging drivers/scsi/aacraid/aachba.c +CONFLICT (content): Merge conflict in drivers/scsi/aacraid/aachba.c +Auto-merging drivers/message/fusion/mptscsih.c +Auto-merging MAINTAINERS +Resolved 'drivers/scsi/aacraid/aachba.c' using previous resolution. +Resolved 'drivers/scsi/ufs/ufshcd.c' using previous resolution. +Resolved 'drivers/scsi/ufs/ufshcd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6819c9a01d60] Merge remote-tracking branch 'scsi-mkp/for-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/scsi/smartpqi.rst | 14 +- + MAINTAINERS | 28 ++- + drivers/message/fusion/mptscsih.c | 3 +- + drivers/scsi/aacraid/aachba.c | 1 - + drivers/scsi/arm/cumana_2.c | 19 +- + drivers/scsi/arm/eesox.c | 9 +- + drivers/scsi/arm/powertec.c | 9 +- + drivers/scsi/dpt_i2o.c | 3 - + drivers/scsi/fdomain_isa.c | 5 +- + drivers/scsi/fnic/fnic_fcs.c | 9 - + drivers/scsi/fnic/fnic_main.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas.h | 35 ++++ + drivers/scsi/hisi_sas/hisi_sas_main.c | 113 +++++++++-- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 24 +-- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 146 ++++++++------ + drivers/scsi/hpsa.c | 1 + + drivers/scsi/hpsa.h | 1 + + drivers/scsi/hpsa_cmd.h | 1 + + drivers/scsi/isci/host.c | 2 - + drivers/scsi/qedi/qedi_main.c | 3 +- + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/scsi_debug.c | 83 ++++++-- + drivers/scsi/scsi_transport_fc.c | 1 + + drivers/scsi/smartpqi/Kconfig | 4 +- + drivers/scsi/smartpqi/smartpqi.h | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 2 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 2 +- + drivers/scsi/ufs/ufs-exynos.c | 3 +- + drivers/scsi/ufs/ufshcd.c | 260 +++++++++++++++++-------- + drivers/scsi/ufs/ufshcd.h | 7 + + drivers/scsi/ufs/ufshci.h | 1 + + drivers/scsi/ufs/unipro.h | 3 + + include/scsi/scsi_transport_fc.h | 1 + + 36 files changed, 563 insertions(+), 245 deletions(-) +Merging vhost/linux-next (8a7c3213db06 vdpa/mlx5: fix up endian-ness for mtu) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (ca69dba7f13a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (feeaefd378ca gpio: dwapb: Use resource managed GPIO-chip add data method) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 6 + + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-dwapb.c | 352 +++++++++++---------- + include/linux/platform_data/gpio-dwapb.h | 4 +- + 4 files changed, 191 insertions(+), 173 deletions(-) +Merging gpio-brgl/gpio/for-next (805a6ef8ac28 gpio: zynq: Simplify with dev_err_probe()) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + .../bindings/gpio/renesas,rcar-gpio.yaml | 1 + + drivers/gpio/gpio-aggregator.c | 70 +++++++++++++--------- + drivers/gpio/gpio-bcm-kona.c | 5 +- + drivers/gpio/gpio-davinci.c | 8 +-- + drivers/gpio/gpio-omap.c | 5 +- + drivers/gpio/gpio-pca953x.c | 9 +-- + drivers/gpio/gpio-pisosr.c | 9 +-- + drivers/gpio/gpio-stp-xway.c | 54 +++++++++++++++-- + drivers/gpio/gpio-zynq.c | 8 +-- + 9 files changed, 105 insertions(+), 64 deletions(-) +Merging gpio-intel/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (ebc2599144b6 pinctrl: mcp23s08: Improve error messaging in ->probe()) +$ git merge pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/actions,s500-pinctrl.yaml | 240 +++ + .../bindings/pinctrl/pinctrl-mt8192.yaml | 155 ++ + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 132 ++ + MAINTAINERS | 2 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- + drivers/pinctrl/actions/Kconfig | 6 + + drivers/pinctrl/actions/Makefile | 1 + + drivers/pinctrl/actions/pinctrl-s500.c | 1727 +++++++++++++++ + drivers/pinctrl/mediatek/Kconfig | 7 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1409 ++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8192.h | 2275 ++++++++++++++++++++ + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 16 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 23 +- + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm8226.c | 630 ++++++ + include/dt-bindings/pinctrl/mt8192-pinfunc.h | 1344 ++++++++++++ + 19 files changed, 7957 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/actions,s500-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt8192.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8226-pinctrl.yaml + create mode 100644 drivers/pinctrl/actions/pinctrl-s500.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8192.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8192.h + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8226.c + create mode 100644 include/dt-bindings/pinctrl/mt8192-pinfunc.h +Merging pinctrl-intel/for-next (a0bf06dc51db pinctrl: cherryview: Preserve CHV_PADCTRL1_INVRXTX_TXDATA flag on GPIOs) +$ git merge pinctrl-intel/for-next +Auto-merging drivers/pinctrl/intel/pinctrl-cherryview.c +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/Kconfig | 12 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 24 +--- + drivers/pinctrl/intel/pinctrl-cherryview.c | 170 +++++++++++++---------------- + drivers/pinctrl/intel/pinctrl-intel.c | 24 +++- + drivers/pinctrl/intel/pinctrl-intel.h | 7 +- + 5 files changed, 104 insertions(+), 133 deletions(-) +Merging pinctrl-samsung/for-next (9123e3a74ec7 Linux 5.9-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 +Already up to date. +Merging userns/for-next (7fce69dff8db Implement kernel_execve) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't") +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (f69237e1e954 selftests: more general make nesting support) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 8 ++++---- + tools/testing/selftests/lib.mk | 4 ++-- + 2 files changed, 6 insertions(+), 6 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 (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next) +$ git merge livepatching/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 4 ---- + tools/testing/selftests/livepatch/functions.sh | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) +Merging coresight/next (ac8b9037ea2c coresight: etm4x: Handle unreachable sink in perf mode) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-cti.c | 30 ++----- + drivers/hwtracing/coresight/coresight-etm-perf.c | 10 +++ + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 99 ++++++++++++---------- + drivers/hwtracing/coresight/coresight-etm4x.h | 3 + + drivers/hwtracing/coresight/coresight-platform.c | 10 +-- + drivers/hwtracing/coresight/coresight-stm.c | 11 ++- + include/uapi/linux/coresight-stm.h | 1 + + 8 files changed, 89 insertions(+), 77 deletions(-) +Merging rtc/rtc-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (03b68d5d7d4b Merge branch 'for-5.9/copy_mc' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Removing tools/testing/selftests/powerpc/copyloops/memcpy_mcsafe_64.S +Removing tools/perf/bench/mem-memcpy-x86-64-lib.c +Auto-merging tools/perf/bench/Build +Auto-merging tools/objtool/check.c +Removing tools/arch/x86/include/asm/mcsafe_test.h +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig +Auto-merging include/linux/uio.h +Auto-merging include/linux/uaccess.h +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/md/dm-writecache.c +Auto-merging arch/x86/lib/Makefile +Auto-merging arch/x86/kernel/quirks.c +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging arch/x86/include/asm/uaccess.h +Removing arch/x86/include/asm/mcsafe_test.h +Auto-merging arch/x86/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/lib/Makefile +Auto-merging arch/powerpc/include/asm/uaccess.h +Auto-merging arch/powerpc/include/asm/string.h +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/string.h | 2 - + arch/powerpc/include/asm/uaccess.h | 40 +++-- + arch/powerpc/lib/Makefile | 2 +- + .../lib/{memcpy_mcsafe_64.S => copy_mc_64.S} | 4 +- + arch/x86/Kconfig | 2 +- + arch/x86/Kconfig.debug | 2 +- + arch/x86/include/asm/copy_mc_test.h | 75 ++++++++++ + arch/x86/include/asm/mcsafe_test.h | 75 ---------- + arch/x86/include/asm/string_64.h | 32 ---- + arch/x86/include/asm/uaccess.h | 21 +++ + arch/x86/include/asm/uaccess_64.h | 20 --- + arch/x86/kernel/cpu/mce/core.c | 8 +- + arch/x86/kernel/quirks.c | 9 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/copy_mc.c | 64 ++++++++ + arch/x86/lib/copy_mc_64.S | 165 +++++++++++++++++++++ + arch/x86/lib/memcpy_64.S | 115 -------------- + arch/x86/lib/usercopy_64.c | 21 --- + drivers/md/dm-writecache.c | 15 +- + drivers/nvdimm/claim.c | 2 +- + drivers/nvdimm/pmem.c | 6 +- + include/linux/string.h | 9 +- + include/linux/uaccess.h | 9 ++ + include/linux/uio.h | 10 +- + lib/Kconfig | 7 +- + lib/iov_iter.c | 43 +++--- + tools/arch/x86/include/asm/mcsafe_test.h | 13 -- + tools/arch/x86/lib/memcpy_64.S | 115 -------------- + tools/objtool/check.c | 5 +- + tools/perf/bench/Build | 1 - + tools/perf/bench/mem-memcpy-x86-64-lib.c | 24 --- + tools/testing/nvdimm/test/nfit.c | 48 +++--- + .../testing/selftests/powerpc/copyloops/.gitignore | 2 +- + tools/testing/selftests/powerpc/copyloops/Makefile | 6 +- + .../selftests/powerpc/copyloops/copy_mc_64.S | 1 + + .../selftests/powerpc/copyloops/memcpy_mcsafe_64.S | 1 - + 37 files changed, 451 insertions(+), 526 deletions(-) + rename arch/powerpc/lib/{memcpy_mcsafe_64.S => copy_mc_64.S} (98%) + create mode 100644 arch/x86/include/asm/copy_mc_test.h + delete mode 100644 arch/x86/include/asm/mcsafe_test.h + create mode 100644 arch/x86/lib/copy_mc.c + create mode 100644 arch/x86/lib/copy_mc_64.S + delete mode 100644 tools/arch/x86/include/asm/mcsafe_test.h + delete mode 100644 tools/perf/bench/mem-memcpy-x86-64-lib.c + create mode 120000 tools/testing/selftests/powerpc/copyloops/copy_mc_64.S + delete mode 120000 tools/testing/selftests/powerpc/copyloops/memcpy_mcsafe_64.S +Merging at24/at24/for-next (99363d1c26c8 eeprom: at24: Tidy at24_read()) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 47 ++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 41 insertions(+), 6 deletions(-) +Merging ntb/ntb-next (b8e2c8bbdf77 NTB: Use struct_size() helper in devm_kzalloc()) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_msi_test.c | 5 +---- + 3 files changed, 3 insertions(+), 5 deletions(-) +Merging seccomp/for-next/seccomp (16b89f695313 net/scm: Fix typo in SCM_RIGHTS compat refactoring) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (55dde35fdb7f overflow: Add __must_check attribute to check_*() helpers) +$ git merge kspp/for-next/kspp +Merge made by the 'recursive' strategy. + include/linux/overflow.h | 39 ++++++++++++++++++++++++--------------- + 1 file changed, 24 insertions(+), 15 deletions(-) +Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (4ca8b73f16f0 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 | 15 ++- + drivers/fsi/fsi-master.h | 3 +- + drivers/fsi/fsi-occ.c | 2 +- + drivers/fsi/fsi-sbefifo.c | 12 +- + drivers/fsi/fsi-scom.c | 2 +- + 11 files changed, 194 insertions(+), 37 deletions(-) +Merging slimbus/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (c368763c4b01 nvmem: core: Use kobj_to_dev() instead of container_of()) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + drivers/nvmem/core.c | 6 +++--- + drivers/nvmem/mtk-efuse.c | 14 -------------- + 2 files changed, 3 insertions(+), 17 deletions(-) +Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked) +$ git merge xarray/xarray +Auto-merging include/linux/xarray.h +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 13 +++++++------ + drivers/infiniband/core/device.c | 6 +----- + include/linux/xarray.h | 23 +++++++++++++++++++++- + lib/idr.c | 1 + + lib/test_xarray.c | 20 +++++++++++++++++++ + lib/xarray.c | 39 +++++++++++++++++++++++++++++++------ + tools/testing/radix-tree/idr-test.c | 29 +++++++++++++++++++++++++++ + 7 files changed, 113 insertions(+), 18 deletions(-) +Merging hyperv/hyperv-next (49971e6bad2d drivers: hv: remove cast from hyperv_die_event) +$ git merge hyperv/hyperv-next +Merge made by the 'recursive' strategy. + drivers/hv/vmbus_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging auxdisplay/auxdisplay (46d4a403a04c auxdisplay: Replace HTTP links with HTTPS ones) +$ git merge auxdisplay/auxdisplay +Already up to date. +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 (f2e9aec45e9e Merge tag 'kernel-clone-v5.9' into for-next) +$ git merge pidfd/for-next +Auto-merging kernel/fork.c +Merge made by the 'recursive' strategy. + Documentation/trace/histogram.rst | 4 +- + arch/h8300/kernel/process.c | 2 +- + arch/ia64/kernel/process.c | 4 +- + arch/m68k/kernel/process.c | 10 ++--- + arch/nios2/kernel/process.c | 2 +- + arch/sparc/kernel/process.c | 6 +-- + arch/x86/kernel/sys_ia32.c | 2 +- + drivers/misc/kgdbts.c | 48 +++++++++++----------- + include/linux/sched/task.h | 2 +- + kernel/fork.c | 16 ++++---- + samples/kprobes/kprobe_example.c | 6 +-- + samples/kprobes/kretprobe_example.c | 4 +- + .../ftrace/test.d/dynevent/add_remove_kprobe.tc | 2 +- + .../ftrace/test.d/dynevent/clear_select_events.tc | 2 +- + .../ftrace/test.d/dynevent/generic_clear_event.tc | 2 +- + .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 4 +- + .../ftrace/test.d/kprobe/add_and_remove.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/kprobe_args.tc | 4 +- + .../ftrace/test.d/kprobe/kprobe_args_comm.tc | 2 +- + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 4 +- + .../ftrace/test.d/kprobe/kprobe_args_symbol.tc | 10 ++--- + .../ftrace/test.d/kprobe/kprobe_args_type.tc | 2 +- + .../ftrace/test.d/kprobe/kprobe_ftrace.tc | 14 +++---- + .../ftrace/test.d/kprobe/kprobe_multiprobe.tc | 2 +- + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 12 +++--- + .../ftrace/test.d/kprobe/kretprobe_args.tc | 4 +- + .../selftests/ftrace/test.d/kprobe/profile.tc | 2 +- + 28 files changed, 88 insertions(+), 88 deletions(-) +Merging hmm/hmm (9123e3a74ec7 Linux 5.9-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (c71e805083af fpga: fpga-region: Cleanup an outdated comment) +$ git merge fpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + drivers/fpga/dfl-fme-perf.c | 2 +- + drivers/fpga/dfl-pci.c | 24 +++-- + drivers/fpga/dfl.c | 212 +++++++++++++++++++++++++++++-------------- + drivers/fpga/dfl.h | 17 ++-- + drivers/fpga/fpga-region.c | 2 +- + drivers/fpga/stratix10-soc.c | 23 +---- + drivers/fpga/xilinx-spi.c | 77 ++++++++++++---- + 8 files changed, 224 insertions(+), 135 deletions(-) +Merging kunit/test (9123e3a74ec7 Linux 5.9-rc1) +$ git merge kunit/test +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 (abe83f7621ee kunit: ubsan integration) +$ git merge kunit-next/kunit +Merge made by the 'recursive' strategy. + lib/ubsan.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging trivial/for-next (2a9b29b28983 xtensa: fix Kconfig typo) +$ git merge trivial/for-next +Auto-merging arch/xtensa/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/xtensa/Kconfig | 2 +- + drivers/hid/hid-logitech-dj.c | 2 +- + drivers/mtd/nand/raw/oxnas_nand.c | 3 +-- + fs/vboxsf/dir.c | 2 +- + include/linux/scif.h | 8 ++++---- + init/main.c | 2 +- + kernel/printk/printk_safe.c | 2 +- + lib/bitmap.c | 2 +- + scripts/spelling.txt | 4 ---- + tools/testing/selftests/vm/config | 1 + + 11 files changed, 13 insertions(+), 17 deletions(-) +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (18e9533ac877 bus: mhi: core: Introduce APIs to allocate and free the MHI controller) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/boot.c | 17 ++++++++++++++++- + drivers/bus/mhi/core/init.c | 21 +++++++++++++++++++-- + drivers/bus/mhi/core/internal.h | 13 ++++++++++++- + drivers/bus/mhi/core/main.c | 27 ++++++++++----------------- + drivers/bus/mhi/core/pm.c | 26 +++++++++++++++----------- + include/linux/mhi.h | 38 ++++++++++++++++++++++++++++++-------- + 6 files changed, 102 insertions(+), 40 deletions(-) +Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/namespace.c +Auto-merging fs/mount.h +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +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 | 18 +++ + fs/mount_notify.c | 222 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + include/linux/dcache.h | 1 + + include/linux/lsm_hook_defs.h | 3 + + include/linux/lsm_hooks.h | 6 + + 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 | 31 +++- + kernel/sys_ni.c | 3 + + samples/watch_queue/watch_test.c | 41 ++++- + security/security.c | 7 + + 35 files changed, 411 insertions(+), 6 deletions(-) + create mode 100644 fs/mount_notify.c +Merging memblock/for-next (762d4d1a174c arch/ia64: Restore arch-specific pgd_offset_k implementation) +$ git merge memblock/for-next +Merge made by the 'recursive' strategy. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +$ git am -3 ../patches/0001-Revert-tracepoint-Optimize-using-static_call.patch +Applying: Revert "tracepoint: Optimize using static_call()" +Merging akpm-current/current (8fc02284173a x86: add failure injection to get/put/clear_user) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/tags.sh +Auto-merging mm/vmstat.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memremap.c +Auto-merging mm/memory.c +Auto-merging mm/ksm.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/gup.c +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/xarray.c +Auto-merging lib/test_xarray.c +Auto-merging lib/iov_iter.c +Auto-merging lib/bitmap.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/kprobes.c +Auto-merging kernel/fork.c +Auto-merging kernel/dma/contiguous.c +Auto-merging include/linux/xarray.h +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/dax.h +Auto-merging fs/configfs/file.c +Auto-merging fs/buffer.c +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/nd.h +Auto-merging drivers/nvdimm/claim.c +Auto-merging drivers/dax/device.c +CONFLICT (content): Merge conflict in drivers/dax/device.c +Auto-merging drivers/base/core.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging arch/x86/mm/numa_emulation.c +Auto-merging arch/x86/lib/usercopy_64.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/powerpc/mm/book3s64/radix_pgtable.c +Auto-merging arch/nds32/kernel/setup.c +Auto-merging arch/h8300/kernel/setup.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/kernel/vdso/Makefile +Auto-merging arch/arm64/kernel/setup.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging Documentation/core-api/xarray.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging .clang-format +CONFLICT (content): Merge conflict in .clang-format +Recorded preimage for '.clang-format' +Recorded preimage for 'drivers/dax/device.c' +Resolved 'mm/filemap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for '.clang-format'. +Recorded resolution for 'drivers/dax/device.c'. +[master 077c00ef7b7c] Merge branch 'akpm-current/current' into master +$ git diff -M --stat --summary HEAD^.. + .clang-format | 5 +- + Documentation/admin-guide/kernel-parameters.txt | 1 + + Documentation/admin-guide/mm/hugetlbpage.rst | 2 +- + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/core-api/xarray.rst | 16 +- + Documentation/dev-tools/kasan.rst | 4 +- + Documentation/fault-injection/fault-injection.rst | 7 +- + Documentation/vm/active_mm.rst | 2 +- + Documentation/x86/x86_64/boot-options.rst | 4 + + Makefile | 9 - + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/tlb.h | 1 + + arch/arm/kernel/setup.c | 18 +- + arch/arm/mm/init.c | 59 +- + arch/arm/mm/mmu.c | 39 +- + arch/arm/mm/pmsa-v7.c | 23 +- + arch/arm/mm/pmsa-v8.c | 17 +- + arch/arm/xen/mm.c | 7 +- + arch/arm64/Kconfig | 2 - + arch/arm64/kernel/machine_kexec_file.c | 6 +- + arch/arm64/kernel/setup.c | 4 +- + arch/arm64/kernel/vdso/Makefile | 7 - + arch/arm64/mm/init.c | 11 +- + arch/arm64/mm/kasan_init.c | 10 +- + arch/arm64/mm/mmu.c | 11 +- + arch/arm64/mm/numa.c | 15 +- + arch/c6x/kernel/setup.c | 9 +- + arch/h8300/kernel/setup.c | 8 +- + arch/ia64/mm/init.c | 4 +- + arch/microblaze/mm/init.c | 21 +- + arch/mips/cavium-octeon/dma-octeon.c | 14 +- + arch/mips/kernel/setup.c | 31 +- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/mips/netlogic/xlp/setup.c | 2 +- + arch/nds32/kernel/setup.c | 8 +- + arch/openrisc/kernel/setup.c | 9 +- + arch/openrisc/mm/init.c | 8 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 29 +- + arch/powerpc/include/asm/nohash/pgtable.h | 5 - + arch/powerpc/kernel/fadump.c | 57 +- + arch/powerpc/kexec/file_load_64.c | 16 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 12 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 14 +- + arch/powerpc/mm/book3s64/hash_utils.c | 16 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 10 +- + arch/powerpc/mm/kasan/kasan_init_32.c | 8 +- + arch/powerpc/mm/mem.c | 33 +- + arch/powerpc/mm/numa.c | 7 +- + arch/powerpc/mm/pgtable.c | 5 - + arch/powerpc/mm/pgtable_32.c | 8 +- + arch/riscv/mm/init.c | 36 +- + arch/riscv/mm/kasan_init.c | 10 +- + arch/s390/kernel/setup.c | 27 +- + arch/s390/mm/page-states.c | 6 +- + arch/s390/mm/vmem.c | 7 +- + arch/sh/mm/init.c | 9 +- + arch/sparc/mm/init_64.c | 12 +- + arch/x86/include/asm/numa.h | 8 +- + arch/x86/include/asm/uaccess.h | 68 +- + arch/x86/kernel/e820.c | 16 +- + arch/x86/kernel/setup.c | 56 +- + arch/x86/lib/usercopy_64.c | 3 + + arch/x86/mm/numa.c | 13 +- + arch/x86/mm/numa_emulation.c | 3 +- + arch/x86/xen/enlighten_pv.c | 2 +- + arch/xtensa/mm/init.c | 55 +- + drivers/acpi/numa/hmat.c | 76 +- + drivers/acpi/numa/srat.c | 9 +- + drivers/base/core.c | 2 +- + drivers/bus/mvebu-mbus.c | 12 +- + drivers/dax/Kconfig | 6 + + drivers/dax/Makefile | 3 +- + drivers/dax/bus.c | 1049 +++++++++++++++++++-- + drivers/dax/bus.h | 28 +- + drivers/dax/dax-private.h | 60 +- + drivers/dax/device.c | 138 ++- + drivers/dax/hmem/Makefile | 6 + + drivers/dax/hmem/device.c | 100 ++ + drivers/dax/{ => hmem}/hmem.c | 23 +- + drivers/dax/kmem.c | 199 ++-- + drivers/dax/pmem/compat.c | 2 +- + drivers/dax/pmem/core.c | 22 +- + drivers/firmware/efi/x86_fake_mem.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 15 +- + drivers/infiniband/core/uverbs_main.c | 3 - + drivers/irqchip/irq-gic-v3-its.c | 2 +- + drivers/nvdimm/badrange.c | 26 +- + drivers/nvdimm/claim.c | 13 +- + drivers/nvdimm/nd.h | 3 +- + drivers/nvdimm/pfn_devs.c | 13 +- + drivers/nvdimm/pmem.c | 27 +- + drivers/nvdimm/region.c | 21 +- + drivers/pci/p2pdma.c | 12 +- + drivers/vfio/pci/vfio_pci.c | 38 +- + drivers/virtio/virtio_mem.c | 47 +- + fs/aio.c | 9 +- + fs/autofs/dev-ioctl.c | 8 +- + fs/binfmt_elf.c | 263 +----- + fs/binfmt_elf_fdpic.c | 162 +--- + fs/buffer.c | 56 +- + fs/configfs/dir.c | 2 +- + fs/configfs/file.c | 2 +- + fs/coredump.c | 236 ++++- + fs/ext4/verity.c | 4 +- + fs/f2fs/verity.c | 4 +- + fs/ntfs/inode.c | 6 + + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/localalloc.c | 2 +- + fs/ocfs2/namei.c | 17 +- + fs/proc/base.c | 3 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 114 ++- + fs/ramfs/inode.c | 12 + + fs/romfs/super.c | 1 + + fs/userfaultfd.c | 28 +- + fs/xattr.c | 22 +- + include/acpi/acpi_numa.h | 14 +- + include/linux/acpi.h | 2 + + include/linux/bitops.h | 13 +- + include/linux/compiler-clang.h | 8 + + include/linux/compiler-gcc.h | 2 +- + include/linux/coredump.h | 11 + + include/linux/dax.h | 8 + + include/linux/fault-inject-usercopy.h | 22 + + include/linux/memblock.h | 88 +- + include/linux/memory_hotplug.h | 30 +- + include/linux/memremap.h | 17 +- + include/linux/mm.h | 38 +- + include/linux/mmap_lock.h | 5 + + include/linux/mmzone.h | 47 +- + include/linux/nmi.h | 1 + + include/linux/numa.h | 11 - + include/linux/oom.h | 1 + + include/linux/page-flags.h | 48 +- + include/linux/pagemap.h | 72 +- + include/linux/range.h | 6 + + include/linux/sched.h | 8 + + include/linux/sched/coredump.h | 1 + + include/linux/sched/mm.h | 25 - + include/linux/swap.h | 3 +- + include/linux/uaccess.h | 11 +- + include/linux/vmstat.h | 2 +- + include/linux/wait.h | 4 +- + include/linux/xarray.h | 22 + + include/ras/ras_event.h | 3 + + kernel/dma/contiguous.c | 11 +- + kernel/fork.c | 22 +- + kernel/hung_task.c | 44 + + kernel/kprobes.c | 9 +- + kernel/panic.c | 12 +- + kernel/resource.c | 11 +- + kernel/sysctl.c | 8 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 17 +- + lib/Kconfig.kasan | 9 +- + lib/Makefile | 1 + + lib/bitmap.c | 2 +- + lib/decompress_bunzip2.c | 2 +- + lib/devres.c | 2 +- + lib/dynamic_queue_limits.c | 4 +- + lib/earlycpio.c | 2 +- + lib/fault-inject-usercopy.c | 39 + + lib/iov_iter.c | 5 + + lib/libcrc32c.c | 2 +- + lib/radix-tree.c | 2 +- + lib/string.c | 24 + + lib/strncpy_from_user.c | 3 + + lib/syscall.c | 2 +- + lib/test_hmm.c | 15 +- + lib/test_sysctl.c | 2 +- + lib/test_xarray.c | 62 ++ + lib/usercopy.c | 5 +- + lib/xarray.c | 198 +++- + mm/Kconfig | 6 +- + mm/debug.c | 18 +- + mm/debug_vm_pgtable.c | 171 ++-- + mm/dmapool.c | 46 +- + mm/filemap.c | 52 +- + mm/gup.c | 98 +- + mm/gup_benchmark.c | 23 +- + mm/highmem.c | 4 +- + mm/huge_memory.c | 48 +- + mm/hugetlb.c | 85 +- + mm/hwpoison-inject.c | 18 +- + mm/internal.h | 19 +- + mm/khugepaged.c | 2 +- + mm/kmemleak.c | 8 +- + mm/ksm.c | 4 + + mm/madvise.c | 58 +- + mm/memblock.c | 98 +- + mm/memcontrol.c | 9 +- + mm/memory-failure.c | 346 +++---- + mm/memory.c | 4 +- + mm/memory_hotplug.c | 178 ++-- + mm/memremap.c | 329 ++++--- + mm/migrate.c | 17 +- + mm/mlock.c | 24 +- + mm/mmap.c | 78 +- + mm/mmu_notifier.c | 2 +- + mm/oom_kill.c | 2 + + mm/page_alloc.c | 164 ++-- + mm/page_io.c | 6 +- + mm/page_isolation.c | 54 +- + mm/page_reporting.c | 2 +- + mm/readahead.c | 130 +-- + mm/shmem.c | 20 +- + mm/slab.h | 1 - + mm/slub.c | 52 +- + mm/sparse.c | 10 +- + mm/swap.c | 16 +- + mm/swap_state.c | 2 +- + mm/swapfile.c | 9 +- + mm/util.c | 3 +- + mm/vmscan.c | 25 +- + mm/vmstat.c | 32 +- + mm/workingset.c | 4 - + scripts/checkpatch.pl | 113 ++- + scripts/const_structs.checkpatch | 3 + + scripts/gdb/linux/proc.py | 15 +- + scripts/gdb/linux/tasks.py | 9 +- + scripts/get_maintainer.pl | 9 +- + scripts/tags.sh | 8 +- + tools/testing/nvdimm/dax-dev.c | 22 +- + tools/testing/nvdimm/test/iomap.c | 2 +- + tools/testing/selftests/exec/.gitignore | 1 + + tools/testing/selftests/exec/Makefile | 9 +- + tools/testing/selftests/exec/load_address.c | 68 ++ + tools/testing/selftests/vm/gup_benchmark.c | 14 +- + tools/testing/selftests/vm/hmm-tests.c | 4 +- + tools/testing/selftests/vm/map_hugetlb.c | 2 +- + 232 files changed, 4674 insertions(+), 2855 deletions(-) + create mode 100644 drivers/dax/hmem/Makefile + create mode 100644 drivers/dax/hmem/device.c + rename drivers/dax/{ => hmem}/hmem.c (69%) + create mode 100644 include/linux/fault-inject-usercopy.h + create mode 100644 lib/fault-inject-usercopy.c + create mode 100644 tools/testing/selftests/exec/load_address.c +$ git am -3 ../patches/0001-merge-fix-up-for-mm-memremap_pages-convert-to-struct.patch +Applying: merge fix up for "mm/memremap_pages: convert to 'struct range'" +$ 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/19)
Rebasing (2/19)
error: could not apply 0eefb52c4c4d... arch/x86/Makefile: use $(CONFIG_SHELL) +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 0eefb52c4c4d... arch/x86/Makefile: use $(CONFIG_SHELL) +Auto-merging arch/x86/Makefile +CONFLICT (content): Merge conflict in arch/x86/Makefile +Rebasing (3/19)
Rebasing (4/19)
Rebasing (5/19)
Rebasing (6/19)
Rebasing (7/19)
Rebasing (8/19)
Rebasing (9/19)
Rebasing (10/19)
Rebasing (11/19)
Rebasing (12/19)
Rebasing (13/19)
Rebasing (14/19)
Rebasing (15/19)
Rebasing (16/19)
Rebasing (17/19)
Rebasing (18/19)
Rebasing (19/19)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + c0a9da717120...74c51179bf58 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (74c51179bf58 mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-fix-fix) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/Makefile | 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_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/configs/i386_defconfig | 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/buffer.c | 6 +- + fs/io_uring.c | 2 +- + fs/notify/fanotify/fanotify.c | 5 +- + fs/notify/inotify/inotify_fsnotify.c | 5 +- + include/linux/memcontrol.h | 12 --- + include/linux/mm.h | 2 +- + include/linux/pid.h | 1 + + include/linux/sched/mm.h | 39 ++++---- + include/linux/syscalls.h | 2 + + include/uapi/asm-generic/unistd.h | 4 +- + kernel/exit.c | 17 ---- + kernel/pid.c | 17 ++++ + kernel/sys_ni.c | 1 + + mm/madvise.c | 142 +++++++++++++++++++++++++--- + mm/memcontrol.c | 75 +++++++++++---- + mm/memory-failure.c | 18 ++-- + mm/memory_hotplug.c | 46 +++++---- + mm/migrate.c | 71 ++++++++------ + mm/mmap.c | 74 +++++++++++---- + mm/percpu.c | 3 +- + mm/slab.h | 3 - + 40 files changed, 381 insertions(+), 186 deletions(-) +$ git am -3 ../patches/0001-fix-for-mm-madvise-introduce-process_madvise-syscall.patch +Applying: fix for "mm/madvise: introduce process_madvise() syscall: an external memory hinting API" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..aa21311d26d7 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200908 |