diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-02-03 14:12:59 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-02-03 14:12:59 +1100 |
| commit | cee5a42837d4a6c4189f06f7bf355b97a24c3c93 (patch) | |
| tree | 2496ddac3c64f5d7629058c03877ce3ca6274c07 | |
| parent | ab7f723a7131c6b2c444a1e8d2b8d466711d31c9 (diff) | |
| download | linux-next-next-20200203.tar.gz | |
Add linux-next specific files for 20200203next-20200203
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 | 5452 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6089 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..0d02c24a1acc --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,316 @@ +Name SHA1 +---- ---- +origin 46d6b7becb1d5a8e697db786590c19e4067a975a +fixes d21718ad2f81b788c2a37baa3898fff01e8f81aa +kbuild-current 94f2630b18975bb56eee5d1a36371db967643479 +arc-current f45ba2bd6da0dc8000aa7ea7a3858fb51608f766 +arm-current 6849b5eba1965ceb0cad3a75877ef4569dd3638e +arm-soc-fixes 6716cb162deb9d474095a57d7a515edc13926ea7 +arm64-fixes aa638cfe3e7358122a15cb1d295b622aae69e006 +m68k-current 6aabc1facdb24e837cfea755ba46a6be22a8860f +powerpc-fixes 5d2e5dd5849b4ef5e8ec35e812cdb732c13cd27e +s390-fixes def9d2780727cec3313ed3522d0123158d87224d +sparc 11648b8339f840d4b1f4c54a1abec8025d9e077d +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net dff6bc1bfd462b76dc13ec19dedc2c134a62ac59 +bpf 2577e373bbc07f18680287b3958d3b2fdebe4b20 +ipsec 72d62c4e422ed2380a2acd51747789b48146e4ee +netfilter 78e06cf430934fc3768c342cbebdd1013dcd6fa7 +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers 1754c4f60aaf1e17d886afefee97e94d7f27b4cb +mac80211 8b792f84c6377b27235fef16f5e78a59f890b3e1 +rdma-fixes 9554de394b7eee01606e64c3806cd43893f3037e +sound-current 112e3f5ac505ea0f1e3c59cc757db3c45252c41d +sound-asoc-fixes ab8ccdd6018b8254a48c4beed6ca3750167676b0 +regmap-fixes def9d2780727cec3313ed3522d0123158d87224d +regulator-fixes d670b40cfde88813500e1f0c8088060ef2fe16c3 +spi-fixes 7265e8fc51081f08728cc7528fd4640a81ec6768 +pci-current 5e89cd303e3a4505752952259b9f1ba036632544 +driver-core.current 9f68e3655aae6d49d6ba05dd263f99f33c2567af +tty.current b3a987b0264d3ddbb24293ebff10eddfc472f653 +usb.current 9f68e3655aae6d49d6ba05dd263f99f33c2567af +usb-gadget-fixes e5b5da96da50ef30abb39cb9f694e99366404d24 +usb-serial-fixes def9d2780727cec3313ed3522d0123158d87224d +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 4f510aa10468954b1da4e94689c38ac6ea8d3627 +staging.current 39bed42de2e7d74686a2d5a45638d6a5d7e7d473 +char-misc.current 98c49f1746ac44ccc164e914b9a44183fad09f51 +soundwire-fixes e42617b825f8073569da76dc4510bfa019b1c35a +thunderbolt-fixes d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 +input-current b19efcabb587e5470a423ef778905f47e5a47f1a +crypto-current 0bc81767c5bd9d005fae1099fb39eb3688370cb1 +ide 94f2630b18975bb56eee5d1a36371db967643479 +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes c79f46a282390e0f5b306007bf7b11a46d529538 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +slave-dma-fixes c79f46a282390e0f5b306007bf7b11a46d529538 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes def9d2780727cec3313ed3522d0123158d87224d +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 8821e92879a397b7ad318cc7e8ba784f588f872a +reset-fixes 08953144526245157ae89275ebb5f703da34e8a6 +mips-fixes bbcc5672b0063b0e9d65dc8787a4f09c3b5bb5cc +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes b0b03951544534d6d9ad4aa2787eefec988fff20 +kvm-fixes ae6088216ce4b99b3a4aaaccd2eb2dd40d473d42 +kvms390-fixes fe33a928bfcd673ecf73b990d704ef18a907c409 +hwmon-fixes 7fee59f207819f1a57a66c176f81fc966d6e4f01 +nvdimm-fixes c1468554776229d0db69e74a9aaf6f7e7095fd51 +btrfs-fixes 5715b7fa8d8d2dffa5a6391669f8d1f946ff70e8 +vfs-fixes d0cb50185ae942b03c4327be322055d622dc79f6 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 +samsung-krzk-fixes a2315d3aea5976acd919d3d3fcf82f752562c25b +pinctrl-samsung-fixes e42617b825f8073569da76dc4510bfa019b1c35a +devicetree-fixes fdf34a19296cc7037bdab0c17d28785079c0f749 +scsi-fixes 81a82753dc1db385e479c372031efa77819695fb +drm-fixes d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 +mmc-fixes 2a187d03352086e300daa2044051db00044cd171 +rtc-fixes f01f4ffdfb703694035870f94b10f6ef2523f8de +gnss-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +hyperv-fixes af42d3466bdc8f39806b26f593604fdc54140bcb +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes def9d2780727cec3313ed3522d0123158d87224d +pidfd-fixes 0bef168e88595a1c42fa83009ffabb26535368f8 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx b3a6082223369203d7e7db7e81253ac761377644 +gpio-intel-fixes d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 +pinctrl-intel-fixes d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 +erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +drm-misc-fixes 8ccb5bf7619c6523e7a4384a84b72e7be804298c +kspp-gustavo 3d519d6d388ba4f9a75d0e0b6f60d890987bc096 +kbuild 94f2630b18975bb56eee5d1a36371db967643479 +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 8c8c5a4994a306c217fd061cbfc5903399fd4c1c +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 29cd07a400ae781c4b10019575ee9fe28d38ba2f +arm64 e533dbe9dcb199bb637a2c465f3a6e70564994fe +arm-perf 8703317ae576c9bf3e07e5b97275e3f957e8d74b +arm-soc 18ee80c0533a8798ccbb449663f44dc108c4ccc3 +amlogic 1b01733a04009545f3cc243416e0f460cd875657 +aspeed 767774e5f8b3bd832819cf375a41e95329a25628 +at91 4ba105339864b426a8e39b6951a9cd34d2d1de14 +bcm2835 f142341846711f8f3cb85e4df5e0130d9e017a9d +imx-mxs c65228f2fe918cb2464c96c91c082936486fe03d +keystone a1766a49fc90df3ac1ab3004dd3d4a80480c1a31 +mediatek fdef5207b966ab5d33643effb89fd890373dfcee +mvebu c0d03b53ef47dbade7be742ec897c77879ad7ccb +omap f9f5267ec2963fdfe01d68abdfed267f30d19843 +qcom 4c26b123c1dd1a799457f4949a5206bec74a46e6 +realtek 45698e00d5a904bdefd5d4cd4a751803674815f1 +renesas 9e4188a77f5e34d4d3c9c2813bbf718510a2e96b +reset 5ec504fa67af37ba4dd0b1b27f28d311bd402c21 +rockchip d9279b5b52efba80afd68ba950232feeb36585db +samsung-krzk ce232ab5d7c8b7f7d0e5fc272bdb66313740050c +scmi f45e09d6e80bcefc2ba30f82dd5ce5b79850e1ea +sunxi 7493e675c5849046b9aa2dd38834414aa0d95237 +tegra 9a55272ef4d5db612d37d911fe3249096de07ffc +clk db865ee447d46eccd641dc70c7f9acc231a3141e +clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 192872ee3e7986ef28e24799b9168be92d6b0660 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 240b62d381fe5b66c496a6fd55edff3976a9be51 +m68k 6aabc1facdb24e837cfea755ba46a6be22a8860f +m68knommu def9d2780727cec3313ed3522d0123158d87224d +microblaze 22648c989cb8305f51b96b5962df8674697bb2ab +mips 2c4288719806ca0b3de1b742ada26b25a60d6a45 +nds32 a7f96fce201c4969178c8709a49e005d9792186b +nios2 051d75d3bb31d456a41c7dc8cf2b8bd23a96774f +openrisc 0ecdcaa6d5e78649578ff32c37556a4140b64edf +parisc-hd 8121fbc4ebbbb2ad29f4393ebfaaa588905dc693 +powerpc 4c25df5640ae6e4491ee2c50d3f70c1559ef037d +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 6e62bd36e9ad85a22d92b1adce6a0336ea549733 +risc-v 4d99abce8ce80e866020ffa5b2bd790269235f37 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 55d0a513a0e202c68af2c8f4b1e923a345227bbb +sh a193018e5290ee9d9fe62ad80cd8f874711eb575 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml d65197ad52494bed3b5e64708281b8295f76c391 +xtensa ede5ef35ce32edfbec3ada22260ed86e1d5c4478 +fscrypt edc440e3d27fb31e6f9663cf413fad97d714c060 +afs 4fe171bb81b13b40bf568330ec3716dfb304ced1 +btrfs 1f1b5766df75738fe1ce6e77f0fb3275b77b768a +ceph 3325322f773bae68b20d8fa0e9e8ebb005271db5 +cifs 94f2630b18975bb56eee5d1a36371db967643479 +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs 1e4a295567949ee8e6896a7db70afd1b6246966e +ext3 daf1cd925487599ac1a9191ff264bf928c61834c +ext4 7f6225e446cc8dfa4c3c7959a4de3dd03ec277bf +f2fs ccaaaf6fe5a5e1fffca5cca0f3fc4ec84d7ae752 +fsverity da3a3da4e6c68459618a1043dcb12b450312a4e2 +fuse 7df1e988c723a066754090b22d047c3225342152 +jfs 802a5017ffb27ade616d0fe605f699a3c6303aa3 +nfs d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 +nfs-anna 1346d280eafaf7eabc8349e3d1e9e17c2d55cf84 +nfsd 06b3fc37dfd61b75fa8290538d944026c05d7e89 +orangefs f9bbb68233aa5bd5ef238bd3532fddf92fa1b53c +overlayfs 1a980b8cbf0059a5308eea61522f232fd03002e2 +ubifs fe357dbae113f6ad89b77818ef92784eb11e21ba +v9fs 79fb9216b7be1832b90c8ddf3c2d465b46670e81 +xfs cdbcf82b86ea24aa942991b4233cd8ddf13f590c +zonefs 37d131712f17b902ae1c47c1a9f600d946ee09b0 +iomap 243145bc4336684c69f95de0a303b31f2e5bf264 +djw-vfs 3253d9d093376d62b4a56e609f15d2ec5085ac73 +file-locks 98ca480a8f22fdbd768e3dad07024c8d4856576c +vfs d2dfd78ce9d2256cf456bd39704cc1db9dcd25b0 +printk e616b43fb3a3c3ae2ba02dc6a7bbeb9003c03c7d +pci 01b810ed71878785d189d01e4d7425a11203d7a8 +pstore e163fdb3f7f8c62dccf194f3f37a7bcb3c333aa8 +hid d036ff0e56a79b5bee805dc9668febe8dca3adfa +i2c ccf7f7a51619e9f2ccbab860cd14bef918aec093 +i3c 3952cf8ff2f7751ee2f9d6cc6140df4667853250 +dmi 2429c99fa13a6330cd9e1b9e6086b290735e77bb +hwmon-staging fd8bdb23b91876ac1e624337bb88dc1dcc21d67e +jc_docs 77ce1a47ebca88bf1eb3018855fc1709c7a1ed86 +v4l-dvb 1697d98124819aab09b86602978bd4f50e101e2d +v4l-dvb-next d45331b00ddb179e291766617259261c112db872 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm dd08aa64df30fbdd51eb713a341ca2e58b5f9635 +cpufreq-arm a48ac1c9f294e1a9b692d9458de6e6b58da8b07d +cpupower 8c30fa7666ff08dad632411d1a9b9883940e53ef +opp 03758d60265c773e1d06d436b99ee338f2ac55d6 +thermal eefb85077bfe5b095db992a8bb596a72e40e00cf +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 8889f6fa35884d09f24734e10fea0c9ddcbc6429 +net-next 9f68e3655aae6d49d6ba05dd263f99f33c2567af +bpf-next b3a6082223369203d7e7db7e81253ac761377644 +ipsec-next e27cca96cd68fa2c6814c90f9a1cfd36bb68c593 +mlx5-next 9b695a64279e4828aeb2ef93f16eb278707ad5f4 +netfilter-next b3a6082223369203d7e7db7e81253ac761377644 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next 2a13513f99e735184fd6f889d78da6424fda80a1 +bluetooth fe66483156050f4eb63c4a1988f3b439e6c9ff2a +mac80211-next 30b2f0be23fb40e58d0ad2caf8702c2a44cda2e1 +gfs2 a31b4ec539e966515f1f97f4000d0e2a399930ce +mtd 4575243c5c173f8adbc08a5c6ea2269742ea2b47 +nand d85339d9ea2660b550f12aca8bd040be4395c963 +spi-nor ccfb9299a0b63da4fde607c822e1470472a46177 +crypto 0bc81767c5bd9d005fae1099fb39eb3688370cb1 +drm b45f1b3b585e195a7daead16d914e164310b1df6 +amdgpu 658d696d01975fa788e412df86e61e5a046e7755 +drm-intel f0b2878f3649aba9cc70e7be30535d4dd74c69d7 +drm-tegra c472a0b0a1fd1688157b4ad6efc1c3fb8e571a53 +drm-misc db735fc4036bbe1fbe606819b5f0ff26cc76cdff +drm-msm 5f9935f514d66ddba868e587d9e976a567232547 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8 +regmap ea87683909bcda665527a828505c5e9c6a625429 +sound 112e3f5ac505ea0f1e3c59cc757db3c45252c41d +sound-asoc ab8ccdd6018b8254a48c4beed6ca3750167676b0 +modules 6080d608eeff7cb5090a2ddbaf723bfb0ff133fc +input c5ccf2ad3d33413fee06ae87d0b970d8cc540db6 +block a6aed3aa015dccfb8f3a7709d95398611c25a348 +device-mapper 47ace7e012b9f7ad71d43ac9063d335ea3d6820b +pcmcia 71705c611263cad99edf85a5ea021e098cac032b +mmc 533a6cfe08f96a7b5c65e06d20916d552c11b256 +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 6a24f567af4accef6d73b0be407227c537b94a1f +backlight 7af43a76695db71a57203793fb9dd3c81a5783b1 +battery 3d32a8437c051013352baf5cbd0844fcf5d2f409 +regulator 29bf153e5fbc3e094953e1f33279d10326667621 +security 10c2d111c906599942efd13109061885631c4a0c +apparmor 01df52d726b5d55d2970f5c957f1961930acd5d6 +integrity d54e17b4066612d88c4ef3e5fb3115f12733763d +keys 24f779af047649916c20f3d0ebac144860415732 +selinux 98aa00345de54b8340dc2ddcd87f446d33387b5e +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo b3a6082223369203d7e7db7e81253ac761377644 +tpmdd 7084eddf6be94e73f8298c1a28078b91536f2975 +watchdog 057b52b4b3d58f4ee5944171da50f77b00a1bb0d +iommu e3b5ee0cfb65646f4a915643fe53e0a51829d891 +vfio 7b5372ba04ca1caabed1470d4ec23001cde2eb91 +audit cb5172d96d16df72db8b55146b0ec00bfd97f079 +devicetree e9a3bfe38e393e1d8bd74986cdc9b99b8f9d1efc +mailbox c6c6bc6ea9fce31baaca053befc31215cfcb3dd9 +spi 754a36a58c29718bf5e28b8789b17bffbb60e8a6 +tip 178915ad4ab329db55c28b53b4a249fed401cba1 +clockevents e4c3b4213b79017001be2a311d7aafebe7497e8a +edac 7e5d6cf35329c8b232a1e97114545c1745d79083 +irqchip 656b42deddea57e55a570671db9403af0ed3c439 +ftrace 2b90927c77c973771cc658d639724d5b247a83eb +rcu 59d8cc6b2e375ff486b030da6703b1d481e186e6 +kvm 4cbc418a44d5067133271bb6eeac2382f2bf94f7 +kvm-arm 4a267aa707953a9a73d1f5dc7f894dd9024a92be +kvm-ppc fd24a8624eb29d3b6b7df68096ce0321b19b03c6 +kvms390 b2ff728bae9b04b533fbc8de66f1719c4dc889de +xen-tip 8557bbe5156e5fba022d5a5220004b1e016227ee +percpu 9391e7a9a1e29c94b432cea0d27ee043a7560758 +workqueues e8ab20d9bcb3e98b3e205396a56799b276951b64 +drivers-x86 cf85e7c7f437cb4e378bddbdb366477096714819 +chrome-platform 27ef91a2e9a589cade3df8106b37be36852e7b2b +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 260718b3a35d23fe89d27cc7b5e8bd30f4bba1aa +ipmi 6b8526d3abc02c08a2f888e8c20b7ac9e5776dfe +driver-core 9f68e3655aae6d49d6ba05dd263f99f33c2567af +usb 9f68e3655aae6d49d6ba05dd263f99f33c2567af +usb-gadget 4baa550ecc86693106493bd92382e0edb8caf64d +usb-serial 19c64e7354e50d19e7b5ddf94bfb5fa24d69594c +usb-chipidea-next 4d6141288c33b73027260e73df262464cbe1fd0d +phy-next 3f41f8ca21c5bdb9fd6c2f6ecdd24e279b8ec4e1 +tty 85f4c95172d606dd66f7ee1fa50c45a245535ffd +char-misc 15d6632496537fa66488221ee5dd2f9fb318ef2e +extcon b7365587f513540c962a734c12cf422ca9a111a5 +soundwire 5098cae1f79cc0580dc2741ce250307a60451eca +thunderbolt d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 +staging 39bed42de2e7d74686a2d5a45638d6a5d7e7d473 +mux f356d58c3a04159f35003b26f8c5183f9456f95d +icc 30c8fa3ec61a46da80698e1f8ab95df4d42bf374 +slave-dma 474809a28e7b0671a5090de6e0db91f0e3821360 +cgroup 0cd9d33ace336bc424fc30944aa3defd6786e4fe +scsi c4b119f431e1fa3950ebd0dfcc401e36b38807d0 +scsi-mkp 81a82753dc1db385e479c372031efa77819695fb +vhost d1281e3a562ec6a08f944a876481dd043ba739b9 +rpmsg 34a9acb223e354c05ed1d8372a466abb2bf56651 +gpio 0282c72d30d32913d641dc81f3f38607ace98802 +gpio-brgl 1e4d149e901769fcde71be039227d184c6e4fda9 +gpio-intel d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 +pinctrl 122ce22cb37b087e7e28ebb16044a622b0a22233 +pinctrl-intel cd0a32371db73d0b50536a7ca4f036abddff0d1d +pinctrl-samsung 225a2ec19aac426ef29f0e4accfc890c87d38bdc +pwm 9871abffc81048e20f02e15d6aa4558a44ad53ea +userns 61a47c1ad3a4dc6882f01ebdc88138ac62d0df03 +ktest 9b5f852ae20d998a534eea46d54e68584868ae8c +random 4cb760b02419061209b9b4cc2557986a6bf93e73 +kselftest af4ddd607dff7aabd466a4a878e01b9f592a75ab +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching d28b4c1b2b3d1337069cbe0bf0bec151d0e4d576 +coresight ad9882f158845df08627dd41af03dddd28104897 +rtc f45719240700398b63a165f6b7f3fbab04f0b052 +nvdimm 46cf053efec6a3a5f343fead837777efe8252a46 +at24 cd5676db0574cc1c0b234bc3b17565b07290aa72 +ntb 1ef512b16bc8e51453d7105609c88f51fba4dcf5 +kspp c79f46a282390e0f5b306007bf7b11a46d529538 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss d1eef1c619749b2a57e514a3fa67d9a516ffa919 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus 526eaf5d08a21d2ea4b84f7df348702ba5cae00a +nvmem 4a81ae0c43bc9483f946fe30aa31ce242f272efa +xarray 3a00e7c47c382b30524e78b36ab047c16b8fcfef +hyperv 54e19d34011fea26d39aa74781131de0ce642a01 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb c58ff643763c78bef12874ee39995c9f7f987bc2 +pidfd 8d19f1c8e1937baf74e1962aae9f90fa3aeab463 +devfreq 054fef0337fe936ad218fcf73cd95d86343a717f +hmm 5292e24a6acf5694e0a32c31e3321964176bc17e +fpga 28910cee898c2a43fcdd8c26e1378ae8084a93a0 +kunit e42617b825f8073569da76dc4510bfa019b1c35a +cel a99d8080aaf358d5d23581244e5da23b35e340b9 +kasan-bitops 4f4afc2c9599520300b3f2b3666d2034fca03df3 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +kunit-next 35c57fc3f8eac81b38664a0fe160e267b908d8b8 +akpm-current c2ab9895e523d234e53e9520552641ab64e54ff3 +akpm f1f518d16d24dee94df900c23d147758aab29171 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..e0d729a393f8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5452 @@ +$ date -R +Mon, 03 Feb 2020 07:51:06 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm +Merging origin/master (46d6b7becb1d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge origin/master +Updating 9f68e3655aae..46d6b7becb1d +Fast-forward + .mailmap | 2 + + Documentation/ABI/testing/sysfs-fs-f2fs | 280 ++-- + Documentation/PCI/msi-howto.rst | 2 +- + Documentation/admin-guide/ext4.rst | 2 + + Documentation/admin-guide/kernel-parameters.txt | 12 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/pin_user_pages.rst | 232 +++ + Documentation/dev-tools/kasan.rst | 4 +- + .../devicetree/bindings/leds/leds-lm3692x.txt | 8 + + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 14 +- + .../devicetree/bindings/media/amlogic,gx-vdec.yaml | 141 ++ + .../devicetree/bindings/media/amlogic,vdec.txt | 72 - + .../devicetree/bindings/media/hix5hd2-ir.txt | 3 +- + .../devicetree/bindings/media/renesas,vin.txt | 4 +- + .../devicetree/bindings/media/ti,cal.yaml | 202 +++ + Documentation/devicetree/bindings/media/ti-cal.txt | 72 - + Documentation/devicetree/bindings/mfd/tps6105x.txt | 47 +- + .../devicetree/bindings/mips/ingenic/devices.yaml | 35 + + .../devicetree/bindings/mtd/denali-nand.txt | 7 + + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 97 ++ + .../devicetree/bindings/pci/intel-gw-pcie.yaml | 138 ++ + .../devicetree/bindings/pci/qcom,pcie.txt | 19 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + .../driver-api/thermal/cpu-idle-cooling.rst | 5 + + .../features/core/jump-labels/arch-support.txt | 2 +- + Documentation/filesystems/f2fs.txt | 216 +-- + Documentation/filesystems/fscrypt.rst | 6 +- + Documentation/kbuild/kconfig-language.rst | 7 +- + Documentation/kbuild/kconfig.rst | 5 - + Documentation/media/kapi/dtv-frontend.rst | 16 +- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 2 +- + Documentation/media/uapi/dvb/video-get-event.rst | 2 +- + Documentation/media/uapi/dvb/video_types.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-reserved.rst | 3 +- + Documentation/media/uapi/v4l/pixfmt-srggb12p.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-srggb14p.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-tch-td16.rst | 34 +- + Documentation/media/uapi/v4l/pixfmt-tch-tu16.rst | 34 +- + Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 4 +- + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 2 +- + Documentation/media/v4l-drivers/cx18.rst | 39 - + Documentation/media/v4l-drivers/index.rst | 1 - + Documentation/powerpc/ultravisor.rst | 60 + + Documentation/virt/kvm/api.txt | 9 + + Documentation/vm/zswap.rst | 13 + + Documentation/x86/intel_mpx.rst | 252 --- + MAINTAINERS | 63 +- + Makefile | 24 +- + arch/arc/Kconfig | 16 +- + arch/arc/boot/dts/axs10x_mb.dtsi | 1 + + arch/arc/include/asm/arcregs.h | 2 + + arch/arc/include/asm/fpu.h | 55 + + arch/arc/include/asm/processor.h | 10 +- + arch/arc/include/asm/switch_to.h | 17 +- + arch/arc/include/asm/syscalls.h | 1 + + arch/arc/include/uapi/asm/unistd.h | 1 + + arch/arc/kernel/Makefile | 2 + + arch/arc/kernel/entry.S | 12 + + arch/arc/kernel/fpu.c | 29 +- + arch/arc/kernel/process.c | 13 +- + arch/arc/kernel/sys.c | 1 + + arch/arm/include/asm/kvm_emulate.h | 27 +- + arch/arm/include/asm/kvm_host.h | 16 +- + arch/arm/include/asm/kvm_hyp.h | 1 + + arch/arm/include/asm/kvm_mmio.h | 26 - + arch/arm/kvm/guest.c | 5 - + arch/arm64/include/asm/kvm_emulate.h | 40 +- + arch/arm64/include/asm/kvm_host.h | 16 +- + arch/arm64/include/asm/kvm_mmio.h | 29 - + arch/arm64/include/asm/ptrace.h | 1 + + arch/arm64/include/uapi/asm/kvm.h | 12 +- + arch/arm64/include/uapi/asm/ptrace.h | 1 + + arch/arm64/kvm/guest.c | 5 - + arch/arm64/kvm/hyp/entry.S | 7 +- + arch/arm64/kvm/inject_fault.c | 70 +- + arch/arm64/kvm/reset.c | 2 +- + arch/arm64/kvm/va_layout.c | 56 +- + arch/mips/Kconfig | 84 +- + arch/mips/Makefile.postlink | 2 +- + arch/mips/boot/Makefile | 2 +- + arch/mips/boot/dts/ingenic/Makefile | 1 + + arch/mips/boot/dts/ingenic/cu1000-neo.dts | 170 ++ + arch/mips/boot/dts/ingenic/x1000.dtsi | 317 ++++ + .../dts/ralink/gardena_smart_gateway_mt7688.dts | 8 + + arch/mips/boot/dts/ralink/mt7628a.dtsi | 10 + + arch/mips/cavium-octeon/octeon-irq.c | 2 +- + arch/mips/configs/cu1000-neo_defconfig | 117 ++ + arch/mips/configs/generic/board-ocelot.config | 1 + + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/bootinfo.h | 1 + + arch/mips/include/asm/cpu-features.h | 4 + + arch/mips/include/asm/cpu.h | 6 +- + arch/mips/include/asm/gio_device.h | 2 - + arch/mips/include/asm/hazards.h | 4 +- + arch/mips/include/asm/irqflags.h | 6 +- + arch/mips/include/asm/local.h | 4 + + .../mips/include/asm/mach-ip27/kernel-entry-init.h | 12 +- + arch/mips/include/asm/mach-ip27/mangle-port.h | 4 +- + arch/mips/include/asm/mach-ip27/mmzone.h | 4 +- + arch/mips/include/asm/mach-ip27/topology.h | 2 +- + .../asm/mach-loongson64/cpu-feature-overrides.h | 2 + + arch/mips/include/asm/mipsregs.h | 3 + + arch/mips/include/asm/pci/bridge.h | 3 +- + arch/mips/include/asm/serial.h | 18 - + arch/mips/include/asm/sn/arch.h | 3 - + arch/mips/include/asm/sn/hub.h | 17 - + arch/mips/include/asm/sn/intr.h | 17 - + arch/mips/include/asm/sn/ioc3.h | 42 +- + arch/mips/include/asm/sn/klconfig.h | 4 - + arch/mips/include/asm/sn/kldir.h | 193 +-- + arch/mips/include/asm/sn/sn0/hub.h | 22 + + arch/mips/include/asm/sn/sn0/hubni.h | 8 + + arch/mips/include/asm/sn/sn0/ip27.h | 85 - + arch/mips/include/asm/sn/sn0/kldir.h | 186 +++ + arch/mips/include/asm/sn/sn_private.h | 19 - + arch/mips/include/asm/sn/types.h | 4 + + arch/mips/jz4740/Kconfig | 10 + + arch/mips/jz4740/setup.c | 4 + + arch/mips/kernel/cpu-probe.c | 81 +- + arch/mips/kernel/setup.c | 6 +- + arch/mips/kernel/sync-r4k.c | 5 + + arch/mips/kernel/syscalls/Makefile | 2 +- + arch/mips/kernel/unaligned.c | 36 +- + arch/mips/kvm/mips.c | 84 +- + arch/mips/lib/memcpy.S | 14 +- + arch/mips/lib/memset.S | 16 +- + arch/mips/lib/mips-atomic.c | 4 +- + arch/mips/loongson2ef/common/pm.c | 2 +- + arch/mips/loongson64/numa.c | 2 +- + arch/mips/loongson64/platform.c | 3 + + arch/mips/math-emu/cp1emu.c | 38 +- + arch/mips/math-emu/dp_maddf.c | 53 +- + arch/mips/math-emu/ieee754.h | 16 + + arch/mips/math-emu/ieee754int.h | 1 + + arch/mips/math-emu/sp_maddf.c | 53 +- + arch/mips/mm/init.c | 45 + + arch/mips/net/Makefile | 1 + + arch/mips/net/bpf_jit.c | 1270 +++++++++++++++ + arch/mips/net/bpf_jit_asm.S | 285 ++++ + arch/mips/pci/pci-ip27.c | 2 +- + arch/mips/pci/pci-xtalk-bridge.c | 52 +- + arch/mips/ralink/ill_acc.c | 2 + + arch/mips/sgi-ip22/ip22-gio.c | 6 +- + arch/mips/sgi-ip27/ip27-berr.c | 40 +- + arch/mips/sgi-ip27/ip27-common.h | 12 +- + arch/mips/sgi-ip27/ip27-console.c | 5 +- + arch/mips/sgi-ip27/ip27-hubio.c | 8 +- + arch/mips/sgi-ip27/ip27-init.c | 25 +- + arch/mips/sgi-ip27/ip27-irq.c | 5 +- + arch/mips/sgi-ip27/ip27-klconfig.c | 51 - + arch/mips/sgi-ip27/ip27-klnuma.c | 16 +- + arch/mips/sgi-ip27/ip27-memory.c | 57 +- + arch/mips/sgi-ip27/ip27-nmi.c | 5 +- + arch/mips/sgi-ip27/ip27-reset.c | 2 +- + arch/mips/sgi-ip27/ip27-smp.c | 33 +- + arch/mips/sgi-ip27/ip27-timer.c | 48 +- + arch/mips/sgi-ip27/ip27-xtalk.c | 1 - + arch/mips/sgi-ip30/ip30-irq.c | 5 +- + arch/mips/vdso/genvdso.c | 13 + + arch/powerpc/include/asm/archrandom.h | 27 +- + arch/powerpc/include/asm/hvcall.h | 1 + + arch/powerpc/include/asm/kvm_book3s_uvmem.h | 10 +- + arch/powerpc/include/asm/kvm_host.h | 1 + + arch/powerpc/include/asm/kvm_ppc.h | 5 +- + arch/powerpc/include/asm/mmu_context.h | 5 - + arch/powerpc/kvm/book3s.c | 9 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + arch/powerpc/kvm/book3s_64_vio.c | 10 +- + arch/powerpc/kvm/book3s_hv.c | 42 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 34 +- + arch/powerpc/kvm/book3s_pr.c | 34 +- + arch/powerpc/kvm/book3s_xive_native.c | 2 +- + arch/powerpc/kvm/booke.c | 67 +- + arch/powerpc/kvm/e500.c | 36 +- + arch/powerpc/kvm/e500mc.c | 30 +- + arch/powerpc/kvm/emulate_loadstore.c | 5 - + arch/powerpc/kvm/powerpc.c | 88 +- + arch/powerpc/mm/book3s64/iommu_api.c | 10 +- + arch/riscv/Kconfig | 4 +- + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 15 +- + .../riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 4 + + arch/riscv/include/asm/kasan.h | 27 + + arch/riscv/include/asm/page.h | 16 +- + arch/riscv/include/asm/pgtable-64.h | 5 + + arch/riscv/include/asm/string.h | 9 + + arch/riscv/kernel/head.S | 3 + + arch/riscv/kernel/riscv_ksyms.c | 2 + + arch/riscv/kernel/setup.c | 5 + + arch/riscv/kernel/vmlinux.lds.S | 1 + + arch/riscv/lib/memcpy.S | 5 +- + arch/riscv/lib/memset.S | 5 +- + arch/riscv/mm/Makefile | 8 + + arch/riscv/mm/kasan_init.c | 104 ++ + arch/riscv/mm/physaddr.c | 37 + + arch/s390/boot/compressed/decompressor.c | 8 +- + arch/s390/boot/ipl_parm.c | 14 + + arch/s390/include/asm/archrandom.h | 20 +- + arch/s390/include/asm/kvm_host.h | 1 - + arch/s390/include/asm/setup.h | 7 + + arch/s390/kernel/setup.c | 14 +- + arch/s390/kvm/kvm-s390.c | 118 +- + arch/sparc/kernel/sys_sparc_64.c | 4 +- + arch/um/include/asm/mmu_context.h | 5 - + arch/unicore32/include/asm/mmu_context.h | 5 - + arch/x86/Kconfig | 31 - + arch/x86/include/asm/archrandom.h | 28 +- + arch/x86/include/asm/bugs.h | 6 - + arch/x86/include/asm/device.h | 10 - + arch/x86/include/asm/disabled-features.h | 8 +- + arch/x86/include/asm/hyperv-tlfs.h | 3 +- + arch/x86/include/asm/kvm_emulate.h | 4 + + arch/x86/include/asm/kvm_host.h | 34 +- + arch/x86/include/asm/mmu.h | 4 - + arch/x86/include/asm/mmu_context.h | 26 - + arch/x86/include/asm/mpx.h | 116 -- + arch/x86/include/asm/pci.h | 31 +- + arch/x86/include/asm/pgtable_types.h | 4 + + arch/x86/include/asm/processor.h | 18 - + arch/x86/include/asm/trace/mpx.h | 134 -- + arch/x86/include/asm/vmx.h | 6 +- + arch/x86/include/uapi/asm/vmx.h | 4 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/alternative.c | 1 + + arch/x86/kernel/cpu/common.c | 18 - + arch/x86/kernel/cpu/intel.c | 36 - + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 48 +- + arch/x86/kernel/crash_core_32.c | 17 + + arch/x86/kernel/crash_core_64.c | 24 + + arch/x86/kernel/machine_kexec_32.c | 12 - + arch/x86/kernel/machine_kexec_64.c | 19 - + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/sys_x86_64.c | 9 - + arch/x86/kernel/traps.c | 74 - + arch/x86/kvm/cpuid.c | 9 +- + arch/x86/kvm/cpuid.h | 45 +- + arch/x86/kvm/emulate.c | 133 +- + arch/x86/kvm/hyperv.c | 17 +- + arch/x86/kvm/i8259.c | 6 +- + arch/x86/kvm/ioapic.c | 41 +- + arch/x86/kvm/ioapic.h | 6 - + arch/x86/kvm/irq.h | 3 + + arch/x86/kvm/irq_comm.c | 18 +- + arch/x86/kvm/lapic.c | 37 +- + arch/x86/kvm/lapic.h | 9 +- + arch/x86/kvm/mmu/mmu.c | 605 +++----- + arch/x86/kvm/mmu/paging_tmpl.h | 88 +- + arch/x86/kvm/mmutrace.h | 12 +- + arch/x86/kvm/mtrr.c | 8 +- + arch/x86/kvm/pmu.h | 18 +- + arch/x86/kvm/svm.c | 134 +- + arch/x86/kvm/vmx/capabilities.h | 5 + + arch/x86/kvm/vmx/evmcs.c | 5 - + arch/x86/kvm/vmx/nested.c | 189 +-- + arch/x86/kvm/vmx/pmu_intel.c | 24 +- + arch/x86/kvm/vmx/vmcs_shadow_fields.h | 4 +- + arch/x86/kvm/vmx/vmx.c | 294 ++-- + arch/x86/kvm/x86.c | 569 ++++--- + arch/x86/kvm/x86.h | 23 +- + arch/x86/lib/x86-opcode-map.txt | 2 +- + arch/x86/mm/Makefile | 1 - + arch/x86/mm/hugetlbpage.c | 5 - + arch/x86/mm/mmap.c | 2 - + arch/x86/mm/mpx.c | 938 ----------- + arch/x86/mm/pat/set_memory.c | 11 + + arch/x86/pci/common.c | 48 +- + drivers/acpi/thermal.c | 34 +- + drivers/base/memory.c | 25 +- + drivers/base/power/main.c | 42 +- + drivers/block/zram/zram_drv.c | 10 +- + drivers/char/random.c | 316 +--- + drivers/cpufreq/cppc_cpufreq.c | 2 +- + drivers/cpufreq/cpufreq-nforce2.c | 2 +- + drivers/cpufreq/cpufreq.c | 147 +- + drivers/cpufreq/freq_table.c | 4 +- + drivers/cpufreq/gx-suspmod.c | 2 +- + drivers/cpufreq/intel_pstate.c | 38 +- + drivers/cpufreq/longrun.c | 6 +- + drivers/cpufreq/pcc-cpufreq.c | 2 +- + drivers/cpufreq/sh-cpufreq.c | 2 +- + drivers/cpufreq/unicore2-cpufreq.c | 2 +- + drivers/gpu/drm/via/via_dmablit.c | 6 +- + drivers/iio/adc/qcom-vadc-common.c | 6 +- + drivers/iio/adc/qcom-vadc-common.h | 1 - + drivers/infiniband/core/Makefile | 9 +- + drivers/infiniband/core/addr.c | 2 +- + drivers/infiniband/core/cache.c | 151 +- + drivers/infiniband/core/cm.c | 1000 ++++++------ + drivers/infiniband/core/cm_msgs.h | 755 +-------- + drivers/infiniband/core/cma.c | 90 +- + drivers/infiniband/core/cma_trace.c | 16 + + drivers/infiniband/core/cma_trace.h | 391 +++++ + drivers/infiniband/core/core_priv.h | 3 +- + drivers/infiniband/core/cq.c | 27 +- + drivers/infiniband/core/device.c | 42 +- + drivers/infiniband/core/ib_core_uverbs.c | 2 + + drivers/infiniband/core/nldev.c | 3 +- + drivers/infiniband/core/rdma_core.c | 235 ++- + drivers/infiniband/core/rdma_core.h | 45 +- + drivers/infiniband/core/sa_query.c | 4 +- + drivers/infiniband/core/trace.c | 14 + + drivers/infiniband/core/umem.c | 28 +- + drivers/infiniband/core/umem_odp.c | 35 +- + drivers/infiniband/core/uverbs.h | 48 +- + drivers/infiniband/core/uverbs_cmd.c | 320 ++-- + drivers/infiniband/core/uverbs_ioctl.c | 45 +- + drivers/infiniband/core/uverbs_main.c | 301 ++-- + drivers/infiniband/core/uverbs_std_types.c | 44 +- + .../infiniband/core/uverbs_std_types_async_fd.c | 52 + + drivers/infiniband/core/uverbs_std_types_cq.c | 19 +- + drivers/infiniband/core/uverbs_std_types_device.c | 38 + + drivers/infiniband/core/uverbs_uapi.c | 7 +- + drivers/infiniband/core/verbs.c | 55 +- + drivers/infiniband/hw/bnxt_re/main.c | 2 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 37 +- + drivers/infiniband/hw/efa/efa_verbs.c | 15 +- + drivers/infiniband/hw/hfi1/chip.c | 198 ++- + drivers/infiniband/hw/hfi1/chip.h | 8 + + drivers/infiniband/hw/hfi1/chip_registers.h | 1 + + drivers/infiniband/hw/hfi1/common.h | 3 + + drivers/infiniband/hw/hfi1/debugfs.c | 2 +- + drivers/infiniband/hw/hfi1/driver.c | 237 ++- + drivers/infiniband/hw/hfi1/file_ops.c | 12 +- + drivers/infiniband/hw/hfi1/hfi.h | 195 ++- + drivers/infiniband/hw/hfi1/init.c | 87 +- + drivers/infiniband/hw/hfi1/msix.c | 106 +- + drivers/infiniband/hw/hfi1/msix.h | 1 + + drivers/infiniband/hw/hfi1/rc.c | 2 +- + drivers/infiniband/hw/hfi1/trace_ctxts.h | 2 +- + drivers/infiniband/hw/hfi1/trace_rx.h | 15 +- + drivers/infiniband/hw/hfi1/user_pages.c | 4 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 2 + + drivers/infiniband/hw/hns/hns_roce_device.h | 44 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 51 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 874 +++++++---- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 159 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 106 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 92 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 2 + + drivers/infiniband/hw/mlx4/cm.c | 29 +- + drivers/infiniband/hw/mlx4/cq.c | 18 +- + drivers/infiniband/hw/mlx4/main.c | 20 +- + drivers/infiniband/hw/mlx4/qp.c | 4 +- + drivers/infiniband/hw/mlx5/devx.c | 159 +- + drivers/infiniband/hw/mlx5/gsi.c | 3 +- + drivers/infiniband/hw/mlx5/ib_virt.c | 28 +- + drivers/infiniband/hw/mlx5/main.c | 224 ++- + drivers/infiniband/hw/mlx5/mem.c | 25 - + drivers/infiniband/hw/mlx5/mlx5_ib.h | 38 +- + drivers/infiniband/hw/mlx5/mr.c | 81 +- + drivers/infiniband/hw/mlx5/odp.c | 44 +- + drivers/infiniband/hw/mlx5/qp.c | 4 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 8 +- + drivers/infiniband/hw/qedr/verbs.c | 13 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 4 +- + drivers/infiniband/hw/qib/qib_user_sdma.c | 8 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 4 +- + drivers/infiniband/sw/rdmavt/rc.c | 9 +- + drivers/infiniband/sw/rxe/rxe_param.h | 7 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 18 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +- + drivers/infiniband/sw/siw/siw.h | 26 +- + drivers/infiniband/sw/siw/siw_cm.c | 2 +- + drivers/infiniband/sw/siw/siw_cq.c | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 2 +- + drivers/infiniband/sw/siw/siw_mem.c | 4 +- + drivers/infiniband/sw/siw/siw_qp.c | 13 +- + drivers/infiniband/sw/siw/siw_qp_rx.c | 6 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 2 +- + drivers/infiniband/sw/siw/siw_verbs.c | 61 +- + drivers/infiniband/ulp/iser/iser_memory.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 - + drivers/iommu/amd_iommu.c | 7 +- + drivers/iommu/intel-iommu.c | 11 +- + drivers/leds/Kconfig | 10 + + drivers/leds/Makefile | 1 + + drivers/leds/led-class.c | 97 +- + drivers/leds/leds-bd2802.c | 27 +- + drivers/leds/leds-lm3532.c | 8 +- + drivers/leds/leds-lm3642.c | 37 +- + drivers/leds/leds-lm3692x.c | 180 ++- + drivers/leds/leds-pca963x.c | 8 +- + drivers/leds/leds-tps6105x.c | 89 ++ + drivers/media/cec/cec-core.c | 21 +- + drivers/media/cec/cec-notifier.c | 37 +- + drivers/media/cec/cec-priv.h | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 6 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 4 +- + drivers/media/dvb-core/dvb_demux.c | 1 + + drivers/media/dvb-core/dvbdev.c | 4 +- + drivers/media/dvb-frontends/as102_fe.c | 3 +- + drivers/media/dvb-frontends/au8522_decoder.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 4 +- + drivers/media/dvb-frontends/dib0070.c | 23 +- + drivers/media/dvb-frontends/dib0090.c | 3 +- + drivers/media/dvb-frontends/dib7000m.c | 2 +- + drivers/media/dvb-frontends/dib7000p.c | 2 +- + drivers/media/dvb-frontends/dvb_dummy_fe.c | 91 +- + drivers/media/dvb-frontends/dvb_dummy_fe.h | 12 +- + drivers/media/dvb-frontends/lgdt330x.c | 4 +- + drivers/media/dvb-frontends/m88ds3103.c | 4 +- + drivers/media/dvb-frontends/ts2020.c | 4 +- + drivers/media/i2c/adv748x/adv748x.h | 8 +- + drivers/media/i2c/adv7604.c | 32 +- + drivers/media/i2c/mt9v032.c | 10 +- + drivers/media/i2c/mt9v111.c | 2 +- + drivers/media/i2c/ov5640.c | 41 +- + drivers/media/i2c/smiapp/smiapp-core.c | 198 ++- + drivers/media/i2c/smiapp/smiapp-regs.c | 3 - + drivers/media/i2c/smiapp/smiapp.h | 1 - + drivers/media/pci/bt8xx/bttv-input.c | 6 +- + drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 69 +- + drivers/media/pci/cx18/cx18-alsa-pcm.c | 75 +- + drivers/media/pci/cx18/cx18-cards.c | 8 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx18/cx18-i2c.c | 2 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 1 - + drivers/media/pci/cx23885/cx23885-cards.c | 24 + + drivers/media/pci/cx23885/cx23885-dvb.c | 114 +- + drivers/media/pci/cx23885/cx23885-i2c.c | 4 +- + drivers/media/pci/cx23885/cx23885-video.c | 3 +- + drivers/media/pci/cx23885/cx23885.h | 1 + + drivers/media/pci/cx25821/cx25821-alsa.c | 1 - + drivers/media/pci/cx88/cx88-alsa.c | 1 - + drivers/media/pci/cx88/cx88-input.c | 2 +- + drivers/media/pci/ivtv/Kconfig | 5 +- + drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 76 +- + drivers/media/pci/ivtv/ivtv-driver.c | 3 +- + drivers/media/pci/ivtv/ivtv-driver.h | 1 - + drivers/media/pci/ivtv/ivtv-i2c.c | 6 +- + drivers/media/pci/ivtv/ivtv-i2c.h | 2 +- + drivers/media/pci/meye/meye.c | 4 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 1 - + drivers/media/pci/saa7164/saa7164-dvb.c | 24 +- + drivers/media/pci/smipcie/smipcie-main.c | 4 +- + drivers/media/pci/solo6x10/solo6x10-g723.c | 24 +- + drivers/media/pci/tw686x/tw686x-audio.c | 16 +- + drivers/media/platform/Kconfig | 4 +- + drivers/media/platform/atmel/atmel-isc-base.c | 94 +- + drivers/media/platform/atmel/atmel-isi.c | 42 +- + drivers/media/platform/atmel/atmel-isi.h | 2 + + drivers/media/platform/coda/coda-bit.c | 29 +- + drivers/media/platform/coda/coda-common.c | 45 +- + drivers/media/platform/coda/coda-jpeg.c | 746 ++++++++- + drivers/media/platform/coda/coda.h | 3 + + drivers/media/platform/coda/coda_regs.h | 83 + + drivers/media/platform/coda/trace.h | 10 + + drivers/media/platform/davinci/vpfe_capture.c | 31 +- + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 3 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 66 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 7 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 2 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 23 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 8 +- + drivers/media/platform/omap3isp/isp.c | 8 +- + drivers/media/platform/omap3isp/ispccdc.c | 12 +- + drivers/media/platform/pxa_camera.c | 2 + + drivers/media/platform/rcar-vin/rcar-v4l2.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-hw.c | 6 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 13 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 5 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 57 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h | 6 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 20 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 5 +- + drivers/media/platform/ti-vpe/cal.c | 773 ++++++++-- + drivers/media/platform/ti-vpe/cal_regs.h | 221 +-- + drivers/media/platform/ti-vpe/csc.c | 32 +- + drivers/media/platform/vimc/vimc-scaler.c | 166 +- + drivers/media/platform/vivid/Makefile | 3 +- + drivers/media/platform/vivid/vivid-core.c | 203 ++- + drivers/media/platform/vivid/vivid-core.h | 20 + + drivers/media/platform/vivid/vivid-ctrls.c | 11 + + drivers/media/platform/vivid/vivid-kthread-touch.c | 181 +++ + drivers/media/platform/vivid/vivid-kthread-touch.h | 13 + + drivers/media/platform/vivid/vivid-touch-cap.c | 341 ++++ + drivers/media/platform/vivid/vivid-touch-cap.h | 39 + + drivers/media/platform/vivid/vivid-vid-common.c | 2 +- + drivers/media/rc/iguanair.c | 2 +- + drivers/media/rc/ir-hix5hd2.c | 79 +- + drivers/media/rc/rc-main.c | 27 +- + drivers/media/rc/serial_ir.c | 2 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-audio.c | 79 +- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 3 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 19 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 4 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 42 +- + drivers/media/usb/dvb-usb-v2/zd1301.c | 4 +- + drivers/media/usb/dvb-usb/af9005.c | 2 +- + drivers/media/usb/dvb-usb/cxusb.c | 33 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 8 +- + drivers/media/usb/dvb-usb/digitv.c | 10 +- + drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 8 +- + drivers/media/usb/dvb-usb/vp7045.c | 21 +- + drivers/media/usb/em28xx/em28xx-audio.c | 87 +- + drivers/media/usb/go7007/s2250-board.c | 1 + + drivers/media/usb/go7007/snd-go7007.c | 60 +- + drivers/media/usb/gspca/gspca.c | 2 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 769 +++++---- + drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 4 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 2 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 82 +- + drivers/media/usb/usbtv/usbtv-audio.c | 29 +- + drivers/media/usb/usbvision/usbvision-video.c | 4 +- + drivers/media/usb/uvc/uvc_driver.c | 37 + + drivers/media/usb/uvc/uvcvideo.h | 1 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 476 +++++- + drivers/media/v4l2-core/v4l2-event.c | 5 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 6 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 213 ++- + drivers/media/v4l2-core/v4l2-subdev.c | 26 +- + drivers/media/v4l2-core/videobuf-core.c | 5 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 8 +- + drivers/mfd/Kconfig | 13 + + drivers/mfd/Makefile | 1 + + drivers/mfd/ioc3.c | 669 ++++++++ + drivers/mtd/devices/block2mtd.c | 8 +- + drivers/mtd/maps/pcmciamtd.c | 7 +- + drivers/mtd/maps/physmap-core.c | 20 +- + drivers/mtd/mtdconcat.c | 5 +- + drivers/mtd/nand/onenand/Kconfig | 14 +- + drivers/mtd/nand/onenand/Makefile | 4 +- + drivers/mtd/nand/onenand/onenand_base.c | 82 +- + .../mtd/nand/onenand/{omap2.c => onenand_omap2.c} | 0 + .../onenand/{samsung_mtd.c => onenand_samsung.c} | 9 +- + drivers/mtd/nand/raw/Kconfig | 2 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 20 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 10 + + drivers/mtd/nand/raw/denali.c | 14 +- + drivers/mtd/nand/raw/denali_dt.c | 56 +- + drivers/mtd/nand/raw/mpc5121_nfc.c | 2 +- + drivers/mtd/nand/raw/nand_macronix.c | 11 +- + drivers/mtd/nand/spi/toshiba.c | 10 + + drivers/mtd/parsers/sharpslpart.c | 4 +- + drivers/mtd/spi-nor/Kconfig | 4 +- + drivers/mtd/spi-nor/aspeed-smc.c | 4 +- + drivers/mtd/spi-nor/cadence-quadspi.c | 4 +- + drivers/mtd/spi-nor/hisi-sfc.c | 6 +- + drivers/mtd/spi-nor/intel-spi-pci.c | 2 + + drivers/mtd/spi-nor/spi-nor.c | 127 +- + drivers/mtd/ubi/attach.c | 2 +- + drivers/mtd/ubi/build.c | 31 +- + drivers/mtd/ubi/fastmap.c | 23 +- + drivers/mtd/ubi/ubi.h | 1 + + drivers/mtd/ubi/vtbl.c | 8 +- + drivers/mtd/ubi/wl.c | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 1 - + drivers/net/ethernet/sgi/Kconfig | 5 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 544 ++----- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 3 +- + drivers/net/wireless/intel/iwlegacy/4965.c | 17 +- + drivers/net/wireless/intel/iwlegacy/common.h | 3 - + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 6 +- + drivers/nvdimm/pmem.c | 6 - + drivers/nvme/host/hwmon.c | 13 +- + drivers/pci/controller/Kconfig | 10 +- + drivers/pci/controller/Makefile | 1 + + drivers/pci/controller/dwc/Kconfig | 11 + + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-exynos.c | 2 +- + drivers/pci/controller/dwc/pci-keystone.c | 6 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 8 +- + drivers/pci/controller/dwc/pcie-designware.c | 56 + + drivers/pci/controller/dwc/pcie-designware.h | 12 + + drivers/pci/controller/dwc/pcie-intel-gw.c | 545 +++++++ + drivers/pci/controller/dwc/pcie-qcom.c | 150 ++ + drivers/pci/controller/dwc/pcie-uniphier.c | 31 +- + drivers/pci/controller/pci-tegra.c | 4 +- + drivers/pci/controller/pcie-brcmstb.c | 1015 ++++++++++++ + drivers/pci/controller/pcie-iproc.c | 24 + + drivers/pci/controller/vmd.c | 156 +- + drivers/pci/iov.c | 9 +- + drivers/pci/p2pdma.c | 3 + + drivers/pci/pci.c | 48 +- + drivers/pci/pci.h | 3 + + drivers/pci/pcie/aer.c | 1 + + drivers/pci/pcie/err.c | 12 +- + drivers/pci/quirks.c | 117 +- + drivers/pci/search.c | 10 +- + drivers/pci/setup-bus.c | 163 +- + drivers/pci/switch/switchtec.c | 370 +++-- + drivers/pcmcia/i82092.c | 648 ++++---- + drivers/pcmcia/i82092aa.h | 11 - + drivers/platform/goldfish/goldfish_pipe.c | 35 +- + drivers/platform/x86/asus-wmi.c | 7 +- + drivers/platform/x86/intel_menlow.c | 9 +- + drivers/rtc/rtc-m48t35.c | 11 + + drivers/soc/lantiq/fpi-bus.c | 4 +- + drivers/staging/media/Kconfig | 4 + + drivers/staging/media/Makefile | 2 + + drivers/staging/media/hantro/Makefile | 1 + + drivers/staging/media/hantro/hantro.h | 66 +- + drivers/staging/media/hantro/hantro_drv.c | 11 +- + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 4 +- + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 6 +- + drivers/staging/media/hantro/hantro_g1_regs.h | 53 + + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 6 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +- + drivers/staging/media/hantro/hantro_h264.c | 2 +- + drivers/staging/media/hantro/hantro_hw.h | 17 +- + drivers/staging/media/hantro/hantro_postproc.c | 148 ++ + drivers/staging/media/hantro/hantro_v4l2.c | 109 +- + drivers/staging/media/hantro/rk3288_vpu_hw.c | 10 + + .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 +- + .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 4 +- + .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 4 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 3 - + drivers/staging/media/ipu3/TODO | 6 - + drivers/staging/media/ipu3/ipu3-css.c | 2 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 5 + + drivers/staging/media/meson/vdec/vdec.c | 18 +- + drivers/staging/media/meson/vdec/vdec.h | 1 + + drivers/staging/media/meson/vdec/vdec_1.c | 29 +- + drivers/staging/media/meson/vdec/vdec_platform.c | 60 + + drivers/staging/media/meson/vdec/vdec_platform.h | 4 + + .../bindings/phy/rockchip-mipi-dphy-rx0.yaml | 76 + + .../staging/media/phy-rockchip-dphy-rx0/Kconfig | 13 + + .../staging/media/phy-rockchip-dphy-rx0/Makefile | 2 + + drivers/staging/media/phy-rockchip-dphy-rx0/TODO | 6 + + .../phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c | 388 +++++ + .../devicetree/bindings/media/rockchip-isp1.yaml | 192 +++ + .../media/uapi/v4l/pixfmt-meta-rkisp1-params.rst | 23 + + .../media/uapi/v4l/pixfmt-meta-rkisp1-stat.rst | 22 + + drivers/staging/media/rkisp1/Kconfig | 17 + + drivers/staging/media/rkisp1/Makefile | 8 + + drivers/staging/media/rkisp1/TODO | 23 + + drivers/staging/media/rkisp1/rkisp1-capture.c | 1437 +++++++++++++++++ + drivers/staging/media/rkisp1/rkisp1-common.c | 37 + + drivers/staging/media/rkisp1/rkisp1-common.h | 337 ++++ + drivers/staging/media/rkisp1/rkisp1-dev.c | 574 +++++++ + drivers/staging/media/rkisp1/rkisp1-isp.c | 1164 ++++++++++++++ + drivers/staging/media/rkisp1/rkisp1-params.c | 1630 ++++++++++++++++++++ + drivers/staging/media/rkisp1/rkisp1-regs.h | 1264 +++++++++++++++ + drivers/staging/media/rkisp1/rkisp1-resizer.c | 775 ++++++++++ + drivers/staging/media/rkisp1/rkisp1-stats.c | 530 +++++++ + drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 819 ++++++++++ + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 26 +- + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 1 + + drivers/staging/media/tegra-vde/Kconfig | 2 +- + drivers/staging/media/tegra-vde/vde.c | 6 +- + drivers/staging/media/tegra-vde/vde.h | 2 +- + drivers/tc/tc-driver.c | 5 +- + drivers/thermal/armada_thermal.c | 2 - + .../intel/int340x_thermal/int340x_thermal_zone.c | 7 +- + drivers/thermal/intel/intel_pch_thermal.c | 3 +- + drivers/thermal/st/stm_thermal.c | 2 +- + drivers/tty/serial/8250/8250_ioc3.c | 98 ++ + drivers/tty/serial/8250/Kconfig | 11 + + drivers/tty/serial/8250/Makefile | 1 + + drivers/vfio/vfio_iommu_type1.c | 35 +- + fs/binfmt_elf.c | 144 +- + fs/btrfs/compression.c | 2 +- + fs/btrfs/zlib.c | 135 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/smb2pdu.c | 2 +- + fs/exec.c | 6 +- + fs/ext2/super.c | 7 +- + fs/ext4/Kconfig | 6 - + fs/ext4/balloc.c | 5 +- + fs/ext4/dir.c | 10 +- + fs/ext4/ext4.h | 81 +- + fs/ext4/ext4_extents.h | 5 - + fs/ext4/ext4_jbd2.c | 25 + + fs/ext4/ext4_jbd2.h | 22 +- + fs/ext4/extents.c | 205 +-- + fs/ext4/extents_status.h | 6 + + fs/ext4/file.c | 203 ++- + fs/ext4/ialloc.c | 6 +- + fs/ext4/indirect.c | 26 - + fs/ext4/inline.c | 4 +- + fs/ext4/inode.c | 53 +- + fs/ext4/ioctl.c | 2 + + fs/ext4/mballoc.c | 4 + + fs/ext4/mmp.c | 6 +- + fs/ext4/namei.c | 20 +- + fs/ext4/page-io.c | 19 +- + fs/ext4/readpage.c | 42 +- + fs/ext4/resize.c | 10 +- + fs/ext4/super.c | 122 +- + fs/ext4/sysfs.c | 88 +- + fs/ext4/xattr.c | 6 +- + fs/f2fs/Kconfig | 27 +- + fs/f2fs/Makefile | 1 + + fs/f2fs/checkpoint.c | 6 +- + fs/f2fs/compress.c | 1176 ++++++++++++++ + fs/f2fs/data.c | 734 +++++++-- + fs/f2fs/debug.c | 88 +- + fs/f2fs/dir.c | 25 +- + fs/f2fs/f2fs.h | 326 +++- + fs/f2fs/file.c | 251 ++- + fs/f2fs/gc.c | 18 +- + fs/f2fs/inline.c | 44 +- + fs/f2fs/inode.c | 41 + + fs/f2fs/namei.c | 120 +- + fs/f2fs/recovery.c | 20 +- + fs/f2fs/segment.c | 271 +++- + fs/f2fs/segment.h | 19 +- + fs/f2fs/super.c | 182 ++- + fs/f2fs/sysfs.c | 158 +- + fs/fs-writeback.c | 2 +- + fs/gfs2/aops.c | 4 +- + fs/gfs2/dir.c | 3 - + fs/gfs2/glock.c | 2 +- + fs/gfs2/glops.c | 2 +- + fs/gfs2/incore.h | 6 +- + fs/gfs2/inode.c | 10 +- + fs/gfs2/log.c | 21 +- + fs/gfs2/log.h | 4 +- + fs/gfs2/lops.c | 70 +- + fs/gfs2/ops_fstype.c | 2 + + fs/gfs2/rgrp.c | 10 - + fs/gfs2/trans.c | 9 +- + fs/io_uring.c | 6 +- + fs/iomap/buffered-io.c | 18 +- + fs/jbd2/checkpoint.c | 2 +- + fs/jbd2/commit.c | 4 +- + fs/jbd2/journal.c | 119 +- + fs/jbd2/transaction.c | 4 +- + fs/namei.c | 4 +- + fs/ocfs2/cluster/quorum.c | 2 +- + fs/ocfs2/dlm/Makefile | 2 - + fs/ocfs2/dlm/dlmast.c | 8 +- + fs/ocfs2/dlm/dlmcommon.h | 4 - + fs/ocfs2/dlm/dlmconvert.c | 8 +- + fs/ocfs2/dlm/dlmdebug.c | 8 +- + fs/ocfs2/dlm/dlmdomain.c | 8 +- + fs/ocfs2/dlm/dlmlock.c | 8 +- + fs/ocfs2/dlm/dlmmaster.c | 10 +- + fs/ocfs2/dlm/dlmrecovery.c | 10 +- + fs/ocfs2/dlm/dlmthread.c | 8 +- + fs/ocfs2/dlm/dlmunlock.c | 8 +- + fs/ocfs2/dlmfs/Makefile | 2 - + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/ocfs2/dlmfs/userdlm.c | 6 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/journal.h | 8 +- + fs/ocfs2/namei.c | 3 +- + fs/quota/quota_v2.c | 2 - + fs/quota/quotaio_v1.h | 6 +- + fs/reiserfs/journal.c | 2 - + fs/reiserfs/procfs.c | 1 - + fs/reiserfs/stree.c | 9 +- + fs/reiserfs/super.c | 4 +- + fs/ubifs/file.c | 4 +- + fs/ubifs/ioctl.c | 14 +- + fs/ubifs/orphan.c | 4 +- + fs/ubifs/sb.c | 2 +- + fs/ubifs/super.c | 2 + + fs/udf/ecma_167.h | 46 +- + fs/udf/inode.c | 6 +- + fs/udf/osta_udf.h | 100 +- + fs/udf/super.c | 40 +- + fs/udf/truncate.c | 2 +- + fs/xfs/libxfs/xfs_attr.c | 14 +- + fs/xfs/libxfs/xfs_attr.h | 15 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 4 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 9 - + fs/xfs/libxfs/xfs_attr_remote.c | 89 +- + fs/xfs/libxfs/xfs_attr_remote.h | 2 + + fs/xfs/libxfs/xfs_btree.c | 2 - + fs/xfs/libxfs/xfs_da_btree.h | 4 +- + fs/xfs/libxfs/xfs_da_format.h | 4 +- + fs/xfs/libxfs/xfs_format.h | 7 + + fs/xfs/libxfs/xfs_log_format.h | 19 +- + fs/xfs/scrub/repair.h | 1 - + fs/xfs/xfs_acl.c | 11 +- + fs/xfs/xfs_attr_inactive.c | 149 +- + fs/xfs/xfs_buf_item.c | 45 +- + fs/xfs/xfs_buf_item.h | 1 + + fs/xfs/xfs_dquot.c | 6 +- + fs/xfs/xfs_file.c | 7 +- + fs/xfs/xfs_inode.c | 25 +- + fs/xfs/xfs_ioctl.c | 20 +- + fs/xfs/xfs_ioctl32.c | 9 +- + fs/xfs/xfs_ioctl32.h | 2 +- + fs/xfs/xfs_iomap.c | 2 +- + fs/xfs/xfs_iops.c | 6 +- + fs/xfs/xfs_log_recover.c | 6 + + fs/xfs/xfs_ondisk.h | 1 + + fs/xfs/xfs_qm.h | 6 +- + fs/xfs/xfs_quotaops.c | 6 +- + fs/xfs/xfs_reflink.c | 9 +- + fs/xfs/xfs_reflink.h | 2 +- + fs/xfs/xfs_super.c | 48 +- + fs/xfs/xfs_trans_dquot.c | 8 +- + fs/xfs/xfs_xattr.c | 14 +- + include/asm-generic/export.h | 8 +- + include/asm-generic/mm_hooks.h | 5 - + include/linux/backing-dev.h | 10 + + include/linux/bitops.h | 1 + + include/linux/context_tracking.h | 9 - + include/linux/cpufreq.h | 32 +- + include/linux/export.h | 33 +- + include/linux/f2fs_fs.h | 5 + + include/linux/fs.h | 6 +- + include/linux/huge_mm.h | 6 + + include/linux/io-mapping.h | 5 +- + include/linux/jbd2.h | 1 - + include/linux/kvm_host.h | 40 +- + include/linux/kvm_types.h | 9 +- + include/linux/leds-bd2802.h | 1 - + include/linux/leds.h | 6 + + include/linux/memblock.h | 7 +- + include/linux/memory.h | 29 - + include/linux/memory_hotplug.h | 3 +- + include/linux/mlx4/cq.h | 5 + + include/linux/mlx5/driver.h | 5 + + include/linux/mlx5/mlx5_ifc.h | 24 +- + include/linux/mm.h | 104 +- + include/linux/mmzone.h | 2 +- + include/linux/module.h | 14 +- + include/linux/moduleparam.h | 82 +- + include/linux/mtd/spi-nor.h | 16 +- + include/linux/page-isolation.h | 4 +- + include/linux/pagemap.h | 28 + + include/linux/pci.h | 3 +- + include/linux/random.h | 24 +- + include/linux/swab.h | 1 + + include/linux/switchtec.h | 160 +- + include/linux/thermal.h | 11 - + include/linux/units.h | 84 + + include/linux/zlib.h | 6 + + include/media/cec-notifier.h | 27 - + include/media/cec.h | 46 - + include/media/dvb-usb-ids.h | 2 + + include/media/v4l2-common.h | 21 + + include/media/v4l2-device.h | 12 +- + include/media/v4l2-ioctl.h | 55 + + include/media/v4l2-rect.h | 8 +- + include/media/v4l2-subdev.h | 2 +- + include/rdma/ib_cm.h | 34 - + include/rdma/ib_verbs.h | 42 +- + include/rdma/iba.h | 146 ++ + include/rdma/ibta_vol1_c12.h | 213 +++ + include/rdma/rdmavt_qp.h | 22 +- + include/rdma/uverbs_named_ioctl.h | 6 +- + include/rdma/uverbs_std_types.h | 13 +- + include/rdma/uverbs_types.h | 34 +- + include/trace/events/ext4.h | 27 +- + include/trace/events/f2fs.h | 103 +- + include/trace/events/kmem.h | 4 +- + include/trace/events/rdma_core.h | 394 +++++ + include/trace/events/v4l2.h | 2 +- + include/trace/events/writeback.h | 37 +- + include/uapi/linux/pci_regs.h | 1 + + include/uapi/linux/random.h | 4 +- + include/uapi/linux/swab.h | 10 + + include/uapi/linux/switchtec_ioctl.h | 17 +- + include/uapi/linux/sysctl.h | 2 +- + include/uapi/linux/videodev2.h | 29 + + include/uapi/rdma/ib_user_ioctl_cmds.h | 15 + + include/uapi/rdma/ib_user_ioctl_verbs.h | 12 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 17 + + include/uapi/rdma/qedr-abi.h | 18 +- + init/main.c | 36 +- + kernel/Makefile | 1 + + kernel/module.c | 22 +- + lib/Kconfig | 7 + + lib/Makefile | 2 + + lib/decompress_inflate.c | 13 + + lib/find_bit.c | 78 +- + lib/scatterlist.c | 2 +- + lib/test_bitmap.c | 9 +- + lib/test_kasan.c | 1 + + lib/zlib_deflate/deflate.c | 85 +- + lib/zlib_deflate/deflate_syms.c | 1 + + lib/zlib_deflate/deftree.c | 54 - + lib/zlib_deflate/defutil.h | 134 +- + lib/zlib_dfltcc/Makefile | 11 + + lib/zlib_dfltcc/dfltcc.c | 55 + + lib/zlib_dfltcc/dfltcc.h | 155 ++ + lib/zlib_dfltcc/dfltcc_deflate.c | 279 ++++ + lib/zlib_dfltcc/dfltcc_inflate.c | 149 ++ + lib/zlib_dfltcc/dfltcc_syms.c | 17 + + lib/zlib_dfltcc/dfltcc_util.h | 103 ++ + lib/zlib_inflate/inflate.c | 32 +- + lib/zlib_inflate/inflate.h | 8 + + lib/zlib_inflate/infutil.h | 18 +- + mm/Makefile | 1 + + mm/backing-dev.c | 1 + + mm/debug.c | 16 +- + mm/early_ioremap.c | 8 +- + mm/filemap.c | 34 +- + mm/gup.c | 501 +++--- + mm/gup_benchmark.c | 9 +- + mm/huge_memory.c | 55 +- + mm/kasan/common.c | 2 + + mm/kmemleak.c | 112 +- + mm/memblock.c | 22 +- + mm/memcontrol.c | 25 +- + mm/memory_hotplug.c | 24 +- + mm/mempolicy.c | 6 +- + mm/memremap.c | 75 +- + mm/migrate.c | 77 +- + mm/mmap.c | 36 +- + mm/oom_kill.c | 2 + + mm/page_alloc.c | 75 +- + mm/page_isolation.c | 53 +- + mm/page_vma_mapped.c | 12 +- + mm/process_vm_access.c | 28 +- + mm/slub.c | 88 +- + mm/sparse.c | 2 +- + mm/swap.c | 27 +- + mm/swapfile.c | 2 +- + mm/vmscan.c | 24 +- + mm/zswap.c | 86 +- + net/xdp/xdp_umem.c | 4 +- + scripts/Kbuild.include | 25 +- + scripts/Kconfig.include | 2 +- + scripts/Makefile.build | 4 +- + scripts/Makefile.lib | 21 +- + scripts/Makefile.modbuiltin | 57 - + scripts/Makefile.modpost | 1 - + scripts/kconfig/Makefile | 24 +- + scripts/kconfig/conf.c | 16 + + scripts/kconfig/confdata.c | 61 +- + scripts/kconfig/expr.c | 3 +- + scripts/kconfig/expr.h | 2 +- + scripts/kconfig/gconf.c | 1 + + scripts/kconfig/lkc.h | 4 +- + scripts/kconfig/mconf.c | 1 + + scripts/kconfig/menu.c | 185 ++- + scripts/kconfig/nconf.c | 1 + + scripts/kconfig/parser.y | 21 +- + scripts/kconfig/streamline_config.pl | 4 +- + scripts/kconfig/symbol.c | 22 - + scripts/link-vmlinux.sh | 4 + + scripts/mod/modpost.c | 8 +- + scripts/package/builddeb | 106 +- + scripts/spelling.txt | 14 + + tools/arch/x86/include/uapi/asm/vmx.h | 4 +- + tools/arch/x86/lib/x86-opcode-map.txt | 2 +- + tools/kvm/kvm_stat/kvm_stat | 8 +- + tools/power/cpupower/lib/cpufreq.c | 78 +- + tools/power/cpupower/lib/cpufreq.h | 20 +- + tools/power/cpupower/man/cpupower.1 | 6 +- + tools/power/cpupower/utils/cpufreq-info.c | 12 +- + .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 38 +- + tools/testing/selftests/kvm/include/x86_64/vmx.h | 8 +- + .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 2 +- + tools/testing/selftests/vm/gup_benchmark.c | 6 +- + tools/vm/slabinfo.c | 4 +- + usr/.gitignore | 8 +- + usr/Kconfig | 26 - + usr/Makefile | 97 +- + usr/default_cpio_list | 6 + + usr/{gen_initramfs_list.sh => gen_initramfs.sh} | 167 +- + usr/include/Makefile | 107 +- + usr/initramfs_data.S | 5 +- + virt/kvm/arm/aarch32.c | 131 +- + virt/kvm/arm/arch_timer.c | 5 +- + virt/kvm/arm/arm.c | 113 +- + virt/kvm/arm/mmio.c | 68 +- + virt/kvm/arm/mmu.c | 32 +- + virt/kvm/arm/perf.c | 6 +- + virt/kvm/arm/pmu.c | 114 +- + virt/kvm/arm/vgic/vgic-its.c | 6 +- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 5 +- + virt/kvm/arm/vgic/vgic-mmio.c | 15 +- + virt/kvm/arm/vgic/vgic-mmio.h | 5 - + virt/kvm/async_pf.c | 31 +- + virt/kvm/kvm_main.c | 435 ++++-- + virt/lib/irqbypass.c | 38 +- + 971 files changed, 38631 insertions(+), 15733 deletions(-) + create mode 100644 Documentation/core-api/pin_user_pages.rst + create mode 100644 Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml + delete mode 100644 Documentation/devicetree/bindings/media/amlogic,vdec.txt + create mode 100644 Documentation/devicetree/bindings/media/ti,cal.yaml + delete mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt + create mode 100644 Documentation/devicetree/bindings/mips/ingenic/devices.yaml + create mode 100644 Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml + delete mode 100644 Documentation/media/v4l-drivers/cx18.rst + delete mode 100644 Documentation/x86/intel_mpx.rst + create mode 100644 arch/arc/include/asm/fpu.h + delete mode 100644 arch/arm/include/asm/kvm_mmio.h + delete mode 100644 arch/arm64/include/asm/kvm_mmio.h + create mode 100644 arch/mips/boot/dts/ingenic/cu1000-neo.dts + create mode 100644 arch/mips/boot/dts/ingenic/x1000.dtsi + create mode 100644 arch/mips/configs/cu1000-neo_defconfig + delete mode 100644 arch/mips/include/asm/serial.h + delete mode 100644 arch/mips/include/asm/sn/hub.h + delete mode 100644 arch/mips/include/asm/sn/sn0/ip27.h + create mode 100644 arch/mips/include/asm/sn/sn0/kldir.h + delete mode 100644 arch/mips/include/asm/sn/sn_private.h + create mode 100644 arch/mips/net/bpf_jit.c + create mode 100644 arch/mips/net/bpf_jit_asm.S + create mode 100644 arch/riscv/include/asm/kasan.h + create mode 100644 arch/riscv/mm/kasan_init.c + create mode 100644 arch/riscv/mm/physaddr.c + delete mode 100644 arch/x86/include/asm/mpx.h + delete mode 100644 arch/x86/include/asm/trace/mpx.h + create mode 100644 arch/x86/kernel/crash_core_32.c + create mode 100644 arch/x86/kernel/crash_core_64.c + delete mode 100644 arch/x86/mm/mpx.c + create mode 100644 drivers/infiniband/core/cma_trace.c + create mode 100644 drivers/infiniband/core/cma_trace.h + create mode 100644 drivers/infiniband/core/trace.c + create mode 100644 drivers/infiniband/core/uverbs_std_types_async_fd.c + create mode 100644 drivers/leds/leds-tps6105x.c + create mode 100644 drivers/media/platform/vivid/vivid-kthread-touch.c + create mode 100644 drivers/media/platform/vivid/vivid-kthread-touch.h + create mode 100644 drivers/media/platform/vivid/vivid-touch-cap.c + create mode 100644 drivers/media/platform/vivid/vivid-touch-cap.h + create mode 100644 drivers/mfd/ioc3.c + rename drivers/mtd/nand/onenand/{omap2.c => onenand_omap2.c} (100%) + rename drivers/mtd/nand/onenand/{samsung_mtd.c => onenand_samsung.c} (99%) + create mode 100644 drivers/pci/controller/dwc/pcie-intel-gw.c + create mode 100644 drivers/pci/controller/pcie-brcmstb.c + create mode 100644 drivers/staging/media/hantro/hantro_postproc.c + create mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml + create mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig + create mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/Makefile + create mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/TODO + create mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/phy-rockchip-dphy-rx0.c + create mode 100644 drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml + create mode 100644 drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-params.rst + create mode 100644 drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-stat.rst + create mode 100644 drivers/staging/media/rkisp1/Kconfig + create mode 100644 drivers/staging/media/rkisp1/Makefile + create mode 100644 drivers/staging/media/rkisp1/TODO + create mode 100644 drivers/staging/media/rkisp1/rkisp1-capture.c + create mode 100644 drivers/staging/media/rkisp1/rkisp1-common.c + create mode 100644 drivers/staging/media/rkisp1/rkisp1-common.h + create mode 100644 drivers/staging/media/rkisp1/rkisp1-dev.c + create mode 100644 drivers/staging/media/rkisp1/rkisp1-isp.c + create mode 100644 drivers/staging/media/rkisp1/rkisp1-params.c + create mode 100644 drivers/staging/media/rkisp1/rkisp1-regs.h + create mode 100644 drivers/staging/media/rkisp1/rkisp1-resizer.c + create mode 100644 drivers/staging/media/rkisp1/rkisp1-stats.c + create mode 100644 drivers/staging/media/rkisp1/uapi/rkisp1-config.h + create mode 100644 drivers/tty/serial/8250/8250_ioc3.c + create mode 100644 fs/f2fs/compress.c + create mode 100644 include/linux/units.h + create mode 100644 include/rdma/iba.h + create mode 100644 include/rdma/ibta_vol1_c12.h + create mode 100644 include/trace/events/rdma_core.h + create mode 100644 lib/zlib_dfltcc/Makefile + create mode 100644 lib/zlib_dfltcc/dfltcc.c + create mode 100644 lib/zlib_dfltcc/dfltcc.h + create mode 100644 lib/zlib_dfltcc/dfltcc_deflate.c + create mode 100644 lib/zlib_dfltcc/dfltcc_inflate.c + create mode 100644 lib/zlib_dfltcc/dfltcc_syms.c + create mode 100644 lib/zlib_dfltcc/dfltcc_util.h + delete mode 100644 scripts/Makefile.modbuiltin + create mode 100644 usr/default_cpio_list + rename usr/{gen_initramfs_list.sh => gen_initramfs.sh} (53%) +Merging fixes/master (d21718ad2f81 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 (94f2630b1897 Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (f45ba2bd6da0 ARCv2: fpu: preserve userspace fpu state) +$ git merge arc-current/for-curr +Already up to date. +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 (6716cb162deb Merge tag 'omap-for-fixes-whenever-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (aa638cfe3e73 arm64: cpu_errata: Add Hisilicon TSV110 to spectre-v2 safe list) +$ 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 (5d2e5dd5849b powerpc/mm/hash: Fix sharing context ids between kernel & userspace) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (def9d2780727 Linux 5.5-rc7) +$ git merge s390-fixes/fixes +Already up to date. +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 (dff6bc1bfd46 MAINTAINERS: correct entries for ISDN/mISDN section) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/nf_flowtable.txt | 2 +- + MAINTAINERS | 9 ++--- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 4 +-- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 2 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 1 + + drivers/net/phy/at803x.c | 11 ++++++ + drivers/net/phy/mii_timestamper.c | 7 ++++ + drivers/of/of_mdio.c | 17 ++++++--- + net/ipv4/tcp.c | 6 ++++ + net/netfilter/ipset/ip_set_core.c | 41 +++++++++++----------- + net/netfilter/nf_conntrack_core.c | 3 +- + net/netfilter/nf_flow_table_core.c | 3 +- + net/netfilter/nf_flow_table_offload.c | 1 + + net/netfilter/x_tables.c | 4 +-- + net/sched/cls_rsvp.h | 6 ++-- + 16 files changed, 77 insertions(+), 42 deletions(-) +Merging bpf/master (2577e373bbc0 runqslower: Fix Makefile) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + include/linux/bpf.h | 7 +++++-- + kernel/bpf/bpf_struct_ops.c | 5 ++--- + kernel/bpf/btf.c | 2 +- + tools/bpf/runqslower/Makefile | 2 +- + 4 files changed, 9 insertions(+), 7 deletions(-) +Merging ipsec/master (72d62c4e422e net: drop_monitor: Use kstrdup) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (78e06cf43093 netfilter: nf_flowtable: fix documentation) +$ git merge netfilter/master +Already up to date. +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 (1754c4f60aaf libertas: make lbs_ibss_join_existing() return error code on rates overflow) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/marvell/libertas/cfg.c | 2 ++ + drivers/net/wireless/marvell/mwifiex/scan.c | 7 +++++++ + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 1 + + drivers/net/wireless/marvell/mwifiex/wmm.c | 4 ++++ + 4 files changed, 14 insertions(+) +Merging mac80211/master (8b792f84c637 Merge branch 'mlxsw-Various-fixes') +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (9554de394b7e i40iw: Remove setting of VMA private data and use rdma_user_mmap_io) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (112e3f5ac505 ALSA: hdsp: Make the firmware loading ioctl a bit more readable) +$ git merge sound-current/for-linus +Auto-merging sound/pci/rme9652/hdsp.c +Merge made by the 'recursive' strategy. + include/sound/pcm.h | 4 +- + include/uapi/sound/asound.h | 4 +- + sound/core/pcm_compat.c | 8 +- + sound/core/pcm_native.c | 211 ++++++++++++++++++++++++++-------------- + sound/drivers/dummy.c | 2 +- + sound/hda/hdac_stream.c | 31 +++--- + sound/pci/emu10k1/emufx.c | 180 +++++++++++++++++++--------------- + sound/pci/hda/hda_intel.c | 2 + + sound/pci/hda/patch_hdmi.c | 1 + + sound/pci/rme9652/hdsp.c | 7 +- + sound/usb/mixer_scarlett_gen2.c | 46 ++++----- + sound/usb/validate.c | 6 +- + 12 files changed, 297 insertions(+), 205 deletions(-) +Merging sound-asoc-fixes/for-linus (ab8ccdd6018b Merge branch 'asoc-5.6' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging sound/soc/sof/intel/hda.h +Merge made by the 'recursive' strategy. + sound/soc/amd/raven/acp3x-i2s.c | 12 ++++--- + sound/soc/amd/raven/acp3x-pcm-dma.c | 14 ++++----- + sound/soc/codecs/max98090.c | 3 +- + sound/soc/codecs/rt1015.c | 2 +- + sound/soc/codecs/rt1308-sdw.c | 4 +-- + sound/soc/codecs/rt700-sdw.c | 4 +-- + sound/soc/codecs/rt711-sdw.c | 4 +-- + sound/soc/codecs/rt715-sdw.c | 4 +-- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 14 ++++----- + sound/soc/intel/boards/bxt_rt298.c | 14 ++++----- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 13 ++++---- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 16 +++++----- + sound/soc/intel/boards/sof_rt5682.c | 15 ++++----- + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 2 +- + sound/soc/sof/core.c | 38 ++++++++++------------- + sound/soc/sof/intel/hda-codec.c | 21 ++++--------- + sound/soc/sof/intel/hda.c | 3 +- + sound/soc/sof/intel/hda.h | 7 ++--- + sound/soc/sof/pcm.c | 10 ++++++ + sound/soc/sof/pm.c | 4 +++ + sound/soc/sof/sof-pci-dev.c | 3 ++ + sound/soc/sof/trace.c | 7 +++-- + sound/soc/tegra/tegra30_i2s.c | 25 +++------------ + 23 files changed, 117 insertions(+), 122 deletions(-) +Merging regmap-fixes/for-linus (def9d2780727 Linux 5.5-rc7) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (d670b40cfde8 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 (7265e8fc5108 Merge branch 'spi-5.5' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (5e89cd303e3a PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (b3a987b0264d Linux 5.5-rc6) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e5b5da96da50 usb: gadget: fix wrong endpoint desc) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (def9d2780727 Linux 5.5-rc7) +$ 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 (39bed42de2e7 Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (98c49f1746ac char: hpet: Fix out-of-bounds read bug) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/char/hpet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soundwire-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (d5226fa6dbae Linux 5.5) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (b19efcabb587 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Removing Documentation/devicetree/bindings/input/touchscreen/goodix.txt +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/edt-ft5x06.txt | 2 + + .../bindings/input/touchscreen/goodix.txt | 50 ----- + .../bindings/input/touchscreen/goodix.yaml | 78 ++++++++ + .../bindings/input/touchscreen/touchscreen.txt | 40 +--- + .../bindings/input/touchscreen/touchscreen.yaml | 83 ++++++++ + drivers/input/misc/axp20x-pek.c | 45 ++++- + drivers/input/rmi4/rmi_f11.c | 14 ++ + drivers/input/serio/Kconfig | 10 + + drivers/input/serio/Makefile | 1 + + drivers/input/serio/apbps2.c | 2 +- + drivers/input/serio/ioc3kbd.c | 216 +++++++++++++++++++++ + drivers/input/touchscreen/ads7846.c | 15 +- + drivers/input/touchscreen/edt-ft5x06.c | 55 ++---- + drivers/input/touchscreen/elants_i2c.c | 77 +++++++- + 14 files changed, 544 insertions(+), 144 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/goodix.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/goodix.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml + create mode 100644 drivers/input/serio/ioc3kbd.c +Merging crypto-current/master (0bc81767c5bd crypto: arm/chacha - fix build failured when kernel mode NEON is disabled) +$ git merge crypto-current/master +Already up to date. +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 (c79f46a28239 Linux 5.5-rc5) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (c79f46a28239 Linux 5.5-rc5) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (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 (8821e92879a3 Merge tag 'v5.5-rc5' into patchwork) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (089531445262 MAINTAINERS: fix style in RESET CONTROLLER FRAMEWORK) +$ git merge reset-fixes/reset/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mips-fixes/mips-fixes (bbcc5672b006 MIPS: Avoid VDSO ABI breakage due to global register variable) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (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 (ae6088216ce4 Merge tag 'trace-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge kvm-fixes/master +Already up to date. +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. + arch/s390/kvm/interrupt.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging hwmon-fixes/hwmon (7fee59f20781 hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions.) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/pmbus/ltc2978.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (c14685547762 tools/testing/nvdimm: Fix mock support for ioremap) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (5715b7fa8d8d Merge branch 'misc-5.5' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +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 (d5226fa6dbae Linux 5.5) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a2315d3aea59 ARM: exynos_defconfig: Restore debugfs support) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (fdf34a19296c dt-bindings: phy: Fix errors in intel,lgm-emmc-phy example) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/phy/intel,lgm-emmc-phy.yaml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging scsi-fixes/fixes (81a82753dc1d scsi: ufs: fix spelling mistake "initilized" -> "initialized") +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/scsi/megaraid/megaraid_sas_base.c | 20 +++++++++----------- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + drivers/scsi/qla2xxx/qla_dbg.c | 6 ------ + drivers/scsi/qla2xxx/qla_dbg.h | 6 ++++++ + drivers/scsi/qla2xxx/qla_isr.c | 12 ++++++++++++ + drivers/scsi/ufs/ufs.h | 2 +- + 7 files changed, 29 insertions(+), 20 deletions(-) +Merging drm-fixes/drm-fixes (d5226fa6dbae Linux 5.5) +$ 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 (d5226fa6dbae Linux 5.5) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (2a187d033520 mmc: sdhci: fix minimum clock rate for v3 controller) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (f01f4ffdfb70 rtc: cmos: Revert "rtc: Fix the AltCentury value on AMD/Hygon platform") +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (d1eef1c61974 Linux 5.5-rc2) +$ 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 (b3a608222336 Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (d5226fa6dbae Linux 5.5) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (d5226fa6dbae Linux 5.5) +$ 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 (8ccb5bf7619c drm/mst: Fix possible NULL pointer dereference in drm_dp_mst_process_up_req()) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_dp_mst_topology.c | 3 ++- + drivers/gpu/drm/sun4i/sun4i_drv.c | 1 - + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging kspp-gustavo/for-next/kspp (3d519d6d388b sh: kgdb: Mark expected switch fall-throughs) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (94f2630b1897 Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6) +$ 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 (8c8c5a4994a3 dma-contiguous: CMA: give precedence to cmdline) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + kernel/dma/contiguous.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) +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 +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 4 ++-- + arch/arm/boot/compressed/Makefile | 12 ++++++------ + arch/arm/boot/compressed/head.S | 29 ++++++++++++++--------------- + arch/arm/include/asm/pgtable-nommu.h | 6 ------ + arch/arm/kernel/stacktrace.c | 2 ++ + arch/arm/kernel/traps.c | 6 ++++-- + arch/arm/mm/init.c | 2 +- + 7 files changed, 29 insertions(+), 32 deletions(-) +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 (18ee80c0533a ARM: Document merges) +$ git merge arm-soc/for-next +Removing include/sound/aess.h +Removing include/soc/fsl/qe/qe_ic.h +Auto-merging include/linux/cpuhotplug.h +Auto-merging drivers/tty/serial/ucc_uart.c +Auto-merging drivers/soc/tegra/fuse/tegra-apbmisc.c +CONFLICT (content): Merge conflict in drivers/soc/tegra/fuse/tegra-apbmisc.c +Auto-merging drivers/soc/tegra/fuse/fuse-tegra.c +Removing drivers/soc/fsl/qe/qe_ic.h +Auto-merging drivers/power/reset/Kconfig +Auto-merging drivers/of/base.c +Auto-merging drivers/net/wan/fsl_ucc_hdlc.c +Removing drivers/firmware/qcom_scm-64.c +Removing drivers/firmware/qcom_scm-32.c +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi +Removing arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi +Removing arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi +Auto-merging arch/arm/mach-exynos/Kconfig +Removing arch/arm/mach-davinci/time.c +Removing arch/arm/mach-davinci/include/mach/time.h +Auto-merging arch/arm/mach-davinci/devices.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Removing arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi +Removing arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi +Removing arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi +Removing arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi +Removing arch/arm/boot/dts/stm32mp157-pinctrl.dtsi +Removing arch/arm/boot/dts/ste-href-ab8505.dtsi +Auto-merging arch/arm/boot/dts/bcm2711.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/power/qcom,rpmpd.txt +Removing Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt +Removing Documentation/devicetree/bindings/clock/sun9i-usb.txt +Removing Documentation/devicetree/bindings/clock/sun9i-de.txt +Removing Documentation/devicetree/bindings/clock/sun8i-de2.txt +Auto-merging Documentation/devicetree/bindings/arm/atmel-sysregs.txt +Resolved 'drivers/soc/tegra/fuse/tegra-apbmisc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5bdbe33adcaf] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/microchip.rst | 6 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../devicetree/bindings/arm/atmel-at91.yaml | 31 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 1 + + Documentation/devicetree/bindings/arm/cpus.yaml | 15 + + Documentation/devicetree/bindings/arm/fsl.yaml | 54 + + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 2 +- + Documentation/devicetree/bindings/arm/psci.yaml | 104 + + Documentation/devicetree/bindings/arm/qcom.yaml | 44 +- + .../devicetree/bindings/arm/rockchip.yaml | 9 + + .../devicetree/bindings/arm/{ => sprd}/sprd.yaml | 2 +- + Documentation/devicetree/bindings/arm/sunxi.yaml | 23 +- + Documentation/devicetree/bindings/arm/ux500.yaml | 36 + + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 76 + + .../clock/allwinner,sun9i-a80-de-clks.yaml | 67 + + .../clock/allwinner,sun9i-a80-usb-clocks.yaml | 59 + + .../bindings/clock/amlogic,meson8-ddr-clkc.yaml | 50 + + .../bindings/clock/amlogic,meson8b-clkc.txt | 5 + + .../devicetree/bindings/clock/sun8i-de2.txt | 34 - + .../devicetree/bindings/clock/sun9i-de.txt | 28 - + .../devicetree/bindings/clock/sun9i-usb.txt | 24 - + .../devicetree/bindings/clock/ti-clkctrl.txt | 11 +- + .../devicetree/bindings/clock/ti/dra7-atl.txt | 4 +- + .../devicetree/bindings/display/mxsfb.txt | 1 + + .../devicetree/bindings/dma/atmel-xdma.txt | 4 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 1 + + .../bindings/iio/adc/at91-sama5d2_adc.txt | 2 +- + .../devicetree/bindings/media/atmel-isi.txt | 2 +- + .../devicetree/bindings/media/fsl-pxp.txt | 2 +- + Documentation/devicetree/bindings/media/rc.yaml | 1 + + .../memory-controllers/nvidia,tegra124-emc.txt | 374 --- + .../memory-controllers/nvidia,tegra124-emc.yaml | 528 +++ + .../memory-controllers/nvidia,tegra186-mc.yaml | 130 + + .../devicetree/bindings/mfd/atmel-gpbr.txt | 4 +- + .../devicetree/bindings/mfd/atmel-matrix.txt | 1 + + .../devicetree/bindings/mfd/atmel-smc.txt | 1 + + .../devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 1 + + .../devicetree/bindings/mtd/atmel-nand.txt | 1 + + .../devicetree/bindings/net/can/atmel-can.txt | 3 +- + .../devicetree/bindings/net/can/rcar_can.txt | 5 +- + .../devicetree/bindings/net/can/rcar_canfd.txt | 5 +- + .../bindings/phy/marvell,mmp3-hsic-phy.yaml | 42 + + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 3 + + .../devicetree/bindings/power/qcom,rpmpd.txt | 148 - + .../devicetree/bindings/power/qcom,rpmpd.yaml | 170 + + .../bindings/power/reset/xlnx,zynqmp-power.txt | 42 +- + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 51 + + .../reset/brcm,bcm7216-pcie-sata-rescal.yaml | 37 + + .../devicetree/bindings/reset/intel,rcu-gw.yaml | 63 + + .../bindings/reset/nuvoton,npcm-reset.txt | 32 + + .../devicetree/bindings/soc/mediatek/scpsys.txt | 6 + + .../devicetree/bindings/timer/renesas,tmu.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 6 + + arch/arm/Kconfig.debug | 6 +- + arch/arm/arm-soc-for-next-contents.txt | 218 ++ + arch/arm/boot/dts/Makefile | 26 +- + arch/arm/boot/dts/am335x-evm.dts | 40 +- + arch/arm/boot/dts/am335x-evmsk.dts | 38 +- + arch/arm/boot/dts/am335x-icev2.dts | 13 + + arch/arm/boot/dts/am33xx-l4.dtsi | 16 - + arch/arm/boot/dts/am33xx.dtsi | 94 +- + arch/arm/boot/dts/am3517.dtsi | 2 +- + arch/arm/boot/dts/am3703.dtsi | 14 + + arch/arm/boot/dts/am3715.dtsi | 10 + + arch/arm/boot/dts/am4372.dtsi | 162 +- + arch/arm/boot/dts/am437x-l4.dtsi | 29 - + arch/arm/boot/dts/am437x-sk-evm.dts | 27 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 23 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 54 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 59 + + arch/arm/boot/dts/armada-385-clearfog-gtr-l8.dts | 115 + + arch/arm/boot/dts/armada-385-clearfog-gtr-s4.dts | 79 + + arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi | 450 +++ + arch/arm/boot/dts/armada-388-clearfog.dtsi | 11 +- + arch/arm/boot/dts/armada-388-helios4.dts | 5 - + .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 13 + + arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts | 1 - + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 1 - + arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 1 - + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 20 +- + arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 2 - + arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 2 - + arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 18 +- + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 - + arch/arm/boot/dts/aspeed-g4.dtsi | 21 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 49 +- + arch/arm/boot/dts/aspeed-g6.dtsi | 2 +- + .../boot/dts/ast2500-facebook-netbmc-common.dtsi | 1 - + arch/arm/boot/dts/at91-kizbox.dts | 172 +- + arch/arm/boot/dts/at91-kizboxmini-base.dts | 24 + + ...-kizboxmini.dts => at91-kizboxmini-common.dtsi} | 163 +- + arch/arm/boot/dts/at91-kizboxmini-mb.dts | 26 + + arch/arm/boot/dts/at91-kizboxmini-rd.dts | 49 + + arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 1 - + arch/arm/boot/dts/at91-sam9x60ek.dts | 647 ++++ + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 4 + + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 6 + + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 304 ++ + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 270 ++ + arch/arm/boot/dts/at91-smartkiz.dts | 109 + + arch/arm/boot/dts/at91sam9260.dtsi | 16 +- + arch/arm/boot/dts/at91sam9261.dtsi | 6 +- + arch/arm/boot/dts/at91sam9263.dtsi | 6 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 8 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 8 +- + arch/arm/boot/dts/bcm2711.dtsi | 70 +- + arch/arm/boot/dts/bcm2835-common.dtsi | 6 + + arch/arm/boot/dts/bcm283x.dtsi | 19 +- + arch/arm/boot/dts/bcm958625hr.dts | 15 +- + arch/arm/boot/dts/dm3725.dtsi | 10 + + arch/arm/boot/dts/dra7-evm-common.dtsi | 2 +- + arch/arm/boot/dts/dra7-l4.dtsi | 126 +- + arch/arm/boot/dts/dra7.dtsi | 276 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 33 +- + arch/arm/boot/dts/dra72x.dtsi | 42 + + arch/arm/boot/dts/dra74x.dtsi | 71 +- + arch/arm/boot/dts/dra76-evm.dts | 101 + + arch/arm/boot/dts/dra76x.dtsi | 42 + + arch/arm/boot/dts/dra7xx-clocks.dtsi | 46 +- + arch/arm/boot/dts/e60k02.dtsi | 3 +- + arch/arm/boot/dts/exynos3250.dtsi | 4 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 6 +- + arch/arm/boot/dts/exynos4210.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 5 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 29 + + arch/arm/boot/dts/exynos4412-n710x.dts | 5 + + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-tiny4412.dts | 25 + + arch/arm/boot/dts/exynos4412.dtsi | 4 +- + arch/arm/boot/dts/exynos5.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 4 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 12 +- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 4 +- + arch/arm/boot/dts/exynos5260.dtsi | 2 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 2 +- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 4 +- + arch/arm/boot/dts/exynos5410.dtsi | 6 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +- + arch/arm/boot/dts/exynos5420-cpus.dtsi | 2 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 4 +- + arch/arm/boot/dts/exynos5420.dtsi | 339 +- + arch/arm/boot/dts/exynos5422-cpus.dtsi | 2 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 285 +- + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 64 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 78 +- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 58 + + arch/arm/boot/dts/exynos54xx.dtsi | 4 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 13 + + arch/arm/boot/dts/exynos5800.dtsi | 58 +- + arch/arm/boot/dts/ibm-power9-dual.dtsi | 4 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 - + arch/arm/boot/dts/imx25-pdk.dts | 2 - + arch/arm/boot/dts/imx25.dtsi | 3 + + arch/arm/boot/dts/imx51-babbage.dts | 64 +- + arch/arm/boot/dts/imx6dl-gw5907.dts | 14 + + arch/arm/boot/dts/imx6dl-gw5910.dts | 14 + + arch/arm/boot/dts/imx6dl-gw5912.dts | 13 + + arch/arm/boot/dts/imx6dl-gw5913.dts | 14 + + arch/arm/boot/dts/imx6q-gw5907.dts | 14 + + arch/arm/boot/dts/imx6q-gw5910.dts | 14 + + arch/arm/boot/dts/imx6q-gw5912.dts | 13 + + arch/arm/boot/dts/imx6q-gw5913.dts | 14 + + arch/arm/boot/dts/imx6q-logicpd.dts | 10 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 399 +++ + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 491 +++ + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 461 +++ + arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 348 ++ + arch/arm/boot/dts/imx6qdl-icore-1.5.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-icore.dtsi | 15 +- + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 9 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 84 +- + arch/arm/boot/dts/imx6sl-tolino-shine3.dts | 322 ++ + arch/arm/boot/dts/imx6sll.dtsi | 9 + + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 1 + + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 1 + + arch/arm/boot/dts/imx6ull-colibri.dtsi | 188 +- + arch/arm/boot/dts/imx7d-pico.dtsi | 90 + + arch/arm/boot/dts/imx7d-sdb-reva.dts | 3 + + arch/arm/boot/dts/imx7d.dtsi | 2 +- + arch/arm/boot/dts/imx7s.dtsi | 16 +- + arch/arm/boot/dts/imx7ulp-com.dts | 79 + + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 88 +- + arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 1 - + arch/arm/boot/dts/ls1021a-tsn.dts | 4 + + arch/arm/boot/dts/ls1021a.dtsi | 19 + + arch/arm/boot/dts/meson.dtsi | 7 + + arch/arm/boot/dts/meson6.dtsi | 7 - + arch/arm/boot/dts/meson8.dtsi | 28 +- + arch/arm/boot/dts/meson8b-ec100.dts | 2 +- + arch/arm/boot/dts/meson8b-mxq.dts | 2 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 2 +- + arch/arm/boot/dts/meson8b.dtsi | 30 +- + arch/arm/boot/dts/mmp3-dell-ariel.dts | 22 + + arch/arm/boot/dts/mmp3.dtsi | 44 + + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 5 +- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 19 + + arch/arm/boot/dts/omap2.dtsi | 43 +- + arch/arm/boot/dts/omap2430.dtsi | 4 + + arch/arm/boot/dts/omap3-echo.dts | 461 +++ + arch/arm/boot/dts/omap3-n900.dts | 5 + + arch/arm/boot/dts/omap3.dtsi | 46 +- + arch/arm/boot/dts/omap36xx.dtsi | 4 + + arch/arm/boot/dts/omap4-l4-abe.dtsi | 7 - + arch/arm/boot/dts/omap4-l4.dtsi | 79 +- + arch/arm/boot/dts/omap4.dtsi | 154 +- + arch/arm/boot/dts/omap44xx-clocks.dtsi | 11 +- + arch/arm/boot/dts/omap5-l4-abe.dtsi | 6 - + arch/arm/boot/dts/omap5-l4.dtsi | 44 +- + arch/arm/boot/dts/omap5.dtsi | 40 +- + arch/arm/boot/dts/omap54xx-clocks.dtsi | 10 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 44 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 7 + + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 45 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 222 +- + arch/arm/boot/dts/r7s72100.dtsi | 18 +- + arch/arm/boot/dts/r8a73a4.dtsi | 42 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 3 +- + arch/arm/boot/dts/r8a7740.dtsi | 102 +- + arch/arm/boot/dts/r8a7743.dtsi | 162 +- + arch/arm/boot/dts/r8a7744.dtsi | 162 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 3 +- + arch/arm/boot/dts/r8a7745.dtsi | 122 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 3 +- + arch/arm/boot/dts/r8a77470.dtsi | 86 +- + arch/arm/boot/dts/r8a7778.dtsi | 11 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 3 +- + arch/arm/boot/dts/r8a7779.dtsi | 16 +- + arch/arm/boot/dts/r8a7790-lager.dts | 6 +- + arch/arm/boot/dts/r8a7790.dtsi | 167 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +- + arch/arm/boot/dts/r8a7791-porter.dts | 6 +- + arch/arm/boot/dts/r8a7791.dtsi | 159 +- + arch/arm/boot/dts/r8a7792.dtsi | 67 +- + arch/arm/boot/dts/r8a7793-gose.dts | 9 +- + arch/arm/boot/dts/r8a7793.dtsi | 123 +- + arch/arm/boot/dts/r8a7794-alt.dts | 6 +- + arch/arm/boot/dts/r8a7794-silk.dts | 3 +- + arch/arm/boot/dts/r8a7794.dtsi | 111 +- + arch/arm/boot/dts/rk3036.dtsi | 6 +- + arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 + + arch/arm/boot/dts/rk322x.dtsi | 6 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- + arch/arm/boot/dts/rk3288-tinker.dtsi | 13 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 9 + + .../boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi | 22 + + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 21 - + arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron-fievel.dts | 14 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 22 + + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 22 + + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 9 + + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 23 +- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 22 + + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 21 + + arch/arm/boot/dts/rk3288-veyron-tiger.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 59 +- + arch/arm/boot/dts/rk3288.dtsi | 8 +- + arch/arm/boot/dts/rk3xxx.dtsi | 6 +- + .../boot/dts/rockchip-radxa-dalang-carrier.dtsi | 81 + + arch/arm/boot/dts/rv1108.dtsi | 6 +- + arch/arm/boot/dts/s3c2416-smdk2416.dts | 2 +- + arch/arm/boot/dts/s3c6410-smdk6410.dts | 4 +- + arch/arm/boot/dts/sam9x60.dtsi | 691 ++++ + arch/arm/boot/dts/sama5d2.dtsi | 10 +- + arch/arm/boot/dts/sama5d3.dtsi | 28 +- + arch/arm/boot/dts/sama5d3_can.dtsi | 4 +- + arch/arm/boot/dts/sama5d3_tcb1.dtsi | 1 + + arch/arm/boot/dts/sama5d3_uart.dtsi | 4 +- + arch/arm/boot/dts/sh73a0.dtsi | 139 +- + arch/arm/boot/dts/ste-ab8500.dtsi | 102 +- + arch/arm/boot/dts/ste-ab8505.dtsi | 275 ++ + arch/arm/boot/dts/ste-db8500.dtsi | 15 + + arch/arm/boot/dts/ste-db8520.dtsi | 15 + + arch/arm/boot/dts/ste-dbx5x0-pinctrl.dtsi | 632 ++++ + arch/arm/boot/dts/ste-dbx5x0.dtsi | 75 +- + arch/arm/boot/dts/ste-href-ab8505.dtsi | 234 -- + arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 532 +-- + arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 79 + + arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 58 + + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 71 +- + arch/arm/boot/dts/ste-href.dtsi | 67 +- + arch/arm/boot/dts/ste-href520-tvk.dts | 22 + + arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 10 +- + arch/arm/boot/dts/ste-hrefprev60-tvk.dts | 10 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- + arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 10 +- + arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | 10 +- + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 1 - + arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 5 + + arch/arm/boot/dts/ste-snowball.dts | 70 +- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 455 +++ + arch/arm/boot/dts/stm32429i-eval.dts | 8 + + arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 28 +- + arch/arm/boot/dts/stm32f429.dtsi | 4 +- + arch/arm/boot/dts/stm32f469-disco.dts | 8 + + arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 22 +- + arch/arm/boot/dts/stm32f746.dtsi | 5 +- + arch/arm/boot/dts/stm32h743.dtsi | 6 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 1092 ++++++ + .../boot/dts/{stm32mp157c.dtsi => stm32mp151.dtsi} | 301 +- + arch/arm/boot/dts/stm32mp153.dtsi | 45 + + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 953 ------ + arch/arm/boot/dts/stm32mp157.dtsi | 31 + + arch/arm/boot/dts/stm32mp157a-avenger96.dts | 5 +- + arch/arm/boot/dts/stm32mp157a-dk1.dts | 498 +-- + arch/arm/boot/dts/stm32mp157c-dk2.dts | 15 +- + arch/arm/boot/dts/stm32mp157c-ed1.dts | 38 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 22 +- + arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi | 90 - + arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi | 62 - + arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi | 78 - + arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi | 62 - + arch/arm/boot/dts/stm32mp15xc.dtsi | 18 + + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 625 ++++ + arch/arm/boot/dts/stm32mp15xxaa-pinctrl.dtsi | 85 + + arch/arm/boot/dts/stm32mp15xxab-pinctrl.dtsi | 57 + + arch/arm/boot/dts/stm32mp15xxac-pinctrl.dtsi | 73 + + arch/arm/boot/dts/stm32mp15xxad-pinctrl.dtsi | 57 + + arch/arm/boot/dts/sun4i-a10.dtsi | 35 + + arch/arm/boot/dts/sun5i.dtsi | 3 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 25 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 36 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 13 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 42 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 1 + + .../dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts | 72 + + arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi | 11 + + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 35 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 172 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 2 - + arch/arm/boot/dts/sun9i-a80.dtsi | 42 +- + arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi | 170 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 13 +- + arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi | 180 + + arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 2 +- + arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 2 +- + arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 2 +- + arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 2 +- + arch/arm/boot/dts/tegra124.dtsi | 4 +- + arch/arm/boot/dts/tegra20-paz00.dts | 46 + + arch/arm/boot/dts/uniphier-ld4.dtsi | 3 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 10 + + arch/arm/boot/dts/uniphier-pro4.dtsi | 3 +- + arch/arm/boot/dts/uniphier-pro5.dtsi | 3 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 3 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 3 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 10 - + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 29 +- + arch/arm/boot/dts/zynq-7000.dtsi | 135 + + arch/arm/configs/at91_dt_defconfig | 59 +- + arch/arm/configs/exynos_defconfig | 9 + + arch/arm/configs/gemini_defconfig | 24 +- + arch/arm/configs/imx_v6_v7_defconfig | 5 + + arch/arm/configs/multi_v7_defconfig | 4 + + arch/arm/configs/qcom_defconfig | 4 + + arch/arm/configs/shmobile_defconfig | 3 + + arch/arm/configs/u8500_defconfig | 4 +- + arch/arm/include/debug/brcmstb.S | 24 +- + arch/arm/mach-at91/Kconfig | 24 +- + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/at91sam9.c | 18 - + arch/arm/mach-at91/pm.c | 11 +- + arch/arm/mach-at91/sam9x60.c | 34 + + arch/arm/mach-bcm/Kconfig | 1 + + arch/arm/mach-davinci/Makefile | 3 +- + arch/arm/mach-davinci/board-dm365-evm.c | 20 + + arch/arm/mach-davinci/board-dm644x-evm.c | 20 + + arch/arm/mach-davinci/devices-da8xx.c | 1 - + arch/arm/mach-davinci/devices.c | 19 - + arch/arm/mach-davinci/dm365.c | 22 +- + arch/arm/mach-davinci/include/mach/common.h | 17 - + arch/arm/mach-davinci/include/mach/time.h | 33 - + arch/arm/mach-davinci/time.c | 400 --- + arch/arm/mach-exynos/Kconfig | 37 +- + arch/arm/mach-exynos/common.h | 2 +- + arch/arm/mach-exynos/exynos.c | 4 +- + arch/arm/mach-exynos/include/mach/map.h | 2 +- + arch/arm/mach-exynos/pm.c | 2 +- + arch/arm/mach-exynos/smc.h | 2 +- + arch/arm/mach-exynos/suspend.c | 2 +- + arch/arm/mach-imx/Kconfig | 2 + + arch/arm/mach-imx/cpu.c | 30 +- + arch/arm/mach-omap2/Makefile | 6 +- + arch/arm/mach-omap2/clockdomains43xx_data.c | 10 + + arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +- + arch/arm/mach-omap2/common.h | 5 +- + arch/arm/mach-omap2/dma.c | 119 +- + arch/arm/mach-omap2/io.c | 11 + + arch/arm/mach-omap2/omap-iommu.c | 128 +- + arch/arm/mach-omap2/omap-secure.c | 50 + + arch/arm/mach-omap2/omap-secure.h | 10 + + arch/arm/mach-omap2/omap-smc.S | 6 +- + arch/arm/mach-omap2/omap_device.c | 170 - + arch/arm/mach-omap2/omap_device.h | 4 - + arch/arm/mach-omap2/omap_hwmod.c | 18 - + arch/arm/mach-omap2/omap_hwmod.h | 3 - + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 34 - + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 34 - + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 18 - + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 33 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 124 - + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 335 -- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 91 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 61 - + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 448 --- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1282 +------ + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 662 ---- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 873 ----- + arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 - + arch/arm/mach-omap2/omap_hwmod_reset.c | 24 - + arch/arm/mach-omap2/pdata-quirks.c | 44 +- + arch/arm/mach-omap2/pm24xx.c | 22 +- + arch/arm/mach-omap2/pm33xx-core.c | 24 + + arch/arm/mach-omap2/pm34xx.c | 5 - + arch/arm/mach-omap2/prcm43xx.h | 1 + + arch/arm/mach-s3c24xx/Kconfig | 16 +- + arch/arm/mach-s3c24xx/mach-rx1950.c | 19 +- + arch/arm/mach-s3c64xx/Kconfig | 1 - + arch/arm/mach-tegra/sleep-tegra30.S | 30 +- + arch/arm/mach-zynq/platsmp.c | 6 +- + arch/arm/plat-omap/dma.c | 471 +-- + arch/arm/plat-samsung/adc.c | 2 +- + arch/arm/plat-samsung/devs.c | 2 +- + arch/arm/plat-samsung/gpio-samsung.c | 2 +- + arch/arm/plat-samsung/include/plat/samsung-time.h | 2 +- + arch/arm64/boot/dts/allwinner/Makefile | 3 + + arch/arm64/boot/dts/allwinner/axp803.dtsi | 43 +- + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 23 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 60 +- + .../boot/dts/allwinner/sun50i-a64-cpu-opp.dtsi | 75 + + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 60 +- + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 8 +- + .../dts/allwinner/sun50i-a64-olinuxino-emmc.dts | 10 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 77 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 62 +- + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 7 +- + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 43 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 60 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 26 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 48 +- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 65 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 26 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 185 +- + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 88 +- + .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 68 +- + .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 6 +- + .../allwinner/sun50i-h5-libretech-all-h3-it.dts | 11 + + .../allwinner/sun50i-h5-libretech-all-h5-cc.dts | 61 + + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 45 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 43 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 43 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 48 +- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 9 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 43 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 85 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 14 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 10 +- + .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 6 +- + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 8 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 8 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 21 + + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 23 +- + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 15 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 59 +- + arch/arm64/boot/dts/altera/Makefile | 3 +- + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 223 ++ + arch/arm64/boot/dts/amlogic/Makefile | 3 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 25 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 23 + + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 6 + + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 375 +++ + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 78 + + .../dts/amlogic/meson-gxl-s905d-libretech-pc.dts | 16 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9 + + .../dts/amlogic/meson-gxm-s912-libretech-pc.dts | 62 + + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 12 + + arch/arm64/boot/dts/bitmain/bm1880-sophon-edge.dts | 9 - + arch/arm64/boot/dts/bitmain/bm1880.dtsi | 28 + + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 4 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 +- + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 17 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 63 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts | 14 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 16 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 24 + + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 24 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 13 + + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 6 +- + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 127 + + .../boot/dts/freescale/fsl-lx2160a-clearfog-cx.dts | 15 + + .../dts/freescale/fsl-lx2160a-clearfog-itx.dtsi | 57 + + .../boot/dts/freescale/fsl-lx2160a-honeycomb.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 28 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 21 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 25 + + arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 16 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 55 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 20 + + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 70 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 61 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 27 + + .../dts/freescale/imx8mq-hummingboard-pulse.dts | 6 + + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 7 + + arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts | 376 +++ + arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi | 6 + + arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 581 ++++ + .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 2 +- + .../boot/dts/freescale/imx8mq-zii-ultra-zest.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 107 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 12 - + .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 1 + + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 2 +- + arch/arm64/boot/dts/intel/Makefile | 3 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 76 +- + .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 135 + + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 8 + + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 11 + + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 34 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 4 + + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 56 + + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 73 + + arch/arm64/boot/dts/qcom/Makefile | 2 + + .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 19 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 11 +- + arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 109 - + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 92 - + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 1408 +++++--- + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 385 +++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 62 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 3530 ++++++++++---------- + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 49 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 41 + + arch/arm64/boot/dts/qcom/msm8998-pins.dtsi | 25 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 262 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 72 + + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 31 + + arch/arm64/boot/dts/qcom/pm8004.dtsi | 10 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 + + arch/arm64/boot/dts/qcom/pm8994.dtsi | 4 + + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 1 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 160 +- + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 430 +++ + arch/arm64/boot/dts/qcom/sc7180.dtsi | 2187 ++++++++++++ + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 18 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 7 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 32 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 7 + + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 35 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 391 ++- + arch/arm64/boot/dts/renesas/Makefile | 27 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 3 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 206 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 206 +- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 3 +- + .../boot/dts/renesas/r8a774c0-ek874-idk-2121wr.dts | 116 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 164 +- + ...-es1-salvator-x.dts => r8a77950-salvator-x.dts} | 4 +- + ...{r8a7795-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} | 4 +- + .../{r8a7795-es1-h3ulcb.dts => r8a77950-ulcb.dts} | 4 +- + .../renesas/{r8a7795-es1.dtsi => r8a77950.dtsi} | 4 +- + ...7795-salvator-x.dts => r8a77951-salvator-x.dts} | 4 +- + ...95-salvator-xs.dts => r8a77951-salvator-xs.dts} | 8 +- + ...7795-es1-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} | 4 +- + .../{r8a7795-h3ulcb.dts => r8a77951-ulcb.dts} | 4 +- + .../dts/renesas/{r8a7795.dtsi => r8a77951.dtsi} | 216 +- + ...7796-salvator-x.dts => r8a77960-salvator-x.dts} | 4 +- + ...96-salvator-xs.dts => r8a77960-salvator-xs.dts} | 4 +- + ...{r8a7796-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} | 4 +- + .../{r8a7796-m3ulcb.dts => r8a77960-ulcb.dts} | 4 +- + .../dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} | 206 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 390 ++- + ...8a77965-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} | 2 +- + .../{r8a77965-m3nulcb.dts => r8a77965-ulcb.dts} | 0 + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 206 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 52 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 96 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 7 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 164 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 74 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 6 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 43 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 199 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 12 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 23 +- + .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 6 - + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 2 - + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 3 + + arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 28 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 27 +- + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 3 + + .../boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 25 +- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 97 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 26 + + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 11 + + .../boot/dts/rockchip/rk3399-rockpro64-v2.dts | 30 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 759 +---- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 797 +++++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 13 +- + .../boot/dts/rockchip/rk3399pro-rock-pi-n10.dts | 17 + + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 333 ++ + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 3 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 3 +- + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 3 +- + arch/arm64/boot/dts/sprd/Makefile | 3 +- + arch/arm64/boot/dts/sprd/sc9863a.dtsi | 523 +++ + arch/arm64/boot/dts/sprd/sharkl3.dtsi | 78 + + arch/arm64/boot/dts/sprd/sp9863a-1h10.dts | 39 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 144 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 92 + + arch/arm64/boot/dts/ti/k3-am65.dtsi | 13 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 80 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 150 + + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 411 ++- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 149 + + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 45 + + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 222 ++ + arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi | 213 -- + arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts | 4 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 7 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 11 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 6 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 4 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 6 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 17 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 197 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 11 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 154 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 124 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 74 +- + arch/arm64/configs/defconfig | 38 + + arch/powerpc/include/asm/cpm.h | 172 +- + arch/powerpc/platforms/83xx/km83xx.c | 3 +- + arch/powerpc/platforms/83xx/misc.c | 23 - + arch/powerpc/platforms/83xx/mpc832x_mds.c | 3 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 3 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 3 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 3 +- + arch/powerpc/platforms/83xx/mpc83xx.h | 7 - + arch/powerpc/platforms/85xx/corenet_generic.c | 10 - + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 27 - + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 17 - + arch/powerpc/platforms/85xx/twr_p102x.c | 15 - + drivers/base/power/domain.c | 38 + + drivers/bus/Kconfig | 1 - + drivers/bus/moxtet.c | 3 +- + drivers/bus/ti-sysc.c | 18 +- + drivers/clk/clk-scmi.c | 2 +- + drivers/clk/mmp/clk-of-mmp2.c | 6 + + drivers/clk/ti/clk-44xx.c | 13 + + drivers/clk/ti/clk-54xx.c | 28 + + drivers/clk/ti/clk-7xx.c | 62 +- + drivers/clk/ti/clk.c | 4 +- + drivers/clk/ti/clkctrl.c | 96 +- + drivers/clocksource/timer-davinci.c | 8 +- + drivers/cpufreq/scmi-cpufreq.c | 2 +- + drivers/cpuidle/Makefile | 4 +- + drivers/cpuidle/cpuidle-psci-domain.c | 308 ++ + drivers/cpuidle/cpuidle-psci.c | 161 +- + drivers/cpuidle/cpuidle-psci.h | 17 + + drivers/cpuidle/dt_idle_states.c | 5 +- + drivers/dma/ti/omap-dma.c | 288 +- + drivers/firmware/Kconfig | 8 - + drivers/firmware/Makefile | 5 +- + drivers/firmware/arm_scmi/bus.c | 29 +- + drivers/firmware/arm_scmi/clock.c | 2 + + drivers/firmware/arm_scmi/common.h | 2 + + drivers/firmware/arm_scmi/driver.c | 110 +- + drivers/firmware/arm_scmi/perf.c | 2 + + drivers/firmware/arm_scmi/power.c | 2 + + drivers/firmware/arm_scmi/reset.c | 2 + + drivers/firmware/arm_scmi/scmi_pm_domain.c | 2 +- + drivers/firmware/arm_scmi/sensors.c | 2 + + drivers/firmware/imx/Kconfig | 2 +- + drivers/firmware/psci/psci.c | 18 +- + drivers/firmware/qcom_scm-32.c | 671 ---- + drivers/firmware/qcom_scm-64.c | 579 ---- + drivers/firmware/qcom_scm-legacy.c | 242 ++ + drivers/firmware/qcom_scm-smc.c | 151 + + drivers/firmware/qcom_scm.c | 854 ++++- + drivers/firmware/qcom_scm.h | 178 +- + drivers/firmware/turris-mox-rwtm.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 43 + + drivers/hwmon/scmi-hwmon.c | 2 +- + drivers/mailbox/armada-37xx-rwtm-mailbox.c | 5 +- + drivers/memory/mvebu-devbus.c | 4 +- + drivers/memory/samsung/Kconfig | 2 +- + drivers/memory/samsung/exynos-srom.c | 2 +- + drivers/memory/samsung/exynos5422-dmc.c | 7 +- + drivers/memory/tegra/Makefile | 3 +- + drivers/memory/tegra/tegra124-emc.c | 185 +- + drivers/memory/tegra/tegra186-emc.c | 293 ++ + drivers/memory/tegra/tegra186.c | 1117 ++++++- + drivers/memory/tegra/tegra20-emc.c | 175 + + drivers/memory/tegra/tegra210.c | 2 +- + drivers/memory/tegra/tegra30-emc.c | 352 +- + drivers/net/ethernet/freescale/Kconfig | 2 +- + drivers/net/wan/fsl_ucc_hdlc.c | 23 +- + drivers/net/wan/fsl_ucc_hdlc.h | 2 +- + drivers/of/base.c | 36 + + drivers/power/reset/Kconfig | 4 +- + drivers/reset/Kconfig | 25 +- + drivers/reset/Makefile | 3 + + drivers/reset/core.c | 33 +- + drivers/reset/reset-brcmstb-rescal.c | 107 + + drivers/reset/reset-intel-gw.c | 262 ++ + drivers/reset/reset-npcm.c | 291 ++ + drivers/reset/reset-qcom-aoss.c | 3 +- + drivers/reset/reset-scmi.c | 2 +- + drivers/reset/reset-uniphier.c | 13 +- + drivers/soc/atmel/soc.c | 5 +- + drivers/soc/bcm/brcmstb/biuctrl.c | 30 +- + drivers/soc/fsl/qe/Kconfig | 3 +- + drivers/soc/fsl/qe/gpio.c | 36 +- + drivers/soc/fsl/qe/qe.c | 104 +- + drivers/soc/fsl/qe/qe_common.c | 50 +- + drivers/soc/fsl/qe/qe_ic.c | 285 +- + drivers/soc/fsl/qe/qe_ic.h | 99 - + drivers/soc/fsl/qe/qe_io.c | 70 +- + drivers/soc/fsl/qe/qe_tdm.c | 8 +- + drivers/soc/fsl/qe/ucc.c | 27 +- + drivers/soc/fsl/qe/ucc_fast.c | 86 +- + drivers/soc/fsl/qe/ucc_slow.c | 60 +- + drivers/soc/fsl/qe/usb.c | 2 +- + drivers/soc/imx/Kconfig | 2 +- + drivers/soc/imx/soc-imx8.c | 9 + + drivers/soc/mediatek/mtk-cmdq-helper.c | 2 - + drivers/soc/qcom/Kconfig | 30 +- + drivers/soc/qcom/qmi_interface.c | 8 +- + drivers/soc/qcom/rpmhpd.c | 56 + + drivers/soc/renesas/Kconfig | 14 +- + drivers/soc/renesas/rcar-rst.c | 2 +- + drivers/soc/samsung/Kconfig | 2 +- + drivers/soc/samsung/exynos-chipid.c | 2 +- + drivers/soc/samsung/exynos-pmu.c | 6 +- + drivers/soc/samsung/exynos-pmu.h | 2 +- + drivers/soc/samsung/exynos3250-pmu.c | 2 +- + drivers/soc/samsung/exynos4-pmu.c | 2 +- + drivers/soc/samsung/exynos5250-pmu.c | 2 +- + drivers/soc/samsung/exynos5420-pmu.c | 2 +- + drivers/soc/tegra/Kconfig | 1 + + drivers/soc/tegra/fuse/fuse-tegra.c | 3 + + drivers/soc/tegra/fuse/fuse-tegra30.c | 29 + + drivers/soc/tegra/fuse/fuse.h | 4 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 34 +- + drivers/soc/tegra/regulators-tegra20.c | 8 +- + drivers/soc/tegra/regulators-tegra30.c | 6 + + drivers/soc/ti/knav_qmss_queue.c | 7 +- + drivers/soc/xilinx/Kconfig | 6 +- + drivers/soc/xilinx/zynqmp_power.c | 120 +- + drivers/tee/optee/core.c | 153 +- + drivers/tty/serial/ucc_uart.c | 385 ++- + include/dt-bindings/clock/dra7.h | 23 + + include/dt-bindings/clock/marvell,mmp2.h | 2 + + include/dt-bindings/clock/meson8-ddr-clkc.h | 4 + + include/dt-bindings/clock/omap4.h | 11 + + include/dt-bindings/clock/omap5.h | 12 + + include/dt-bindings/{clk => clock}/ti-dra7-atl.h | 0 + include/dt-bindings/memory/tegra186-mc.h | 139 + + include/dt-bindings/memory/tegra194-mc.h | 410 +++ + include/dt-bindings/power/mt6765-power.h | 14 + + include/dt-bindings/power/qcom-rpmpd.h | 24 + + include/dt-bindings/reset/nuvoton,npcm7xx-reset.h | 91 + + include/linux/cpuhotplug.h | 1 + + include/linux/firmware/xlnx-zynqmp.h | 7 + + include/linux/of.h | 8 + + include/linux/omap-dma.h | 18 - + include/linux/platform_data/ti-sysc.h | 1 + + include/linux/pm_domain.h | 8 + + include/linux/psci.h | 2 + + include/linux/qcom_scm.h | 119 +- + include/linux/scmi_protocol.h | 5 +- + include/linux/soc/samsung/exynos-pmu.h | 2 +- + include/linux/soc/samsung/exynos-regs-pmu.h | 16 +- + include/soc/fsl/cpm.h | 171 + + include/soc/fsl/qe/qe.h | 59 +- + include/soc/fsl/qe/qe_ic.h | 135 - + include/soc/fsl/qe/ucc_fast.h | 4 +- + include/soc/fsl/qe/ucc_slow.h | 6 +- + include/sound/aess.h | 53 - + include/trace/events/scmi.h | 90 + + 809 files changed, 40759 insertions(+), 20110 deletions(-) + rename Documentation/devicetree/bindings/arm/{ => sprd}/sprd.yaml (92%) + create mode 100644 Documentation/devicetree/bindings/arm/ux500.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-de-clks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,meson8-ddr-clkc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt + delete mode 100644 Documentation/devicetree/bindings/clock/sun9i-de.txt + delete mode 100644 Documentation/devicetree/bindings/clock/sun9i-usb.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/power/qcom,rpmpd.txt + create mode 100644 Documentation/devicetree/bindings/power/qcom,rpmpd.yaml + create mode 100644 Documentation/devicetree/bindings/reset/brcm,bcm7216-pcie-sata-rescal.yaml + create mode 100644 Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml + create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,npcm-reset.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am3703.dtsi + create mode 100644 arch/arm/boot/dts/am3715.dtsi + create mode 100644 arch/arm/boot/dts/armada-385-clearfog-gtr-l8.dts + create mode 100644 arch/arm/boot/dts/armada-385-clearfog-gtr-s4.dts + create mode 100644 arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi + create mode 100644 arch/arm/boot/dts/at91-kizboxmini-base.dts + rename arch/arm/boot/dts/{at91-kizboxmini.dts => at91-kizboxmini-common.dtsi} (51%) + create mode 100644 arch/arm/boot/dts/at91-kizboxmini-mb.dts + create mode 100644 arch/arm/boot/dts/at91-kizboxmini-rd.dts + create mode 100644 arch/arm/boot/dts/at91-sam9x60ek.dts + create mode 100644 arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts + create mode 100644 arch/arm/boot/dts/at91-smartkiz.dts + create mode 100644 arch/arm/boot/dts/dm3725.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-gw5907.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw5910.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw5912.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw5913.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5907.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5910.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5912.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5913.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-gw5907.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw5910.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw5912.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw5913.dtsi + create mode 100644 arch/arm/boot/dts/imx6sl-tolino-shine3.dts + create mode 100644 arch/arm/boot/dts/imx7ulp-com.dts + create mode 100644 arch/arm/boot/dts/omap3-echo.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi + create mode 100644 arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi + create mode 100644 arch/arm/boot/dts/sam9x60.dtsi + create mode 100644 arch/arm/boot/dts/ste-ab8505.dtsi + create mode 100644 arch/arm/boot/dts/ste-db8500.dtsi + create mode 100644 arch/arm/boot/dts/ste-db8520.dtsi + create mode 100644 arch/arm/boot/dts/ste-dbx5x0-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/ste-href-ab8505.dtsi + create mode 100644 arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi + create mode 100644 arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi + create mode 100644 arch/arm/boot/dts/ste-href520-tvk.dts + create mode 100644 arch/arm/boot/dts/ste-ux500-samsung-golden.dts + create mode 100644 arch/arm/boot/dts/stm32mp15-pinctrl.dtsi + rename arch/arm/boot/dts/{stm32mp157c.dtsi => stm32mp151.dtsi} (87%) + create mode 100644 arch/arm/boot/dts/stm32mp153.dtsi + delete mode 100644 arch/arm/boot/dts/stm32mp157-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157.dtsi + delete mode 100644 arch/arm/boot/dts/stm32mp157xaa-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/stm32mp157xab-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/stm32mp157xac-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/stm32mp157xad-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp15xc.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp15xx-dkx.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp15xxaa-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp15xxab-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp15xxac-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp15xxad-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi + create mode 100644 arch/arm/mach-at91/sam9x60.c + delete mode 100644 arch/arm/mach-davinci/include/mach/time.h + delete mode 100644 arch/arm/mach-davinci/time.c + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-cpu-opp.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-it.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts + create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-cx.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-itx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-honeycomb.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-thor96.dts + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts + delete mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts + create mode 100644 arch/arm64/boot/dts/qcom/pm6150.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm6150l.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-idp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0-ek874-idk-2121wr.dts + rename arch/arm64/boot/dts/renesas/{r8a7795-es1-salvator-x.dts => r8a77950-salvator-x.dts} (96%) + rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} (75%) + rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb.dts => r8a77950-ulcb.dts} (89%) + rename arch/arm64/boot/dts/renesas/{r8a7795-es1.dtsi => r8a77950.dtsi} (98%) + rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-x.dts => r8a77951-salvator-x.dts} (96%) + rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-xs.dts => r8a77951-salvator-xs.dts} (96%) + rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} (75%) + rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb.dts => r8a77951-ulcb.dts} (92%) + rename arch/arm64/boot/dts/renesas/{r8a7795.dtsi => r8a77951.dtsi} (94%) + rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-x.dts => r8a77960-salvator-x.dts} (94%) + rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-xs.dts => r8a77960-salvator-xs.dts} (94%) + rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} (77%) + rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb.dts => r8a77960-ulcb.dts} (90%) + rename arch/arm64/boot/dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} (94%) + rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} (92%) + rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb.dts => r8a77965-ulcb.dts} (100%) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi + create mode 100644 arch/arm64/boot/dts/sprd/sc9863a.dtsi + create mode 100644 arch/arm64/boot/dts/sprd/sharkl3.dtsi + create mode 100644 arch/arm64/boot/dts/sprd/sp9863a-1h10.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi + delete mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi + create mode 100644 drivers/cpuidle/cpuidle-psci-domain.c + create mode 100644 drivers/cpuidle/cpuidle-psci.h + delete mode 100644 drivers/firmware/qcom_scm-32.c + delete mode 100644 drivers/firmware/qcom_scm-64.c + create mode 100644 drivers/firmware/qcom_scm-legacy.c + create mode 100644 drivers/firmware/qcom_scm-smc.c + create mode 100644 drivers/memory/tegra/tegra186-emc.c + create mode 100644 drivers/reset/reset-brcmstb-rescal.c + create mode 100644 drivers/reset/reset-intel-gw.c + create mode 100644 drivers/reset/reset-npcm.c + delete mode 100644 drivers/soc/fsl/qe/qe_ic.h + create mode 100644 include/dt-bindings/clock/meson8-ddr-clkc.h + rename include/dt-bindings/{clk => clock}/ti-dra7-atl.h (100%) + create mode 100644 include/dt-bindings/memory/tegra194-mc.h + create mode 100644 include/dt-bindings/power/mt6765-power.h + create mode 100644 include/dt-bindings/reset/nuvoton,npcm7xx-reset.h + create mode 100644 include/soc/fsl/cpm.h + delete mode 100644 include/soc/fsl/qe/qe_ic.h + delete mode 100644 include/sound/aess.h + create mode 100644 include/trace/events/scmi.h +Merging amlogic/for-next (1b01733a0400 Merge branch 'v5.6/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + drivers/clk/meson/clk-pll.c | 9 +++++++++ + drivers/clk/meson/g12a.c | 1 + + 2 files changed, 10 insertions(+) +Merging aspeed/for-next (767774e5f8b3 ARM: dts: aspeed: tiogapass: Add gpio line names) +$ git merge aspeed/for-next +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Merge made by the 'recursive' strategy. + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 63 +++++++++ + .../boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 151 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-g5.dtsi | 18 +++ + arch/arm/boot/dts/aspeed-g6.dtsi | 36 +++++ + 4 files changed, 268 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts +Merging at91/at91-next (4ba105339864 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging 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 (c65228f2fe91 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx8mp-clock.yaml | 68 ++ + drivers/clk/imx/Kconfig | 6 + + drivers/clk/imx/Makefile | 3 +- + drivers/clk/imx/clk-composite-7ulp.c | 2 +- + drivers/clk/imx/clk-composite-8m.c | 4 +- + drivers/clk/imx/clk-divider-gate.c | 12 +- + drivers/clk/imx/clk-frac-pll.c | 7 +- + drivers/clk/imx/clk-imx6q.c | 5 +- + drivers/clk/imx/clk-imx7ulp.c | 182 ++--- + drivers/clk/imx/clk-imx8mm.c | 565 +++++++-------- + drivers/clk/imx/clk-imx8mn.c | 498 +++++++------- + drivers/clk/imx/clk-imx8mp.c | 764 +++++++++++++++++++++ + drivers/clk/imx/clk-imx8mq.c | 584 ++++++++-------- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 11 + + drivers/clk/imx/clk-pfdv2.c | 2 +- + drivers/clk/imx/clk-pll14xx.c | 29 +- + drivers/clk/imx/clk-pllv1.c | 14 +- + drivers/clk/imx/clk-pllv2.c | 14 +- + drivers/clk/imx/clk-pllv4.c | 2 +- + drivers/clk/imx/{clk-sccg-pll.c => clk-sscg-pll.c} | 152 ++-- + drivers/clk/imx/clk.c | 12 +- + drivers/clk/imx/clk.h | 162 +++-- + include/dt-bindings/clock/imx8mp-clock.h | 300 ++++++++ + 23 files changed, 2346 insertions(+), 1052 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx8mp-clock.yaml + create mode 100644 drivers/clk/imx/clk-imx8mp.c + rename drivers/clk/imx/{clk-sccg-pll.c => clk-sscg-pll.c} (70%) + create mode 100644 include/dt-bindings/clock/imx8mp-clock.h +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 (fdef5207b966 Merge branch 'v5.5-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (4c26b123c1dd Merge branches 'arm64-defconfig-for-5.6', 'arm64-for-5.6', 'defconfig-for-5.6', 'drivers-for-5.6' and 'dts-for-5.6' into for-next) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (9e4188a77f5e Merge branch 'renesas-drivers-for-v5.6' into renesas-next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (5ec504fa67af reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml | 6 +++++- + drivers/reset/Kconfig | 3 ++- + include/dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) +Merging rockchip/for-next (d9279b5b52ef Merge branch 'v5.6-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (ce232ab5d7c8 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (f45e09d6e80b Merge remote-tracking branch 'korg_sudeep/fixes/juno' into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging sunxi/sunxi/for-next (7493e675c584 Merge remote-tracking branches 'sunxi-korg/sunxi/clk-fixes-for-5.5', 'sunxi-korg/sunxi/fixes-for-5.5', 'sunxi-korg/sunxi/config-for-5.6', 'sunxi-korg/sunxi/config64-for-5.6', 'sunxi-korg/sunxi/clk-for-5.6' and 'sunxi-korg/sunxi/dt-for-5.6' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm64/configs/defconfig | 2 ++ + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 28 ++++++++++++++++++++++++++- + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 1 - + drivers/clk/sunxi-ng/ccu-sun6i-a31.h | 4 +++- + drivers/clk/sunxi-ng/ccu-sun8i-a23-a33.h | 4 +++- + drivers/clk/sunxi-ng/ccu-sun8i-r40.h | 4 ---- + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 6 ++---- + include/dt-bindings/clock/sun50i-a64-ccu.h | 1 + + include/dt-bindings/clock/sun6i-a31-ccu.h | 2 ++ + include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 2 ++ + include/dt-bindings/clock/sun8i-r40-ccu.h | 2 +- + 12 files changed, 44 insertions(+), 13 deletions(-) +Merging tegra/for-next (9a55272ef4d5 Merge branch for-5.6/clk into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-dfll.c | 3 +-- + drivers/clk/tegra/clk-divider.c | 9 +++++++-- + drivers/clk/tegra/clk-tegra-periph.c | 6 +++++- + drivers/clk/tegra/clk-tegra20.c | 4 +--- + drivers/clk/tegra/clk-tegra30.c | 4 +--- + 5 files changed, 15 insertions(+), 11 deletions(-) +Merging clk/clk-next (db865ee447d4 Merge branches 'clk-imx', 'clk-ti', 'clk-xilinx', 'clk-nvidia', 'clk-qcom', 'clk-freescale' and 'clk-qoriq' into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Auto-merging drivers/firmware/xilinx/zynqmp.c +Removing Documentation/devicetree/bindings/clock/qcom,videocc.txt +Removing Documentation/devicetree/bindings/clock/qcom,mmcc.txt +Removing Documentation/devicetree/bindings/clock/qcom,gpucc.txt +Removing Documentation/devicetree/bindings/clock/qcom,dispcc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/fsl,plldig.yaml | 54 + + .../devicetree/bindings/clock/fsl,sai-clock.yaml | 55 + + .../devicetree/bindings/clock/qcom,dispcc.txt | 19 - + .../devicetree/bindings/clock/qcom,dispcc.yaml | 67 + + .../devicetree/bindings/clock/qcom,gcc.yaml | 87 +- + .../devicetree/bindings/clock/qcom,gpucc.txt | 24 - + .../devicetree/bindings/clock/qcom,gpucc.yaml | 72 + + .../devicetree/bindings/clock/qcom,mmcc.txt | 28 - + .../devicetree/bindings/clock/qcom,mmcc.yaml | 98 + + .../devicetree/bindings/clock/qcom,videocc.txt | 18 - + .../devicetree/bindings/clock/qcom,videocc.yaml | 62 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 2 +- + .../devicetree/bindings/clock/xlnx,versal-clk.yaml | 64 + + .../bindings/mailbox/qcom,apcs-kpss-global.txt | 24 +- + drivers/clk/Kconfig | 24 +- + drivers/clk/Makefile | 2 + + drivers/clk/at91/clk-sam9x60-pll.c | 8 +- + drivers/clk/at91/sam9x60.c | 1 + + drivers/clk/clk-asm9260.c | 8 +- + drivers/clk/clk-bm1880.c | 3 +- + drivers/clk/clk-composite.c | 56 +- + drivers/clk/clk-divider.c | 91 +- + drivers/clk/clk-fixed-rate.c | 113 +- + drivers/clk/clk-fsl-sai.c | 92 + + drivers/clk/clk-gate.c | 35 +- + drivers/clk/clk-gpio.c | 172 +- + drivers/clk/clk-mux.c | 58 +- + drivers/clk/clk-plldig.c | 286 ++ + drivers/clk/clk-qoriq.c | 29 + + drivers/clk/clk.c | 110 +- + drivers/clk/mediatek/Kconfig | 44 +- + drivers/clk/meson/Makefile | 2 +- + drivers/clk/meson/clk-mpll.c | 4 +- + drivers/clk/meson/clk-phase.c | 4 +- + drivers/clk/meson/clk-pll.c | 4 +- + drivers/clk/meson/meson8-ddr.c | 149 + + drivers/clk/meson/meson8b.c | 124 +- + drivers/clk/meson/sclk-div.c | 4 +- + drivers/clk/microchip/clk-core.c | 8 +- + drivers/clk/mmp/clk-frac.c | 4 +- + drivers/clk/mmp/clk-mix.c | 4 +- + drivers/clk/mvebu/Kconfig | 2 +- + drivers/clk/qcom/Kconfig | 47 +- + drivers/clk/qcom/Makefile | 5 + + drivers/clk/qcom/apcs-msm8916.c | 13 +- + drivers/clk/qcom/clk-alpha-pll.c | 91 +- + drivers/clk/qcom/clk-alpha-pll.h | 5 + + drivers/clk/qcom/clk-hfpll.c | 6 +- + drivers/clk/qcom/clk-rcg.h | 1 + + drivers/clk/qcom/clk-rcg2.c | 77 + + drivers/clk/qcom/clk-rpmh.c | 10 +- + drivers/clk/qcom/clk-smd-rpm.c | 5 + + drivers/clk/qcom/dispcc-sc7180.c | 776 ++++ + drivers/clk/qcom/dispcc-sdm845.c | 214 +- + drivers/clk/qcom/gcc-ipq6018.c | 4635 ++++++++++++++++++++ + drivers/clk/qcom/gcc-msm8996.c | 35 +- + drivers/clk/qcom/gcc-msm8998.c | 14 + + drivers/clk/qcom/gcc-qcs404.c | 2 +- + drivers/clk/qcom/gpucc-sc7180.c | 266 ++ + drivers/clk/qcom/hfpll.c | 21 +- + drivers/clk/qcom/mmcc-msm8974.c | 13 - + drivers/clk/qcom/mmcc-msm8998.c | 2913 ++++++++++++ + drivers/clk/qcom/videocc-sc7180.c | 259 ++ + drivers/clk/renesas/Kconfig | 4 +- + drivers/clk/renesas/r7s9210-cpg-mssr.c | 1 + + drivers/clk/renesas/rcar-gen2-cpg.h | 8 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 6 +- + drivers/clk/rockchip/clk-pll.c | 28 +- + drivers/clk/ti/clock.h | 2 +- + drivers/clk/ti/clockdomain.c | 8 +- + drivers/clk/uniphier/clk-uniphier-peri.c | 13 +- + drivers/clk/ux500/u8500_of_clk.c | 2 + + drivers/clk/versatile/Kconfig | 2 +- + drivers/clk/zynqmp/clkc.c | 3 +- + drivers/clk/zynqmp/divider.c | 118 +- + drivers/clk/zynqmp/pll.c | 6 +- + drivers/firmware/xilinx/zynqmp.c | 2 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 4 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 4 +- + drivers/net/phy/mdio-mux-meson-g12a.c | 4 +- + include/dt-bindings/clock/qcom,dispcc-sc7180.h | 46 + + include/dt-bindings/clock/qcom,dispcc-sdm845.h | 13 +- + include/dt-bindings/clock/qcom,gcc-ipq6018.h | 262 ++ + include/dt-bindings/clock/qcom,gcc-msm8998.h | 1 + + include/dt-bindings/clock/qcom,gpucc-sc7180.h | 21 + + include/dt-bindings/clock/qcom,mmcc-msm8998.h | 210 + + include/dt-bindings/clock/qcom,videocc-sc7180.h | 23 + + include/dt-bindings/clock/xlnx-versal-clk.h | 123 + + include/dt-bindings/reset/qcom,gcc-ipq6018.h | 157 + + include/linux/clk-provider.h | 444 +- + include/linux/clk.h | 3 + + include/linux/firmware/xlnx-zynqmp.h | 2 + + 92 files changed, 12333 insertions(+), 710 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/fsl,plldig.yaml + create mode 100644 Documentation/devicetree/bindings/clock/fsl,sai-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,mmcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,mmcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,videocc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,videocc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/xlnx,versal-clk.yaml + create mode 100644 drivers/clk/clk-fsl-sai.c + create mode 100644 drivers/clk/clk-plldig.c + create mode 100644 drivers/clk/meson/meson8-ddr.c + create mode 100644 drivers/clk/qcom/dispcc-sc7180.c + create mode 100644 drivers/clk/qcom/gcc-ipq6018.c + create mode 100644 drivers/clk/qcom/gpucc-sc7180.c + create mode 100644 drivers/clk/qcom/mmcc-msm8998.c + create mode 100644 drivers/clk/qcom/videocc-sc7180.c + create mode 100644 include/dt-bindings/clock/qcom,dispcc-sc7180.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq6018.h + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sc7180.h + create mode 100644 include/dt-bindings/clock/qcom,mmcc-msm8998.h + create mode 100644 include/dt-bindings/clock/qcom,videocc-sc7180.h + create mode 100644 include/dt-bindings/clock/xlnx-versal-clk.h + create mode 100644 include/dt-bindings/reset/qcom,gcc-ipq6018.h +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 (192872ee3e79 csky: Minimize defconfig to support buildroot config.fragment) +$ git merge csky/linux-next +Auto-merging arch/riscv/kernel/riscv_ksyms.c +Auto-merging arch/riscv/kernel/entry.S +Auto-merging arch/csky/kernel/setup.c +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Recorded preimage for 'Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Makefile'. +[master 6bde32f90534] Merge remote-tracking branch 'csky/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/csky/Kconfig | 46 ++++++++- + 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/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/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 | 6 ++ + arch/csky/kernel/setup.c | 5 +- + arch/csky/kernel/smp.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 +++++++++++++++++++++++++++++++++ + 31 files changed, 619 insertions(+), 159 deletions(-) + create mode 100644 arch/csky/Kconfig.platforms + create mode 100644 arch/csky/include/asm/memory.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 (6aabc1facdb2 m68k: Implement copy_thread_tls()) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (22648c989cb8 microblaze: Increase max dtb size to 64K from 32K) +$ 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 (0ecdcaa6d5e7 openrisc: Fix Kconfig indentation) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (8121fbc4ebbb parisc: map_pages(): cleanup page table initialization) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/mm/init.c | 50 ++++++++++++-------------------------------------- + 1 file changed, 12 insertions(+), 38 deletions(-) +Merging powerpc/next (4c25df5640ae Merge branch 'topic/user-access-begin' into next) +$ git merge powerpc/next +Auto-merging arch/powerpc/platforms/maple/setup.c +Auto-merging arch/powerpc/platforms/85xx/twr_p102x.c +Auto-merging arch/powerpc/platforms/83xx/km83xx.c +Auto-merging arch/powerpc/oprofile/backtrace.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_radix.c +Removing arch/powerpc/kernel/idle_power4.S +Auto-merging arch/powerpc/kernel/entry_64.S +Auto-merging arch/powerpc/kernel/entry_32.S +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/fsl-spi.txt | 8 +- + Documentation/powerpc/imc.rst | 199 ++++++++++++++++ + Documentation/powerpc/index.rst | 2 + + Documentation/powerpc/papr_hcalls.rst | 250 +++++++++++++++++++++ + arch/powerpc/Kconfig | 9 +- + arch/powerpc/Kconfig.debug | 2 +- + arch/powerpc/Makefile.postlink | 4 +- + arch/powerpc/boot/4xx.c | 2 +- + arch/powerpc/boot/dts/mgcoge.dts | 2 +- + arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 2 +- + arch/powerpc/configs/44x/akebono_defconfig | 1 - + arch/powerpc/configs/44x/sam440ep_defconfig | 2 - + arch/powerpc/configs/52xx/pcm030_defconfig | 2 - + arch/powerpc/configs/83xx/kmeter1_defconfig | 2 - + arch/powerpc/configs/adder875_defconfig | 1 - + arch/powerpc/configs/ep8248e_defconfig | 1 - + arch/powerpc/configs/ep88xc_defconfig | 1 - + arch/powerpc/configs/mgcoge_defconfig | 1 - + arch/powerpc/configs/mpc512x_defconfig | 1 - + arch/powerpc/configs/mpc885_ads_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/configs/skiroot_defconfig | 68 +++--- + arch/powerpc/configs/storcenter_defconfig | 1 - + arch/powerpc/configs/tqm8xx_defconfig | 1 - + arch/powerpc/include/asm/book3s/32/kup.h | 68 +++++- + arch/powerpc/include/asm/book3s/32/pgtable.h | 5 + + arch/powerpc/include/asm/book3s/64/kup-radix.h | 40 +++- + arch/powerpc/include/asm/cputable.h | 7 +- + arch/powerpc/include/asm/firmware.h | 6 +- + arch/powerpc/include/asm/hw_breakpoint.h | 4 + + arch/powerpc/include/asm/kasan.h | 2 + + arch/powerpc/include/asm/kup.h | 49 +++- + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 21 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 5 + + arch/powerpc/include/asm/page.h | 2 +- + arch/powerpc/include/asm/pci-bridge.h | 7 +- + arch/powerpc/include/asm/pci.h | 1 - + arch/powerpc/include/asm/pgtable.h | 6 - + arch/powerpc/include/asm/pnv-pci.h | 1 + + arch/powerpc/include/asm/processor.h | 9 + + arch/powerpc/include/asm/reg_8xx.h | 14 ++ + arch/powerpc/include/asm/thread_info.h | 18 ++ + arch/powerpc/include/asm/uaccess.h | 88 ++++++-- + arch/powerpc/include/asm/vdso_datapage.h | 14 +- + arch/powerpc/include/asm/xive.h | 92 ++++---- + arch/powerpc/kernel/Makefile | 3 +- + arch/powerpc/kernel/asm-offsets.c | 11 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 13 +- + arch/powerpc/kernel/eeh.c | 32 +-- + arch/powerpc/kernel/eeh_cache.c | 10 +- + arch/powerpc/kernel/eeh_driver.c | 6 - + arch/powerpc/kernel/eeh_sysfs.c | 22 +- + arch/powerpc/kernel/entry_32.S | 32 +-- + arch/powerpc/kernel/entry_64.S | 18 +- + arch/powerpc/kernel/exceptions-64s.S | 32 ++- + arch/powerpc/kernel/fpu.S | 3 + + arch/powerpc/kernel/head_32.S | 62 +++-- + arch/powerpc/kernel/head_32.h | 180 +++++++++++++-- + arch/powerpc/kernel/head_40x.S | 2 + + arch/powerpc/kernel/head_8xx.S | 189 ++++++++-------- + arch/powerpc/kernel/head_booke.h | 2 + + arch/powerpc/kernel/head_fsl_booke.S | 1 + + arch/powerpc/kernel/hw_breakpoint.c | 15 +- + arch/powerpc/kernel/idle.c | 25 +++ + arch/powerpc/kernel/idle_book3s.S | 20 ++ + arch/powerpc/kernel/idle_power4.S | 83 ------- + arch/powerpc/kernel/irq.c | 22 ++ + arch/powerpc/kernel/pci-common.c | 46 +--- + arch/powerpc/kernel/pci-hotplug.c | 1 - + arch/powerpc/kernel/pci_dn.c | 47 ++-- + arch/powerpc/kernel/pci_of_scan.c | 1 - + arch/powerpc/kernel/process.c | 69 +++--- + arch/powerpc/kernel/setup.h | 2 +- + arch/powerpc/kernel/setup_32.c | 17 +- + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/traps.c | 9 + + arch/powerpc/kernel/vdso.c | 5 - + arch/powerpc/kernel/vdso32/Makefile | 4 +- + arch/powerpc/kernel/vdso32/cacheflush.S | 32 ++- + arch/powerpc/kernel/vdso32/datapage.S | 31 +-- + arch/powerpc/kernel/vdso32/getcpu.S | 23 +- + arch/powerpc/kernel/vdso32/gettimeofday.S | 119 +++++++--- + arch/powerpc/kernel/vdso32/vdso32.lds.S | 2 +- + arch/powerpc/kernel/vector.S | 3 + + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 6 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 + + arch/powerpc/kvm/book3s_xive.c | 2 +- + arch/powerpc/mm/book3s32/hash_low.S | 46 ++-- + arch/powerpc/mm/book3s32/mmu.c | 9 +- + arch/powerpc/mm/book3s64/hash_utils.c | 11 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 6 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 3 + + arch/powerpc/mm/fault.c | 11 +- + arch/powerpc/mm/kasan/kasan_init_32.c | 89 ++++---- + arch/powerpc/mm/mem.c | 4 + + arch/powerpc/mm/mmu_decl.h | 6 + + arch/powerpc/mm/nohash/8xx.c | 13 +- + arch/powerpc/mm/pgtable_32.c | 1 + + arch/powerpc/mm/ptdump/ptdump.c | 6 +- + arch/powerpc/oprofile/backtrace.c | 14 +- + arch/powerpc/perf/8xx-pmu.c | 12 +- + arch/powerpc/perf/callchain.c | 20 +- + arch/powerpc/perf/core-book3s.c | 8 +- + arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 6 +- + arch/powerpc/platforms/83xx/km83xx.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 9 + + arch/powerpc/platforms/85xx/twr_p102x.c | 5 +- + arch/powerpc/platforms/Kconfig | 4 + + arch/powerpc/platforms/Kconfig.cputype | 8 + + arch/powerpc/platforms/maple/setup.c | 2 +- + arch/powerpc/platforms/powernv/opal.c | 144 ++++++------ + arch/powerpc/platforms/powernv/pci-ioda.c | 244 ++++++++++++++------ + arch/powerpc/platforms/powernv/pci.c | 71 ++---- + arch/powerpc/platforms/powernv/pci.h | 3 - + arch/powerpc/platforms/powernv/setup.c | 4 + + arch/powerpc/platforms/pseries/Kconfig | 1 - + arch/powerpc/platforms/pseries/firmware.c | 10 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 4 +- + arch/powerpc/platforms/pseries/iommu.c | 64 +++--- + arch/powerpc/platforms/pseries/lparcfg.c | 4 +- + arch/powerpc/platforms/pseries/papr_scm.c | 8 +- + arch/powerpc/platforms/pseries/pci.c | 4 +- + arch/powerpc/platforms/pseries/vio.c | 2 + + arch/powerpc/sysdev/fsl_pci.c | 10 +- + arch/powerpc/sysdev/mpic.c | 4 +- + arch/powerpc/tools/relocs_check.sh | 20 +- + arch/powerpc/xmon/dis-asm.h | 4 +- + arch/powerpc/xmon/xmon.c | 20 +- + drivers/macintosh/Kconfig | 6 +- + drivers/misc/ocxl/Kconfig | 1 + + drivers/pci/hotplug/pnv_php.c | 82 ++++--- + .../testing/selftests/powerpc/eeh/eeh-functions.sh | 10 +- + tools/testing/selftests/powerpc/mm/.gitignore | 1 + + tools/testing/selftests/powerpc/mm/Makefile | 3 +- + tools/testing/selftests/powerpc/mm/bad_accesses.c | 171 ++++++++++++++ + .../selftests/powerpc/ptrace/ptrace-hwbreak.c | 5 +- + 141 files changed, 2310 insertions(+), 1121 deletions(-) + create mode 100644 Documentation/powerpc/imc.rst + create mode 100644 Documentation/powerpc/papr_hcalls.rst + delete mode 100644 arch/powerpc/kernel/idle_power4.S + create mode 100644 tools/testing/selftests/powerpc/mm/bad_accesses.c +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (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 (4d99abce8ce8 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 (55d0a513a0e2 s390/pkey/zcrypt: Support EP11 AES secure keys) +$ git merge s390/features +Merge made by the 'recursive' strategy. + .../debug/kprobes-on-ftrace/arch-support.txt | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/crypto/paes_s390.c | 230 +++- + arch/s390/include/asm/kprobes.h | 1 - + arch/s390/include/asm/page.h | 2 + + arch/s390/include/uapi/asm/pkey.h | 69 +- + arch/s390/include/uapi/asm/zcrypt.h | 32 +- + arch/s390/kernel/ftrace.c | 80 +- + arch/s390/kernel/kprobes.c | 61 +- + arch/s390/kernel/mcount.S | 6 + + arch/s390/mm/hugetlbpage.c | 100 +- + drivers/s390/crypto/Makefile | 3 +- + drivers/s390/crypto/pkey_api.c | 470 ++++++- + drivers/s390/crypto/zcrypt_api.c | 27 +- + drivers/s390/crypto/zcrypt_api.h | 1 + + drivers/s390/crypto/zcrypt_ccamisc.h | 1 + + drivers/s390/crypto/zcrypt_cex4.c | 273 ++++- + drivers/s390/crypto/zcrypt_ep11misc.c | 1293 ++++++++++++++++++++ + drivers/s390/crypto/zcrypt_ep11misc.h | 124 ++ + 19 files changed, 2494 insertions(+), 282 deletions(-) + create mode 100644 drivers/s390/crypto/zcrypt_ep11misc.c + create mode 100644 drivers/s390/crypto/zcrypt_ep11misc.h +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 (ede5ef35ce32 Merge branch 'xtensa-5.6-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/kernel/setup.c +Auto-merging arch/xtensa/kernel/entry.S +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 44 +++++++++--- + arch/xtensa/configs/audio_kc705_defconfig | 2 - + arch/xtensa/configs/cadence_csp_defconfig | 2 - + arch/xtensa/configs/generic_kc705_defconfig | 2 - + arch/xtensa/configs/iss_defconfig | 2 - + arch/xtensa/configs/nommu_kc705_defconfig | 2 - + arch/xtensa/configs/smp_lx200_defconfig | 3 - + arch/xtensa/configs/virt_defconfig | 1 - + arch/xtensa/include/asm/asmmacro.h | 2 + + arch/xtensa/include/asm/core.h | 8 +++ + arch/xtensa/include/asm/platform.h | 2 - + arch/xtensa/include/asm/processor.h | 4 -- + arch/xtensa/include/asm/vectors.h | 6 +- + arch/xtensa/include/uapi/asm/setup.h | 2 - + arch/xtensa/kernel/coprocessor.S | 12 +--- + arch/xtensa/kernel/entry.S | 17 +++-- + arch/xtensa/kernel/platform.c | 5 +- + arch/xtensa/kernel/setup.c | 8 ++- + arch/xtensa/kernel/vectors.S | 3 +- + arch/xtensa/kernel/vmlinux.lds.S | 102 +++++++++++++++++----------- + arch/xtensa/platforms/iss/setup.c | 25 ++----- + arch/xtensa/platforms/xtfpga/setup.c | 17 +---- + 22 files changed, 137 insertions(+), 134 deletions(-) +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 (1f1b5766df75 Merge branch 'for-next-current-v5.5-20200202' into for-next-20200202) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 39 +++++++++---- + fs/btrfs/ctree.c | 8 +-- + fs/btrfs/ctree.h | 6 +- + fs/btrfs/delayed-ref.c | 8 +-- + fs/btrfs/disk-io.c | 1 - + fs/btrfs/extent_io.c | 49 +++++++++------- + fs/btrfs/inode.c | 121 +++++++++++++++++++++++++++++++-------- + fs/btrfs/send.c | 3 +- + fs/btrfs/space-info.c | 18 +++--- + fs/btrfs/space-info.h | 3 + + fs/btrfs/super.c | 10 +++- + fs/btrfs/tests/btrfs-tests.c | 1 - + fs/btrfs/tests/extent-io-tests.c | 9 +++ + 13 files changed, 193 insertions(+), 83 deletions(-) +Merging ceph/master (3325322f773b rbd: set the 'device' link in sysfs) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 4 +- + fs/ceph/Makefile | 2 +- + fs/ceph/acl.c | 4 +- + fs/ceph/caps.c | 3 +- + fs/ceph/debugfs.c | 2 +- + fs/ceph/dir.c | 4 +- + fs/ceph/file.c | 11 ++- + fs/ceph/inode.c | 47 +++++++--- + fs/ceph/mds_client.c | 171 ++++++++++++++++++++--------------- + fs/ceph/mds_client.h | 39 ++++---- + fs/ceph/mdsmap.c | 91 +++++++++++-------- + fs/ceph/super.c | 128 ++++++++++++++++++++++---- + fs/ceph/super.h | 2 + + net/ceph/ceph_fs.c => fs/ceph/util.c | 4 - + fs/ceph/xattr.c | 7 +- + include/linux/ceph/mdsmap.h | 11 ++- + include/linux/ceph/osd_client.h | 1 + + include/linux/ceph/rados.h | 2 + + net/ceph/Makefile | 2 +- + net/ceph/osd_client.c | 18 ++-- + 20 files changed, 360 insertions(+), 193 deletions(-) + rename net/ceph/ceph_fs.c => fs/ceph/util.c (94%) +Merging cifs/for-next (94f2630b1897 Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge cifs/for-next +Already up to date. +Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/keystore.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/messaging.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging erofs/dev (1e4a29556794 erofs: clean up z_erofs_submit_queue()) +$ 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 (7f6225e446cc jbd2: clean __jbd2_journal_abort_hard() and __journal_abort_soft()) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (ccaaaf6fe5a5 Merge tag 'mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/daveh/x86-mpx) +$ 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 (7df1e988c723 fuse: fix fuse_send_readpages() in the syncronous read case) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (802a5017ffb2 jfs: remove unused MAXL2PAGES) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_dmap.c | 1 - + 1 file changed, 1 deletion(-) +Merging nfs/linux-next (d5226fa6dbae Linux 5.5) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (1346d280eafa NFS: Revalidate once when holding a delegation) +$ git merge nfs-anna/linux-next +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Auto-merging net/sunrpc/auth_gss/gss_mech_switch.c +Auto-merging include/linux/sunrpc/gss_api.h +Auto-merging fs/nfs/nfstrace.h +Auto-merging fs/nfs/nfs4xdr.c +Auto-merging fs/nfs/fscache.c +Merge made by the 'recursive' strategy. + fs/nfs/Kconfig | 11 +- + fs/nfs/Makefile | 2 +- + fs/nfs/callback_xdr.c | 11 +- + fs/nfs/client.c | 84 +- + fs/nfs/dir.c | 56 +- + fs/nfs/direct.c | 7 +- + fs/nfs/file.c | 49 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 34 +- + fs/nfs/fs_context.c | 1437 +++++++++++++++++++++ + fs/nfs/fscache.c | 2 +- + fs/nfs/getroot.c | 73 +- + fs/nfs/inode.c | 8 +- + fs/nfs/internal.h | 143 +- + fs/nfs/mount_clnt.c | 2 - + fs/nfs/namespace.c | 146 ++- + fs/nfs/nfs2xdr.c | 12 +- + fs/nfs/nfs3_fs.h | 2 +- + fs/nfs/nfs3client.c | 6 +- + fs/nfs/nfs3proc.c | 28 +- + fs/nfs/nfs3xdr.c | 5 +- + fs/nfs/nfs42proc.c | 36 +- + fs/nfs/nfs4_fs.h | 15 +- + fs/nfs/nfs4client.c | 101 +- + fs/nfs/nfs4file.c | 1 + + fs/nfs/nfs4namespace.c | 296 +++-- + fs/nfs/nfs4proc.c | 87 +- + fs/nfs/nfs4state.c | 2 +- + fs/nfs/nfs4super.c | 257 ++-- + fs/nfs/nfs4trace.c | 4 + + fs/nfs/nfs4trace.h | 237 +++- + fs/nfs/nfs4xdr.c | 7 +- + fs/nfs/nfstrace.h | 279 ++-- + fs/nfs/pnfs.c | 2 - + fs/nfs/pnfs.h | 8 +- + fs/nfs/pnfs_nfs.c | 7 +- + fs/nfs/proc.c | 24 +- + fs/nfs/read.c | 7 +- + fs/nfs/super.c | 2218 +++++--------------------------- + fs/nfs/write.c | 32 +- + include/linux/nfs_fs.h | 3 + + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_xdr.h | 11 +- + include/linux/sunrpc/auth.h | 2 - + include/linux/sunrpc/gss_api.h | 3 - + include/trace/events/rpcrdma.h | 12 +- + include/trace/events/sunrpc.h | 1 + + net/sunrpc/auth.c | 49 - + net/sunrpc/auth_gss/auth_gss.c | 1 - + net/sunrpc/auth_gss/gss_mech_switch.c | 29 - + net/sunrpc/clnt.c | 1 + + net/sunrpc/sched.c | 4 +- + net/sunrpc/xdr.c | 2 +- + net/sunrpc/xprtrdma/backchannel.c | 4 + + net/sunrpc/xprtrdma/frwr_ops.c | 104 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 20 +- + net/sunrpc/xprtrdma/transport.c | 17 +- + net/sunrpc/xprtrdma/verbs.c | 213 +-- + net/sunrpc/xprtrdma/xprt_rdma.h | 14 +- + 58 files changed, 3244 insertions(+), 2985 deletions(-) + create mode 100644 fs/nfs/fs_context.c +Merging nfsd/nfsd-next (06b3fc37dfd6 nfsd4: fix double free in nfsd4_do_async_copy()) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/cache.c +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Auto-merging include/linux/sunrpc/cache.h +Merge made by the 'recursive' strategy. + fs/nfsd/Kconfig | 10 + + fs/nfsd/filecache.c | 313 +++++++++++++++++++------- + fs/nfsd/filecache.h | 7 +- + fs/nfsd/netns.h | 6 +- + fs/nfsd/nfs3proc.c | 5 +- + fs/nfsd/nfs3xdr.c | 36 +-- + fs/nfsd/nfs4callback.c | 11 +- + fs/nfsd/nfs4layouts.c | 2 +- + fs/nfsd/nfs4proc.c | 462 ++++++++++++++++++++++++++++++++++---- + fs/nfsd/nfs4recover.c | 8 +- + fs/nfsd/nfs4state.c | 262 ++++++++++++++++----- + fs/nfsd/nfs4xdr.c | 161 ++++++++++++- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfsd.h | 34 ++- + fs/nfsd/nfsfh.h | 9 +- + fs/nfsd/nfsproc.c | 8 +- + fs/nfsd/nfssvc.c | 21 +- + fs/nfsd/state.h | 44 +++- + fs/nfsd/trace.h | 22 +- + fs/nfsd/vfs.c | 109 ++++++--- + fs/nfsd/vfs.h | 18 +- + fs/nfsd/xdr3.h | 4 +- + fs/nfsd/xdr4.h | 39 +++- + include/linux/sunrpc/cache.h | 3 - + net/sunrpc/auth_gss/svcauth_gss.c | 4 + + net/sunrpc/cache.c | 82 +++---- + 26 files changed, 1340 insertions(+), 346 deletions(-) +$ git am -3 ../patches/0001-Revert-sunrpc-expiry_time-should-be-seconds-not-time.patch +Applying: Revert "sunrpc: expiry_time should be seconds not timeval" +$ git reset HEAD^ +Unstaged changes after reset: +M net/sunrpc/auth_gss/svcauth_gss.c +$ git add -A . +$ git commit -v -a --amend +[master 5f8d4115b361] Merge remote-tracking branch 'nfsd/nfsd-next' + Date: Mon Feb 3 09:41:43 2020 +1100 +Merging orangefs/for-next (f9bbb68233aa orangefs: posix open permission checking...) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (1a980b8cbf00 ovl: add splice file read write helper) +$ git merge overlayfs/overlayfs-next +Auto-merging include/linux/fs.h +Auto-merging fs/read_write.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 43 ++++++++- + fs/overlayfs/dir.c | 10 +- + fs/overlayfs/export.c | 28 +++--- + fs/overlayfs/file.c | 160 +++++++++++++++++++++++++++++--- + fs/overlayfs/inode.c | 66 ++++++++------ + fs/overlayfs/namei.c | 38 ++++---- + fs/overlayfs/overlayfs.h | 24 ++++- + fs/overlayfs/ovl_entry.h | 23 +++-- + fs/overlayfs/readdir.c | 22 +++-- + fs/overlayfs/super.c | 233 ++++++++++++++++++++++++++--------------------- + fs/overlayfs/util.c | 28 ++---- + fs/read_write.c | 56 ++++++++++++ + include/linux/fs.h | 16 ++++ + 13 files changed, 520 insertions(+), 227 deletions(-) +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 +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_ag.c | 21 +++--- + fs/xfs/libxfs/xfs_alloc.c | 51 ++++++------- + fs/xfs/libxfs/xfs_attr_remote.c | 22 ++---- + fs/xfs/libxfs/xfs_bmap.c | 25 ++++--- + fs/xfs/libxfs/xfs_btree.c | 45 +---------- + fs/xfs/libxfs/xfs_btree.h | 21 ------ + fs/xfs/libxfs/xfs_da_btree.c | 8 +- + fs/xfs/libxfs/xfs_ialloc.c | 12 +-- + fs/xfs/libxfs/xfs_refcount.c | 6 -- + fs/xfs/libxfs/xfs_sb.c | 17 +++-- + fs/xfs/scrub/agheader_repair.c | 4 - + fs/xfs/scrub/fscounters.c | 3 - + fs/xfs/scrub/repair.c | 10 ++- + fs/xfs/xfs_attr_inactive.c | 17 +++-- + fs/xfs/xfs_buf.c | 161 ++++++++++++++++++++++++---------------- + fs/xfs/xfs_buf.h | 33 ++++---- + fs/xfs/xfs_buf_item.c | 2 +- + fs/xfs/xfs_discard.c | 2 +- + fs/xfs/xfs_dquot.c | 8 +- + fs/xfs/xfs_filestream.c | 11 ++- + fs/xfs/xfs_inode.c | 12 +-- + fs/xfs/xfs_log_recover.c | 30 +++----- + fs/xfs/xfs_reflink.c | 2 - + fs/xfs/xfs_rtalloc.c | 8 +- + fs/xfs/xfs_symlink.c | 37 +++------ + fs/xfs/xfs_trans.h | 14 ++-- + fs/xfs/xfs_trans_buf.c | 61 ++++++--------- + 27 files changed, 278 insertions(+), 365 deletions(-) +Merging zonefs/for-next (37d131712f17 zonefs: Add documentation) +$ git merge zonefs/for-next +Auto-merging fs/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/zonefs.txt | 303 ++++++++ + MAINTAINERS | 10 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/zonefs/Kconfig | 9 + + fs/zonefs/Makefile | 4 + + fs/zonefs/super.c | 1423 ++++++++++++++++++++++++++++++++++ + fs/zonefs/zonefs.h | 192 +++++ + include/uapi/linux/magic.h | 1 + + 9 files changed, 1944 insertions(+) + create mode 100644 Documentation/filesystems/zonefs.txt + create mode 100644 fs/zonefs/Kconfig + create mode 100644 fs/zonefs/Makefile + create mode 100644 fs/zonefs/super.c + create mode 100644 fs/zonefs/zonefs.h +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 (d2dfd78ce9d2 Merge branch 'merge.nfs-fs_parse' into for-next) +$ git merge vfs/for-next +Auto-merging security/selinux/hooks.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/bpf/inode.c +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/ubifs/sb.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/jbd2/journal.c +CONFLICT (content): Merge conflict in fs/jbd2/journal.c +Auto-merging fs/ioctl.c +Auto-merging fs/inode.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/Makefile +CONFLICT (content): Merge conflict in fs/Makefile +Auto-merging fs/Kconfig +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/md/md-bitmap.c +Auto-merging drivers/block/rbd.c +Auto-merging drivers/base/devtmpfs.c +Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c +Auto-merging MAINTAINERS +Resolved 'fs/Makefile' using previous resolution. +Resolved 'fs/jbd2/journal.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fed85c31955c] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/mount_api.txt | 12 +- + MAINTAINERS | 6 + + arch/powerpc/platforms/cell/spufs/inode.c | 11 +- + arch/s390/hypfs/inode.c | 11 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 11 +- + drivers/base/devtmpfs.c | 4 +- + drivers/block/rbd.c | 31 +- + drivers/md/md-bitmap.c | 16 +- + drivers/usb/gadget/function/f_fs.c | 11 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/afs/super.c | 32 +- + fs/attr.c | 23 +- + fs/cachefiles/rdwr.c | 27 +- + fs/ceph/cache.c | 4 +- + fs/ceph/mds_client.c | 4 +- + fs/ceph/super.c | 40 +- + fs/cifs/inode.c | 13 +- + fs/configfs/inode.c | 9 +- + fs/cramfs/inode.c | 14 +- + fs/debugfs/inode.c | 121 +--- + fs/ecryptfs/mmap.c | 16 +- + fs/f2fs/data.c | 16 +- + fs/f2fs/file.c | 18 +- + fs/fat/misc.c | 10 +- + fs/filesystems.c | 3 +- + fs/fs_context.c | 79 +-- + fs/fs_parser.c | 447 +++++++-------- + fs/fsopen.c | 26 +- + fs/fuse/inode.c | 25 +- + fs/gfs2/ops_fstype.c | 103 ++-- + fs/hugetlbfs/inode.c | 13 +- + fs/inode.c | 63 +-- + fs/ioctl.c | 33 +- + fs/jbd2/journal.c | 22 +- + fs/jffs2/super.c | 26 +- + fs/kernfs/inode.c | 6 +- + fs/libfs.c | 70 +++ + fs/nfs/fs_context.c | 93 +-- + fs/ntfs/inode.c | 18 +- + fs/proc/root.c | 13 +- + fs/ramfs/inode.c | 11 +- + fs/tracefs/inode.c | 114 +--- + fs/ubifs/file.c | 18 +- + fs/ubifs/sb.c | 11 +- + fs/utimes.c | 4 +- + fs/vboxsf/Kconfig | 10 + + fs/vboxsf/Makefile | 5 + + fs/vboxsf/dir.c | 427 ++++++++++++++ + fs/vboxsf/file.c | 379 +++++++++++++ + fs/vboxsf/shfl_hostintf.h | 901 ++++++++++++++++++++++++++++++ + fs/vboxsf/super.c | 491 ++++++++++++++++ + fs/vboxsf/utils.c | 551 ++++++++++++++++++ + fs/vboxsf/vboxsf_wrappers.c | 371 ++++++++++++ + fs/vboxsf/vfsmod.h | 137 +++++ + fs/xfs/xfs_super.c | 11 +- + include/linux/ceph/libceph.h | 5 +- + include/linux/debugfs.h | 2 +- + include/linux/fs.h | 16 +- + include/linux/fs_context.h | 32 +- + include/linux/fs_parser.h | 101 ++-- + include/linux/ramfs.h | 4 +- + include/linux/shmem_fs.h | 3 +- + include/linux/tracefs.h | 1 - + kernel/bpf/inode.c | 11 +- + kernel/cgroup/cgroup-internal.h | 4 +- + kernel/cgroup/cgroup-v1.c | 35 +- + kernel/cgroup/cgroup.c | 13 +- + kernel/trace/trace.c | 4 +- + kernel/trace/trace_events.c | 6 +- + kernel/trace/trace_hwlat.c | 2 +- + mm/page_io.c | 11 +- + mm/shmem.c | 40 +- + net/ceph/ceph_common.c | 41 +- + security/selinux/hooks.c | 11 +- + security/smack/smack_lsm.c | 9 +- + 76 files changed, 4118 insertions(+), 1176 deletions(-) + create mode 100644 fs/vboxsf/Kconfig + create mode 100644 fs/vboxsf/Makefile + create mode 100644 fs/vboxsf/dir.c + create mode 100644 fs/vboxsf/file.c + create mode 100644 fs/vboxsf/shfl_hostintf.h + create mode 100644 fs/vboxsf/super.c + create mode 100644 fs/vboxsf/utils.c + create mode 100644 fs/vboxsf/vboxsf_wrappers.c + create mode 100644 fs/vboxsf/vfsmod.h +$ git am -3 ../patches/0001-fs-fix-up-for-CONFIG_BLOCK-and-bmap.patch +Applying: fs: fix up for !CONFIG_BLOCK and bmap +$ git reset HEAD^ +Unstaged changes after reset: +M fs/inode.c +$ git add -A . +$ git commit -v -a --amend +[master 5308a7a3b014] Merge remote-tracking branch 'vfs/for-next' + Date: Mon Feb 3 10:03:38 2020 +1100 +Merging printk/for-next (e616b43fb3a3 Merge branch 'for-5.6' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (01b810ed7187 Merge branch 'remotes/lorenzo/pci/uniphier') +$ 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 (d036ff0e56a7 Merge branch 'for-5.6/logitech' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (ccf7f7a51619 Revert "i2c: stm32f7: allow controller to be wakeup-source") +$ git merge i2c/i2c/for-next +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/i2c/busses/i2c-pmcmsp.c +Removing drivers/i2c/busses/i2c-parport.h +Removing drivers/i2c/busses/i2c-parport-light.c +Auto-merging drivers/i2c/busses/i2c-highlander.c +Auto-merging MAINTAINERS +Removing Documentation/i2c/busses/i2c-parport-light.rst +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 9 +- + Documentation/devicetree/bindings/eeprom/at25.txt | 2 + + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 14 +- + .../devicetree/bindings/i2c/i2c-jz4780.txt | 4 +- + .../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 2 + + .../devicetree/bindings/i2c/renesas,i2c.txt | 3 +- + .../devicetree/bindings/i2c/renesas,iic.txt | 1 + + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 11 + + Documentation/i2c/busses/i2c-parport-light.rst | 24 - + Documentation/i2c/busses/index.rst | 1 - + Documentation/i2c/dev-interface.rst | 24 +- + Documentation/i2c/dma-considerations.rst | 2 +- + Documentation/i2c/i2c-protocol.rst | 45 +- + Documentation/i2c/i2c-topology.rst | 72 +- + Documentation/i2c/i2c.svg | 1341 ++++++++++++++++++++ + Documentation/i2c/index.rst | 58 +- + Documentation/i2c/instantiating-devices.rst | 123 +- + Documentation/i2c/old-module-parameters.rst | 31 +- + Documentation/i2c/slave-interface.rst | 4 +- + Documentation/i2c/smbus-protocol.rst | 107 +- + Documentation/i2c/summary.rst | 62 +- + Documentation/i2c/writing-clients.rst | 36 +- + MAINTAINERS | 2 - + drivers/i2c/busses/Kconfig | 107 +- + drivers/i2c/busses/Makefile | 1 - + drivers/i2c/busses/i2c-at91-core.c | 39 - + drivers/i2c/busses/i2c-cadence.c | 32 +- + drivers/i2c/busses/i2c-cht-wc.c | 6 +- + drivers/i2c/busses/i2c-highlander.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 10 +- + drivers/i2c/busses/i2c-jz4780.c | 156 ++- + drivers/i2c/busses/i2c-meson.c | 97 +- + drivers/i2c/busses/i2c-nvidia-gpu.c | 6 +- + drivers/i2c/busses/i2c-ocores.c | 2 +- + drivers/i2c/busses/i2c-parport-light.c | 267 ---- + drivers/i2c/busses/i2c-parport.c | 113 +- + drivers/i2c/busses/i2c-parport.h | 106 -- + drivers/i2c/busses/i2c-pmcmsp.c | 6 +- + drivers/i2c/busses/i2c-pnx.c | 4 +- + drivers/i2c/busses/i2c-powermac.c | 8 +- + drivers/i2c/busses/i2c-stm32f7.c | 117 +- + drivers/i2c/busses/i2c-stu300.c | 2 +- + drivers/i2c/busses/i2c-taos-evm.c | 4 +- + drivers/i2c/busses/i2c-tegra.c | 178 ++- + drivers/i2c/busses/i2c-tiny-usb.c | 8 +- + drivers/i2c/busses/i2c-xiic.c | 69 +- + drivers/i2c/i2c-core-acpi.c | 12 +- + drivers/i2c/i2c-core-base.c | 33 +- + drivers/i2c/i2c-core-of.c | 7 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 29 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 69 +- + drivers/misc/eeprom/at24.c | 72 +- + drivers/nvmem/core.c | 19 +- + drivers/nvmem/nvmem.h | 2 + + include/linux/i2c.h | 115 +- + include/linux/nvmem-provider.h | 3 + + 56 files changed, 2574 insertions(+), 1105 deletions(-) + delete mode 100644 Documentation/i2c/busses/i2c-parport-light.rst + create mode 100644 Documentation/i2c/i2c.svg + delete mode 100644 drivers/i2c/busses/i2c-parport-light.c + delete mode 100644 drivers/i2c/busses/i2c-parport.h +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 (2429c99fa13a firmware: dmi: Add dmi_memdev_handle) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (fd8bdb23b918 hwmon: (k10temp) Display up to eight sets of CCD temperatures) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (77ce1a47ebca docs: filesystems: add overlayfs to index.rst) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (1697d9812481 media: staging/intel-ipu3: remove TODO item about acronyms) +$ 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 (dd08aa64df30 Merge branch 'acpi-misc' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (a48ac1c9f294 cpufreq: brcmstb-avs: fix imbalance of cpufreq policy refcount) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (8c30fa7666ff Correction to manpage of cpupower) +$ 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. +Recorded preimage for 'Documentation/driver-api/thermal/cpu-idle-cooling.rst' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/driver-api/thermal/cpu-idle-cooling.rst'. +[master 999325f28000] 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 (8889f6fa3588 RDMA/core: Make the entire API tree static) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (b3a608222336 Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (e27cca96cd68 xfrm: add espintcp (RFC 8229)) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (9b695a64279e net/mlx5: Add bit to indicate support for encap/decap in sw-steering managed tables) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'recursive' strategy. + include/linux/mlx5/mlx5_ifc.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging netfilter-next/master (b3a608222336 Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security) +$ 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 5a503ab72d86] 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 (2a13513f99e7 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (fe6648315605 Bluetooth: optimize barrier usage for Rmw atomics) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap_core.c | 26 +++++++++++++++----------- + net/bluetooth/l2cap_sock.c | 16 +++++++++++++--- + net/bluetooth/smp.c | 4 ++-- + 4 files changed, 31 insertions(+), 17 deletions(-) +Merging mac80211-next/master (30b2f0be23fb mac80211: add ieee80211_is_any_nullfunc()) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/cfg.c +Auto-merging include/net/cfg80211.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 11 +- + include/linux/ieee80211.h | 11 +- + include/net/cfg80211.h | 28 ++++ + include/net/mac80211.h | 38 ++++- + include/uapi/linux/nl80211.h | 26 ++++ + include/uapi/linux/wireless.h | 5 +- + net/mac80211/cfg.c | 5 +- + net/mac80211/debugfs.c | 56 ++++++- + net/mac80211/debugfs_sta.c | 6 +- + net/mac80211/ieee80211_i.h | 9 ++ + net/mac80211/iface.c | 67 +++++++++ + net/mac80211/key.c | 11 ++ + net/mac80211/mlme.c | 11 +- + net/mac80211/rx.c | 8 +- + net/mac80211/status.c | 91 +++++++++++- + net/mac80211/tx.c | 172 +++++++++++++++++++++- + net/mac80211/util.c | 1 - + net/wireless/nl80211.c | 40 +++++ + 19 files changed, 563 insertions(+), 35 deletions(-) +Merging gfs2/for-next (a31b4ec539e9 Revert "gfs2: eliminate tr_num_revoke_rm") +$ 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 (ccfb9299a0b6 mtd: spi-nor: Add support for at25sl321) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (0bc81767c5bd crypto: arm/chacha - fix build failured when kernel mode NEON is disabled) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (b45f1b3b585e Merge branch 'ttm-prot-fix' of git://people.freedesktop.org/~thomash/linux into drm-next) +$ git merge drm/drm-next +Auto-merging mm/memory.c +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/ttm/ttm_bo_vm.c | 22 ++++++++++++++------- + include/linux/mm.h | 2 ++ + include/linux/mm_types.h | 7 ++++++- + mm/memory.c | 44 +++++++++++++++++++++++++++++++++++++---- + 4 files changed, 63 insertions(+), 12 deletions(-) +Merging amdgpu/drm-next (658d696d0197 drm/amdgpu/smu_v11_0: Correct behavior of restoring default tables (v2)) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 229 ++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 96 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 20 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 52 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 92 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 59 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 31 +- + 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 | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 236 +++-- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 978 +++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 35 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 705 ++++++++++++++- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 8 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 37 +- + 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 | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 32 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 105 +-- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 41 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 40 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 + + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 82 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 78 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 34 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 21 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 30 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 42 +- + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 73 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 12 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 19 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 24 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 24 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 3 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 17 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 25 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 8 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 19 + + .../drm/amd/display/modules/color/color_gamma.c | 307 +++---- + .../drm/amd/display/modules/color/color_gamma.h | 4 - + .../drm/amd/display/modules/freesync/freesync.c | 2 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 8 +- + .../amd/display/modules/hdcp/hdcp1_transition.c | 4 +- + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 3 + + .../drm/amd/include/asic_reg/df/df_3_6_sh_mask.h | 8 + + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 6 +- + .../drm/amd/include/asic_reg/gc/gc_9_4_1_offset.h | 264 ++++++ + .../drm/amd/include/asic_reg/gc/gc_9_4_1_sh_mask.h | 748 ++++++++++++++++ + .../include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 128 +++ + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 23 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 70 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 + + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 12 +- + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 12 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 28 +- + drivers/gpu/drm/radeon/radeon_display.c | 9 +- + drivers/gpu/drm/radeon/radeon_mode.h | 1 - + drivers/gpu/drm/scheduler/sched_entity.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- + include/drm/gpu_scheduler.h | 5 +- + include/uapi/drm/amdgpu_drm.h | 10 +- + include/uapi/linux/kfd_ioctl.h | 19 +- + 130 files changed, 4597 insertions(+), 983 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_1_sh_mask.h +Merging drm-intel/for-linux-next (f0b2878f3649 drm/i915: Fix i915_error_state_store error defination) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_types.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_bios.c | 6 +- + drivers/gpu/drm/i915/display/intel_display.c | 44 ++- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 50 ++-- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 37 ++- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 90 +++++- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 6 +- + drivers/gpu/drm/i915/gt/intel_context.c | 46 +-- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 13 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 354 ++++++++++++++++++++++- + drivers/gpu/drm/i915/gt/mock_engine.c | 17 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 258 +++++++++++++++++ + drivers/gpu/drm/i915/i915_active.c | 35 ++- + drivers/gpu/drm/i915/i915_active.h | 6 + + drivers/gpu/drm/i915/i915_gem.c | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 7 +- + drivers/gpu/drm/i915/i915_pmu.c | 12 + + drivers/gpu/drm/i915/i915_request.c | 6 +- + drivers/gpu/drm/i915/i915_request.h | 60 ++++ + drivers/gpu/drm/i915/i915_scheduler.c | 22 +- + drivers/gpu/drm/i915/i915_vma.c | 14 +- + 23 files changed, 963 insertions(+), 146 deletions(-) +Merging drm-tegra/drm/tegra/for-next (c472a0b0a1fd drm/tegra: sor: Initialize runtime PM before use) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/sor.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/sor.c | 49 +++++++++++++++++++++++++-------------------- + 1 file changed, 27 insertions(+), 22 deletions(-) +Merging drm-misc/for-linux-next (db735fc4036b drm/msm: Set dma maximum segment size for mdss) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/msm_drv.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +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 (ea87683909bc Merge branch 'regmap-5.6' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (112e3f5ac505 ALSA: hdsp: Make the firmware loading ioctl a bit more readable) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (ab8ccdd6018b Merge branch 'asoc-5.6' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (6080d608eeff module.h: Annotate mod_kallsyms with __rcu) +$ git merge modules/modules-next +Already up to date. +Merging input/next (c5ccf2ad3d33 Input: synaptics-rmi4 - switch to reduced reporting mode) +$ git merge input/next +Already up to date. +Merging block/for-next (766202ba3aba Merge branch 'io_uring-5.6' into for-next) +$ git merge block/for-next +Auto-merging fs/io_uring.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/ata/ahci.c | 7 ++ + drivers/ata/libata-core.c | 21 ++++ + drivers/ata/pata_arasan_cf.c | 6 +- + drivers/ata/pata_pcmcia.c | 1 + + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_nl.c | 3 +- + drivers/block/drbd/drbd_receiver.c | 2 +- + drivers/block/drbd/drbd_worker.c | 4 +- + drivers/block/nbd.c | 10 ++ + drivers/block/xen-blkfront.c | 8 +- + drivers/md/bcache/bcache.h | 3 + + drivers/md/bcache/bset.h | 3 +- + drivers/md/bcache/journal.c | 3 +- + drivers/md/bcache/request.c | 17 ++- + drivers/md/bcache/stats.c | 10 +- + drivers/md/bcache/super.c | 21 +++- + drivers/md/bcache/sysfs.c | 22 ++++ + fs/eventfd.c | 15 +++ + fs/io_uring.c | 209 ++++++++++++++++++++++++++++++------- + include/linux/eventfd.h | 12 +++ + include/linux/libata.h | 1 + + 22 files changed, 318 insertions(+), 64 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at d43de60cfebb Merge remote-tracking branch 'etnaviv/etnaviv/next' +Merging next-20200131 version of block +$ git merge -m next-20200131/block a6aed3aa015dccfb8f3a7709d95398611c25a348 +Auto-merging fs/io_uring.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/ata/ahci.c | 7 +++ + drivers/ata/libata-core.c | 21 ++++++++ + drivers/ata/pata_arasan_cf.c | 6 ++- + drivers/ata/pata_pcmcia.c | 1 + + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_nl.c | 3 +- + drivers/block/drbd/drbd_receiver.c | 2 +- + drivers/block/drbd/drbd_worker.c | 4 +- + drivers/block/nbd.c | 10 ++++ + drivers/block/xen-blkfront.c | 8 ++- + fs/io_uring.c | 107 +++++++++++++++++++++++++++++++++++++ + include/linux/libata.h | 1 + + 13 files changed, 161 insertions(+), 13 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 (533a6cfe08f9 mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()) +$ git merge mmc/next +Already up to date. +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 (6a24f567af4a mfd: syscon: Add arguments support for syscon reference) +$ git merge mfd/for-mfd-next +Auto-merging drivers/regulator/bd718x7-regulator.c +CONFLICT (content): Merge conflict in drivers/regulator/bd718x7-regulator.c +Auto-merging drivers/regulator/Makefile +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/clk/Kconfig +Resolved 'drivers/regulator/bd718x7-regulator.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 059a18087e46] Merge remote-tracking branch 'mfd/for-mfd-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/leds/rohm,bd71828-leds.yaml | 52 +++ + Documentation/devicetree/bindings/mfd/ab8500.txt | 8 +- + .../devicetree/bindings/mfd/atmel-usart.txt | 11 +- + Documentation/devicetree/bindings/mfd/da9062.txt | 10 + + Documentation/devicetree/bindings/mfd/max14577.txt | 2 + + .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 193 ++++++++++ + drivers/clk/Kconfig | 6 +- + drivers/clk/clk-bd718x7.c | 50 ++- + drivers/gpio/Kconfig | 12 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-bd71828.c | 159 ++++++++ + drivers/mfd/Kconfig | 18 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/ab8500-core.c | 18 +- + drivers/mfd/atmel-hlcdc.c | 18 +- + drivers/mfd/axp20x.c | 2 +- + drivers/mfd/cros_ec_dev.c | 22 ++ + drivers/mfd/cs47l15-tables.c | 1 + + drivers/mfd/da9062-core.c | 18 +- + drivers/mfd/db8500-prcmu.c | 122 +----- + drivers/mfd/dln2.c | 13 +- + drivers/mfd/intel-lpss-pci.c | 13 + + drivers/mfd/madera-core.c | 33 +- + drivers/mfd/rn5t618.c | 1 + + drivers/mfd/rohm-bd70528.c | 3 +- + drivers/mfd/rohm-bd71828.c | 344 +++++++++++++++++ + drivers/mfd/rohm-bd718x7.c | 43 ++- + drivers/mfd/sm501.c | 19 +- + drivers/mfd/syscon.c | 31 +- + drivers/mfd/tqmx86.c | 3 +- + drivers/regulator/Kconfig | 4 + + drivers/regulator/Makefile | 1 + + drivers/regulator/bd718x7-regulator.c | 194 ++++------ + drivers/regulator/rohm-regulator.c | 95 +++++ + drivers/rtc/Kconfig | 3 +- + drivers/rtc/rtc-bd70528.c | 220 +++++++++-- + include/linux/mfd/db8500-prcmu.h | 18 - + include/linux/mfd/dbx500-prcmu.h | 30 -- + include/linux/mfd/rohm-bd70528.h | 19 +- + include/linux/mfd/rohm-bd71828.h | 423 +++++++++++++++++++++ + include/linux/mfd/rohm-bd718x7.h | 6 - + include/linux/mfd/rohm-generic.h | 70 +++- + include/linux/mfd/rohm-shared.h | 21 + + include/linux/mfd/syscon.h | 14 + + 44 files changed, 1929 insertions(+), 416 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/rohm,bd71828-leds.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml + create mode 100644 drivers/gpio/gpio-bd71828.c + create mode 100644 drivers/mfd/rohm-bd71828.c + create mode 100644 drivers/regulator/rohm-regulator.c + create mode 100644 include/linux/mfd/rohm-bd71828.h + create mode 100644 include/linux/mfd/rohm-shared.h +Merging backlight/for-backlight-next (7af43a76695d backlight: qcom-wled: Fix unsigned comparison to zero) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/ams369fg06.c | 1 - + drivers/video/backlight/bd6107.c | 24 ++++++++++++++++-------- + drivers/video/backlight/qcom-wled.c | 4 ++-- + include/linux/platform_data/bd6107.h | 1 - + 4 files changed, 18 insertions(+), 12 deletions(-) +Merging battery/for-next (3d32a8437c05 power: supply: ipaq_micro_battery: remove unneeded semicolon) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (29bf153e5fbc Merge remote-tracking branch 'regulator/topic/equal' into regulator-next) +$ git merge regulator/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (24f779af0476 Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/include/security.h +Auto-merging security/selinux/include/classmap.h +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/keys/key.c +Auto-merging samples/Makefile +Auto-merging net/wireless/reg.c +Auto-merging net/ceph/ceph_common.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_audit.h +CONFLICT (content): Merge conflict in include/linux/lsm_audit.h +Auto-merging fs/ecryptfs/keystore.c +Auto-merging fs/crypto/keysetup_v1.c +Auto-merging fs/crypto/keyring.c +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Resolved 'include/linux/lsm_audit.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a1d010d60a0f] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + 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 | 3 +- + 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, 3184 insertions(+), 444 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 (98aa00345de5 selinux: fix regression introduced by move_mount(2) syscall) +$ git merge selinux/next +Already up to date. +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 (b3a608222336 Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (7084eddf6be9 tpm: Add tpm_version_major sysfs file) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (057b52b4b3d5 watchdog: da9062: make restart handler atomic safe) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/da9062-wdt.txt | 5 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 11 ++- + drivers/watchdog/at91sam9_wdt.h | 21 ++++ + drivers/watchdog/cadence_wdt.c | 5 +- + drivers/watchdog/da9062_wdt.c | 35 ++++++- + drivers/watchdog/dw_wdt.c | 11 ++- + drivers/watchdog/it87_wdt.c | 2 + + drivers/watchdog/mtk_wdt.c | 105 +++++++++++++++++++- + drivers/watchdog/qcom-wdt.c | 2 +- + drivers/watchdog/sama5d4_wdt.c | 109 ++++++++++++++++----- + drivers/watchdog/stm32_iwdg.c | 18 ++++ + drivers/watchdog/watchdog_core.c | 35 +++++++ + drivers/watchdog/watchdog_dev.c | 36 +------ + .../dt-bindings/reset-controller/mt2712-resets.h | 22 +++++ + .../dt-bindings/reset-controller/mt8183-resets.h | 17 ++++ + 15 files changed, 361 insertions(+), 73 deletions(-) + create mode 100644 include/dt-bindings/reset-controller/mt2712-resets.h +Merging iommu/next (e3b5ee0cfb65 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/pci/pci.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/amd_iommu_init.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/acpi/arm64/iort.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/iommu/iommu.txt | 6 + + drivers/acpi/arm64/iort.c | 22 +- + drivers/iommu/Kconfig | 35 +- + drivers/iommu/Makefile | 3 +- + drivers/iommu/amd_iommu.c | 12 +- + drivers/iommu/amd_iommu_init.c | 55 +- + drivers/iommu/amd_iommu_types.h | 7 +- + drivers/iommu/arm-smmu-impl.c | 2 +- + drivers/iommu/arm-smmu-v3.c | 600 ++++++++++++++++------ + drivers/iommu/arm-smmu.c | 334 +++++++----- + drivers/iommu/arm-smmu.h | 228 ++++---- + drivers/iommu/dmar.c | 44 +- + drivers/iommu/intel-iommu-debugfs.c | 75 +++ + drivers/iommu/intel-iommu.c | 366 +++++++++---- + drivers/iommu/intel-pasid.c | 97 +--- + drivers/iommu/intel-pasid.h | 6 + + drivers/iommu/intel-svm.c | 171 +++--- + drivers/iommu/io-pgtable-arm-v7s.c | 22 +- + drivers/iommu/io-pgtable-arm.c | 164 +++--- + drivers/iommu/io-pgtable.c | 2 +- + drivers/iommu/iommu-sysfs.c | 5 + + drivers/iommu/iommu.c | 51 +- + drivers/iommu/iova.c | 2 +- + drivers/iommu/ipmmu-vmsa.c | 2 +- + drivers/iommu/msm_iommu.c | 4 +- + drivers/iommu/mtk_iommu.c | 4 +- + drivers/iommu/of_iommu.c | 25 +- + drivers/iommu/qcom_iommu.c | 25 +- + drivers/iommu/virtio-iommu.c | 14 +- + drivers/pci/ats.c | 2 + + drivers/pci/pci.c | 1 + + include/linux/intel-iommu.h | 25 +- + include/linux/io-pgtable.h | 27 +- + include/linux/iommu.h | 19 +- + include/linux/pci-ats.h | 3 + + include/trace/events/intel_iommu.h | 48 +- + 36 files changed, 1686 insertions(+), 822 deletions(-) +Merging vfio/next (7b5372ba04ca vfio: platform: fix __iomem in vfio_platform_amdxgbe.c) +$ git merge vfio/next +Auto-merging drivers/vfio/platform/reset/vfio_platform_amdxgbe.c +Merge made by the 'recursive' strategy. + drivers/vfio/mdev/mdev_sysfs.c | 2 +- + drivers/vfio/pci/vfio_pci_nvlink2.c | 8 +++++--- + drivers/vfio/platform/reset/vfio_platform_amdxgbe.c | 4 ++-- + drivers/vfio/vfio_iommu_spapr_tce.c | 2 +- + 4 files changed, 9 insertions(+), 7 deletions(-) +Merging audit/next (cb5172d96d16 audit: Add __rcu annotation to RCU pointer) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (e9a3bfe38e39 scripts/dtc: Revert "yamltree: Ensure consistent bracketing of properties with phandles") +$ git merge devicetree/for-next +Already up to date. +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 (754a36a58c29 Merge branch 'spi-5.6' into spi-next) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (178915ad4ab3 Merge branch 'core/urgent') +$ git merge tip/auto-latest +Auto-merging scripts/Makefile.lib +Auto-merging mm/Makefile +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/events/core.c +Auto-merging kernel/Makefile +Auto-merging init/main.c +Auto-merging include/linux/sched.h +Auto-merging drivers/cpufreq/intel_pstate.c +Auto-merging arch/x86/mm/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 266 ++++++++++ + MAINTAINERS | 13 +- + Makefile | 3 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/Makefile | 2 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/entry/vdso/Makefile | 6 + + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/include/asm/topology.h | 25 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/smpboot.c | 290 ++++++++++- + 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/perf_event.h | 4 + + include/linux/sched.h | 4 + + include/linux/sched/nohz.h | 2 + + include/linux/seqlock.h | 51 +- + init/init_task.c | 8 + + init/main.c | 2 + + kernel/Makefile | 6 + + kernel/events/core.c | 17 +- + 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/sched/Makefile | 6 + + kernel/sched/core.c | 53 +- + kernel/sched/fair.c | 47 +- + kernel/sched/loadavg.c | 33 +- + kernel/sched/rt.c | 24 +- + kernel/sched/sched.h | 7 + + kernel/smp.c | 2 +- + 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 | 18 + + 80 files changed, 3591 insertions(+), 788 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 Documentation/devicetree/bindings/arm/atmel-sysregs.txt +Merge made by the 'recursive' strategy. +Merging edac/edac-for-next (7e5d6cf35329 EDAC/amd64: Do not warn when removing instances) +$ git merge edac/edac-for-next +Already up to date. +Merging irqchip/irq/irqchip-next (656b42deddea irqchip: Some Kconfig cleanup for C-SKY) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 4 ++-- + drivers/irqchip/irq-gic-v3.c | 9 +++++++-- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging ftrace/for-next (2b90927c77c9 tracing: Use seq_buf for building dynevent_cmd string) +$ git merge ftrace/for-next +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/trace/trace_syscalls.c +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_hwlat.c +Auto-merging kernel/trace/trace_events_trigger.c +Auto-merging kernel/trace/trace_events_hist.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace_entries.h +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace.c +Auto-merging kernel/events/core.c +Auto-merging init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merging init/Kconfig +Auto-merging include/trace/trace_events.h +Auto-merging include/linux/trace_events.h +Auto-merging include/linux/perf_event.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/index.rst +Resolved 'init/main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1816b15dbbe0] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/bootconfig.rst | 188 ++++ + Documentation/admin-guide/index.rst | 1 + + Documentation/trace/boottime-trace.rst | 184 ++++ + Documentation/trace/events.rst | 515 ++++++++++ + Documentation/trace/index.rst | 1 + + Documentation/trace/kprobetrace.rst | 1 + + MAINTAINERS | 9 + + drivers/oprofile/cpu_buffer.c | 2 +- + fs/proc/Makefile | 1 + + fs/proc/bootconfig.c | 89 ++ + include/linux/bootconfig.h | 224 +++++ + include/linux/perf_event.h | 6 +- + include/linux/ring_buffer.h | 110 +-- + include/linux/trace_events.h | 131 ++- + include/trace/trace_events.h | 11 +- + init/Kconfig | 14 + + init/main.c | 213 +++- + kernel/events/core.c | 42 +- + kernel/events/internal.h | 34 +- + kernel/events/ring_buffer.c | 54 +- + kernel/trace/Kconfig | 360 +++---- + kernel/trace/Makefile | 3 + + kernel/trace/blktrace.c | 8 +- + kernel/trace/ftrace.c | 22 +- + kernel/trace/kprobe_event_gen_test.c | 225 +++++ + kernel/trace/ring_buffer.c | 135 +-- + kernel/trace/ring_buffer_benchmark.c | 2 +- + kernel/trace/synth_event_gen_test.c | 523 ++++++++++ + kernel/trace/trace.c | 453 +++++---- + kernel/trace/trace.h | 69 +- + kernel/trace/trace_boot.c | 334 +++++++ + kernel/trace/trace_branch.c | 6 +- + kernel/trace/trace_dynevent.c | 212 ++++ + kernel/trace/trace_dynevent.h | 32 + + kernel/trace/trace_entries.h | 2 +- + kernel/trace/trace_events.c | 106 +- + kernel/trace/trace_events_hist.c | 1030 ++++++++++++++++++-- + kernel/trace/trace_events_trigger.c | 7 +- + kernel/trace/trace_functions.c | 8 +- + kernel/trace/trace_functions_graph.c | 14 +- + kernel/trace/trace_hwlat.c | 2 +- + kernel/trace/trace_irqsoff.c | 8 +- + kernel/trace/trace_kdb.c | 8 +- + kernel/trace/trace_kprobe.c | 238 ++++- + kernel/trace/trace_mmiotrace.c | 12 +- + kernel/trace/trace_output.c | 2 +- + kernel/trace/trace_sched_switch.c | 4 +- + kernel/trace/trace_sched_wakeup.c | 20 +- + kernel/trace/trace_selftest.c | 26 +- + kernel/trace/trace_seq.c | 3 - + kernel/trace/trace_stat.c | 31 +- + kernel/trace/trace_syscalls.c | 8 +- + kernel/trace/trace_uprobe.c | 2 +- + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/bootconfig.c | 803 +++++++++++++++ + tools/Makefile | 11 +- + tools/bootconfig/.gitignore | 1 + + tools/bootconfig/Makefile | 23 + + tools/bootconfig/include/linux/bootconfig.h | 7 + + tools/bootconfig/include/linux/bug.h | 12 + + tools/bootconfig/include/linux/ctype.h | 7 + + tools/bootconfig/include/linux/errno.h | 7 + + tools/bootconfig/include/linux/kernel.h | 18 + + tools/bootconfig/include/linux/printk.h | 17 + + tools/bootconfig/include/linux/string.h | 32 + + tools/bootconfig/main.c | 353 +++++++ + .../samples/bad-array-space-comment.bconf | 5 + + tools/bootconfig/samples/bad-array.bconf | 2 + + tools/bootconfig/samples/bad-dotword.bconf | 4 + + tools/bootconfig/samples/bad-empty.bconf | 1 + + tools/bootconfig/samples/bad-keyerror.bconf | 2 + + tools/bootconfig/samples/bad-longkey.bconf | 1 + + tools/bootconfig/samples/bad-manywords.bconf | 1 + + tools/bootconfig/samples/bad-no-keyword.bconf | 2 + + tools/bootconfig/samples/bad-nonprintable.bconf | 2 + + tools/bootconfig/samples/bad-spaceword.bconf | 2 + + tools/bootconfig/samples/bad-tree.bconf | 5 + + tools/bootconfig/samples/bad-value.bconf | 3 + + tools/bootconfig/samples/escaped.bconf | 3 + + .../samples/good-array-space-comment.bconf | 4 + + .../samples/good-comment-after-value.bconf | 1 + + tools/bootconfig/samples/good-printables.bconf | 2 + + tools/bootconfig/samples/good-simple.bconf | 11 + + tools/bootconfig/samples/good-single.bconf | 4 + + .../samples/good-space-after-value.bconf | 1 + + tools/bootconfig/samples/good-tree.bconf | 12 + + tools/bootconfig/test-bootconfig.sh | 105 ++ + .../test.d/trigger/trigger-hist-syntax-errors.tc | 32 + + 89 files changed, 6419 insertions(+), 827 deletions(-) + create mode 100644 Documentation/admin-guide/bootconfig.rst + create mode 100644 Documentation/trace/boottime-trace.rst + create mode 100644 fs/proc/bootconfig.c + create mode 100644 include/linux/bootconfig.h + create mode 100644 kernel/trace/kprobe_event_gen_test.c + create mode 100644 kernel/trace/synth_event_gen_test.c + create mode 100644 kernel/trace/trace_boot.c + create mode 100644 lib/bootconfig.c + create mode 100644 tools/bootconfig/.gitignore + create mode 100644 tools/bootconfig/Makefile + create mode 100644 tools/bootconfig/include/linux/bootconfig.h + create mode 100644 tools/bootconfig/include/linux/bug.h + create mode 100644 tools/bootconfig/include/linux/ctype.h + create mode 100644 tools/bootconfig/include/linux/errno.h + create mode 100644 tools/bootconfig/include/linux/kernel.h + create mode 100644 tools/bootconfig/include/linux/printk.h + create mode 100644 tools/bootconfig/include/linux/string.h + create mode 100644 tools/bootconfig/main.c + create mode 100644 tools/bootconfig/samples/bad-array-space-comment.bconf + create mode 100644 tools/bootconfig/samples/bad-array.bconf + create mode 100644 tools/bootconfig/samples/bad-dotword.bconf + create mode 100644 tools/bootconfig/samples/bad-empty.bconf + create mode 100644 tools/bootconfig/samples/bad-keyerror.bconf + create mode 100644 tools/bootconfig/samples/bad-longkey.bconf + create mode 100644 tools/bootconfig/samples/bad-manywords.bconf + create mode 100644 tools/bootconfig/samples/bad-no-keyword.bconf + create mode 100644 tools/bootconfig/samples/bad-nonprintable.bconf + create mode 100644 tools/bootconfig/samples/bad-spaceword.bconf + create mode 100644 tools/bootconfig/samples/bad-tree.bconf + create mode 100644 tools/bootconfig/samples/bad-value.bconf + create mode 100644 tools/bootconfig/samples/escaped.bconf + create mode 100644 tools/bootconfig/samples/good-array-space-comment.bconf + create mode 100644 tools/bootconfig/samples/good-comment-after-value.bconf + create mode 100644 tools/bootconfig/samples/good-printables.bconf + create mode 100644 tools/bootconfig/samples/good-simple.bconf + create mode 100644 tools/bootconfig/samples/good-single.bconf + create mode 100644 tools/bootconfig/samples/good-space-after-value.bconf + create mode 100644 tools/bootconfig/samples/good-tree.bconf + create mode 100755 tools/bootconfig/test-bootconfig.sh + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-syntax-errors.tc +Merging rcu/rcu/next (59d8cc6b2e37 rcu: Forgive slow expedited grace periods at boot time) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (4cbc418a44d5 Merge branch 'cve-2019-3016' into kvm-next-5.6) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (4a267aa70795 KVM: arm64: Treat emulated TVAL TimerValue as a signed 32-bit integer) +$ git merge kvm-arm/next +Already up to date. +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 (b2ff728bae9b selftests: KVM: testing the local IRQs resets) +$ git merge kvms390/next +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/kvm_host.h +Auto-merging Documentation/virt/kvm/api.txt +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.txt | 43 ++++++ + arch/s390/include/asm/kvm_host.h | 5 + + arch/s390/kvm/kvm-s390.c | 92 +++++++----- + include/uapi/linux/kvm.h | 5 + + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/include/kvm_util.h | 6 + + tools/testing/selftests/kvm/lib/kvm_util.c | 36 +++++ + tools/testing/selftests/kvm/s390x/resets.c | 197 +++++++++++++++++++++++++ + 8 files changed, 351 insertions(+), 34 deletions(-) + create mode 100644 tools/testing/selftests/kvm/s390x/resets.c +Merging xen-tip/linux-next (8557bbe5156e xen/blkback: Consistently insert one empty line between functions) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-pciback | 13 ++++ + Documentation/ABI/testing/sysfs-driver-xen-blkback | 10 +++ + drivers/block/xen-blkback/blkback.c | 42 +++++----- + drivers/block/xen-blkback/common.h | 1 + + drivers/block/xen-blkback/xenbus.c | 26 ++++++- + drivers/xen/gntdev.c | 24 +++--- + drivers/xen/xen-balloon.c | 2 +- + drivers/xen/xen-pciback/conf_space.c | 37 +++++++++ + drivers/xen/xen-pciback/conf_space.h | 7 ++ + drivers/xen/xen-pciback/conf_space_capability.c | 89 ++++++++++++++++++++++ + drivers/xen/xen-pciback/conf_space_header.c | 19 +++++ + drivers/xen/xen-pciback/pci_stub.c | 66 ++++++++++++++++ + drivers/xen/xen-pciback/pciback.h | 1 + + drivers/xen/xenbus/xenbus_probe.c | 8 +- + drivers/xen/xenbus/xenbus_probe_backend.c | 38 +++++++++ + include/xen/xenbus.h | 2 + + 16 files changed, 346 insertions(+), 39 deletions(-) +Merging percpu/for-next (9391e7a9a1e2 Merge branch 'for-5.6' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/asm-generic/percpu.h | 10 +++++----- + include/linux/percpu-defs.h | 3 +-- + 2 files changed, 6 insertions(+), 7 deletions(-) +Merging workqueues/for-next (e8ab20d9bcb3 workqueue: remove workqueue_work event class) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (cf85e7c7f437 platform/x86: intel_pmc_ipc: Switch to use driver->dev_groups) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (27ef91a2e9a5 platform/chrome: cros_ec: Match implementation with headers) +$ git merge chrome-platform/for-next +Removing include/linux/mfd/cros_ec.h +Auto-merging drivers/power/supply/cros_usbpd-charger.c +Auto-merging drivers/mfd/cros_ec_dev.c +Merge made by the 'recursive' strategy. + drivers/iio/accel/cros_ec_accel_legacy.c | 1 - + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 1 - + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 1 - + drivers/iio/light/cros_ec_light_prox.c | 1 - + drivers/iio/pressure/cros_ec_baro.c | 1 - + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 1 - + drivers/mfd/cros_ec_dev.c | 1 - + drivers/platform/chrome/chromeos_laptop.c | 18 ++-- + drivers/platform/chrome/cros_ec.c | 27 +++++- + drivers/platform/chrome/cros_ec.h | 19 +++++ + drivers/platform/chrome/cros_ec_chardev.c | 1 - + drivers/platform/chrome/cros_ec_debugfs.c | 1 - + drivers/platform/chrome/cros_ec_i2c.c | 2 + + drivers/platform/chrome/cros_ec_ishtp.c | 4 +- + drivers/platform/chrome/cros_ec_lightbar.c | 1 - + drivers/platform/chrome/cros_ec_lpc.c | 3 +- + drivers/platform/chrome/cros_ec_proto.c | 6 +- + drivers/platform/chrome/cros_ec_rpmsg.c | 2 + + drivers/platform/chrome/cros_ec_sensorhub.c | 1 - + drivers/platform/chrome/cros_ec_spi.c | 2 + + drivers/platform/chrome/cros_ec_sysfs.c | 1 - + drivers/platform/chrome/cros_ec_trace.c | 97 ++++++++++++++++++++-- + drivers/platform/chrome/cros_ec_trace.h | 26 ++++-- + drivers/platform/chrome/cros_ec_vbc.c | 1 - + drivers/platform/chrome/cros_usbpd_logger.c | 1 - + drivers/platform/chrome/wilco_ec/Kconfig | 3 +- + drivers/platform/chrome/wilco_ec/core.c | 4 +- + drivers/platform/chrome/wilco_ec/keyboard_leds.c | 8 +- + drivers/platform/chrome/wilco_ec/mailbox.c | 4 +- + drivers/platform/chrome/wilco_ec/telemetry.c | 6 +- + drivers/power/supply/cros_usbpd-charger.c | 1 - + drivers/rtc/rtc-cros-ec.c | 1 - + include/linux/mfd/cros_ec.h | 35 -------- + include/linux/platform_data/cros_ec_proto.h | 34 ++++++-- + 34 files changed, 219 insertions(+), 97 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec.h + delete mode 100644 include/linux/mfd/cros_ec.h +Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (260718b3a35d leds: lm3692x: Disable chip on brightness 0) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (6b8526d3abc0 ipmi:ssif: Handle a possible NULL pointer reference) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/ipmb.rst | 4 ++++ + drivers/char/ipmi/ipmb_dev_int.c | 31 ++++++++++++++++++++++++++++++- + drivers/char/ipmi/ipmi_ssif.c | 10 +++++++--- + 3 files changed, 41 insertions(+), 4 deletions(-) +Merging driver-core/driver-core-next (9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (4baa550ecc86 usb: musb: remove dummy driver musb_am335x.c) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (19c64e7354e5 USB: serial: cyberjack: fix spelling mistake "To" -> "Too") +$ git merge usb-serial/usb-next +Already up to date. +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 (3f41f8ca21c5 dt-bindings: fix compilation error of the example in intel,lgm-emmc-phy.yaml) +$ git merge phy-next/next +Auto-merging Documentation/devicetree/bindings/phy/intel,lgm-emmc-phy.yaml +Merge made by the 'recursive' strategy. +Merging tty/tty-next (85f4c95172d6 tty: n_hdlc: Use flexible-array member and struct_size() helper) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (15d663249653 Merge branch 'urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (b7365587f513 extcon: Remove unneeded extern keyword from extcon.h) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (5098cae1f79c dt-bindings: soundwire: fix example) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (d5226fa6dbae Linux 5.5) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (39bed42de2e7 Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma) +$ git merge staging/staging-next +Already up to date. +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 (30c8fa3ec61a interconnect: qcom: Add MSM8916 interconnect provider driver) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (474809a28e7b dmaengine: Fix return value for dma_request_chan() in case of failure) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + Documentation/driver-api/dmaengine/client.rst | 4 ++-- + drivers/dma/dmaengine.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging cgroup/for-next (0cd9d33ace33 cgroup: init_tasks shouldn't be linked to the root cgroup) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) +Merging scsi/for-next (c4b119f431e1 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (81a82753dc1d scsi: ufs: fix spelling mistake "initilized" -> "initialized") +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (d1281e3a562e virtio-blk: remove VIRTIO_BLK_F_SCSI support) +$ git merge vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/block/virtio_blk.c +CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c +Resolved 'drivers/block/virtio_blk.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e0837207f0b8] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/configs/guest.config | 1 - + drivers/block/Kconfig | 10 ---- + drivers/block/virtio_blk.c | 118 +------------------------------------ + drivers/net/virtio_net.c | 9 +++ + drivers/virtio/virtio_balloon.c | 2 + + drivers/virtio/virtio_mmio.c | 15 +---- + drivers/virtio/virtio_pci_common.c | 2 +- + 7 files changed, 16 insertions(+), 141 deletions(-) +Merging rpmsg/for-next (34a9acb223e3 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/mtk,scp.txt | 36 ++ + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 44 ++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 23 +- + MAINTAINERS | 1 + + drivers/hwspinlock/omap_hwspinlock.c | 32 +- + drivers/hwspinlock/qcom_hwspinlock.c | 28 +- + drivers/hwspinlock/sirf_hwspinlock.c | 46 +- + drivers/hwspinlock/stm32_hwspinlock.c | 4 +- + drivers/remoteproc/Kconfig | 10 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/mtk_common.h | 94 +++ + drivers/remoteproc/mtk_scp.c | 663 +++++++++++++++++++++ + drivers/remoteproc/mtk_scp_ipi.c | 219 +++++++ + drivers/remoteproc/qcom_q6v5_mss.c | 220 ++++++- + drivers/remoteproc/qcom_q6v5_pas.c | 260 +++++++- + drivers/remoteproc/qcom_sysmon.c | 2 +- + drivers/remoteproc/remoteproc_core.c | 6 +- + drivers/rpmsg/Kconfig | 9 + + drivers/rpmsg/Makefile | 1 + + drivers/rpmsg/mtk_rpmsg.c | 414 +++++++++++++ + include/linux/remoteproc/mtk_scp.h | 66 ++ + include/linux/rpmsg/mtk_rpmsg.h | 38 ++ + 22 files changed, 2108 insertions(+), 109 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.txt + create mode 100644 drivers/remoteproc/mtk_common.h + create mode 100644 drivers/remoteproc/mtk_scp.c + create mode 100644 drivers/remoteproc/mtk_scp_ipi.c + create mode 100644 drivers/rpmsg/mtk_rpmsg.c + create mode 100644 include/linux/remoteproc/mtk_scp.h + create mode 100644 include/linux/rpmsg/mtk_rpmsg.h +Merging gpio/for-next (0282c72d30d3 Merge tag 'gpio-updates-for-v5.6-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (1e4d149e9017 gpio: altera: change to platform_get_irq_optional to avoid false-positive error) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (d5226fa6dbae Linux 5.5) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (122ce22cb37b pinctrl: madera: Remove extra blank line) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (cd0a32371db7 pinctrl: tigerlake: Tiger Lake uses _HID enumeration) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (225a2ec19aac pinctrl: samsung: Fix missing OF and GPIOLIB dependency on S3C24xx and S3C64xx) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 4 +- + drivers/pwm/Kconfig | 9 +- + drivers/pwm/core.c | 13 +- + drivers/pwm/pwm-atmel.c | 87 ++++++++-- + drivers/pwm/pwm-cros-ec.c | 58 ++++++- + drivers/pwm/pwm-imx27.c | 147 +++++++++------- + drivers/pwm/pwm-mxs.c | 101 ++++++----- + drivers/pwm/pwm-omap-dmtimer.c | 54 ++++-- + drivers/pwm/pwm-pca9685.c | 4 - + drivers/pwm/pwm-rcar.c | 5 +- + drivers/pwm/pwm-stm32.c | 4 +- + drivers/pwm/pwm-sun4i.c | 194 ++++++++++++++++++---- + include/trace/events/pwm.h | 58 +++++++ + 13 files changed, 539 insertions(+), 199 deletions(-) + create mode 100644 include/trace/events/pwm.h +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 (af4ddd607dff selftests/ftrace: fix glob selftest) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (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 (ad9882f15884 coresight: etm4x: Fix unused function warning) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (f45719240700 dt-bindings: rtc: at91rm9200: document clocks property) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-mt6397.c +Removing drivers/rtc/rtc-at91rm9200.h +Auto-merging drivers/rtc/Kconfig +Removing Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/ABI/testing/rtc-cdev | 8 + + .../bindings/rtc/atmel,at91rm9200-rtc.txt | 17 - + .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 49 +++ + drivers/rtc/Kconfig | 24 +- + drivers/rtc/rtc-abx80x.c | 7 +- + drivers/rtc/rtc-asm9260.c | 3 + + drivers/rtc/rtc-at91rm9200.c | 119 +++--- + drivers/rtc/rtc-at91rm9200.h | 71 ---- + drivers/rtc/rtc-cmos.c | 12 +- + drivers/rtc/rtc-ds1343.c | 10 +- + drivers/rtc/rtc-hym8563.c | 19 +- + drivers/rtc/rtc-moxart.c | 5 +- + drivers/rtc/rtc-mt6397.c | 10 +- + drivers/rtc/rtc-omap.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 6 +- + drivers/rtc/rtc-pcf85063.c | 16 +- + drivers/rtc/rtc-pcf8523.c | 6 +- + drivers/rtc/rtc-pcf8563.c | 40 +- + drivers/rtc/rtc-rv3028.c | 17 +- + drivers/rtc/rtc-rv3029c2.c | 442 +++++++++------------ + drivers/rtc/rtc-rv8803.c | 16 +- + drivers/rtc/rtc-rx8010.c | 25 +- + drivers/rtc/rtc-rx8025.c | 27 +- + drivers/rtc/rtc-stm32.c | 5 +- + drivers/rtc/rtc-tps6586x.c | 4 +- + drivers/rtc/rtc-zynqmp.c | 4 +- + include/linux/rtc.h | 1 + + include/uapi/linux/rtc.h | 7 +- + 29 files changed, 415 insertions(+), 558 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.yaml + delete mode 100644 drivers/rtc/rtc-at91rm9200.h +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 (cd5676db0574 misc: eeprom: at24: support pm_runtime control) +$ git merge at24/at24/for-next +Already up to date. +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 (d1eef1c61974 Linux 5.5-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Merge made by the 'recursive' strategy. +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 (4a81ae0c43bc nvmem: add QTI SDAM driver) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/core.c +Merge made by the 'recursive' strategy. +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 +Auto-merging drivers/video/fbdev/hyperv_fb.c +Auto-merging drivers/hv/hv_util.c +Merge made by the 'recursive' strategy. + drivers/hv/channel_mgmt.c | 21 ++-- + drivers/hv/hv_balloon.c | 13 +-- + drivers/hv/hv_fcopy.c | 54 +++++++++- + drivers/hv/hv_kvp.c | 43 +++++++- + drivers/hv/hv_snapshot.c | 55 +++++++++- + drivers/hv/hv_util.c | 148 +++++++++++++++++++++++++-- + drivers/hv/hyperv_vmbus.h | 6 ++ + drivers/hv/vmbus_drv.c | 4 + + drivers/input/serio/hyperv-keyboard.c | 27 +++++ + drivers/video/fbdev/Kconfig | 1 + + drivers/video/fbdev/hyperv_fb.c | 184 +++++++++++++++++++++++++++------- + include/linux/hyperv.h | 4 + + tools/hv/hv_fcopy_daemon.c | 37 ++++++- + tools/hv/hv_kvp_daemon.c | 36 ++++--- + tools/hv/hv_vss_daemon.c | 49 +++++++-- + 15 files changed, 574 insertions(+), 108 deletions(-) +Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c58ff643763c kdb: Tweak escape handling for vi users) +$ 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 (054fef0337fe 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 (5292e24a6acf mm/mmu_notifiers: Use 'interval_sub' as the variable for mmu_interval_notifier) +$ 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 (e42617b825f8 Linux 5.5-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 (35c57fc3f8ea kunit: building kunit as a module breaks allmodconfig) +$ git merge kunit-next/kunit +Already up to date. +Merging akpm-current/current (c2ab9895e523 ipc/msg.c: Adjust indentation in ksys_msgctl) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging fs/ramfs/inode.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/memory-barriers.txt | 16 ++-- + Documentation/process/deprecated.rst | 10 +-- + MAINTAINERS | 7 ++ + arch/mips/kernel/traps.c | 5 -- + arch/x86/mm/fault.c | 26 +++++- + drivers/acpi/apei/ghes.c | 2 +- + drivers/base/memory.c | 53 ++++++++---- + fs/aio.c | 9 +- + fs/buffer.c | 56 +++++++++++- + fs/ocfs2/file.c | 14 ++- + fs/proc/page.c | 70 ++++++++++----- + fs/ramfs/inode.c | 12 +++ + include/linux/compat.h | 29 ------- + include/linux/kdb.h | 2 - + include/linux/ktime.h | 37 -------- + include/linux/memory_hotplug.h | 4 +- + include/linux/memremap.h | 6 ++ + include/linux/mm.h | 6 -- + include/linux/mmzone.h | 10 +++ + include/linux/sched.h | 9 ++ + 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/trace/events/vmscan.h | 71 ++++++++++++--- + include/uapi/asm-generic/posix_types.h | 2 + + include/uapi/linux/time.h | 22 ++--- + ipc/mqueue.c | 105 ++++++++++++++++++---- + ipc/msg.c | 62 +++++++++---- + ipc/sem.c | 72 ++++++++------- + kernel/compat.c | 64 -------------- + kernel/debug/kdb/kdb_bt.c | 8 +- + kernel/debug/kdb/kdb_main.c | 31 +++---- + kernel/debug/kdb/kdb_private.h | 2 +- + kernel/hung_task.c | 44 ++++++++++ + kernel/notifier.c | 2 +- + kernel/relay.c | 17 ++-- + kernel/time/time.c | 43 --------- + lib/Kconfig.debug | 6 ++ + mm/memory_hotplug.c | 104 +++++++--------------- + mm/memremap.c | 34 +++++++- + mm/mmap.c | 43 ++++++--- + mm/nommu.c | 10 ++- + mm/oom_kill.c | 67 +++++++------- + mm/page_alloc.c | 71 +++++++++------ + mm/sparse.c | 10 --- + mm/vmalloc.c | 11 ++- + mm/vmscan.c | 18 ++-- + scripts/checkpatch.pl | 24 +++++ + 51 files changed, 829 insertions(+), 742 deletions(-) +$ 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: drivers/block/null_blk_main.c: fix layout +Applying: drivers/block/null_blk_main.c: fix uninitialized var warnings +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: mm: remove __krealloc +Applying: mm: add generic p?d_leaf() macros +Applying: arc: mm: add p?d_leaf() definitions +Applying: arm: mm: add p?d_leaf() definitions +Applying: arm64: mm: add p?d_leaf() definitions +Applying: mips: mm: add p?d_leaf() definitions +Applying: powerpc: mm: add p?d_leaf() definitions +Applying: riscv: mm: add p?d_leaf() definitions +Applying: s390: mm: add p?d_leaf() definitions +Applying: sparc: mm: add p?d_leaf() definitions +Applying: x86: mm: add p?d_leaf() definitions +Applying: mm: pagewalk: add p4d_entry() and pgd_entry() +Applying: mm: pagewalk: fix unused variable warning +Applying: mm: pagewalk: allow walking without vma +Applying: mm: pagewalk: don't lock PTEs for walk_page_range_novma() +Applying: mm: pagewalk: fix termination condition in walk_pte_range() +Applying: mm: pagewalk: add 'depth' parameter to pte_hole +Applying: x86: mm: point to struct seq_file from struct pg_state +Applying: x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct +Applying: x86: mm: convert ptdump_walk_pgd_level_debugfs() to take an mm_struct +Applying: mm: add generic ptdump +Applying: x86: mm: convert dump_pagetables to use walk_page_range +Applying: arm64: mm: convert mm/dump.c to use walk_page_range() +Applying: arm64: mm: display non-present entries in ptdump +Applying: mm: ptdump: reduce level numbers by 1 in note_page() +Applying: x86: mm: avoid allocating struct mm_struct on the stack +Applying: x86-mm-avoid-allocating-struct-mm_struct-on-the-stack-fix +Applying: powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case +Applying: mm/mmu_gather: invalidate TLB correctly on batch allocation failure and flush +Applying: asm-generic/tlb: avoid potential double flush +Applying: asm-gemeric/tlb: remove stray function declarations +Applying: asm-generic/tlb: add missing CONFIG symbol +Applying: asm-generic/tlb: rename HAVE_RCU_TABLE_FREE +Applying: asm-generic/tlb: rename HAVE_MMU_GATHER_PAGE_SIZE +Applying: asm-generic/tlb: Rename HAVE_MMU_GATHER_NO_GATHER +Applying: asm-generic/tlb: Provide MMU_GATHER_TABLE_FREE +Applying: proc: decouple proc from VFS with "struct proc_ops" +Applying: proc: convert everything to "struct proc_ops" +Applying: proc-convert-everything-to-struct-proc_ops-fix +Applying: proc-convert-everything-to-struct-proc_ops-fix-2 +Applying: lib/string: add strnchrnul() +Applying: bitops: more BITS_TO_* macros +Applying: lib: add test for bitmap_parse() +Applying: fix rebase issue +Applying: lib/test_bitmap: fix address space when test user buffer +Applying: lib: make bitmap_parse_user a wrapper on bitmap_parse +Applying: lib: rework bitmap_parse() +Applying: lib: new testcases for bitmap_parse{_user} +Applying: include/linux/cpumask.h: don't calculate length of the input string +Applying: treewide: remove redundant IS_ERR() before error code check +Applying: ARM: dma-api: fix max_pfn off-by-one error in __dma_supported() +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 + + 1eee2961b389...f1f518d16d24 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (f1f518d16d24 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/Kconfig | 13 +- + arch/alpha/kernel/srm_env.c | 17 +- + arch/arc/include/asm/pgtable.h | 1 + + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/include/asm/tlb.h | 4 - + arch/arm/kernel/atags_proc.c | 8 +- + arch/arm/mm/alignment.c | 14 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm64/Kconfig | 3 +- + arch/arm64/Kconfig.debug | 19 +- + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/include/asm/ptdump.h | 8 +- + arch/arm64/mm/Makefile | 4 +- + arch/arm64/mm/dump.c | 148 ++++------ + arch/arm64/mm/mmu.c | 4 +- + arch/arm64/mm/ptdump_debugfs.c | 2 +- + arch/ia64/kernel/salinfo.c | 24 +- + arch/m68k/kernel/bootinfo_proc.c | 8 +- + arch/mips/include/asm/pgtable.h | 5 + + arch/mips/lasat/picvue_proc.c | 31 +- + arch/powerpc/Kconfig | 5 +- + arch/powerpc/include/asm/book3s/32/pgalloc.h | 8 - + arch/powerpc/include/asm/book3s/64/pgalloc.h | 2 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 3 + + arch/powerpc/include/asm/nohash/pgalloc.h | 8 - + arch/powerpc/include/asm/tlb.h | 11 + + arch/powerpc/kernel/proc_powerpc.c | 10 +- + arch/powerpc/kernel/rtas-proc.c | 70 ++--- + arch/powerpc/kernel/rtas_flash.c | 34 +-- + arch/powerpc/kernel/rtasd.c | 14 +- + arch/powerpc/mm/book3s64/pgtable.c | 7 - + arch/powerpc/mm/numa.c | 12 +- + arch/powerpc/platforms/pseries/lpar.c | 24 +- + arch/powerpc/platforms/pseries/lparcfg.c | 14 +- + arch/powerpc/platforms/pseries/reconfig.c | 8 +- + arch/powerpc/platforms/pseries/scanlog.c | 15 +- + arch/riscv/include/asm/pgtable-64.h | 7 + + arch/riscv/include/asm/pgtable.h | 7 + + arch/s390/Kconfig | 4 +- + arch/s390/include/asm/pgtable.h | 2 + + arch/sh/mm/alignment.c | 17 +- + arch/sparc/Kconfig | 3 +- + arch/sparc/include/asm/pgtable_64.h | 2 + + arch/sparc/include/asm/tlb_64.h | 9 + + arch/sparc/kernel/led.c | 15 +- + arch/um/drivers/mconsole_kern.c | 9 +- + arch/um/kernel/exitcode.c | 15 +- + arch/um/kernel/process.c | 15 +- + arch/x86/Kconfig | 3 +- + arch/x86/Kconfig.debug | 20 +- + arch/x86/include/asm/pgtable.h | 10 +- + arch/x86/include/asm/tlb.h | 4 +- + arch/x86/kernel/cpu/mtrr/if.c | 21 +- + arch/x86/mm/Makefile | 4 +- + arch/x86/mm/debug_pagetables.c | 18 +- + arch/x86/mm/dump_pagetables.c | 322 +++++---------------- + arch/x86/platform/efi/efi_32.c | 2 +- + arch/x86/platform/efi/efi_64.c | 4 +- + arch/x86/platform/uv/tlb_uv.c | 14 +- + arch/xtensa/platforms/iss/simdisk.c | 10 +- + crypto/af_alg.c | 2 +- + drivers/acpi/battery.c | 15 +- + drivers/acpi/proc.c | 15 +- + drivers/acpi/scan.c | 2 +- + drivers/block/null_blk_main.c | 56 ++-- + drivers/char/hw_random/bcm2835-rng.c | 2 +- + drivers/char/hw_random/omap-rng.c | 4 +- + drivers/clk/clk.c | 2 +- + drivers/dma/mv_xor_v2.c | 2 +- + drivers/firmware/efi/arm-runtime.c | 2 +- + drivers/gpio/gpiolib-devres.c | 2 +- + drivers/gpio/gpiolib-of.c | 8 +- + drivers/gpio/gpiolib.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 15 +- + drivers/i2c/busses/i2c-mv64xxx.c | 5 +- + drivers/i2c/busses/i2c-synquacer.c | 2 +- + drivers/ide/ide-proc.c | 19 +- + drivers/input/input.c | 28 +- + drivers/isdn/capi/kcapi_proc.c | 6 +- + drivers/macintosh/via-pmu.c | 17 +- + drivers/md/md.c | 15 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/misc/sgi-gru/gruprocfs.c | 42 +-- + drivers/mtd/ubi/build.c | 2 +- + drivers/net/wireless/cisco/airo.c | 98 +++---- + drivers/net/wireless/intel/ipw2x00/libipw_module.c | 15 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 4 +- + drivers/net/wireless/intersil/hostap/hostap_proc.c | 14 +- + drivers/net/wireless/intersil/hostap/hostap_wlan.h | 2 +- + drivers/net/wireless/ray_cs.c | 20 +- + drivers/of/device.c | 2 +- + drivers/parisc/led.c | 17 +- + drivers/pci/controller/pci-tegra.c | 2 +- + drivers/pci/proc.c | 25 +- + drivers/phy/phy-core.c | 4 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/platform/x86/thinkpad_acpi.c | 15 +- + drivers/platform/x86/toshiba_acpi.c | 60 ++-- + drivers/pnp/isapnp/proc.c | 9 +- + drivers/pnp/pnpbios/proc.c | 17 +- + drivers/s390/block/dasd_proc.c | 15 +- + drivers/s390/cio/blacklist.c | 14 +- + drivers/s390/cio/css.c | 11 +- + drivers/scsi/esas2r/esas2r_main.c | 9 +- + drivers/scsi/scsi_devinfo.c | 15 +- + drivers/scsi/scsi_proc.c | 29 +- + drivers/scsi/sg.c | 30 +- + drivers/spi/spi-orion.c | 3 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 14 +- + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/sysrq.c | 8 +- + drivers/usb/gadget/function/rndis.c | 17 +- + drivers/video/fbdev/imxfb.c | 2 +- + drivers/video/fbdev/via/viafbdev.c | 105 ++++--- + drivers/zorro/proc.c | 9 +- + fs/cifs/cifs_debug.c | 108 +++---- + fs/cifs/dfs_cache.c | 13 +- + fs/cifs/dfs_cache.h | 2 +- + fs/ext4/super.c | 2 +- + fs/f2fs/node.c | 2 +- + fs/fscache/internal.h | 2 +- + fs/fscache/object-list.c | 11 +- + fs/fscache/proc.c | 2 +- + fs/jbd2/journal.c | 13 +- + fs/jfs/jfs_debug.c | 14 +- + fs/lockd/procfs.c | 12 +- + fs/nfsd/nfsctl.c | 13 +- + fs/nfsd/stats.c | 12 +- + fs/ocfs2/suballoc.c | 2 +- + fs/proc/cpuinfo.c | 12 +- + fs/proc/generic.c | 38 ++- + fs/proc/inode.c | 76 ++--- + fs/proc/internal.h | 5 +- + fs/proc/kcore.c | 13 +- + fs/proc/kmsg.c | 14 +- + fs/proc/page.c | 24 +- + fs/proc/proc_net.c | 32 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc/root.c | 2 +- + fs/proc/stat.c | 12 +- + fs/proc/task_mmu.c | 4 +- + fs/proc/vmcore.c | 10 +- + fs/sysfs/group.c | 2 +- + include/asm-generic/pgtable.h | 20 ++ + include/asm-generic/tlb.h | 120 +++++--- + include/linux/bitmap.h | 8 +- + include/linux/bitops.h | 4 +- + include/linux/cpumask.h | 4 +- + include/linux/pagewalk.h | 49 +++- + include/linux/proc_fs.h | 23 +- + include/linux/ptdump.h | 22 ++ + include/linux/seq_file.h | 13 + + include/linux/slab.h | 1 - + include/linux/string.h | 1 + + include/linux/sunrpc/stats.h | 4 +- + ipc/util.c | 14 +- + kernel/configs.c | 9 +- + kernel/irq/proc.c | 42 +-- + kernel/kallsyms.c | 12 +- + kernel/latencytop.c | 14 +- + kernel/locking/lockdep_proc.c | 15 +- + kernel/module.c | 12 +- + kernel/profile.c | 24 +- + kernel/sched/psi.c | 48 +-- + lib/bitmap.c | 193 ++++++------ + lib/string.c | 17 ++ + lib/test_bitmap.c | 105 ++++++- + mm/Kconfig.debug | 21 ++ + mm/Makefile | 1 + + mm/gup.c | 2 +- + mm/hmm.c | 62 ++-- + mm/migrate.c | 5 +- + mm/mincore.c | 1 + + mm/mmu_gather.c | 134 ++++++--- + mm/pagewalk.c | 163 ++++++++--- + mm/ptdump.c | 139 +++++++++ + mm/slab_common.c | 37 +-- + mm/swapfile.c | 14 +- + net/atm/mpoa_proc.c | 17 +- + net/atm/proc.c | 8 +- + net/core/dev.c | 2 +- + net/core/filter.c | 2 +- + net/core/pktgen.c | 44 +-- + net/ipv4/ipconfig.c | 10 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 +- + net/ipv4/route.c | 24 +- + net/netfilter/xt_recent.c | 17 +- + net/sunrpc/auth_gss/svcauth_gss.c | 10 +- + net/sunrpc/cache.c | 45 ++- + net/sunrpc/stats.c | 21 +- + net/xfrm/xfrm_policy.c | 2 +- + samples/kfifo/bytestream-example.c | 11 +- + samples/kfifo/inttype-example.c | 11 +- + samples/kfifo/record-example.c | 11 +- + scripts/coccinelle/free/devm_free.cocci | 4 - + sound/core/info.c | 36 ++- + sound/soc/codecs/ak4104.c | 3 +- + sound/soc/codecs/cs4270.c | 3 +- + sound/soc/codecs/tlv320aic32x4.c | 6 +- + sound/soc/sunxi/sun4i-spdif.c | 2 +- + tools/include/linux/bitops.h | 9 +- + 203 files changed, 2164 insertions(+), 1917 deletions(-) + create mode 100644 include/linux/ptdump.h + create mode 100644 mm/ptdump.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..125d385f20a1 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 5.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4c2507597110 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200203 |