diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-02-18 15:25:49 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-02-18 15:25:49 +1100 |
| commit | 02815e777db630e3c183718cab73752b48a5053e (patch) | |
| tree | a2dc28f19bd9691a9acfe06d963a6d3b741cbea3 | |
| parent | dab91bf89900957a6a30a4a5b315fcdc3233744b (diff) | |
| download | linux-next-next-20200218.tar.gz | |
Add linux-next specific files for 20200218next-20200218
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 316 | ||||
| -rw-r--r-- | Next/Trees | 318 | ||||
| -rw-r--r-- | Next/merge.log | 4161 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4798 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1730ebd5553c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,316 @@ +Name SHA1 +---- ---- +origin 11a48a5a18c63fd7621bb050228cebf13566e4d8 +fixes ba954bf6cb386867497fa8c8850d0759e35f6a1f +kbuild-current 743de36e106d0797c5654b1be93333e37dbd2e3d +arc-current 0acdf63d2296f9542437a4842ad94554d240eab6 +arm-current 6849b5eba1965ceb0cad3a75877ef4569dd3638e +arm-soc-fixes 3bf3c9744694803bd2d6f0ee70a6369b980530fd +arm64-fixes d91771848f0ae2eec250a9345926a1a3558fa943 +m68k-current 6aabc1facdb24e837cfea755ba46a6be22a8860f +powerpc-fixes d4bf905307a1c90a27714ff7a9fd29b0a2ceed98 +s390-fixes 94e90f727f7424d827256023cace829cad6896f4 +sparc 11648b8339f840d4b1f4c54a1abec8025d9e077d +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 9a6a0dea16177ccaecc116f560232e63bec115f1 +bpf e20d3a055a457a10a4c748ce5b7c2ed3173a1324 +ipsec a1a7e3a36e01ca6e67014f8cf673cb8e47be5550 +netfilter a7da92c2c8a1faf253a3b3e292fda6910deba540 +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers a9149d243f259ad8f02b1e23dfe8ba06128f15e1 +mac80211 9a6a0dea16177ccaecc116f560232e63bec115f1 +rdma-fixes 685eff513183d6d64a5f413531e683d23b8b198b +sound-current a655e2b107d463ce2745188ce050d07daed09a71 +sound-asoc-fixes d7aa029b173b8b85079598fbe34848987a011c51 +regmap-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +regulator-fixes e361130b31aac2ff04ba0305300c62513a255e0d +spi-fixes db33c6a8314be01ab5d1f1ad7468577d0ed8795c +pci-current bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +driver-core.current ae91c92565494a37c30ce9a691c87890f800d826 +tty.current 07e6124a1a46b4b5a9b3cacc0c306b50da87abf5 +usb.current bab5417f5f0118ce914bc5b2f8381e959e891155 +usb-gadget-fixes 42cd5ffe46c1037d5d9a253c72e71a024a7bfbef +usb-serial-fixes 7c3d02285ad558691f27fde760bcd841baa27eab +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 4f510aa10468954b1da4e94689c38ac6ea8d3627 +staging.current 9a4556bd8f23209c29f152e6a930b6a893b0fc81 +char-misc.current 74ba569a15a08b988bc059ad515980f51e85be79 +soundwire-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +thunderbolt-fixes da0f3e0201b87ee4bbd2175925dd57e1228c35fb +input-current 3dbae15538972c9e1578cb216964c2840361a538 +crypto-current c9cc0517bba9f0213f1e55172feceb99e5512daf +ide 94f2630b18975bb56eee5d1a36371db967643479 +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes 9a0584f05687947d5a0b87f046bcd2592a55e67c +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +slave-dma-fixes 2227ab4216cd4d56619733bcfaee7e6943cdc9aa +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes def9d2780727cec3313ed3522d0123158d87224d +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 1697d98124819aab09b86602978bd4f50e101e2d +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes bef8e2dfceed6daeb6ca3e8d33f9c9d43b926580 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes b0b03951544534d6d9ad4aa2787eefec988fff20 +kvm-fixes ead68df94d248c80fdbae220ae5425eb5af2e753 +kvms390-fixes fe33a928bfcd673ecf73b990d704ef18a907c409 +hwmon-fixes 11a48a5a18c63fd7621bb050228cebf13566e4d8 +nvdimm-fixes 96222d53842dfe54869ec4e1b9d4856daf9105a2 +btrfs-fixes c4ebce2b0e30c87b570801803c1e5e7bb2fc45ff +vfs-fixes d0cb50185ae942b03c4327be322055d622dc79f6 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +samsung-krzk-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl-samsung-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +devicetree-fixes 04dbd86539fd2f0a65fdd5a0416b7f6606f95e16 +scsi-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +drm-fixes 11a48a5a18c63fd7621bb050228cebf13566e4d8 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes dc35d7955e72d304375d708a3292fe7e6848f1ad +mmc-fixes 9051db381fabe75079ef38135ab73c5dd3a7c3e5 +rtc-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +gnss-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +hyperv-fixes af42d3466bdc8f39806b26f593604fdc54140bcb +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes def9d2780727cec3313ed3522d0123158d87224d +pidfd-fixes 0bef168e88595a1c42fa83009ffabb26535368f8 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +gpio-intel-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl-intel-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +drm-misc-fixes dde2bb2da01e96c17f0a44b4a3cf72a30e66e3ef +kspp-gustavo bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +kbuild 0bf999f9c5e74c7ecf9dafb527146601e5c848b9 +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 75467ee48a5e04cf3ae3cb39aea6adee73aeff91 +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 29cd07a400ae781c4b10019575ee9fe28d38ba2f +arm64 e533dbe9dcb199bb637a2c465f3a6e70564994fe +arm-perf 8703317ae576c9bf3e07e5b97275e3f957e8d74b +arm-soc f07849b2ac772fa5e06a71623ac0502dc4a32b62 +amlogic 7ef59ea6bce077cd9ce0c96fa5b42d2d50349274 +aspeed 5a020d80bbef3176e034e5d47677044289e78186 +at91 1bf2570010796dbfc16ea81ac10e80124f57e026 +bcm2835 f142341846711f8f3cb85e4df5e0130d9e017a9d +imx-mxs eb63d5e07b53aafcd736f72e503a5a2a993c2f0d +keystone a1766a49fc90df3ac1ab3004dd3d4a80480c1a31 +mediatek faf3024a8ea2ec5d0c1cb0070f698bbfbb930f24 +mvebu c0d03b53ef47dbade7be742ec897c77879ad7ccb +omap f9f5267ec2963fdfe01d68abdfed267f30d19843 +qcom bc50f20a31b1dea6efcc6c96b40775ad34bbfeea +realtek 45698e00d5a904bdefd5d4cd4a751803674815f1 +renesas c3f5f82f4dfcc32be7b2e7f9b593dad143e96d75 +reset 4e0b9bc98c4a09c6e0bbd621ca57734170f1b820 +rockchip 152f9a049efc1c2bcd9ce3e3f365c0b610cd6944 +samsung-krzk 735478fc8a89822acc2d2e254712ca3ff75d68f8 +scmi 11a48a5a18c63fd7621bb050228cebf13566e4d8 +sunxi 8033917515c7f036a5dcc54720cd2a358c5e16db +tegra 108f7e5e947886c535fef39d16e649173d7d28b9 +clk 931cfff0458a4d3b1fb45ab9dce9d4cdd6b33e0d +clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 85ea1329d67405e62bb4a90a4c599a8f0a8df65d +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 240b62d381fe5b66c496a6fd55edff3976a9be51 +m68k dff527e7a0a831459efcda23ba1577d2cc7aa6e5 +m68knommu bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +microblaze 6aa71ef9bcf9d8688c777dfbff340348cb89a5b4 +mips 2c4288719806ca0b3de1b742ada26b25a60d6a45 +nds32 a7f96fce201c4969178c8709a49e005d9792186b +nios2 051d75d3bb31d456a41c7dc8cf2b8bd23a96774f +openrisc fc74d716600545304a066bfd9d54cbd07e531701 +parisc-hd bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +powerpc 71c3a888cbcaf453aecf8d2f8fb003271d28073f +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 6e62bd36e9ad85a22d92b1adce6a0336ea549733 +risc-v b2389902f6fdc4e8801df4cde7fc7495cb9e3889 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 c4f762ff6b7766e0053e39d1d87d599384288048 +sh a193018e5290ee9d9fe62ad80cd8f874711eb575 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml d65197ad52494bed3b5e64708281b8295f76c391 +xtensa 362961f4063fc9b6aa8347175442071d1e22fa4f +fscrypt edc440e3d27fb31e6f9663cf413fad97d714c060 +afs 4fe171bb81b13b40bf568330ec3716dfb304ced1 +btrfs 455808a18dbf27c4c85a077e72c2a427bf15b1bf +ceph 3b20bc2fe4c0cfd82d35838965dc7ff0b93415c6 +cifs 0fc6b1c269d110e45233624d3e461f22bab26537 +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs 2c2a7552dd6465e8fde6bc9cccf8d66ed1c1eb72 +erofs bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +ext3 daf1cd925487599ac1a9191ff264bf928c61834c +ext4 c96dceeabf765d0b1b1f29c3bf50a5c01315b820 +f2fs b19e8c68470385dd2c5440876591fddb02c8c402 +fsverity da3a3da4e6c68459618a1043dcb12b450312a4e2 +fuse 3e8cb8b2eaeb22f540f1cbc00cbb594047b7ba89 +jfs 802a5017ffb27ade616d0fe605f699a3c6303aa3 +nfs 11a48a5a18c63fd7621bb050228cebf13566e4d8 +nfs-anna 5d63944f8206a80636ae8cb4b9107d3b49f43d37 +nfsd 3d96208c30f84d6edf9ab4fac813306ac0d20c10 +orangefs 9f198a2ac543eaaf47be275531ad5cbd50db3edf +overlayfs a4ac9d45c0cd14a2adc872186431c79804b77dbf +ubifs fe357dbae113f6ad89b77818ef92784eb11e21ba +v9fs 79fb9216b7be1832b90c8ddf3c2d465b46670e81 +xfs cdbcf82b86ea24aa942991b4233cd8ddf13f590c +zonefs bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +iomap 243145bc4336684c69f95de0a303b31f2e5bf264 +djw-vfs 3253d9d093376d62b4a56e609f15d2ec5085ac73 +file-locks 98ca480a8f22fdbd768e3dad07024c8d4856576c +vfs 0fd169576648452725fa2949bf391d10883d3991 +printk f93598b8c76f022d760c0e4efa629c1a2174abde +pci bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pstore e163fdb3f7f8c62dccf194f3f37a7bcb3c333aa8 +hid 9d7e22b27ba7efff6ac4523420cdcb66e0ad5210 +i2c bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +i3c 3952cf8ff2f7751ee2f9d6cc6140df4667853250 +dmi 6eaaa9e897193a42fc21fe643bb2815455179e62 +hwmon-staging 42db9602a0330047c19331bd5bbcc9e0cc921781 +jc_docs 2e5b1886e9bab6c29c5e5c3ce4e373bb9e9eaa8b +v4l-dvb bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +v4l-dvb-next d45331b00ddb179e291766617259261c112db872 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 00b838d60ec480d931f6209868e69e0d251000c2 +cpufreq-arm a30f8a91f3c25ad7df897bf7877bad410ad19f79 +cpupower bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +opp 03758d60265c773e1d06d436b99ee338f2ac55d6 +thermal eefb85077bfe5b095db992a8bb596a72e40e00cf +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma beb205dd67aaa4315dedf5c40b47c6e9dee5a469 +net-next 92df9f8a745ee9b8cc250514272345cb2e74e7ef +bpf-next 92df9f8a745ee9b8cc250514272345cb2e74e7ef +ipsec-next 9f68e3655aae6d49d6ba05dd263f99f33c2567af +mlx5-next bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +netfilter-next fdfa3a6778b194974df77b384cc71eb2e503639a +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next 932183aa35c62e9657585382de641716088a0023 +bluetooth e22998f53a1e5a2e8c98d0f42506be985773b50c +mac80211-next 92df9f8a745ee9b8cc250514272345cb2e74e7ef +gfs2 6e5e41e2dc4e4413296d5a4af54ac92d7cd52317 +mtd 4575243c5c173f8adbc08a5c6ea2269742ea2b47 +nand d85339d9ea2660b550f12aca8bd040be4395c963 +spi-nor 8c79fa6c44deac8042bd747527fea06a32738158 +crypto 7f19380b2cfd412dcef2facefb3f6c62788864d7 +drm bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +amdgpu 05b5ff30d31fbf9281b108a84da7422efce5c419 +drm-intel 8d6cae6fcde8dcac3009175b157a79e86c43f5a1 +drm-tegra 98ae41adb252866158dd4e998551dfa85e612bed +drm-misc e1cf35b94c5fd122a8780587559fc6da9fc2dd12 +drm-msm 5f9935f514d66ddba868e587d9e976a567232547 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8 +regmap bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +sound 2948f4a4e583a4d283a4b57b7b1101761daee5cc +sound-asoc 71d81115223928cf5134dd8cd830bb8d3633f9cd +modules 0f74226649fb2875a91b68f3750f55220aa73425 +input c5ccf2ad3d33413fee06ae87d0b970d8cc540db6 +block 6b6eb301e9762e54ff6c636cd2017c1d47c32a6f +device-mapper 47ace7e012b9f7ad71d43ac9063d335ea3d6820b +pcmcia 71705c611263cad99edf85a5ea021e098cac032b +mmc 84f371938735be9bb5f713bf3151fb89d8b6c174 +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 5312f321a67cfee1fe4de245bc558fa857dce33b +backlight 7af43a76695db71a57203793fb9dd3c81a5783b1 +battery bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +regulator 5932ad6367d180531c69b321ebb3a5f37fdb66a1 +security 10c2d111c906599942efd13109061885631c4a0c +apparmor 01df52d726b5d55d2970f5c957f1961930acd5d6 +integrity d54e17b4066612d88c4ef3e5fb3115f12733763d +keys bda7978b1956a6828924150d3c51fe0665294c08 +selinux 253050f57c7afe87d182f4029645568c2fc837f7 +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +tpmdd dc10e4181c05a2315ddc375e963b7c763b5ee0df +watchdog 44144c809e39d64ff9931c7e8956c42b2baa89e6 +iommu e3b5ee0cfb65646f4a915643fe53e0a51829d891 +vfio 7b5372ba04ca1caabed1470d4ec23001cde2eb91 +audit 70b3eeed49e8190d97139806f6fbaf8964306cdb +devicetree 90aeca875f8a33da7cbcac20b7921ca090127346 +mailbox c6c6bc6ea9fce31baaca053befc31215cfcb3dd9 +spi 7b3bbd9f82f29b0e9d653b061a7c91525f045aea +tip fc822da1328ebd28d7266629d0cfdd614250e96b +clockevents e4c3b4213b79017001be2a311d7aafebe7497e8a +edac 4aa92c86463273b673e4170c60cb78e2625781eb +irqchip 5186a6cc3ef5a3fa327c258924ef098b0de77006 +ftrace 7276531d4036f5db2af15c8b6caa02e7741f5d80 +rcu 2de7463235f0d7f2966b7963d57145d919f981d1 +kvm ead68df94d248c80fdbae220ae5425eb5af2e753 +kvm-arm b3f15ec3d809ccf2e171ca4e272a220d3c1a3e05 +kvm-ppc fd24a8624eb29d3b6b7df68096ce0321b19b03c6 +kvms390 b35e8878e1d313044863855f3cbaee0040d0bd39 +xen-tip 8557bbe5156e5fba022d5a5220004b1e016227ee +percpu 9391e7a9a1e29c94b432cea0d27ee043a7560758 +workqueues 1cd27003497accca0c2dc7cfe3abe7512ecd911d +drivers-x86 7adb1e8aeeb5d4d88012568b2049599c1a247cf2 +chrome-platform 42cd0ab476e2daffc23982c37822a78f9a53cdd5 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 11a48a5a18c63fd7621bb050228cebf13566e4d8 +ipmi 7342db125413d880fa518085bfe79381c06db19f +driver-core 99c73ce158a44a1a11cb146062bc32df0c1d95db +usb b57a368efde6b2980606169cdcaa1c4101adffe0 +usb-gadget bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +usb-serial 2c0bee081315b18064fe39661e679b2fe6b86476 +usb-chipidea-next 4d6141288c33b73027260e73df262464cbe1fd0d +phy-next a5c86c557fe90391a19e4b41c32f125b91d8a3c2 +tty 643f7d95fe236d739aaba3b63f0627b20471d4da +char-misc 06e33595e96f212811066df192ae8bf802174296 +extcon bbbd323cf9e7b25113a5038b26a4fb3601425244 +soundwire bfaa3549541cf8bf16246dfd9b4d2f3af679be86 +thunderbolt 3084ea9ea88906576d0bfc0d66cb1735045266c8 +staging b1f17561541c09f775b8a23c3e39d58e56beaff4 +mux f356d58c3a04159f35003b26f8c5183f9456f95d +icc bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +slave-dma acd624185d204b0ae2360b4648cc50802df5da01 +cgroup 9bd5910d7f3db2f65be139d2679dd9daa4a3419a +scsi 145e5a8a5cbd0c608dfe653c92edb70a580bdbf6 +scsi-mkp 145e5a8a5cbd0c608dfe653c92edb70a580bdbf6 +vhost 370e2c82a4a5f533ea8680cdf72e20143699a602 +rpmsg 5a87e60312a93c3989bd1f983b872164438d7243 +gpio 53803ecac78bbabfdd65f5cb789e46660fa63900 +gpio-brgl cb548e981da5fea6f98fc08cd031876940cac7fb +gpio-intel bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl c93214689f0c70b6942ba1d12b8371b9fc60ae41 +pinctrl-intel bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl-samsung bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pwm 9871abffc81048e20f02e15d6aa4558a44ad53ea +userns 61a47c1ad3a4dc6882f01ebdc88138ac62d0df03 +ktest 9b5f852ae20d998a534eea46d54e68584868ae8c +random 4cb760b02419061209b9b4cc2557986a6bf93e73 +kselftest 3032e3a7c7e3ef4a9839ec99c60ffeed76830bf2 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching d28b4c1b2b3d1337069cbe0bf0bec151d0e4d576 +coresight bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +rtc 4594d082dbe6385c2df6b838817ccd214c16b358 +nvdimm 46cf053efec6a3a5f343fead837777efe8252a46 +at24 4837621cd61e6b81a182098889143c6c9a06b0f3 +ntb 1ef512b16bc8e51453d7105609c88f51fba4dcf5 +kspp c79f46a282390e0f5b306007bf7b11a46d529538 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus 526eaf5d08a21d2ea4b84f7df348702ba5cae00a +nvmem e44b9b8b2c57b26fcd0f45d451fafda3cf482ab8 +xarray 3a00e7c47c382b30524e78b36ab047c16b8fcfef +hyperv 54e19d34011fea26d39aa74781131de0ce642a01 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb fcf2736c82ca1908e3a0e74730c404baebd8ccdf +pidfd 8d19f1c8e1937baf74e1962aae9f90fa3aeab463 +devfreq a454401a57ed929d81e0be92adaa9d215398a5b5 +hmm bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +fpga 28910cee898c2a43fcdd8c26e1378ae8084a93a0 +kunit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +cel a99d8080aaf358d5d23581244e5da23b35e340b9 +kasan-bitops 4f4afc2c9599520300b3f2b3666d2034fca03df3 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +kunit-next e20d8e81a0e06c672e964c9f01100f07a64b1ce6 +akpm-current 5b957e5ca73670a7f0fb4a1ec99f5cee4eb19d86 +akpm d445fed97103f92c10b29c2b73c5c0bf217bc6a7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..381db61e8a83 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,318 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#master +drivers-x86-fixes git git://git.infradead.org/linux-platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#pinctrl-fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.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.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-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 +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#for-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/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +kasan-bitops git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/kasan-bitops +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +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..47803757a844 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4161 @@ +$ date -R +Tue, 18 Feb 2020 07:52:54 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 713db3560410 Merge tag 'for-5.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux +Merging origin/master (11a48a5a18c6 Linux 5.6-rc2) +$ git merge origin/master +Updating 713db3560410..11a48a5a18c6 +Fast-forward + Documentation/driver-api/ipmb.rst | 4 + + .../guest-halt-polling.rst} | 12 +- + Documentation/virt/index.rst | 2 + + Documentation/virt/kvm/{api.txt => api.rst} | 3350 ++++++++++++-------- + .../virt/kvm/arm/{hyp-abi.txt => hyp-abi.rst} | 28 +- + Documentation/virt/kvm/arm/index.rst | 12 + + Documentation/virt/kvm/arm/{psci.txt => psci.rst} | 46 +- + .../devices/{arm-vgic-its.txt => arm-vgic-its.rst} | 106 +- + .../devices/{arm-vgic-v3.txt => arm-vgic-v3.rst} | 132 +- + .../kvm/devices/{arm-vgic.txt => arm-vgic.rst} | 89 +- + Documentation/virt/kvm/devices/index.rst | 19 + + .../virt/kvm/devices/{mpic.txt => mpic.rst} | 11 +- + .../kvm/devices/{s390_flic.txt => s390_flic.rst} | 70 +- + Documentation/virt/kvm/devices/vcpu.rst | 114 + + Documentation/virt/kvm/devices/vcpu.txt | 76 - + .../virt/kvm/devices/{vfio.txt => vfio.rst} | 25 +- + Documentation/virt/kvm/devices/{vm.txt => vm.rst} | 206 +- + .../virt/kvm/devices/{xics.txt => xics.rst} | 28 +- + .../virt/kvm/devices/{xive.txt => xive.rst} | 152 +- + .../kvm/{halt-polling.txt => halt-polling.rst} | 90 +- + .../virt/kvm/{hypercalls.txt => hypercalls.rst} | 129 +- + Documentation/virt/kvm/index.rst | 16 + + Documentation/virt/kvm/locking.rst | 243 ++ + Documentation/virt/kvm/locking.txt | 215 -- + Documentation/virt/kvm/{mmu.txt => mmu.rst} | 62 +- + Documentation/virt/kvm/{msr.txt => msr.rst} | 147 +- + .../virt/kvm/{nested-vmx.txt => nested-vmx.rst} | 37 +- + Documentation/virt/kvm/{ppc-pv.txt => ppc-pv.rst} | 26 +- + .../{review-checklist.txt => review-checklist.rst} | 3 + + .../virt/kvm/{s390-diag.txt => s390-diag.rst} | 13 +- + .../virt/kvm/{timekeeping.txt => timekeeping.rst} | 223 +- + ...UserModeLinux-HOWTO.txt => user_mode_linux.rst} | 1810 +++++------ + Makefile | 2 +- + arch/x86/include/asm/kvm_host.h | 16 +- + arch/x86/kvm/lapic.c | 3 - + arch/x86/kvm/mmu.h | 13 + + arch/x86/kvm/mmu/mmu.c | 11 +- + arch/x86/kvm/mmu/paging_tmpl.h | 2 +- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/vmx/nested.c | 33 +- + arch/x86/kvm/vmx/vmx.c | 5 +- + arch/x86/kvm/x86.c | 42 +- + drivers/char/ipmi/ipmb_dev_int.c | 33 +- + drivers/char/ipmi/ipmi_ssif.c | 10 +- + drivers/edac/edac_mc.c | 12 +- + drivers/edac/edac_mc_sysfs.c | 18 +- + drivers/md/bcache/alloc.c | 18 +- + drivers/md/bcache/btree.c | 13 + + drivers/md/bcache/journal.c | 7 +- + drivers/md/bcache/super.c | 17 - + drivers/nvme/host/core.c | 12 +- + drivers/nvme/host/pci.c | 23 +- + drivers/nvme/host/rdma.c | 2 +- + drivers/nvme/host/tcp.c | 9 +- + tools/testing/selftests/kvm/Makefile | 3 +- + .../selftests/kvm/include/x86_64/processor.h | 44 +- + tools/testing/selftests/kvm/include/x86_64/svm.h | 297 ++ + .../selftests/kvm/include/x86_64/svm_util.h | 38 + + tools/testing/selftests/kvm/lib/x86_64/svm.c | 161 + + tools/testing/selftests/kvm/lib/x86_64/vmx.c | 6 +- + .../testing/selftests/kvm/x86_64/svm_vmcall_test.c | 79 + + virt/kvm/arm/vgic/vgic-mmio.c | 12 - + virt/kvm/kvm_main.c | 16 +- + 63 files changed, 5020 insertions(+), 3435 deletions(-) + rename Documentation/{virtual/guest-halt-polling.txt => virt/guest-halt-polling.rst} (91%) + rename Documentation/virt/kvm/{api.txt => api.rst} (71%) + rename Documentation/virt/kvm/arm/{hyp-abi.txt => hyp-abi.rst} (79%) + create mode 100644 Documentation/virt/kvm/arm/index.rst + rename Documentation/virt/kvm/arm/{psci.txt => psci.rst} (60%) + rename Documentation/virt/kvm/devices/{arm-vgic-its.txt => arm-vgic-its.rst} (71%) + rename Documentation/virt/kvm/devices/{arm-vgic-v3.txt => arm-vgic-v3.rst} (77%) + rename Documentation/virt/kvm/devices/{arm-vgic.txt => arm-vgic.rst} (66%) + create mode 100644 Documentation/virt/kvm/devices/index.rst + rename Documentation/virt/kvm/devices/{mpic.txt => mpic.rst} (91%) + rename Documentation/virt/kvm/devices/{s390_flic.txt => s390_flic.rst} (87%) + create mode 100644 Documentation/virt/kvm/devices/vcpu.rst + delete mode 100644 Documentation/virt/kvm/devices/vcpu.txt + rename Documentation/virt/kvm/devices/{vfio.txt => vfio.rst} (72%) + rename Documentation/virt/kvm/devices/{vm.txt => vm.rst} (61%) + rename Documentation/virt/kvm/devices/{xics.txt => xics.rst} (84%) + rename Documentation/virt/kvm/devices/{xive.txt => xive.rst} (62%) + rename Documentation/virt/kvm/{halt-polling.txt => halt-polling.rst} (64%) + rename Documentation/virt/kvm/{hypercalls.txt => hypercalls.rst} (55%) + create mode 100644 Documentation/virt/kvm/locking.rst + delete mode 100644 Documentation/virt/kvm/locking.txt + rename Documentation/virt/kvm/{mmu.txt => mmu.rst} (94%) + rename Documentation/virt/kvm/{msr.txt => msr.rst} (74%) + rename Documentation/virt/kvm/{nested-vmx.txt => nested-vmx.rst} (90%) + rename Documentation/virt/kvm/{ppc-pv.txt => ppc-pv.rst} (91%) + rename Documentation/virt/kvm/{review-checklist.txt => review-checklist.rst} (95%) + rename Documentation/virt/kvm/{s390-diag.txt => s390-diag.rst} (90%) + rename Documentation/virt/kvm/{timekeeping.txt => timekeeping.rst} (85%) + rename Documentation/virt/uml/{UserModeLinux-HOWTO.txt => user_mode_linux.rst} (74%) + create mode 100644 tools/testing/selftests/kvm/include/x86_64/svm.h + create mode 100644 tools/testing/selftests/kvm/include/x86_64/svm_util.h + create mode 100644 tools/testing/selftests/kvm/lib/x86_64/svm.c + create mode 100644 tools/testing/selftests/kvm/x86_64/svm_vmcall_test.c +Merging fixes/master (ba954bf6cb38 evh_bytechan: fix out of bounds accesses) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/epapr_hcalls.h | 42 ----------------------------- + drivers/tty/ehv_bytechan.c | 48 +++++++++++++++++++++++++++++++++ + 2 files changed, 48 insertions(+), 42 deletions(-) +Merging kbuild-current/fixes (743de36e106d kbuild: add comment for V=2 mode) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Makefile | 1 + + 1 file changed, 1 insertion(+) +Merging arc-current/for-curr (0acdf63d2296 ARC: fpu: fix randconfig build error reported by 0-day test service) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 4 ++-- + arch/arc/configs/nps_defconfig | 2 -- + arch/arc/configs/nsimosci_defconfig | 2 -- + arch/arc/configs/nsimosci_hs_defconfig | 2 -- + arch/arc/configs/nsimosci_hs_smp_defconfig | 2 -- + arch/arc/include/asm/fpu.h | 2 ++ + 6 files changed, 4 insertions(+), 10 deletions(-) +Merging arm-current/fixes (6849b5eba196 ARM: 8955/1: virt: Relax arch timer version check during early boot) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (3bf3c9744694 bus: moxtet: fix potential stack buffer overflow) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (d91771848f0a arm64: time: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (6aabc1facdb2 m68k: Implement copy_thread_tls()) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (d4bf905307a1 powerpc: Fix CONFIG_TRACE_IRQFLAGS with CONFIG_VMAP_STACK) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (94e90f727f74 s390: make 'install' not depend on vmlinux) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/Makefile | 2 +- + arch/s390/boot/Makefile | 2 +- + arch/s390/boot/kaslr.c | 2 +- + arch/s390/configs/debug_defconfig | 28 +++++++++++++--------------- + arch/s390/configs/defconfig | 11 +++++------ + arch/s390/include/asm/page.h | 2 +- + drivers/s390/cio/blacklist.c | 5 +++-- + drivers/s390/cio/chp.c | 4 ++-- + drivers/s390/crypto/zcrypt_ep11misc.c | 4 ++-- + 9 files changed, 29 insertions(+), 31 deletions(-) +Merging sparc/master (11648b8339f8 sparc64: fix adjtimex regression) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (9a6a0dea1617 net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/bonding/bond_main.c | 55 ++++++++++++++++++++-- + drivers/net/bonding/bond_options.c | 2 + + drivers/net/dsa/b53/b53_common.c | 3 ++ + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 5 ++ + .../net/ethernet/aquantia/atlantic/aq_filters.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 2 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 8 ++-- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 13 +++-- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 10 ++-- + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 3 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 22 +++++---- + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 19 +++++++- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 12 +++++ + drivers/net/ethernet/cadence/macb_main.c | 6 ++- + drivers/net/ethernet/davicom/dm9000.c | 2 + + drivers/net/ethernet/micrel/ks8851_mll.c | 53 ++++----------------- + drivers/net/phy/mdio-bcm-iproc.c | 20 ++++++++ + drivers/net/wireguard/device.c | 7 +-- + drivers/net/wireguard/receive.c | 7 ++- + drivers/net/wireguard/send.c | 16 +++++-- + drivers/net/wireguard/socket.c | 1 - + drivers/nfc/pn544/pn544.c | 2 +- + include/linux/netdevice.h | 7 ++- + include/linux/skbuff.h | 30 ++++++++++++ + include/net/sock.h | 38 +++++++++++++-- + net/core/dev.c | 12 +++-- + net/core/fib_rules.c | 2 +- + net/core/rtnetlink.c | 26 +++++----- + net/core/skbuff.c | 2 - + net/ethtool/bitset.c | 3 ++ + net/ipv6/ip6_fib.c | 7 +-- + net/ipv6/route.c | 1 + + net/mptcp/Kconfig | 1 + + net/mptcp/protocol.c | 48 ++++++++----------- + net/rds/rdma.c | 24 +++++----- + tools/testing/selftests/net/fib_tests.sh | 6 +++ + .../testing/selftests/net/forwarding/mirror_gre.sh | 25 +++++----- + .../selftests/net/forwarding/vxlan_bridge_1d.sh | 6 +-- + tools/testing/selftests/wireguard/qemu/Makefile | 38 ++++++--------- + 39 files changed, 349 insertions(+), 197 deletions(-) +Merging bpf/master (e20d3a055a45 bpf, offload: Replace bitwise AND by logical AND in bpf_prog_offload_info_fill) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/btf.c | 6 +++--- + kernel/bpf/offload.c | 2 +- + net/xdp/xsk.c | 2 ++ + net/xdp/xsk_queue.h | 3 ++- + tools/testing/selftests/bpf/prog_tests/select_reuseport.c | 8 ++++++-- + tools/testing/selftests/bpf/prog_tests/sockmap_basic.c | 5 +++++ + 6 files changed, 19 insertions(+), 7 deletions(-) +Merging ipsec/master (a1a7e3a36e01 xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/Kconfig | 1 + + net/ipv4/ip_vti.c | 38 ++++++++++++++++++++++++++++++-------- + net/ipv6/ip6_vti.c | 32 +++++++++++++++++++++++++------- + net/xfrm/xfrm_device.c | 1 + + net/xfrm/xfrm_user.c | 6 +++++- + 5 files changed, 62 insertions(+), 16 deletions(-) +Merging netfilter/master (a7da92c2c8a1 netfilter: flowtable: skip offload setup if disabled) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nf_flow_table_offload.c | 6 +++--- + net/netfilter/xt_hashlimit.c | 22 ++++++++++++++++------ + 2 files changed, 19 insertions(+), 9 deletions(-) +Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (a9149d243f25 iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging mac80211/master (9a6a0dea1617 net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (685eff513183 IB/mlx5: Use div64_u64 for num_var_hw_entries calculation) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (a655e2b107d4 ALSA: hda/realtek - Apply quirk for MSI GP63, too) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/rawmidi.h | 6 +++--- + sound/core/seq/seq_clientmgr.c | 4 ++-- + sound/core/seq/seq_queue.c | 29 ++++++++++++++++++++++------- + sound/core/seq/seq_timer.c | 13 ++++++++++--- + sound/core/seq/seq_timer.h | 3 ++- + sound/pci/hda/patch_realtek.c | 1 + + 6 files changed, 40 insertions(+), 16 deletions(-) +Merging sound-asoc-fixes/for-linus (d7aa029b173b Merge branch 'asoc-5.6' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc-dapm.h | 2 - + sound/hda/ext/hdac_ext_controller.c | 9 +- + sound/soc/amd/raven/acp3x-i2s.c | 8 + + sound/soc/amd/raven/acp3x-pcm-dma.c | 7 +- + sound/soc/atmel/Kconfig | 4 +- + sound/soc/atmel/Makefile | 10 +- + sound/soc/codecs/max98090.c | 434 ++++++++++-------------------------- + sound/soc/codecs/max98090.h | 3 +- + sound/soc/fsl/fsl_sai.c | 22 +- + sound/soc/soc-dapm.c | 57 ++--- + sound/soc/sof/intel/hda-codec.c | 12 +- + sound/soc/sof/intel/hda-dsp.c | 11 + + sound/soc/sof/intel/hda.c | 19 +- + 13 files changed, 207 insertions(+), 391 deletions(-) +Merging regmap-fixes/for-linus (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (e361130b31aa Merge branch 'regulator-5.6' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (db33c6a8314b Merge branch 'spi-5.6' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-omap2-mcspi.c | 103 ++++++++++++++++---------- + include/linux/platform_data/spi-omap2-mcspi.h | 1 + + 2 files changed, 65 insertions(+), 39 deletions(-) +Merging pci-current/for-linus (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (ae91c9256549 debugfs: remove return value of debugfs_create_regset32()) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + Documentation/filesystems/debugfs.txt | 6 +++--- + fs/debugfs/file.c | 17 ++++------------- + include/linux/debugfs.h | 13 ++++++------- + 3 files changed, 13 insertions(+), 23 deletions(-) +Merging tty.current/tty-linus (07e6124a1a46 vt: selection, close sel_buffer race) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serdev/serdev-ttyport.c | 6 ++--- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 1 - + drivers/tty/serial/8250/8250_core.c | 5 ++--- + drivers/tty/serial/8250/8250_of.c | 1 - + drivers/tty/serial/8250/8250_port.c | 4 ++++ + drivers/tty/serial/ar933x_uart.c | 8 +++++++ + drivers/tty/serial/atmel_serial.c | 3 ++- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 1 + + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 18 +++++++++++---- + drivers/tty/serial/serial-tegra.c | 35 +++++++++++++---------------- + drivers/tty/tty_port.c | 5 +++-- + drivers/tty/vt/selection.c | 32 ++++++++++++++++++++------ + drivers/tty/vt/vt.c | 15 +++++++++++-- + drivers/tty/vt/vt_ioctl.c | 17 +++++++++----- + include/linux/tty.h | 2 ++ + 16 files changed, 104 insertions(+), 51 deletions(-) +Merging usb.current/usb-linus (bab5417f5f01 USB: misc: iowarrior: add support for the 100 device) +$ git merge usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 18 ++++----- + drivers/thunderbolt/switch.c | 7 ++++ + drivers/usb/core/config.c | 31 +++++++++------ + drivers/usb/core/hub.c | 20 +++++++--- + drivers/usb/core/hub.h | 1 + + drivers/usb/core/quirks.c | 40 +++++++++++++++++++ + drivers/usb/core/usb.h | 3 ++ + drivers/usb/dwc2/gadget.c | 40 +++++++++++-------- + drivers/usb/dwc3/debug.h | 39 +++++++------------ + drivers/usb/dwc3/gadget.c | 3 +- + drivers/usb/gadget/composite.c | 30 +++++++++----- + drivers/usb/gadget/function/f_fs.c | 5 ++- + drivers/usb/gadget/function/u_audio.c | 10 ++--- + drivers/usb/gadget/function/u_serial.c | 4 +- + drivers/usb/gadget/udc/udc-xilinx.c | 1 - + drivers/usb/host/xhci-hub.c | 25 ++++++++---- + drivers/usb/host/xhci-mem.c | 71 ++++++++++++++++++++++------------ + drivers/usb/host/xhci-pci.c | 10 +++-- + drivers/usb/host/xhci.h | 14 +++++-- + drivers/usb/misc/iowarrior.c | 31 ++++++++++++++- + drivers/usb/phy/phy-tegra-usb.c | 8 ++++ + drivers/usb/serial/ch341.c | 10 +++++ + drivers/usb/serial/ir-usb.c | 2 +- + drivers/usb/storage/uas.c | 23 ++++++++++- + include/linux/usb/quirks.h | 3 ++ + include/uapi/linux/usb/charger.h | 16 ++++---- + 26 files changed, 326 insertions(+), 139 deletions(-) +Merging usb-gadget-fixes/fixes (42cd5ffe46c1 usb: dwc3: debug: fix string position formatting mixup with ret and len) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (7c3d02285ad5 USB: serial: ch341: fix receiver regression) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (4f510aa10468 phy/rockchip: inno-hdmi: round clock rate down to closest 1000 Hz) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (9a4556bd8f23 staging: rtl8723bs: Remove unneeded goto statements) +$ git merge staging.current/staging-linus +Removing drivers/staging/android/vsoc.c +Removing drivers/staging/android/uapi/vsoc_shm.h +Merge made by the 'recursive' strategy. + drivers/staging/android/Kconfig | 8 - + drivers/staging/android/Makefile | 1 - + drivers/staging/android/TODO | 9 - + drivers/staging/android/ashmem.c | 28 + + drivers/staging/android/uapi/vsoc_shm.h | 295 ------ + drivers/staging/android/vsoc.c | 1149 ------------------------ + drivers/staging/greybus/audio_manager.c | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 40 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 5 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 47 +- + drivers/staging/vt6656/dpc.c | 2 +- + 11 files changed, 56 insertions(+), 1530 deletions(-) + delete mode 100644 drivers/staging/android/uapi/vsoc_shm.h + delete mode 100644 drivers/staging/android/vsoc.c +Merging char-misc.current/char-misc-linus (74ba569a15a0 Merge tag 'misc-habanalabs-fixes-2020-02-11' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus) +$ git merge char-misc.current/char-misc-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + COPYING | 2 + + .../process/embargoed-hardware-issues.rst | 8 ++-- + .../zh_CN/process/embargoed-hardware-issues.rst | 2 +- + MAINTAINERS | 22 +++++------ + drivers/fsi/Kconfig | 1 + + drivers/misc/habanalabs/device.c | 5 ++- + drivers/misc/habanalabs/goya/goya.c | 44 +++++++++++++++++++++- + 7 files changed, 65 insertions(+), 19 deletions(-) +Merging soundwire-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (da0f3e0201b8 MAINTAINERS: Sort entries in database for THUNDERBOLT) +$ git merge thunderbolt-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging input-current/for-linus (3dbae1553897 Input: cyapa - replace zero-length array with flexible-array member) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (c9cc0517bba9 crypto: chacha20poly1305 - prevent integer overflow on large input) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/tee/amdtee/Kconfig | 2 +- + lib/crypto/chacha20poly1305.c | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging ide/master (94f2630b1897 Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (9a0584f05687 selftests: openat2: fix build error on newer glibc) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 12 +++++++++-- + .../ftrace/test.d/ftrace/func-filter-pid.tc | 8 +------- + tools/testing/selftests/futex/functional/Makefile | 2 +- + tools/testing/selftests/lib.mk | 23 ++++++++++++---------- + tools/testing/selftests/net/Makefile | 4 ++-- + tools/testing/selftests/openat2/helpers.c | 2 +- + tools/testing/selftests/openat2/resolve_test.c | 2 +- + tools/testing/selftests/rtc/Makefile | 2 +- + tools/testing/selftests/timens/Makefile | 2 +- + tools/testing/selftests/tpm2/test_smoke.sh | 13 ++++++++++-- + tools/testing/selftests/tpm2/test_space.sh | 9 ++++++++- + 11 files changed, 50 insertions(+), 29 deletions(-) +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (2227ab4216cd dmaengine: idxd: Fix error handling in idxd_wq_cdev_dev_setup()) +$ git merge slave-dma-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/driver-api/dmaengine/client.rst | 14 ++++++++++---- + drivers/dma/idxd/cdev.c | 4 ++-- + drivers/dma/idxd/sysfs.c | 3 +++ + 3 files changed, 15 insertions(+), 6 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 (def9d2780727 Linux 5.5-rc7) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (1697d9812481 media: staging/intel-ipu3: remove TODO item about acronyms) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml | 6 +++++- + MAINTAINERS | 2 +- + drivers/reset/Kconfig | 3 ++- + 3 files changed, 8 insertions(+), 3 deletions(-) +Merging mips-fixes/mips-fixes (bef8e2dfceed MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()') +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/include/asm/sync.h | 4 +++- + arch/mips/kernel/vpe.c | 2 +- + arch/mips/vdso/Makefile | 28 +++++++++++++++++++++++++--- + 3 files changed, 29 insertions(+), 5 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 (b0b039515445 ARM: dts: am43x-epos-evm: set data pin directions for spi0 and spi1) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (ead68df94d24 KVM: x86: enable -Werror) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/x86/kvm/Makefile | 1 + + 1 file changed, 1 insertion(+) +Merging kvms390-fixes/master (fe33a928bfcd KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups) +$ git merge kvms390-fixes/master +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'recursive' strategy. +Merging hwmon-fixes/hwmon (11a48a5a18c6 Linux 5.6-rc2) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (96222d53842d dax: pass NOWAIT flag to iomap_apply) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (c4ebce2b0e30 Merge branch 'misc-5.6' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/inode.c | 2 -- + 1 file changed, 2 deletions(-) +Merging vfs-fixes/fixes (d0cb50185ae9 do_last(): fetch directory ->i_mode and ->i_uid before it's too late) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (04dbd86539fd dt-bindings: Fix paths in schema $id fields) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (11a48a5a18c6 Linux 5.6-rc2) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (dc35d7955e72 HACK: Revert "ACPI: PM: s2idle: Avoid possible race related to the EC GPE") +$ git merge drm-intel-fixes/for-linux-next-fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/acpi/sleep.c | 50 ++++++++-------------------- + drivers/gpu/drm/i915/Kconfig | 5 ++- + drivers/gpu/drm/i915/display/intel_ddi.c | 4 ++- + drivers/gpu/drm/i915/display/intel_display.c | 18 ++++++++++ + drivers/gpu/drm/i915/gem/i915_gem_context.c | 16 +++++++++ + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 3 ++ + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 3 ++ + drivers/gpu/drm/i915/gt/intel_lrc.c | 7 +++- + drivers/gpu/drm/i915/i915_gpu_error.c | 3 +- + drivers/gpu/drm/i915/i915_request.c | 21 ++++++++---- + drivers/gpu/drm/i915/i915_scheduler.c | 6 ++-- + drivers/gpu/drm/i915/i915_utils.c | 5 ++- + include/linux/suspend.h | 2 +- + kernel/power/suspend.c | 9 +++-- + 15 files changed, 92 insertions(+), 62 deletions(-) +Merging mmc-fixes/fixes (9051db381fab mmc: sdhci-msm: Mark sdhci_msm_cqe_disable static) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci-msm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (af42d3466bdc Linux 5.4-rc8) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (def9d2780727 Linux 5.5-rc7) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (0bef168e8859 exit: Fix Sparse errors and warnings) +$ git merge pidfd-fixes/fixes +Auto-merging kernel/fork.c +Merge made by the 'recursive' strategy. + kernel/exit.c | 4 ++-- + kernel/fork.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2) +$ git merge erofs-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (dde2bb2da01e drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 6 +++++- + drivers/gpu/drm/bridge/tc358767.c | 8 ++++---- + drivers/gpu/drm/bridge/ti-tfp410.c | 3 ++- + drivers/gpu/drm/drm_client_modeset.c | 3 ++- + drivers/gpu/drm/drm_modes.c | 7 +++++++ + drivers/gpu/drm/panfrost/panfrost_job.c | 6 +----- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 7 ++++++- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 11 ++++------- + drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 1 + + drivers/gpu/drm/selftests/test-drm_cmdline_parser.c | 15 +++++++++++++-- + 10 files changed, 45 insertions(+), 22 deletions(-) +Merging kspp-gustavo/for-next/kspp (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (0bf999f9c5e7 linux/pipe_fs_i.h: fix kernel-doc warnings after @wait was split) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (75467ee48a5e dma-direct: improve DMA mask overflow reporting) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + include/linux/swiotlb.h | 11 +++------ + kernel/dma/contiguous.c | 9 +++++++- + kernel/dma/direct.c | 61 ++++++++++++++++++++----------------------------- + kernel/dma/swiotlb.c | 42 +++++++++++++++++++--------------- + 4 files changed, 59 insertions(+), 64 deletions(-) +Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (29cd07a400ae 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 (e533dbe9dcb1 arm64: acpi: fix DAIF manipulation with pNMI) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (8703317ae576 drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (f07849b2ac77 ARM: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (7ef59ea6bce0 Merge branch 'v5.7/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 40 ++++ + arch/arm/mach-meson/Kconfig | 1 - + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 6 + + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 + + drivers/firmware/meson/meson_sm.c | 2 + + drivers/soc/amlogic/Kconfig | 13 ++ + drivers/soc/amlogic/Makefile | 1 + + drivers/soc/amlogic/meson-secure-pwrc.c | 204 +++++++++++++++++++++ + include/dt-bindings/power/meson-a1-power.h | 32 ++++ + include/linux/firmware/meson/meson_sm.h | 2 + + 10 files changed, 301 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml + create mode 100644 drivers/soc/amlogic/meson-secure-pwrc.c + create mode 100644 include/dt-bindings/power/meson-a1-power.h +$ git am -3 ../patches/soc-amlogic-fix-compile-failure-with-MESON_SECURE_PM_DOMAINS-MESON_SM.patch +Applying: soc: amlogic: fix compile failure with MESON_SECURE_PM_DOMAINS & !MESON_SM +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/soc/amlogic/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 3c8f1eaba4fa] Merge remote-tracking branch 'amlogic/for-next' + Date: Tue Feb 18 08:19:03 2020 +1100 +Merging aspeed/for-next (5a020d80bbef ARM: dts: aspeed: g4: add video engine support) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 74 ++++++++++ + .../boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 151 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 4 + + arch/arm/boot/dts/aspeed-g4.dtsi | 10 ++ + arch/arm/boot/dts/aspeed-g5.dtsi | 18 +++ + arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 25 ++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 79 +++++++++++ + 8 files changed, 362 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts +Merging at91/at91-next (1bf257001079 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi | 2 +- + arch/arm/boot/dts/at91-sam9x60ek.dts | 5 + + arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 2 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 2 +- + arch/arm/boot/dts/at91sam9x5dm.dtsi | 2 +- + arch/arm/boot/dts/sam9x60.dtsi | 8 ++ + arch/arm/configs/at91_dt_defconfig | 1 + + arch/arm/mach-at91/Kconfig | 1 - + arch/arm/mach-at91/pm.c | 35 ++++- + arch/arm/mach-at91/pm.h | 2 + + arch/arm/mach-at91/pm_data-offsets.c | 4 + + arch/arm/mach-at91/pm_suspend.S | 189 ++++++++++++++++++++++++-- + drivers/clk/at91/clk-sam9x60-pll.c | 91 +++++-------- + include/linux/clk/at91_pmc.h | 23 ++++ + 14 files changed, 288 insertions(+), 79 deletions(-) +Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (eb63d5e07b53 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Removing Documentation/devicetree/bindings/clock/imx8mq-clock.txt +Removing Documentation/devicetree/bindings/clock/imx8mm-clock.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 51 ++ + .../devicetree/bindings/clock/imx8mm-clock.txt | 29 - + .../devicetree/bindings/clock/imx8mm-clock.yaml | 68 ++ + .../devicetree/bindings/clock/imx8mn-clock.yaml | 48 +- + .../devicetree/bindings/clock/imx8mq-clock.txt | 20 - + .../devicetree/bindings/clock/imx8mq-clock.yaml | 72 ++ + arch/arm/boot/dts/imx25-pinfunc.h | 4 + + arch/arm/boot/dts/imx25.dtsi | 4 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 10 + + arch/arm/boot/dts/imx31.dtsi | 4 +- + arch/arm/boot/dts/imx35.dtsi | 4 +- + arch/arm/boot/dts/imx50.dtsi | 4 +- + arch/arm/boot/dts/imx51.dtsi | 4 +- + arch/arm/boot/dts/imx53.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 4 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 2 + + arch/arm/boot/dts/imx6dl.dtsi | 4 +- + arch/arm/boot/dts/imx6q-novena.dts | 2 +- + arch/arm/boot/dts/imx6q.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 31 + + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 1 - + arch/arm/boot/dts/imx6qdl.dtsi | 10 +- + arch/arm/boot/dts/imx6qp.dtsi | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 10 +- + arch/arm/boot/dts/imx6sll.dtsi | 4 +- + arch/arm/boot/dts/imx6sx.dtsi | 12 +- + arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 2 +- + arch/arm/boot/dts/imx6ul-pico.dtsi | 39 +- + arch/arm/boot/dts/imx6ul.dtsi | 12 +- + arch/arm/boot/dts/imx6ull.dtsi | 2 +- + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 5 + + arch/arm/boot/dts/imx7-colibri.dtsi | 187 ++++- + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 +- + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 26 + + arch/arm/boot/dts/imx7d.dtsi | 6 +- + arch/arm/boot/dts/imx7s.dtsi | 18 +- + arch/arm/boot/dts/imx7ulp-evk.dts | 3 +- + arch/arm/boot/dts/ls1021a.dtsi | 4 +- + arch/arm/boot/dts/vf500.dtsi | 4 +- + arch/arm/boot/dts/vf610-zii-cfu1.dts | 8 + + arch/arm/boot/dts/vf610-zii-dev.dtsi | 8 + + arch/arm/boot/dts/vf610-zii-spb4.dts | 8 + + arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 8 + + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 8 + + arch/arm/boot/dts/vfxxx.dtsi | 4 +- + arch/arm/configs/imx_v6_v7_defconfig | 3 + + arch/arm/mach-imx/Kconfig | 10 +- + arch/arm/mach-imx/Makefile | 2 + + arch/arm/mach-imx/common.h | 4 +- + arch/arm/mach-imx/gpc.c | 2 +- + arch/arm/mach-imx/mach-imx6q.c | 13 - + arch/arm/mach-imx/mach-imx6sl.c | 1 - + arch/arm/mach-imx/resume-imx6.S | 24 + + arch/arm/mach-imx/suspend-imx6.S | 14 - + arch/arm64/boot/dts/freescale/Makefile | 5 + + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 27 + + .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 106 +++ + .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 50 ++ + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 174 ++++ + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 11 + + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 231 +++++ + arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h | 931 +++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 608 ++++++++++++++ + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 12 + + arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts | 41 + + arch/arm64/boot/dts/freescale/s32v234.dtsi | 4 +- + arch/arm64/configs/defconfig | 1 + + drivers/clk/imx/clk-composite-8m.c | 20 +- + drivers/clk/imx/clk-fixup-div.c | 2 +- + drivers/clk/imx/clk-fixup-mux.c | 2 +- + drivers/clk/imx/clk-gate2.c | 6 +- + drivers/clk/imx/clk-imx6sl.c | 1 + + drivers/clk/imx/clk-imx7ulp.c | 2 +- + drivers/clk/imx/clk-imx8mm.c | 45 +- + drivers/clk/imx/clk-imx8mn.c | 23 +- + drivers/clk/imx/clk-imx8mp.c | 2 + + drivers/clk/imx/clk-imx8mq.c | 37 +- + drivers/clk/imx/clk-pll14xx.c | 2 + + drivers/clk/imx/clk.h | 13 +- + drivers/firmware/imx/scu-pd.c | 9 +- + drivers/soc/Makefile | 2 +- + drivers/soc/imx/Kconfig | 9 + + drivers/soc/imx/Makefile | 2 +- + drivers/soc/imx/gpcv2.c | 1 + + drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} | 0 + include/dt-bindings/clock/imx8mm-clock.h | 9 +- + include/dt-bindings/clock/imx8mn-clock.h | 10 +- + include/dt-bindings/clock/imx8mq-clock.h | 7 +- + 95 files changed, 2975 insertions(+), 288 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/imx8mm-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx8mm-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx8mq-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx8mq-clock.yaml + create mode 100644 arch/arm/mach-imx/resume-imx6.S + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var4.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp.dtsi + rename drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} (100%) +Merging keystone/next (a1766a49fc90 Merge tag 'drivers_soc_for_5.6' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (faf3024a8ea2 Merge branch 'v5.6-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + arch/arm/boot/dts/mt2701.dtsi | 2 +- + arch/arm/boot/dts/mt7623.dtsi | 2 +- + arch/arm/boot/dts/mt7629.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt6797.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 37 ++++++ + drivers/soc/mediatek/mtk-cmdq-helper.c | 1 + + drivers/soc/mediatek/mtk-pmic-wrap.c | 128 +++++++++++++++++++++ + 11 files changed, 175 insertions(+), 7 deletions(-) +Merging mvebu/for-next (c0d03b53ef47 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 (f9f5267ec296 Merge branch 'omap-for-v5.6/dt' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. +Merging qcom/for-next (bc50f20a31b1 Merge branches 'arm64-for-5.7', 'defconfig-for-5.7', 'drivers-for-5.7' and 'dts-for-5.7' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 71 ++++++++++++++++++++++ + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 25 ++++++++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 9 +++ + arch/arm/configs/qcom_defconfig | 4 ++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 8 +++ + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 7 ++- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 4 ++ + arch/arm64/configs/defconfig | 1 + + drivers/soc/qcom/qcom_aoss.c | 6 +- + drivers/soc/qcom/rpmh-internal.h | 1 + + drivers/soc/qcom/rpmh.c | 22 +++---- + include/soc/qcom/rpmh.h | 5 -- + 13 files changed, 144 insertions(+), 21 deletions(-) +Merging realtek/for-next (45698e00d5a9 Merge branch 'v5.6/dt' into next) +$ git merge realtek/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/realtek.yaml | 21 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 2 + + arch/arm/Kconfig | 2 + + arch/arm/Makefile | 3 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/rtd1195-horseradish.dts | 32 +++ + arch/arm/boot/dts/rtd1195-mele-x1000.dts | 32 +++ + arch/arm/boot/dts/rtd1195.dtsi | 217 +++++++++++++++++++ + arch/arm/mach-realtek/Kconfig | 11 + + arch/arm/mach-realtek/Makefile | 2 + + arch/arm/mach-realtek/rtd1195.c | 40 ++++ + arch/arm64/boot/dts/realtek/Makefile | 6 + + arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts | 6 +- + arch/arm64/boot/dts/realtek/rtd1293.dtsi | 12 +- + arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts | 6 +- + .../arm64/boot/dts/realtek/rtd1295-probox2-ava.dts | 6 +- + arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts | 30 +++ + arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 4 +- + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 21 +- + arch/arm64/boot/dts/realtek/rtd1296-ds418.dts | 4 +- + arch/arm64/boot/dts/realtek/rtd1296.dtsi | 8 +- + arch/arm64/boot/dts/realtek/rtd129x.dtsi | 221 +++++++++++++------- + arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts | 30 +++ + arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts | 36 ++++ + arch/arm64/boot/dts/realtek/rtd1395.dtsi | 65 ++++++ + arch/arm64/boot/dts/realtek/rtd139x.dtsi | 193 +++++++++++++++++ + arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts | 44 ++++ + arch/arm64/boot/dts/realtek/rtd1619.dtsi | 12 ++ + arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 229 +++++++++++++++++++++ + include/dt-bindings/reset/realtek,rtd1195.h | 74 +++++++ + include/dt-bindings/reset/realtek,rtd1295.h | 3 + + 32 files changed, 1268 insertions(+), 109 deletions(-) + create mode 100644 arch/arm/boot/dts/rtd1195-horseradish.dts + create mode 100644 arch/arm/boot/dts/rtd1195-mele-x1000.dts + create mode 100644 arch/arm/boot/dts/rtd1195.dtsi + create mode 100644 arch/arm/mach-realtek/Kconfig + create mode 100644 arch/arm/mach-realtek/Makefile + create mode 100644 arch/arm/mach-realtek/rtd1195.c + create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1395.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd139x.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1619.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd16xx.dtsi + create mode 100644 include/dt-bindings/reset/realtek,rtd1195.h +Merging renesas/next (c3f5f82f4dfc Merge branches 'renesas-arm-soc-for-v5.7' and 'renesas-drivers-for-v5.7' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r7s72100-gr-peach.dts | 3 +++ + arch/arm/boot/dts/r7s72100.dtsi | 5 +++-- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 7 ++----- + arch/arm/boot/dts/r8a7790-lager.dts | 1 + + arch/arm/boot/dts/r8a7790-stout.dts | 1 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 1 + + arch/arm/boot/dts/r8a7791-porter.dts | 1 + + arch/arm/boot/dts/r8a7793-gose.dts | 1 + + arch/arm/boot/dts/r8a7794-alt.dts | 1 + + arch/arm/boot/dts/r8a7794-silk.dts | 1 + + arch/arm/boot/dts/sh73a0-kzm9g.dts | 9 +++------ + arch/arm/mach-shmobile/setup-r8a7779.c | 1 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 1 - + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 ++- + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 3 ++- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 11 ++++++++++- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 9 +++++++++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 11 ++++++++++- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 3 ++- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 6 +++--- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 ++++++++++- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 11 ++++++++++- + drivers/soc/renesas/Kconfig | 2 ++ + drivers/soc/renesas/rcar-sysc.h | 4 ++-- + 28 files changed, 84 insertions(+), 31 deletions(-) +Merging reset/reset/next (4e0b9bc98c4a dt-bindings: reset: meson: add gxl internal dac reset) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + include/dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rockchip/for-next (152f9a049efc Merge branch 'v5.6-clk/fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-rockchip/rockchip.c | 2 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 43 +++++++++++-- + drivers/clk/rockchip/clk-pll.c | 70 +++++++++++++--------- + drivers/clk/rockchip/clk-rk3228.c | 17 ++---- + 6 files changed, 87 insertions(+), 53 deletions(-) +Merging samsung-krzk/for-next (735478fc8a89 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 9 ++++ + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 30 +++++++++++ + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 59 ++++++++++++++++++++++ + drivers/soc/samsung/exynos-chipid.c | 2 +- + 4 files changed, 99 insertions(+), 1 deletion(-) +Merging scmi/for-linux-next (11a48a5a18c6 Linux 5.6-rc2) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (8033917515c7 Merge branches 'sunxi/clk-for-5.7', 'sunxi/core-for-5.7' and 'sunxi/dt-for-5.7' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 11 + + .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + + .../media/allwinner,sun8i-h3-deinterlace.yaml | 6 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 11 +- + arch/arm/boot/dts/Makefile | 1 + + .../boot/dts/sun7i-a20-linutronix-testbox-v2.dts | 47 +++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 6 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 28 ++ + arch/arm/mach-sunxi/sunxi.c | 2 +- + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 17 + + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 95 +++-- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 460 +++++++++++++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 22 + + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 1 + + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 9 + + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 19 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 55 +++ + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 4 - + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 115 ++++-- + include/dt-bindings/clock/sun50i-a64-ccu.h | 2 +- + 21 files changed, 815 insertions(+), 98 deletions(-) + create mode 100644 arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts +Merging tegra/for-next (108f7e5e9478 Merge branch for-5.6/clk into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. +Merging clk/clk-next (931cfff0458a Merge branch 'clk-socfpga' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + drivers/clk/at91/Makefile | 3 + + drivers/clk/at91/at91sam9g45.c | 220 +++++++++++++++++++ + drivers/clk/at91/at91sam9n12.c | 238 ++++++++++++++++++++ + drivers/clk/at91/clk-usb.c | 9 +- + drivers/clk/at91/sam9x60.c | 14 +- + drivers/clk/at91/sama5d3.c | 240 +++++++++++++++++++++ + drivers/clk/clk-si5341.c | 212 ++++++++++++++++-- + drivers/clk/clk.c | 127 ++++++----- + drivers/clk/qcom/clk-alpha-pll.c | 17 +- + drivers/clk/qcom/clk-rpmh.c | 25 ++- + drivers/clk/qcom/dispcc-sc7180.c | 19 -- + drivers/clk/qcom/gpucc-sc7180.c | 37 ++++ + drivers/clk/qcom/videocc-sc7180.c | 2 +- + drivers/clk/samsung/clk.c | 4 - + drivers/clk/socfpga/clk-gate-s10.c | 40 ++-- + drivers/clk/socfpga/clk-periph-s10.c | 42 ++-- + drivers/clk/socfpga/clk-pll-s10.c | 17 +- + drivers/clk/socfpga/clk-s10.c | 29 +-- + drivers/clk/socfpga/stratix10-clk.h | 25 +-- + include/dt-bindings/clock/qcom,gpucc-sc7180.h | 3 +- + include/dt-bindings/clock/qcom,rpmh.h | 4 +- + include/linux/of_clk.h | 8 +- + 23 files changed, 1125 insertions(+), 211 deletions(-) + create mode 100644 drivers/clk/at91/at91sam9g45.c + create mode 100644 drivers/clk/at91/at91sam9n12.c + create mode 100644 drivers/clk/at91/sama5d3.c +Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (85ea1329d674 csky: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge csky/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/csky/Kconfig | 51 +++++++++- + arch/csky/Kconfig.platforms | 9 ++ + arch/csky/abiv1/inc/abi/cacheflush.h | 5 +- + arch/csky/abiv1/inc/abi/entry.h | 19 +++- + arch/csky/abiv2/cacheflush.c | 84 +++++++++++----- + arch/csky/abiv2/inc/abi/cacheflush.h | 33 ++++--- + arch/csky/abiv2/inc/abi/entry.h | 11 +++ + arch/csky/configs/defconfig | 8 -- + arch/csky/include/asm/Kbuild | 1 - + arch/csky/include/asm/cache.h | 1 + + arch/csky/include/asm/cacheflush.h | 1 + + arch/csky/include/asm/fixmap.h | 9 +- + arch/csky/include/asm/memory.h | 25 +++++ + arch/csky/include/asm/mmu.h | 1 + + arch/csky/include/asm/mmu_context.h | 2 + + arch/csky/include/asm/pci.h | 34 +++++++ + arch/csky/include/asm/pgtable.h | 6 +- + arch/csky/include/asm/stackprotector.h | 29 ++++++ + arch/csky/include/asm/tcm.h | 24 +++++ + arch/csky/include/uapi/asm/unistd.h | 3 + + arch/csky/kernel/atomic.S | 8 +- + arch/csky/kernel/process.c | 13 ++- + arch/csky/kernel/setup.c | 5 +- + arch/csky/kernel/smp.c | 2 +- + arch/csky/kernel/time.c | 2 +- + arch/csky/kernel/vmlinux.lds.S | 49 ++++++++++ + arch/csky/mm/Makefile | 3 + + arch/csky/mm/cachev1.c | 5 + + arch/csky/mm/cachev2.c | 45 +++++---- + arch/csky/mm/highmem.c | 64 +------------ + arch/csky/mm/init.c | 92 ++++++++++++++++++ + arch/csky/mm/syscache.c | 13 +-- + arch/csky/mm/tcm.c | 169 +++++++++++++++++++++++++++++++++ + 34 files changed, 663 insertions(+), 164 deletions(-) + create mode 100644 arch/csky/Kconfig.platforms + create mode 100644 arch/csky/include/asm/memory.h + create mode 100644 arch/csky/include/asm/pci.h + create mode 100644 arch/csky/include/asm/stackprotector.h + create mode 100644 arch/csky/include/asm/tcm.h + create mode 100644 arch/csky/mm/tcm.c +Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (240b62d381fe ia64: remove stale paravirt leftovers) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (dff527e7a0a8 m68k: Switch to asm-generic/hardirq.h) +$ git merge m68k/for-next +Removing arch/m68k/include/asm/hardirq.h +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.bus | 2 +- + arch/m68k/Kconfig.debug | 16 +-- + arch/m68k/Kconfig.machine | 8 +- + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/asm/hardirq.h | 29 ---- + arch/m68k/include/asm/mcf_pgalloc.h | 31 ++--- + arch/m68k/include/asm/motorola_pgalloc.h | 74 ++++------ + arch/m68k/include/asm/motorola_pgtable.h | 36 +++-- + arch/m68k/include/asm/page.h | 16 ++- + arch/m68k/include/asm/pgtable_mm.h | 10 +- + arch/m68k/mm/init.c | 34 +++-- + arch/m68k/mm/kmap.c | 36 +++-- + arch/m68k/mm/memory.c | 103 -------------- + arch/m68k/mm/motorola.c | 228 +++++++++++++++++++++++++------ + drivers/dio/dio-driver.c | 9 +- + drivers/video/fbdev/c2p_core.h | 12 +- + drivers/zorro/zorro-driver.c | 16 +-- + drivers/zorro/zorro.h | 7 + + include/linux/dio.h | 5 - + include/linux/zorro.h | 12 -- + 20 files changed, 338 insertions(+), 347 deletions(-) + delete mode 100644 arch/m68k/include/asm/hardirq.h +Merging m68knommu/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (6aa71ef9bcf9 microblaze: Add ID for Microblaze v11) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (2c4288719806 MIPS: PCI: Add detection of IOC3 on IO7, IO8, IO9 and Fuel) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (a7f96fce201c MAINTAINERS: add nds32 maintainer) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (051d75d3bb31 MAINTAINERS: Update Ley Foon Tan's email address) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (fc74d7166005 openrisc: use mmgrab) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + Documentation/openrisc/openrisc_port.rst | 4 ++-- + arch/openrisc/configs/or1ksim_defconfig | 1 - + arch/openrisc/configs/simple_smp_defconfig | 1 - + arch/openrisc/kernel/smp.c | 3 ++- + 4 files changed, 4 insertions(+), 5 deletions(-) +Merging parisc-hd/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (71c3a888cbca Merge tag 'powerpc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ 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 (6e62bd36e9ad soc: fsl: qe: remove set but not used variable 'mm_gc') +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (b2389902f6fd riscv: Use flush_icache_mm for flush_icache_user_range) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + arch/riscv/include/asm/cacheflush.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (c4f762ff6b77 s390/zcrypt: Support for CCA protected key block version 2) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/kernel/perf_cpum_sf.c | 40 +++++++++++++++++++----------------- + drivers/s390/crypto/zcrypt_ccamisc.c | 25 +++++++++++----------- + 2 files changed, 34 insertions(+), 31 deletions(-) +Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay) +$ git merge sh/sh-next +Merge made by the 'recursive' strategy. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/kernel/Makefile | 2 -- + arch/sh/kernel/sh_ksyms_32.c | 17 +++++++++++++++++ + arch/sh/lib/delay.c | 1 + + 5 files changed, 22 insertions(+), 8 deletions(-) +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (d65197ad5249 um: Fix time-travel=inf-cpu with xor/raid6) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (362961f4063f Merge branch 'xtensa-5.6-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (edc440e3d27f fscrypt: improve format of no-key names) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret') +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (455808a18dbf Merge branch 'for-next-next-v5.6-20200211' into for-next-20200211) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 160 ++++++---- + fs/btrfs/block-group.c | 85 ++++-- + fs/btrfs/block-rsv.c | 92 ++++++ + fs/btrfs/btrfs_inode.h | 6 + + fs/btrfs/check-integrity.c | 215 ++++--------- + fs/btrfs/check-integrity.h | 2 - + fs/btrfs/ctree.c | 63 +--- + fs/btrfs/ctree.h | 51 ++-- + fs/btrfs/delalloc-space.c | 102 +++++++ + fs/btrfs/delayed-inode.c | 5 +- + fs/btrfs/dev-replace.c | 40 +++ + fs/btrfs/disk-io.c | 710 ++++++++++++++++++++++--------------------- + fs/btrfs/disk-io.h | 38 +-- + fs/btrfs/export.c | 7 +- + fs/btrfs/export.h | 5 + + fs/btrfs/extent-io-tree.h | 4 +- + fs/btrfs/extent-tree.c | 125 +++----- + fs/btrfs/extent_io.c | 62 ++-- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/file-item.c | 91 ++++++ + fs/btrfs/file.c | 23 +- + fs/btrfs/free-space-cache.c | 49 +-- + fs/btrfs/free-space-cache.h | 1 + + fs/btrfs/free-space-tree.c | 2 +- + fs/btrfs/inode.c | 94 ++++-- + fs/btrfs/ioctl.c | 213 +++++++++---- + fs/btrfs/locking.c | 129 ++++++++ + fs/btrfs/locking.h | 21 ++ + fs/btrfs/ordered-data.c | 140 +-------- + fs/btrfs/ordered-data.h | 10 +- + fs/btrfs/qgroup.c | 4 +- + fs/btrfs/relocation.c | 116 +++++-- + fs/btrfs/root-tree.c | 37 +-- + fs/btrfs/scrub.c | 5 +- + fs/btrfs/send.c | 21 +- + fs/btrfs/space-info.c | 147 +++++++++ + fs/btrfs/super.c | 29 +- + fs/btrfs/tests/btrfs-tests.c | 30 +- + fs/btrfs/transaction.c | 28 +- + fs/btrfs/transaction.h | 13 + + fs/btrfs/tree-log.c | 88 ++++-- + fs/btrfs/volumes.c | 68 ++--- + fs/btrfs/volumes.h | 3 +- + include/trace/events/btrfs.h | 5 +- + include/uapi/linux/btrfs.h | 8 +- + 45 files changed, 1911 insertions(+), 1240 deletions(-) +Merging ceph/master (3b20bc2fe4c0 ceph: noacl mount option is effectively ignored) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (0fc6b1c269d1 cifs: plumb smb2 POSIX dir enumeration) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifspdu.h | 1 + + fs/cifs/readdir.c | 82 ++++++++++++++++++++++++++++++ + fs/cifs/smb2pdu.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++---- + fs/cifs/smb2pdu.h | 53 ++++++++++++++++++-- + fs/cifs/smb2proto.h | 2 + + 5 files changed, 266 insertions(+), 14 deletions(-) +Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (2c2a7552dd64 ecryptfs: replace BUG_ON with error handling code) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/keystore.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + fs/ecryptfs/crypto.c | 6 ++++-- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/messaging.c | 3 ++- + 6 files changed, 11 insertions(+), 8 deletions(-) +Merging erofs/dev (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge erofs/dev +Already up to date. +Merging ext3/for_next (daf1cd925487 Pull macro cleanup patches.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (c96dceeabf76 jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (b19e8c684703 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (da3a3da4e6c6 fs-verity: use u64_to_user_ptr()) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (3e8cb8b2eaeb fuse: fix stack use after return) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 6 +++--- + fs/fuse/fuse_i.h | 2 ++ + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging jfs/jfs-next (802a5017ffb2 jfs: remove unused MAXL2PAGES) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (11a48a5a18c6 Linux 5.6-rc2) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (5d63944f8206 NFSv4: Ensure the delegation cred is pinned when we call delegreturn) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (3d96208c30f8 sunrpc: expiry_time should be seconds not timeval) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (9f198a2ac543 help_next should increase position index) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (a4ac9d45c0cd ovl: fix lseek overflow on 32bit) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (fe357dbae113 ubi: Fix an error pointer dereference in error handling code) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. +Merging v9fs/9p-next (79fb9216b7be 9p: Remove unneeded semicolon) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + fs/9p/Kconfig | 20 ++++++++++---------- + fs/9p/vfs_inode.c | 2 +- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging xfs/for-next (cdbcf82b86ea xfs: fix xfs_buf_ioerror_alert location reporting) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (243145bc4336 fs: Fix page_mkwrite off-by-one errors) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (3253d9d09337 splice: only read in as much information as there is pipe buffer space) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (98ca480a8f22 locks: print unsigned ino in /proc/locks) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (0fd169576648 fs: Add VirtualBox guest shared folder (vboxsf) support) +$ git merge vfs/for-next +Already up to date. +Merging printk/for-next (f93598b8c76f Merge branch 'for-5.7' into for-next) +$ git merge printk/for-next +Auto-merging include/linux/console.h +Merge made by the 'recursive' strategy. + drivers/accessibility/braille/braille_console.c | 4 -- + include/linux/console.h | 1 + + kernel/printk/printk.c | 55 ++++++++++++++----------- + 3 files changed, 33 insertions(+), 27 deletions(-) +Merging pci/next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (e163fdb3f7f8 pstore/ram: Regularize prz label allocation lifetime) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (9d7e22b27ba7 Merge branch 'for-5.6/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-alps.c | 2 +- + drivers/hid/hid-apple.c | 3 ++- + drivers/hid/hid-core.c | 4 ++- + drivers/hid/hid-ite.c | 5 ++-- + drivers/hid/hid-logitech-dj.c | 2 ++ + drivers/hid/hid-logitech-hidpp.c | 43 ++++++++++++++++---------------- + drivers/hid/hid-quirks.c | 3 --- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++++++ + drivers/hid/usbhid/hiddev.c | 2 +- + include/linux/hid.h | 2 +- + 10 files changed, 42 insertions(+), 32 deletions(-) +Merging i2c/i2c/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (3952cf8ff2f7 i3c: master: dw: reattach device on first available location of address table) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (6eaaa9e89719 firmware/dmi: Report DMI Bios & EC firmware release) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 6 ++++++ + drivers/firmware/dmi_scan.c | 30 ++++++++++++++++++++++++++++++ + include/linux/mod_devicetable.h | 2 ++ + scripts/mod/file2alias.c | 2 ++ + 4 files changed, 40 insertions(+) +Merging hwmon-staging/hwmon-next (42db9602a033 hwmon: (pmbus/tps53679) Add documentation) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/hwmon/adi,axi-fan-control.yaml | 62 +++ + .../devicetree/bindings/hwmon/ltc2978.txt | 22 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/k10temp.rst | 29 +- + Documentation/hwmon/ltc2978.rst | 198 ++++++--- + Documentation/hwmon/pmbus-core.rst | 22 +- + Documentation/hwmon/pmbus.rst | 8 +- + Documentation/hwmon/tps53679.rst | 178 ++++++++ + MAINTAINERS | 8 + + drivers/hwmon/Kconfig | 9 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/axi-fan-control.c | 469 +++++++++++++++++++++ + drivers/hwmon/ibmaem.c | 2 +- + drivers/hwmon/k10temp.c | 60 +-- + drivers/hwmon/pmbus/Kconfig | 15 +- + drivers/hwmon/pmbus/adm1275.c | 37 +- + drivers/hwmon/pmbus/ibm-cffps.c | 15 +- + drivers/hwmon/pmbus/ir35221.c | 23 +- + drivers/hwmon/pmbus/isl68137.c | 3 +- + drivers/hwmon/pmbus/lm25066.c | 39 +- + drivers/hwmon/pmbus/ltc2978.c | 130 +++++- + drivers/hwmon/pmbus/ltc3815.c | 20 +- + drivers/hwmon/pmbus/max16064.c | 7 +- + drivers/hwmon/pmbus/max20730.c | 3 +- + drivers/hwmon/pmbus/max31785.c | 6 +- + drivers/hwmon/pmbus/max34440.c | 25 +- + drivers/hwmon/pmbus/max8688.c | 17 +- + drivers/hwmon/pmbus/pmbus.c | 4 +- + drivers/hwmon/pmbus/pmbus.h | 20 +- + drivers/hwmon/pmbus/pmbus_core.c | 119 ++++-- + drivers/hwmon/pmbus/tps53679.c | 172 +++++++- + drivers/hwmon/pmbus/ucd9000.c | 2 +- + drivers/hwmon/pmbus/zl6100.c | 5 +- + 33 files changed, 1464 insertions(+), 267 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml + create mode 100644 Documentation/hwmon/tps53679.rst + create mode 100644 drivers/hwmon/axi-fan-control.c +Merging jc_docs/docs-next (2e5b1886e9ba Documentation: bootconfig: fix Sphinx block warning) +$ git merge jc_docs/docs-next +Removing Documentation/filesystems/nfs/nfs41-server.txt +Merge made by the 'recursive' strategy. + .../ABI/{testing => removed}/sysfs-kernel-uids | 2 +- + Documentation/admin-guide/blockdev/zram.rst | 2 - + Documentation/admin-guide/bootconfig.rst | 2 +- + Documentation/admin-guide/sysctl/kernel.rst | 1 + + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/nfs/index.rst | 13 ++ + .../nfs/{knfsd-stats.txt => knfsd-stats.rst} | 17 +- + Documentation/filesystems/nfs/nfs41-server.rst | 256 +++++++++++++++++++++ + Documentation/filesystems/nfs/nfs41-server.txt | 173 -------------- + .../filesystems/nfs/{pnfs.txt => pnfs.rst} | 25 +- + .../nfs/{rpc-cache.txt => rpc-cache.rst} | 136 ++++++----- + .../nfs/{rpc-server-gss.txt => rpc-server-gss.rst} | 19 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + 13 files changed, 384 insertions(+), 264 deletions(-) + rename Documentation/ABI/{testing => removed}/sysfs-kernel-uids (91%) + create mode 100644 Documentation/filesystems/nfs/index.rst + rename Documentation/filesystems/nfs/{knfsd-stats.txt => knfsd-stats.rst} (95%) + create mode 100644 Documentation/filesystems/nfs/nfs41-server.rst + delete mode 100644 Documentation/filesystems/nfs/nfs41-server.txt + rename Documentation/filesystems/nfs/{pnfs.txt => pnfs.rst} (87%) + rename Documentation/filesystems/nfs/{rpc-cache.txt => rpc-cache.rst} (66%) + rename Documentation/filesystems/nfs/{rpc-server-gss.txt => rpc-server-gss.rst} (92%) +Merging v4l-dvb/master (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4) +$ 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 (00b838d60ec4 Merge branch 'pm-qos' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 + + Documentation/admin-guide/pm/cpuidle.rst | 73 ++-- + Documentation/power/pm_qos_interface.rst | 86 ++-- + Documentation/trace/events-power.rst | 21 +- + arch/x86/platform/intel/iosf_mbi.c | 13 +- + drivers/acpi/Kconfig | 24 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_watchdog.c | 15 +- + drivers/acpi/button.c | 3 - + drivers/acpi/tiny-power-button.c | 46 ++ + drivers/cpuidle/cpuidle.c | 40 +- + drivers/cpuidle/governor.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 4 +- + drivers/gpu/drm/i915/i915_drv.c | 12 +- + drivers/gpu/drm/i915/intel_sideband.c | 5 +- + drivers/hsi/clients/cmt_speech.c | 9 +- + drivers/media/pci/saa7134/saa7134-video.c | 5 +- + drivers/media/platform/via-camera.c | 4 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 14 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 13 +- + drivers/net/wireless/ath/ath10k/core.c | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 10 +- + drivers/spi/spi-fsl-qspi.c | 4 +- + drivers/tty/serial/8250/8250_omap.c | 13 +- + drivers/tty/serial/omap-serial.c | 15 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 12 +- + drivers/watchdog/wdat_wdt.c | 25 +- + include/acpi/actypes.h | 3 +- + include/acpi/button.h | 4 + + include/linux/pm_qos.h | 81 ++-- + include/trace/events/power.h | 59 +-- + kernel/power/qos.c | 557 +++++++----------------- + sound/core/pcm_native.c | 14 +- + sound/soc/intel/atom/sst/sst.c | 5 +- + sound/soc/intel/atom/sst/sst_loader.c | 4 +- + sound/soc/ti/omap-dmic.c | 7 +- + sound/soc/ti/omap-mcbsp.c | 16 +- + sound/soc/ti/omap-mcpdm.c | 16 +- + 38 files changed, 522 insertions(+), 721 deletions(-) + create mode 100644 drivers/acpi/tiny-power-button.c +Merging cpufreq-arm/cpufreq/arm/linux-next (a30f8a91f3c2 cpufreq: imx-cpufreq-dt: Add "cpu-supply" property check) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/imx-cpufreq-dt.c | 3 +++ + drivers/cpufreq/imx6q-cpufreq.c | 3 +++ + drivers/cpufreq/ti-cpufreq.c | 7 +++++++ + 3 files changed, 13 insertions(+) +Merging cpupower/cpupower (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (eefb85077bfe ARM: configs: Build BCM2711 thermal as module) +$ git merge thermal/thermal/linux-next +Auto-merging drivers/thermal/of-thermal.c +Auto-merging drivers/thermal/intel/intel_pch_thermal.c +Auto-merging drivers/thermal/cpufreq_cooling.c +Auto-merging drivers/thermal/armada_thermal.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/bcm2711.dtsi +Auto-merging MAINTAINERS +CONFLICT (add/add): Merge conflict in Documentation/driver-api/thermal/cpu-idle-cooling.rst +Auto-merging Documentation/driver-api/thermal/cpu-idle-cooling.rst +CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml +Auto-merging Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml +Resolved 'Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml' using previous resolution. +Resolved 'Documentation/driver-api/thermal/cpu-idle-cooling.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f37ceee6d699] Merge remote-tracking branch 'thermal/thermal/linux-next' +$ git diff -M --stat --summary HEAD^.. +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 (a48f9721e6db dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (beb205dd67aa RDMA/siw: Fix setting active_mtu attribute) +$ git merge rdma/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 100 +++--- + drivers/infiniband/core/cma_configfs.c | 6 +- + drivers/infiniband/core/cma_priv.h | 6 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 12 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 491 +++++++--------------------- + drivers/infiniband/hw/hns/hns_roce_qp.c | 23 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 3 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 18 +- + drivers/infiniband/sw/siw/siw_verbs.c | 2 +- + 9 files changed, 195 insertions(+), 466 deletions(-) +Merging net-next/master (92df9f8a745e Merge branch 'mvneta-xdp-ethtool-stats') +$ git merge net-next/master +Merge made by the 'recursive' strategy. + drivers/net/dsa/bcm_sf2.c | 3 + + drivers/net/dsa/bcm_sf2_regs.h | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 32 +- + drivers/net/dsa/mv88e6xxx/chip.h | 5 + + drivers/net/dsa/mv88e6xxx/serdes.c | 77 +++++ + drivers/net/dsa/mv88e6xxx/serdes.h | 5 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 11 + + drivers/net/ethernet/intel/ice/ice_base.c | 43 ++- + drivers/net/ethernet/intel/ice/ice_base.h | 4 +- + drivers/net/ethernet/intel/ice/ice_common.c | 4 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 6 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 2 + + drivers/net/ethernet/intel/ice/ice_lib.c | 98 +++++-- + drivers/net/ethernet/intel/ice/ice_lib.h | 6 +- + drivers/net/ethernet/intel/ice/ice_main.c | 33 ++- + drivers/net/ethernet/intel/ice/ice_sriov.c | 2 - + drivers/net/ethernet/intel/ice/ice_switch.c | 4 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 5 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 341 ++++++++++++++-------- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 12 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 12 +- + drivers/net/ethernet/marvell/mvneta.c | 227 ++++++++++---- + drivers/net/ethernet/natsemi/jazzsonic.c | 31 +- + drivers/net/ethernet/natsemi/macsonic.c | 48 +-- + drivers/net/ethernet/natsemi/sonic.c | 66 +++-- + drivers/net/ethernet/natsemi/sonic.h | 2 +- + drivers/net/ethernet/natsemi/xtsonic.c | 40 +-- + drivers/net/ethernet/realtek/r8169_main.c | 187 +++++------- + drivers/net/ethernet/renesas/sh_eth.c | 104 ++----- + drivers/net/ethernet/renesas/sh_eth.h | 2 +- + drivers/net/phy/Makefile | 3 +- + drivers/net/phy/linkmode.c | 95 ++++++ + drivers/net/phy/phy_device.c | 43 ++- + drivers/net/phy/phylink.c | 162 ++++++---- + drivers/net/wireless/ath/ath10k/mac.c | 3 +- + drivers/net/wireless/ath/ath9k/main.c | 3 + + drivers/net/wireless/ath/ath9k/xmit.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 11 +- + drivers/ptp/ptp_qoriq.c | 29 +- + include/linux/fsl/ptp_qoriq.h | 2 - + include/linux/ieee80211.h | 26 +- + include/linux/linkmode.h | 8 +- + include/linux/phy.h | 3 + + include/linux/phylink.h | 34 ++- + include/net/cfg80211.h | 63 +++- + include/net/mac80211.h | 40 ++- + include/uapi/linux/nl80211.h | 80 ++++- + include/uapi/linux/openvswitch.h | 7 + + include/uapi/linux/tcp.h | 2 + + include/uapi/linux/wireless.h | 5 +- + lib/objagg.c | 4 +- + net/ipv4/tcp.c | 21 +- + net/mac80211/cfg.c | 106 +------ + net/mac80211/debugfs.c | 56 +++- + net/mac80211/debugfs_netdev.c | 13 +- + net/mac80211/debugfs_sta.c | 6 +- + net/mac80211/he.c | 4 + + net/mac80211/ht.c | 64 ++-- + net/mac80211/ieee80211_i.h | 28 +- + net/mac80211/iface.c | 82 +++++- + net/mac80211/key.c | 19 +- + net/mac80211/main.c | 33 ++- + net/mac80211/mlme.c | 139 ++++++--- + net/mac80211/rx.c | 14 +- + net/mac80211/sta_info.c | 16 +- + net/mac80211/status.c | 91 +++++- + net/mac80211/tx.c | 177 ++++++++++- + net/mac80211/util.c | 83 ++++-- + net/mac80211/vht.c | 58 +++- + net/mac80211/wep.c | 4 +- + net/mac80211/wep.h | 2 +- + net/openvswitch/actions.c | 67 +++++ + net/openvswitch/flow_netlink.c | 70 +++++ + net/vmw_vsock/virtio_transport_common.c | 1 + + net/wireless/core.h | 2 +- + net/wireless/mlme.c | 33 ++- + net/wireless/nl80211.c | 109 ++++++- + net/wireless/rdev-ops.h | 8 +- + net/wireless/reg.c | 2 + + net/wireless/trace.h | 27 +- + net/x25/x25_forward.c | 12 +- + tools/testing/vsock/vsock_test.c | 77 +++++ + 83 files changed, 2421 insertions(+), 1048 deletions(-) + create mode 100644 drivers/net/phy/linkmode.c +Merging bpf-next/master (92df9f8a745e Merge branch 'mvneta-xdp-ethtool-stats') +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (fdfa3a6778b1 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/se.c +CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5b59ccfe66e9] Merge remote-tracking branch 'nfc-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 3 +-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 25 insertions(+), 52 deletions(-) +Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (932183aa35c6 mwifiex: change license text from MARVELL to NXP) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/wireless/ti,wl1251.txt | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 + + .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + + drivers/net/wireless/marvell/mwifiex/11ac.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11ac.h | 8 +- + drivers/net/wireless/marvell/mwifiex/11h.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11n.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11n.h | 8 +- + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11n_aggr.h | 8 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 8 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.h | 8 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.h | 8 +- + drivers/net/wireless/marvell/mwifiex/cfp.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 8 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 8 +- + drivers/net/wireless/marvell/mwifiex/decl.h | 8 +- + drivers/net/wireless/marvell/mwifiex/ethtool.c | 8 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 8 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 8 +- + drivers/net/wireless/marvell/mwifiex/init.c | 8 +- + drivers/net/wireless/marvell/mwifiex/ioctl.h | 8 +- + drivers/net/wireless/marvell/mwifiex/join.c | 8 +- + drivers/net/wireless/marvell/mwifiex/main.c | 8 +- + drivers/net/wireless/marvell/mwifiex/main.h | 8 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 8 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 6 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sdio.h | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_rx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_tx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 9 +- + drivers/net/wireless/marvell/mwifiex/txrx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 8 +- + drivers/net/wireless/marvell/mwifiex/uap_event.c | 8 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 8 +- + drivers/net/wireless/marvell/mwifiex/usb.h | 6 +- + drivers/net/wireless/marvell/mwifiex/util.c | 8 +- + drivers/net/wireless/marvell/mwifiex/util.h | 8 +- + drivers/net/wireless/marvell/mwifiex/wmm.c | 8 +- + drivers/net/wireless/marvell/mwifiex/wmm.h | 8 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 64 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 651 +++++++++------------ + drivers/net/wireless/quantenna/qtnfmac/commands.h | 4 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 47 +- + drivers/net/wireless/quantenna/qtnfmac/core.h | 26 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 67 +-- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 329 ++++++++--- + .../net/wireless/quantenna/qtnfmac/qlink_util.h | 45 +- + drivers/net/wireless/realtek/rtw88/bf.c | 6 +- + drivers/net/wireless/realtek/rtw88/coex.c | 3 + + drivers/net/wireless/realtek/rtw88/fw.c | 11 +- + drivers/net/wireless/realtek/rtw88/hci.h | 26 + + drivers/net/wireless/realtek/rtw88/mac.c | 25 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 37 +- + drivers/net/wireless/realtek/rtw88/main.c | 19 +- + drivers/net/wireless/realtek/rtw88/main.h | 32 +- + drivers/net/wireless/realtek/rtw88/pci.c | 9 +- + drivers/net/wireless/realtek/rtw88/pci.h | 1 + + drivers/net/wireless/realtek/rtw88/phy.c | 10 - + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 30 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 50 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 5 + + drivers/net/wireless/rsi/rsi_91x_sdio.c | 9 +- + drivers/net/wireless/ti/wl1251/sdio.c | 32 +- + 75 files changed, 981 insertions(+), 927 deletions(-) +Merging bluetooth/master (e22998f53a1e Bluetooth: Fix a typo in Kconfig) +$ git merge bluetooth/master +Auto-merging Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 2 + + drivers/bluetooth/Kconfig | 2 +- + drivers/bluetooth/btintel.c | 4 +- + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/hci_ag6xx.c | 2 +- + drivers/bluetooth/hci_intel.c | 2 +- + drivers/bluetooth/hci_qca.c | 14 ++- + include/net/bluetooth/bluetooth.h | 17 ++++ + include/net/bluetooth/hci_core.h | 2 + + net/bluetooth/hci_conn.c | 107 +++++++++++++++++++++ + net/bluetooth/hci_event.c | 10 ++ + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap_core.c | 26 ++--- + net/bluetooth/l2cap_sock.c | 31 +++++- + net/bluetooth/rfcomm/core.c | 3 - + net/bluetooth/sco.c | 13 +++ + net/bluetooth/smp.c | 23 ++++- + 17 files changed, 235 insertions(+), 26 deletions(-) +Merging mac80211-next/master (92df9f8a745e Merge branch 'mvneta-xdp-ethtool-stats') +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (6e5e41e2dc4e gfs2: fix O_SYNC write handling) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (4575243c5c17 Merge tag 'nand/for-5.6' into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (d85339d9ea26 mtd: onenand: Rename omap2 driver to avoid a build warning) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (8c79fa6c44de mtd: spi-nor: introduce SR_BP_SHIFT define) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/spi-nor.c | 22 +++++++++------------- + include/linux/mtd/spi-nor.h | 2 ++ + 2 files changed, 11 insertions(+), 13 deletions(-) +Merging crypto/master (7f19380b2cfd crypto: qce - handle AES-XTS cases that qce fails) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + arch/arm64/crypto/.gitignore | 1 + + arch/x86/crypto/curve25519-x86_64.c | 3546 ++++++++------------- + crypto/proc.c | 2 +- + crypto/rng.c | 8 +- + crypto/tcrypt.c | 4 +- + drivers/crypto/Kconfig | 23 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 4 +- + drivers/crypto/caam/qi.c | 60 +- + drivers/crypto/caam/qi.h | 4 +- + drivers/crypto/ccree/cc_aead.c | 1 + + drivers/crypto/ccree/cc_buffer_mgr.c | 76 +- + drivers/crypto/ccree/cc_buffer_mgr.h | 1 + + drivers/crypto/ccree/cc_cipher.c | 16 +- + drivers/crypto/chelsio/chcr_algo.c | 25 +- + drivers/crypto/chelsio/chcr_core.c | 1 + + drivers/crypto/chelsio/chcr_core.h | 3 +- + drivers/crypto/chelsio/chcr_crypto.h | 1 + + drivers/crypto/hisilicon/hpre/hpre_main.c | 108 +- + drivers/crypto/hisilicon/qm.c | 216 +- + drivers/crypto/hisilicon/qm.h | 25 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 162 +- + drivers/crypto/hisilicon/zip/zip_main.c | 183 +- + drivers/crypto/qce/common.c | 2 - + drivers/crypto/qce/common.h | 3 + + drivers/crypto/qce/dma.c | 11 +- + drivers/crypto/qce/dma.h | 2 +- + drivers/crypto/qce/skcipher.c | 30 +- + 27 files changed, 1815 insertions(+), 2703 deletions(-) +Merging drm/drm-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (05b5ff30d31f drm/amdgpu: drop legacy drm load and unload callbacks) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/bios/command_table2.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 69 +++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 81 ++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 81 +++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 25 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 36 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 15 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 44 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 51 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 98 ++++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 149 +++++++------ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 29 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 10 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 7 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 43 ++++ + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 69 ++++-- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 132 ++++++++++- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 225 +++++++++++++++---- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 34 ++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 64 ++++++ + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 241 ++++++++++++++++++++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 9 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 9 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 4 +- + .../amd/display/dc/bios/command_table_helper2.c | 13 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 155 +++++++++---- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 45 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 8 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 188 +++++++++++++++- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 56 ++--- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 193 +++++++++++------ + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 5 +- + drivers/gpu/drm/amd/display/dc/dc.h | 24 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 48 ++++ + drivers/gpu/drm/amd/display/dc/dc_link.h | 16 ++ + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 85 +++++--- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 8 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 43 ++-- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 67 +----- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 91 +++++--- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 2 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 5 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 89 +++----- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 7 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 3 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.h | 20 -- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 46 ++-- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.h | 7 - + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 35 ++- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 165 ++++++++++---- + .../drm/amd/display/dc/dml/display_mode_structs.h | 5 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 3 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 20 +- + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 4 +- + .../gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h | 74 +++++++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 48 ++++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 64 ++++++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 9 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 50 +++++ + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 8 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 49 ++--- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 11 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 4 - + .../amd/display/modules/hdcp/hdcp1_transition.c | 12 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- + .../amd/display/modules/hdcp/hdcp2_transition.c | 6 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 4 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 9 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 164 ++++++++------ + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 32 ++- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 2 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 75 +++++-- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 7 +- + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 4 +- + .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 4 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 8 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo.c | 26 +-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- + include/uapi/drm/amdgpu_drm.h | 10 +- + include/uapi/linux/kfd_ioctl.h | 19 +- + 140 files changed, 2946 insertions(+), 1124 deletions(-) + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h +Merging drm-intel/for-linux-next (8d6cae6fcde8 drm/i915/selftests: Mark the mock ring->vma as being in the GGTT) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_sideband.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_scheduler.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_scheduler.c +Auto-merging drivers/gpu/drm/i915/i915_request.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.h +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_active.h +Auto-merging drivers/gpu/drm/i915/i915_active.c +Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/mock_engine.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/mock_engine.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_types.h +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_context.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object_types.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/display/intel_dsi_vbt.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_ddi.c' +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_display.c' +Recorded preimage for 'drivers/gpu/drm/i915/gt/intel_context.c' +Recorded preimage for 'drivers/gpu/drm/i915/gt/intel_lrc.c' +Recorded preimage for 'drivers/gpu/drm/i915/gt/mock_engine.c' +Recorded preimage for 'drivers/gpu/drm/i915/gt/selftest_lrc.c' +Recorded preimage for 'drivers/gpu/drm/i915/i915_request.h' +Recorded preimage for 'drivers/gpu/drm/i915/i915_scheduler.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_ddi.c'. +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_display.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/intel_context.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/intel_lrc.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/mock_engine.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/selftest_lrc.c'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_request.h'. +Recorded resolution for 'drivers/gpu/drm/i915/i915_scheduler.c'. +[master f521c9234c58] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Kconfig | 7 - + drivers/gpu/drm/i915/Makefile | 13 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 383 +-- + drivers/gpu/drm/i915/display/intel_acpi.c | 89 + + drivers/gpu/drm/i915/display/intel_acpi.h | 5 + + drivers/gpu/drm/i915/display/intel_atomic.c | 57 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 5 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 73 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 247 +- + drivers/gpu/drm/i915/display/intel_bios.c | 443 ++- + drivers/gpu/drm/i915/display/intel_bios.h | 11 + + drivers/gpu/drm/i915/display/intel_bw.c | 63 +- + drivers/gpu/drm/i915/display/intel_bw.h | 4 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 995 ++++--- + drivers/gpu/drm/i915/display/intel_cdclk.h | 71 +- + drivers/gpu/drm/i915/display/intel_color.c | 210 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 163 +- + drivers/gpu/drm/i915/display/intel_connector.c | 5 +- + drivers/gpu/drm/i915/display/intel_crt.c | 126 +- + drivers/gpu/drm/i915/{ => display}/intel_csr.c | 31 +- + drivers/gpu/drm/i915/{ => display}/intel_csr.h | 0 + drivers/gpu/drm/i915/display/intel_ddi.c | 743 +++-- + drivers/gpu/drm/i915/display/intel_de.h | 72 + + drivers/gpu/drm/i915/display/intel_display.c | 2966 +++++++++++--------- + drivers/gpu/drm/i915/display/intel_display.h | 6 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 2120 ++++++++++++++ + .../gpu/drm/i915/display/intel_display_debugfs.h | 20 + + drivers/gpu/drm/i915/display/intel_display_power.c | 563 ++-- + drivers/gpu/drm/i915/display/intel_display_power.h | 5 + + drivers/gpu/drm/i915/display/intel_display_types.h | 51 +- + drivers/gpu/drm/i915/display/intel_dp.c | 590 ++-- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 169 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 75 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 33 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 108 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 677 ++--- + drivers/gpu/drm/i915/display/intel_dsb.c | 30 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 6 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 167 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 49 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 202 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 13 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 13 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 37 +- + drivers/gpu/drm/i915/display/intel_global_state.c | 223 ++ + drivers/gpu/drm/i915/display/intel_global_state.h | 87 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 77 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 398 +-- + drivers/gpu/drm/i915/display/intel_hdcp.h | 5 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 422 +-- + drivers/gpu/drm/i915/display/intel_hotplug.c | 110 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 16 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 64 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 221 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 57 +- + drivers/gpu/drm/i915/display/intel_panel.c | 374 +-- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 34 +- + drivers/gpu/drm/i915/display/intel_psr.c | 363 ++- + drivers/gpu/drm/i915/display/intel_quirks.c | 10 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 112 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 385 +-- + drivers/gpu/drm/i915/display/intel_tc.c | 51 +- + drivers/gpu/drm/i915/display/intel_tv.c | 164 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 2 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 443 +-- + drivers/gpu/drm/i915/display/intel_vga.c | 14 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 440 +-- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 96 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 352 +-- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 63 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 98 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 135 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 19 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 102 - + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 163 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 74 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 5 +- + drivers/gpu/drm/i915/gt/intel_context.c | 9 +- + drivers/gpu/drm/i915/gt/intel_context.h | 20 + + drivers/gpu/drm/i915/gt/intel_context_sseu.c | 98 + + drivers/gpu/drm/i915/gt/intel_context_types.h | 12 + + drivers/gpu/drm/i915/gt/intel_engine.h | 22 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 135 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 12 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 3 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 89 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 54 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 117 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.h | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 36 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 4 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 311 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 1 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 10 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 83 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 7 +- + drivers/gpu/drm/i915/gt/intel_ring.h | 8 + + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 87 +- + drivers/gpu/drm/i915/gt/intel_ring_types.h | 7 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 20 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 6 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 135 +- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 4 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 3 + + drivers/gpu/drm/i915/gt/selftest_lrc.c | 722 ++++- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 188 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 9 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 255 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 7 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 10 +- + drivers/gpu/drm/i915/gvt/handlers.c | 8 +- + drivers/gpu/drm/i915/i915_active.c | 15 +- + drivers/gpu/drm/i915/i915_active.h | 3 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 29 +- + drivers/gpu/drm/i915/i915_debugfs.c | 2277 +-------------- + drivers/gpu/drm/i915/i915_debugfs.h | 8 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 250 ++ + drivers/gpu/drm/i915/i915_debugfs_params.h | 14 + + drivers/gpu/drm/i915/i915_drv.c | 698 +---- + drivers/gpu/drm/i915/i915_drv.h | 83 +- + drivers/gpu/drm/i915/i915_gem.c | 26 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 13 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 31 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 5 + + drivers/gpu/drm/i915/i915_irq.c | 236 +- + drivers/gpu/drm/i915/i915_params.c | 11 +- + drivers/gpu/drm/i915/i915_params.h | 74 +- + drivers/gpu/drm/i915/i915_pci.c | 16 +- + drivers/gpu/drm/i915/i915_perf.c | 53 +- + drivers/gpu/drm/i915/i915_pmu.c | 6 +- + drivers/gpu/drm/i915/i915_reg.h | 38 +- + drivers/gpu/drm/i915/i915_request.c | 43 +- + drivers/gpu/drm/i915/i915_request.h | 2 +- + drivers/gpu/drm/i915/i915_scheduler.c | 2 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 17 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 19 +- + drivers/gpu/drm/i915/i915_trace.h | 66 +- + drivers/gpu/drm/i915/i915_vgpu.c | 41 +- + drivers/gpu/drm/i915/i915_vma.c | 61 +- + drivers/gpu/drm/i915/i915_vma.h | 2 + + drivers/gpu/drm/i915/intel_device_info.c | 37 +- + drivers/gpu/drm/i915/intel_device_info.h | 2 + + drivers/gpu/drm/i915/intel_gvt.c | 13 +- + drivers/gpu/drm/i915/intel_memory_region.c | 4 +- + drivers/gpu/drm/i915/intel_pch.c | 66 +- + drivers/gpu/drm/i915/intel_pm.c | 638 +++-- + drivers/gpu/drm/i915/intel_pm.h | 5 +- + drivers/gpu/drm/i915/intel_sideband.c | 11 +- + drivers/gpu/drm/i915/intel_uncore.c | 54 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 6 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 1 + + .../gpu/drm/i915/selftests/intel_memory_region.c | 203 ++ + drivers/gpu/drm/i915/vlv_suspend.c | 489 ++++ + drivers/gpu/drm/i915/vlv_suspend.h | 18 + + include/drm/drm_print.h | 29 + + 175 files changed, 14683 insertions(+), 10518 deletions(-) + rename drivers/gpu/drm/i915/{ => display}/intel_csr.c (96%) + rename drivers/gpu/drm/i915/{ => display}/intel_csr.h (100%) + create mode 100644 drivers/gpu/drm/i915/display/intel_de.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_debugfs.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_debugfs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_global_state.c + create mode 100644 drivers/gpu/drm/i915/display/intel_global_state.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_context_sseu.c + create mode 100644 drivers/gpu/drm/i915/i915_debugfs_params.c + create mode 100644 drivers/gpu/drm/i915/i915_debugfs_params.h + create mode 100644 drivers/gpu/drm/i915/vlv_suspend.c + create mode 100644 drivers/gpu/drm/i915/vlv_suspend.h +Merging drm-tegra/drm/tegra/for-next (98ae41adb252 gpu: host1x: Set DMA direction only for DMA-mapped buffer objects) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (e1cf35b94c5f drm/edid: fix building error) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (5f9935f514d6 drm/msm: Fix error about comments within a comment block) +$ 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 (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt | 1 + + 1 file changed, 1 insertion(+) +Merging regmap/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (2948f4a4e583 Merge branch 'topic/usb-uac2-effect-unit' into for-next) +$ git merge sound/for-next +Auto-merging sound/core/pcm_native.c +Merge made by the 'recursive' strategy. + include/linux/usb/audio-v2.h | 12 + + include/sound/pcm.h | 9 + + include/sound/pcm_params.h | 7 + + sound/core/info.c | 2 +- + sound/core/oss/pcm_oss.c | 23 +- + sound/core/oss/rate.c | 2 +- + sound/core/pcm_dmaengine.c | 2 +- + sound/core/pcm_misc.c | 17 +- + sound/core/pcm_native.c | 47 ++-- + sound/drivers/aloop.c | 6 +- + sound/drivers/dummy.c | 6 +- + sound/isa/sb/emu8000_pcm.c | 4 +- + sound/pci/ali5451/ali5451.c | 6 +- + sound/pci/emu10k1/emu10k1_main.c | 4 +- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_controller.c | 2 +- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/hda/patch_hdmi.c | 313 ++++++-------------- + sound/pci/rme9652/hdsp.c | 3 +- + sound/pci/via82xx.c | 6 +- + sound/pci/via82xx_modem.c | 6 +- + sound/usb/Makefile | 1 + + sound/usb/format.c | 37 +++ + sound/usb/midi.c | 2 +- + sound/usb/mixer.c | 16 ++ + sound/usb/mixer_quirks.c | 5 + + sound/usb/mixer_s1810c.c | 595 +++++++++++++++++++++++++++++++++++++++ + sound/usb/mixer_s1810c.h | 7 + + sound/usb/proc.c | 2 +- + sound/usb/quirks.c | 36 +++ + 30 files changed, 895 insertions(+), 287 deletions(-) + create mode 100644 sound/usb/mixer_s1810c.c + create mode 100644 sound/usb/mixer_s1810c.h +Merging sound-asoc/for-next (71d811152239 Merge branch 'asoc-5.7' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/core/pcm_dmaengine.c +Removing Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/amlogic,aiu.yaml | 111 ++++ + .../bindings/sound/amlogic,gx-sound-card.yaml | 113 ++++ + .../bindings/sound/google,cros-ec-codec.txt | 44 -- + .../bindings/sound/google,cros-ec-codec.yaml | 62 +++ + drivers/gpu/drm/mediatek/mtk_hdmi.c | 54 +- + drivers/spi/Kconfig | 2 +- + include/dt-bindings/sound/meson-aiu.h | 18 + + include/sound/soc-component.h | 7 +- + include/sound/soc-dai.h | 5 +- + include/sound/soc-dapm.h | 5 + + sound/core/pcm_dmaengine.c | 8 +- + sound/soc/amd/raven/pci-acp3x.c | 23 - + sound/soc/codecs/Kconfig | 608 ++++++++++++--------- + sound/soc/codecs/cros_ec_codec.c | 25 +- + sound/soc/codecs/hdmi-codec.c | 10 + + sound/soc/codecs/max98357a.c | 36 +- + sound/soc/codecs/mt6660.c | 1 - + sound/soc/codecs/rl6231.c | 1 + + sound/soc/codecs/rl6231.h | 2 +- + sound/soc/codecs/rt1015.c | 6 +- + sound/soc/codecs/rt5659.c | 2 +- + sound/soc/codecs/rt5682.c | 359 ++++++++---- + sound/soc/codecs/rt5682.h | 45 +- + sound/soc/codecs/wcd934x.c | 23 +- + sound/soc/codecs/wm0010.c | 2 +- + sound/soc/intel/atom/sst/sst_pci.c | 2 +- + sound/soc/intel/boards/Kconfig | 14 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/sof_pcm512x.c | 428 +++++++++++++++ + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 7 + + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 17 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 183 ++++++- + sound/soc/meson/Kconfig | 24 + + sound/soc/meson/Makefile | 15 + + sound/soc/meson/aiu-acodec-ctrl.c | 203 +++++++ + sound/soc/meson/aiu-codec-ctrl.c | 151 +++++ + sound/soc/meson/aiu-encoder-i2s.c | 317 +++++++++++ + sound/soc/meson/aiu-encoder-spdif.c | 209 +++++++ + sound/soc/meson/aiu-fifo-i2s.c | 153 ++++++ + sound/soc/meson/aiu-fifo-spdif.c | 186 +++++++ + sound/soc/meson/aiu-fifo.c | 223 ++++++++ + sound/soc/meson/aiu-fifo.h | 50 ++ + sound/soc/meson/aiu.c | 366 +++++++++++++ + sound/soc/meson/aiu.h | 83 +++ + sound/soc/meson/axg-card.c | 403 +------------- + sound/soc/meson/g12a-tohdmitx.c | 219 ++------ + sound/soc/meson/gx-card.c | 141 +++++ + sound/soc/meson/meson-card-utils.c | 385 +++++++++++++ + sound/soc/meson/meson-card.h | 55 ++ + sound/soc/meson/meson-codec-glue.c | 149 +++++ + sound/soc/meson/meson-codec-glue.h | 32 ++ + sound/soc/sh/fsi.c | 3 +- + sound/soc/soc-component.c | 35 +- + sound/soc/soc-core.c | 37 +- + sound/soc/soc-dai.c | 11 +- + sound/soc/soc-dapm.c | 8 +- + sound/soc/soc-pcm.c | 246 ++++----- + sound/soc/sof/core.c | 4 +- + sound/soc/sof/imx/imx8.c | 57 +- + sound/soc/sof/intel/cnl.c | 37 +- + sound/soc/sof/intel/hda-dsp.c | 289 +++++++++- + sound/soc/sof/intel/hda.c | 5 + + sound/soc/sof/intel/hda.h | 21 +- + sound/soc/sof/ipc.c | 29 +- + sound/soc/sof/ops.h | 16 +- + sound/soc/sof/pcm.c | 2 +- + sound/soc/sof/pm.c | 176 +++--- + sound/soc/sof/sof-audio.c | 42 +- + sound/soc/sof/sof-audio.h | 3 +- + sound/soc/sof/sof-of-dev.c | 10 + + sound/soc/sof/sof-priv.h | 43 +- + sound/soc/stm/stm32_i2s.c | 39 +- + sound/soc/stm/stm32_sai.c | 26 +- + sound/soc/stm/stm32_sai_sub.c | 11 +- + sound/soc/stm/stm32_spdifrx.c | 29 +- + sound/soc/sunxi/sun8i-codec.c | 3 +- + sound/soc/ti/Kconfig | 8 +- + sound/soc/ti/Makefile | 2 + + sound/soc/ti/davinci-mcasp.c | 13 +- + sound/soc/ti/udma-pcm.c | 43 ++ + sound/soc/ti/udma-pcm.h | 18 + + 82 files changed, 5428 insertions(+), 1429 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,aiu.yaml + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt + create mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml + create mode 100644 include/dt-bindings/sound/meson-aiu.h + create mode 100644 sound/soc/intel/boards/sof_pcm512x.c + create mode 100644 sound/soc/meson/aiu-acodec-ctrl.c + create mode 100644 sound/soc/meson/aiu-codec-ctrl.c + create mode 100644 sound/soc/meson/aiu-encoder-i2s.c + create mode 100644 sound/soc/meson/aiu-encoder-spdif.c + create mode 100644 sound/soc/meson/aiu-fifo-i2s.c + create mode 100644 sound/soc/meson/aiu-fifo-spdif.c + create mode 100644 sound/soc/meson/aiu-fifo.c + create mode 100644 sound/soc/meson/aiu-fifo.h + create mode 100644 sound/soc/meson/aiu.c + create mode 100644 sound/soc/meson/aiu.h + create mode 100644 sound/soc/meson/gx-card.c + create mode 100644 sound/soc/meson/meson-card-utils.c + create mode 100644 sound/soc/meson/meson-card.h + create mode 100644 sound/soc/meson/meson-codec-glue.c + create mode 100644 sound/soc/meson/meson-codec-glue.h + create mode 100644 sound/soc/ti/udma-pcm.c + create mode 100644 sound/soc/ti/udma-pcm.h +Merging modules/modules-next (0f74226649fb kernel: module: Replace zero-length array with flexible-array member) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging input/next (c5ccf2ad3d33 Input: synaptics-rmi4 - switch to reduced reporting mode) +$ git merge input/next +Already up to date. +Merging block/for-next (6b6eb301e976 Merge branch 'io_uring-5.6' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + fs/io_uring.c | 155 ++++++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 114 insertions(+), 41 deletions(-) +Merging device-mapper/for-next (47ace7e012b9 dm: fix potential for q->make_request_fn NULL pointer) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (71705c611263 PCMCIA/i82092: remove #if 0 block) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (84f371938735 Merge branch 'fixes' into next) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + drivers/firmware/xilinx/zynqmp.c | 2 + + drivers/mmc/host/renesas_sdhi.h | 6 ++ + drivers/mmc/host/renesas_sdhi_core.c | 184 ++++++++++++++++++++++++++--------- + drivers/mmc/host/sdhci-of-arasan.c | 59 ++++++++++- + drivers/mmc/host/tmio_mmc.h | 11 +-- + drivers/mmc/host/tmio_mmc_core.c | 77 ++------------- + include/linux/firmware/xlnx-zynqmp.h | 9 +- + 7 files changed, 220 insertions(+), 128 deletions(-) +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (5312f321a67c mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (7af43a76695d backlight: qcom-wled: Fix unsigned comparison to zero) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (5932ad6367d1 Merge branch 'regulator-5.7' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/mps,mp5416.yaml | 78 +++++++ + MAINTAINERS | 3 +- + drivers/regulator/Kconfig | 10 + + drivers/regulator/Makefile | 1 + + drivers/regulator/da9062-regulator.c | 2 +- + drivers/regulator/da9063-regulator.c | 66 +++--- + drivers/regulator/mp5416.c | 245 +++++++++++++++++++++ + drivers/regulator/mp8859.c | 1 + + 8 files changed, 375 insertions(+), 31 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mps,mp5416.yaml + create mode 100644 drivers/regulator/mp5416.c +Merging security/next-testing (10c2d111c906 security: remove EARLY_LSM_COUNT which never used) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (01df52d726b5 apparmor: remove duplicate check of xattrs on profile attachment.) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging fs/proc/base.c +Merge made by the 'recursive' strategy. + fs/proc/base.c | 13 ++++++++++ + security/apparmor/apparmorfs.c | 54 +++++++++------------------------------ + security/apparmor/domain.c | 39 ++++++++++------------------ + security/apparmor/include/label.h | 1 + + security/apparmor/include/match.h | 11 ++++++++ + security/apparmor/label.c | 37 +++++++++++++++++++++++++-- + security/apparmor/match.c | 53 +++++++++++++++++++++++++++++++++++++- + security/apparmor/path.c | 2 +- + security/apparmor/policy_unpack.c | 4 +++ + 9 files changed, 143 insertions(+), 71 deletions(-) +Merging integrity/next-integrity (d54e17b40666 Merge branch 'next-integrity.defer-measuring-keys' into next-integrity) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (bda7978b1956 Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/selinux/hooks.c +Auto-merging net/wireless/reg.c +Auto-merging init/Kconfig +Auto-merging include/linux/pipe_fs_i.h +Auto-merging fs/ecryptfs/keystore.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Merge made by the 'recursive' strategy. + Documentation/security/keys/core.rst | 186 +++++- + Documentation/security/keys/request-key.rst | 9 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 354 +++++++++++ + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-verity-verify-sig.c | 3 +- + drivers/nvdimm/security.c | 2 +- + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + fs/crypto/keyring.c | 29 +- + fs/crypto/keysetup_v1.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/fscache/object-list.c | 2 +- + fs/nfs/nfs4idmap.c | 30 +- + fs/pipe.c | 242 +++++--- + fs/splice.c | 12 +- + fs/ubifs/auth.c | 2 +- + fs/verity/signature.c | 15 +- + include/linux/key.h | 126 ++-- + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 ++ + include/linux/pipe_fs_i.h | 27 +- + include/linux/security.h | 31 + + include/linux/watch_queue.h | 127 ++++ + include/uapi/linux/keyctl.h | 68 +++ + include/uapi/linux/watch_queue.h | 104 ++++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/watch_queue.c | 659 +++++++++++++++++++++ + lib/digsig.c | 2 +- + net/ceph/ceph_common.c | 2 +- + net/dns_resolver/dns_key.c | 12 +- + net/dns_resolver/dns_query.c | 15 +- + net/rxrpc/key.c | 19 +- + net/wireless/reg.c | 6 +- + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 186 ++++++ + security/integrity/digsig.c | 31 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima_mok.c | 13 +- + security/integrity/integrity.h | 6 +- + .../integrity/platform_certs/platform_keyring.c | 14 +- + security/keys/Kconfig | 9 + + security/keys/compat.c | 5 + + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/keys/gc.c | 7 +- + security/keys/internal.h | 46 +- + security/keys/key.c | 67 +-- + security/keys/keyctl.c | 202 +++++-- + security/keys/keyring.c | 47 +- + security/keys/permission.c | 363 ++++++++++-- + security/keys/persistent.c | 27 +- + security/keys/proc.c | 22 +- + security/keys/process_keys.c | 86 ++- + security/keys/request_key.c | 38 +- + security/keys/request_key_auth.c | 15 +- + security/security.c | 23 + + security/selinux/hooks.c | 75 ++- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/security.h | 8 + + security/selinux/ss/services.c | 3 +- + security/smack/smack_lsm.c | 86 ++- + 71 files changed, 3183 insertions(+), 443 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 kernel/watch_queue.c + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +Merging selinux/next (253050f57c7a selinux: factor out loop body from filename_trans_read()) +$ git merge selinux/next +Auto-merging security/selinux/ss/services.c +CONFLICT (content): Merge conflict in security/selinux/ss/services.c +Auto-merging security/selinux/include/security.h +CONFLICT (content): Merge conflict in security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'security/selinux/hooks.c' using previous resolution. +Resolved 'security/selinux/include/security.h' using previous resolution. +Resolved 'security/selinux/ss/services.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 69c5fb8b0efc] Merge remote-tracking branch 'selinux/next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/obsolete/sysfs-selinux-checkreqprot | 23 ++ + Documentation/admin-guide/kernel-parameters.txt | 1 + + MAINTAINERS | 1 + + security/selinux/Kconfig | 3 + + security/selinux/Makefile | 4 +- + security/selinux/hooks.c | 11 +- + security/selinux/include/conditional.h | 8 +- + security/selinux/include/security.h | 12 + + security/selinux/selinuxfs.c | 13 +- + security/selinux/ss/conditional.c | 251 +++++++++------------ + security/selinux/ss/conditional.h | 27 ++- + security/selinux/ss/policydb.c | 124 +++++----- + security/selinux/ss/policydb.h | 3 +- + security/selinux/ss/services.c | 37 ++- + security/selinux/ss/services.h | 2 - + security/selinux/{ss => }/status.c | 32 +-- + 16 files changed, 278 insertions(+), 274 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-selinux-checkreqprot + rename security/selinux/{ss => }/status.c (81%) +Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock) +$ git merge smack/for-next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. +Merging tomoyo/master (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (dc10e4181c05 tpm: Initialize crypto_id of allocated_banks to HASH_ALGO__LAST) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/Makefile | 8 +++++--- + drivers/char/tpm/tpm2-cmd.c | 2 ++ + drivers/char/tpm/{tpm_tis_spi.c => tpm_tis_spi_main.c} | 0 + 3 files changed, 7 insertions(+), 3 deletions(-) + rename drivers/char/tpm/{tpm_tis_spi.c => tpm_tis_spi_main.c} (100%) +Merging watchdog/master (44144c809e39 watchdog: da9062: Add dependency on I2C) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/Kconfig | 2 ++ + drivers/watchdog/da9062_wdt.c | 19 ++++++++++++------- + 2 files changed, 14 insertions(+), 7 deletions(-) +Merging iommu/next (e3b5ee0cfb65 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (7b5372ba04ca vfio: platform: fix __iomem in vfio_platform_amdxgbe.c) +$ git merge vfio/next +Already up to date. +Merging audit/next (70b3eeed49e8 audit: CONFIG_CHANGE don't log internal bookkeeping as an event) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit_watch.c | 2 -- + 1 file changed, 2 deletions(-) +Merging devicetree/for-next (90aeca875f8a dt-bindings: display: Convert etnaviv to json-schema) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +CONFLICT (modify/delete): Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt +rm 'Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt' +$ git commit --no-edit -v -a +[master 518625a00daf] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/etnaviv/etnaviv-drm.txt | 37 ------------ + .../devicetree/bindings/gpu/vivante,gc.yaml | 69 ++++++++++++++++++++++ + .../devicetree/bindings/soc/imx/fsl,aips-bus.yaml | 47 +++++++++++++++ + Documentation/devicetree/bindings/usb/dwc2.yaml | 6 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 6 ++ + 5 files changed, 128 insertions(+), 37 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt + create mode 100644 Documentation/devicetree/bindings/gpu/vivante,gc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,aips-bus.yaml +Merging mailbox/mailbox-for-next (c6c6bc6ea9fc mailbox: imx: add support for imx v1 mu) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (7b3bbd9f82f2 Merge branch 'spi-5.7' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 5 +- + .../devicetree/bindings/spi/qca,ar934x-spi.yaml | 41 ++++ + Documentation/devicetree/bindings/spi/spi-mux.yaml | 89 ++++++++ + drivers/spi/Kconfig | 18 ++ + drivers/spi/Makefile | 2 + + drivers/spi/spi-ar934x.c | 235 +++++++++++++++++++++ + drivers/spi/spi-geni-qcom.c | 26 +-- + drivers/spi/spi-mem.c | 2 +- + drivers/spi/spi-mux.c | 187 ++++++++++++++++ + drivers/spi/spi-stm32-qspi.c | 31 +-- + tools/spi/Makefile | 2 +- + tools/spi/spidev_test.c | 14 +- + 12 files changed, 617 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/qca,ar934x-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/spi-mux.yaml + create mode 100644 drivers/spi/spi-ar934x.c + create mode 100644 drivers/spi/spi-mux.c +Merging tip/auto-latest (fc822da1328e Merge branch 'core/objtool') +$ git merge tip/auto-latest +Auto-merging kernel/exit.c +Auto-merging kernel/Makefile +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 22 + + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 266 +++++++++ + MAINTAINERS | 11 + + Makefile | 3 +- + arch/powerpc/perf/core-book3s.c | 1 + + arch/x86/Kconfig | 1 + + arch/x86/boot/Makefile | 2 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/boot/compressed/head_64.S | 6 +- + arch/x86/entry/vdso/Makefile | 6 + + arch/x86/events/intel/core.c | 25 +- + arch/x86/events/intel/lbr.c | 9 + + arch/x86/events/intel/uncore.c | 12 + + arch/x86/events/intel/uncore.h | 2 + + arch/x86/events/intel/uncore_snb.c | 159 ++++++ + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/include/asm/cpu.h | 12 + + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/msr-index.h | 9 + + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/include/asm/topology.h | 25 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/cpu/intel.c | 175 ++++++ + arch/x86/kernel/cpu/mce/amd.c | 50 +- + arch/x86/kernel/fpu/xstate.c | 66 ++- + arch/x86/kernel/irqinit.c | 2 +- + arch/x86/kernel/nmi.c | 4 +- + arch/x86/kernel/process.c | 3 + + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/smpboot.c | 292 +++++++++- + arch/x86/kernel/traps.c | 24 +- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/tsc_sync.c | 2 +- + arch/x86/lib/Makefile | 4 + + arch/x86/mm/Makefile | 4 + + arch/x86/purgatory/Makefile | 2 + + arch/x86/realmode/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 3 + + drivers/cpufreq/intel_pstate.c | 1 + + drivers/firmware/efi/libstub/Makefile | 2 + + include/asm-generic/atomic-instrumented.h | 722 ++++++++++++------------ + include/asm-generic/atomic-long.h | 331 +++++------ + include/linux/atomic-fallback.h | 340 +++++------ + include/linux/compiler-clang.h | 11 +- + include/linux/compiler-gcc.h | 6 + + include/linux/compiler.h | 60 +- + include/linux/kcsan-checks.h | 93 +++ + include/linux/kcsan.h | 108 ++++ + include/linux/percpu-rwsem.h | 83 +-- + include/linux/perf_event.h | 12 + + include/linux/preempt.h | 30 + + include/linux/rwsem.h | 6 - + include/linux/sched.h | 4 + + include/linux/seqlock.h | 51 +- + include/linux/wait.h | 1 + + include/uapi/linux/perf_event.h | 8 +- + init/init_task.c | 8 + + init/main.c | 2 + + kernel/Makefile | 6 + + kernel/cpu.c | 4 +- + kernel/events/core.c | 10 + + kernel/exit.c | 1 + + kernel/irq/internals.h | 2 - + kernel/irq/manage.c | 18 +- + kernel/irq/proc.c | 22 + + kernel/kcsan/Makefile | 12 + + kernel/kcsan/atomic.h | 27 + + kernel/kcsan/core.c | 621 ++++++++++++++++++++ + kernel/kcsan/debugfs.c | 271 +++++++++ + kernel/kcsan/encoding.h | 95 ++++ + kernel/kcsan/kcsan.h | 109 ++++ + kernel/kcsan/report.c | 318 +++++++++++ + kernel/kcsan/test.c | 121 ++++ + kernel/locking/lockdep.c | 331 +++++++++-- + kernel/locking/lockdep_internals.h | 14 +- + kernel/locking/lockdep_proc.c | 31 +- + kernel/locking/percpu-rwsem.c | 192 +++++-- + kernel/locking/rwsem.c | 7 +- + kernel/locking/rwsem.h | 10 - + kernel/sched/Makefile | 6 + + kernel/sched/core.c | 2 +- + kernel/sched/fair.c | 92 ++- + kernel/sched/rt.c | 24 +- + kernel/sched/sched.h | 9 +- + kernel/sched/topology.c | 15 +- + lib/Kconfig.debug | 2 + + lib/Kconfig.kcsan | 116 ++++ + lib/Makefile | 4 + + mm/Makefile | 8 + + scripts/Makefile.kcsan | 6 + + scripts/Makefile.lib | 10 + + scripts/atomic/fallbacks/acquire | 2 +- + scripts/atomic/fallbacks/add_negative | 2 +- + scripts/atomic/fallbacks/add_unless | 2 +- + scripts/atomic/fallbacks/andnot | 2 +- + scripts/atomic/fallbacks/dec | 2 +- + scripts/atomic/fallbacks/dec_and_test | 2 +- + scripts/atomic/fallbacks/dec_if_positive | 2 +- + scripts/atomic/fallbacks/dec_unless_positive | 2 +- + scripts/atomic/fallbacks/fence | 2 +- + scripts/atomic/fallbacks/fetch_add_unless | 2 +- + scripts/atomic/fallbacks/inc | 2 +- + scripts/atomic/fallbacks/inc_and_test | 2 +- + scripts/atomic/fallbacks/inc_not_zero | 2 +- + scripts/atomic/fallbacks/inc_unless_negative | 2 +- + scripts/atomic/fallbacks/read_acquire | 2 +- + scripts/atomic/fallbacks/release | 2 +- + scripts/atomic/fallbacks/set_release | 2 +- + scripts/atomic/fallbacks/sub_and_test | 2 +- + scripts/atomic/fallbacks/try_cmpxchg | 2 +- + scripts/atomic/gen-atomic-fallback.sh | 2 + + scripts/atomic/gen-atomic-instrumented.sh | 20 +- + scripts/atomic/gen-atomic-long.sh | 3 +- + tools/objtool/check.c | 66 ++- + 117 files changed, 4688 insertions(+), 1069 deletions(-) + create mode 100644 Documentation/dev-tools/kcsan.rst + create mode 100644 include/linux/kcsan-checks.h + create mode 100644 include/linux/kcsan.h + create mode 100644 kernel/kcsan/Makefile + create mode 100644 kernel/kcsan/atomic.h + create mode 100644 kernel/kcsan/core.c + create mode 100644 kernel/kcsan/debugfs.c + create mode 100644 kernel/kcsan/encoding.h + create mode 100644 kernel/kcsan/kcsan.h + create mode 100644 kernel/kcsan/report.c + create mode 100644 kernel/kcsan/test.c + create mode 100644 lib/Kconfig.kcsan + create mode 100644 scripts/Makefile.kcsan +Merging clockevents/timers/drivers/next (e4c3b4213b79 clocksource/hyperv: Set TSC clocksource as default w/ InvariantTSC) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/hv/hv_util.c +Auto-merging Documentation/devicetree/bindings/arm/atmel-sysregs.txt +Merge made by the 'recursive' strategy. +Merging edac/edac-for-next (4aa92c864632 EDAC/mc: Remove per layer counters) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/edac_mc.c | 511 ++++++++++++++++++++----------------------- + drivers/edac/edac_mc.h | 6 +- + drivers/edac/edac_mc_sysfs.c | 110 ++++------ + drivers/edac/edac_module.h | 1 - + drivers/edac/ghes_edac.c | 16 +- + include/linux/edac.h | 9 +- + 6 files changed, 300 insertions(+), 353 deletions(-) +Merging irqchip/irq/irqchip-next (5186a6cc3ef5 irqchip/gic-v3-its: Rename VPENDBASER/VPROPBASER accessors) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (7276531d4036 tracing: Consolidate trace() functions) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (2de7463235f0 rcu: Don't use negative nesting depth in __rcu_read_unlock()) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging fs/nfs/dir.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 8 +- + Documentation/RCU/listRCU.rst | 281 +++++++++--- + Documentation/RCU/rcu.rst | 18 +- + Documentation/RCU/torture.txt | 147 +++++- + Documentation/admin-guide/kernel-parameters.txt | 19 + + Documentation/memory-barriers.txt | 8 +- + arch/x86/lib/Makefile | 5 + + fs/nfs/dir.c | 2 +- + include/asm-generic/atomic-instrumented.h | 395 ++++++++-------- + include/asm-generic/bitops/instrumented-atomic.h | 14 +- + include/asm-generic/bitops/instrumented-lock.h | 10 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 16 +- + include/linux/compiler.h | 16 +- + include/linux/instrumented.h | 109 +++++ + include/linux/kcsan-checks.h | 174 ++++++- + include/linux/kcsan.h | 46 +- + include/linux/rculist.h | 6 +- + include/linux/rcutiny.h | 1 + + include/linux/rcutree.h | 1 + + include/linux/sched.h | 2 +- + include/linux/seqlock.h | 2 +- + include/linux/timer.h | 2 +- + include/linux/uaccess.h | 14 +- + include/trace/events/rcu.h | 29 ++ + init/init_task.c | 1 + + kernel/kcsan/Makefile | 2 + + kernel/kcsan/atomic.h | 2 +- + kernel/kcsan/core.c | 183 ++++++-- + kernel/kcsan/debugfs.c | 65 ++- + kernel/kcsan/encoding.h | 14 +- + kernel/kcsan/kcsan.h | 33 +- + kernel/kcsan/report.c | 255 +++++++++-- + kernel/kcsan/test.c | 10 + + kernel/locking/Makefile | 3 + + kernel/locking/locktorture.c | 15 +- + kernel/locking/rtmutex.c | 2 +- + kernel/rcu/Makefile | 4 + + kernel/rcu/rcu.h | 23 +- + kernel/rcu/rcu_segcblist.c | 4 +- + kernel/rcu/rcuperf.c | 14 +- + kernel/rcu/rcutorture.c | 67 ++- + kernel/rcu/srcutree.c | 24 +- + kernel/rcu/tree.c | 500 +++++++++++++++------ + kernel/rcu/tree.h | 4 + + kernel/rcu/tree_exp.h | 63 ++- + kernel/rcu/tree_plugin.h | 85 ++-- + kernel/rcu/tree_stall.h | 63 +-- + kernel/rcu/update.c | 28 +- + kernel/time/timer.c | 7 +- + kernel/torture.c | 29 +- + kernel/trace/Makefile | 3 + + lib/Kconfig.debug | 2 + + lib/Kconfig.kcsan | 70 ++- + lib/iov_iter.c | 7 +- + lib/usercopy.c | 7 +- + scripts/atomic/gen-atomic-instrumented.sh | 19 +- + tools/memory-model/Documentation/references.txt | 21 +- + 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 ++ + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 + + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 16 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 17 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 + + .../selftests/rcutorture/configs/rcu/TREE10 | 18 + + 80 files changed, 2592 insertions(+), 909 deletions(-) + create mode 100644 include/linux/instrumented.h + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE10 +Merging kvm/linux-next (ead68df94d24 KVM: x86: enable -Werror) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (b3f15ec3d809 kvm: arm/arm64: Fold VHE entry/exit work into kvm_vcpu_run_vhe()) +$ git merge kvm-arm/next +Auto-merging virt/kvm/arm/arm.c +Auto-merging arch/arm64/kvm/hyp/switch.c +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm/include/asm/kvm_host.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_host.h | 3 --- + arch/arm64/include/asm/kvm_host.h | 32 -------------------------------- + arch/arm64/kvm/hyp/switch.c | 39 +++++++++++++++++++++++++++++++++++++-- + virt/kvm/arm/arm.c | 2 -- + virt/kvm/arm/trace.h | 1 + + 5 files changed, 38 insertions(+), 39 deletions(-) +Merging kvm-ppc/kvm-ppc-next (fd24a8624eb2 KVM: PPC: Book3S PR: Fix -Werror=return-type build failure) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (b35e8878e1d3 KVM: s390/interrupt: do not pin adapter interrupt pages) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + arch/s390/include/asm/kvm_host.h | 3 - + arch/s390/kvm/interrupt.c | 146 +++++++++++++-------------------------- + 2 files changed, 49 insertions(+), 100 deletions(-) +Merging xen-tip/linux-next (8557bbe5156e xen/blkback: Consistently insert one empty line between functions) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (9391e7a9a1e2 Merge branch 'for-5.6' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (1cd27003497a workqueue: don't use wq_select_unbound_cpu() for bound works) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 16 ++++++++++++++++ + kernel/workqueue.c | 14 ++++++++------ + 2 files changed, 24 insertions(+), 6 deletions(-) +Merging drivers-x86/for-next (7adb1e8aeeb5 platform/x86: intel_pmc_core: Add debugfs support to access live status registers) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 82 +- + drivers/platform/x86/Kconfig | 1318 ++++++++++----------- + drivers/platform/x86/Makefile | 197 +-- + drivers/platform/x86/dell_rbu.c | 173 +-- + drivers/platform/x86/intel-hid.c | 2 +- + drivers/platform/x86/intel-vbtn.c | 2 +- + drivers/platform/x86/intel_pmc_core.c | 308 ++++- + drivers/platform/x86/intel_pmc_core.h | 28 + + drivers/platform/x86/pmc_atom.c | 8 + + tools/power/x86/intel-speed-select/isst-config.c | 5 +- + tools/power/x86/intel-speed-select/isst-display.c | 4 +- + 11 files changed, 1204 insertions(+), 923 deletions(-) +Merging chrome-platform/for-next (42cd0ab476e2 platform/chrome: cros_ec: Query EC protocol version if EC transitions between RO/RW) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 14 ++ + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/cros_ec.c | 30 +++++ + drivers/platform/chrome/cros_usbpd_notify.c | 169 ++++++++++++++++++++++++ + drivers/platform/chrome/wilco_ec/properties.c | 5 +- + drivers/platform/chrome/wilco_ec/sysfs.c | 4 + + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 50 +++---- + include/linux/platform_data/cros_ec_proto.h | 4 + + include/linux/platform_data/cros_usbpd_notify.h | 17 +++ + include/linux/platform_data/wilco-ec.h | 8 +- + 11 files changed, 268 insertions(+), 36 deletions(-) + create mode 100644 drivers/platform/chrome/cros_usbpd_notify.c + create mode 100644 include/linux/platform_data/cros_usbpd_notify.h +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (11a48a5a18c6 Linux 5.6-rc2) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (7342db125413 drivers: char: ipmi: ipmi_msghandler: Pass lockdep expression to RCU lists) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 14 ++++++++++---- + drivers/char/ipmi/ipmi_si_platform.c | 4 ++-- + 2 files changed, 12 insertions(+), 6 deletions(-) +Merging driver-core/driver-core-next (99c73ce158a4 drivers base/arch_topology: Reformat topology_get_[cpu/freq]_scale() function name) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/firmware_loader/main.c | 6 +- + fs/exec.c | 26 ++++ + include/linux/arch_topology.h | 7 +- + include/linux/fs.h | 2 + + include/linux/platform_device.h | 2 +- + tools/testing/selftests/firmware/Makefile | 9 +- + tools/testing/selftests/firmware/fw_namespace.c | 151 +++++++++++++++++++++++ + tools/testing/selftests/firmware/fw_run_tests.sh | 4 + + 8 files changed, 193 insertions(+), 14 deletions(-) + create mode 100644 tools/testing/selftests/firmware/fw_namespace.c +Merging usb/usb-next (b57a368efde6 usb: gadget: f_phonet: Replace zero-length array with flexible-array member) +$ git merge usb/usb-next +Auto-merging drivers/usb/core/usb.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-typec | 14 +- + Documentation/driver-api/usb/typec_bus.rst | 22 +-- + MAINTAINERS | 6 + + drivers/thunderbolt/usb4.c | 4 + + drivers/usb/atm/ueagle-atm.c | 2 +- + drivers/usb/cdns3/gadget.c | 2 +- + drivers/usb/core/driver.c | 58 ++++++- + drivers/usb/core/generic.c | 48 +++++- + drivers/usb/core/sysfs.c | 6 +- + drivers/usb/core/usb.h | 8 + + drivers/usb/dwc3/dwc3-qcom.c | 2 +- + drivers/usb/gadget/function/f_phonet.c | 2 +- + drivers/usb/gadget/function/f_uac1_legacy.c | 2 - + drivers/usb/host/ehci-platform.c | 127 +++++++++++++++ + drivers/usb/misc/Kconfig | 10 ++ + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/apple-mfi-fastcharge.c | 237 ++++++++++++++++++++++++++++ + drivers/usb/musb/musb_host.c | 2 +- + drivers/usb/roles/class.c | 2 +- + drivers/usb/typec/bus.c | 12 +- + drivers/usb/typec/bus.h | 2 - + drivers/usb/typec/class.c | 137 ++++++++-------- + drivers/usb/typec/mux.c | 25 +-- + drivers/usb/typec/tcpm/tcpm.c | 53 +++++-- + drivers/usb/typec/ucsi/ucsi.c | 2 +- + include/linux/usb.h | 7 + + include/linux/usb/ehci_def.h | 2 +- + include/linux/usb/typec.h | 2 - + include/linux/usb/typec_altmode.h | 7 - + 29 files changed, 621 insertions(+), 183 deletions(-) + create mode 100644 drivers/usb/misc/apple-mfi-fastcharge.c +Merging usb-gadget/next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (2c0bee081315 USB: serial: digi_acceleport: remove redundant assignment to pointer priv) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/digi_acceleport.c | 2 +- + drivers/usb/serial/generic.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (4d6141288c33 usb: chipidea: imx: pinctrl for HSIC is optional) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (a5c86c557fe9 phy: mapphone-mdm6600: Fix write timeouts with shorter GPIO toggle interval) +$ git merge phy-next/next +Auto-merging drivers/phy/motorola/phy-mapphone-mdm6600.c +Merge made by the 'recursive' strategy. + drivers/phy/motorola/phy-mapphone-mdm6600.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) +Merging tty/tty-next (643f7d95fe23 serial: core: use octal permissions on module param) +$ git merge tty/tty-next +Auto-merging drivers/tty/serial/8250/8250_of.c +Merge made by the 'recursive' strategy. + drivers/tty/n_gsm.c | 2 +- + drivers/tty/n_tty.c | 2 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 18 +++ + drivers/tty/serial/8250/8250_exar.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 28 ----- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/tty/serial/8250/8250_tegra.c | 198 ++++++++++++++++++++++++++++++ + drivers/tty/serial/8250/Kconfig | 9 ++ + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/kgdboc.c | 4 +- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/serial_core.c | 65 +++++----- + 12 files changed, 266 insertions(+), 67 deletions(-) + create mode 100644 drivers/tty/serial/8250/8250_tegra.c +Merging char-misc/char-misc-next (06e33595e96f misc: Use kzalloc() instead of kmalloc() with flag GFP_ZERO.) +$ git merge char-misc/char-misc-next +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + Documentation/admin-guide/dynamic-debug-howto.rst | 3 +++ + drivers/char/virtio_console.c | 2 +- + drivers/misc/lkdtm/stackleak.c | 25 +++++++++++++------- + drivers/misc/mei/bus-fixup.c | 4 ++-- + drivers/misc/mei/client.c | 4 ++-- + drivers/misc/mei/hw.h | 3 +++ + drivers/misc/mic/host/mic_boot.c | 2 +- + drivers/misc/vexpress-syscfg.c | 2 +- + lib/Kconfig.debug | 7 +++--- + lib/dynamic_debug.c | 28 +++++++++++++++++++---- + scripts/ver_linux | 24 ++++++------------- + 11 files changed, 64 insertions(+), 40 deletions(-) +Merging extcon/extcon-next (bbbd323cf9e7 extcon: Remove unneeded extern keyword from extcon-provider.h) +$ git merge extcon/extcon-next +Removing Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt +Merge made by the 'recursive' strategy. + .../bindings/extcon/extcon-usbc-cros-ec.txt | 24 ---------- + .../bindings/extcon/extcon-usbc-cros-ec.yaml | 56 ++++++++++++++++++++++ + include/linux/extcon-provider.h | 28 +++++------ + 3 files changed, 70 insertions(+), 38 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.yaml +Merging soundwire/next (bfaa3549541c soundwire: stream: don't program ports when a stream that has not been prepared) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + Documentation/driver-api/soundwire/stream.rst | 61 +++++++++++++----- + drivers/soundwire/stream.c | 90 ++++++++++++++++++++++++--- + 2 files changed, 124 insertions(+), 27 deletions(-) +Merging thunderbolt/next (3084ea9ea889 thunderbolt: icm: Replace zero-length array with flexible-array member) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + drivers/thunderbolt/eeprom.c | 2 +- + drivers/thunderbolt/icm.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging staging/staging-next (b1f17561541c staging: wilc1000: define macros to replace magic number values) +$ git merge staging/staging-next +Removing drivers/staging/wusbcore/wusbhc.h +Removing drivers/staging/wusbcore/wusbhc.c +Removing drivers/staging/wusbcore/wa-xfer.c +Removing drivers/staging/wusbcore/wa-rpipe.c +Removing drivers/staging/wusbcore/wa-nep.c +Removing drivers/staging/wusbcore/wa-hc.h +Removing drivers/staging/wusbcore/wa-hc.c +Removing drivers/staging/wusbcore/security.c +Removing drivers/staging/wusbcore/rh.c +Removing drivers/staging/wusbcore/reservation.c +Removing drivers/staging/wusbcore/pal.c +Removing drivers/staging/wusbcore/mmc.c +Removing drivers/staging/wusbcore/include/wusb.h +Removing drivers/staging/wusbcore/include/wusb-wa.h +Removing drivers/staging/wusbcore/include/association.h +Removing drivers/staging/wusbcore/host/whci/wusb.c +Removing drivers/staging/wusbcore/host/whci/whci-hc.h +Removing drivers/staging/wusbcore/host/whci/whcd.h +Removing drivers/staging/wusbcore/host/whci/qset.c +Removing drivers/staging/wusbcore/host/whci/pzl.c +Removing drivers/staging/wusbcore/host/whci/int.c +Removing drivers/staging/wusbcore/host/whci/init.c +Removing drivers/staging/wusbcore/host/whci/hw.c +Removing drivers/staging/wusbcore/host/whci/hcd.c +Removing drivers/staging/wusbcore/host/whci/debug.c +Removing drivers/staging/wusbcore/host/whci/asl.c +Removing drivers/staging/wusbcore/host/whci/Makefile +Removing drivers/staging/wusbcore/host/hwa-hc.c +Removing drivers/staging/wusbcore/host/Makefile +Removing drivers/staging/wusbcore/host/Kconfig +Removing drivers/staging/wusbcore/devconnect.c +Removing drivers/staging/wusbcore/dev-sysfs.c +Removing drivers/staging/wusbcore/crypto.c +Removing drivers/staging/wusbcore/cbaf.c +Removing drivers/staging/wusbcore/TODO +Removing drivers/staging/wusbcore/Makefile +Removing drivers/staging/wusbcore/Kconfig +Removing drivers/staging/wusbcore/Documentation/wusb-design-overview.rst +Removing drivers/staging/wusbcore/Documentation/wusb-cbaf +Removing drivers/staging/uwb/whci.c +Removing drivers/staging/uwb/whc-rc.c +Removing drivers/staging/uwb/uwbd.c +Removing drivers/staging/uwb/uwb.h +Removing drivers/staging/uwb/uwb-internal.h +Removing drivers/staging/uwb/uwb-debug.c +Removing drivers/staging/uwb/umc-drv.c +Removing drivers/staging/uwb/umc-dev.c +Removing drivers/staging/uwb/umc-bus.c +Removing drivers/staging/uwb/scan.c +Removing drivers/staging/uwb/rsv.c +Removing drivers/staging/uwb/reset.c +Removing drivers/staging/uwb/radio.c +Removing drivers/staging/uwb/pal.c +Removing drivers/staging/uwb/neh.c +Removing drivers/staging/uwb/lc-rc.c +Removing drivers/staging/uwb/lc-dev.c +Removing drivers/staging/uwb/include/whci.h +Removing drivers/staging/uwb/include/umc.h +Removing drivers/staging/uwb/include/spec.h +Removing drivers/staging/uwb/include/debug-cmd.h +Removing drivers/staging/uwb/ie.c +Removing drivers/staging/uwb/ie-rcv.c +Removing drivers/staging/uwb/i1480/i1480-est.c +Removing drivers/staging/uwb/i1480/dfu/usb.c +Removing drivers/staging/uwb/i1480/dfu/phy.c +Removing drivers/staging/uwb/i1480/dfu/mac.c +Removing drivers/staging/uwb/i1480/dfu/i1480-dfu.h +Removing drivers/staging/uwb/i1480/dfu/dfu.c +Removing drivers/staging/uwb/i1480/dfu/Makefile +Removing drivers/staging/uwb/i1480/Makefile +Removing drivers/staging/uwb/hwa-rc.c +Removing drivers/staging/uwb/est.c +Removing drivers/staging/uwb/drp.c +Removing drivers/staging/uwb/drp-ie.c +Removing drivers/staging/uwb/drp-avail.c +Removing drivers/staging/uwb/driver.c +Removing drivers/staging/uwb/beacon.c +Removing drivers/staging/uwb/allocator.c +Removing drivers/staging/uwb/address.c +Removing drivers/staging/uwb/TODO +Removing drivers/staging/uwb/Makefile +Removing drivers/staging/uwb/Kconfig +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +Auto-merging drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 759aee25ce54] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 10 - + .../cavium-octeon/executive/cvmx-helper-board.c | 4 +- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 6 +- + .../cavium-octeon/executive/cvmx-helper-sgmii.c | 8 +- + .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 6 +- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 6 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +- + arch/mips/include/asm/octeon/cvmx-helper-board.h | 2 +- + arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-spi.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-util.h | 2 +- + arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper.h | 8 +- + arch/mips/include/asm/octeon/cvmx-pko.h | 10 +- + arch/mips/include/asm/octeon/cvmx-pow.h | 22 +- + arch/mips/include/asm/octeon/cvmx-wqe.h | 16 +- + drivers/staging/Kconfig | 7 +- + drivers/staging/Makefile | 4 +- + drivers/staging/comedi/drivers/ni_660x.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 1 + + drivers/staging/comedi/drivers/ni_pcimio.c | 2 + + drivers/staging/comedi/drivers/ni_routes.c | 63 +- + drivers/staging/comedi/drivers/ni_routes.h | 1 + + drivers/staging/comedi/drivers/ni_stc.h | 1 + + drivers/staging/exfat/exfat.h | 39 +- + drivers/staging/exfat/exfat_core.c | 26 +- + drivers/staging/exfat/exfat_super.c | 266 +- + drivers/staging/gasket/gasket_core.c | 9 +- + drivers/staging/greybus/raw.c | 2 +- + drivers/staging/netlogic/platform_net.h | 4 +- + drivers/staging/netlogic/xlr_net.h | 4 +- + drivers/staging/octeon-usb/Kconfig | 11 + + drivers/staging/octeon-usb/Makefile | 2 + + drivers/staging/octeon-usb/TODO | 8 + + drivers/staging/octeon-usb/octeon-hcd.c | 3737 ++++++++++++++++++++ + drivers/staging/octeon-usb/octeon-hcd.h | 1847 ++++++++++ + drivers/staging/octeon/Kconfig | 15 + + drivers/staging/octeon/Makefile | 19 + + drivers/staging/octeon/TODO | 9 + + drivers/staging/octeon/ethernet-defines.h | 40 + + drivers/staging/octeon/ethernet-mdio.c | 178 + + drivers/staging/octeon/ethernet-mdio.h | 28 + + drivers/staging/octeon/ethernet-mem.c | 154 + + drivers/staging/octeon/ethernet-mem.h | 9 + + drivers/staging/octeon/ethernet-rgmii.c | 158 + + drivers/staging/octeon/ethernet-rx.c | 538 +++ + drivers/staging/octeon/ethernet-rx.h | 31 + + drivers/staging/octeon/ethernet-sgmii.c | 30 + + drivers/staging/octeon/ethernet-spi.c | 226 ++ + drivers/staging/octeon/ethernet-tx.c | 717 ++++ + drivers/staging/octeon/ethernet-tx.h | 14 + + drivers/staging/octeon/ethernet-util.h | 47 + + drivers/staging/octeon/ethernet.c | 992 ++++++ + drivers/staging/octeon/octeon-ethernet.h | 107 + + drivers/staging/octeon/octeon-stubs.h | 1433 ++++++++ + drivers/staging/pi433/pi433_if.h | 4 +- + drivers/staging/pi433/rf69.h | 4 +- + drivers/staging/pi433/rf69_enum.h | 4 +- + drivers/staging/pi433/rf69_registers.h | 4 +- + drivers/staging/qlge/qlge_main.c | 25 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 20 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 36 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 24 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 14 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192e/rtllib_tx.c | 2 +- + drivers/staging/rtl8192u/r819xU_phy.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 8 - + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 6 +- + drivers/staging/rtl8723bs/hal/odm.h | 2 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 +- + drivers/staging/rtl8723bs/include/HalVerDef.h | 32 +- + drivers/staging/rtl8723bs/include/cmd_osdep.h | 4 +- + drivers/staging/rtl8723bs/include/drv_types.h | 10 +- + drivers/staging/rtl8723bs/include/hal_com.h | 98 +- + drivers/staging/rtl8723bs/include/hal_com_h2c.h | 8 +- + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 2 +- + drivers/staging/rtl8723bs/include/hal_com_reg.h | 14 +- + drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- + drivers/staging/rtl8723bs/include/hal_phy.h | 2 +- + drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 4 +- + drivers/staging/rtl8723bs/include/hal_pwr_seq.h | 4 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 22 +- + drivers/staging/rtl8723bs/include/osdep_intf.h | 2 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 10 +- + .../rtl8723bs/include/osdep_service_linux.h | 2 +- + drivers/staging/rtl8723bs/include/recv_osdep.h | 4 +- + drivers/staging/rtl8723bs/include/rtl8723b_cmd.h | 2 +- + drivers/staging/rtl8723bs/include/rtl8723b_rf.h | 2 +- + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_byteorder.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 112 +- + drivers/staging/rtl8723bs/include/rtw_debug.h | 28 +- + drivers/staging/rtl8723bs/include/rtw_eeprom.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_efuse.h | 8 +- + drivers/staging/rtl8723bs/include/rtw_event.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_ht.h | 12 +- + drivers/staging/rtl8723bs/include/rtw_io.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 66 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 40 +- + drivers/staging/rtl8723bs/include/rtw_mp.h | 16 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 18 +- + drivers/staging/rtl8723bs/include/rtw_security.h | 30 +- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 26 +- + drivers/staging/rtl8723bs/include/sta_info.h | 8 +- + drivers/staging/rtl8723bs/include/wifi.h | 8 +- + drivers/staging/rtl8723bs/include/xmit_osdep.h | 4 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 124 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 280 +- + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 6 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 8 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 12 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 +- + drivers/staging/unisys/visorinput/visorinput.c | 2 +- + drivers/staging/uwb/Kconfig | 72 - + drivers/staging/uwb/Makefile | 32 - + drivers/staging/uwb/TODO | 8 - + drivers/staging/uwb/address.c | 352 -- + drivers/staging/uwb/allocator.c | 374 -- + drivers/staging/uwb/beacon.c | 595 ---- + drivers/staging/uwb/driver.c | 143 - + drivers/staging/uwb/drp-avail.c | 278 -- + drivers/staging/uwb/drp-ie.c | 305 -- + drivers/staging/uwb/drp.c | 842 ----- + drivers/staging/uwb/est.c | 450 --- + drivers/staging/uwb/hwa-rc.c | 929 ----- + drivers/staging/uwb/i1480/Makefile | 2 - + drivers/staging/uwb/i1480/dfu/Makefile | 10 - + drivers/staging/uwb/i1480/dfu/dfu.c | 198 -- + drivers/staging/uwb/i1480/dfu/i1480-dfu.h | 246 -- + drivers/staging/uwb/i1480/dfu/mac.c | 496 --- + drivers/staging/uwb/i1480/dfu/phy.c | 190 - + drivers/staging/uwb/i1480/dfu/usb.c | 448 --- + drivers/staging/uwb/i1480/i1480-est.c | 85 - + drivers/staging/uwb/ie-rcv.c | 42 - + drivers/staging/uwb/ie.c | 366 -- + drivers/staging/uwb/include/debug-cmd.h | 57 - + drivers/staging/uwb/include/spec.h | 767 ---- + drivers/staging/uwb/include/umc.h | 192 - + drivers/staging/uwb/include/whci.h | 102 - + drivers/staging/uwb/lc-dev.c | 457 --- + drivers/staging/uwb/lc-rc.c | 569 --- + drivers/staging/uwb/neh.c | 606 ---- + drivers/staging/uwb/pal.c | 128 - + drivers/staging/uwb/radio.c | 196 - + drivers/staging/uwb/reset.c | 379 -- + drivers/staging/uwb/rsv.c | 1000 ------ + drivers/staging/uwb/scan.c | 120 - + drivers/staging/uwb/umc-bus.c | 211 -- + drivers/staging/uwb/umc-dev.c | 94 - + drivers/staging/uwb/umc-drv.c | 31 - + drivers/staging/uwb/uwb-debug.c | 354 -- + drivers/staging/uwb/uwb-internal.h | 366 -- + drivers/staging/uwb/uwb.h | 817 ----- + drivers/staging/uwb/uwbd.c | 356 -- + drivers/staging/uwb/whc-rc.c | 467 --- + drivers/staging/uwb/whci.c | 257 -- + .../interface/vchiq_arm/vchiq_2835_arm.c | 43 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 536 +-- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 76 - + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 306 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 35 +- + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 2 - + drivers/staging/vt6655/device_main.c | 3 +- + drivers/staging/vt6656/device.h | 1 - + drivers/staging/vt6656/int.c | 38 - + drivers/staging/vt6656/key.c | 5 +- + drivers/staging/vt6656/main_usb.c | 8 +- + drivers/staging/vt6656/rxtx.c | 235 +- + drivers/staging/vt6656/rxtx.h | 60 - + .../bindings/net/wireless/siliabs,wfx.txt | 11 +- + drivers/staging/wfx/bh.c | 8 +- + drivers/staging/wfx/bus_sdio.c | 16 +- + drivers/staging/wfx/bus_spi.c | 45 +- + drivers/staging/wfx/hwio.c | 2 +- + drivers/staging/wfx/main.c | 23 +- + drivers/staging/wfx/main.h | 1 - + drivers/staging/wfx/queue.c | 18 +- + drivers/staging/wilc1000/cfg80211.c | 360 +- + drivers/staging/wilc1000/hif.c | 3 +- + drivers/staging/wilc1000/mon.c | 2 +- + drivers/staging/wilc1000/netdev.c | 2 - + drivers/staging/wilc1000/netdev.h | 9 - + drivers/staging/wilc1000/sdio.c | 281 +- + drivers/staging/wilc1000/spi.c | 775 ++-- + drivers/staging/wilc1000/wlan.c | 128 +- + drivers/staging/wilc1000/wlan.h | 96 +- + drivers/staging/wusbcore/Documentation/wusb-cbaf | 130 - + .../Documentation/wusb-design-overview.rst | 457 --- + drivers/staging/wusbcore/Kconfig | 39 - + drivers/staging/wusbcore/Makefile | 28 - + drivers/staging/wusbcore/TODO | 8 - + drivers/staging/wusbcore/cbaf.c | 645 ---- + drivers/staging/wusbcore/crypto.c | 441 --- + drivers/staging/wusbcore/dev-sysfs.c | 124 - + drivers/staging/wusbcore/devconnect.c | 1085 ------ + drivers/staging/wusbcore/host/Kconfig | 28 - + drivers/staging/wusbcore/host/Makefile | 3 - + drivers/staging/wusbcore/host/hwa-hc.c | 875 ----- + drivers/staging/wusbcore/host/whci/Makefile | 14 - + drivers/staging/wusbcore/host/whci/asl.c | 376 -- + drivers/staging/wusbcore/host/whci/debug.c | 153 - + drivers/staging/wusbcore/host/whci/hcd.c | 356 -- + drivers/staging/wusbcore/host/whci/hw.c | 93 - + drivers/staging/wusbcore/host/whci/init.c | 177 - + drivers/staging/wusbcore/host/whci/int.c | 82 - + drivers/staging/wusbcore/host/whci/pzl.c | 404 --- + drivers/staging/wusbcore/host/whci/qset.c | 831 ----- + drivers/staging/wusbcore/host/whci/whcd.h | 202 -- + drivers/staging/wusbcore/host/whci/whci-hc.h | 401 --- + drivers/staging/wusbcore/host/whci/wusb.c | 210 -- + drivers/staging/wusbcore/include/association.h | 151 - + drivers/staging/wusbcore/include/wusb-wa.h | 304 -- + drivers/staging/wusbcore/include/wusb.h | 362 -- + drivers/staging/wusbcore/mmc.c | 303 -- + drivers/staging/wusbcore/pal.c | 45 - + drivers/staging/wusbcore/reservation.c | 110 - + drivers/staging/wusbcore/rh.c | 426 --- + drivers/staging/wusbcore/security.c | 599 ---- + drivers/staging/wusbcore/wa-hc.c | 88 - + drivers/staging/wusbcore/wa-hc.h | 467 --- + drivers/staging/wusbcore/wa-nep.c | 289 -- + drivers/staging/wusbcore/wa-rpipe.c | 539 --- + drivers/staging/wusbcore/wa-xfer.c | 2927 --------------- + drivers/staging/wusbcore/wusbhc.c | 490 --- + drivers/staging/wusbcore/wusbhc.h | 487 --- + 234 files changed, 12291 insertions(+), 31731 deletions(-) + create mode 100644 drivers/staging/octeon-usb/Kconfig + create mode 100644 drivers/staging/octeon-usb/Makefile + create mode 100644 drivers/staging/octeon-usb/TODO + create mode 100644 drivers/staging/octeon-usb/octeon-hcd.c + create mode 100644 drivers/staging/octeon-usb/octeon-hcd.h + create mode 100644 drivers/staging/octeon/Kconfig + create mode 100644 drivers/staging/octeon/Makefile + create mode 100644 drivers/staging/octeon/TODO + create mode 100644 drivers/staging/octeon/ethernet-defines.h + create mode 100644 drivers/staging/octeon/ethernet-mdio.c + create mode 100644 drivers/staging/octeon/ethernet-mdio.h + create mode 100644 drivers/staging/octeon/ethernet-mem.c + create mode 100644 drivers/staging/octeon/ethernet-mem.h + create mode 100644 drivers/staging/octeon/ethernet-rgmii.c + create mode 100644 drivers/staging/octeon/ethernet-rx.c + create mode 100644 drivers/staging/octeon/ethernet-rx.h + create mode 100644 drivers/staging/octeon/ethernet-sgmii.c + create mode 100644 drivers/staging/octeon/ethernet-spi.c + create mode 100644 drivers/staging/octeon/ethernet-tx.c + create mode 100644 drivers/staging/octeon/ethernet-tx.h + create mode 100644 drivers/staging/octeon/ethernet-util.h + create mode 100644 drivers/staging/octeon/ethernet.c + create mode 100644 drivers/staging/octeon/octeon-ethernet.h + create mode 100644 drivers/staging/octeon/octeon-stubs.h + delete mode 100644 drivers/staging/uwb/Kconfig + delete mode 100644 drivers/staging/uwb/Makefile + delete mode 100644 drivers/staging/uwb/TODO + delete mode 100644 drivers/staging/uwb/address.c + delete mode 100644 drivers/staging/uwb/allocator.c + delete mode 100644 drivers/staging/uwb/beacon.c + delete mode 100644 drivers/staging/uwb/driver.c + delete mode 100644 drivers/staging/uwb/drp-avail.c + delete mode 100644 drivers/staging/uwb/drp-ie.c + delete mode 100644 drivers/staging/uwb/drp.c + delete mode 100644 drivers/staging/uwb/est.c + delete mode 100644 drivers/staging/uwb/hwa-rc.c + delete mode 100644 drivers/staging/uwb/i1480/Makefile + delete mode 100644 drivers/staging/uwb/i1480/dfu/Makefile + delete mode 100644 drivers/staging/uwb/i1480/dfu/dfu.c + delete mode 100644 drivers/staging/uwb/i1480/dfu/i1480-dfu.h + delete mode 100644 drivers/staging/uwb/i1480/dfu/mac.c + delete mode 100644 drivers/staging/uwb/i1480/dfu/phy.c + delete mode 100644 drivers/staging/uwb/i1480/dfu/usb.c + delete mode 100644 drivers/staging/uwb/i1480/i1480-est.c + delete mode 100644 drivers/staging/uwb/ie-rcv.c + delete mode 100644 drivers/staging/uwb/ie.c + delete mode 100644 drivers/staging/uwb/include/debug-cmd.h + delete mode 100644 drivers/staging/uwb/include/spec.h + delete mode 100644 drivers/staging/uwb/include/umc.h + delete mode 100644 drivers/staging/uwb/include/whci.h + delete mode 100644 drivers/staging/uwb/lc-dev.c + delete mode 100644 drivers/staging/uwb/lc-rc.c + delete mode 100644 drivers/staging/uwb/neh.c + delete mode 100644 drivers/staging/uwb/pal.c + delete mode 100644 drivers/staging/uwb/radio.c + delete mode 100644 drivers/staging/uwb/reset.c + delete mode 100644 drivers/staging/uwb/rsv.c + delete mode 100644 drivers/staging/uwb/scan.c + delete mode 100644 drivers/staging/uwb/umc-bus.c + delete mode 100644 drivers/staging/uwb/umc-dev.c + delete mode 100644 drivers/staging/uwb/umc-drv.c + delete mode 100644 drivers/staging/uwb/uwb-debug.c + delete mode 100644 drivers/staging/uwb/uwb-internal.h + delete mode 100644 drivers/staging/uwb/uwb.h + delete mode 100644 drivers/staging/uwb/uwbd.c + delete mode 100644 drivers/staging/uwb/whc-rc.c + delete mode 100644 drivers/staging/uwb/whci.c + delete mode 100644 drivers/staging/wusbcore/Documentation/wusb-cbaf + delete mode 100644 drivers/staging/wusbcore/Documentation/wusb-design-overview.rst + delete mode 100644 drivers/staging/wusbcore/Kconfig + delete mode 100644 drivers/staging/wusbcore/Makefile + delete mode 100644 drivers/staging/wusbcore/TODO + delete mode 100644 drivers/staging/wusbcore/cbaf.c + delete mode 100644 drivers/staging/wusbcore/crypto.c + delete mode 100644 drivers/staging/wusbcore/dev-sysfs.c + delete mode 100644 drivers/staging/wusbcore/devconnect.c + delete mode 100644 drivers/staging/wusbcore/host/Kconfig + delete mode 100644 drivers/staging/wusbcore/host/Makefile + delete mode 100644 drivers/staging/wusbcore/host/hwa-hc.c + delete mode 100644 drivers/staging/wusbcore/host/whci/Makefile + delete mode 100644 drivers/staging/wusbcore/host/whci/asl.c + delete mode 100644 drivers/staging/wusbcore/host/whci/debug.c + delete mode 100644 drivers/staging/wusbcore/host/whci/hcd.c + delete mode 100644 drivers/staging/wusbcore/host/whci/hw.c + delete mode 100644 drivers/staging/wusbcore/host/whci/init.c + delete mode 100644 drivers/staging/wusbcore/host/whci/int.c + delete mode 100644 drivers/staging/wusbcore/host/whci/pzl.c + delete mode 100644 drivers/staging/wusbcore/host/whci/qset.c + delete mode 100644 drivers/staging/wusbcore/host/whci/whcd.h + delete mode 100644 drivers/staging/wusbcore/host/whci/whci-hc.h + delete mode 100644 drivers/staging/wusbcore/host/whci/wusb.c + delete mode 100644 drivers/staging/wusbcore/include/association.h + delete mode 100644 drivers/staging/wusbcore/include/wusb-wa.h + delete mode 100644 drivers/staging/wusbcore/include/wusb.h + delete mode 100644 drivers/staging/wusbcore/mmc.c + delete mode 100644 drivers/staging/wusbcore/pal.c + delete mode 100644 drivers/staging/wusbcore/reservation.c + delete mode 100644 drivers/staging/wusbcore/rh.c + delete mode 100644 drivers/staging/wusbcore/security.c + delete mode 100644 drivers/staging/wusbcore/wa-hc.c + delete mode 100644 drivers/staging/wusbcore/wa-hc.h + delete mode 100644 drivers/staging/wusbcore/wa-nep.c + delete mode 100644 drivers/staging/wusbcore/wa-rpipe.c + delete mode 100644 drivers/staging/wusbcore/wa-xfer.c + delete mode 100644 drivers/staging/wusbcore/wusbhc.c + delete mode 100644 drivers/staging/wusbcore/wusbhc.h +Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging icc/icc-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (acd624185d20 dmaengine: ti: dma-crossbar: convert to devm_platform_ioremap_resource()) +$ git merge slave-dma/next +Auto-merging drivers/dma/idxd/sysfs.c +Auto-merging drivers/dma/idxd/cdev.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/ti-edma.txt | 2 +- + drivers/dma/bcm-sba-raid.c | 2 +- + drivers/dma/idxd/cdev.c | 2 -- + drivers/dma/idxd/sysfs.c | 3 +-- + drivers/dma/sun4i-dma.c | 2 ++ + drivers/dma/ti/dma-crossbar.c | 8 ++------ + drivers/dma/ti/omap-dma.c | 2 +- + drivers/dma/uniphier-mdmac.c | 2 +- + 8 files changed, 9 insertions(+), 14 deletions(-) +Merging cgroup/for-next (9bd5910d7f3d selftests/cgroup: add tests for cloning into cgroups) +$ git merge cgroup/for-next +Auto-merging kernel/fork.c +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 5 +- + include/linux/cgroup.h | 24 +- + include/linux/cpuset.h | 3 - + include/linux/sched/task.h | 4 + + include/uapi/linux/sched.h | 5 + + kernel/cgroup/cgroup-v1.c | 1 + + kernel/cgroup/cgroup.c | 367 ++++++++++++++++------ + kernel/cgroup/cpuset.c | 31 +- + kernel/cgroup/pids.c | 15 +- + kernel/fork.c | 19 +- + kernel/power/process.c | 2 - + tools/testing/selftests/cgroup/Makefile | 6 +- + tools/testing/selftests/cgroup/cgroup_util.c | 126 ++++++++ + tools/testing/selftests/cgroup/cgroup_util.h | 4 + + tools/testing/selftests/cgroup/test_core.c | 177 +++++++++++ + tools/testing/selftests/clone3/clone3_selftests.h | 19 +- + 16 files changed, 674 insertions(+), 134 deletions(-) +Merging scsi/for-next (145e5a8a5cbd scsi: lpfc: Copyright updates for 12.6.0.4 patches) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 5 +- + drivers/scsi/lpfc/lpfc_ct.c | 141 +++++++++++---------- + drivers/scsi/lpfc/lpfc_els.c | 195 +----------------------------- + drivers/scsi/lpfc/lpfc_hbadisc.c | 61 ++++++---- + drivers/scsi/lpfc/lpfc_hw.h | 58 +++------ + drivers/scsi/lpfc/lpfc_init.c | 40 +++--- + drivers/scsi/lpfc/lpfc_scsi.c | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 15 +-- + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/qla2xxx/qla_os.c | 2 + + drivers/scsi/qla2xxx/qla_target.c | 28 +---- + drivers/scsi/qla2xxx/qla_target.h | 2 + + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 25 ++++ + drivers/scsi/scsi_transport_iscsi.c | 68 +++++++++++ + drivers/scsi/ufs/ufs-mediatek.c | 67 ++++++---- + drivers/scsi/ufs/ufs-mediatek.h | 12 ++ + drivers/scsi/ufs/ufshcd.c | 3 +- + drivers/scsi/ufs/ufshcd.h | 6 + + drivers/scsi/virtio_scsi.c | 1 - + include/scsi/scsi_host.h | 3 - + include/scsi/scsi_transport_iscsi.h | 1 + + 23 files changed, 336 insertions(+), 415 deletions(-) +Merging scsi-mkp/for-next (145e5a8a5cbd scsi: lpfc: Copyright updates for 12.6.0.4 patches) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (370e2c82a4a5 vhost: use batched version by default) +$ git merge vhost/linux-next +Auto-merging include/linux/ptr_ring.h +Merge made by the 'recursive' strategy. + drivers/vhost/vhost.c | 232 ++++++++++++++++++++++++++++------------------- + drivers/vhost/vhost.h | 12 +++ + include/linux/ptr_ring.h | 79 +++++++++++++++- + tools/virtio/Makefile | 27 +++++- + 4 files changed, 253 insertions(+), 97 deletions(-) +Merging rpmsg/for-next (5a87e60312a9 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 (53803ecac78b Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-pxa.c | 4 +- + drivers/gpio/gpio-wcd934x.c | 9 +- + drivers/gpio/gpiolib.c | 350 ++++++++++++++++++++++++++++++++---------- + drivers/gpio/gpiolib.h | 1 + + include/asm-generic/gpio.h | 4 +- + include/linux/gpio.h | 2 - + include/linux/gpio/consumer.h | 5 +- + include/linux/kfifo.h | 73 +++++++++ + include/linux/of_gpio.h | 9 +- + include/uapi/linux/gpio.h | 30 ++++ + tools/gpio/.gitignore | 1 + + tools/gpio/Build | 1 + + tools/gpio/Makefile | 11 +- + tools/gpio/gpio-watch.c | 99 ++++++++++++ + 14 files changed, 505 insertions(+), 94 deletions(-) + create mode 100644 tools/gpio/gpio-watch.c +Merging gpio-brgl/gpio/for-next (cb548e981da5 gpiolib: Rename 'event' to 'ge' to be consistent with other use) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-uniphier.c | 2 +- + drivers/gpio/gpiolib.c | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) +Merging gpio-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (c93214689f0c MAINTAINERS: Sort entries in database for PIN CONTROLLER) +$ git merge pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 153 +++ + MAINTAINERS | 36 +- + drivers/pinctrl/actions/pinctrl-s700.c | 510 ++++----- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 106 +- + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 11 +- + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 7 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 260 ++++- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 16 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 358 ++++--- + drivers/pinctrl/mediatek/pinctrl-paris.h | 3 + + drivers/pinctrl/qcom/Kconfig | 10 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-ipq6018.c | 1107 ++++++++++++++++++++ + 13 files changed, 2130 insertions(+), 448 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq6018-pinctrl.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq6018.c +Merging pinctrl-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9871abffc810 pwm: Remove set but not set variable 'pwm') +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (61a47c1ad3a4 sysctl: Remove the sysctl system call) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (9b5f852ae20d ktest: Make default build option oldconfig not randconfig) +$ git merge ktest/for-next +Merge made by the 'recursive' strategy. + tools/testing/ktest/ktest.pl | 2 +- + tools/testing/ktest/sample.conf | 22 +++++++++++----------- + 2 files changed, 12 insertions(+), 12 deletions(-) +Merging random/dev (4cb760b02419 s390x: Mark archrandom.h functions __must_check) +$ git merge random/dev +Already up to date. +Merging kselftest/next (3032e3a7c7e3 selftests/resctrl: Add the test in MAINTAINERS) +$ git merge kselftest/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + tools/testing/selftests/resctrl/Makefile | 17 + + tools/testing/selftests/resctrl/README | 53 ++ + tools/testing/selftests/resctrl/cache.c | 272 +++++++++ + tools/testing/selftests/resctrl/cat_test.c | 250 ++++++++ + tools/testing/selftests/resctrl/cqm_test.c | 176 ++++++ + tools/testing/selftests/resctrl/fill_buf.c | 213 +++++++ + tools/testing/selftests/resctrl/mba_test.c | 171 ++++++ + tools/testing/selftests/resctrl/mbm_test.c | 145 +++++ + tools/testing/selftests/resctrl/resctrl.h | 107 ++++ + tools/testing/selftests/resctrl/resctrl_tests.c | 202 +++++++ + tools/testing/selftests/resctrl/resctrl_val.c | 744 ++++++++++++++++++++++++ + tools/testing/selftests/resctrl/resctrlfs.c | 722 +++++++++++++++++++++++ + 13 files changed, 3073 insertions(+) + create mode 100644 tools/testing/selftests/resctrl/Makefile + create mode 100644 tools/testing/selftests/resctrl/README + create mode 100644 tools/testing/selftests/resctrl/cache.c + create mode 100644 tools/testing/selftests/resctrl/cat_test.c + create mode 100644 tools/testing/selftests/resctrl/cqm_test.c + create mode 100644 tools/testing/selftests/resctrl/fill_buf.c + create mode 100644 tools/testing/selftests/resctrl/mba_test.c + create mode 100644 tools/testing/selftests/resctrl/mbm_test.c + create mode 100644 tools/testing/selftests/resctrl/resctrl.h + create mode 100644 tools/testing/selftests/resctrl/resctrl_tests.c + create mode 100644 tools/testing/selftests/resctrl/resctrl_val.c + create mode 100644 tools/testing/selftests/resctrl/resctrlfs.c +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 (d28b4c1b2b3d Merge branch 'for-5.6/selftests' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (4594d082dbe6 rtc: zynqmp: Clear alarm interrupt status before interrupt enable) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-sh.c | 3 +-- + drivers/rtc/rtc-zynqmp.c | 27 +++++++++++++++++++++++---- + 2 files changed, 24 insertions(+), 6 deletions(-) +Merging nvdimm/libnvdimm-for-next (46cf053efec6 Linux 5.5-rc3) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (4837621cd61e eeprom: at24: add TPF0001 ACPI ID for 24c1024 device) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 1 + + 1 file changed, 1 insertion(+) +Merging ntb/ntb-next (1ef512b16bc8 NTB: Fix an error in get link status) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/amd/ntb_hw_amd.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 ++-- + drivers/ntb/hw/amd/ntb_hw_amd.h | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging kspp/for-next/kspp (c79f46a28239 Linux 5.5-rc5) +$ git merge kspp/for-next/kspp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Auto-merging drivers/fsi/Kconfig +CONFLICT (content): Merge conflict in drivers/fsi/Kconfig +Resolved 'drivers/fsi/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 99ed3e467d5b] Merge remote-tracking branch 'fsi/next' +$ git diff -M --stat --summary HEAD^.. +Merging slimbus/for-next (526eaf5d08a2 slimbus: Use the correct style for SPDX License Identifier) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (e44b9b8b2c57 nvmem: core: add nvmem_cell_read_u64) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + drivers/nvmem/core.c | 69 +++++++++++++++++++++--------------------- + drivers/nvmem/imx-ocotp.c | 21 +++++++++++++ + include/linux/nvmem-consumer.h | 7 +++++ + 3 files changed, 62 insertions(+), 35 deletions(-) +Merging xarray/xarray (3a00e7c47c38 ida: remove abandoned macros) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + include/linux/xarray.h | 4 ++-- + lib/radix-tree.c | 8 -------- + lib/test_xarray.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ + lib/xarray.c | 5 +++-- + 4 files changed, 60 insertions(+), 12 deletions(-) +Merging hyperv/hyperv-next (54e19d34011f hv_utils: Add the support of hibernation) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (fcf2736c82ca Revert "kdb: Get rid of confusing diag msg from "rd" if current task has no regs") +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (8d19f1c8e193 prctl: PR_{G,S}ET_IO_FLUSHER to support controlling memory reclaim) +$ git merge pidfd/for-next +Already up to date. +Merging devfreq/devfreq-next (a454401a57ed PM / devfreq: Change to DEVFREQ_GOV_UPDATE_INTERVAL event name) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/devfreq.c | 10 +-- + drivers/devfreq/governor.h | 19 +++--- + drivers/devfreq/governor_simpleondemand.c | 4 +- + drivers/devfreq/governor_userspace.c | 2 +- + drivers/devfreq/tegra30-devfreq.c | 4 +- + include/linux/devfreq.h | 100 +++++++++++++++--------------- + 6 files changed, 68 insertions(+), 71 deletions(-) +Merging hmm/hmm (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (28910cee898c fpga: xilinx-pr-decoupler: Remove clk_get error message for probe defer) +$ git merge fpga/for-next +Already up to date. +Merging kunit/test (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge kunit/test +Already up to date. +Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6) +$ git merge cel/cel-next +Already up to date. +Merging kasan-bitops/topic/kasan-bitops (4f4afc2c9599 docs/core-api: Remove possibly confusing sub-headings from Bit Operations) +$ git merge kasan-bitops/topic/kasan-bitops +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 kunit-next/kunit (e20d8e81a0e0 Documentation: kunit: fixed sphinx error in code block) +$ git merge kunit-next/kunit +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/usage.rst | 1 + + 1 file changed, 1 insertion(+) +$ git am -3 ../patches/0001-Revert-soc-imx-increase-build-coverage-for-imx8m-soc.patch +Applying: Revert "soc: imx: increase build coverage for imx8m soc driver" +Merging akpm-current/current (5b957e5ca736 init/Kconfig: clean up ANON_INODES and old IO schedulers options) +$ git merge --no-ff akpm-current/current +Auto-merging net/ipv4/tcp.c +Auto-merging mm/Makefile +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/linux/wait.h +Auto-merging include/linux/sched.h +Auto-merging arch/m68k/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/m68k/include/asm/Kbuild +Auto-merging arch/csky/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/csky/include/asm/Kbuild +Auto-merging MAINTAINERS +Resolved 'arch/csky/include/asm/Kbuild' using previous resolution. +Resolved 'arch/m68k/include/asm/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6d6517719729] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v1/hugetlb.rst | 103 +++- + Documentation/core-api/pin_user_pages.rst | 86 ++- + Documentation/process/deprecated.rst | 10 +- + Documentation/vm/free_page_reporting.rst | 41 ++ + Documentation/vm/zswap.rst | 20 +- + MAINTAINERS | 7 + + arch/alpha/include/asm/Kbuild | 11 - + arch/alpha/kernel/syscalls/syscallhdr.sh | 2 +- + arch/arc/include/asm/Kbuild | 21 - + arch/arm/include/asm/Kbuild | 12 - + arch/arm64/include/asm/Kbuild | 18 - + arch/c6x/include/asm/Kbuild | 37 -- + arch/csky/include/asm/Kbuild | 36 -- + arch/h8300/include/asm/Kbuild | 46 -- + arch/hexagon/include/asm/Kbuild | 33 -- + arch/ia64/include/asm/Kbuild | 7 - + arch/ia64/kernel/syscalls/syscallhdr.sh | 2 +- + arch/m68k/include/asm/Kbuild | 24 - + arch/microblaze/include/asm/Kbuild | 30 - + arch/microblaze/kernel/syscalls/syscallhdr.sh | 2 +- + arch/mips/include/asm/Kbuild | 13 - + arch/mips/kernel/syscalls/syscallhdr.sh | 3 +- + arch/nds32/include/asm/Kbuild | 37 -- + arch/nios2/include/asm/Kbuild | 38 -- + arch/openrisc/include/asm/Kbuild | 36 -- + arch/parisc/include/asm/Kbuild | 18 - + arch/parisc/kernel/syscalls/syscallhdr.sh | 2 +- + arch/powerpc/include/asm/Kbuild | 4 - + arch/powerpc/kernel/syscalls/syscallhdr.sh | 3 +- + arch/riscv/include/asm/Kbuild | 28 - + arch/s390/include/asm/Kbuild | 15 - + arch/sh/include/asm/Kbuild | 16 - + arch/sh/kernel/syscalls/syscallhdr.sh | 2 +- + arch/sparc/include/asm/Kbuild | 14 - + arch/sparc/kernel/syscalls/syscallhdr.sh | 2 +- + arch/unicore32/include/asm/Kbuild | 34 -- + arch/x86/include/asm/Kbuild | 2 - + arch/x86/mm/fault.c | 26 +- + arch/xtensa/include/asm/Kbuild | 26 - + arch/xtensa/kernel/syscalls/syscallhdr.sh | 2 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/base/memory.c | 126 ++-- + drivers/virtio/Kconfig | 1 + + drivers/virtio/virtio_balloon.c | 87 ++- + fs/aio.c | 9 +- + fs/buffer.c | 56 +- + fs/proc/page.c | 40 +- + fs/ramfs/inode.c | 12 + + include/asm-generic/Kbuild | 52 ++ + include/linux/compat.h | 29 - + include/linux/hugetlb.h | 49 +- + include/linux/hugetlb_cgroup.h | 169 +++++- + include/linux/ktime.h | 37 -- + include/linux/memory.h | 1 - + include/linux/memremap.h | 6 + + include/linux/mm.h | 110 +++- + include/linux/mm_types.h | 7 +- + include/linux/mmzone.h | 46 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 11 + + include/linux/page_ref.h | 9 + + include/linux/page_reporting.h | 26 + + include/linux/sched.h | 8 + + include/linux/string.h | 45 ++ + include/linux/time32.h | 154 +---- + include/linux/timekeeping32.h | 32 - + include/linux/types.h | 5 - + include/linux/vmalloc.h | 5 +- + include/linux/wait.h | 4 +- + include/uapi/asm-generic/posix_types.h | 2 + + include/uapi/linux/mman.h | 5 +- + include/uapi/linux/swab.h | 4 +- + include/uapi/linux/time.h | 22 +- + include/uapi/linux/virtio_balloon.h | 1 + + init/Kconfig | 3 +- + ipc/sem.c | 6 +- + kernel/compat.c | 64 -- + kernel/fork.c | 10 +- + kernel/hung_task.c | 44 ++ + kernel/notifier.c | 2 +- + kernel/relay.c | 17 +- + kernel/time/time.c | 43 -- + kernel/watchdog.c | 22 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 18 + + lib/Makefile | 1 + + lib/bch.c | 2 +- + lib/scatterlist.c | 2 +- + lib/string.c | 16 + + lib/test_lockup.c | 554 ++++++++++++++++++ + lib/ts_bm.c | 2 +- + lib/ts_fsm.c | 2 +- + lib/ts_kmp.c | 2 +- + mm/Kconfig | 129 ++++- + mm/Makefile | 1 + + mm/debug.c | 44 +- + mm/filemap.c | 2 +- + mm/gup.c | 451 ++++++++++++--- + mm/gup_benchmark.c | 71 ++- + mm/huge_memory.c | 29 +- + mm/hugetlb.c | 641 ++++++++++++++++----- + mm/hugetlb_cgroup.c | 317 ++++++++-- + mm/internal.h | 2 + + mm/mapping_dirty_helpers.c | 42 +- + mm/memcontrol.c | 11 +- + mm/memory.c | 153 ++++- + mm/mempolicy.c | 39 +- + mm/memremap.c | 20 + + mm/migrate.c | 96 ++- + mm/mmap.c | 43 +- + mm/mremap.c | 98 +++- + mm/nommu.c | 10 +- + mm/page_alloc.c | 166 ++++-- + mm/page_ext.c | 5 +- + mm/page_isolation.c | 6 +- + mm/page_reporting.c | 364 ++++++++++++ + mm/page_reporting.h | 54 ++ + mm/rmap.c | 19 +- + mm/shuffle.c | 12 +- + mm/shuffle.h | 6 + + mm/slab_common.c | 2 +- + mm/sparse.c | 2 +- + mm/swapfile.c | 43 +- + mm/vmalloc.c | 11 +- + mm/vmpressure.c | 8 +- + mm/vmscan.c | 15 +- + mm/vmstat.c | 2 + + mm/zswap.c | 24 +- + net/ipv4/tcp.c | 70 ++- + scripts/checkpatch.pl | 103 +++- + scripts/get_maintainer.pl | 32 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + .../selftests/vm/charge_reserved_hugetlb.sh | 575 ++++++++++++++++++ + tools/testing/selftests/vm/gup_benchmark.c | 15 +- + .../selftests/vm/hugetlb_reparenting_test.sh | 244 ++++++++ + tools/testing/selftests/vm/run_vmtests | 55 ++ + tools/testing/selftests/vm/write_hugetlb_memory.sh | 23 + + tools/testing/selftests/vm/write_to_hugetlbfs.c | 242 ++++++++ + 139 files changed, 5299 insertions(+), 1853 deletions(-) + create mode 100644 Documentation/vm/free_page_reporting.rst + create mode 100644 include/linux/page_reporting.h + create mode 100644 lib/test_lockup.c + create mode 100644 mm/page_reporting.c + create mode 100644 mm/page_reporting.h + create mode 100644 tools/testing/selftests/vm/charge_reserved_hugetlb.sh + create mode 100644 tools/testing/selftests/vm/hugetlb_reparenting_test.sh + create mode 100644 tools/testing/selftests/vm/write_hugetlb_memory.sh + create mode 100644 tools/testing/selftests/vm/write_to_hugetlbfs.c +$ git am -3 ../patches/0001-Revert-net-zerocopy-use-vm_insert_pages-for-tcp-rcv-.patch +Applying: Revert "net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix" +$ git reset HEAD^ +Unstaged changes after reset: +M net/ipv4/tcp.c +$ git add -A . +$ git commit -v -a --amend +[master 508e8a9b2cc2] Merge branch 'akpm-current/current' + Date: Tue Feb 18 13:17:31 2020 +1100 +$ git am -3 ../patches/0002-Revert-net-zerocopy-use-vm_insert_pages-for-tcp-rcv-.patch +Applying: Revert "net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy" +$ git reset HEAD^ +Unstaged changes after reset: +M net/ipv4/tcp.c +$ git add -A . +$ git commit -v -a --amend +[master 959cace945e0] Merge branch 'akpm-current/current' + Date: Tue Feb 18 13:17:31 2020 +1100 +$ git am -3 ../patches/0003-Revert-add-missing-page_count-check-to-vm_insert_pag.patch +Applying: Revert "add missing page_count() check to vm_insert_pages()." +$ git reset HEAD^ +Unstaged changes after reset: +M mm/memory.c +$ git add -A . +$ git commit -v -a --amend +[master 746bb4a3d545] Merge branch 'akpm-current/current' + Date: Tue Feb 18 13:17:31 2020 +1100 +$ git am -3 ../patches/0004-Revert-mm-add-vm_insert_pages-fix.patch +Applying: Revert "mm-add-vm_insert_pages-fix" +$ git reset HEAD^ +Unstaged changes after reset: +M mm/memory.c +$ git add -A . +$ git commit -v -a --amend +[master 9ddb80cd2409] Merge branch 'akpm-current/current' + Date: Tue Feb 18 13:17:31 2020 +1100 +$ git am -3 ../patches/0005-Revert-mm-memory.c-add-vm_insert_pages.patch +Applying: Revert "mm/memory.c: add vm_insert_pages()" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/mm.h +M mm/memory.c +$ git add -A . +$ git commit -v -a --amend +[master b6365e28dfa1] Merge branch 'akpm-current/current' + Date: Tue Feb 18 13:17:31 2020 +1100 +$ 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 +First, rewinding head to replay your work on top of it... +Applying: mm/frontswap: mark various intentional data races +Applying: mm/page_io: mark various intentional data races +Applying: mm-page_io-mark-various-intentional-data-races-v2 +Applying: mm/swap_state: mark various intentional data races +Applying: mm/kmemleak: annotate various data races obj->ptr +Applying: mm/filemap.c: fix a data race in filemap_fault() +Applying: mm/swapfile: fix and annotate various data races +Applying: mm-swapfile-fix-and-annotate-various-data-races-v2 +Applying: mm/page_counter: fix various data races at memsw +Applying: mm/memcontrol: fix a data race in scan count +Applying: mm/list_lru: fix a data race in list_lru_count_one +Applying: mm/mempool: fix a data race in mempool_free() +Applying: mm/util.c: annotate an data race at vm_committed_as +Applying: mm/rmap: annotate a data race at tlb_flush_batched +Applying: drivers/tty/serial/sh-sci.c: suppress warning +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 13d06fbc4958...d445fed97103 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (d445fed97103 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + drivers/tty/serial/sh-sci.c | 2 +- + include/linux/memcontrol.h | 2 +- + mm/filemap.c | 20 +++++++++++------- + mm/frontswap.c | 8 +++---- + mm/kmemleak.c | 9 ++++++-- + mm/list_lru.c | 2 +- + mm/memory.c | 4 ++-- + mm/mempool.c | 2 +- + mm/page_counter.c | 13 ++++++------ + mm/page_io.c | 8 +++---- + mm/rmap.c | 2 +- + mm/swap_state.c | 4 ++-- + mm/swapfile.c | 31 ++++++++++++++++------------ + mm/util.c | 8 +++++-- + 15 files changed, 70 insertions(+), 49 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..60ec6cc9b303 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 5.5 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..64954a3d980c --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200218 |