diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-08-28 15:21:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-08-28 15:21:12 +1000 |
| commit | b36c969764ab12faebb74711c942fa3e6eaf1e96 (patch) | |
| tree | d2ab1b83554fc436ae610a6f816c18a8e6ce1c11 | |
| parent | 7b7af024d050a0ae196f763c53e3f8476623076b (diff) | |
| download | linux-next-b36c969764ab12faebb74711c942fa3e6eaf1e96.tar.gz | |
Add linux-next specific files for 20200828next-20200828
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 | 6276 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6937 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c66ccd1da8fe --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,329 @@ +Name SHA1 +---- ---- +origin 15bc20c6af4ceee97a1f90b43c0e386643c071b4 +fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +kbuild-current d012a7190fc1fd72ed48911e77ca97ba4521bccd +arc-current 89d29997f103d08264b0685796b420d911658b96 +arm-current 5c6360ee4a0e7f62de34341ad5d3c936f49b391d +arm64-fixes 8d75785a814241587802655cc33e384230744f0c +arm-soc-fixes 9c8b0a9c37b757ae06f382668d5a80eae4921339 +uniphier-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +drivers-memory-fixes 7ff3a2a626f7161c94fb58a0058dbdaedaa9d166 +m68k-current 382f429bb559fe991b1ece2e5e58c812e28b3ad8 +powerpc-fixes 16d83a540ca4e7f1ebb2b3756869b77451d31414 +s390-fixes bffc2f7aa96343f91931272d7a8a2d8d925e1ab2 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net b43c75abfd084b9e961a47c6331e01f2f91176b6 +bpf 7787b6fc938e16aa418613c4a765c1dbb268ed9f +ipsec 45a36a18d01907710bad5258d81f76c18882ad88 +netfilter 3622adb02623cde94ea85c68e9a968d0059de545 +ipvs 7c7ab580db49cc7befe5f4b91bb1920cd6b07575 +wireless-drivers 4afc850e2e9e781976fb2c7852ce7bac374af938 +mac80211 2d9b55508556ccee6410310fb9ea2482fd3328eb +rdma-fixes 097a9d23b7250355b182c5fd47dd4c55b22b1c33 +sound-current 858e0ad9301d1270c02b5aca97537d2d6ee9dd68 +sound-asoc-fixes d563b6c834ae1da46fcb1f00f262c76a155aa231 +regmap-fixes d012a7190fc1fd72ed48911e77ca97ba4521bccd +regulator-fixes 3bec5b6aae830355e786e204b20a7cea38c3a8ed +spi-fixes 3812e0343b427351f1bd5120a1ec704458d0ee18 +pci-current 7c2308f79fc81ba0bf24ccd2429fb483a91bcd51 +driver-core.current d012a7190fc1fd72ed48911e77ca97ba4521bccd +tty.current ea1fc02e12b647d8dd7515d1dba137847d8e951d +usb.current 9aa37788e7ebb3f489fb4b71ce07adadd444264a +usb-gadget-fixes bc9a2e226ea95e1699f7590845554de095308b75 +usb-serial-fixes 6ccc48e0eb2f3a5f3bd39954a21317e5f8874726 +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy afd55e6d1bd35b4b36847869011447a83a81c8e0 +staging.current 1dffeb8b8b4c261c45416d53c75ea51e6ece1770 +char-misc.current 9c97cecab0d49e40460d9b5230ab4bf036f59491 +soundwire-fixes f8d0168e035f6359275efcfd1ad014c80e5adaa9 +thunderbolt-fixes 813050e0a9b871ac575abfd3d321f74916df609d +input-current 9e8238020c5beba64e7ffafbb7ea0fb02fe68270 +crypto-current c195d66a8a75c60515819b101975f38b7ec6577f +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes aae7a75a821a793ed6b8ad502a5890fb8e8f172d +kselftest-fixes 5c1e4f7e9e49b6925b1fb5c507d2c614f3edb292 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 6d6018fc30bee67290dbed2fa51123f7c6f3d691 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes f7e6b19bc76471ba03725fe58e0c218a3d6266c3 +mfd-fixes dddf4ddc3971b7c29b7adcb1791b0138f762b875 +v4l-dvb-fixes 4ffb879ea648c2b42da4ca992ed3db87e564af69 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 91dbd73a1739039fa7e9fe5c0169f2817a7f7670 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 6542e2b613c2b1952e83973dc434831332ce8e27 +kvm-fixes b5331379bc62611d1026173a09c73573384201d9 +kvms390-fixes 774911290c589e98e3638e73b24b0a4d4530e97c +hwmon-fixes c1ae18d313e24bc7833e1749dd36dba5d47f259c +nvdimm-fixes c2affe920b0e0669650943ac086215cf6519be34 +btrfs-fixes c9f8e44ec4a513fa4fa8cb068e0cc746751ef665 +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 75d46c6d15efabc5176a5e2694ee236f02ee72ef +drm-fixes 60a10650e7e5f74e7d17393e763f2ff432b13784 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes e5f10d6385cda083037915c12b130887c8831d2b +mmc-fixes 710d4d916e6d84aa3f1507db1f1dfce8f60211a1 +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes b46b4a8a57c377b72a98c7930a9f6969d2d4784e +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 0981b50cd6c7711b721f49f5049d111345fe4062 +pidfd-fixes bda4c60d02e9ceeee726f73250b808fad0663dd6 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gpio-intel-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pinctrl-intel-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +erofs-fixes 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +ubifs-fixes f37e99aca03f63aa3f2bd13ceaf769455d12c4b0 +memblock-fixes bd05220c7be3356046861c317d9c287ca50445ba +drm-misc-fixes 07b5b12d97dc9f47ff3dff46c4f944a15bd762e5 +kspp-gustavo c165a08d2b2857c91c627039c4881f9d7ad1a3bd +kbuild 6ad7cbc01527223f3f92baac9b122f15651cf76b +compiler-attributes 5861af92ff2a2e002449191413c35f3ec5f721fe +dma-mapping d7e673ec2c8e0ea39c4c70fc490d67d7fbda869d +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 4dffbda6a996813bc2760f021e1edf669cf84805 +arm64 3df14264ad9930733a8166e5bd0eccc1727564bb +arm-perf 55fdc1f44cd6bb1d61c9ca946d8f7cd67ea0bf36 +arm-soc 210ecbc29884d1281cac17995bd0c26f340ada5b +amlogic c943b84fab78170fcdf60d960ea8d82d2cedbdbb +aspeed 7c32a9d95c9af768cf6d192f0b2f72f22d8c2cde +at91 b68f43873b72e2a0ddbd6770172b8797772e3615 +drivers-memory fd22781648080cc400772b3c68aa6b059d2d5420 +imx-mxs 4279542645553b1fc66f7f08c8bbc4c01e93d6aa +keystone 50c950e2c8b6c11fc7bb2f23856bd541f1b55a16 +mediatek 647a84d1e4dcc43369a968d6d2215de17b1c30d0 +mvebu 29bd9d8c2ac147964552b1bbfaf2b43fe53fd10c +omap 390f789055a05499f7f62312939b6fd88c6ed970 +qcom 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +raspberrypi 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 15c95b417a9cd07b75651f1b2a0f1c247e3bc4d7 +reset 2983e2385ff6addd31de6f5b27f1ad0bec26aab6 +rockchip 088d74f511583cafbfc6ae37dc21fefe22f1fd05 +samsung-krzk f609c46be3ca9800b244d94adabfe686b9c8fa93 +scmi d012a7190fc1fd72ed48911e77ca97ba4521bccd +sunxi 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +tegra ce0ead94461f60c4e144f6b3ccbb85651503640a +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +uniphier 4f8fb65af5299d138f57e6d62f88d2d5964d40eb +clk 24907ec547022f4e31b85e45e7f9d99a2939af11 +clk-samsung 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +csky bdcd93ef9afb42a6051e472fa62c693b1f9edbd8 +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +ia64 1a9d3c34c593f7ce3c6673e9e015b3253330eab2 +m68k 5661bccb70ef134502b9d2e80a19465ad943b022 +m68knommu 0fdaa525ea1ce4d39d9a21eebdf75eb52073a13f +microblaze b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +mips aa9c45db018fadd8d15611ba403d4a8e7c6521a9 +nds32 0a2e478902c75be12b3e384cfe80b731e659f863 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 55b2662ec665cc8b592809a011fe807b05370ab8 +parisc-hd bcf876870b95592b52519ed4aafcf9d95999bc9c +powerpc 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e9e4ef9116b12951eaee3f8447ba9bbb40ab3620 +risc-v d012a7190fc1fd72ed48911e77ca97ba4521bccd +s390 d012a7190fc1fd72ed48911e77ca97ba4521bccd +sh 0c64a0dce51faa9c706fdf1f957d6f19878f4b81 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f6e8c474390be2e6f5bd0b8966e19958214609ff +xtensa a0fc1436f1f4f84e93144480bf30e0c958d135b6 +fscrypt 55e32c54bbd5741cad462c9ee00c453c72fa74b9 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 70daa2f88d6970c40176683642d297981bb2cd7f +ceph 496ceaf12432b3d136dcdec48424312e71359ea7 +cifs 68d7a2eb103d43d980a8ad4970b35c58efffcf7c +configfs 059ccbfff8a826c0e7bfe5d69a55e1179672d8f8 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs cfcedfe21820f425ddb40a75ad660e21249fdb91 +exfat 9409a51062c139dec6ab5f09b19bcaa267ca18c5 +ext3 de575ac602ab510d595869edf06431591e1d32a6 +ext4 27bc446e2def38db3244a6eb4bb1d6312936610a +f2fs da0815f3bce11c8b7b93a6f7188a63c3bd4c7a77 +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 9e9e23bd2d363adfe9bf52e91ef238f9b4cbebf5 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs d012a7190fc1fd72ed48911e77ca97ba4521bccd +nfs-anna 65caafd0d2145d1dd02072c4ced540624daeab40 +nfsd 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +cel ad112aa8b1ac4bf5e8da67734fcb535fd3cd564e +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs 4518dfcf761e3c44632855abcf433236cf7ab6c6 +ubifs 798b7347e4f29553db4b996393caf12f5b233daf +v9fs 2ed0b7578170c3bab10cde09d4440897b305e40c +xfs 125eac243806e021f33a1fdea3687eccbb9f7636 +zonefs 2f4b7462d2fab380ba53f633948880552abb0b32 +iomap 60263d5889e6dc5987dc51b801be4955ff2e4aa7 +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks c0842fbc1b18c7a044e6ff3e8fa78bfa822c7d1a +vfs bcf876870b95592b52519ed4aafcf9d95999bc9c +printk 20d6ee092831629e583d6a3abd592f73040fdbec +pci 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid de11ec5fedd90a58917059a5f3c1d86154fe5744 +i2c 3f7462407ce391f4d63ad3fccaf9c1f86afe9b4e +i3c 9da36a7ec42135428e1d41621e3703429bda3b2e +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging 97568defeee16fc48e4936787f865d61c6f0f136 +jc_docs 92001bc0365a144783f8f3108be94e74baf61011 +v4l-dvb d84eca28c807dbcdb40a2b8e2697118b99fdb2fd +v4l-dvb-next 0d6db85131e014c128e57649793aff5aa96e065f +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm dc37b29f6d3007e72ff3de80fcbeeed75843cfed +cpufreq-arm 99bcfd231280e3e060a8906f510076621eb466c8 +cpupower 527b7779e5ecabb057089b760140309bdcacc16a +devfreq 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +opp 9b53e98910811a04d1d2fd2b9f160f8c0b7c6cc4 +thermal 6f55be9fd5eed1239ab2639688a889c7e922c5e9 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 7ae0451e2e6c29ff9fc17754b1129d9491177634 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 8dc105befe16b6504ecc17a235b3c22932fa33dc +net-next 50aba46c234ea6ab3134cebb5ab27885f33a3e5d +bpf-next 2e80be60c465a4f8559327340eaf40845dd7797a +ipsec-next da7955405fb25c11a541234b32d06d9c09f81be6 +mlx5-next 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +netfilter-next d0a84e1f38d9d6ae2dfab0b6c2407d667a265aa5 +ipvs-next bfdd5aaa54b0a44d9df550fe4c9db7e1470a11b8 +wireless-drivers-next 26721b02466e396efaca6807b52916478c4f9197 +bluetooth 3b799254cf6f481460719023d7a18f46651e5e7f +mac80211-next 2831a631022eed6e3f800f08892132c6edde652c +gfs2 e28c02b94f9e039beeb5c75198caf6e17b66c520 +mtd 6a1380271b75e0d9a961e192e56b733fedf7a23a +nand da151e3458c825fa9d57c2db6e37748166e4d129 +spi-nor e93a977367b2aefff3c1fb426bbdfc6e2980815f +crypto 6779d0e6b0fe193ab3010ea201782ca6f75a3862 +drm d012a7190fc1fd72ed48911e77ca97ba4521bccd +amdgpu ebf375830bfc58176718e0d1a6649aeba6ed38a0 +drm-intel caab25dc9e36e83d3ff870cabd80b811ed02242d +drm-tegra 4fba6d22ca9ad28b8871d763b35a4da2e1ca272e +drm-misc 3bc46a083fa9f475dd2e0ab8717d9839b070b8d9 +drm-msm 5e0c22d4a9ddae4e784a3e171b9d3d452b37aeb2 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm efd5a93d2a894a1efde45ed12c17cb32f1740812 +etnaviv c5d5a32ead1e3a61a07a1e59eb52a53e4a6b2a7f +regmap 53be8bbc2f4058d4a6bfff3dadf34164bcaafa87 +sound 685a04a53747d07d22f5139c04ae35745200a91d +sound-asoc f00bb4eb18c1ce6ca435f09b2dbe07886cddd7d8 +modules 262e6ae7081df304fc625cf368d5c2cbba2bb991 +input 9b5fbad1dcee0607300d08f888c71c8ef97a06a0 +block 86cfccb66937dd6cbf26ed619958b9e587e6a115 +device-mapper a9cb9f4148ef6bb8fabbdaa85c42b2171fbd5a0d +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 10a70e0d4edd5a6cb45924148d4e33b45316446c +mfd c563a66537d2a8c7baa9ca63574d5604d290ccc8 +backlight 7eb99a39ef767644bbfd2b3f12f139d13e3ee8b3 +battery c24b9a741b5f292112f2f75091f06a561b665770 +regulator 1406da6929428049449fd1655472adcfb262cf78 +security bc62d68e2a0a69fcdcf28aca8edb01abf306b698 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity d012a7190fc1fd72ed48911e77ca97ba4521bccd +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 0476c865ded6180f9b3b68325b9bb5aa7f3babdb +selinux 9ff9abc4c6be27ff27b6df625501a46711730520 +smack 42a2df3e829f3c5562090391b33714b2e2e5ad4a +tomoyo 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +tpmdd 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +watchdog 18445bf405cb331117bc98427b1ba6f12418ad17 +iommu e46b3c0d011eab9933c183d5b47569db8e377281 +vfio ccd59dce1a21f473518bf273bdf5b182bab955b3 +audit c07203516439b9cd9f7b3cbed82a77164de5af40 +devicetree 7ba58fff001da7e7296dbed8ddc13212300d1c57 +mailbox 884996986347dbe3b735cfa9bc041dd98a533796 +spi a37344d70f4775eec37213f24e9948f868b8854d +tip 21f294e9c2da915d0cebb747f64e2c08b24fbd93 +clockevents 9fba22584e54340365c611987c451e384bc4a96f +edac efe5396fa1dbd839c1ebab938613a8955aa27c75 +irqchip 821fc9e261f3af235752f46e59084467cfd440c4 +ftrace 38ce2a9e33db61a3041840310077072d6210ead4 +rcu 417ea89c28ab7b3694c14ba851b483bbe443c8a7 +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 16314874b12b451bd5a1df86bcb69745eb487502 +kvm-ppc 81ab595ddd3c3036806b460526e1fbc5b271ff33 +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip 9d3004bf7ba32c89873bb8422671d52b4bb52ce1 +percpu 4fa640dc52302b5e62b01b05c755b055549633ae +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +chrome-platform 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 242b81170fb8a4a9d84ae183a8e0b1aaf2554d89 +ipmi 83dea128567250ee8dee6a5f1f9913f617bfc153 +driver-core d012a7190fc1fd72ed48911e77ca97ba4521bccd +usb cb06b385d5361217764543a1dec746955a094d0b +usb-gadget f5e46aa4a124bfac34a770c4cfe5023de99380d4 +usb-serial 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +usb-chipidea-next 58a3cefb3840b17f0eba357d8e82536135a1257b +phy-next c42dcb195b2f92385d6676f1ca00524ff685d26d +tty 52c3c3a59234a9725b5dcfe9729ed737d7843980 +char-misc d162219c655c8cf8003128a13840d6c1e183fb80 +extcon 70f8ef3228291b178376810cd229f675df0e44c5 +soundwire 08abad9f45f105e947d91822bdbc47650fbd7773 +thunderbolt d012a7190fc1fd72ed48911e77ca97ba4521bccd +staging bc752d2f345bf55d71b3422a6a24890ea03168dc +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 12a400b016ab955be8e4c569346fa18aaceed9d7 +dmaengine 78a2f92e4c4a3b775add7f99d04f8acf2fcb48d7 +cgroup 936f2a70f2077f64fab1dcb3eca71879e82ecd3f +scsi 7b08f25e38ced786fe67bebeb0a36e2c27dbadf4 +scsi-mkp 32417d7844ab0bc154c39128d9ac026f4f8a7907 +vhost 8a7c3213db068135e816a6a517157de6443290d6 +rpmsg ca69dba7f13a293f83b08f003cd935c6abfee249 +gpio 22cc422070d9a9a399f8a70b89f1b852945444cb +gpio-brgl 01e8d85b68fdde832f762f85b0d407ba891fd5e1 +gpio-intel 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pinctrl fc80c51fd4b23ec007e88d4c688f2cac1b8648e7 +pinctrl-intel 04d53068508e1b670a46ed9507aeaec7ef6d4ae4 +pinctrl-samsung 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pwm 6ced5ff0be8e94871ba846dfbddf69d21363f3d7 +userns 7fce69dff8db30cb93aace0bbebda09972027af7 +ktest ff131efff141fc679cccde28bc265f4c79cbe329 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 338c0aff6dbb0db0e849bfc482015358338dffca +coresight 8aba79505eb373258a92ab9c21951a9eeaa88b6d +rtc 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +nvdimm 03b68d5d7d4b7551ca445dfb84cb05786d70ae90 +at24 99363d1c26c825055f8a879d9d5c2b78168cf655 +ntb b8e2c8bbdf7778c6e3c65db21ababb1dfa794282 +seccomp 16b89f695313d91c99bdaf6898f28a51d0af1b17 +kspp 55dde35fdb7f3646f9aa534f56a2599e2aef6b31 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 4ca8b73f16f0a9ea773a706fe4a3fd91e667aab9 +slimbus b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +nvmem a24ef5be460b771424db6674f8d3f5d025415821 +xarray 27586ca786a729cda6c807621a1494900a56e7bc +hyperv 49971e6bad2da980686368baa34039907f62b516 +auxdisplay 46d4a403a04c0ba46641452367b6a04bcf918a06 +kgdb 2c308ef41351372a5c23a1047d71db3015ed7a9c +pidfd da83d0cb92373b4424c60ff97edd941e300a1e7a +hmm 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +fpga 8a5de2de0339cdb7bd269140f857b62ba7222759 +kunit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 11399346ac39a26ade2a90303d38ad318163c665 +kunit-next 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +trivial c1a371cf80fbc06280cc0064ca99a39d0428ded3 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 18e9533ac877f3828e080ffc799ab2b67ee8500b +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 762d4d1a174c2b2f1181ef284769e4cba7d2b11c +init 38b082236e77d403fed23ac2d30d570598744ec3 +akpm-current f60aef257493fdcf35e9de155c8f9dc2b8ede4d5 +akpm 93ec0960bea8e7575c6c870d0c2ebdd04fbd0f87 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..58b859963938 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6276 @@ +$ date -R +Fri, 28 Aug 2020 08:57:06 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 15bc20c6af4c Merge tag 'tty-5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty +Merging origin/master (15bc20c6af4c Merge tag 'tty-5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty) +$ git merge origin/master +Already up to date. +Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (d012a7190fc1 Linux 5.9-rc2) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (89d29997f103 irqchip/eznps: Fix build error for !ARC700 builds) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/hsdk.dts | 2 + + arch/arc/include/asm/pgalloc.h | 4 +- + arch/arc/kernel/perf_event.c | 14 ++---- + arch/arc/kernel/troubleshoot.c | 77 +++++++++++++-------------------- + arch/arc/plat-eznps/include/plat/ctop.h | 1 - + include/soc/nps/common.h | 6 +++ + 6 files changed, 44 insertions(+), 60 deletions(-) +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 (8d75785a8142 ARM64: vdso32: Install vdso32 from vdso_install) +$ 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 (16d83a540ca4 Revert "powerpc/powernv/idle: Replace CPU feature check with PVR check") +$ git merge powerpc-fixes/fixes +Auto-merging include/linux/mm.h +Auto-merging drivers/video/fbdev/controlfb.c +Merge made by the 'recursive' strategy. + Documentation/powerpc/syscall64-abi.rst | 4 ++- + arch/powerpc/Kconfig | 12 ++++++++ + arch/powerpc/include/asm/book3s/64/pgtable.h | 8 ++--- + arch/powerpc/include/asm/cputable.h | 10 +++---- + arch/powerpc/include/asm/mman.h | 31 ++++++++++++++++--- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 ++ + arch/powerpc/include/uapi/asm/mman.h | 2 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 2 +- + arch/powerpc/kernel/entry_64.S | 4 +++ + arch/powerpc/kernel/process.c | 12 ++++++-- + arch/powerpc/mm/book3s64/hash_utils.c | 2 ++ + arch/powerpc/perf/core-book3s.c | 19 ++++++++---- + arch/powerpc/perf/imc-pmu.c | 4 +-- + arch/powerpc/platforms/powernv/idle.c | 2 +- + drivers/video/fbdev/controlfb.c | 2 ++ + include/linux/mm.h | 2 ++ + include/trace/events/mmflags.h | 2 ++ + mm/ksm.c | 4 +++ + tools/testing/selftests/powerpc/mm/.gitignore | 1 + + tools/testing/selftests/powerpc/mm/Makefile | 4 ++- + tools/testing/selftests/powerpc/mm/prot_sao.c | 43 +++++++++++++++++++++++++++ + 21 files changed, 143 insertions(+), 29 deletions(-) + create mode 100644 tools/testing/selftests/powerpc/mm/prot_sao.c +Merging s390-fixes/fixes (bffc2f7aa963 s390/vmem: fix vmem_add_range for 4-level paging) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/include/asm/percpu.h | 28 ++++++++++++++-------------- + arch/s390/mm/vmem.c | 1 + + 2 files changed, 15 insertions(+), 14 deletions(-) +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 (b43c75abfd08 rxrpc: Fix memory leak in rxkad_verify_response()) +$ git merge net/master +Auto-merging net/rxrpc/input.c +Auto-merging net/mptcp/protocol.c +Auto-merging net/core/sock.c +Auto-merging net/core/dev.c +Auto-merging include/linux/skbuff.h +Auto-merging drivers/net/wan/lapbether.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/dsa/mt7530.c +Auto-merging drivers/atm/firestream.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/dsa/dsa.txt | 2 +- + MAINTAINERS | 17 ++- + drivers/atm/firestream.c | 1 + + drivers/net/dsa/mt7530.c | 5 +- + drivers/net/dsa/ocelot/felix.c | 1 + + drivers/net/dsa/sja1105/sja1105_main.c | 2 +- + 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/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/renesas/ravb_main.c | 110 +++++++++---------- + drivers/net/ethernet/sfc/ef100_rx.c | 8 +- + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/cpsw_new.c | 29 +++-- + drivers/net/gtp.c | 1 + + drivers/net/phy/dp83869.c | 12 +-- + drivers/net/usb/Kconfig | 1 + + drivers/net/usb/asix_common.c | 2 +- + drivers/net/wan/lapbether.c | 3 + + drivers/nfc/st95hf/core.c | 2 +- + 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 +- + include/linux/netfilter/nf_conntrack_sctp.h | 2 + + include/linux/skbuff.h | 13 ++- + include/net/af_rxrpc.h | 2 +- + include/net/ndisc.h | 2 +- + include/net/netfilter/nf_tables.h | 2 + + include/trace/events/rxrpc.h | 27 ++++- + include/uapi/linux/in.h | 2 +- + include/uapi/linux/netfilter/nf_tables.h | 2 +- + 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/skbuff.c | 2 + + net/core/sock.c | 2 +- + net/ipv4/fib_trie.c | 3 +- + net/ipv4/raw.c | 2 +- + net/l3mdev/l3mdev.c | 2 +- + net/mptcp/protocol.c | 3 +- + net/netfilter/nf_conntrack_proto_sctp.c | 39 ++++++- + net/netfilter/nf_tables_api.c | 3 +- + net/netfilter/nft_payload.c | 4 +- + net/netfilter/nft_set_rbtree.c | 57 ++++++++-- + net/netlabel/netlabel_domainhash.c | 59 ++++++----- + 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_taprio.c | 30 ++++-- + net/sctp/socket.c | 16 ++- + net/socket.c | 4 +- + 64 files changed, 660 insertions(+), 344 deletions(-) +Merging bpf/master (7787b6fc938e bpf, sysctl: Let bpf_stats_handler take a kernel pointer buffer) +$ git merge bpf/master +Auto-merging kernel/bpf/syscall.c +Merge made by the 'recursive' strategy. + kernel/bpf/syscall.c | 2 +- + kernel/sysctl.c | 3 +-- + tools/testing/selftests/bpf/test_progs.c | 4 +++- + 3 files changed, 5 insertions(+), 4 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 (3622adb02623 ipv6: ndisc: adjust ndisc_ifinfo_sysctl_change prototype) +$ 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 (4afc850e2e9e mwifiex: Increase AES key storage size to 256 bits) +$ 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 +- + 6 files changed, 21 insertions(+), 10 deletions(-) +Merging mac80211/master (2d9b55508556 cfg80211: Adjust 6 GHz frequency to channel conversion) +$ git merge mac80211/master +Auto-merging net/wireless/util.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/chan.c +Merge made by the 'recursive' strategy. + net/mac80211/airtime.c | 202 ++++++++++++++++++++++++++++++++++-------------- + net/mac80211/sta_info.h | 5 +- + net/mac80211/status.c | 43 ++++++----- + net/wireless/chan.c | 15 +++- + net/wireless/nl80211.c | 2 +- + net/wireless/reg.c | 3 + + net/wireless/util.c | 8 +- + 7 files changed, 192 insertions(+), 86 deletions(-) +Merging rdma-fixes/for-rc (097a9d23b725 RDMA/bnxt_re: Remove the qp from list only if the qp destroy succeeds) +$ 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/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 + + 15 files changed, 79 insertions(+), 37 deletions(-) +Merging sound-current/for-linus (858e0ad9301d ALSA: hda/hdmi: always check pin power status in i915 pin fixup) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + Documentation/sound/cards/audigy-mixer.rst | 2 +- + Documentation/sound/cards/sb-live-mixer.rst | 2 +- + sound/firewire/digi00x/digi00x.c | 5 ++ + sound/firewire/tascam/tascam.c | 33 ++++++++++-- + sound/pci/ca0106/ca0106_main.c | 3 +- + sound/pci/hda/hda_intel.c | 2 - + sound/pci/hda/hda_tegra.c | 7 +++ + sound/pci/hda/patch_hdmi.c | 6 +++ + sound/pci/hda/patch_realtek.c | 3 +- + sound/usb/pcm.c | 2 + + sound/usb/quirks-table.h | 78 +++++++++++++++++++++++++---- + sound/usb/quirks.c | 11 ++++ + sound/usb/usbaudio.h | 1 + + 13 files changed, 134 insertions(+), 21 deletions(-) +Merging sound-asoc-fixes/for-linus (d563b6c834ae Merge series "ASoC: Fix return check for devm_regmap_init_sdw()" from Vinod Koul <vkoul@kernel.org>:) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + 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/intel/atom/sst-mfld-platform-pcm.c | 11 +++++++++++ + sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 +- + sound/soc/intel/boards/sof_maxim_common.c | 7 ++++--- + 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/ti/ams-delta.c | 4 ++-- + 15 files changed, 43 insertions(+), 18 deletions(-) +Merging regmap-fixes/for-linus (d012a7190fc1 Linux 5.9-rc2) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (3bec5b6aae83 Merge tag 'v5.9-rc2' into regulator-5.9) +$ git merge regulator-fixes/for-linus +Auto-merging drivers/regulator/core.c +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 164 ++++++++++++++++++---------------- + drivers/regulator/cros-ec-regulator.c | 3 + + drivers/regulator/fixed.c | 2 +- + 3 files changed, 91 insertions(+), 78 deletions(-) +Merging spi-fixes/for-linus (3812e0343b42 Merge remote-tracking branch 'spi/for-5.9' into spi-linus) +$ git merge spi-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++++++++ + drivers/spi/spi-cadence-quadspi.c | 9 +++++++++ + 2 files changed, 17 insertions(+) +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 (d012a7190fc1 Linux 5.9-rc2) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (ea1fc02e12b6 tty: serial: imx: add dependence and build for earlycon) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (9aa37788e7eb USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge) +$ git merge usb.current/usb-linus +Auto-merging drivers/usb/host/xhci.c +Auto-merging drivers/usb/host/xhci-hub.c +Merge made by the 'recursive' strategy. + drivers/usb/class/cdc-acm.c | 22 ++++--- + drivers/usb/core/driver.c | 40 ++++++++++++- + drivers/usb/core/generic.c | 5 +- + drivers/usb/core/hcd-pci.c | 5 +- + drivers/usb/core/quirks.c | 7 +++ + drivers/usb/dwc3/gadget.c | 107 +++++++++++++++++++++++++++++------ + drivers/usb/gadget/function/f_ncm.c | 81 ++++++++++++++++++++++---- + drivers/usb/gadget/function/f_tcm.c | 7 ++- + drivers/usb/gadget/u_f.h | 38 +++++++++---- + drivers/usb/host/ohci-exynos.c | 5 +- + drivers/usb/host/xhci-debugfs.c | 8 +-- + drivers/usb/host/xhci-hub.c | 19 ++++--- + drivers/usb/host/xhci-pci-renesas.c | 19 +------ + drivers/usb/host/xhci-tegra.c | 4 +- + drivers/usb/host/xhci.c | 3 +- + drivers/usb/misc/lvstest.c | 2 +- + drivers/usb/misc/yurex.c | 2 +- + drivers/usb/phy/phy-jz4770.c | 1 + + drivers/usb/storage/unusual_devs.h | 2 +- + drivers/usb/storage/unusual_uas.h | 7 +++ + drivers/usb/typec/tcpm/tcpm.c | 28 ++++++++- + drivers/usb/typec/ucsi/displayport.c | 9 +-- + drivers/usb/typec/ucsi/ucsi.c | 103 +++++++++++++++++---------------- + drivers/usb/usbip/stub_dev.c | 6 ++ + tools/usb/Build | 2 + + tools/usb/Makefile | 53 ++++++++++++++--- + 26 files changed, 416 insertions(+), 169 deletions(-) + create mode 100644 tools/usb/Build +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 (6ccc48e0eb2f USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter) +$ 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 + + 2 files changed, 2 insertions(+) +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 (afd55e6d1bd3 phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init) +$ 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 ++ + 3 files changed, 13 insertions(+), 10 deletions(-) +Merging staging.current/staging-linus (1dffeb8b8b4c staging: greybus: audio: fix uninitialized value issue) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + 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 ++++++------------- + 4 files changed, 22 insertions(+), 34 deletions(-) +Merging char-misc.current/char-misc-linus (9c97cecab0d4 Merge tag 'misc-habanalabs-fixes-2020-08-22' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (f8d0168e035f soundwire: bus: fix typo in comment on INTSTAT registers) +$ git merge soundwire-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/soundwire/bus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging thunderbolt-fixes/fixes (813050e0a9b8 thunderbolt: Use maximum USB3 link rate when reclaiming if link is not up) +$ git merge thunderbolt-fixes/fixes +Auto-merging drivers/thunderbolt/tunnel.c +Auto-merging drivers/thunderbolt/switch.c +Merge made by the 'recursive' strategy. + drivers/thunderbolt/switch.c | 1 + + drivers/thunderbolt/tb.h | 2 +- + drivers/thunderbolt/tunnel.c | 12 ++++++++++-- + 3 files changed, 12 insertions(+), 3 deletions(-) +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 (c195d66a8a75 crypto: af_alg - Work around empty control messages without MSG_MORE) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/af_alg.c | 13 ++++++++++--- + drivers/char/hw_random/ingenic-rng.c | 9 ++------- + drivers/crypto/Kconfig | 3 +++ + drivers/crypto/qat/qat_common/adf_admin.c | 7 ++++--- + 4 files changed, 19 insertions(+), 13 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 (6d6018fc30be drivers/dma/dma-jz4780: Fix race condition between probe and irq handler) +$ git merge dmaengine-fixes/fixes +Auto-merging drivers/dma/pl330.c +Merge made by the 'recursive' strategy. + 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 | 6 +++--- + 9 files changed, 71 insertions(+), 47 deletions(-) +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 (dddf4ddc3971 mfd: mfd-core: Ensure disabled devices are ignored without error) +$ git merge mfd-fixes/for-mfd-fixes +Merge made by the 'recursive' strategy. + drivers/mfd/mfd-core.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging v4l-dvb-fixes/fixes (4ffb879ea648 media: media/v4l2-core: Fix kernel-infoleak in video_put_user()) +$ git merge v4l-dvb-fixes/fixes +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Merge made by the 'recursive' strategy. + drivers/media/platform/ti-vpe/cal.h | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 50 +++++++++++++++++++----------------- + 2 files changed, 28 insertions(+), 24 deletions(-) +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 (91dbd73a1739 mips/oprofile: Fix fallthrough placement) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/include/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/smp-bmips.c | 2 ++ + arch/mips/mm/c-r4k.c | 4 ++++ + arch/mips/oprofile/op_model_mipsxx.c | 4 +++- + 6 files changed, 9 insertions(+), 6 deletions(-) +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 (c1ae18d313e2 hwmon: (gsc-hwmon) Scale temperature to millidegrees) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/applesmc.c | 31 ++++++++++++++++--------------- + drivers/hwmon/gsc-hwmon.c | 1 + + drivers/hwmon/nct7904.c | 4 ++-- + drivers/hwmon/pmbus/isl68137.c | 7 ++++++- + 4 files changed, 25 insertions(+), 18 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (c2affe920b0e dax: do not print error message for non-persistent memory block device) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (c9f8e44ec4a5 Merge branch 'misc-5.9' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +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 +Merge made by the 'recursive' strategy. + kernel/dma/pool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (75d46c6d15ef scsi: scsi_debug: Remove superfluous close zone in resp_open_zone()) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/scsi_debug.c | 2 -- + 3 files changed, 2 insertions(+), 4 deletions(-) +Merging drm-fixes/drm-fixes (60a10650e7e5 Merge tag 'drm-msm-fixes-2020-08-24' of https://gitlab.freedesktop.org/drm/msm into drm-fixes) +$ git merge drm-fixes/drm-fixes +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 11 +++++++-- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 11 +++++---- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 38 ++++++++++++++++++++++------- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 3 ++- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 2 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 4 +++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 20 ++++++++------- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 +-- + drivers/gpu/drm/msm/msm_atomic.c | 36 +++++++++++++++++++++++++++ + drivers/gpu/drm/msm/msm_drv.c | 8 ++++++ + drivers/gpu/drm/msm/msm_ringbuffer.c | 3 ++- + 16 files changed, 116 insertions(+), 34 deletions(-) +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 (e5f10d6385cd drm/i915: Fix cmd parser desc matching with masks) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_cmd_parser.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) +Merging mmc-fixes/fixes (710d4d916e6d dt-bindings: mmc: Add missing description for clk_in/out_sd1) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 10 +++- + Documentation/devicetree/bindings/mmc/mtk-sd.txt | 2 + + drivers/mmc/host/mtk-sd.c | 13 +++++ + drivers/mmc/host/sdhci-acpi.c | 67 ++++++++++++++++++---- + drivers/mmc/host/sdhci-pci-core.c | 10 +++- + 5 files changed, 88 insertions(+), 14 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 (0981b50cd6c7 riscv/mm: Simplify retry logic in do_page_fault()) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/mm/fault.c | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) +Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation) +$ git merge pidfd-fixes/fixes +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 (9123e3a74ec7 Linux 5.9-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (f37e99aca03f Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into master) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (bd05220c7be3 arch/ia64: Restore arch-specific pgd_offset_k implementation) +$ git merge memblock-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (07b5b12d97dc drm/sun4i: add missing put_device() call in sun8i_r40_tcon_tv_set_mux()) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_helper.c | 7 ++++--- + drivers/gpu/drm/drm_color_mgmt.c | 2 +- + drivers/gpu/drm/drm_crtc.c | 4 +--- + drivers/gpu/drm/drm_dp_mst_topology.c | 4 ++-- + drivers/gpu/drm/drm_mode_object.c | 4 ++-- + drivers/gpu/drm/drm_plane.c | 2 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 3 ++- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 8 ++++++-- + drivers/gpu/drm/virtio/virtgpu_object.c | 8 +++++++- + include/drm/drm_modeset_lock.h | 9 +++++++-- + 10 files changed, 33 insertions(+), 18 deletions(-) +Merging kspp-gustavo/for-next/kspp (c165a08d2b28 arm64/cpuinfo: Remove unnecessary fallthrough annotation) +$ git merge kspp-gustavo/for-next/kspp +Merge made by the 'recursive' strategy. + arch/arm64/kernel/cpuinfo.c | 1 - + drivers/iio/dac/dpot-dac.c | 3 ++- + drivers/media/usb/dvb-usb/dib0700_devices.c | 10 +++++----- + fs/afs/flock.c | 1 - + 4 files changed, 7 insertions(+), 8 deletions(-) +Merging kbuild/for-next (6ad7cbc01527 Makefile: Add clang-tidy and static analyzer support to makefile) +$ git merge kbuild/for-next +Removing scripts/gen_compile_commands.py +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + Makefile | 56 ++++++- + lib/Kconfig.debug | 10 +- + 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 +- + 7 files changed, 373 insertions(+), 171 deletions(-) + 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 +Merging compiler-attributes/compiler-attributes (5861af92ff2a Compiler Attributes: fix comment concerning GCC 4.6) +$ git merge compiler-attributes/compiler-attributes +Merge made by the 'recursive' strategy. + include/linux/compiler_attributes.h | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) +Merging dma-mapping/for-next (d7e673ec2c8e dma-pool: Only allocate from CMA when in same memory zone) +$ git merge dma-mapping/for-next +Already up to date. +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 (3df14264ad99 recordmcount: Fix build failure on non arm64) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (55fdc1f44cd6 arm64: perf: Expose some new events via sysfs) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (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 (7c32a9d95c9a ARM: dts: aspeed: wedge40: Update UART4 pin settings) +$ 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 - + 7 files changed, 503 insertions(+), 17 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 (fd2278164808 memory: emif: Remove bogus debugfs error handling) +$ 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 | 39 ++++--- + drivers/memory/emif.c | 33 +----- + drivers/memory/omap-gpmc.c | 160 +++++++++++++++++--------- + drivers/memory/renesas-rpc-if.c | 4 +- + drivers/memory/samsung/exynos5422-dmc.c | 4 + + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 2 +- + drivers/memory/tegra/tegra210.c | 2 +- + 9 files changed, 176 insertions(+), 121 deletions(-) +Merging imx-mxs/for-next (427954264555 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 3 + + MAINTAINERS | 7 + + arch/arm/boot/dts/Makefile | 1 + + 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.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-m28cu3.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 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/imx6q-bx50v3.dtsi | 17 +- + arch/arm/boot/dts/imx6q-tqma6a.dtsi | 16 + + arch/arm/boot/dts/imx6q-tqma6b.dtsi | 15 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 6 +- + 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.dtsi | 2 +- + arch/arm/boot/dts/imx6qp-sabreauto.dts | 3 +- + arch/arm/boot/dts/imx6qp-tqma6b.dtsi | 16 + + arch/arm/boot/dts/imx6sl.dtsi | 2 + + arch/arm/boot/dts/imx6sll.dtsi | 7 + + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ull.dtsi | 7 + + arch/arm/boot/dts/imx7d-sdb.dts | 81 ++ + arch/arm/boot/dts/imx7s.dtsi | 15 +- + arch/arm/boot/dts/vf610-zii-cfu1.dts | 2 - + 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_v6_v7_defconfig | 6 + + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 94 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 141 ++- + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 2 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h | 360 ++----- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 3 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 33 + + .../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.dtsi | 52 +- + 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 | 2 + + 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 | 1 + + drivers/clk/imx/clk-imx8mm.c | 4 + + drivers/clk/imx/clk-imx8mn.c | 4 + + drivers/clk/imx/clk-imx8mp.c | 4 + + 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-pll14xx.c | 7 +- + drivers/clk/imx/clk-pllv1.c | 1 + + 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/vf610-clock.h | 3 +- + 87 files changed, 2393 insertions(+), 412 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/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 (647a84d1e4dc Merge branch 'v5.8-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (29bd9d8c2ac1 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (390f789055a0 Merge branch 'omap-for-v5.10/dt' 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.dtsi | 4 +- + arch/arm/boot/dts/am4372.dtsi | 2 + + 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 +- + .../omap_hwmod_33xx_43xx_interconnect_data.c | 16 - + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 40 -- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 4 +- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 2 - + 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 | 2 +- + 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 | 2 +- + 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 ++++++++++++- + 67 files changed, 824 insertions(+), 585 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi +Merging qcom/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge qcom/for-next +Already up to date. +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 (15c95b417a9c Merge branches 'renesas-arm-defconfig-for-v5.10', 'renesas-arm-dt-for-v5.10' and 'renesas-drivers-for-v5.10' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 46 + + arch/arm/boot/dts/r8a7742-iwg21m.dtsi | 28 +- + arch/arm/boot/dts/r8a7742.dtsi | 255 +++++ + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 112 +- + arch/arm/configs/shmobile_defconfig | 3 +- + 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 + + .../boot/dts/renesas/r8a774e1-hihope-rzg2h.dts | 15 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1180 +++++++++++++++++++- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + + arch/arm64/configs/defconfig | 7 + + drivers/soc/renesas/Kconfig | 2 +- + 14 files changed, 1662 insertions(+), 87 deletions(-) +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 d0cce03ee958] 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 (088d74f51158 Merge branch 'v5.9-clk/next' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (f609c46be3ca Merge branch 'next/soc-s3c-cleanup' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/spi/Kconfig +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 MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/samsung/pmu.yaml | 22 ++- + MAINTAINERS | 24 +-- + arch/arm/Kconfig | 8 +- + arch/arm/Kconfig.debug | 18 +- + arch/arm/Makefile | 7 +- + arch/arm/boot/dts/exynos4210.dtsi | 2 + + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 42 +++- + arch/arm/boot/dts/exynos4412-i9300.dts | 4 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 78 ++++++-- + arch/arm/boot/dts/exynos4412-n710x.dts | 37 +++- + arch/arm/boot/dts/exynos4412.dtsi | 2 + + 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 | 37 ++-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c | 13 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c | 19 +- + .../{mach-s3c24xx => mach-s3c}/mach-at2440evb.c | 27 +-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c | 21 +- + .../mach-crag6410-module.c | 7 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c | 33 ++-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c | 56 ++++-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c | 69 +++++-- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c | 15 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c | 26 ++- + .../arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c | 41 ++-- + .../arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c | 26 ++- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c | 35 ++-- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c | 13 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c | 19 +- + .../{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c | 4 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c | 23 +-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c | 15 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c | 37 ++-- + .../arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c | 22 +-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c | 56 ++++-- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c | 25 ++- + .../{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 | 19 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h | 0 + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c | 18 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c | 18 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c | 15 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c | 22 ++- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c | 24 ++- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c | 26 ++- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c | 15 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c | 13 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c | 31 ++- + .../{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c | 23 ++- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c | 14 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c | 19 +- + .../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} | 27 ++- + .../{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} | 43 ++--- + .../{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 - + 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 - + 280 files changed, 2117 insertions(+), 2089 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 (85%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c (97%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c (95%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-at2440evb.c (89%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c (98%) + 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 (90%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c (92%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c (98%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c (95%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c (95%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c (91%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c (92%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c (98%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c (91%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c (89%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c (93%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c (90%) + 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 (97%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h (100%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c (92%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c (93%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c (89%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c (90%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c (94%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c (89%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c (93%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c (91%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c (83%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c (91%) + 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 (d012a7190fc1 Linux 5.9-rc2) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge sunxi/sunxi/for-next +Already up to date. +Merging tegra/for-next (ce0ead94461f Merge branch for-5.10/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + 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 | 22 ++++++++++++++++++---- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 15 ++++++++++++++- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 10 ++++++---- + 6 files changed, 67 insertions(+), 10 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge ti-k3-new/ti-k3-next +Already up to date. +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 (5661bccb70ef m68k: Correct some typos in comments) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/amiga/config.c | 6 +++--- + arch/m68k/kernel/head.S | 16 ++++++++-------- + arch/m68k/kernel/traps.c | 5 +---- + drivers/zorro/zorro.c | 2 +- + 4 files changed, 13 insertions(+), 16 deletions(-) +Merging m68knommu/for-next (0fdaa525ea1c binfmt_flat: revert "binfmt_flat: don't offset the data start") +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. +Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (aa9c45db018f MIPS: SGI-IP32: No need to include mc14818*.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 +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-loongson2ef/mc146818rtc.h +Removing arch/mips/include/asm/mach-ip27/kmalloc.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 | 30 - + arch/mips/bcm63xx/boards/board_bcm963xx.c | 625 ++++++++++----------- + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/pnx8335_stb225_defconfig | 77 --- + arch/mips/include/asm/m48t37.h | 36 -- + arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 +- + arch/mips/include/asm/mach-ip27/kmalloc.h | 8 - + .../include/asm/mach-loongson2ef/mc146818rtc.h | 36 -- + .../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/mipsregs.h | 12 - + arch/mips/kernel/ftrace.c | 4 - + arch/mips/lantiq/xway/sysctrl.c | 10 +- + 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 + + include/linux/bcm47xx_sprom.h | 10 + + 32 files changed, 326 insertions(+), 1926 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-ip27/kmalloc.h + delete mode 100644 arch/mips/include/asm/mach-loongson2ef/mc146818rtc.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/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 (0a2e478902c7 nds32: use get_kernel_nofault in dump_mem) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 3 files changed, 4 insertions(+), 49 deletions(-) +Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (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 (bcf876870b95 Linux 5.8) +$ git merge parisc-hd/for-next +Already up to date. +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 (d012a7190fc1 Linux 5.9-rc2) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (d012a7190fc1 Linux 5.9-rc2) +$ git merge s390/features +Already up to date. +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 (a0fc1436f1f4 xtensa: add missing exclusive access state management) +$ git merge xtensa/xtensa-for-next +Already up to date. +Merging fscrypt/master (55e32c54bbd5 fscrypt: don't load ->i_crypt_info before it's known to be valid) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (70daa2f88d69 Merge branch 'for-next-next-v5.9-20200826' into for-next-20200826) +$ 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 | 23 +- + fs/btrfs/btrfs_inode.h | 5 + + fs/btrfs/compression.c | 35 --- + fs/btrfs/compression.h | 35 +++ + fs/btrfs/ctree.c | 79 ++++++- + fs/btrfs/ctree.h | 10 +- + fs/btrfs/delalloc-space.c | 123 +---------- + fs/btrfs/delayed-inode.c | 3 +- + fs/btrfs/dev-replace.c | 8 +- + fs/btrfs/disk-io.c | 44 ++-- + fs/btrfs/extent-io-tree.h | 1 + + fs/btrfs/extent-tree.c | 186 ++++++++++++++-- + fs/btrfs/extent_io.c | 92 ++++---- + fs/btrfs/extent_io.h | 6 +- + fs/btrfs/file.c | 122 +++++++---- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/free-space-tree.c | 4 + + fs/btrfs/inode.c | 501 +++++++++++++++++-------------------------- + fs/btrfs/ioctl.c | 35 ++- + fs/btrfs/ordered-data.c | 59 +++++ + fs/btrfs/ordered-data.h | 11 + + fs/btrfs/qgroup.c | 2 +- + fs/btrfs/reada.c | 25 ++- + fs/btrfs/root-tree.c | 13 +- + fs/btrfs/scrub.c | 130 ++++++----- + 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 | 20 +- + fs/btrfs/sysfs.h | 5 +- + fs/btrfs/transaction.c | 10 + + fs/btrfs/transaction.h | 7 + + fs/btrfs/tree-log.c | 276 +++++++++++++----------- + fs/btrfs/tree-log.h | 32 +-- + fs/btrfs/volumes.c | 218 +++++++++---------- + fs/btrfs/volumes.h | 9 +- + include/trace/events/btrfs.h | 10 +- + 40 files changed, 1406 insertions(+), 1055 deletions(-) +Merging ceph/master (496ceaf12432 ceph: don't allow setlease on cephfs) +$ git merge ceph/master +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/dir.c +Merge made by the 'recursive' strategy. + fs/ceph/caps.c | 14 ++++---- + fs/ceph/debugfs.c | 4 +-- + fs/ceph/dir.c | 31 +++++++--------- + fs/ceph/file.c | 5 +-- + fs/ceph/inode.c | 19 +++++----- + fs/ceph/mds_client.h | 2 +- + fs/ceph/quota.c | 4 +-- + fs/ceph/super.h | 73 ++++++++++++++++++++------------------ + include/linux/ceph/ceph_features.h | 8 ++--- + 9 files changed, 79 insertions(+), 81 deletions(-) +Merging cifs/for-next (68d7a2eb103d cifs: fix check of tcon dfs in smb1) +$ git merge cifs/for-next +Auto-merging fs/cifs/connect.c +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 15 +++++++++++++++ + fs/cifs/connect.c | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) +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 (9409a51062c1 exfat: fix pointer error checking) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/exfat_fs.h | 2 +- + fs/exfat/file.c | 2 +- + fs/exfat/namei.c | 15 +++++++-------- + fs/exfat/nls.c | 2 +- + 4 files changed, 10 insertions(+), 11 deletions(-) +Merging ext3/for_next (de575ac602ab Pull reiserfs spelling fixes.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (27bc446e2def ext4: limit the length of per-inode prealloc list) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (da0815f3bce1 f2fs: Use generic casefolding support) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.rst | 17 ++ + fs/f2fs/checkpoint.c | 7 +- + fs/f2fs/compress.c | 56 +++-- + fs/f2fs/data.c | 13 +- + fs/f2fs/debug.c | 10 +- + fs/f2fs/dir.c | 84 +------ + fs/f2fs/extent_cache.c | 37 ++- + fs/f2fs/f2fs.h | 68 ++++-- + fs/f2fs/file.c | 12 +- + fs/f2fs/gc.c | 397 ++++++++++++++++++++++++++++-- + fs/f2fs/gc.h | 69 +++++- + fs/f2fs/node.c | 3 + + fs/f2fs/segment.c | 489 ++++++++++++++++++++++++++++++------- + fs/f2fs/segment.h | 66 +++-- + fs/f2fs/super.c | 86 +++++-- + fs/f2fs/sysfs.c | 10 +- + 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 | 8 +- + 22 files changed, 1294 insertions(+), 270 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 (9e9e23bd2d36 fuse: update project homepage) +$ git merge fuse/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/fuse.rst | 2 +- + MAINTAINERS | 2 +- + fs/fuse/Kconfig | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (d012a7190fc1 Linux 5.9-rc2) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion")) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/cel-next (ad112aa8b1ac SUNRPC: remove duplicate include) +$ git merge cel/cel-next +Already up to date. +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 (4518dfcf761e ovl: fix lookup of indexed hardlinks with metacopy) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (798b7347e4f2 jffs2: fix UAF problem) +$ git merge ubifs/next +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 (125eac243806 xfs: initialize the shortform attr header padding entry) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_attr_leaf.c | 8 +++++--- + fs/xfs/libxfs/xfs_ialloc.c | 4 ++-- + fs/xfs/libxfs/xfs_trans_space.h | 2 +- + fs/xfs/xfs_bmap_util.c | 2 +- + 4 files changed, 9 insertions(+), 7 deletions(-) +Merging zonefs/for-next (2f4b7462d2fa zonefs: update documentation to reflect zone size vs capacity) +$ git merge zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. +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 (c0842fbc1b18 random32: move the pseudo-random 32-bit definitions to prandom.h) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (bcf876870b95 Linux 5.8) +$ git merge vfs/for-next +Already up to date. +Merging printk/for-next (20d6ee092831 Merge branch 'for-5.10' 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. + 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 +++++++++ + 7 files changed, 2590 insertions(+), 457 deletions(-) + create mode 100644 kernel/printk/printk_ringbuffer.c + create mode 100644 kernel/printk/printk_ringbuffer.h +Merging pci/next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge pci/next +Already up to date. +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 c7dbac9ab75a] Merge remote-tracking branch 'pstore/for-next/pstore' into master +$ git diff -M --stat --summary HEAD^.. +Merging hid/for-next (de11ec5fedd9 Merge branch 'for-5.9/upstream-fixes' 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/i2c-hid/i2c-hid-core.c | 12 ++++++++++++ + 3 files changed, 24 insertions(+), 9 deletions(-) +Merging i2c/i2c/for-next (3f7462407ce3 Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/Kconfig | 1 - + drivers/i2c/busses/Kconfig | 3 --- + drivers/i2c/busses/i2c-bcm-iproc.c | 4 ++-- + drivers/i2c/busses/i2c-rcar.c | 1 + + drivers/i2c/i2c-core-acpi.c | 10 ---------- + drivers/i2c/i2c-core-base.c | 2 +- + drivers/i2c/i2c-core.h | 9 --------- + 7 files changed, 4 insertions(+), 26 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 (97568defeee1 hwmon: (k10temp) Define SVI telemetry and current factors for Zen2 CPUs) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/w83795.c +Auto-merging drivers/hwmon/w83781d.c +Auto-merging drivers/hwmon/ina3221.c +Auto-merging drivers/hwmon/emc1403.c +Auto-merging drivers/hwmon/adt7462.c +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/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 + + 146 files changed, 1350 insertions(+), 527 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 (92001bc0365a Documentation: laptops: thinkpad-acpi: fix underline length build warning) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/RCU/lockdep.rst | 2 +- + Documentation/admin-guide/devices.txt | 2 +- + .../admin-guide/laptops/thinkpad-acpi.rst | 2 +- + Documentation/driver-api/fpga/fpga-bridge.rst | 6 +++--- + Documentation/driver-api/fpga/fpga-mgr.rst | 6 +++--- + Documentation/driver-api/fpga/fpga-programming.rst | 16 +++++++-------- + Documentation/driver-api/fpga/fpga-region.rst | 18 ++++++++-------- + Documentation/driver-api/iio/core.rst | 16 +++++++-------- + Documentation/hwmon/abituguru-datasheet.rst | 6 +++--- + Documentation/hwmon/abituguru.rst | 4 ++-- + Documentation/hwmon/abituguru3.rst | 4 ++-- + Documentation/locking/locktypes.rst | 24 +++++++++++----------- + .../maintainer/maintainer-entry-profile.rst | 1 + + Documentation/process/deprecated.rst | 2 +- + .../translations/it_IT/process/deprecated.rst | 2 +- + MAINTAINERS | 1 + + 16 files changed, 57 insertions(+), 55 deletions(-) +Merging v4l-dvb/master (d84eca28c807 media: MAINTAINERS: add Dafna Hirschfeld for rkisp1) +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../userspace-api/media/v4l/colorspaces-defs.rst | 9 +- + .../media/v4l/colorspaces-details.rst | 5 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 2 +- + MAINTAINERS | 5 +- + drivers/media/i2c/adv7180.c | 7 +- + 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/ml86v7667.c | 7 +- + drivers/media/i2c/mt9m001.c | 7 +- + drivers/media/i2c/mt9m111.c | 7 +- + drivers/media/i2c/ov6650.c | 53 ++++-- + drivers/media/i2c/ov9640.c | 7 +- + drivers/media/i2c/tc358743.c | 7 +- + drivers/media/i2c/tvp5150.c | 7 +- + drivers/media/platform/Kconfig | 4 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 8 + + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 8 + + drivers/media/platform/pxa_camera.c | 189 ++++++--------------- + drivers/media/platform/qcom/venus/core.c | 22 ++- + drivers/media/platform/qcom/venus/core.h | 5 + + drivers/media/platform/qcom/venus/pm_helpers.c | 92 +++++++++- + drivers/media/platform/rcar-vin/rcar-csi2.c | 75 +++++++- + drivers/media/test-drivers/vivid/vivid-meta-out.c | 9 +- + drivers/media/tuners/tuner-simple.c | 5 +- + drivers/media/usb/em28xx/em28xx-cards.c | 22 +++ + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 5 +- + drivers/media/v4l2-core/v4l2-subdev.c | 16 ++ + drivers/staging/media/imx/TODO | 4 + + include/media/tpg/v4l2-tpg.h | 1 + + include/media/v4l2-mediabus.h | 33 +++- + include/media/v4l2-subdev.h | 38 +++-- + include/uapi/linux/videodev2.h | 17 +- + 34 files changed, 492 insertions(+), 248 deletions(-) +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 (dc37b29f6d30 Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/pm/intel_pstate.rst | 4 ++-- + drivers/acpi/acpi_apd.c | 4 ++-- + drivers/acpi/osl.c | 23 +++++++++++++++++++---- + drivers/base/core.c | 12 ++++++++---- + drivers/base/power/main.c | 16 ++++++++++------ + drivers/cpufreq/cpufreq.c | 3 +-- + drivers/cpufreq/tegra194-cpufreq.c | 10 +++++++--- + include/linux/cpufreq.h | 4 ++-- + 8 files changed, 51 insertions(+), 25 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (99bcfd231280 cpufreq: tegra186: Fix initial frequency) +$ 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/tegra186-cpufreq.c | 30 ++++ + drivers/opp/core.c | 53 ++++--- + drivers/opp/of.c | 8 +- + drivers/soc/samsung/exynos-asv.c | 2 +- + 6 files changed, 217 insertions(+), 176 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 (9123e3a74ec7 Linux 5.9-rc1) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (9b53e9891081 opp: Allow opp-supported-hw to contain multiple versions) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/opp/opp.txt | 53 ++++---- + drivers/opp/core.c | 169 +++++++++++++------------- + drivers/opp/cpu.c | 2 +- + drivers/opp/of.c | 49 +++++--- + drivers/opp/opp.h | 5 +- + 5 files changed, 153 insertions(+), 125 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/qcom/qcom-spmi-temp-alarm.c | 4 ++-- + drivers/thermal/rcar_thermal.c | 4 ++-- + drivers/thermal/st/Kconfig | 2 +- + drivers/thermal/thermal_core.c | 5 +++-- + drivers/thermal/thermal_sysfs.c | 2 +- + .../thermal/ti-soc-thermal/omap4-thermal-data.c | 23 +++++++++++----------- + drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h | 10 +++++++--- + 9 files changed, 37 insertions(+), 45 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 fe7530116871] Merge remote-tracking branch 'swiotlb/linux-next' into master +$ git diff -M --stat --summary HEAD^.. +Merging rdma/for-next (8dc105befe16 RDMA/cm: Add tracepoints to track MAD send operations) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Auto-merging drivers/infiniband/sw/rxe/rxe_sysfs.c +Auto-merging drivers/infiniband/sw/rxe/rxe.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx4/main.c +Auto-merging drivers/infiniband/core/cm.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_trace.h | 40 --- + 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/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 | 50 ++- + 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 | 6 + + drivers/infiniband/sw/rxe/rxe_sysfs.c | 6 + + drivers/infiniband/ulp/isert/ib_isert.c | 15 +- + include/rdma/ib_cm.h | 3 - + include/rdma/ib_verbs.h | 13 +- + include/trace/events/rdma.h | 41 ++- + include/trace/events/rpcrdma.h | 1 + + include/uapi/rdma/efa-abi.h | 1 + + 31 files changed, 1094 insertions(+), 387 deletions(-) + create mode 100644 drivers/infiniband/core/cm_trace.c + create mode 100644 drivers/infiniband/core/cm_trace.h +Merging net-next/master (50aba46c234e gtp: add notification mechanism) +$ git merge net-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/socket.c +Auto-merging net/sctp/sm_make_chunk.c +Auto-merging net/netlink/policy.c +Auto-merging net/ipv4/raw.c +CONFLICT (content): Merge conflict in net/ipv4/raw.c +Auto-merging net/core/sock.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/devlink.c +Auto-merging net/batman-adv/bridge_loop_avoidance.c +Auto-merging net/batman-adv/bat_v_ogm.c +Auto-merging fs/io_uring.c +Auto-merging drivers/s390/net/qeth_l3_main.c +Auto-merging drivers/s390/net/qeth_l2_main.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/net/phy/sfp.c +Auto-merging drivers/net/phy/dp83640.c +Auto-merging drivers/net/gtp.c +Auto-merging drivers/net/ethernet/renesas/ravb_main.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_dev.c +Auto-merging drivers/net/ethernet/netronome/nfp/flower/offload.c +Auto-merging drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +Auto-merging drivers/net/ethernet/hisilicon/hns/hns_enet.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +Auto-merging drivers/net/ethernet/8390/pcnet_cs.c +Auto-merging drivers/net/ethernet/8390/axnet_cs.c +Auto-merging MAINTAINERS +Resolved 'drivers/net/ethernet/ibm/ibmvnic.c' using previous resolution. +Recorded preimage for 'net/ipv4/raw.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'net/ipv4/raw.c'. +[master d9f085cceff9] Merge remote-tracking branch 'net-next/master' into master +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 130 +++ + Documentation/networking/l2tp.rst | 939 ++++++++++++++------- + MAINTAINERS | 21 +- + 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/dsa_loop.c | 56 +- + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 59 +- + 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/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 | 38 + + .../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 - + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 11 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 5 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +- + drivers/net/ethernet/ibm/ibmvnic.c | 168 ++-- + drivers/net/ethernet/ibm/ibmvnic.h | 2 + + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 12 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 11 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 10 +- + drivers/net/ethernet/intel/igb/igb_main.c | 10 +- + drivers/net/ethernet/intel/igc/igc_main.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 11 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 11 +- + 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 | 7 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 19 + + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 28 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 168 +++- + .../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 | 87 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 13 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 +- + 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/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/stmicro/stmmac/Kconfig | 12 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 191 +++++ + drivers/net/ethernet/ti/am65-cpts.c | 37 +- + drivers/net/ethernet/ti/cpts.c | 42 +- + drivers/net/gtp.c | 58 +- + 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 | 16 + + drivers/net/pcs/Makefile | 4 + + 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/mscc/mscc_macsec.c | 2 +- + drivers/net/phy/sfp.c | 2 +- + drivers/net/wan/sbni.c | 101 ++- + drivers/net/wireguard/netlink.c | 14 +- + drivers/net/wireless/ath/ath11k/thermal.c | 2 +- + drivers/nfc/st-nci/se.c | 3 +- + drivers/nfc/st21nfca/se.c | 3 +- + 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/ipv6.h | 11 - + {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 | 16 + + include/linux/{mdio-xpcs.h => pcs/pcs-xpcs.h} | 8 +- + include/linux/ptp_classify.h | 70 +- + include/linux/qed/qed_if.h | 82 +- + include/net/inet_sock.h | 7 - + include/net/netlink.h | 58 +- + include/uapi/linux/gtp.h | 2 + + include/uapi/linux/if_pppol2tp.h | 2 +- + include/uapi/linux/l2tp.h | 6 +- + lib/nlattr.c | 63 +- + 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/bridge/br_netlink.c | 4 +- + net/bridge/br_vlan.c | 4 +- + net/core/datagram.c | 33 +- + net/core/devlink.c | 11 +- + net/core/ptp_classifier.c | 30 + + net/core/skbuff.c | 3 +- + net/core/sock.c | 14 - + net/dccp/ackvec.c | 2 +- + net/dccp/ipv4.c | 2 +- + net/dccp/timer.c | 2 +- + net/ethtool/ioctl.c | 3 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/fou.c | 4 +- + net/ipv4/icmp.c | 4 +- + net/ipv4/ip_options.c | 35 +- + net/ipv4/ip_output.c | 2 +- + net/ipv4/ip_sockglue.c | 5 +- + net/ipv4/nexthop.c | 49 +- + net/ipv4/ping.c | 23 +- + net/ipv4/raw.c | 9 +- + net/ipv4/route.c | 9 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/tcp_scalable.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv6/af_inet6.c | 1 + + net/ipv6/ip6_fib.c | 12 +- + net/l2tp/Makefile | 2 + + net/l2tp/l2tp_core.c | 192 ++--- + net/l2tp/l2tp_core.h | 23 +- + net/l2tp/l2tp_debugfs.c | 4 +- + net/l2tp/l2tp_eth.c | 11 - + net/l2tp/l2tp_ip.c | 15 - + net/l2tp/l2tp_ip6.c | 15 - + net/l2tp/l2tp_netlink.c | 16 +- + net/l2tp/l2tp_ppp.c | 55 +- + net/l2tp/trace.h | 211 +++++ + net/mptcp/pm_netlink.c | 4 +- + net/netlink/af_netlink.c | 8 +- + net/netlink/genetlink.c | 2 +- + net/netlink/policy.c | 32 +- + 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 | 5 + + net/wireless/nl80211.c | 12 +- + .../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/tcp_mmap.c | 42 +- + 253 files changed, 4797 insertions(+), 2521 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/intel,dwmac-plat.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/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 + 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 + rename drivers/net/{phy/mdio-xpcs.c => pcs/pcs-xpcs.c} (99%) + rename {drivers/net/phy => include/linux/mdio}/mdio-i2c.h (100%) + rename {drivers/net/phy => include/linux/mdio}/mdio-xgene.h (100%) + rename include/linux/{mdio-xpcs.h => pcs/pcs-xpcs.h} (88%) + create mode 100644 net/l2tp/trace.h +Merging bpf-next/master (2e80be60c465 libbpf: Fix compilation warnings for 64-bit printf args) +$ git merge bpf-next/master +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging tools/lib/bpf/libbpf.c +CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c +Auto-merging tools/lib/bpf/btf_dump.c +Auto-merging tools/include/uapi/linux/bpf.h +Removing tools/build/feature/test-libelf-mmap.c +Auto-merging tools/bpf/resolve_btfids/main.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/core/skmsg.c +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/bpf_iter.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/bpf.h +Auto-merging include/linux/filter.h +Auto-merging drivers/net/veth.c +Auto-merging drivers/net/tun.c +Resolved 'tools/lib/bpf/libbpf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 73b35c9503bd] Merge remote-tracking branch 'bpf-next/master' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/bpf_devel_QA.rst | 19 +- + Documentation/bpf/btf.rst | 25 + + Documentation/bpf/index.rst | 1 + + Documentation/bpf/prog_sk_lookup.rst | 98 ++ + drivers/net/tun.c | 18 - + drivers/net/veth.c | 6 +- + include/linux/bpf-cgroup.h | 25 + + include/linux/bpf.h | 32 + + 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/skmsg.h | 17 - + include/linux/tcp.h | 20 +- + include/net/bpf_sk_storage.h | 14 + + include/net/inet_connection_sock.h | 2 + + include/net/request_sock.h | 9 +- + include/net/sock.h | 4 +- + include/net/tcp.h | 59 +- + include/uapi/linux/bpf.h | 380 ++++- + init/Kconfig | 2 + + kernel/Makefile | 2 +- + kernel/bpf/Makefile | 3 + + kernel/bpf/bpf_inode_storage.c | 273 ++++ + 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/inode.c | 116 +- + 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/syscall.c | 54 +- + kernel/bpf/verifier.c | 201 ++- + kernel/trace/bpf_trace.c | 48 + + net/bpfilter/Kconfig | 1 + + net/core/bpf_sk_storage.c | 832 ++-------- + net/core/filter.c | 416 ++++- + net/core/skmsg.c | 34 +- + net/core/sock_map.c | 89 +- + 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 | 5 +- + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/tcp_output.c | 193 ++- + net/ipv4/udp_bpf.c | 9 +- + net/ipv6/tcp_ipv6.c | 5 +- + samples/bpf/Makefile | 18 +- + 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 +- + scripts/bpf_helpers_doc.py | 2 + + security/bpf/hooks.c | 6 + + tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- + 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.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 | 380 ++++- + tools/lib/bpf/Makefile | 19 +- + 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 | 1712 ++++++++++++++------ + tools/lib/bpf/libbpf.h | 4 + + tools/lib/bpf/libbpf.map | 8 + + 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 | 3 - + 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/network_helpers.c | 37 + + tools/testing/selftests/bpf/network_helpers.h | 2 + + .../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 + + .../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/map_ptr_kern.c | 6 +- + .../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 +- + .../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 + + 168 files changed, 10891 insertions(+), 2060 deletions(-) + create mode 100644 Documentation/bpf/prog_sk_lookup.rst + create mode 100644 include/linux/bpf_local_storage.h + 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 + 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 ipsec-next/master (da7955405fb2 sfc: Fix build with CONFIG_RFS_ACCEL disabled.) +$ 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 (d0a84e1f38d9 ethtool: allow flow-type ether without IP protocol field) +$ git merge netfilter-next/master +Already up to date. +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 (26721b02466e zd1211rw: convert tasklets to use new tasklet_setup() API) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.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_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 | 2 - + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 - + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 17 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.h | 2 +- + 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 | 10 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 12 +- + drivers/net/wireless/intel/iwlegacy/common.c | 76 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 18 +- + drivers/net/wireless/intersil/orinoco/main.c | 11 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 8 +- + drivers/net/wireless/intersil/p54/p54pci.c | 8 +- + drivers/net/wireless/intersil/prism54/isl_38xx.c | 2 +- + drivers/net/wireless/intersil/prism54/isl_ioctl.c | 2 +- + drivers/net/wireless/intersil/prism54/islpci_dev.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 8 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 2 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 174 ++- + drivers/net/wireless/marvell/mwifiex/scan.c | 4 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- + drivers/net/wireless/marvell/mwl8k.c | 16 +- + 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/rtlwifi/pci.c | 21 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 9 +- + 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/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/ti/wl1251/main.c | 2 +- + drivers/net/wireless/ti/wlcore/cmd.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 8 +- + 148 files changed, 5149 insertions(+), 1671 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 (3b799254cf6f Bluetooth: hci_uart: Cancel init work before unregistering) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_sdio.c | 54 +++-------------------------------------- + drivers/bluetooth/hci_h5.c | 2 -- + drivers/bluetooth/hci_ldisc.c | 1 + + drivers/bluetooth/hci_serdev.c | 2 ++ + 4 files changed, 7 insertions(+), 52 deletions(-) +Merging mac80211-next/master (2831a631022e nl80211: support SAE authentication offload in AP mode) +$ git merge mac80211-next/master +Auto-merging net/wireless/wext-compat.c +Auto-merging net/wireless/util.c +Auto-merging net/wireless/sme.c +Auto-merging net/wireless/scan.c +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/chan.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/mcu.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/ath/ath10k/mac.c | 4 +- + drivers/net/wireless/ath/ath10k/wmi.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 +- + include/net/cfg80211.h | 3 + + include/net/mac80211.h | 35 ++- + include/uapi/linux/nl80211.h | 76 ++++-- + 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/wireless/core.h | 4 +- + net/wireless/nl80211.c | 258 ++++++++++++++------- + net/wireless/reg.c | 257 ++++++++++++++++---- + net/wireless/scan.c | 4 +- + net/wireless/sme.c | 2 +- + net/wireless/wext-compat.c | 2 +- + 28 files changed, 541 insertions(+), 255 deletions(-) +Merging gfs2/for-next (e28c02b94f9e gfs2: When gfs2_dirty_inode gets a glock error, dump the glock) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (6a1380271b75 Merge tag 'nand/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (da151e3458c8 dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags) +$ git merge nand/nand/next +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 (6779d0e6b0fe crypto: arm/curve25519 - include <linux/scatterlist.h>) +$ git merge crypto/master +Auto-merging crypto/tcrypt.c +Merge made by the 'recursive' strategy. + arch/arm/crypto/curve25519-glue.c | 1 + + arch/powerpc/crypto/crc-vpmsum_test.c | 1 + + 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 | 41 +--- + 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/intel-rng.c | 2 +- + drivers/char/hw_random/optee-rng.c | 6 +- + drivers/crypto/amcc/crypto4xx_core.h | 1 + + 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/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.h | 1 - + drivers/crypto/hifn_795x.c | 21 +- + 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/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-platform.c | 4 +- + 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/sahara.c | 2 +- + drivers/crypto/stm32/stm32-crc32.c | 2 + + drivers/crypto/stm32/stm32-hash.c | 1 + + 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/internal/hash.h | 13 -- + 70 files changed, 583 insertions(+), 713 deletions(-) + create mode 100644 drivers/crypto/caam/debugfs.c + create mode 100644 drivers/crypto/caam/debugfs.h +Merging drm/drm-next (d012a7190fc1 Linux 5.9-rc2) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (ebf375830bfc drm/amdgpu/swsmu: add handle manual fan readback on SMU11) +$ 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/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_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_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_link.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_link.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_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 +CONFLICT (content): Merge conflict in 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/amdgpu_vram_mgr.c +Auto-merging 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_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.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_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 +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' +Resolved 'drivers/gpu/drm/amd/amdgpu/nv.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/core/dc_link.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 +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c'. +[master 0af2957fb148] 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 | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 214 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 263 ++-- + 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 | 44 +- + 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 | 194 ++- + 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 | 17 + + 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 | 84 +- + 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 | 12 +- + 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 | 18 +- + .../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 | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 75 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 2 + + 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 | 827 +++++------ + 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 | 43 +- + 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 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 10 + + .../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.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 22 +- + 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 | 4 +- + 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 | 207 ++- + .../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 | 89 +- + 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 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 2 + + .../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 | 9 +- + .../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 | 19 +- + .../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 | 32 +- + .../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 | 21 +- + .../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 | 21 +- + .../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 | 2 + + .../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 | 64 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 33 + + .../{powerplay => pm/swsmu/smu11}/arcturus_ppt.c | 153 +- + .../{powerplay => pm/swsmu/smu11}/arcturus_ppt.h | 0 + .../amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.c | 198 ++- + .../amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.h | 3 - + .../swsmu/smu11}/sienna_cichlid_ppt.c | 175 ++- + .../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_display.c | 2 +- + 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 | 9 +- + sound/pci/hda/hda_intel.c | 3 + + 463 files changed, 13814 insertions(+), 3309 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 (99%) + 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 (95%) + 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 (94%) + 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 (94%) + 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 (99%) + 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 (93%) + 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 (95%) + 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 (caab25dc9e36 drm/i915/display: Fix DRRS debugfs) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/display/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_debugfs.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 +Merge made by the 'recursive' strategy. + 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 | 113 ++++++- + drivers/gpu/drm/i915/display/intel_display.c | 88 ++++- + .../gpu/drm/i915/display/intel_display_debugfs.c | 15 +- + 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 | 123 +++++-- + drivers/gpu/drm/i915/display/intel_dp.h | 2 + + .../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_hdcp.c | 23 +- + 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/display/vlv_dsi_pll.c | 2 +- + 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 | 120 +++++-- + .../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 | 33 +- + 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 +- + include/drm/i915_pciids.h | 4 +- + include/uapi/drm/i915_drm.h | 59 +++- + 41 files changed, 1065 insertions(+), 293 deletions(-) +Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (3bc46a083fa9 drm/sun4i: lvds: Invert the LVDS polarity) +$ git merge drm-misc/for-linux-next +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_object.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +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/i915/display/intel_dp.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/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_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_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.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +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/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 9b604bfeded1] Merge remote-tracking branch 'drm-misc/for-linux-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 | 45 +- + 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_dp.c | 8 + + 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 | 6 +- + 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/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/linux/virtio_gpu.h | 19 + + kernel/params.c | 17 +- + 273 files changed, 8687 insertions(+), 4351 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 7a22ef706ee6] Merge remote-tracking branch 'drm-misc/for-linux-next' into master + Date: Fri Aug 28 11:06:47 2020 +1000 +Merging drm-msm/msm-next (5e0c22d4a9dd drm/msm/a6xx: fix frequency not always being restored on GMU resume) +$ git merge drm-msm/msm-next +Already up to date. +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (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 (53be8bbc2f40 mfd: intel-m10-bmc: add Max10 BMC chip support for Intel FPGA PAC) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-intel-m10-bmc | 15 + + drivers/base/regmap/Kconfig | 6 +- + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/regmap-spi-avmm.c | 719 +++++++++++++++++++++ + drivers/mfd/Kconfig | 13 + + drivers/mfd/Makefile | 2 + + drivers/mfd/intel-m10-bmc.c | 169 +++++ + include/linux/mfd/intel-m10-bmc.h | 57 ++ + include/linux/regmap.h | 36 ++ + 9 files changed, 1017 insertions(+), 1 deletion(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-m10-bmc + create mode 100644 drivers/base/regmap/regmap-spi-avmm.c + create mode 100644 drivers/mfd/intel-m10-bmc.c + create mode 100644 include/linux/mfd/intel-m10-bmc.h +Merging sound/for-next (685a04a53747 ALSA: hda/ca0132 - Add AE-7 exit commands.) +$ git merge sound/for-next +Auto-merging sound/usb/quirks-table.h +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_ca0132.c | 1794 +++++++++++++++++++++++++++++++++--------- + sound/usb/card.c | 133 +++- + sound/usb/quirks-table.h | 262 +----- + sound/usb/usbaudio.h | 1 - + 4 files changed, 1584 insertions(+), 606 deletions(-) +Merging sound-asoc/for-next (f00bb4eb18c1 Merge remote-tracking branch 'asoc/for-5.10' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/sof/pcm.c +Auto-merging sound/soc/soc-core.c +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 + + .../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.h | 3 + + include/sound/sof/ext_manifest.h | 7 + + include/sound/sof/info.h | 2 +- + include/uapi/sound/sof/abi.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-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/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 | 175 +- + 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 | 129 +- + 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 | 44 + + sound/soc/soc-dai.c | 4 +- + 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/sof-acpi-dev.c | 2 + + sound/soc/sof/sof-audio.c | 2 +- + sound/soc/sof/sof-pci-dev.c | 32 +- + sound/soc/sof/sof-priv.h | 11 +- + sound/soc/sof/topology.c | 24 +- + 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 | 138 +- + sound/soc/ti/davinci-mcasp.c | 2 +- + sound/soc/xilinx/Kconfig | 4 +- + 146 files changed, 9611 insertions(+), 1497 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 (262e6ae7081d modules: inherit TAINT_PROPRIETARY_MODULE) +$ git merge modules/modules-next +Already up to date. +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 (86cfccb66937 Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge block/for-next +Already up to date. +Merging device-mapper/for-next (a9cb9f4148ef dm: don't call report zones for more than the user requested) +$ 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 (10a70e0d4edd Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c +Auto-merging drivers/mmc/host/s3cmci.c +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/memstick/core/ms_block.c +Merge made by the 'recursive' strategy. + .../bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 65 +++++ + .../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/mmc_test.c | 8 +- + drivers/mmc/core/sd.c | 36 ++- + drivers/mmc/core/sdio.c | 24 ++ + drivers/mmc/core/sdio_bus.c | 54 +++-- + drivers/mmc/core/sdio_cis.c | 11 + + drivers/mmc/host/Kconfig | 14 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/mmc_spi.c | 4 +- + drivers/mmc/host/s3cmci.c | 3 - + drivers/mmc/host/sdhci-esdhc-imx.c | 10 + + drivers/mmc/host/sdhci-msm.c | 11 +- + drivers/mmc/host/sdhci-of-sparx5.c | 269 +++++++++++++++++++++ + drivers/mmc/host/sdhci-pci-core.c | 154 ++++++++++++ + drivers/mmc/host/sdhci_am654.c | 2 +- + drivers/mmc/host/via-sdmmc.c | 3 + + include/linux/mmc/card.h | 2 + + include/linux/mmc/host.h | 3 +- + include/linux/mmc/sdio_func.h | 2 + + 23 files changed, 658 insertions(+), 39 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 +Auto-merging drivers/mfd/Kconfig +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 (c24b9a741b5f power: supply: pm2301_charger: fix spelling mistake "chargind" -> "charging") +$ git merge battery/for-next +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/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 | 8 +- + drivers/power/supply/bq2515x_charger.c | 12 +- + drivers/power/supply/bq27xxx_battery.c | 10 +- + 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/sbs-battery.c | 84 ++- + drivers/power/supply/smb347-charger.c | 565 +++++++++++---------- + include/dt-bindings/power/summit,smb347-charger.h | 19 + + include/linux/power/gpio-charger.h | 6 - + include/linux/power_supply.h | 7 + + 23 files changed, 830 insertions(+), 421 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 include/dt-bindings/power/summit,smb347-charger.h +Merging regulator/for-next (1406da692942 Merge remote-tracking branch 'regulator/for-5.10' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/core.c +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/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/core.c | 85 ++-- + drivers/regulator/da9210-regulator.c | 2 +- + drivers/regulator/da9211-regulator.c | 14 + + drivers/regulator/dbx500-prcmu.c | 26 +- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/fixed.c | 16 +- + drivers/regulator/lp8755.c | 82 +--- + drivers/regulator/ltc3589.c | 2 +- + drivers/regulator/ltc3676.c | 2 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max77826-regulator.c | 2 +- + drivers/regulator/mp886x.c | 109 ++++- + drivers/regulator/mt6360-regulator.c | 459 +++++++++++++++++++++ + 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/stm32-booster.c | 2 +- + drivers/regulator/stm32-pwr.c | 2 +- + drivers/regulator/stm32-vrefbuf.c | 2 +- + drivers/regulator/sy8106a-regulator.c | 2 +- + drivers/regulator/sy8827n.c | 2 + + drivers/regulator/tps65023-regulator.c | 2 +- + .../regulator/mediatek,mt6360-regulator.h | 16 + + 37 files changed, 1674 insertions(+), 590 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 (9ff9abc4c6be selinux: move policy mutex to selinux_state, use in lockdep checks) +$ 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 | 38 +- + security/selinux/selinuxfs.c | 242 +++++--- + 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 | 867 +++++++++++++++++------------ + security/selinux/ss/services.h | 5 +- + security/selinux/ss/sidtab.c | 10 + + security/selinux/ss/sidtab.h | 2 + + 20 files changed, 1105 insertions(+), 466 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 (42a2df3e829f Smack: prevent underflow in smk_set_cipso()) +$ 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 (e46b3c0d011e Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next) +$ git merge iommu/next +Already up to date. +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 (7ba58fff001d dt-bindings: Validate DT binding schema in a single call) +$ git merge devicetree/for-next +Removing Documentation/devicetree/bindings/w1/fsl-imx-owire.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/perf/fsl-imx-ddr.txt +Removing Documentation/devicetree/bindings/nvmem/snvs-lpgpr.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 +++++++++++++ + .../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 +++++++ + 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 +++++++++++++++ + .../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 +- + 37 files changed, 986 insertions(+), 482 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/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/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/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 (a37344d70f47 Merge remote-tracking branch 'spi/for-5.10' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-s3c24xx.c +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/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 +++++++++++---------- + 11 files changed, 235 insertions(+), 217 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 (21f294e9c2da Merge branch 'perf/core') +$ git merge tip/auto-latest +Auto-merging kernel/sched/topology.c +Auto-merging kernel/events/core.c +Removing drivers/firmware/efi/libstub/hidden.h +Auto-merging arch/x86/events/intel/core.c +Auto-merging arch/x86/boot/compressed/kaslr.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/topology.c | 26 --- + arch/x86/boot/compressed/Makefile | 39 +--- + 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 | 24 +- + arch/x86/boot/setup.ld | 2 +- + arch/x86/boot/tools/build.c | 4 - + arch/x86/entry/entry_64.S | 4 +- + arch/x86/entry/vdso/vdso32/vclock_gettime.c | 1 + + arch/x86/events/core.c | 80 +++++-- + arch/x86/events/intel/core.c | 350 ++++++++++++++++++++++++++-- + arch/x86/events/perf_event.h | 52 ++++- + arch/x86/include/asm/fixmap.h | 2 +- + arch/x86/include/asm/fpu/internal.h | 7 +- + arch/x86/include/asm/idtentry.h | 4 +- + arch/x86/include/asm/mce.h | 1 - + 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/required-features.h | 2 +- + arch/x86/include/asm/segment.h | 4 - + arch/x86/include/asm/special_insns.h | 6 + + arch/x86/include/asm/sync_core.h | 34 ++- + arch/x86/kernel/cpu/common.c | 8 - + arch/x86/kernel/cpu/mce/amd.c | 44 ++-- + arch/x86/kernel/cpu/resctrl/core.c | 45 ++-- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 92 ++------ + arch/x86/kernel/cpu/resctrl/internal.h | 21 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 16 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 32 ++- + arch/x86/kernel/kprobes/core.c | 1 - + arch/x86/kernel/kprobes/opt.c | 1 - + arch/x86/kernel/msr.c | 18 +- + arch/x86/kernel/paravirt.c | 19 -- + arch/x86/kernel/paravirt_patch.c | 17 -- + arch/x86/kernel/umip.c | 40 ++-- + 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 | 2 +- + drivers/firmware/efi/libstub/hidden.h | 6 - + drivers/ras/cec.c | 9 +- + include/linux/cacheinfo.h | 21 ++ + include/linux/hidden.h | 19 ++ + include/linux/perf_event.h | 33 ++- + include/linux/resctrl.h | 2 + + include/linux/sched/sd_flags.h | 156 +++++++++++++ + include/linux/sched/topology.h | 45 ++-- + include/linux/timekeeping.h | 15 ++ + include/trace/events/xen.h | 20 -- + kernel/events/core.c | 38 ++- + kernel/sched/debug.c | 56 ++++- + kernel/sched/topology.c | 52 ++--- + kernel/time/timekeeping.c | 109 +++++++-- + 62 files changed, 1439 insertions(+), 978 deletions(-) + 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 +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 (efe5396fa1db Merge branch 'edac-urgent' 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/e752x_edac.c | 2 +- + drivers/edac/ghes_edac.c | 12 +- + 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 | 2 +- + 15 files changed, 468 insertions(+), 21 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 +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt +Removing Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/ti,sci-inta.txt | 66 --------- + .../bindings/interrupt-controller/ti,sci-inta.yaml | 98 +++++++++++++ + .../bindings/interrupt-controller/ti,sci-intr.txt | 82 ----------- + .../bindings/interrupt-controller/ti,sci-intr.yaml | 102 ++++++++++++++ + MAINTAINERS | 4 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 36 +++-- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 12 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 4 +- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 10 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 43 +++--- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 12 +- + drivers/firmware/ti_sci.c | 155 +++++++++------------ + drivers/irqchip/Kconfig | 2 +- + drivers/irqchip/irq-ingenic.c | 2 +- + drivers/irqchip/irq-mtk-cirq.c | 4 +- + drivers/irqchip/irq-mtk-sysirq.c | 4 +- + drivers/irqchip/irq-stm32-exti.c | 14 +- + drivers/irqchip/irq-ti-sci-inta.c | 95 ++++++++++--- + drivers/irqchip/irq-ti-sci-intr.c | 152 ++++++++++++-------- + drivers/irqchip/irqchip.c | 2 +- + drivers/irqchip/qcom-pdc.c | 8 +- + include/linux/soc/ti/ti_sci_protocol.h | 13 ++ + 23 files changed, 534 insertions(+), 394 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml +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 (417ea89c28ab refscale: Bounds-check module parameters) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon +Auto-merging lib/Kconfig.debug +Auto-merging kernel/entry/common.c +Auto-merging kernel/Makefile +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 + + Documentation/memory-barriers.txt | 6 +- + MAINTAINERS | 3 +- + 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/rculist.h | 48 + + include/linux/rcupdate.h | 19 +- + include/linux/rcutiny.h | 1 - + include/linux/rcutree.h | 1 - + include/linux/smp.h | 3 + + include/linux/smp_types.h | 3 + + include/trace/events/rcu.h | 54 +- + kernel/Makefile | 2 + + kernel/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 | 2 +- + 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 | 165 ++- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_exp.h | 6 +- + kernel/rcu/tree_plugin.h | 40 +- + kernel/rcu/tree_stall.h | 8 +- + kernel/rcu/update.c | 13 - + kernel/scftorture.c | 575 +++++++++++ + kernel/smp.c | 134 +++ + kernel/time/tick-sched.c | 2 +- + lib/Kconfig.debug | 21 + + lib/Kconfig.kcsan | 5 + + lib/nmi_backtrace.c | 6 +- + scripts/Makefile.kcsan | 2 +- + scripts/atomic/gen-atomic-instrumented.sh | 21 +- + tools/memory-model/Documentation/README | 82 ++ + tools/memory-model/Documentation/cheatsheet.txt | 27 +- + tools/memory-model/Documentation/litmus-tests.txt | 1074 ++++++++++++++++++++ + tools/memory-model/Documentation/locking.txt | 320 ++++++ + tools/memory-model/Documentation/ordering.txt | 462 +++++++++ + 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/control-dependencies.txt | 256 +++++ + 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 | 33 +- + 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 +- + 105 files changed, 5383 insertions(+), 1003 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/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 100644 tools/memory-model/control-dependencies.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 +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 (16314874b12b Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (81ab595ddd3c KVM: PPC: Book3S HV: Rework secure mem slot dropping) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (9d3004bf7ba3 arm/xen: Add misuse warning to virt_to_gfn) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/events/events_base.c | 16 ++++++++-------- + drivers/xen/xenbus/xenbus_client.c | 10 ++++++++-- + include/xen/arm/page.h | 6 +++++- + 3 files changed, 21 insertions(+), 11 deletions(-) +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 (9123e3a74ec7 Linux 5.9-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (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 (83dea1285672 char: ipmi: convert tasklets to use new tasklet_setup() API) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) +Merging driver-core/driver-core-next (d012a7190fc1 Linux 5.9-rc2) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (cb06b385d536 usb: atm: don't use snprintf() for sysfs attrs) +$ git merge usb/usb-next +Auto-merging drivers/usb/misc/yurex.c +Auto-merging drivers/usb/host/xhci-tegra.c +Auto-merging drivers/usb/host/pci-quirks.c +Auto-merging drivers/usb/core/generic.c +Auto-merging drivers/usb/c67x00/c67x00-sched.c +Auto-merging drivers/reset/Kconfig +Merge made by the 'recursive' strategy. + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 21 ++++ + 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/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/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/yurex.c | 6 +- + drivers/usb/mtu3/mtu3.h | 6 - + drivers/usb/serial/mos7720.c | 8 +- + drivers/usb/storage/isd200.c | 2 +- + .../dt-bindings/reset/raspberrypi,firmware-reset.h | 13 +++ + include/soc/bcm2835/raspberrypi-firmware.h | 7 -- + 29 files changed, 342 insertions(+), 197 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 (58a3cefb3840 usb: chipidea: imx: add two samsung picophy parameters tuning implementation) +$ 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 | 5 +++++ + drivers/usb/chipidea/ci_hdrc_imx.h | 2 ++ + drivers/usb/chipidea/usbmisc_imx.c | 21 +++++++++++++++++++++ + 4 files changed, 37 insertions(+) +Merging phy-next/next (c42dcb195b2f phy: ti: j721e-wiz: Remove duplicate include) +$ git merge phy-next/next +Merge made by the 'recursive' strategy. + drivers/phy/samsung/phy-exynos5-usbdrd.c | 39 ++-- + drivers/phy/ti/phy-am654-serdes.c | 325 ++++++++++++++++++++----------- + drivers/phy/ti/phy-j721e-wiz.c | 1 - + 3 files changed, 223 insertions(+), 142 deletions(-) +Merging tty/tty-next (52c3c3a59234 Revert "vc_screen: extract vcs_read_buf_header") +$ git merge tty/tty-next +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/tty/vt/vt_ioctl.c +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/tty/serial/atmel_serial.c +Auto-merging drivers/tty/n_hdlc.c +Auto-merging drivers/tty/n_gsm.c +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/ipwireless/hardware.c | 6 +- + drivers/tty/n_gsm.c | 38 +- + drivers/tty/n_hdlc.c | 72 +-- + drivers/tty/n_tty.c | 4 +- + drivers/tty/pty.c | 2 +- + drivers/tty/serial/atmel_serial.c | 20 +- + drivers/tty/serial/ifx6x60.c | 15 +- + drivers/tty/serial/men_z135_uart.c | 8 +- + drivers/tty/serial/sa1100.c | 22 +- + drivers/tty/serial/timbuart.c | 6 +- + drivers/tty/synclink.c | 82 ++-- + drivers/tty/synclink_gt.c | 81 ++-- + 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 +- + 32 files changed, 586 insertions(+), 538 deletions(-) +Merging char-misc/char-misc-next (d162219c655c mei: virtio: virtualization frontend driver) +$ 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/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 +- + include/uapi/linux/mei.h | 49 ++ + 17 files changed, 2084 insertions(+), 135 deletions(-) + create mode 100644 drivers/misc/mei/hw-virtio.c +Merging extcon/extcon-next (70f8ef322829 extcon: ptn5150: Set the VBUS and POLARITY property capability) +$ 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-palmas.c | 2 +- + drivers/extcon/extcon-ptn5150.c | 205 ++++++++++----------- + drivers/extcon/extcon-usb-gpio.c | 2 +- + 6 files changed, 165 insertions(+), 138 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-ptn5150.txt + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml +Merging soundwire/next (08abad9f45f1 soundwire: intel: refine runtime pm for SDW_INTEL_CLK_STOP_BUS_RESET) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/cadence_master.h | 4 + + drivers/soundwire/intel.c | 444 ++++++++++++++++++++++++++++++++++++- + drivers/soundwire/intel.h | 2 + + drivers/soundwire/intel_init.c | 19 +- + drivers/soundwire/master.c | 2 + + 5 files changed, 463 insertions(+), 8 deletions(-) +Merging thunderbolt/next (d012a7190fc1 Linux 5.9-rc2) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (bc752d2f345b staging: hikey9xx: Kconfig: add regulator dependency) +$ git merge staging/staging-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/android/ion/ion.c | 6 +- + drivers/staging/comedi/drivers/pcl726.c | 2 +- + drivers/staging/emxx_udc/Kconfig | 2 +- + 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/most/dim2/dim2.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 88 ++-- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 10 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 6 +- + 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/sdio_intf.c | 3 +- + drivers/staging/wfx/data_rx.c | 2 +- + drivers/staging/wfx/data_tx.c | 2 +- + drivers/staging/wfx/debug.c | 8 +- + drivers/staging/wfx/hif_rx.c | 2 +- + drivers/staging/wfx/hif_tx.c | 4 +- + drivers/staging/wfx/main.c | 2 +- + drivers/staging/wfx/main.h | 2 +- + drivers/staging/wfx/sta.c | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 2 +- + drivers/staging/wlan-ng/prism2sta.c | 4 +- + include/linux/mfd/hi6421-spmi-pmic.h | 53 +++ + 39 files changed, 1813 insertions(+), 348 deletions(-) + 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 (12a400b016ab interconnect: Mark all dummy functions as static inline) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (78a2f92e4c4a dmaengine: axi-dmac: add support for reading bus attributes from registers) +$ 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 +Merge made by the 'recursive' strategy. + .../bindings/dma/snps,dma-spear1340.yaml | 7 +- + drivers/dma/dma-axi-dmac.c | 138 +++++++++++--- + 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/irq.c | 2 +- + drivers/dma/pch_dma.c | 35 +--- + drivers/dma/pl330.c | 2 +- + 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_dpdma.c | 209 +++++++++++++++++++++ + include/linux/platform_data/dma-dw.h | 2 + + 19 files changed, 548 insertions(+), 89 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 (7b08f25e38ce 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/qedf/qedf_main.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 +Merge made by the 'recursive' strategy. + drivers/scsi/mpt3sas/mpt3sas_base.c | 50 +++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 21 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 6 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 245 +++++++++++++-- + drivers/scsi/qedf/qedf_els.c | 32 +- + drivers/scsi/qedf/qedf_io.c | 11 +- + drivers/scsi/qedf/qedf_main.c | 11 + + drivers/scsi/smartpqi/smartpqi.h | 5 +- + drivers/scsi/smartpqi/smartpqi_init.c | 474 ++++++++++++++++------------- + 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 | 541 +++++++++++++++++++++------------- + drivers/scsi/ufs/ufshcd.h | 14 + + 15 files changed, 953 insertions(+), 733 deletions(-) +Merging scsi-mkp/for-next (32417d7844ab scsi: esas2r: Remove unnecessary casts) +$ git merge scsi-mkp/for-next +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/qla4xxx/ql4_os.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_nvme.c +Auto-merging drivers/scsi/qla2xxx/qla_mbx.c +Auto-merging drivers/scsi/qedf/qedf_main.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/cxgbi/libcxgbi.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 +Resolved 'drivers/scsi/ufs/ufshcd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5de5a52bbe63] Merge remote-tracking branch 'scsi-mkp/for-next' into master +$ git diff -M --stat --summary HEAD^.. + 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 | 1 - + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 10 +- + drivers/scsi/mvsas/mv_init.c | 4 - + drivers/scsi/pmcraid.c | 1 - + 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/snic/snic_scsi.c | 4 +- + drivers/scsi/ufs/ufs-mediatek.h | 4 +- + drivers/scsi/ufs/ufshcd.c | 34 ++++--- + 30 files changed, 204 insertions(+), 220 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 (22cc422070d9 gpio: wcove: Request IRQ after all initialisation done) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (01e8d85b68fd gpio: aggregator: Refactor ->{get, set}_multiple() to make Sparse happy) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-aggregator.c | 70 ++++++++++++++++++++++++++---------------- + drivers/gpio/gpio-stp-xway.c | 54 ++++++++++++++++++++++++++++---- + 2 files changed, 91 insertions(+), 33 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 (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (04d53068508e pinctrl: intel: Update header block to reflect direct dependencies) +$ git merge pinctrl-intel/for-next +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 (9123e3a74ec7 Linux 5.9-rc1) +$ git merge kselftest/next +Already up to date. +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 (338c0aff6dbb Merge branch 'for-5.9/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + tools/testing/selftests/livepatch/functions.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging coresight/next (8aba79505eb3 coresight: etm4x: Ensure default perf settings filter user/kernel) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-cti.c | 6 +- + 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 + + 6 files changed, 73 insertions(+), 57 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 (b3a9e3b9622a Linux 5.8-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (a24ef5be460b nvmem: qcom-spmi-sdam: Enable multiple devices) +$ git merge nvmem/for-next +Auto-merging MAINTAINERS +CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml +Auto-merging Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml +Resolved 'Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3c95e31c7dd5] Merge remote-tracking branch 'nvmem/for-next' into master +$ git diff -M --stat --summary HEAD^.. +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 +Merge made by the 'recursive' strategy. + drivers/auxdisplay/arm-charlcd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kgdb/kgdb/for-next (2c308ef41351 kgdb: Make "kgdbcon" work properly with "kgdb_earlycon") +$ git merge kgdb/kgdb/for-next +Auto-merging kernel/debug/kdb/kdb_io.c +Auto-merging kernel/debug/debug_core.c +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 22 ++++++++++++++-------- + kernel/debug/kdb/kdb_io.c | 14 +++++++------- + 2 files changed, 21 insertions(+), 15 deletions(-) +Merging pidfd/for-next (da83d0cb9237 Merge branch 'cap_checkpoint_restore' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging hmm/hmm (9123e3a74ec7 Linux 5.9-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (8a5de2de0339 fpga: dfl: change data type of feature id to u16) +$ 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.c | 29 +++++++++++++++-------------- + drivers/fpga/dfl.h | 10 +++++----- + drivers/fpga/stratix10-soc.c | 23 +++-------------------- + 5 files changed, 26 insertions(+), 40 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 (9123e3a74ec7 Linux 5.9-rc1) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (c1a371cf80fb printk: fix global comment) +$ git merge trivial/for-next +Auto-merging lib/bitmap.c +Auto-merging kernel/printk/printk_safe.c +Merge made by the 'recursive' strategy. + fs/vboxsf/dir.c | 2 +- + kernel/printk/printk_safe.c | 2 +- + lib/bitmap.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (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. +Merging akpm-current/current (f60aef257493 ROMFS: support inode blocks calculation) +$ git merge --no-ff akpm-current/current +Auto-merging lib/bitmap.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging include/linux/mm.h +Auto-merging fs/configfs/file.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/claim.c +Auto-merging drivers/base/core.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging arch/s390/mm/vmem.c +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/h8300/kernel/setup.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .clang-format | 5 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 2 +- + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/vm/active_mm.rst | 2 +- + Documentation/x86/x86_64/boot-options.rst | 4 + + MAINTAINERS | 30 +- + 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/kernel/machine_kexec_file.c | 6 +- + arch/arm64/kernel/setup.c | 4 +- + 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/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_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/kernel/e820.c | 16 +- + arch/x86/kernel/setup.c | 56 +- + 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 | 4 + + drivers/dax/Makefile | 3 +- + drivers/dax/bus.c | 1046 ++++++++++++++++++++++++-- + 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/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/virtio/virtio_mem.c | 47 +- + fs/aio.c | 9 +- + fs/autofs/dev-ioctl.c | 8 +- + fs/binfmt_elf.c | 25 + + fs/buffer.c | 62 +- + fs/configfs/dir.c | 2 +- + fs/configfs/file.c | 2 +- + fs/notify/fanotify/fanotify.c | 5 +- + fs/notify/inotify/inotify_fsnotify.c | 5 +- + fs/ntfs/inode.c | 6 + + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/localalloc.c | 2 +- + fs/ocfs2/namei.c | 17 +- + fs/proc/base.c | 7 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 96 ++- + fs/ramfs/inode.c | 12 + + fs/romfs/super.c | 1 + + include/acpi/acpi_numa.h | 14 +- + include/linux/acpi.h | 2 + + include/linux/bitops.h | 13 +- + include/linux/dax.h | 8 + + 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 | 35 + + include/linux/nmi.h | 1 + + include/linux/numa.h | 11 - + include/linux/oom.h | 1 + + include/linux/page-flags.h | 48 +- + include/linux/range.h | 6 + + include/linux/sched.h | 8 + + include/linux/sched/coredump.h | 1 + + include/linux/sched/mm.h | 30 +- + include/linux/swap.h | 3 +- + include/linux/wait.h | 4 +- + include/ras/ras_event.h | 3 + + ipc/ipc_sysctl.c | 2 +- + kernel/dma/contiguous.c | 11 +- + kernel/fork.c | 24 +- + kernel/hung_task.c | 44 ++ + kernel/panic.c | 12 +- + kernel/resource.c | 11 +- + kernel/sysctl.c | 8 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 6 + + lib/bitmap.c | 2 +- + lib/decompress_bunzip2.c | 2 +- + lib/devres.c | 2 +- + lib/dynamic_queue_limits.c | 4 +- + lib/earlycpio.c | 2 +- + lib/libcrc32c.c | 2 +- + lib/radix-tree.c | 2 +- + lib/string.c | 24 + + lib/syscall.c | 2 +- + lib/test_hmm.c | 15 +- + lib/test_sysctl.c | 2 +- + mm/Kconfig | 6 +- + mm/debug.c | 18 +- + mm/dmapool.c | 46 +- + mm/gup.c | 37 +- + mm/gup_benchmark.c | 23 +- + mm/highmem.c | 4 +- + mm/huge_memory.c | 2 + + mm/hugetlb.c | 12 +- + mm/hwpoison-inject.c | 18 +- + mm/kmemleak.c | 8 +- + mm/madvise.c | 7 +- + mm/memblock.c | 98 +-- + mm/memcontrol.c | 21 +- + mm/memory-failure.c | 308 ++++---- + mm/memory.c | 41 +- + mm/memory_hotplug.c | 166 ++-- + mm/memremap.c | 329 ++++---- + mm/migrate.c | 28 +- + mm/mmap.c | 65 +- + mm/oom_kill.c | 2 + + mm/page_alloc.c | 160 ++-- + mm/page_io.c | 6 +- + mm/page_isolation.c | 46 +- + mm/page_reporting.c | 2 +- + mm/rmap.c | 9 +- + mm/slab.h | 1 - + mm/slub.c | 64 +- + mm/sparse.c | 10 +- + mm/swap.c | 6 +- + mm/swap_state.c | 2 +- + mm/swapfile.c | 9 +- + mm/util.c | 3 +- + mm/vmstat.c | 32 +- + scripts/checkpatch.pl | 117 +-- + scripts/const_structs.checkpatch | 1 + + 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 +- + 186 files changed, 3475 insertions(+), 2001 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 tools/testing/selftests/exec/load_address.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/15)
Rebasing (2/15)
Rebasing (3/15)
Rebasing (4/15)
Rebasing (5/15)
Rebasing (6/15)
Rebasing (7/15)
Rebasing (8/15)
Rebasing (9/15)
Rebasing (10/15)
Rebasing (11/15)
Rebasing (12/15)
Rebasing (13/15)
Rebasing (14/15)
Rebasing (15/15)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + fbaa3fc5cf22...93ec0960bea8 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (93ec0960bea8 mm/mmap: add inline munmap_vma_range() for code readability) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kdump/gdbmacros.txt | 153 ++++++++++++++------- + 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_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/configs/i386_defconfig | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/io_uring.c | 2 +- + include/linux/compat.h | 4 + + include/linux/mm.h | 3 +- + include/linux/pid.h | 1 + + include/linux/syscalls.h | 2 + + include/uapi/asm-generic/unistd.h | 4 +- + kernel/exit.c | 17 --- + kernel/pid.c | 17 +++ + kernel/sys_ni.c | 2 + + mm/madvise.c | 189 ++++++++++++++++++++++---- + mm/memory-failure.c | 18 +-- + mm/memory_hotplug.c | 46 +++---- + mm/migrate.c | 71 ++++++---- + mm/mmap.c | 74 +++++++--- + scripts/gdb/linux/dmesg.py | 139 ++++++++++++++----- + scripts/gdb/linux/utils.py | 7 + + 37 files changed, 558 insertions(+), 215 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..bf5e6ae0b4fe --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200828 |