diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-03-13 21:59:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-03-13 21:59:20 +1100 |
| commit | 2e602db729948ce577bf07e2b113f2aa806b62c7 (patch) | |
| tree | 300a28bc5a018640e5c7b00f14045266536ad58a | |
| parent | f172b576c783bba55246b397b68d89329e522a5d (diff) | |
| download | linux-next-next-20200313.tar.gz | |
Add linux-next specific files for 20200313next-20200313
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 315 | ||||
| -rw-r--r-- | Next/Trees | 317 | ||||
| -rw-r--r-- | Next/merge.log | 10821 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 11456 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..4bbb2b53f4f2 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,315 @@ +Name SHA1 +---- ---- +origin 3cc6e2c599cdca573a8f347aea5da4c855ff5a78 +fixes eb239a5f369fda911065f48d4e2c98cc3f70a6f3 +kbuild-current 98d54f81e36ba3bf92172791eba5ca5bd813989b +arc-current 8d92e992a785f35d23f845206cf8c6cafbc264e0 +arm-current 89604523a76eb3e13014b2bdab7f8870becee284 +arm-soc-fixes d4d89e25fc7b4225211c217491e5525b00cf3961 +arm64-fixes 9abd515a6e4a5c58c6eb4d04110430325eb5f5ac +m68k-current 6aabc1facdb24e837cfea755ba46a6be22a8860f +powerpc-fixes 59bee45b9712c759ea4d3dcc4eff1752f3a66558 +s390-fixes 9218b36d767a09dcca6760cf301720e1caaecc61 +sparc 11648b8339f840d4b1f4c54a1abec8025d9e077d +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net b09fe70ef520e011ba4a64f4b93f948a8f14717b +bpf 90db6d772f749e38171d04619a5e3cd8804a6d02 +ipsec d1d17a359ce6901545c075d7401c10179d9cedfd +netfilter b723bd933980f4956dabc8a8d84b3e83be8d094c +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers e2e57291097b289f84e05fa58ab5e6c6f30cc6e2 +mac80211 ba32679cac50c38fdf488296f96b1f3175532b8e +rdma-fixes 2c523b344dfa65a3738e7039832044aa133c75fb +sound-current 5461e0530c222129dfc941058be114b5cbc00837 +sound-asoc-fixes 20370e3ada3885c17c835a4fbce8dd5db4d09097 +regmap-fixes d29456d34def5e7edd1a0b94485eb4ff07cc9773 +regulator-fixes 2339289c9c697b637b65e7f0e8b39744c9538c94 +spi-fixes 2c523b344dfa65a3738e7039832044aa133c75fb +pci-current 5901b51f3e5d9129da3e59b10cc76e4cc983e940 +driver-core.current 2c523b344dfa65a3738e7039832044aa133c75fb +tty.current 2c523b344dfa65a3738e7039832044aa133c75fb +usb.current b433e340e7565110b0ce9ca4b3e26f4b97a1decf +usb-gadget-fixes 42cd5ffe46c1037d5d9a253c72e71a024a7bfbef +usb-serial-fixes cecc113c1af0dd41ccf265c1fdb84dbd05e63423 +usb-chipidea-fixes 7cbf3dd3139ab4683d9cffe9d6972a1dbe3ecaa6 +phy be4e3c737eebd75815633f4b8fd766defaf0f1fc +staging.current ac42c12dd752d315a7027dcb50421dbbd1af53bd +char-misc.current f17f06a0c7794d3a7c2425663738823354447472 +soundwire-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +thunderbolt-fixes e9d0e7511fda92a6511904996dd0aa57b6d7687a +input-current da3289044833769188c0da945d2cec90af35e87e +crypto-current 1579f1bc3b753d17a44de3457d5c6f4a5b14c752 +ide 94f2630b18975bb56eee5d1a36371db967643479 +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes f3a60268f5cec7dae0e9713f5fc65aecc3734c09 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +slave-dma-fixes 195967c088aa856fc7a2698230cddef3b8d7cda9 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes def9d2780727cec3313ed3522d0123158d87224d +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes ec14a914b8446190d507aba4f2343b2dbb945306 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes f7d5f5655ef7e5d2a128f6696ac35256e83b119b +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 1756bfe89857898eb7f434b60d063f649c3395db +kvm-fixes d718fdc3e752ba51ddb2b5554d3db98a09355cc2 +kvms390-fixes e93fc7b4544a5475cfdbc22f87e89f9829bf801c +hwmon-fixes 2c523b344dfa65a3738e7039832044aa133c75fb +nvdimm-fixes 96222d53842dfe54869ec4e1b9d4856daf9105a2 +btrfs-fixes eab248b5a21d119476419dc3a228c2798f2b576b +vfs-fixes bf4498ad3f9a0f7202cf90e52b5ce9bb31700b91 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes f8788d86ab28f61f7b46eb6be375f8a726783636 +samsung-krzk-fixes 0d935f0bf77d8d6f924f35da4b549c94d36795d2 +pinctrl-samsung-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +devicetree-fixes d2334a91a3b01dce4f290b4536fcfa4b9e923a3d +scsi-fixes 394b61711f3ce33f75bf70a3e22938464a13b3ee +drm-fixes e3c3b6e66da1caeb39a504b03ddcdd3693e45254 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 14a0d527a479eb2cb6067f9e5e163e1bf35db2a9 +mmc-fixes 18d200460cd73636d4f20674085c39e32b4e0097 +rtc-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +gnss-fixes f8788d86ab28f61f7b46eb6be375f8a726783636 +hyperv-fixes c1088d6c08fdc3cc8ffff9ebcd54f09630813ae2 +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes af33d2433b03d63ed31fcfda842f46676a5e1afc +pidfd-fixes 10dab84caf400f2f5f8b010ebb0c7c4272ec5093 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +gpio-intel-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl-intel-fixes 2c523b344dfa65a3738e7039832044aa133c75fb +erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +drm-misc-fixes 9803aac7b5508718989e4cde11b854fc01037b01 +kspp-gustavo d5180902be1cf9f6b33a7b270bac94db453f2d80 +kbuild da64dbe8eceeaeff55f7b95865645254ec4beba7 +compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 89bb6e2ac940503dcea874a152cd78c8016e60e1 +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm d46a35a9ad25b1868757b59d78bc6edaaa6e7288 +arm64 1424835a7c53fcf12270c6df2ca26bd26bd26d2f +arm-perf 29cc4ceeac1274ab8363a11b81ebd99f3b023985 +arm-soc 09e7f9a4c8e2025f05b2af253db75ba360eb204b +amlogic 340b12db7cc9369f5e571f84bbb30e244c2ad7f9 +aspeed de285b938cf330b30acfdb037d14018d38292c3e +at91 7448f052c816c8b97e3153162766567e1e6b6c35 +imx-mxs 4559a11e48d5246865e58ff984378759ee8d4462 +keystone 560b4d4691b07819f8d3e0cb030f72f863ec1ba3 +mediatek 28f0b89610455423bcf6c65ac374d5806878de7d +mvebu c0d03b53ef47dbade7be742ec897c77879ad7ccb +omap b6bb79e88514fa5789bedc41b6f90248ac90b7ce +qcom 2611bc0b358f3739ce9968df52189f8d4050285b +raspberrypi d886ff4d2a6aaf4a1e837dc4ccc731bf8c9a606f +realtek 45698e00d5a904bdefd5d4cd4a751803674815f1 +renesas bf4540d5148c39f1339cc9c870b4075864a8c76c +reset 2ebf89fd4ecf37e7ae4c323a9fd69f9d9d0ea260 +rockchip 6795e06559b8ffd6b59870ab01b9b664dba1430c +samsung-krzk ec793c394501664506b627c148a6b6c79c18ac10 +scmi b48c74f4e139bf91f0148d4cb4868a60347425ab +sunxi 8afff9da61eaa1ffd0fbf0296027c58c0e8074f2 +tegra 90060ae838202bc3eda36af3e2f825b5bca48fc9 +clk 5b36638c88df6dd0c278b4cbac9432bae57fa896 +clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky f8f35a5806f3e16d1100b6c6a226914bd0e17120 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 240b62d381fe5b66c496a6fd55edff3976a9be51 +m68k 86cded5fc52567774b596827544874499532b8ae +m68knommu 4e9c3950ce093472657d851e3c59aad55be0904e +microblaze 9fd1a1c9b3f2a38a5357a13335e0b9e5f21d093b +mips ac8fd122e070ce0e60c608d4f085f7af77290844 +nds32 d785c5a324cd8812720a409dc85050558281a567 +nios2 051d75d3bb31d456a41c7dc8cf2b8bd23a96774f +openrisc d95b56c77efdafec14d767bbf9730ff55907667d +parisc-hd bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +powerpc 247257b03b04398ca07da4bce3d17bee25d623cb +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 6a7f10c795743a7f81e89df99866d7532811c324 +risc-v 9f40b6e77d2f888a8c0608036eb124cedb6d2434 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 bb533ec8bacd064ee273ca3305db97938c3331ae +sh a193018e5290ee9d9fe62ad80cd8f874711eb575 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml d65197ad52494bed3b5e64708281b8295f76c391 +xtensa 2ef7e1268525554d6051d2209247ca95eb2470ae +fscrypt 98d54f81e36ba3bf92172791eba5ca5bd813989b +afs 4fe171bb81b13b40bf568330ec3716dfb304ced1 +btrfs a3b6a332e1ad477a0a4a7a0ea0f9d13e191632fc +ceph 3b20bc2fe4c0cfd82d35838965dc7ff0b93415c6 +cifs 6f5a333ac1d32af50c04b17dcea849a1efb978bc +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs aa99a76b40d6434e67ac23efef2a01c291b82d8b +ext3 bc36dfffd5f3f19edcf85954d93eb0bc45875c37 +ext4 dce8e237100f60c28cc66effb526ba65a01d8cb3 +f2fs 2536ac6872e5265b4d9d263122cee02e3d5cae1d +fsverity 98d54f81e36ba3bf92172791eba5ca5bd813989b +fuse 3e8cb8b2eaeb22f540f1cbc00cbb594047b7ba89 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 2c523b344dfa65a3738e7039832044aa133c75fb +nfs-anna 55dee1bc0d72877b99805e42e0205087e98b9edd +nfsd 2653de9f0398b3230bb098704451ba16be5458f0 +orangefs 9f198a2ac543eaaf47be275531ad5cbd50db3edf +overlayfs c2e87fd933969bd3df90dc28348d309bf6f76d71 +ubifs fe357dbae113f6ad89b77818ef92784eb11e21ba +v9fs 79fb9216b7be1832b90c8ddf3c2d465b46670e81 +xfs 17bb60b74124e9491d593e2601e3afe14daa2f57 +zonefs 0dda2ddb7ded1395189e95d43106469687c07795 +iomap 1ac994525b9d3b6245c1a61632156f19ab73fccb +djw-vfs 3253d9d093376d62b4a56e609f15d2ec5085ac73 +file-locks e2de130a568c95f67c8e6c24ad2043fade40b108 +vfs 7440cd5bdd9bd8a54118b25a18025f6fe5d14988 +printk d34f14ae521f076f68f3ce213c64193f9a5a8adf +pci 432e9e41c3b5b6c4215c68f27d8ec25bffd1262e +pstore 8128d3aac0ee3420ede34950c9c0ef9ee118bec9 +hid 2739dca88ca709769c19a78393de57dd1ce68827 +i2c 866a8a691e5d515a1aff621ca94b136c65275265 +i3c cd851485ef297fc439fd398c4b26e1b2e497045a +dmi 6eaaa9e897193a42fc21fe643bb2815455179e62 +hwmon-staging 6a096871b2bedd524ce706aa687de4f7145f535c +jc_docs 7d3d3254adaa61cba896f71497f56901deb618e5 +v4l-dvb 00c43088aa680989407b6afbda295f67b3f123f1 +v4l-dvb-next 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm b5028d145af7cbfc41af009e8da00c489c8e42a0 +cpufreq-arm 0c868627e617e43a295d8e7d542ec40387853694 +cpupower 2de7fb60a4740135e03cf55c1982e393ccb87b6b +opp 03758d60265c773e1d06d436b99ee338f2ac55d6 +thermal 0bf3a650ab8df4fcb37d18f2d28412e00b8e2db6 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 0aeb3622ea6f14f36232a33f1d08c2ff02f4048b +net-next a8eceea84a3a3504e42f6495cf462027c5d19cb0 +bpf-next fb6a088e834e53dc0674b540260f9079ce6b2a83 +ipsec-next dda520c4d4623701dd70cf7b40d29a4eed232d0f +mlx5-next e0ebd8eb36ed850a22a9a0ca83edc4a40ad67c16 +netfilter-next bd63666189e7cd14f11734351970ba3bc2039743 +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next ca44e47a2b8611178d38d4ed9532f793cf4244a8 +bluetooth b354e6c10eaf97a1f5aff4839795bd32ad32f0f9 +mac80211-next a862889b18bae092c4a607a006d7c60618019e84 +gfs2 cc44457f16296809e40aae31415cd081a8352433 +mtd 4da0ea71ea934af18db4c63396ba2af1a679ef02 +nand 9f9ae0c253c1e058fbc845e26c4a32a7d777f0dc +spi-nor 2dcbfe365b130321b1b48cfa55f7bdad6baf85ad +crypto 0eae14a067c5b2596c5a1049561cbc86b990c7ce +drm 69ddce0970d9d1de63bed9c24eefa0814db29a5a +amdgpu c448ed62de73a0910287c64512461c4fdcc5d248 +drm-intel 175c4d9b3b9a60b4ea0b8cd034011808c6a03b05 +drm-tegra d87b2fea990ceb323635d447946017c37cdbed73 +drm-misc e1cf35b94c5fd122a8780587559fc6da9fc2dd12 +drm-msm 5f9935f514d66ddba868e587d9e976a567232547 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 2c76b324c7944fedf453abca5003569d9556c6df +etnaviv 1442d81fef9955f362ed64b3da7a9d885cd09205 +regmap d29456d34def5e7edd1a0b94485eb4ff07cc9773 +sound 3db1b00f2122bfe259bdb19f7c0bfcaec54568e3 +sound-asoc c2807dc7c00b9f2f9ec72e0b0382e36bcb1bbc1f +modules 0f74226649fb2875a91b68f3750f55220aa73425 +input 061706716384f1633d3d5090b22a99f33f1fcf2f +block a227f192663c3854b2dc710ef30dc7b70f030d7f +device-mapper 636be4241bdd88fec273b38723e44bad4e1c4fae +pcmcia 71705c611263cad99edf85a5ea021e098cac032b +mmc d997c18ab48e99dd733f421923a9c736f94ecd62 +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 1129d6145ed58362738d9411279132b0c5e71e85 +backlight 7af43a76695db71a57203793fb9dd3c81a5783b1 +battery f78c55e3b4806974f7d590b2aab8683232b7bd25 +regulator 385377acc5a16664cee1a3c5edf8c53749a2fdab +security 3e27a33932df104f4f9ff811467b0b4ccebde773 +apparmor 01df52d726b5d55d2970f5c957f1961930acd5d6 +integrity 9e2b4be377f0d715d9d910507890f9620cc22a9d +keys 43672cf93c6d96380222064aec06e9593113cdea +selinux 28d4d0e16f09c1865e2ec8a7d89ca7057a5cf7ae +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +tpmdd 6390677444b03206f0ea20bebe7df301e7084204 +watchdog 44144c809e39d64ff9931c7e8956c42b2baa89e6 +iommu a4909b4d377cc8ba7e6792d5e9c319bf1073871c +vfio 7b5372ba04ca1caabed1470d4ec23001cde2eb91 +audit 1320a4052ea11eb2879eb7361da15a106a780972 +devicetree 905fc6b1bfb4a631e8447da88de2998ebda547e8 +mailbox c6c6bc6ea9fce31baaca053befc31215cfcb3dd9 +spi 5abd978a85f0bb552442afd2e8ac346b189adebb +tip 12481c76713078054f2d043b3ce946e4814ac29f +clockevents cc2550b421aa30e3da67e5a7f6d14f3ecd3527b3 +edac ffa9a9758be2793d11b0c51bc2845f7dd200e261 +irqchip 850fc6a2ae5be98b3b9013f387a43ee2ee0969e3 +ftrace 2910b5aa6f545c044173a5cab3dbb7f43e23916d +rcu a5ba56ed4232e53b2550a57ff004b60844699bf1 +kvm a93236fcbe1d0248461b29c0f87cb0b510c94e6f +kvm-arm e43f1331e2ef913b8c566920c9af75e0ccdd1d3f +kvm-ppc fd24a8624eb29d3b6b7df68096ce0321b19b03c6 +kvms390 e0d5710dc73f7ca562826504ff0896566deaaed9 +xen-tip e63de44d28ca1a76955a1082f80655e5ffc32d0d +percpu cfe2a689f75583230f35be909cd64ad1ca9332e9 +workqueues 4acf8a423cd321248b4cc9eb21c11bb88931938b +drivers-x86 8d92e160dd8fa62a4e52e334ff6dccc885cb6696 +chrome-platform 7e11f4c0c5ccaac5e8ee1b2e46b3c2cbc47d199e +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds dd47a83453e4a5b0d6a91fe702b7fbc1984fb610 +ipmi 26455d00ee58c8f5d197d82cdfafc1468e37efbf +driver-core 9a2dd570591ea1d53284208ab8838c0ab2a08340 +usb 8e567ed9e244f6af2ecfd22a7204612ec361d334 +usb-gadget bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +usb-serial 615e58ccfbc05a64dddd16db5277fc2b49ed643a +usb-chipidea-next cbdfbda4a1661a779c58d1aee3bb4d82ee75fa22 +phy-next 33f12efe336fa5cf2f51f7496f6cc0f7176b30b8 +tty cb05c6c82fb0853b53ecf983c29ab02aaca13194 +char-misc bb3a151dd42765acc8f469ff994de3ab31f15a95 +extcon 87ccafd3bd641932499d2f843ccfba401c91d7ed +soundwire 5de79ba865d7770c3bdde7c266ed425832764aac +thunderbolt 3010518964dc96c41848a05a5b0ec11ccf8d5ebe +staging c15e7f072288bc6d19bbab065a8b60ca096529bf +mux f356d58c3a04159f35003b26f8c5183f9456f95d +icc 03c4e6186bbbe639b5277077c26786069e9e2b89 +slave-dma 3a5a8a27545ddd8bbdcc9241230a2eed4e81c931 +cgroup ef2289f941de0feaf8db305bea0ef4eb4c8403e7 +scsi 93615c72d129ad936bf894a0cb050805087e5cd1 +scsi-mkp efa75c21c487533bc9ee32c2c47b2f57ab0fabb8 +vhost d40662d5f12b68b0de8eb02489ea5d6f9506dc80 +rpmsg 2bbad2db074986007bcfb90d39d2c1d514277a7d +gpio 9cd0c5e02ee4fcf8d0905def9b096b4222e179c2 +gpio-brgl 8c97246c39b506c0180b38bd7290049ad5027479 +gpio-intel bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl ab5644db943f5fb4d0dbb8ee4219ae09803abeb2 +pinctrl-intel 2c523b344dfa65a3738e7039832044aa133c75fb +pinctrl-samsung bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pwm 9871abffc81048e20f02e15d6aa4558a44ad53ea +userns a0d4a141750df51135499f96c355c4d76add5505 +ktest 1091c8fce8aa9c5abe1a73acab4bcaf58a729005 +random e00d996a4317aff5351c4338dd97d390225412c2 +kselftest 3032e3a7c7e3ef4a9839ec99c60ffeed76830bf2 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching d28b4c1b2b3d1337069cbe0bf0bec151d0e4d576 +coresight 749c4ad29ea7377c46dcd471b4b29138d2e4ad0a +rtc ebc8fddc50fff33baa72d5950a746cc8c84d0bf8 +nvdimm 7b27a8622f802761d5c6abd6c37b22312a35343c +at24 4837621cd61e6b81a182098889143c6c9a06b0f3 +ntb fd8cab9aee2c7d001909180789893ee25bd2fb25 +kspp c79f46a282390e0f5b306007bf7b11a46d529538 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f8788d86ab28f61f7b46eb6be375f8a726783636 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus ba1589ff458e032f40780188189eb0fb5a71a103 +nvmem c609408c27bed434c2c16662524a663046517a12 +xarray 7e934cf5ace1dceeb804f7493fa28bb697ed3c52 +hyperv 40d1d2d6e89e0682f5d431fd699903a6b5b9058e +auxdisplay 2f920c0f0e29268827c2894c6e8f237a78159718 +kgdb 5ea771abd5a3734dfc55dee3772ff94ecc0b6f6a +pidfd 8d19f1c8e1937baf74e1962aae9f90fa3aeab463 +devfreq d4aaf8643cffc7bb4e2bea5cc0849823d37854e1 +hmm fdf8822d38edae423d6350071dea67474008de81 +fpga 2fb2e7cdfbb027c6e26ddd781db800ee3331e7d4 +kunit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +cel a99d8080aaf358d5d23581244e5da23b35e340b9 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi b6fe8bc67d2d33a9eff1b0785482bccd14979115 +kunit-next be886ba90cce2fb2f5a4dbcda8f3be3fd1b2f484 +akpm-current 05e265818063a1f30d90f3c9251ea016634d70a4 +akpm 893619530eebd53010ab1e34d3ba1305b82224e6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..24776d8be23f --- /dev/null +++ b/Next/Trees @@ -0,0 +1,317 @@ +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 +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 +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +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 +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 +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +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..84f1bde7b523 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10821 @@ +$ date -R +Fri, 13 Mar 2020 08:28:13 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 88% (5943/6699)
Updating files: 89% (5963/6699)
Updating files: 90% (6030/6699)
Updating files: 91% (6097/6699)
Updating files: 92% (6164/6699)
Updating files: 93% (6231/6699)
Updating files: 94% (6298/6699)
Updating files: 95% (6365/6699)
Updating files: 96% (6432/6699)
Updating files: 97% (6499/6699)
Updating files: 98% (6566/6699)
Updating files: 99% (6633/6699)
Updating files: 100% (6699/6699)
Updating files: 100% (6699/6699), done. +HEAD is now at e6e6ec48dd0f Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt +Merging origin/master (3cc6e2c599cd Merge tag 'for-linus-5.6-2' of git://github.com/cminyard/linux-ipmi) +$ git merge origin/master +Updating e6e6ec48dd0f..3cc6e2c599cd +Fast-forward + arch/x86/Makefile | 5 +++-- + arch/x86/crypto/Makefile | 7 ++++++- + drivers/char/ipmi/ipmi_si_platform.c | 4 ++-- + include/crypto/curve25519.h | 6 ++++-- + 4 files changed, 15 insertions(+), 7 deletions(-) +Merging fixes/master (eb239a5f369f evh_bytechan: fix out of bounds accesses) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + drivers/tty/ehv_bytechan.c | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) +Merging kbuild-current/fixes (98d54f81e36b Linux 5.6-rc4) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (8d92e992a785 ARC: define __ALIGN_STR and __ALIGN symbols for ARC) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 4 ++-- + arch/arc/configs/nps_defconfig | 2 -- + arch/arc/configs/nsimosci_defconfig | 2 -- + arch/arc/configs/nsimosci_hs_defconfig | 2 -- + arch/arc/configs/nsimosci_hs_smp_defconfig | 2 -- + arch/arc/include/asm/fpu.h | 2 ++ + arch/arc/include/asm/linkage.h | 2 ++ + arch/arc/kernel/setup.c | 2 +- + arch/arc/kernel/troubleshoot.c | 27 ++++++++++++--------------- + 9 files changed, 19 insertions(+), 26 deletions(-) +Merging arm-current/fixes (89604523a76e ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/Makefile | 4 +++- + arch/arm/boot/compressed/Makefile | 4 ++-- + arch/arm/kernel/vdso.c | 2 ++ + arch/arm/lib/copy_from_user.S | 2 +- + 4 files changed, 8 insertions(+), 4 deletions(-) +Merging arm-soc-fixes/arm/fixes (d4d89e25fc7b Merge tag 'socfpga_defconfig_fix_for_v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (9abd515a6e4a arm64: context: Fix ASID limit in boot messages) +$ 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 (59bee45b9712 powerpc/mm: Fix missing KUAP disable in flush_coherent_icache()) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (9218b36d767a s390/diag: fix display of diagnose call statistics) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/kernel/diag.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sparc/master (11648b8339f8 sparc64: fix adjtimex regression) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (b09fe70ef520 taprio: Fix sending packets without dequeueing them) +$ git merge net/master +Auto-merging kernel/cgroup/cgroup.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/fsl-fman.txt | 7 + + .../networking/devlink/devlink-region.rst | 3 - + Documentation/networking/net_failover.rst | 6 +- + Documentation/networking/rds.txt | 2 +- + MAINTAINERS | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi | 2 + + drivers/atm/nicstar.c | 2 +- + drivers/net/bonding/bond_alb.c | 20 +-- + drivers/net/can/dev.c | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 2 + + drivers/net/dsa/mv88e6xxx/global2.c | 8 +- + drivers/net/dsa/sja1105/sja1105_main.c | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 24 ++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 49 +++--- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 114 ++++++++++++- + drivers/net/ethernet/freescale/fec_main.c | 6 +- + drivers/net/ethernet/freescale/fman/Kconfig | 28 ++++ + drivers/net/ethernet/freescale/fman/fman.c | 18 +++ + drivers/net/ethernet/freescale/fman/fman.h | 5 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 +- + drivers/net/ethernet/ibm/ibmvnic.c | 24 ++- + drivers/net/ethernet/ibm/ibmvnic.h | 6 +- + drivers/net/ethernet/marvell/mvmdio.c | 6 +- + drivers/net/ethernet/mscc/ocelot.c | 28 ++-- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 8 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/sfc/ef10.c | 32 ++-- + drivers/net/ethernet/sfc/efx.h | 1 + + drivers/net/ethernet/sfc/efx_channels.c | 1 + + drivers/net/ethernet/sfc/net_driver.h | 3 - + drivers/net/ethernet/sfc/tx.c | 38 +++++ + drivers/net/ethernet/sfc/tx_common.c | 29 ++-- + drivers/net/ethernet/sfc/tx_common.h | 6 + + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 3 +- + drivers/net/ipvlan/ipvlan_core.c | 19 ++- + drivers/net/ipvlan/ipvlan_main.c | 5 +- + drivers/net/macsec.c | 25 ++- + drivers/net/macvlan.c | 2 + + drivers/net/phy/bcm63xx.c | 1 + + drivers/net/phy/phy.c | 3 +- + drivers/net/phy/phylink.c | 8 +- + drivers/net/slip/slhc.c | 14 +- + drivers/net/team/team.c | 2 + + drivers/net/usb/r8152.c | 8 + + drivers/net/veth.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 +- + drivers/net/wireless/mediatek/mt76/dma.c | 9 +- + drivers/of/of_mdio.c | 1 + + drivers/s390/net/qeth_core.h | 4 +- + drivers/s390/net/qeth_core_main.c | 176 ++++++++++++++------- + drivers/s390/net/qeth_core_sys.c | 9 +- + drivers/s390/net/qeth_l2_main.c | 1 + + drivers/s390/net/qeth_l3_main.c | 1 + + drivers/s390/net/qeth_l3_sys.c | 9 +- + include/linux/inet_diag.h | 18 ++- + include/linux/phy.h | 1 + + include/linux/rhashtable.h | 2 +- + include/net/fib_rules.h | 1 + + include/soc/mscc/ocelot_dev.h | 2 +- + include/uapi/linux/in.h | 2 + + kernel/cgroup/cgroup.c | 4 + + mm/memcontrol.c | 14 +- + net/batman-adv/bat_iv_ogm.c | 4 + + net/caif/caif_dev.c | 3 +- + net/core/devlink.c | 33 ++-- + net/core/netclassid_cgroup.c | 47 ++++-- + net/core/sock.c | 5 +- + net/dsa/dsa_priv.h | 2 + + net/dsa/port.c | 44 ++++-- + net/dsa/slave.c | 8 +- + net/ieee802154/nl_policy.c | 6 + + net/ipv4/gre_demux.c | 12 +- + net/ipv4/inet_connection_sock.c | 20 +++ + net/ipv4/inet_diag.c | 44 +++--- + net/ipv4/raw_diag.c | 5 +- + net/ipv4/udp_diag.c | 5 +- + net/ipv6/addrconf.c | 51 ++++-- + net/ipv6/seg6_iptunnel.c | 2 +- + net/ipv6/seg6_local.c | 2 +- + net/mac80211/mesh_hwmp.c | 3 +- + net/mptcp/options.c | 19 ++- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nf_synproxy_core.c | 2 +- + net/netfilter/nf_tables_api.c | 22 ++- + net/netfilter/nfnetlink_cthelper.c | 2 + + net/netfilter/nft_chain_nat.c | 1 + + net/netfilter/nft_payload.c | 1 + + net/netfilter/nft_tunnel.c | 2 + + net/netfilter/x_tables.c | 6 +- + net/netfilter/xt_recent.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/nfc/hci/core.c | 19 ++- + net/nfc/netlink.c | 4 + + net/openvswitch/datapath.c | 1 + + net/packet/af_packet.c | 13 +- + net/sched/sch_fq.c | 1 + + net/sched/sch_taprio.c | 13 +- + net/sctp/diag.c | 8 +- + net/smc/smc_ib.c | 1 + + net/tipc/netlink.c | 1 + + net/wireless/nl80211.c | 5 + + tools/testing/selftests/net/fib_tests.sh | 34 +++- + 103 files changed, 939 insertions(+), 363 deletions(-) +Merging bpf/master (90db6d772f74 bpf, sockmap: Remove bucket->lock from sock_{hash|map}_free) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + .mailmap | 1 + + arch/x86/net/bpf_jit_comp32.c | 10 ++-- + kernel/bpf/bpf_struct_ops.c | 14 +++-- + kernel/bpf/btf.c | 2 +- + kernel/bpf/cgroup.c | 7 ++- + kernel/bpf/syscall.c | 5 ++ + kernel/trace/bpf_trace.c | 2 +- + net/core/sock_map.c | 12 +++-- + .../bpf/prog_tests/send_signal_sched_switch.c | 60 ++++++++++++++++++++++ + .../selftests/bpf/progs/test_send_signal_kern.c | 6 +++ + tools/testing/selftests/bpf/test_btf.c | 42 +++++++++++++++ + tools/testing/selftests/bpf/verifier/jmp32.c | 15 ++++++ + 12 files changed, 161 insertions(+), 15 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/send_signal_sched_switch.c +Merging ipsec/master (d1d17a359ce6 esp: remove the skb from the chain when it's enqueued in cryptd_wq) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/Kconfig | 1 + + net/ipv4/ip_vti.c | 38 ++++++++++++++++++++++++++++++-------- + net/ipv6/ip6_vti.c | 32 +++++++++++++++++++++++++------- + net/ipv6/xfrm6_tunnel.c | 2 +- + net/xfrm/xfrm_device.c | 9 +++++---- + net/xfrm/xfrm_user.c | 6 +++++- + 6 files changed, 67 insertions(+), 21 deletions(-) +Merging netfilter/master (b723bd933980 net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used) +$ 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 (e2e57291097b wlcore: remove stray plus sign) +$ git merge wireless-drivers/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 2 ++ + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 25 +++++----------- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 6 ++-- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 35 ++++++++++++++++------ + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 4 +++ + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 1 + + drivers/net/wireless/ti/wlcore/main.c | 2 +- + 9 files changed, 47 insertions(+), 32 deletions(-) +Merging mac80211/master (ba32679cac50 mac80211: Do not send mesh HWMP PREQ if HWMP is disabled) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (2c523b344dfa Linux 5.6-rc5) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (5461e0530c22 ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/oss/pcm_plugin.c | 12 ++++++++++-- + sound/pci/hda/patch_realtek.c | 2 ++ + sound/usb/line6/driver.c | 2 +- + sound/usb/line6/midibuf.c | 2 +- + 4 files changed, 14 insertions(+), 4 deletions(-) +Merging sound-asoc-fixes/for-linus (20370e3ada38 Merge branch 'asoc-5.6' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 15 ++++++++++-- + include/sound/soc.h | 1 + + sound/soc/codecs/wcd9335.c | 18 +++++++------- + sound/soc/codecs/wcd9335.h | 7 +++--- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 1 + + sound/soc/intel/skylake/bxt-sst.c | 3 --- + sound/soc/intel/skylake/cnl-sst.c | 35 +++++++++++++++++++++------ + sound/soc/intel/skylake/skl-nhlt.c | 3 ++- + sound/soc/intel/skylake/skl-sst-dsp.h | 2 ++ + sound/soc/intel/skylake/skl.c | 29 ++++++++++------------ + sound/soc/jz4740/jz4740-i2s.c | 2 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 30 +++++++++++++++++------ + sound/soc/qcom/qdsp6/q6routing.c | 19 --------------- + sound/soc/soc-core.c | 28 ++++++++++++++++++--- + sound/soc/soc-topology.c | 22 ++++++++++------- + sound/soc/sof/intel/hda-stream.c | 2 ++ + 16 files changed, 136 insertions(+), 81 deletions(-) +Merging regmap-fixes/for-linus (d29456d34def Merge branch 'regmap-5.6' into regmap-linus) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + include/linux/regmap.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging regulator-fixes/for-linus (2339289c9c69 Merge branch 'regulator-5.6' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging spi-fixes/for-linus (2c523b344dfa Linux 5.6-rc5) +$ git merge spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (5901b51f3e5d MAINTAINERS: Correct Cadence PCI driver path) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (2c523b344dfa Linux 5.6-rc5) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (2c523b344dfa Linux 5.6-rc5) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (b433e340e756 usb: host: xhci-plat: add a shutdown) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/thunderbolt/switch.c | 2 +- + drivers/usb/core/quirks.c | 3 +++ + drivers/usb/host/xhci-pci.c | 3 ++- + drivers/usb/host/xhci-plat.c | 1 + + drivers/usb/host/xhci-trace.h | 23 ++++++----------------- + drivers/usb/typec/ucsi/displayport.c | 12 +++++++++++- + 6 files changed, 24 insertions(+), 20 deletions(-) +Merging usb-gadget-fixes/fixes (42cd5ffe46c1 usb: dwc3: debug: fix string position formatting mixup with ret and len) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (cecc113c1af0 USB: serial: pl2303: add device-id for HP LD381) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 2 ++ + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 1 + + 3 files changed, 4 insertions(+) +Merging usb-chipidea-fixes/ci-for-usb-stable (7cbf3dd3139a usb: chipidea: udc: fix sleeping function called from invalid context) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/udc.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging phy/fixes (be4e3c737eeb phy: mapphone-mdm6600: Fix timeouts by adding wake-up handling) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (ac42c12dd752 staging: wfx: fix RCU usage between hif_join() and ieee80211_bss_get_ie()) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/speakup/main.c | 2 +- + drivers/staging/wfx/hif_tx.c | 15 ++++++++------- + drivers/staging/wfx/hif_tx.h | 2 +- + drivers/staging/wfx/hif_tx_mib.h | 15 ++++++++++----- + drivers/staging/wfx/sta.c | 25 +++++++++++++++---------- + 5 files changed, 35 insertions(+), 24 deletions(-) +Merging char-misc.current/char-misc-linus (f17f06a0c779 slimbus: ngd: add v2.1.0 compatible) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/android/binderfs.c | 1 + + drivers/slimbus/qcom-ngd-ctrl.c | 3 +++ + 2 files changed, 4 insertions(+) +Merging soundwire-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (e9d0e7511fda thunderbolt: Fix error code in tb_port_is_width_supported()) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (da3289044833 Input: tm2-touchkey - add support for Coreriver TC360 variant) +$ git merge input-current/for-linus +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/cypress,tm2-touchkey.txt | 1 + + Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ + drivers/input/keyboard/tm2-touchkey.c | 11 +++++++++++ + drivers/input/touchscreen/raydium_i2c_ts.c | 8 ++++---- + 4 files changed, 18 insertions(+), 4 deletions(-) +Merging crypto-current/master (1579f1bc3b75 crypto: x86/curve25519 - support assemblers with no adx support) +$ 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 (f3a60268f5ce selftest/lkdtm: Use local .gitignore) +$ 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 (195967c088aa MAINTAINERS: rectify the INTEL IADX DRIVER entry) +$ git merge slave-dma-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/dmaengine/provider.rst | 12 ++++++++++-- + MAINTAINERS | 1 - + drivers/dma/dmaengine.c | 2 +- + 3 files changed, 11 insertions(+), 4 deletions(-) +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (def9d2780727 Linux 5.5-rc7) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (ec14a914b844 media: venus: firmware: Ignore secure call error on first resume) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/platform/qcom/venus/firmware.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (f7d5f5655ef7 MAINTAINERS: Correct MIPS patchwork URL) +$ 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 (1756bfe89857 Merge branch 'fix-lcdc-quirk' into fixes) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/dm8148-evm.dts | 4 ++-- + arch/arm/boot/dts/dm8148-t410.dts | 4 ++-- + arch/arm/boot/dts/dra62x-j5eco-evm.dts | 4 ++-- + arch/arm/boot/dts/omap3-n900.dts | 44 +++++++++++++++++++++------------- + drivers/bus/ti-sysc.c | 3 ++- + 5 files changed, 36 insertions(+), 23 deletions(-) +Merging kvm-fixes/master (d718fdc3e752 KVM: x86: remove stale comment from struct x86_emulate_ctxt) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/x86/include/asm/kvm_emulate.h | 1 - + arch/x86/kvm/emulate.c | 1 + + arch/x86/kvm/svm.c | 3 ++- + arch/x86/kvm/x86.c | 8 +++++--- + 4 files changed, 8 insertions(+), 5 deletions(-) +Merging kvms390-fixes/master (e93fc7b4544a KVM: s390: Also reset registers in sync regs for initial cpu reset) +$ git merge kvms390-fixes/master +Merge made by the 'recursive' strategy. + arch/s390/kvm/kvm-s390.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) +Merging hwmon-fixes/hwmon (2c523b344dfa Linux 5.6-rc5) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (96222d53842d dax: pass NOWAIT flag to iomap_apply) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (eab248b5a21d Merge branch 'misc-5.6' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 2 ++ + fs/btrfs/inode.c | 4 ++++ + fs/btrfs/relocation.c | 18 +++++++++--------- + 3 files changed, 15 insertions(+), 9 deletions(-) +Merging vfs-fixes/fixes (bf4498ad3f9a tmpfs: deny and force are not huge mount options) +$ 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 (f8788d86ab28 Linux 5.6-rc3) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (0d935f0bf77d ARM: dts: exynos: Fix regulator node aliasing on Midas-based boards) +$ git merge samsung-krzk-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 ++-- + arch/arm/boot/dts/exynos4412-n710x.dts | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging pinctrl-samsung-fixes/pinctrl-fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (d2334a91a3b0 dt-bindings: arm: Fixup the DT bindings for hierarchical PSCI states) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (394b61711f3c scsi: ipr: Fix softlockup when rescanning devices in petitboot) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/ipr.c | 3 ++- + drivers/scsi/ipr.h | 1 + + drivers/scsi/ufs/ufshcd.c | 21 ++++++++++++++------- + 3 files changed, 17 insertions(+), 8 deletions(-) +Merging drm-fixes/drm-fixes (e3c3b6e66da1 Merge tag 'exynos-drm-fixes-for-v5.6-rc5-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes) +$ git merge drm-fixes/drm-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 5 +++-- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 5 +++-- + drivers/gpu/drm/exynos/exynos_drm_dma.c | 28 ++++++++++++++++++--------- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 6 ++++-- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 5 +++-- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 5 +++-- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 5 +++-- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 5 +++-- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 5 +++-- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 6 ++++-- + drivers/gpu/drm/exynos/exynos_mixer.c | 7 +++++-- + 11 files changed, 53 insertions(+), 29 deletions(-) +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (14a0d527a479 drm/i915: Defer semaphore priority bumping to a workqueue) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 ++- + drivers/gpu/drm/i915/gt/intel_lrc.c | 29 ++++++++++++++++---------- + drivers/gpu/drm/i915/gt/intel_timeline.c | 8 +++++-- + drivers/gpu/drm/i915/gvt/display.c | 3 ++- + drivers/gpu/drm/i915/gvt/opregion.c | 5 ++--- + drivers/gpu/drm/i915/gvt/vgpu.c | 12 ++++++++--- + drivers/gpu/drm/i915/i915_request.c | 28 ++++++++++++++++++------- + drivers/gpu/drm/i915/i915_request.h | 2 ++ + drivers/gpu/drm/i915/i915_utils.h | 5 +++++ + 9 files changed, 66 insertions(+), 29 deletions(-) +Merging mmc-fixes/fixes (18d200460cd7 mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/core/core.c | 5 ++++- + drivers/mmc/core/mmc.c | 7 +++++-- + drivers/mmc/core/mmc_ops.c | 6 ++++-- + drivers/mmc/host/sdhci-omap.c | 3 +++ + drivers/mmc/host/sdhci-tegra.c | 3 +++ + include/linux/mmc/host.h | 1 + + 6 files changed, 20 insertions(+), 5 deletions(-) +Merging rtc-fixes/rtc-fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f8788d86ab28 Linux 5.6-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (c1088d6c08fd HID: hyperv: NULL check before some freeing functions is not needed.) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create) +$ git merge soc-fsl-fixes/fix +Merge made by the 'recursive' strategy. + drivers/soc/fsl/dpio/dpio-driver.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging risc-v-fixes/fixes (af33d2433b03 riscv: fix seccomp reject syscall code path) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (10dab84caf40 pid: make ENOMEM return value more obvious) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (2c523b344dfa Linux 5.6-rc5) +$ 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 (9803aac7b550 drm/komeda: mark PM functions as __maybe_unused) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 4 +-- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 46 ++++++++++++++----------- + 2 files changed, 28 insertions(+), 22 deletions(-) +Merging kspp-gustavo/for-next/kspp (d5180902be1c firmware: google: vpd: Replace zero-length array with flexible-array member) +$ git merge kspp-gustavo/for-next/kspp +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-sysfs.c | 2 +- + drivers/firmware/google/memconsole-coreboot.c | 2 +- + drivers/firmware/google/vpd.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging kbuild/for-next (da64dbe8ecee modpost: return error if module is missing ns imports and MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=n) +$ git merge kbuild/for-next +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/Makefile | 3 +- + Documentation/devicetree/bindings/.gitignore | 2 +- + Documentation/devicetree/bindings/Makefile | 32 +++++++---- + Documentation/devicetree/writing-schema.rst | 4 ++ + Documentation/kbuild/index.rst | 1 + + Documentation/kbuild/kconfig-language.rst | 27 ++++++++- + Documentation/kbuild/llvm.rst | 80 +++++++++++++++++++++++++++ + MAINTAINERS | 1 + + Makefile | 30 +++++++--- + arch/sh/Kconfig | 5 -- + arch/sparc/Kconfig | 5 -- + arch/x86/Kconfig | 5 -- + arch/x86/um/Kconfig | 5 -- + init/Kconfig | 16 +++++- + lib/Kconfig.debug | 3 +- + scripts/Makefile.lib | 3 +- + scripts/Makefile.modpost | 15 ++--- + scripts/adjust_autoksyms.sh | 24 ++------ + scripts/basic/fixdep.c | 10 +--- + scripts/dtc/Makefile | 5 +- + scripts/gen_autoksyms.sh | 52 +++++++++++++++++ + scripts/kconfig/Makefile | 4 -- + scripts/kconfig/symbol.c | 9 ++- + scripts/mkcompile_h | 11 ---- + scripts/mod/modpost.c | 83 ++++++++++++++-------------- + scripts/mod/modpost.h | 14 ++++- + 26 files changed, 296 insertions(+), 153 deletions(-) + create mode 100644 Documentation/kbuild/llvm.rst + create mode 100755 scripts/gen_autoksyms.sh +$ git am -3 ../patches/net-drop_monitor-use-IS_REACHABLE-to-guard-net_dm_hw_report.patch +Applying: net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report() +$ git reset HEAD^ +Unstaged changes after reset: +M include/net/drop_monitor.h +$ git add -A . +$ git commit -v -a --amend +[master a58c10c3aa6c] Merge remote-tracking branch 'kbuild/for-next' + Date: Fri Mar 13 08:47:23 2020 +1100 +Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4) +$ 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 (89bb6e2ac940 ARM/dma-mapping: merge __dma_supported into arm_dma_supported) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/dma-iommu.h | 2 -- + arch/arm/mm/dma-mapping.c | 76 ++++++++++------------------------------ + 2 files changed, 18 insertions(+), 60 deletions(-) +Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (d46a35a9ad25 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/Makefile | 6 +- + arch/arm/boot/compressed/fdt_get_mem_start.c | 52 +++++++ + arch/arm/boot/compressed/head.S | 216 +++++++++++++++++---------- + arch/arm/boot/compressed/vmlinux.lds.S | 1 - + arch/arm/kernel/relocate_kernel.S | 8 +- + arch/arm/kernel/unwind.c | 2 +- + arch/arm/mach-ebsa110/core.c | 12 +- + arch/arm/mach-rpc/time.c | 8 +- + 8 files changed, 208 insertions(+), 97 deletions(-) + create mode 100644 arch/arm/boot/compressed/fdt_get_mem_start.c +Merging arm64/for-next/core (1424835a7c53 Merge branch 'for-next/asm-annotations' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging arch/arm64/mm/context.c +Auto-merging arch/arm64/kvm/hyp/switch.c +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Merge made by the 'recursive' strategy. + Documentation/arm64/amu.rst | 112 +++++++++++ + Documentation/arm64/booting.rst | 14 ++ + Documentation/arm64/index.rst | 1 + + arch/arm64/Kconfig | 34 +++- + arch/arm64/crypto/aes-ce.S | 4 +- + arch/arm64/crypto/aes-modes.S | 48 ++--- + arch/arm64/crypto/aes-neon.S | 4 +- + arch/arm64/crypto/ghash-ce-core.S | 16 +- + arch/arm64/include/asm/assembler.h | 16 +- + arch/arm64/include/asm/checksum.h | 7 +- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/cpufeature.h | 5 + + arch/arm64/include/asm/esr.h | 2 +- + arch/arm64/include/asm/kvm_arm.h | 1 + + arch/arm64/include/asm/kvm_asm.h | 4 + + arch/arm64/include/asm/kvm_mmu.h | 9 +- + arch/arm64/include/asm/memory.h | 1 + + arch/arm64/include/asm/mmu.h | 10 +- + arch/arm64/include/asm/mmu_context.h | 2 + + arch/arm64/include/asm/proc-fns.h | 2 - + arch/arm64/include/asm/sysreg.h | 38 ++++ + arch/arm64/include/asm/topology.h | 9 + + arch/arm64/kernel/Makefile | 2 +- + arch/arm64/kernel/cpu_errata.c | 18 +- + arch/arm64/kernel/cpufeature.c | 70 +++++++ + arch/arm64/kernel/entry-common.c | 2 +- + arch/arm64/kernel/entry-ftrace.S | 48 ++--- + arch/arm64/kernel/entry.S | 115 +++++------ + arch/arm64/kernel/head.S | 74 +++---- + arch/arm64/kernel/hibernate-asm.S | 2 - + arch/arm64/kernel/topology.c | 180 +++++++++++++++++ + arch/arm64/kernel/vdso/sigreturn.S | 4 +- + arch/arm64/kernel/vdso32/sigreturn.S | 23 +-- + arch/arm64/kvm/hyp-init.S | 8 +- + arch/arm64/kvm/hyp.S | 4 +- + arch/arm64/kvm/hyp/fpsimd.S | 8 +- + arch/arm64/kvm/hyp/hyp-entry.S | 27 ++- + arch/arm64/kvm/hyp/switch.c | 14 +- + arch/arm64/kvm/sys_regs.c | 93 ++++++++- + arch/arm64/lib/csum.c | 27 +++ + arch/arm64/mm/context.c | 32 ++- + arch/arm64/mm/mmu.c | 379 ++++++++++++++++++++++++++++++++++- + arch/arm64/mm/proc.S | 31 +-- + arch/arm64/mm/ptdump_debugfs.c | 4 + + drivers/base/arch_topology.c | 12 ++ + drivers/clocksource/arm_arch_timer.c | 18 +- + drivers/cpufreq/cpufreq.c | 20 ++ + drivers/firmware/arm_sdei.c | 71 +++---- + include/linux/arch_topology.h | 2 + + include/linux/cpufreq.h | 5 + + 50 files changed, 1328 insertions(+), 307 deletions(-) + create mode 100644 Documentation/arm64/amu.rst +Merging arm-perf/for-next/perf (29cc4ceeac12 arm64: perf: Support new DT compatibles) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + arch/arm64/kernel/perf_event.c | 168 +++++++++++++++++++---------------------- + drivers/perf/arm_spe_pmu.c | 2 +- + 2 files changed, 78 insertions(+), 92 deletions(-) +Merging arm-soc/for-next (09e7f9a4c8e2 Merge branch 'arm/fixes' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 36 ++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (340b12db7cc9 Merge branch 'v5.7/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 40 ++++ + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 6 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 6 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 2 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 4 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 + + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 9 +- + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 1 + + drivers/firmware/meson/meson_sm.c | 2 + + drivers/soc/amlogic/Kconfig | 13 ++ + drivers/soc/amlogic/Makefile | 1 + + drivers/soc/amlogic/meson-secure-pwrc.c | 204 +++++++++++++++++++++ + include/dt-bindings/power/meson-a1-power.h | 32 ++++ + include/linux/firmware/meson/meson_sm.h | 2 + + 19 files changed, 325 insertions(+), 7 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml + create mode 100644 drivers/soc/amlogic/meson-secure-pwrc.c + create mode 100644 include/dt-bindings/power/meson-a1-power.h +Merging aspeed/for-next (de285b938cf3 ARM: dts: aspeed: ast2600: Fix SCU IRQ controller nodes) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 74 ++++++++++ + .../boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 151 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 21 +++ + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 34 +++++ + arch/arm/boot/dts/aspeed-g4.dtsi | 12 ++ + arch/arm/boot/dts/aspeed-g5.dtsi | 21 +++ + arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 25 ++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 83 +++++++++++ + 9 files changed, 425 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts +Merging at91/at91-next (7448f052c816 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi | 2 +- + arch/arm/boot/dts/at91-sam9x60ek.dts | 5 + + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 33 ++++- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 33 ++++- + arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 2 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 2 +- + arch/arm/boot/dts/at91sam9x5dm.dtsi | 2 +- + arch/arm/boot/dts/sam9x60.dtsi | 8 ++ + arch/arm/boot/dts/sama5d2.dtsi | 2 +- + arch/arm/boot/dts/sama5d3.dtsi | 33 ++++- + arch/arm/boot/dts/sama5d4.dtsi | 35 ++++- + arch/arm/configs/at91_dt_defconfig | 1 + + arch/arm/mach-at91/Kconfig | 1 - + arch/arm/mach-at91/pm.c | 35 ++++- + arch/arm/mach-at91/pm.h | 2 + + arch/arm/mach-at91/pm_data-offsets.c | 4 + + arch/arm/mach-at91/pm_suspend.S | 189 ++++++++++++++++++++++++-- + drivers/clk/at91/clk-sam9x60-pll.c | 91 +++++-------- + include/linux/clk/at91_pmc.h | 23 ++++ + 19 files changed, 410 insertions(+), 93 deletions(-) +Merging imx-mxs/for-next (4559a11e48d5 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Removing Documentation/devicetree/bindings/clock/imx8mq-clock.txt +Removing Documentation/devicetree/bindings/clock/imx8mm-clock.txt +Auto-merging Documentation/devicetree/bindings/arm/fsl.yaml +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 70274d6ee8b6] Merge remote-tracking branch 'imx-mxs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/fsl.yaml | 54 ++ + .../devicetree/bindings/clock/imx8mm-clock.txt | 29 - + .../devicetree/bindings/clock/imx8mm-clock.yaml | 68 ++ + .../devicetree/bindings/clock/imx8mn-clock.yaml | 48 +- + .../devicetree/bindings/clock/imx8mq-clock.txt | 20 - + .../devicetree/bindings/clock/imx8mq-clock.yaml | 72 ++ + .../devicetree/bindings/crypto/fsl-dcp.txt | 2 +- + .../devicetree/bindings/crypto/fsl-imx-sahara.txt | 2 +- + .../devicetree/bindings/crypto/fsl-sec4.txt | 2 +- + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/imx23.dtsi | 2 +- + arch/arm/boot/dts/imx25-pinfunc.h | 8 + + arch/arm/boot/dts/imx25.dtsi | 4 +- + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 10 + + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/imx31.dtsi | 4 +- + arch/arm/boot/dts/imx35.dtsi | 4 +- + arch/arm/boot/dts/imx50.dtsi | 4 +- + arch/arm/boot/dts/imx51.dtsi | 4 +- + arch/arm/boot/dts/imx53.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 2 + + arch/arm/boot/dts/imx6dl.dtsi | 6 +- + arch/arm/boot/dts/imx6q-novena.dts | 2 +- + arch/arm/boot/dts/imx6q.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 31 + + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 25 + + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 9 +- + arch/arm/boot/dts/imx6qdl-sr-som-ti.dtsi | 1 + + arch/arm/boot/dts/imx6qdl.dtsi | 24 +- + arch/arm/boot/dts/imx6qp.dtsi | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 20 +- + arch/arm/boot/dts/imx6sll.dtsi | 6 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 20 +- + arch/arm/boot/dts/imx6sx-pinfunc.h | 286 +++++-- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 4 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 12 +- + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 22 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 28 +- + arch/arm/boot/dts/imx6sx.dtsi | 28 +- + arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 2 +- + arch/arm/boot/dts/imx6ul-pico.dtsi | 39 +- + arch/arm/boot/dts/imx6ul.dtsi | 28 +- + arch/arm/boot/dts/imx6ull.dtsi | 2 +- + arch/arm/boot/dts/imx7-colibri-aster.dtsi | 169 ++++ + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 45 +- + arch/arm/boot/dts/imx7-colibri.dtsi | 229 ++++- + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 +- + arch/arm/boot/dts/imx7d-colibri-aster.dts | 20 + + arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts | 20 + + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 26 + + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 40 +- + arch/arm/boot/dts/imx7s-colibri-aster.dts | 15 + + arch/arm/boot/dts/imx7s-colibri-eval-v3.dts | 40 +- + arch/arm/boot/dts/imx7s.dtsi | 38 +- + arch/arm/boot/dts/imx7ulp-evk.dts | 3 +- + arch/arm/boot/dts/imx7ulp.dtsi | 4 +- + arch/arm/boot/dts/vf500.dtsi | 4 +- + arch/arm/boot/dts/vf610-zii-cfu1.dts | 8 + + arch/arm/boot/dts/vf610-zii-dev.dtsi | 8 + + arch/arm/boot/dts/vf610-zii-spb4.dts | 8 + + arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 8 + + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 8 + + arch/arm/boot/dts/vfxxx.dtsi | 4 +- + arch/arm/configs/imx_v6_v7_defconfig | 3 + + arch/arm/configs/multi_v7_defconfig | 6 + + arch/arm/mach-imx/Kconfig | 10 +- + arch/arm/mach-imx/anatop.c | 7 +- + arch/arm/mach-imx/gpc.c | 4 +- + arch/arm/mach-imx/mach-imx6q.c | 13 - + arch/arm/mach-imx/mach-imx6sl.c | 1 - + arch/arm/mach-imx/mach-imx6ul.c | 1 - + arch/arm/mach-imx/platsmp.c | 1 + + arch/arm/mach-imx/pm-imx6.c | 2 + + arch/arm/mach-imx/pm-imx7ulp.c | 1 + + arch/arm/mach-imx/src.c | 3 - + arch/arm64/boot/dts/freescale/Makefile | 5 + + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 27 + + .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 106 +++ + .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 51 ++ + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 175 ++++ + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 61 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 129 ++- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 4 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 + + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 37 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 4 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 168 ++++ + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 2 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 19 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 21 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 19 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 270 ++++++ + arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h | 931 +++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 652 +++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 2 + + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 148 +++- + arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts | 104 +++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 39 + + arch/arm64/boot/dts/freescale/s32v234.dtsi | 4 +- + arch/arm64/configs/defconfig | 3 + + drivers/clk/imx/clk-composite-8m.c | 20 +- + drivers/clk/imx/clk-fixup-div.c | 2 +- + drivers/clk/imx/clk-fixup-mux.c | 2 +- + drivers/clk/imx/clk-gate2.c | 6 +- + drivers/clk/imx/clk-imx6sl.c | 1 + + drivers/clk/imx/clk-imx7ulp.c | 2 +- + drivers/clk/imx/clk-imx8mm.c | 63 +- + drivers/clk/imx/clk-imx8mn.c | 41 +- + drivers/clk/imx/clk-imx8mp.c | 28 +- + drivers/clk/imx/clk-imx8mq.c | 53 +- + drivers/clk/imx/clk-pfdv2.c | 61 +- + drivers/clk/imx/clk-pll14xx.c | 4 + + drivers/clk/imx/clk-pllv4.c | 12 +- + drivers/clk/imx/clk-scu.c | 8 +- + drivers/clk/imx/clk-sscg-pll.c | 14 +- + drivers/clk/imx/clk.h | 13 +- + drivers/firmware/imx/scu-pd.c | 13 +- + drivers/soc/Makefile | 2 +- + drivers/soc/imx/Kconfig | 9 + + drivers/soc/imx/Makefile | 2 +- + drivers/soc/imx/gpcv2.c | 1 + + drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} | 0 + include/dt-bindings/clock/imx8mm-clock.h | 11 +- + include/dt-bindings/clock/imx8mn-clock.h | 12 +- + include/dt-bindings/clock/imx8mp-clock.h | 5 +- + include/dt-bindings/clock/imx8mq-clock.h | 9 +- + include/linux/firmware/imx/ipc.h | 14 +- + include/linux/firmware/imx/sci.h | 22 + + include/linux/firmware/imx/svc/misc.h | 19 + + 137 files changed, 4498 insertions(+), 678 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/imx8mm-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx8mm-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx8mq-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx8mq-clock.yaml + create mode 100644 arch/arm/boot/dts/imx7-colibri-aster.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-colibri-aster.dts + create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts + create mode 100644 arch/arm/boot/dts/imx7s-colibri-aster.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var4.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp.dtsi + rename drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} (100%) +Merging keystone/next (560b4d4691b0 Merge branch 'for_5.7/keystone-dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-k2g-evm.dts | 101 +++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/keystone-k2g.dtsi | 22 +++++++ + 2 files changed, 123 insertions(+) +Merging mediatek/for-next (28f0b8961045 Merge branch 'v5.6-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + arch/arm/boot/dts/mt2701.dtsi | 2 +- + arch/arm/boot/dts/mt7623.dtsi | 2 +- + arch/arm/boot/dts/mt7629.dtsi | 16 +- + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt6797.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 53 ++ + arch/arm64/boot/dts/mediatek/mt8516-pinfunc.h | 663 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8516-pumpkin.dts | 20 + + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 457 ++++++++++++++ + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 221 +++++++ + drivers/soc/mediatek/mtk-cmdq-helper.c | 1 + + drivers/soc/mediatek/mtk-pmic-wrap.c | 128 ++++ + 16 files changed, 1567 insertions(+), 7 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt8516-pinfunc.h + create mode 100644 arch/arm64/boot/dts/mediatek/mt8516-pumpkin.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8516.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +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 (b6bb79e88514 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + Documentation/devicetree/bindings/bus/ti-sysc.txt | 1 + + arch/arm/boot/dts/am33xx-l4.dtsi | 21 +- + arch/arm/boot/dts/am33xx.dtsi | 133 +++-- + arch/arm/boot/dts/am4372.dtsi | 191 ++++--- + arch/arm/boot/dts/am437x-l4.dtsi | 77 ++- + arch/arm/boot/dts/am57-pruss.dtsi | 50 ++ + arch/arm/boot/dts/am5718.dtsi | 1 + + arch/arm/boot/dts/am5728.dtsi | 1 + + arch/arm/boot/dts/am5748.dtsi | 1 + + arch/arm/boot/dts/dra7.dtsi | 219 +++++--- + arch/arm/boot/dts/dra72x.dtsi | 6 +- + arch/arm/boot/dts/dra74x.dtsi | 10 +- + arch/arm/boot/dts/omap4-l4.dtsi | 1 + + arch/arm/boot/dts/omap4.dtsi | 279 +++++++--- + arch/arm/boot/dts/omap5-l4-abe.dtsi | 16 +- + arch/arm/boot/dts/omap5.dtsi | 241 +++++--- + arch/arm/configs/omap2plus_defconfig | 2 + + arch/arm/mach-omap1/pm.c | 13 +- + arch/arm/mach-omap1/time.c | 10 +- + arch/arm/mach-omap1/timer32k.c | 10 +- + arch/arm/mach-omap2/omap_hwmod.c | 19 +- + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 10 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 40 -- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 115 ---- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 14 - + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 114 ---- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 531 ------------------ + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 288 ---------- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 251 --------- + arch/arm/mach-omap2/pdata-quirks.c | 6 + + arch/arm/mach-omap2/pm33xx-core.c | 137 ++++- + arch/arm/mach-omap2/timer.c | 11 +- + drivers/bus/ti-sysc.c | 604 ++++++++++++++++++--- + drivers/gpu/drm/omapdrm/dss/dss.c | 25 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 25 +- + drivers/soc/ti/pm33xx.c | 21 +- + include/dt-bindings/bus/ti-sysc.h | 4 + + include/linux/platform_data/pm33xx.h | 6 +- + include/linux/platform_data/ti-sysc.h | 5 + + 40 files changed, 1679 insertions(+), 1832 deletions(-) + create mode 100644 arch/arm/boot/dts/am57-pruss.dtsi +Merging qcom/for-next (2611bc0b358f Merge branches 'arm64-for-5.7', 'arm64-defconfig-for-5.7', 'defconfig-for-5.7', 'drivers-for-5.7' and 'dts-for-5.7' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 8 + + .../devicetree/bindings/firmware/qcom,scm.txt | 1 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 1 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 1 + + arch/arm/boot/dts/qcom-ipq4019.dtsi | 1 + + arch/arm/boot/dts/qcom-ipq8064.dtsi | 1 + + arch/arm/boot/dts/qcom-mdm9615.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8960.dtsi | 1 + + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 71 +++ + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 25 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 10 + + arch/arm/configs/qcom_defconfig | 6 + + arch/arm64/boot/dts/qcom/Makefile | 2 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 1 - + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 6 - + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 64 +++ + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 443 +++++++++++++++ + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 1 + + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 8 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 21 +- + arch/arm64/boot/dts/qcom/msm8992.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8994.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 33 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 8 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 16 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 1 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 64 ++- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 605 ++++++++++++++++++++- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 10 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 125 +++++ + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 82 +++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 342 +++++++++++- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 29 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 444 +++++++++++++++ + arch/arm64/configs/defconfig | 6 + + drivers/soc/qcom/Kconfig | 1 - + drivers/soc/qcom/qcom_aoss.c | 6 +- + drivers/soc/qcom/rpmh-internal.h | 1 + + drivers/soc/qcom/rpmh-rsc.c | 2 +- + drivers/soc/qcom/rpmh.c | 22 +- + drivers/soc/qcom/socinfo.c | 2 +- + include/soc/qcom/rpmh.h | 5 - + 46 files changed, 2398 insertions(+), 90 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq6018.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8250.dtsi +Merging raspberrypi/for-next (d886ff4d2a6a ARM: dts: bcm2711: Move emmc2 into its own bus) +$ git merge raspberrypi/for-next +Auto-merging arch/arm/configs/bcm2835_defconfig +Auto-merging arch/arm/boot/dts/bcm2711-rpi-4-b.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 74 +++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/bcm2711.dtsi | 25 +++++++++--- + arch/arm/configs/bcm2835_defconfig | 5 +++ + 3 files changed, 99 insertions(+), 5 deletions(-) +Merging realtek/for-next (45698e00d5a9 Merge branch 'v5.6/dt' into next) +$ git merge realtek/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/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 (bf4540d5148c Merge branch 'renesas-arm64-dt-for-v5.7' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Recorded preimage for 'arch/arm64/configs/defconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm64/configs/defconfig'. +[master f70a76998a21] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/renesas.yaml | 1 + + arch/arm/boot/dts/r7s72100-gr-peach.dts | 3 + + arch/arm/boot/dts/r7s72100.dtsi | 5 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 7 +- + arch/arm/boot/dts/r8a7743.dtsi | 5 +- + arch/arm/boot/dts/r8a7744.dtsi | 5 +- + .../arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 6 ++ + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 93 ++++++++++++++++++++++ + arch/arm/boot/dts/r8a7745.dtsi | 3 +- + arch/arm/boot/dts/r8a77470.dtsi | 5 +- + arch/arm/boot/dts/r8a7790-lager.dts | 1 + + arch/arm/boot/dts/r8a7790-stout.dts | 1 + + arch/arm/boot/dts/r8a7790.dtsi | 2 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 1 + + arch/arm/boot/dts/r8a7791-porter.dts | 1 + + arch/arm/boot/dts/r8a7791.dtsi | 5 +- + arch/arm/boot/dts/r8a7792.dtsi | 5 +- + arch/arm/boot/dts/r8a7793-gose.dts | 1 + + arch/arm/boot/dts/r8a7793.dtsi | 5 +- + arch/arm/boot/dts/r8a7794-alt.dts | 1 + + arch/arm/boot/dts/r8a7794-silk.dts | 1 + + arch/arm/boot/dts/r8a7794.dtsi | 2 + + arch/arm/boot/dts/sh73a0-kzm9g.dts | 9 +-- + arch/arm/mach-shmobile/setup-r8a7779.c | 1 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 1 - + arch/arm64/boot/dts/renesas/Makefile | 6 +- + .../r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts | 52 ++++++++++++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 7 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 7 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 11 +-- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 16 +++- + .../boot/dts/renesas/r8a77961-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 32 ++++++++ + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 89 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 31 +++++++- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 7 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 29 ++++++- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 14 +++- + arch/arm64/configs/defconfig | 21 +++++ + drivers/soc/renesas/Kconfig | 18 +++-- + drivers/soc/renesas/rcar-sysc.h | 4 +- + drivers/soc/renesas/renesas-soc.c | 2 +- + 46 files changed, 458 insertions(+), 76 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts +Merging reset/reset/next (2ebf89fd4ecf reset: hi6220: Add support for AO reset controller) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/fsl,imx7-src.txt | 6 +- + drivers/reset/hisilicon/hi6220_reset.c | 69 +++++++++++++- + drivers/reset/reset-imx7.c | 101 +++++++++++++++++++++ + .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 +- + include/dt-bindings/reset/imx8mp-reset.h | 50 ++++++++++ + include/dt-bindings/reset/imx8mq-reset.h | 56 ++++++------ + 6 files changed, 253 insertions(+), 31 deletions(-) + create mode 100644 include/dt-bindings/reset/imx8mp-reset.h +Merging rockchip/for-next (6795e06559b8 Merge branch 'v5.7-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 12 +- + arch/arm/boot/dts/rk3036-kylin.dts | 2 +- + arch/arm/boot/dts/rk3036.dtsi | 6 +- + arch/arm/boot/dts/rk3188-bqedison2qc.dts | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 5 +- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 1 + + arch/arm/boot/dts/rk3288-evb-rk808.dts | 1 + + arch/arm/boot/dts/rk3288-r89.dts | 1 + + arch/arm/boot/dts/rk3288-vyasa.dts | 28 +- + arch/arm/boot/dts/rk3288.dtsi | 6 +- + arch/arm/boot/dts/rk3xxx.dtsi | 2 +- + arch/arm/boot/dts/rv1108.dtsi | 9 +- + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm/mach-rockchip/rockchip.c | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 30 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 5 +- + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 270 ++++- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 43 +- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1096 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 +- + .../boot/dts/rockchip/rk3399pro-rock-pi-n10.dts | 3 +- + drivers/clk/rockchip/clk-pll.c | 70 +- + drivers/clk/rockchip/clk-rk3228.c | 17 +- + 34 files changed, 1530 insertions(+), 117 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +Merging samsung-krzk/for-next (ec793c394501 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 9 ++++ + arch/arm/boot/dts/exynos5250-arndale.dts | 10 ++-- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 + + arch/arm/boot/dts/exynos5422-cpus.dtsi | 8 +++ + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 1 + + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 30 +++++++++++ + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 59 ++++++++++++++++++++++ + arch/arm/configs/exynos_defconfig | 11 +++- + drivers/soc/samsung/exynos-chipid.c | 2 +- + 11 files changed, 129 insertions(+), 9 deletions(-) +Merging scmi/for-linux-next (b48c74f4e139 Merge tag 'scmi-updates-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/firmware/arm_scmi/Makefile | 3 +- + drivers/firmware/arm_scmi/common.h | 115 +++++++++++++- + drivers/firmware/arm_scmi/driver.c | 293 +++++------------------------------- + drivers/firmware/arm_scmi/mailbox.c | 184 ++++++++++++++++++++++ + drivers/firmware/arm_scmi/perf.c | 2 +- + drivers/firmware/arm_scmi/shmem.c | 83 ++++++++++ + drivers/firmware/arm_scpi.c | 4 +- + drivers/misc/vexpress-syscfg.c | 2 +- + 8 files changed, 420 insertions(+), 266 deletions(-) + create mode 100644 drivers/firmware/arm_scmi/mailbox.c + create mode 100644 drivers/firmware/arm_scmi/shmem.c +Merging sunxi/sunxi/for-next (8afff9da61ea Merge branch 'sunxi/dt-for-5.7' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 26 ++ + .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + + .../crypto/allwinner,sun4i-a10-crypto.yaml | 2 + + .../media/allwinner,sun8i-h3-deinterlace.yaml | 6 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 11 +- + arch/arm/boot/dts/Makefile | 2 + + .../boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts | 257 ++++++++++++ + arch/arm/boot/dts/sun5i.dtsi | 3 - + arch/arm/boot/dts/sun6i-a31.dtsi | 12 - + .../boot/dts/sun7i-a20-linutronix-testbox-v2.dts | 47 +++ + arch/arm/boot/dts/sun7i-a20.dtsi | 25 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 3 - + arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 8 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 79 +++- + arch/arm/boot/dts/sun8i-h3.dtsi | 25 ++ + arch/arm/boot/dts/sun8i-r40.dtsi | 155 ++++--- + arch/arm/boot/dts/sun8i-v3s.dtsi | 2 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 17 +- + arch/arm/mach-sunxi/sunxi.c | 2 +- + arch/arm64/boot/dts/allwinner/Makefile | 3 + + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 17 + + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 170 +++++--- + .../dts/allwinner/sun50i-a64-pinephone-1.0.dts | 11 + + .../dts/allwinner/sun50i-a64-pinephone-1.1.dts | 11 + + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 379 +++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 460 +++++++++++++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 44 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 21 + + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 3 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 11 + + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 20 + + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 33 ++ + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 37 ++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 30 ++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 66 ++- + drivers/bus/sunxi-rsb.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 4 - + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 115 ++++-- + include/dt-bindings/clock/sun50i-a64-ccu.h | 2 +- + 40 files changed, 1896 insertions(+), 230 deletions(-) + create mode 100644 arch/arm/boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts +Merging tegra/for-next (90060ae83820 Merge branch for-5.7/arm64/dt into for-next) +$ git merge tegra/for-next +Removing drivers/clk/tegra/clk-tegra-pmc.c +Removing arch/arm/mach-tegra/cpuidle.h +Removing arch/arm/mach-tegra/cpuidle.c +Removing arch/arm/mach-tegra/cpuidle-tegra30.c +Removing arch/arm/mach-tegra/cpuidle-tegra20.c +Removing arch/arm/mach-tegra/cpuidle-tegra114.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Removing Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 300 ---------------- + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 354 +++++++++++++++++++ + .../bindings/pci/nvidia,tegra194-pcie.txt | 2 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 8 +- + arch/arm/boot/dts/tegra114.dtsi | 4 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 8 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 8 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 14 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 8 +- + arch/arm/boot/dts/tegra124-venice2.dts | 8 +- + arch/arm/boot/dts/tegra124.dtsi | 4 +- + arch/arm/boot/dts/tegra20.dtsi | 4 +- + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 8 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 8 +- + arch/arm/boot/dts/tegra30-beaver.dts | 8 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 8 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 8 +- + arch/arm/boot/dts/tegra30.dtsi | 4 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/tegra_defconfig | 1 + + arch/arm/mach-tegra/Makefile | 19 +- + arch/arm/mach-tegra/cpuidle-tegra114.c | 89 ----- + arch/arm/mach-tegra/cpuidle-tegra20.c | 212 ----------- + arch/arm/mach-tegra/cpuidle-tegra30.c | 132 ------- + arch/arm/mach-tegra/cpuidle.c | 50 --- + arch/arm/mach-tegra/cpuidle.h | 21 -- + arch/arm/mach-tegra/irq.c | 3 +- + arch/arm/mach-tegra/pm.c | 54 +-- + arch/arm/mach-tegra/pm.h | 4 - + arch/arm/mach-tegra/reset-handler.S | 11 - + arch/arm/mach-tegra/reset.h | 9 +- + arch/arm/mach-tegra/sleep-tegra20.S | 170 --------- + arch/arm/mach-tegra/sleep-tegra30.S | 6 +- + arch/arm/mach-tegra/sleep.h | 15 - + arch/arm/mach-tegra/tegra.c | 7 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 26 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 19 + + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 36 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 81 +++++ + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 250 ++++++++++++- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 3 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 2 + + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 45 ++- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 24 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 25 +- + drivers/clk/tegra/Makefile | 1 - + drivers/clk/tegra/clk-id.h | 12 +- + drivers/clk/tegra/clk-tegra-fixed.c | 37 +- + drivers/clk/tegra/clk-tegra-pmc.c | 122 ------- + drivers/clk/tegra/clk-tegra114.c | 43 +-- + drivers/clk/tegra/clk-tegra124.c | 48 +-- + drivers/clk/tegra/clk-tegra20.c | 9 +- + drivers/clk/tegra/clk-tegra210.c | 32 +- + drivers/clk/tegra/clk-tegra30.c | 33 +- + drivers/clk/tegra/clk.h | 1 - + drivers/cpuidle/Kconfig.arm | 8 + + drivers/cpuidle/Makefile | 1 + + drivers/cpuidle/cpuidle-tegra.c | 392 +++++++++++++++++++++ + drivers/firmware/tegra/Kconfig | 2 +- + drivers/memory/tegra/tegra124-emc.c | 5 + + drivers/memory/tegra/tegra20-emc.c | 5 + + drivers/memory/tegra/tegra30-emc.c | 5 + + drivers/soc/tegra/pmc.c | 354 +++++++++++++++++++ + include/dt-bindings/clock/tegra114-car.h | 4 +- + include/dt-bindings/clock/tegra124-car-common.h | 4 +- + include/dt-bindings/clock/tegra210-car.h | 4 +- + include/dt-bindings/clock/tegra30-car.h | 4 +- + include/dt-bindings/soc/tegra-pmc.h | 16 + + include/soc/tegra/cpuidle.h | 2 +- + {arch/arm/mach-tegra => include/soc/tegra}/irq.h | 8 +- + include/soc/tegra/pm.h | 31 ++ + 74 files changed, 1904 insertions(+), 1367 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml + delete mode 100644 arch/arm/mach-tegra/cpuidle-tegra114.c + delete mode 100644 arch/arm/mach-tegra/cpuidle-tegra20.c + delete mode 100644 arch/arm/mach-tegra/cpuidle-tegra30.c + delete mode 100644 arch/arm/mach-tegra/cpuidle.c + delete mode 100644 arch/arm/mach-tegra/cpuidle.h + delete mode 100644 drivers/clk/tegra/clk-tegra-pmc.c + create mode 100644 drivers/cpuidle/cpuidle-tegra.c + create mode 100644 include/dt-bindings/soc/tegra-pmc.h + rename {arch/arm/mach-tegra => include/soc/tegra}/irq.h (59%) +Merging clk/clk-next (5b36638c88df Merge branch 'clk-amlogic' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + drivers/clk/at91/Makefile | 3 + + drivers/clk/at91/at91sam9g45.c | 220 +++++++++++++++++++ + drivers/clk/at91/at91sam9n12.c | 238 ++++++++++++++++++++ + drivers/clk/at91/clk-usb.c | 9 +- + drivers/clk/at91/sam9x60.c | 14 +- + drivers/clk/at91/sama5d3.c | 240 +++++++++++++++++++++ + drivers/clk/clk-si5341.c | 212 ++++++++++++++++-- + drivers/clk/clk.c | 129 ++++++----- + drivers/clk/meson/g12a.c | 129 +++++++++++ + drivers/clk/meson/g12a.h | 6 +- + drivers/clk/meson/gxbb.c | 21 +- + drivers/clk/meson/gxbb.h | 2 +- + drivers/clk/meson/meson8b.c | 21 +- + drivers/clk/qcom/clk-alpha-pll.c | 17 +- + drivers/clk/qcom/clk-rpmh.c | 25 ++- + drivers/clk/qcom/dispcc-sc7180.c | 19 -- + drivers/clk/qcom/gpucc-sc7180.c | 37 ++++ + drivers/clk/qcom/videocc-sc7180.c | 2 +- + drivers/clk/renesas/Kconfig | 2 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 8 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 10 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 + + drivers/clk/rockchip/clk-mmc-phase.c | 4 +- + drivers/clk/samsung/clk.c | 4 - + drivers/clk/socfpga/clk-gate-s10.c | 40 ++-- + drivers/clk/socfpga/clk-periph-s10.c | 42 ++-- + drivers/clk/socfpga/clk-pll-s10.c | 17 +- + drivers/clk/socfpga/clk-s10.c | 29 +-- + drivers/clk/socfpga/stratix10-clk.h | 25 +-- + include/dt-bindings/clock/g12a-clkc.h | 2 + + include/dt-bindings/clock/gxbb-clkc.h | 1 + + include/dt-bindings/clock/qcom,gpucc-sc7180.h | 3 +- + include/dt-bindings/clock/qcom,rpmh.h | 4 +- + include/linux/of_clk.h | 8 +- + 37 files changed, 1327 insertions(+), 233 deletions(-) + create mode 100644 drivers/clk/at91/at91sam9g45.c + create mode 100644 drivers/clk/at91/at91sam9n12.c + create mode 100644 drivers/clk/at91/sama5d3.c +Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (f8f35a5806f3 csky: Fixup init_fpu compile warning with __init) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/abiv2/fpu.c | 5 ----- + arch/csky/abiv2/inc/abi/fpu.h | 3 ++- + arch/csky/kernel/smp.c | 3 +++ + 3 files changed, 5 insertions(+), 6 deletions(-) +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 (86cded5fc525 m68k: defconfig: Update defconfigs for v5.6-rc4) +$ git merge m68k/for-next +Removing arch/m68k/include/asm/hardirq.h +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.bus | 2 +- + arch/m68k/Kconfig.debug | 16 +-- + arch/m68k/Kconfig.machine | 8 +- + arch/m68k/configs/amiga_defconfig | 5 +- + arch/m68k/configs/apollo_defconfig | 5 +- + arch/m68k/configs/atari_defconfig | 5 +- + arch/m68k/configs/bvme6000_defconfig | 5 +- + arch/m68k/configs/hp300_defconfig | 5 +- + arch/m68k/configs/mac_defconfig | 5 +- + arch/m68k/configs/multi_defconfig | 5 +- + arch/m68k/configs/mvme147_defconfig | 5 +- + arch/m68k/configs/mvme16x_defconfig | 5 +- + arch/m68k/configs/q40_defconfig | 5 +- + arch/m68k/configs/sun3_defconfig | 5 +- + arch/m68k/configs/sun3x_defconfig | 5 +- + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/asm/hardirq.h | 29 ---- + arch/m68k/include/asm/mcf_pgalloc.h | 31 ++--- + arch/m68k/include/asm/motorola_pgalloc.h | 74 ++++------ + arch/m68k/include/asm/motorola_pgtable.h | 36 +++-- + arch/m68k/include/asm/page.h | 16 ++- + arch/m68k/include/asm/pgtable_mm.h | 10 +- + arch/m68k/mm/init.c | 34 +++-- + arch/m68k/mm/kmap.c | 36 +++-- + arch/m68k/mm/memory.c | 103 -------------- + arch/m68k/mm/motorola.c | 228 +++++++++++++++++++++++++------ + drivers/dio/dio-driver.c | 9 +- + drivers/video/fbdev/c2p_core.h | 12 +- + drivers/zorro/zorro-driver.c | 16 +-- + drivers/zorro/zorro.c | 2 +- + drivers/zorro/zorro.h | 7 + + include/linux/dio.h | 5 - + include/linux/zorro.h | 12 -- + 33 files changed, 351 insertions(+), 396 deletions(-) + delete mode 100644 arch/m68k/include/asm/hardirq.h +Merging m68knommu/for-next (4e9c3950ce09 m68k: Replace setup_irq() by request_irq()) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/68000/timers.c | 16 +++++++--------- + arch/m68k/coldfire/pit.c | 16 +++++++--------- + arch/m68k/coldfire/sltimers.c | 29 +++++++++++++++-------------- + arch/m68k/coldfire/timers.c | 31 +++++++++++++++---------------- + 4 files changed, 44 insertions(+), 48 deletions(-) +Merging microblaze/next (9fd1a1c9b3f2 microblaze: Replace setup_irq() by request_irq()) +$ git merge microblaze/next +Removing arch/microblaze/include/asm/user.h +Removing arch/microblaze/include/asm/tlb.h +Removing arch/microblaze/include/asm/hw_irq.h +Removing arch/microblaze/include/asm/cputable.h +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/Kbuild | 4 ++- + arch/microblaze/include/asm/barrier.h | 13 +++++++++ + arch/microblaze/include/asm/cache.h | 5 +--- + arch/microblaze/include/asm/cacheflush.h | 6 +--- + arch/microblaze/include/asm/checksum.h | 5 +--- + arch/microblaze/include/asm/cmpxchg.h | 40 ++------------------------- + arch/microblaze/include/asm/cpuinfo.h | 5 +--- + arch/microblaze/include/asm/cputable.h | 1 - + arch/microblaze/include/asm/current.h | 5 +--- + arch/microblaze/include/asm/delay.h | 7 +---- + arch/microblaze/include/asm/dma.h | 5 +--- + arch/microblaze/include/asm/elf.h | 5 +--- + arch/microblaze/include/asm/entry.h | 5 +--- + arch/microblaze/include/asm/exceptions.h | 5 +--- + arch/microblaze/include/asm/fixmap.h | 5 +--- + arch/microblaze/include/asm/flat.h | 5 +--- + arch/microblaze/include/asm/hw_irq.h | 1 - + arch/microblaze/include/asm/io.h | 5 +--- + arch/microblaze/include/asm/irq.h | 5 +--- + arch/microblaze/include/asm/irqflags.h | 5 +--- + arch/microblaze/include/asm/mmu.h | 5 +--- + arch/microblaze/include/asm/mmu_context_mm.h | 5 +--- + arch/microblaze/include/asm/module.h | 5 +--- + arch/microblaze/include/asm/page.h | 5 +--- + arch/microblaze/include/asm/pgalloc.h | 5 +--- + arch/microblaze/include/asm/pgtable.h | 5 +--- + arch/microblaze/include/asm/processor.h | 5 +--- + arch/microblaze/include/asm/ptrace.h | 5 +--- + arch/microblaze/include/asm/pvr.h | 5 +--- + arch/microblaze/include/asm/registers.h | 5 +--- + arch/microblaze/include/asm/sections.h | 5 +--- + arch/microblaze/include/asm/setup.h | 7 +---- + arch/microblaze/include/asm/string.h | 5 +--- + arch/microblaze/include/asm/switch_to.h | 5 +--- + arch/microblaze/include/asm/thread_info.h | 5 +--- + arch/microblaze/include/asm/timex.h | 5 +--- + arch/microblaze/include/asm/tlb.h | 17 ------------ + arch/microblaze/include/asm/tlbflush.h | 5 +--- + arch/microblaze/include/asm/uaccess.h | 5 +--- + arch/microblaze/include/asm/unaligned.h | 5 +--- + arch/microblaze/include/asm/unistd.h | 5 +--- + arch/microblaze/include/asm/unwind.h | 5 +--- + arch/microblaze/include/asm/user.h | 1 - + arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 7 +---- + arch/microblaze/kernel/cpu/pvr.c | 1 + + arch/microblaze/kernel/entry.S | 1 + + arch/microblaze/kernel/misc.S | 3 +- + arch/microblaze/kernel/setup.c | 2 -- + arch/microblaze/kernel/timer.c | 10 ++----- + arch/microblaze/kernel/vmlinux.lds.S | 3 ++ + arch/microblaze/mm/init.c | 14 ++-------- + 51 files changed, 67 insertions(+), 236 deletions(-) + create mode 100644 arch/microblaze/include/asm/barrier.h + delete mode 100644 arch/microblaze/include/asm/cputable.h + delete mode 100644 arch/microblaze/include/asm/hw_irq.h + delete mode 100644 arch/microblaze/include/asm/tlb.h + delete mode 100644 arch/microblaze/include/asm/user.h +Merging mips/mips-next (ac8fd122e070 MIPS: Replace setup_irq() by request_irq()) +$ git merge mips/mips-next +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 2 +- + arch/mips/alchemy/common/time.c | 11 +- + arch/mips/ar7/irq.c | 16 +- + arch/mips/ath25/ar2315.c | 9 +- + arch/mips/ath25/ar5312.c | 9 +- + arch/mips/ath79/setup.c | 2 +- + arch/mips/bcm63xx/irq.c | 41 ++-- + arch/mips/bmips/setup.c | 2 +- + arch/mips/cavium-octeon/octeon-irq.c | 3 + + arch/mips/cobalt/irq.c | 18 +- + arch/mips/configs/ar7_defconfig | 1 - + arch/mips/configs/ath25_defconfig | 1 - + arch/mips/configs/ath79_defconfig | 1 - + arch/mips/configs/bcm63xx_defconfig | 2 - + arch/mips/configs/bmips_be_defconfig | 2 - + arch/mips/configs/bmips_stb_defconfig | 2 - + arch/mips/configs/db1xxx_defconfig | 1 - + arch/mips/configs/generic/board-ni169445.config | 1 - + arch/mips/configs/jazz_defconfig | 267 +-------------------- + arch/mips/configs/lasat_defconfig | 2 - + arch/mips/configs/lemote2f_defconfig | 2 +- + arch/mips/configs/loongson3_defconfig | 5 +- + arch/mips/configs/msp71xx_defconfig | 2 - + arch/mips/configs/pnx8335_stb225_defconfig | 2 - + arch/mips/configs/rb532_defconfig | 1 - + arch/mips/configs/rt305x_defconfig | 1 - + arch/mips/configs/xway_defconfig | 1 - + arch/mips/dec/setup.c | 59 ++--- + arch/mips/emma/markeins/irq.c | 21 +- + arch/mips/generic/init.c | 2 +- + arch/mips/include/asm/sni.h | 4 +- + arch/mips/jazz/irq.c | 12 +- + arch/mips/jz4740/time.c | 2 +- + arch/mips/kernel/cevt-bcm1480.c | 11 +- + arch/mips/kernel/cevt-ds1287.c | 9 +- + arch/mips/kernel/cevt-gt641xx.c | 9 +- + arch/mips/kernel/cevt-r4k.c | 4 +- + arch/mips/kernel/cevt-sb1250.c | 11 +- + arch/mips/kernel/cevt-txx9.c | 11 +- + arch/mips/kernel/i8253.c | 11 +- + arch/mips/kernel/rtlx-mt.c | 8 +- + arch/mips/kernel/smp.c | 33 +-- + arch/mips/lasat/interrupt.c | 10 +- + arch/mips/loongson2ef/common/bonito-irq.c | 9 +- + arch/mips/loongson2ef/common/cs5536/cs5536_mfgpt.c | 10 +- + arch/mips/loongson2ef/fuloong-2e/irq.c | 16 +- + arch/mips/loongson2ef/lemote-2f/irq.c | 20 +- + arch/mips/loongson32/common/irq.c | 21 +- + arch/mips/loongson32/common/time.c | 12 +- + arch/mips/loongson64/hpet.c | 10 +- + arch/mips/mm/c-octeon.c | 18 +- + arch/mips/mm/c-r3k.c | 4 +- + arch/mips/mm/c-r4k.c | 20 +- + arch/mips/mm/c-tx39.c | 4 +- + arch/mips/mti-malta/malta-int.c | 10 +- + arch/mips/netlogic/xlr/fmn.c | 11 +- + arch/mips/pic32/pic32mzda/time.c | 4 +- + arch/mips/pistachio/time.c | 2 +- + arch/mips/pmcs-msp71xx/msp_irq.c | 28 +-- + arch/mips/pmcs-msp71xx/msp_smp.c | 22 +- + arch/mips/pmcs-msp71xx/msp_time.c | 8 +- + arch/mips/ralink/cevt-rt3352.c | 18 +- + arch/mips/ralink/timer-gic.c | 2 +- + arch/mips/sgi-ip22/ip22-eisa.c | 10 +- + arch/mips/sgi-ip22/ip22-int.c | 49 ++-- + arch/mips/sgi-ip32/ip32-irq.c | 18 +- + arch/mips/sni/a20r.c | 4 +- + arch/mips/sni/irq.c | 8 +- + arch/mips/sni/pcit.c | 8 +- + arch/mips/sni/rm200.c | 23 +- + arch/mips/sni/time.c | 12 +- + arch/mips/vr41xx/common/irq.c | 9 +- + drivers/video/fbdev/g364fb.c | 29 +-- + 73 files changed, 294 insertions(+), 749 deletions(-) +Merging nds32/next (d785c5a324cd nds32: configs: Cleanup CONFIG_CROSS_COMPILE) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/time.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +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 (d95b56c77efd openrisc: Cleanup copy_thread_tls docs and comments) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + Documentation/openrisc/openrisc_port.rst | 4 ++-- + arch/openrisc/Kconfig | 1 + + arch/openrisc/configs/or1ksim_defconfig | 1 - + arch/openrisc/configs/simple_smp_defconfig | 1 - + arch/openrisc/include/uapi/asm/unistd.h | 1 + + arch/openrisc/kernel/process.c | 18 ++++++------------ + arch/openrisc/kernel/smp.c | 3 ++- + 7 files changed, 12 insertions(+), 17 deletions(-) +Merging parisc-hd/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (247257b03b04 powerpc/numa: Remove late request for home node associativity) +$ git merge powerpc/next +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/mm/kasan/kasan_init_32.c +Auto-merging arch/powerpc/mm/book3s32/mmu.c +Auto-merging arch/powerpc/mm/book3s32/hash_low.S +Auto-merging arch/powerpc/kernel/head_32.h +Auto-merging arch/powerpc/kernel/entry_32.S +Merge made by the 'recursive' strategy. + .../ABI/obsolete/sysfs-kernel-fadump_enabled | 9 + + .../ABI/obsolete/sysfs-kernel-fadump_registered | 10 + + .../ABI/obsolete/sysfs-kernel-fadump_release_mem | 10 + + .../removed/sysfs-kernel-fadump_release_opalcore | 9 + + Documentation/ABI/testing/sysfs-kernel-fadump | 40 +++ + Documentation/powerpc/firmware-assisted-dump.rst | 32 +- + arch/powerpc/Makefile | 6 + + arch/powerpc/boot/Makefile | 2 + + arch/powerpc/include/asm/book3s/32/pgtable.h | 6 +- + arch/powerpc/include/asm/drmem.h | 4 +- + arch/powerpc/include/asm/kvm_host.h | 3 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 6 +- + arch/powerpc/include/asm/opal-api.h | 1 + + arch/powerpc/include/asm/perf_event.h | 2 +- + arch/powerpc/include/asm/pgtable.h | 17 + + arch/powerpc/include/asm/reg.h | 4 +- + arch/powerpc/include/asm/topology.h | 10 +- + arch/powerpc/kernel/entry_32.S | 38 +- + arch/powerpc/kernel/fadump.c | 134 +++++--- + arch/powerpc/kernel/head_32.h | 28 +- + arch/powerpc/kernel/head_booke.h | 5 +- + arch/powerpc/kernel/irq.c | 9 +- + arch/powerpc/kernel/misc.S | 4 +- + arch/powerpc/kernel/process.c | 4 +- + arch/powerpc/kernel/setup-common.c | 3 +- + arch/powerpc/kernel/smp.c | 35 +- + arch/powerpc/kernel/stacktrace.c | 6 +- + arch/powerpc/kernel/sysfs.c | 381 +++++++++++---------- + arch/powerpc/kernel/traps.c | 25 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 5 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 5 +- + arch/powerpc/kvm/book3s_hv.c | 9 +- + arch/powerpc/kvm/timing.c | 17 +- + arch/powerpc/mm/book3s32/hash_low.S | 13 +- + arch/powerpc/mm/book3s32/mmu.c | 2 +- + arch/powerpc/mm/book3s32/tlb.c | 11 +- + arch/powerpc/mm/book3s64/hash_utils.c | 7 +- + arch/powerpc/mm/book3s64/iommu_api.c | 39 ++- + arch/powerpc/mm/kasan/kasan_init_32.c | 8 +- + arch/powerpc/mm/mem.c | 6 - + arch/powerpc/mm/nohash/40x.c | 4 +- + arch/powerpc/mm/numa.c | 97 ++++-- + arch/powerpc/mm/pgtable_32.c | 41 +-- + arch/powerpc/mm/ptdump/bats.c | 8 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 7 +- + arch/powerpc/mm/ptdump/ptdump.c | 8 +- + arch/powerpc/mm/ptdump/segment_regs.c | 8 +- + arch/powerpc/platforms/83xx/km83xx.c | 9 +- + arch/powerpc/platforms/Kconfig.cputype | 6 + + arch/powerpc/platforms/cell/axon_msi.c | 6 +- + arch/powerpc/platforms/powernv/memtrace.c | 7 - + arch/powerpc/platforms/powernv/opal-core.c | 55 ++- + arch/powerpc/platforms/powernv/opal-imc.c | 24 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 5 - + arch/powerpc/platforms/powernv/setup.c | 4 +- + arch/powerpc/platforms/powernv/vas-debug.c | 37 +- + arch/powerpc/platforms/pseries/Makefile | 2 - + arch/powerpc/platforms/pseries/hotplug-memory.c | 8 +- + arch/powerpc/platforms/pseries/papr_scm.c | 5 +- + arch/powerpc/platforms/pseries/vio.c | 2 - + arch/powerpc/platforms/pseries/vphn.c | 3 +- + fs/sysfs/group.c | 28 +- + include/linux/sysfs.h | 12 + + 63 files changed, 796 insertions(+), 555 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-kernel-fadump_enabled + create mode 100644 Documentation/ABI/obsolete/sysfs-kernel-fadump_registered + create mode 100644 Documentation/ABI/obsolete/sysfs-kernel-fadump_release_mem + create mode 100644 Documentation/ABI/removed/sysfs-kernel-fadump_release_opalcore + create mode 100644 Documentation/ABI/testing/sysfs-kernel-fadump +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (6a7f10c79574 soc: fsl: dpio: fix dereference of pointer p before null check) +$ git merge soc-fsl/next +Merge made by the 'recursive' strategy. + drivers/soc/fsl/dpio/dpio-service.c | 69 +++- + drivers/soc/fsl/dpio/qbman-portal.c | 767 ++++++++++++++++++++++++++++++++---- + drivers/soc/fsl/dpio/qbman-portal.h | 158 +++++++- + include/soc/fsl/dpaa2-io.h | 6 +- + 4 files changed, 908 insertions(+), 92 deletions(-) +Merging risc-v/for-next (9f40b6e77d2f RISC-V: Move all address space definition macros to one place) +$ git merge risc-v/for-next +Auto-merging arch/riscv/kernel/entry.S +Auto-merging arch/riscv/configs/rv32_defconfig +Auto-merging arch/riscv/configs/defconfig +Merge made by the 'recursive' strategy. + arch/riscv/configs/defconfig | 1 + + arch/riscv/configs/rv32_defconfig | 1 + + arch/riscv/include/asm/cacheflush.h | 2 +- + arch/riscv/include/asm/current.h | 5 +- + arch/riscv/include/asm/pgtable.h | 78 ++++++++++---------- + arch/riscv/kernel/entry.S | 143 +++++++++++++++--------------------- + arch/riscv/kernel/process.c | 5 +- + arch/riscv/kernel/setup.c | 8 +- + arch/riscv/kernel/stacktrace.c | 7 +- + arch/riscv/kernel/vmlinux.lds.S | 1 - + arch/riscv/lib/uaccess.S | 6 +- + arch/riscv/mm/hugetlbpage.c | 6 +- + 12 files changed, 125 insertions(+), 138 deletions(-) +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 (bb533ec8bacd s390/config: do not select VIRTIO_CONSOLE via Kconfig) +$ git merge s390/features +Auto-merging drivers/s390/cio/qdio_setup.c +Removing arch/s390/numa/toptree.h +Removing arch/s390/numa/toptree.c +Removing arch/s390/numa/numa_mode.h +Removing arch/s390/numa/mode_emu.c +Auto-merging arch/s390/include/asm/processor.h +Auto-merging arch/s390/include/asm/page.h +Auto-merging arch/s390/configs/defconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + arch/s390/Kconfig | 63 +--- + arch/s390/appldata/appldata_os.c | 2 +- + arch/s390/boot/install.sh | 17 +- + arch/s390/configs/debug_defconfig | 1 + + arch/s390/configs/defconfig | 1 + + arch/s390/crypto/aes_s390.c | 3 + + arch/s390/include/asm/hw_irq.h | 1 - + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/numa.h | 13 +- + arch/s390/include/asm/page.h | 18 +- + arch/s390/include/asm/pci.h | 2 + + arch/s390/include/asm/processor.h | 1 + + arch/s390/include/asm/setup.h | 7 + + arch/s390/include/asm/topology.h | 9 +- + arch/s390/kernel/asm-offsets.c | 2 + + arch/s390/kernel/entry.S | 65 ++-- + arch/s390/kernel/irq.c | 26 +- + arch/s390/kernel/perf_cpum_cf_events.c | 123 ++++++- + arch/s390/kernel/perf_cpum_sf.c | 40 +-- + arch/s390/kernel/process.c | 1 + + arch/s390/kernel/processor.c | 22 ++ + arch/s390/kernel/setup.c | 4 + + arch/s390/kernel/smp.c | 2 + + arch/s390/kernel/topology.c | 2 - + arch/s390/kernel/traps.c | 2 +- + arch/s390/mm/fault.c | 10 +- + arch/s390/mm/vmem.c | 4 + + arch/s390/numa/Makefile | 2 - + arch/s390/numa/mode_emu.c | 577 --------------------------------- + arch/s390/numa/numa.c | 147 +-------- + arch/s390/numa/numa_mode.h | 25 -- + arch/s390/numa/toptree.c | 351 -------------------- + arch/s390/numa/toptree.h | 61 ---- + drivers/pci/hotplug/s390_pci_hpc.c | 99 ++---- + drivers/s390/block/dasd_diag.c | 2 +- + drivers/s390/block/dasd_eckd.h | 2 +- + drivers/s390/char/raw3270.h | 2 +- + drivers/s390/char/sclp_cmd.c | 2 +- + drivers/s390/char/sclp_pci.c | 2 +- + drivers/s390/cio/airq.c | 8 +- + drivers/s390/cio/cio.c | 8 +- + drivers/s390/cio/idset.c | 2 +- + drivers/s390/cio/qdio.h | 4 +- + drivers/s390/cio/qdio_debug.c | 53 +-- + drivers/s390/cio/qdio_main.c | 13 +- + drivers/s390/cio/qdio_setup.c | 25 +- + drivers/s390/crypto/pkey_api.c | 2 +- + drivers/s390/crypto/zcrypt_ccamisc.c | 25 +- + drivers/s390/crypto/zcrypt_ccamisc.h | 2 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 2 +- + 51 files changed, 390 insertions(+), 1475 deletions(-) + delete mode 100644 arch/s390/numa/mode_emu.c + delete mode 100644 arch/s390/numa/numa_mode.h + delete mode 100644 arch/s390/numa/toptree.c + delete mode 100644 arch/s390/numa/toptree.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 (2ef7e1268525 Merge branch 'xtensa-5.6-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/boot/Makefile | 1 - + arch/xtensa/kernel/smp.c | 8 ++------ + arch/xtensa/kernel/time.c | 12 +++++------- + 3 files changed, 7 insertions(+), 14 deletions(-) +Merging fscrypt/master (98d54f81e36b Linux 5.6-rc4) +$ 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 (a3b6a332e1ad Merge branch 'for-next-next-v5.6-20200311' into for-next-20200311) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 2 +- + fs/btrfs/async-thread.c | 8 + + fs/btrfs/async-thread.h | 1 + + fs/btrfs/backref.c | 181 ++++---- + fs/btrfs/backref.h | 4 + + fs/btrfs/block-group.c | 85 ++-- + fs/btrfs/block-rsv.c | 105 ++++- + fs/btrfs/block-rsv.h | 12 +- + fs/btrfs/btrfs_inode.h | 6 + + fs/btrfs/check-integrity.c | 200 ++------- + fs/btrfs/check-integrity.h | 2 - + fs/btrfs/ctree.c | 74 +--- + fs/btrfs/ctree.h | 82 ++-- + fs/btrfs/delalloc-space.c | 106 ++++- + fs/btrfs/delayed-inode.c | 11 +- + fs/btrfs/delayed-inode.h | 2 +- + fs/btrfs/delayed-ref.c | 3 +- + fs/btrfs/dev-replace.c | 44 +- + fs/btrfs/disk-io.c | 913 ++++++++++++++++++++------------------- + fs/btrfs/disk-io.h | 34 +- + fs/btrfs/export.c | 32 +- + fs/btrfs/export.h | 5 + + fs/btrfs/extent-io-tree.h | 7 +- + fs/btrfs/extent-tree.c | 489 +++++++++++---------- + fs/btrfs/extent_io.c | 204 ++++++--- + fs/btrfs/extent_io.h | 11 +- + fs/btrfs/file-item.c | 131 +++++- + fs/btrfs/file.c | 79 ++-- + fs/btrfs/free-space-cache.c | 43 +- + fs/btrfs/free-space-tree.c | 4 +- + fs/btrfs/inode-map.c | 2 +- + fs/btrfs/inode.c | 154 +++++-- + fs/btrfs/ioctl.c | 972 ++++++++---------------------------------- + fs/btrfs/locking.c | 135 ++++++ + fs/btrfs/locking.h | 20 + + fs/btrfs/ordered-data.c | 140 +----- + fs/btrfs/ordered-data.h | 10 +- + fs/btrfs/props.c | 2 +- + fs/btrfs/qgroup.c | 28 +- + fs/btrfs/raid56.c | 41 +- + fs/btrfs/rcu-string.h | 2 +- + fs/btrfs/reflink.c | 804 ++++++++++++++++++++++++++++++++++ + fs/btrfs/reflink.h | 12 + + fs/btrfs/relocation.c | 591 ++++++++++++------------- + fs/btrfs/root-tree.c | 43 +- + fs/btrfs/scrub.c | 7 +- + fs/btrfs/send.c | 79 +--- + fs/btrfs/space-info.c | 203 ++++++++- + fs/btrfs/space-info.h | 7 + + fs/btrfs/super.c | 35 +- + fs/btrfs/sysfs.c | 16 +- + fs/btrfs/sysfs.h | 4 +- + fs/btrfs/tests/btrfs-tests.c | 44 +- + fs/btrfs/tests/qgroup-tests.c | 2 + + fs/btrfs/transaction.c | 113 +++-- + fs/btrfs/transaction.h | 13 + + fs/btrfs/tree-log.c | 486 ++++++++++++--------- + fs/btrfs/uuid-tree.c | 57 ++- + fs/btrfs/volumes.c | 774 +++++++++++++++++---------------- + fs/btrfs/volumes.h | 12 +- + include/linux/uuid.h | 22 +- + include/trace/events/btrfs.h | 6 +- + include/uapi/linux/btrfs.h | 28 +- + lib/uuid.c | 10 + + 64 files changed, 4350 insertions(+), 3404 deletions(-) + create mode 100644 fs/btrfs/reflink.c + create mode 100644 fs/btrfs/reflink.h +Merging ceph/master (3b20bc2fe4c0 ceph: noacl mount option is effectively ignored) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (6f5a333ac1d3 CIFS: Increment num_remote_opens stats counter even in case of smb2_query_dir_first) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsacl.c | 5 +- + fs/cifs/cifsfs.c | 4 +- + fs/cifs/cifspdu.h | 19 ++--- + fs/cifs/cifsproto.h | 5 ++ + fs/cifs/cifssmb.c | 22 ++++-- + fs/cifs/connect.c | 89 +++++++---------------- + fs/cifs/dfs_cache.c | 38 ++++++++++ + fs/cifs/dfs_cache.h | 4 ++ + fs/cifs/inode.c | 49 ++++++++----- + fs/cifs/link.c | 4 +- + fs/cifs/misc.c | 80 +++++++++++++++++++++ + fs/cifs/readdir.c | 82 +++++++++++++++++++++ + fs/cifs/smb2file.c | 9 ++- + fs/cifs/smb2ops.c | 28 +++++--- + fs/cifs/smb2pdu.c | 202 +++++++++++++++++++++++++++++++++++++++++++++------- + fs/cifs/smb2pdu.h | 95 +++++++++++++++++------- + fs/cifs/smb2proto.h | 7 +- + 17 files changed, 579 insertions(+), 163 deletions(-) +Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (aa99a76b40d6 erofs: handle corrupted images whose decompressed size less than it'd be) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/decompressor.c | 22 ++++++++---- + fs/erofs/internal.h | 8 ++--- + fs/erofs/super.c | 2 +- + fs/erofs/utils.c | 90 ++++++++++++++++++------------------------------- + fs/erofs/zdata.c | 76 +++++++++++++++++++++-------------------- + 5 files changed, 93 insertions(+), 105 deletions(-) +Merging ext3/for_next (bc36dfffd5f3 ext2: Silence lockdep warning about reclaim under xattr_sem) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/xattr.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) +Merging ext4/dev (dce8e237100f ext4: fix a data race at inode->i_disksize) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 5 +-- + fs/ext4/ext4_jbd2.c | 1 + + fs/ext4/extents.c | 117 +++++++--------------------------------------------- + fs/ext4/file.c | 1 + + fs/ext4/inode.c | 6 +-- + fs/ext4/ioctl.c | 12 ------ + fs/ext4/mballoc.c | 6 ++- + fs/ext4/namei.c | 4 +- + fs/ext4/super.c | 13 ++---- + fs/jbd2/commit.c | 7 ++-- + 10 files changed, 36 insertions(+), 136 deletions(-) +Merging f2fs/dev (2536ac6872e5 f2fs: allow to clear F2FS_COMPR_FL flag) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 34 +++++++++++----------------------- + fs/f2fs/compress.c | 24 ++++++++++++++---------- + fs/f2fs/data.c | 23 ++++++++--------------- + fs/f2fs/f2fs.h | 18 ++++++++++-------- + fs/f2fs/file.c | 40 +++++++++++++++++++++++++--------------- + fs/f2fs/gc.c | 5 ++++- + fs/f2fs/inode.c | 25 +++++++++++++++++++++---- + fs/f2fs/namei.c | 2 +- + fs/f2fs/node.c | 18 ++++++++---------- + fs/f2fs/shrinker.c | 2 +- + fs/f2fs/super.c | 7 ++++--- + fs/f2fs/xattr.c | 3 --- + 12 files changed, 107 insertions(+), 94 deletions(-) +Merging fsverity/fsverity (98d54f81e36b Linux 5.6-rc4) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (3e8cb8b2eaeb fuse: fix stack use after return) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 6 +++--- + fs/fuse/fuse_i.h | 2 ++ + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_dtree.c | 2 +- + fs/jfs/jfs_xattr.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging nfs/linux-next (2c523b344dfa Linux 5.6-rc5) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (55dee1bc0d72 nfs: add minor version to nfs_server_key for fscache) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/client.c | 1 + + fs/nfs/fs_context.c | 9 +++++++++ + fs/nfs/fscache.c | 2 ++ + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs4client.c | 1 - + 5 files changed, 13 insertions(+), 2 deletions(-) +Merging nfsd/nfsd-next (2653de9f0398 fs: nfsd: fileache.c: Use built-in RCU list checking) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/filecache.c | 2 +- + fs/nfsd/netns.h | 2 ++ + fs/nfsd/nfs4state.c | 3 ++- + fs/nfsd/nfs4xdr.c | 9 +++++---- + fs/nfsd/nfssvc.c | 3 +++ + include/linux/sunrpc/svc.h | 2 +- + net/sunrpc/cache.c | 3 ++- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 2 +- + 8 files changed, 17 insertions(+), 9 deletions(-) +Merging orangefs/for-next (9f198a2ac543 help_next should increase position index) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (c2e87fd93396 ovl: allow remote upper) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 44 ++++++++++ + fs/overlayfs/copy_up.c | 16 +++- + fs/overlayfs/dir.c | 3 + + fs/overlayfs/export.c | 2 + + fs/overlayfs/inode.c | 39 +++++++-- + fs/overlayfs/namei.c | 5 +- + fs/overlayfs/overlayfs.h | 7 +- + fs/overlayfs/super.c | 141 ++++++++++++++++++-------------- + fs/overlayfs/util.c | 38 ++++----- + 9 files changed, 194 insertions(+), 101 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 (17bb60b74124 xfs: Use scnprintf() for avoiding potential buffer overflow) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_ag.c | 16 +- + fs/xfs/libxfs/xfs_alloc.c | 81 +++++---- + fs/xfs/libxfs/xfs_alloc.h | 9 + + fs/xfs/libxfs/xfs_alloc_btree.c | 10 +- + fs/xfs/libxfs/xfs_attr.c | 351 +++++++++++++------------------------ + fs/xfs/libxfs/xfs_attr.h | 114 +++--------- + fs/xfs/libxfs/xfs_attr_leaf.c | 125 ++++++------- + fs/xfs/libxfs/xfs_attr_leaf.h | 1 - + fs/xfs/libxfs/xfs_attr_remote.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 32 +--- + fs/xfs/libxfs/xfs_bmap.h | 3 +- + fs/xfs/libxfs/xfs_btree.c | 2 +- + fs/xfs/libxfs/xfs_da_btree.c | 13 +- + fs/xfs/libxfs/xfs_da_btree.h | 11 +- + fs/xfs/libxfs/xfs_da_format.h | 12 -- + fs/xfs/libxfs/xfs_dir2_block.c | 33 +++- + fs/xfs/libxfs/xfs_dir2_data.c | 32 +++- + fs/xfs/libxfs/xfs_dir2_leaf.c | 2 +- + fs/xfs/libxfs/xfs_dir2_node.c | 11 +- + fs/xfs/libxfs/xfs_format.h | 15 +- + fs/xfs/libxfs/xfs_fs.h | 32 +++- + fs/xfs/libxfs/xfs_ialloc.c | 27 ++- + fs/xfs/libxfs/xfs_ialloc_btree.c | 10 +- + fs/xfs/libxfs/xfs_inode_buf.c | 8 +- + fs/xfs/libxfs/xfs_inode_buf.h | 2 - + fs/xfs/libxfs/xfs_refcount_btree.c | 12 +- + fs/xfs/libxfs/xfs_rmap.c | 13 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 12 +- + fs/xfs/libxfs/xfs_sb.c | 17 +- + fs/xfs/scrub/agheader.c | 20 +-- + fs/xfs/scrub/agheader_repair.c | 26 +-- + fs/xfs/scrub/attr.c | 20 +-- + fs/xfs/scrub/dir.c | 3 + + fs/xfs/scrub/repair.c | 8 +- + fs/xfs/xfs_acl.c | 132 +++++++------- + fs/xfs/xfs_acl.h | 6 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_attr_inactive.c | 6 +- + fs/xfs/xfs_attr_list.c | 169 +++--------------- + fs/xfs/xfs_bmap_util.c | 57 +++--- + fs/xfs/xfs_buf.c | 29 ++- + fs/xfs/xfs_buf.h | 2 + + fs/xfs/xfs_discard.c | 7 +- + fs/xfs/xfs_dquot.c | 4 +- + fs/xfs/xfs_error.c | 7 +- + fs/xfs/xfs_error.h | 2 +- + fs/xfs/xfs_icache.c | 4 + + fs/xfs/xfs_inode.c | 28 ++- + fs/xfs/xfs_inode_item.c | 4 +- + fs/xfs/xfs_ioctl.c | 347 +++++++++++++++++++++++------------- + fs/xfs/xfs_ioctl.h | 35 ++-- + fs/xfs/xfs_ioctl32.c | 99 ++--------- + fs/xfs/xfs_iops.c | 23 ++- + fs/xfs/xfs_itable.c | 4 +- + fs/xfs/xfs_linux.h | 27 +-- + fs/xfs/xfs_log.c | 13 +- + fs/xfs/xfs_log_recover.c | 12 +- + fs/xfs/xfs_mount.c | 2 +- + fs/xfs/xfs_qm.c | 35 ++-- + fs/xfs/xfs_quota.h | 4 +- + fs/xfs/xfs_stats.c | 10 +- + fs/xfs/xfs_symlink.c | 4 +- + fs/xfs/xfs_trace.h | 63 ++++--- + fs/xfs/xfs_trans.c | 2 +- + fs/xfs/xfs_trans_ail.c | 5 +- + fs/xfs/xfs_xattr.c | 92 ++++------ + 66 files changed, 1033 insertions(+), 1288 deletions(-) +Merging zonefs/for-next (0dda2ddb7ded zonefs: select FS_IOMAP) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (1ac994525b9d iomap: Remove pgoff from tracepoints) +$ git merge iomap/iomap-for-next +Merge made by the 'recursive' strategy. + fs/iomap/buffered-io.c | 7 ++++--- + fs/iomap/trace.h | 27 +++++++++++---------------- + 2 files changed, 15 insertions(+), 19 deletions(-) +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 (e2de130a568c locks: reintroduce locks_delete_lock shortcut) +$ git merge file-locks/locks-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/locking.rst | 2 ++ + fs/locks.c | 29 ++++++++++++++++++++++++++++- + 2 files changed, 30 insertions(+), 1 deletion(-) +Merging vfs/for-next (7440cd5bdd9b Merge branches 'work.do_last' and 'work.exfat' into for-next) +$ git merge vfs/for-next +Auto-merging fs/erofs/zdata.c +Auto-merging fs/erofs/super.c +Auto-merging fs/erofs/internal.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/path-lookup.rst | 7 +- + MAINTAINERS | 7 + + drivers/staging/exfat/Kconfig | 2 +- + fs/Kconfig | 3 +- + fs/Makefile | 1 + + fs/autofs/dev-ioctl.c | 6 +- + fs/erofs/internal.h | 27 +- + fs/erofs/super.c | 251 +++-- + fs/erofs/xattr.c | 4 +- + fs/erofs/zdata.c | 4 +- + fs/exfat/Kconfig | 21 + + fs/exfat/Makefile | 8 + + fs/exfat/balloc.c | 280 ++++++ + fs/exfat/cache.c | 325 +++++++ + fs/exfat/dir.c | 1238 ++++++++++++++++++++++++ + fs/exfat/exfat_fs.h | 519 +++++++++++ + fs/exfat/exfat_raw.h | 184 ++++ + fs/exfat/fatent.c | 463 +++++++++ + fs/exfat/file.c | 360 +++++++ + fs/exfat/inode.c | 671 +++++++++++++ + fs/exfat/misc.c | 163 ++++ + fs/exfat/namei.c | 1448 +++++++++++++++++++++++++++++ + fs/exfat/nls.c | 831 +++++++++++++++++ + fs/exfat/super.c | 722 ++++++++++++++ + fs/internal.h | 1 - + fs/namei.c | 981 ++++++++----------- + fs/namespace.c | 101 +- + fs/open.c | 4 +- + fs/super.c | 2 +- + include/linux/namei.h | 4 +- + 30 files changed, 7828 insertions(+), 810 deletions(-) + create mode 100644 fs/exfat/Kconfig + create mode 100644 fs/exfat/Makefile + create mode 100644 fs/exfat/balloc.c + create mode 100644 fs/exfat/cache.c + create mode 100644 fs/exfat/dir.c + create mode 100644 fs/exfat/exfat_fs.h + create mode 100644 fs/exfat/exfat_raw.h + create mode 100644 fs/exfat/fatent.c + create mode 100644 fs/exfat/file.c + create mode 100644 fs/exfat/inode.c + create mode 100644 fs/exfat/misc.c + create mode 100644 fs/exfat/namei.c + create mode 100644 fs/exfat/nls.c + create mode 100644 fs/exfat/super.c +Merging printk/for-next (d34f14ae521f Merge branch 'for-5.7-preferred-console' into for-next) +$ git merge printk/for-next +Auto-merging include/linux/console.h +Merge made by the 'recursive' strategy. + drivers/accessibility/braille/braille_console.c | 4 - + include/linux/console.h | 3 +- + kernel/printk/console_cmdline.h | 1 + + kernel/printk/printk.c | 177 +++++++++++++++--------- + 4 files changed, 113 insertions(+), 72 deletions(-) +Merging pci/next (a536a320bfa2 Merge branch 'remotes/lorenzo/pci/vmd') +$ git merge pci/next +Auto-merging drivers/pci/controller/pcie-brcmstb.c +Auto-merging Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt +Merge made by the 'recursive' strategy. + Documentation/PCI/boot-interrupts.rst | 155 +++++ + Documentation/PCI/index.rst | 1 + + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 22 +- + .../bindings/pci/nvidia,tegra194-pcie.txt | 125 +++- + .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 35 ++ + .../bindings/phy/amlogic,meson-axg-pcie.yaml | 52 ++ + arch/x86/include/asm/hyperv-tlfs.h | 41 ++ + arch/x86/include/asm/mshyperv.h | 8 + + drivers/misc/pci_endpoint_test.c | 165 ++++- + drivers/pci/controller/dwc/Kconfig | 30 +- + drivers/pci/controller/dwc/pci-meson.c | 116 +--- + drivers/pci/controller/dwc/pcie-designware-ep.c | 79 ++- + drivers/pci/controller/dwc/pcie-designware.h | 11 + + drivers/pci/controller/dwc/pcie-qcom.c | 8 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 679 ++++++++++++++++++++- + drivers/pci/controller/pci-hyperv.c | 260 +++++--- + drivers/pci/controller/pci-tegra.c | 187 ++---- + drivers/pci/controller/pcie-brcmstb.c | 4 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 372 +++++++++-- + drivers/pci/endpoint/pci-ep-cfs.c | 28 +- + drivers/pci/endpoint/pci-epc-core.c | 130 ++-- + drivers/pci/endpoint/pci-epc-mem.c | 10 +- + drivers/pci/endpoint/pci-epf-core.c | 33 +- + drivers/pci/hotplug/pciehp.h | 1 + + drivers/pci/hotplug/pciehp_hpc.c | 53 +- + drivers/pci/pci-acpi.c | 2 +- + drivers/pci/pci-sysfs.c | 27 +- + drivers/pci/pci.c | 23 +- + drivers/pci/pci.h | 19 +- + drivers/pci/probe.c | 40 ++ + drivers/pci/quirks.c | 80 ++- + drivers/pci/slot.c | 38 +- + drivers/phy/amlogic/Kconfig | 22 + + drivers/phy/amlogic/Makefile | 12 +- + .../phy/amlogic/phy-meson-axg-mipi-pcie-analog.c | 188 ++++++ + drivers/phy/amlogic/phy-meson-axg-pcie.c | 192 ++++++ + include/linux/pci-epc.h | 21 +- + include/linux/pci-epf.h | 14 +- + include/linux/pci.h | 2 +- + include/soc/tegra/bpmp-abi.h | 10 +- + include/uapi/linux/pci_regs.h | 2 + + include/uapi/linux/pcitest.h | 5 + + tools/pci/pcitest.c | 20 +- + 43 files changed, 2643 insertions(+), 679 deletions(-) + create mode 100644 Documentation/PCI/boot-interrupts.rst + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie-analog.yaml + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml + create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c + create mode 100644 drivers/phy/amlogic/phy-meson-axg-pcie.c +$ git reset --hard HEAD^ +HEAD is now at 8b9e8b0ba378 Merge remote-tracking branch 'printk/for-next' +Merging next-20200312 version of pci +$ git merge -m next-20200312/pci 432e9e41c3b5b6c4215c68f27d8ec25bffd1262e +Auto-merging drivers/pci/controller/pcie-brcmstb.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/PCI/boot-interrupts.rst | 155 ++++++ + Documentation/PCI/index.rst | 1 + + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 22 +- + .../bindings/pci/layerscape-pcie-gen4.txt | 52 ++ + .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 35 ++ + .../bindings/phy/amlogic,meson-axg-pcie.yaml | 52 ++ + MAINTAINERS | 10 +- + arch/x86/include/asm/hyperv-tlfs.h | 41 ++ + arch/x86/include/asm/mshyperv.h | 8 + + drivers/pci/controller/Kconfig | 11 +- + drivers/pci/controller/Makefile | 2 +- + drivers/pci/controller/dwc/pci-meson.c | 116 +---- + drivers/pci/controller/dwc/pcie-designware-ep.c | 79 ++- + drivers/pci/controller/dwc/pcie-designware.h | 11 + + drivers/pci/controller/dwc/pcie-qcom.c | 8 +- + drivers/pci/controller/mobiveil/Kconfig | 33 ++ + drivers/pci/controller/mobiveil/Makefile | 5 + + .../pci/controller/mobiveil/pcie-layerscape-gen4.c | 267 ++++++++++ + .../pcie-mobiveil-host.c} | 564 +++++---------------- + .../pci/controller/mobiveil/pcie-mobiveil-plat.c | 61 +++ + drivers/pci/controller/mobiveil/pcie-mobiveil.c | 230 +++++++++ + drivers/pci/controller/mobiveil/pcie-mobiveil.h | 226 +++++++++ + drivers/pci/controller/pci-hyperv.c | 260 +++++++--- + drivers/pci/controller/pci-tegra.c | 187 ++----- + drivers/pci/controller/pcie-brcmstb.c | 4 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 121 +++-- + drivers/pci/endpoint/pci-ep-cfs.c | 27 +- + drivers/pci/endpoint/pci-epc-core.c | 130 ++--- + drivers/pci/endpoint/pci-epc-mem.c | 10 +- + drivers/pci/endpoint/pci-epf-core.c | 33 +- + drivers/pci/hotplug/pciehp.h | 1 + + drivers/pci/hotplug/pciehp_hpc.c | 53 +- + drivers/pci/pci-acpi.c | 2 +- + drivers/pci/pci-sysfs.c | 27 +- + drivers/pci/pci.c | 23 +- + drivers/pci/pci.h | 19 +- + drivers/pci/probe.c | 40 ++ + drivers/pci/quirks.c | 80 ++- + drivers/pci/slot.c | 38 +- + drivers/phy/amlogic/Kconfig | 22 + + drivers/phy/amlogic/Makefile | 12 +- + .../phy/amlogic/phy-meson-axg-mipi-pcie-analog.c | 188 +++++++ + drivers/phy/amlogic/phy-meson-axg-pcie.c | 192 +++++++ + include/linux/pci-epc.h | 21 +- + include/linux/pci-epf.h | 14 +- + include/linux/pci.h | 2 +- + include/uapi/linux/pci_regs.h | 2 + + 47 files changed, 2438 insertions(+), 1059 deletions(-) + create mode 100644 Documentation/PCI/boot-interrupts.rst + create mode 100644 Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie-analog.yaml + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml + create mode 100644 drivers/pci/controller/mobiveil/Kconfig + create mode 100644 drivers/pci/controller/mobiveil/Makefile + create mode 100644 drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c + rename drivers/pci/controller/{pcie-mobiveil.c => mobiveil/pcie-mobiveil-host.c} (54%) + create mode 100644 drivers/pci/controller/mobiveil/pcie-mobiveil-plat.c + create mode 100644 drivers/pci/controller/mobiveil/pcie-mobiveil.c + create mode 100644 drivers/pci/controller/mobiveil/pcie-mobiveil.h + create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c + create mode 100644 drivers/phy/amlogic/phy-meson-axg-pcie.c +Merging pstore/for-next/pstore (8128d3aac0ee pstore/ram: Replace zero-length array with flexible-array member) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/inode.c | 5 ++++- + fs/pstore/platform.c | 4 ++-- + fs/pstore/ram.c | 1 - + fs/pstore/ram_core.c | 2 +- + 4 files changed, 7 insertions(+), 5 deletions(-) +Merging hid/for-next (2739dca88ca7 Merge branch 'for-5.6/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + drivers/hid/Kconfig | 10 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-logitech-dj.c | 11 +- + drivers/hid/hid-mcp2221.c | 742 ++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-picolcd_fb.c | 4 +- + drivers/hid/hid-quirks.c | 3 - + drivers/hid/hid-sensor-custom.c | 6 +- + 9 files changed, 775 insertions(+), 10 deletions(-) + create mode 100644 drivers/hid/hid-mcp2221.c +Merging i2c/i2c/for-next (866a8a691e5d Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml | 97 +++++++++++ + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 10 ++ + .../devicetree/bindings/i2c/i2c-brcmstb.txt | 26 --- + Documentation/i2c/smbus-protocol.rst | 2 +- + MAINTAINERS | 2 +- + drivers/i2c/busses/i2c-at91-master.c | 78 +++++++++ + drivers/i2c/busses/i2c-at91.h | 4 + + drivers/i2c/busses/i2c-brcmstb.c | 33 ++++ + drivers/i2c/busses/i2c-designware-pcidrv.c | 1 + + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 45 ++--- + drivers/i2c/busses/i2c-imx.c | 146 +++++++++++----- + drivers/i2c/busses/i2c-omap.c | 4 +- + drivers/i2c/busses/i2c-parport.c | 12 +- + drivers/i2c/busses/i2c-powermac.c | 15 +- + drivers/i2c/busses/i2c-stm32f7.c | 184 +++++++++++++++++---- + drivers/i2c/busses/i2c-thunderx-pcidrv.c | 11 +- + drivers/i2c/busses/i2c-xlp9xx.c | 10 +- + drivers/i2c/i2c-core-smbus.c | 26 +-- + drivers/i2c/i2c-dev.c | 2 +- + drivers/i2c/i2c-slave-eeprom.c | 4 +- + drivers/i2c/i2c-smbus.c | 2 +- + drivers/macintosh/windfarm_ad7417_sensor.c | 7 + + drivers/macintosh/windfarm_fcu_controls.c | 7 + + drivers/macintosh/windfarm_lm75_sensor.c | 16 +- + drivers/macintosh/windfarm_lm87_sensor.c | 7 + + drivers/macintosh/windfarm_max6690_sensor.c | 7 + + drivers/macintosh/windfarm_smu_sat.c | 7 + + drivers/watchdog/iTCO_vendor.h | 2 + + drivers/watchdog/iTCO_vendor_support.c | 16 +- + drivers/watchdog/iTCO_wdt.c | 28 ++-- + include/linux/i2c-smbus.h | 9 +- + 32 files changed, 616 insertions(+), 206 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt +Merging i3c/i3c/next (cd851485ef29 i3c: master: Replace zero-length array with flexible-array member) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/device.c | 50 ++++++++++++++++-------------------- + drivers/i3c/master.c | 26 +++++++++++++++++-- + drivers/i3c/master/dw-i3c-master.c | 2 +- + drivers/i3c/master/i3c-master-cdns.c | 2 +- + scripts/mod/devicetable-offsets.c | 7 +++++ + scripts/mod/file2alias.c | 19 ++++++++++++++ + 6 files changed, 74 insertions(+), 32 deletions(-) +Merging dmi/master (6eaaa9e89719 firmware/dmi: Report DMI Bios & EC firmware release) +$ git merge dmi/master +Auto-merging scripts/mod/file2alias.c +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 6 ++++++ + drivers/firmware/dmi_scan.c | 30 ++++++++++++++++++++++++++++++ + include/linux/mod_devicetable.h | 2 ++ + scripts/mod/file2alias.c | 2 ++ + 4 files changed, 40 insertions(+) +Merging hwmon-staging/hwmon-next (6a096871b2be hwmon: (ibmpowernv) Use scnprintf() for avoiding potential buffer overflow) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/hwmon/adi,axi-fan-control.yaml | 62 +++ + .../devicetree/bindings/hwmon/adt7475.yaml | 84 ++++ + .../devicetree/bindings/hwmon/ltc2978.txt | 22 +- + .../devicetree/bindings/trivial-devices.yaml | 10 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/k10temp.rst | 29 +- + Documentation/hwmon/ltc2978.rst | 198 ++++++--- + Documentation/hwmon/pmbus-core.rst | 22 +- + Documentation/hwmon/pmbus.rst | 8 +- + Documentation/hwmon/tps53679.rst | 178 ++++++++ + MAINTAINERS | 8 + + drivers/hwmon/Kconfig | 9 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adt7475.c | 95 ++++- + drivers/hwmon/axi-fan-control.c | 469 +++++++++++++++++++++ + drivers/hwmon/ibmaem.c | 2 +- + drivers/hwmon/ibmpowernv.c | 8 +- + drivers/hwmon/k10temp.c | 60 +-- + drivers/hwmon/lm73.c | 10 + + drivers/hwmon/pmbus/Kconfig | 15 +- + drivers/hwmon/pmbus/adm1275.c | 37 +- + drivers/hwmon/pmbus/ibm-cffps.c | 15 +- + drivers/hwmon/pmbus/ir35221.c | 23 +- + drivers/hwmon/pmbus/isl68137.c | 3 +- + drivers/hwmon/pmbus/lm25066.c | 39 +- + drivers/hwmon/pmbus/ltc2978.c | 130 +++++- + drivers/hwmon/pmbus/ltc3815.c | 20 +- + drivers/hwmon/pmbus/max16064.c | 7 +- + drivers/hwmon/pmbus/max20730.c | 3 +- + drivers/hwmon/pmbus/max31785.c | 6 +- + drivers/hwmon/pmbus/max34440.c | 25 +- + drivers/hwmon/pmbus/max8688.c | 17 +- + drivers/hwmon/pmbus/pmbus.c | 4 +- + drivers/hwmon/pmbus/pmbus.h | 20 +- + drivers/hwmon/pmbus/pmbus_core.c | 119 ++++-- + drivers/hwmon/pmbus/tps53679.c | 172 +++++++- + drivers/hwmon/pmbus/ucd9000.c | 2 +- + drivers/hwmon/pmbus/xdpe12284.c | 5 +- + drivers/hwmon/pmbus/zl6100.c | 5 +- + 39 files changed, 1659 insertions(+), 284 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/adt7475.yaml + create mode 100644 Documentation/hwmon/tps53679.rst + create mode 100644 drivers/hwmon/axi-fan-control.c +Merging jc_docs/docs-next (7d3d3254adaa docs: fix pointers to io-mapping.rst and io_ordering.rst files) +$ git merge jc_docs/docs-next +Auto-merging net/ipv4/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kbuild/index.rst +CONFLICT (content): Merge conflict in Documentation/kbuild/index.rst +Auto-merging Documentation/filesystems/zonefs.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/zonefs.rst +Removing Documentation/filesystems/omfs.txt +Removing Documentation/filesystems/nfs/nfs41-server.txt +Removing Documentation/filesystems/isofs.txt +Auto-merging Documentation/filesystems/debugfs.rst +Removing Documentation/debugging-modules.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/bootconfig.rst +Auto-merging Documentation/Makefile +Resolved 'Documentation/filesystems/zonefs.rst' using previous resolution. +Resolved 'Documentation/kbuild/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d7b93f893850] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/{testing => removed}/sysfs-kernel-uids | 2 +- + Documentation/Makefile | 2 +- + Documentation/PCI/pci.rst | 2 +- + Documentation/accounting/psi.rst | 2 + + Documentation/admin-guide/binfmt-misc.rst | 4 +- + Documentation/admin-guide/blockdev/zram.rst | 2 - + Documentation/admin-guide/bootconfig.rst | 2 +- + Documentation/admin-guide/cgroup-v1/index.rst | 2 + + Documentation/admin-guide/cgroup-v2.rst | 28 +- + Documentation/{driver-api => admin-guide}/edid.rst | 4 +- + .../admin-guide/hw-vuln/tsx_async_abort.rst | 2 - + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 26 +- + .../admin-guide/kernel-per-CPU-kthreads.rst | 2 +- + Documentation/admin-guide/perf/imx-ddr.rst | 3 +- + Documentation/admin-guide/sysctl/kernel.rst | 1049 ++++++------- + Documentation/arm/tcm.rst | 6 +- + Documentation/core-api/index.rst | 94 +- + .../{kobject.txt => core-api/kobject.rst} | 78 +- + Documentation/debugging-modules.txt | 22 - + Documentation/dev-tools/gcov.rst | 2 +- + Documentation/dev-tools/kmemleak.rst | 3 +- + Documentation/driver-api/driver-model/driver.rst | 2 +- + Documentation/driver-api/index.rst | 4 +- + .../{io-mapping.txt => driver-api/io-mapping.rst} | 0 + .../io_ordering.rst} | 0 + Documentation/{core-api => driver-api}/ioctl.rst | 0 + .../features/vm/pte_special/arch-support.txt | 2 +- + Documentation/filesystems/{9p.txt => 9p.rst} | 114 +- + Documentation/filesystems/{adfs.txt => adfs.rst} | 29 +- + Documentation/filesystems/{affs.txt => affs.rst} | 62 +- + Documentation/filesystems/{afs.txt => afs.rst} | 73 +- + ...-mount-control.txt => autofs-mount-control.rst} | 108 +- + Documentation/filesystems/{befs.txt => befs.rst} | 59 +- + Documentation/filesystems/{bfs.txt => bfs.rst} | 37 +- + Documentation/filesystems/{btrfs.txt => btrfs.rst} | 3 + + Documentation/filesystems/{ceph.txt => ceph.rst} | 26 +- + Documentation/filesystems/cifs/cifsroot.txt | 2 +- + .../filesystems/{cramfs.txt => cramfs.rst} | 19 +- + .../filesystems/{debugfs.txt => debugfs.rst} | 54 +- + Documentation/filesystems/{dlmfs.txt => dlmfs.rst} | 28 +- + .../filesystems/{ecryptfs.txt => ecryptfs.rst} | 44 +- + .../filesystems/{efivarfs.txt => efivarfs.rst} | 5 +- + Documentation/filesystems/{erofs.txt => erofs.rst} | 177 ++- + Documentation/filesystems/{ext2.txt => ext2.rst} | 41 +- + Documentation/filesystems/{ext3.txt => ext3.rst} | 2 + + Documentation/filesystems/{f2fs.txt => f2fs.rst} | 254 ++-- + Documentation/filesystems/fuse.rst | 5 +- + .../{gfs2-uevents.txt => gfs2-uevents.rst} | 20 +- + Documentation/filesystems/{gfs2.txt => gfs2.rst} | 20 +- + Documentation/filesystems/{hfs.txt => hfs.rst} | 23 +- + .../filesystems/{hfsplus.txt => hfsplus.rst} | 2 + + Documentation/filesystems/{hpfs.txt => hpfs.rst} | 239 +-- + Documentation/filesystems/index.rst | 45 + + .../filesystems/{inotify.txt => inotify.rst} | 33 +- + Documentation/filesystems/isofs.rst | 64 + + Documentation/filesystems/isofs.txt | 48 - + Documentation/filesystems/nfs/index.rst | 13 + + .../nfs/{knfsd-stats.txt => knfsd-stats.rst} | 17 +- + Documentation/filesystems/nfs/nfs41-server.rst | 256 ++++ + Documentation/filesystems/nfs/nfs41-server.txt | 173 --- + .../filesystems/nfs/{pnfs.txt => pnfs.rst} | 25 +- + .../nfs/{rpc-cache.txt => rpc-cache.rst} | 136 +- + .../nfs/{rpc-server-gss.txt => rpc-server-gss.rst} | 19 +- + .../filesystems/{nilfs2.txt => nilfs2.rst} | 40 +- + Documentation/filesystems/{ntfs.txt => ntfs.rst} | 145 +- + ...ne-filecheck.txt => ocfs2-online-filecheck.rst} | 45 +- + Documentation/filesystems/{ocfs2.txt => ocfs2.rst} | 31 +- + Documentation/filesystems/omfs.rst | 112 ++ + Documentation/filesystems/omfs.txt | 106 -- + .../filesystems/{orangefs.txt => orangefs.rst} | 187 ++- + Documentation/filesystems/{proc.txt => proc.rst} | 1544 +++++++++++--------- + Documentation/filesystems/{qnx6.txt => qnx6.rst} | 22 + + ...fs-initramfs.txt => ramfs-rootfs-initramfs.rst} | 54 +- + Documentation/filesystems/{relay.txt => relay.rst} | 139 +- + Documentation/filesystems/{romfs.txt => romfs.rst} | 42 +- + .../filesystems/{squashfs.txt => squashfs.rst} | 60 +- + Documentation/filesystems/{sysfs.txt => sysfs.rst} | 324 ++-- + .../filesystems/{sysv-fs.txt => sysv-fs.rst} | 153 +- + Documentation/filesystems/{tmpfs.txt => tmpfs.rst} | 44 +- + Documentation/filesystems/ubifs-authentication.rst | 10 +- + Documentation/filesystems/{ubifs.txt => ubifs.rst} | 25 +- + Documentation/filesystems/{udf.txt => udf.rst} | 21 +- + .../filesystems/{zonefs.txt => zonefs.rst} | 108 +- + Documentation/gpu/i915.rst | 4 +- + Documentation/index.rst | 1 - + Documentation/{core-api => kbuild}/gcc-plugins.rst | 4 + + Documentation/kbuild/index.rst | 1 + + Documentation/kref.txt | 4 + + Documentation/misc-devices/index.rst | 1 + + Documentation/{ => misc-devices}/mic/index.rst | 0 + .../{ => misc-devices}/mic/mic_overview.rst | 0 + .../{ => misc-devices}/mic/scif_overview.rst | 0 + Documentation/process/2.Process.rst | 108 +- + Documentation/process/coding-style.rst | 18 +- + Documentation/process/deprecated.rst | 98 +- + Documentation/process/email-clients.rst | 4 +- + Documentation/process/howto.rst | 17 +- + Documentation/process/kernel-docs.rst | 10 +- + Documentation/process/management-style.rst | 2 +- + Documentation/trace/events.rst | 63 +- + .../translations/it_IT/networking/netdev-FAQ.rst | 2 +- + .../it_IT/process/programming-language.rst | 30 +- + Documentation/translations/zh_CN/io_ordering.txt | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 12 +- + arch/unicore32/include/asm/io.h | 2 +- + fs/nfs/Kconfig | 2 +- + include/linux/io-mapping.h | 2 +- + net/ipv4/Kconfig | 6 +- + net/ipv4/ipconfig.c | 2 +- + scripts/check-sysctl-docs | 181 +++ + scripts/documentation-file-ref-check | 11 +- + scripts/gcc-plugins/Kconfig | 2 +- + scripts/sphinx-pre-install | 17 +- + {Documentation/EDID => tools/edid}/1024x768.S | 0 + {Documentation/EDID => tools/edid}/1280x1024.S | 0 + {Documentation/EDID => tools/edid}/1600x1200.S | 0 + {Documentation/EDID => tools/edid}/1680x1050.S | 0 + {Documentation/EDID => tools/edid}/1920x1080.S | 0 + {Documentation/EDID => tools/edid}/800x600.S | 0 + {Documentation/EDID => tools/edid}/Makefile | 0 + {Documentation/EDID => tools/edid}/edid.S | 0 + {Documentation/EDID => tools/edid}/hex | 0 + 124 files changed, 4295 insertions(+), 3147 deletions(-) + rename Documentation/ABI/{testing => removed}/sysfs-kernel-uids (91%) + rename Documentation/{driver-api => admin-guide}/edid.rst (98%) + rename Documentation/{kobject.txt => core-api/kobject.rst} (87%) + delete mode 100644 Documentation/debugging-modules.txt + rename Documentation/{io-mapping.txt => driver-api/io-mapping.rst} (100%) + rename Documentation/{io_ordering.txt => driver-api/io_ordering.rst} (100%) + rename Documentation/{core-api => driver-api}/ioctl.rst (100%) + rename Documentation/filesystems/{9p.txt => 9p.rst} (63%) + rename Documentation/filesystems/{adfs.txt => adfs.rst} (85%) + rename Documentation/filesystems/{affs.txt => affs.rst} (86%) + rename Documentation/filesystems/{afs.txt => afs.rst} (90%) + rename Documentation/filesystems/{autofs-mount-control.txt => autofs-mount-control.rst} (89%) + rename Documentation/filesystems/{befs.txt => befs.rst} (83%) + rename Documentation/filesystems/{bfs.txt => bfs.rst} (71%) + rename Documentation/filesystems/{btrfs.txt => btrfs.rst} (96%) + rename Documentation/filesystems/{ceph.txt => ceph.rst} (91%) + rename Documentation/filesystems/{cramfs.txt => cramfs.rst} (88%) + rename Documentation/filesystems/{debugfs.txt => debugfs.rst} (91%) + rename Documentation/filesystems/{dlmfs.txt => dlmfs.rst} (86%) + rename Documentation/filesystems/{ecryptfs.txt => ecryptfs.rst} (70%) + rename Documentation/filesystems/{efivarfs.txt => efivarfs.rst} (85%) + rename Documentation/filesystems/{erofs.txt => erofs.rst} (54%) + rename Documentation/filesystems/{ext2.txt => ext2.rst} (91%) + rename Documentation/filesystems/{ext3.txt => ext3.rst} (88%) + rename Documentation/filesystems/{f2fs.txt => f2fs.rst} (84%) + rename Documentation/filesystems/{gfs2-uevents.txt => gfs2-uevents.rst} (94%) + rename Documentation/filesystems/{gfs2.txt => gfs2.rst} (76%) + rename Documentation/filesystems/{hfs.txt => hfs.rst} (80%) + rename Documentation/filesystems/{hfsplus.txt => hfsplus.rst} (95%) + rename Documentation/filesystems/{hpfs.txt => hpfs.rst} (66%) + rename Documentation/filesystems/{inotify.txt => inotify.rst} (83%) + create mode 100644 Documentation/filesystems/isofs.rst + delete mode 100644 Documentation/filesystems/isofs.txt + create mode 100644 Documentation/filesystems/nfs/index.rst + rename Documentation/filesystems/nfs/{knfsd-stats.txt => knfsd-stats.rst} (95%) + create mode 100644 Documentation/filesystems/nfs/nfs41-server.rst + delete mode 100644 Documentation/filesystems/nfs/nfs41-server.txt + rename Documentation/filesystems/nfs/{pnfs.txt => pnfs.rst} (87%) + rename Documentation/filesystems/nfs/{rpc-cache.txt => rpc-cache.rst} (66%) + rename Documentation/filesystems/nfs/{rpc-server-gss.txt => rpc-server-gss.rst} (92%) + rename Documentation/filesystems/{nilfs2.txt => nilfs2.rst} (89%) + rename Documentation/filesystems/{ntfs.txt => ntfs.rst} (85%) + rename Documentation/filesystems/{ocfs2-online-filecheck.txt => ocfs2-online-filecheck.rst} (77%) + rename Documentation/filesystems/{ocfs2.txt => ocfs2.rst} (88%) + create mode 100644 Documentation/filesystems/omfs.rst + delete mode 100644 Documentation/filesystems/omfs.txt + rename Documentation/filesystems/{orangefs.txt => orangefs.rst} (83%) + rename Documentation/filesystems/{proc.txt => proc.rst} (65%) + rename Documentation/filesystems/{qnx6.txt => qnx6.rst} (98%) + rename Documentation/filesystems/{ramfs-rootfs-initramfs.txt => ramfs-rootfs-initramfs.rst} (91%) + rename Documentation/filesystems/{relay.txt => relay.rst} (91%) + rename Documentation/filesystems/{romfs.txt => romfs.rst} (86%) + rename Documentation/filesystems/{squashfs.txt => squashfs.rst} (91%) + rename Documentation/filesystems/{sysfs.txt => sysfs.rst} (56%) + rename Documentation/filesystems/{sysv-fs.txt => sysv-fs.rst} (73%) + rename Documentation/filesystems/{tmpfs.txt => tmpfs.rst} (86%) + rename Documentation/filesystems/{ubifs.txt => ubifs.rst} (91%) + rename Documentation/filesystems/{udf.txt => udf.rst} (83%) + rename Documentation/filesystems/{zonefs.txt => zonefs.rst} (90%) + rename Documentation/{core-api => kbuild}/gcc-plugins.rst (98%) + rename Documentation/{ => misc-devices}/mic/index.rst (100%) + rename Documentation/{ => misc-devices}/mic/mic_overview.rst (100%) + rename Documentation/{ => misc-devices}/mic/scif_overview.rst (100%) + create mode 100755 scripts/check-sysctl-docs + rename {Documentation/EDID => tools/edid}/1024x768.S (100%) + rename {Documentation/EDID => tools/edid}/1280x1024.S (100%) + rename {Documentation/EDID => tools/edid}/1600x1200.S (100%) + rename {Documentation/EDID => tools/edid}/1680x1050.S (100%) + rename {Documentation/EDID => tools/edid}/1920x1080.S (100%) + rename {Documentation/EDID => tools/edid}/800x600.S (100%) + rename {Documentation/EDID => tools/edid}/Makefile (100%) + rename {Documentation/EDID => tools/edid}/edid.S (100%) + rename {Documentation/EDID => tools/edid}/hex (100%) +Merging v4l-dvb/master (2a9c226da9aa media: imx: imx7-media-csi: Support clamping Y10 and Y12 to Y8) +$ git merge v4l-dvb/master +Removing include/media/i2c/smiapp.h +Auto-merging drivers/media/platform/qcom/venus/firmware.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/qcom,venus.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + .../display/connector/analog-tv-connector.txt | 6 + + .../media/allwinner,sun8i-a83t-de2-rotate.yaml | 70 + + .../devicetree/bindings/media/aspeed-video.txt | 5 +- + .../devicetree/bindings/media/i2c/imx219.yaml | 114 ++ + .../devicetree/bindings/media/i2c/tvp5150.txt | 146 +- + .../bindings/media/qcom,msm8916-venus.yaml | 119 ++ + .../bindings/media/qcom,msm8996-venus.yaml | 172 ++ + .../bindings/media/qcom,sc7180-venus.yaml | 140 ++ + .../bindings/media/qcom,sdm845-venus-v2.yaml | 140 ++ + .../bindings/media/qcom,sdm845-venus.yaml | 156 ++ + .../devicetree/bindings/media/qcom,venus.txt | 120 -- + Documentation/devicetree/bindings/media/rc.yaml | 1 + + .../devicetree/bindings/media/rockchip-rga.txt | 5 +- + Documentation/media/kapi/csi2.rst | 2 +- + Documentation/media/kapi/v4l2-dev.rst | 4 +- + .../media/uapi/cec/cec-ioc-adap-g-conn-info.rst | 10 +- + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 20 +- + .../uapi/mediactl/media-ioc-enum-entities.rst | 24 +- + Documentation/media/uapi/v4l/buffer.rst | 53 +- + Documentation/media/uapi/v4l/dev-sliced-vbi.rst | 15 +- + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 16 + + .../media/uapi/v4l/pixfmt-v4l2-mplane.rst | 6 +- + Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 2 - + .../media/uapi/v4l/vidioc-dbg-g-chip-info.rst | 12 +- + .../media/uapi/v4l/vidioc-dbg-g-register.rst | 12 +- + .../media/uapi/v4l/vidioc-decoder-cmd.rst | 26 +- + Documentation/media/uapi/v4l/vidioc-dqevent.rst | 55 +- + .../media/uapi/v4l/vidioc-dv-timings-cap.rst | 14 +- + .../media/uapi/v4l/vidioc-enum-frameintervals.rst | 19 +- + .../media/uapi/v4l/vidioc-enum-framesizes.rst | 18 +- + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 16 +- + .../media/uapi/v4l/vidioc-g-ext-ctrls.rst | 45 +- + Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 29 +- + Documentation/media/uapi/v4l/vidioc-g-parm.rst | 18 +- + Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 21 +- + Documentation/media/v4l-drivers/ipu3.rst | 11 +- + Documentation/media/v4l-drivers/vivid.rst | 63 +- + .../zh_CN/video4linux/v4l2-framework.txt | 4 +- + MAINTAINERS | 29 +- + drivers/media/Kconfig | 6 +- + drivers/media/common/saa7146/saa7146_fops.c | 12 +- + drivers/media/common/videobuf2/videobuf2-core.c | 4 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 4 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 4 +- + drivers/media/dvb-frontends/m88ds3103.c | 466 ++++- + drivers/media/dvb-frontends/m88ds3103_priv.h | 14 +- + drivers/media/dvb-frontends/tda10071.c | 9 +- + drivers/media/i2c/Kconfig | 16 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/adv7180.c | 12 + + drivers/media/i2c/imx214.c | 1 - + drivers/media/i2c/imx219.c | 1481 ++++++++++++++ + drivers/media/i2c/ov5675.c | 82 +- + drivers/media/i2c/ov5695.c | 49 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 2 +- + drivers/media/i2c/smiapp/smiapp-core.c | 259 ++- + drivers/media/i2c/smiapp/smiapp-reg.h | 4 + + drivers/media/i2c/smiapp/smiapp-regs.c | 71 +- + drivers/media/i2c/smiapp/smiapp.h | 44 +- + drivers/media/i2c/tvp5150.c | 802 ++++++-- + drivers/media/i2c/video-i2c.c | 2 +- + drivers/media/mc/mc-entity.c | 11 +- + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 2 +- + drivers/media/pci/cx18/cx18-streams.c | 12 +- + drivers/media/pci/cx23885/cx23885-417.c | 2 +- + drivers/media/pci/cx23885/cx23885-video.c | 2 +- + drivers/media/pci/cx25821/cx25821-video.c | 2 +- + drivers/media/pci/cx88/cx88-blackbird.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/dt3155/dt3155.c | 2 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- + drivers/media/pci/ivtv/ivtv-streams.c | 12 +- + drivers/media/pci/meye/meye.c | 2 +- + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + drivers/media/pci/saa7134/saa7134-empress.c | 2 +- + drivers/media/pci/saa7146/hexium_gemini.c | 2 +- + drivers/media/pci/saa7146/hexium_orion.c | 2 +- + drivers/media/pci/saa7146/mxb.c | 2 +- + drivers/media/pci/saa7164/saa7164-encoder.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +- + drivers/media/pci/ttpci/av7110_v4l.c | 2 +- + drivers/media/pci/ttpci/budget-av.c | 2 +- + drivers/media/pci/tw5864/tw5864-video.c | 2 +- + drivers/media/pci/tw68/tw68-video.c | 2 +- + drivers/media/pci/tw686x/tw686x-video.c | 2 +- + drivers/media/platform/Kconfig | 86 +- + drivers/media/platform/am437x/am437x-vpfe.c | 3 +- + drivers/media/platform/aspeed-video.c | 86 +- + drivers/media/platform/atmel/atmel-isc-base.c | 224 +- + drivers/media/platform/atmel/atmel-isc.h | 23 +- + drivers/media/platform/atmel/atmel-isi.c | 2 +- + drivers/media/platform/coda/coda-common.c | 2 +- + drivers/media/platform/davinci/isif.c | 2 +- + drivers/media/platform/davinci/vpbe_display.c | 2 +- + drivers/media/platform/davinci/vpfe_capture.c | 4 +- + drivers/media/platform/davinci/vpif_capture.c | 2 +- + drivers/media/platform/davinci/vpif_display.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +- + drivers/media/platform/exynos4-is/Kconfig | 2 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 2 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 5 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 2 +- + drivers/media/platform/fsl-viu.c | 2 +- + drivers/media/platform/imx-pxp.c | 2 +- + drivers/media/platform/m2m-deinterlace.c | 2 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 2 +- + drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 6 + + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 2 +- + drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c | 9 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 29 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 6 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 12 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 45 +- + drivers/media/platform/mtk-vpu/mtk_vpu.h | 2 +- + drivers/media/platform/mx2_emmaprp.c | 2 +- + drivers/media/platform/omap/omap_vout.c | 2 +- + drivers/media/platform/omap3isp/ispccdc.c | 4 + + drivers/media/platform/omap3isp/ispvideo.c | 8 +- + drivers/media/platform/pxa_camera.c | 22 +- + drivers/media/platform/qcom/camss/camss-video.c | 6 +- + drivers/media/platform/qcom/venus/Makefile | 2 +- + drivers/media/platform/qcom/venus/core.c | 167 +- + drivers/media/platform/qcom/venus/core.h | 33 +- + drivers/media/platform/qcom/venus/firmware.c | 3 +- + drivers/media/platform/qcom/venus/helpers.c | 448 ++-- + drivers/media/platform/qcom/venus/helpers.h | 4 - + drivers/media/platform/qcom/venus/hfi_cmds.c | 2 + + drivers/media/platform/qcom/venus/hfi_helper.h | 6 + + drivers/media/platform/qcom/venus/hfi_parser.c | 1 + + drivers/media/platform/qcom/venus/hfi_parser.h | 5 + + drivers/media/platform/qcom/venus/pm_helpers.c | 959 +++++++++ + drivers/media/platform/qcom/venus/pm_helpers.h | 65 + + drivers/media/platform/qcom/venus/vdec.c | 86 +- + drivers/media/platform/qcom/venus/venc.c | 81 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 8 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 91 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 34 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 28 +- + drivers/media/platform/rcar_drif.c | 12 +- + drivers/media/platform/rcar_fdp1.c | 2 +- + drivers/media/platform/rcar_jpu.c | 4 +- + drivers/media/platform/renesas-ceu.c | 2 +- + drivers/media/platform/rockchip/rga/rga.c | 2 +- + drivers/media/platform/s3c-camif/camif-capture.c | 2 +- + drivers/media/platform/s5p-g2d/g2d.c | 2 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 +- + drivers/media/platform/sh_veu.c | 2 +- + drivers/media/platform/sh_vou.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 2 +- + drivers/media/platform/sti/delta/delta-v4l2.c | 2 +- + drivers/media/platform/sti/hva/hva-v4l2.c | 2 +- + drivers/media/platform/stm32/stm32-cec.c | 10 +- + drivers/media/platform/stm32/stm32-dcmi.c | 13 +- + drivers/media/platform/sunxi/Makefile | 1 + + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 8 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 8 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 7 +- + drivers/media/platform/sunxi/sun8i-rotate/Makefile | 5 + + .../platform/sunxi/sun8i-rotate/sun8i-formats.h | 25 + + .../platform/sunxi/sun8i-rotate/sun8i-rotate.h | 135 ++ + .../platform/sunxi/sun8i-rotate/sun8i_formats.c | 273 +++ + .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 924 +++++++++ + drivers/media/platform/ti-vpe/cal.c | 31 +- + drivers/media/platform/ti-vpe/vpe.c | 2 +- + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/vicodec/vicodec-core.c | 164 +- + drivers/media/platform/vim2m.c | 2 +- + drivers/media/platform/vimc/vimc-capture.c | 20 +- + drivers/media/platform/vimc/vimc-common.c | 2 - + drivers/media/platform/vimc/vimc-common.h | 27 +- + drivers/media/platform/vimc/vimc-core.c | 93 +- + drivers/media/platform/vimc/vimc-debayer.c | 21 +- + drivers/media/platform/vimc/vimc-scaler.c | 21 +- + drivers/media/platform/vimc/vimc-sensor.c | 20 +- + drivers/media/platform/vimc/vimc-streamer.c | 17 +- + drivers/media/platform/vivid/vivid-core.c | 10 +- + drivers/media/platform/vsp1/vsp1_histo.c | 4 +- + drivers/media/platform/vsp1/vsp1_regs.h | 2 +- + drivers/media/platform/vsp1/vsp1_video.c | 4 +- + drivers/media/platform/xilinx/xilinx-dma.c | 15 +- + drivers/media/radio/si470x/Kconfig | 4 +- + drivers/media/rc/bpf-lirc.c | 5 - + drivers/media/rc/iguanair.c | 2 +- + drivers/media/rc/ir-xmp-decoder.c | 2 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-videostrong-kii-pro.c | 83 + + drivers/media/rc/lirc_dev.c | 7 +- + drivers/media/rc/rc-main.c | 80 +- + drivers/media/spi/gs1662.c | 20 +- + drivers/media/usb/Kconfig | 1 - + drivers/media/usb/Makefile | 1 - + drivers/media/usb/au0828/au0828-video.c | 4 +- + drivers/media/usb/b2c2/flexcop-usb.c | 6 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 4 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 5 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 + + drivers/media/usb/dvb-usb/cxusb-analog.c | 12 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 4 +- + drivers/media/usb/dvb-usb/dw2102.c | 45 +- + drivers/media/usb/em28xx/em28xx-cards.c | 18 + + drivers/media/usb/em28xx/em28xx-dvb.c | 60 + + drivers/media/usb/em28xx/em28xx-video.c | 4 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/go7007/go7007-usb.c | 4 +- + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/gspca/gspca.c | 2 +- + drivers/media/usb/gspca/ov519.c | 10 + + drivers/media/usb/gspca/stv06xx/stv06xx.c | 19 +- + drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c | 4 + + drivers/media/usb/gspca/xirlink_cit.c | 18 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +- + drivers/media/usb/pwc/pwc-if.c | 2 +- + drivers/media/usb/s2255/s2255drv.c | 4 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 2 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 2 +- + drivers/media/usb/tm6000/tm6000-video.c | 4 +- + drivers/media/usb/usbtv/usbtv-core.c | 2 +- + drivers/media/usb/usbtv/usbtv-video.c | 7 +- + drivers/media/usb/uvc/uvc_driver.c | 2 +- + drivers/media/usb/zr364xx/zr364xx.c | 2 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 11 +- + drivers/media/v4l2-core/v4l2-dev.c | 10 +- + drivers/media/v4l2-core/v4l2-device.c | 8 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 192 +- + drivers/media/v4l2-core/v4l2-i2c.c | 10 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- + drivers/media/v4l2-core/v4l2-mc.c | 18 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 221 +- + drivers/staging/media/Kconfig | 4 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/allegro-dvt/allegro-core.c | 28 +- + drivers/staging/media/hantro/hantro.h | 2 +- + drivers/staging/media/hantro/hantro_drv.c | 12 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 19 +- + drivers/staging/media/hantro/hantro_jpeg.c | 76 +- + drivers/staging/media/hantro/hantro_jpeg.h | 2 +- + drivers/staging/media/hantro/hantro_v4l2.c | 2 +- + .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 24 +- + drivers/staging/media/imx/imx-media-capture.c | 8 +- + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 5 +- + drivers/staging/media/imx/imx-media-utils.c | 19 +- + drivers/staging/media/imx/imx7-media-csi.c | 24 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 16 +- + drivers/staging/media/ipu3/TODO | 2 - + drivers/staging/media/ipu3/ipu3-css.c | 6 +- + drivers/staging/media/ipu3/ipu3-css.h | 3 +- + drivers/staging/media/ipu3/ipu3-mmu.c | 4 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 2 +- + drivers/staging/media/ipu3/ipu3.c | 16 +- + drivers/staging/media/meson/vdec/Makefile | 4 +- + drivers/staging/media/meson/vdec/codec_h264.c | 485 +++++ + drivers/staging/media/meson/vdec/codec_h264.h | 14 + + .../staging/media/meson/vdec/codec_hevc_common.c | 297 +++ + .../staging/media/meson/vdec/codec_hevc_common.h | 71 + + drivers/staging/media/meson/vdec/codec_vp9.c | 2141 ++++++++++++++++++++ + drivers/staging/media/meson/vdec/codec_vp9.h | 13 + + drivers/staging/media/meson/vdec/esparser.c | 200 +- + drivers/staging/media/meson/vdec/hevc_regs.h | 218 ++ + drivers/staging/media/meson/vdec/vdec.c | 107 +- + drivers/staging/media/meson/vdec/vdec.h | 14 +- + drivers/staging/media/meson/vdec/vdec_helpers.c | 123 +- + drivers/staging/media/meson/vdec/vdec_helpers.h | 10 +- + drivers/staging/media/meson/vdec/vdec_hevc.c | 231 +++ + drivers/staging/media/meson/vdec/vdec_hevc.h | 13 + + drivers/staging/media/meson/vdec/vdec_platform.c | 109 + + drivers/staging/media/omap4iss/iss_video.c | 8 +- + drivers/staging/media/rkisp1/TODO | 1 - + drivers/staging/media/rkisp1/rkisp1-capture.c | 13 +- + drivers/staging/media/rkisp1/rkisp1-common.h | 3 + + drivers/staging/media/rkisp1/rkisp1-dev.c | 20 +- + drivers/staging/media/rkisp1/rkisp1-isp.c | 61 +- + drivers/staging/media/rkisp1/rkisp1-params.c | 2 +- + drivers/staging/media/rkisp1/rkisp1-resizer.c | 27 +- + drivers/staging/media/rkisp1/rkisp1-stats.c | 5 +- + drivers/staging/media/soc_camera/soc_camera.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- + drivers/staging/media/tegra-vde/vde.c | 55 +- + .../{media/usb => staging/media}/usbvision/Kconfig | 9 +- + .../usb => staging/media}/usbvision/Makefile | 0 + drivers/staging/media/usbvision/TODO | 11 + + .../media}/usbvision/usbvision-cards.c | 0 + .../media}/usbvision/usbvision-cards.h | 0 + .../media}/usbvision/usbvision-core.c | 0 + .../media}/usbvision/usbvision-i2c.c | 0 + .../media}/usbvision/usbvision-video.c | 2 +- + .../usb => staging/media}/usbvision/usbvision.h | 0 + drivers/staging/most/video/video.c | 4 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +- + drivers/usb/gadget/function/f_uvc.c | 2 +- + include/dt-bindings/display/sdtv-standards.h | 76 + + include/dt-bindings/media/tvp5150.h | 2 - + include/linux/atmel-isc-media.h | 58 + + include/media/h264-ctrls.h | 2 + + include/media/i2c/smiapp.h | 63 - + include/media/rc-core.h | 8 +- + include/media/rc-map.h | 5 +- + include/media/v4l2-dev.h | 4 +- + include/media/v4l2-device.h | 16 +- + include/media/v4l2-fwnode.h | 143 ++ + include/media/v4l2-mc.h | 40 +- + include/media/v4l2-mem2mem.h | 133 ++ + include/media/v4l2-subdev.h | 2 +- + include/media/videobuf2-core.h | 7 +- + include/uapi/linux/v4l2-controls.h | 6 + + include/uapi/linux/videodev2.h | 4 + + samples/v4l/v4l2-pci-skeleton.c | 2 +- + 321 files changed, 13341 insertions(+), 2456 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/imx219.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8996-venus.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm845-venus.yaml + delete mode 100644 Documentation/devicetree/bindings/media/qcom,venus.txt + create mode 100644 drivers/media/i2c/imx219.c + create mode 100644 drivers/media/platform/qcom/venus/pm_helpers.c + create mode 100644 drivers/media/platform/qcom/venus/pm_helpers.h + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/Makefile + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c + create mode 100644 drivers/media/rc/keymaps/rc-videostrong-kii-pro.c + create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c + create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h + create mode 100644 drivers/staging/media/meson/vdec/codec_hevc_common.c + create mode 100644 drivers/staging/media/meson/vdec/codec_hevc_common.h + create mode 100644 drivers/staging/media/meson/vdec/codec_vp9.c + create mode 100644 drivers/staging/media/meson/vdec/codec_vp9.h + create mode 100644 drivers/staging/media/meson/vdec/hevc_regs.h + create mode 100644 drivers/staging/media/meson/vdec/vdec_hevc.c + create mode 100644 drivers/staging/media/meson/vdec/vdec_hevc.h + rename drivers/{media/usb => staging/media}/usbvision/Kconfig (51%) + rename drivers/{media/usb => staging/media}/usbvision/Makefile (100%) + create mode 100644 drivers/staging/media/usbvision/TODO + rename drivers/{media/usb => staging/media}/usbvision/usbvision-cards.c (100%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision-cards.h (100%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision-core.c (100%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision-i2c.c (100%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision-video.c (99%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision.h (100%) + create mode 100644 include/dt-bindings/display/sdtv-standards.h + create mode 100644 include/linux/atmel-isc-media.h + delete mode 100644 include/media/i2c/smiapp.h +$ git reset --hard HEAD^ +HEAD is now at d7b93f893850 Merge remote-tracking branch 'jc_docs/docs-next' +Merging next-20200312 version of v4l-dvb +$ git merge -m next-20200312/v4l-dvb 00c43088aa680989407b6afbda295f67b3f123f1 +Removing include/media/i2c/smiapp.h +Auto-merging drivers/media/platform/qcom/venus/firmware.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/qcom,venus.txt +Merge made by the 'recursive' strategy. + .../media/allwinner,sun8i-a83t-de2-rotate.yaml | 70 + + .../devicetree/bindings/media/aspeed-video.txt | 5 +- + .../devicetree/bindings/media/i2c/imx219.yaml | 114 ++ + .../bindings/media/qcom,msm8916-venus.yaml | 119 ++ + .../bindings/media/qcom,msm8996-venus.yaml | 172 ++ + .../bindings/media/qcom,sc7180-venus.yaml | 140 ++ + .../bindings/media/qcom,sdm845-venus-v2.yaml | 140 ++ + .../bindings/media/qcom,sdm845-venus.yaml | 156 ++ + .../devicetree/bindings/media/qcom,venus.txt | 120 -- + Documentation/devicetree/bindings/media/rc.yaml | 1 + + .../devicetree/bindings/media/rockchip-rga.txt | 5 +- + Documentation/media/kapi/csi2.rst | 2 +- + Documentation/media/kapi/v4l2-dev.rst | 4 +- + .../media/uapi/cec/cec-ioc-adap-g-conn-info.rst | 10 +- + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 20 +- + .../uapi/mediactl/media-ioc-enum-entities.rst | 24 +- + Documentation/media/uapi/v4l/buffer.rst | 53 +- + Documentation/media/uapi/v4l/dev-sliced-vbi.rst | 15 +- + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 16 + + .../media/uapi/v4l/pixfmt-v4l2-mplane.rst | 6 +- + Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 2 - + .../media/uapi/v4l/vidioc-dbg-g-chip-info.rst | 12 +- + .../media/uapi/v4l/vidioc-dbg-g-register.rst | 12 +- + .../media/uapi/v4l/vidioc-decoder-cmd.rst | 26 +- + Documentation/media/uapi/v4l/vidioc-dqevent.rst | 55 +- + .../media/uapi/v4l/vidioc-dv-timings-cap.rst | 14 +- + .../media/uapi/v4l/vidioc-enum-frameintervals.rst | 19 +- + .../media/uapi/v4l/vidioc-enum-framesizes.rst | 18 +- + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 16 +- + .../media/uapi/v4l/vidioc-g-ext-ctrls.rst | 45 +- + Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 29 +- + Documentation/media/uapi/v4l/vidioc-g-parm.rst | 18 +- + Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 21 +- + Documentation/media/v4l-drivers/ipu3.rst | 11 +- + Documentation/media/v4l-drivers/vivid.rst | 63 +- + .../zh_CN/video4linux/v4l2-framework.txt | 4 +- + MAINTAINERS | 26 +- + drivers/media/Kconfig | 6 +- + drivers/media/common/saa7146/saa7146_fops.c | 12 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 4 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 4 +- + drivers/media/i2c/Kconfig | 11 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/adv7180.c | 12 + + drivers/media/i2c/imx219.c | 1312 ++++++++++++ + drivers/media/i2c/ov5675.c | 82 +- + drivers/media/i2c/smiapp/smiapp-core.c | 259 ++- + drivers/media/i2c/smiapp/smiapp-reg.h | 4 + + drivers/media/i2c/smiapp/smiapp-regs.c | 71 +- + drivers/media/i2c/smiapp/smiapp.h | 44 +- + drivers/media/i2c/video-i2c.c | 2 +- + drivers/media/mc/mc-entity.c | 11 +- + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 2 +- + drivers/media/pci/cx18/cx18-streams.c | 12 +- + drivers/media/pci/cx23885/cx23885-417.c | 2 +- + drivers/media/pci/cx23885/cx23885-video.c | 2 +- + drivers/media/pci/cx25821/cx25821-video.c | 2 +- + drivers/media/pci/cx88/cx88-blackbird.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/dt3155/dt3155.c | 2 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- + drivers/media/pci/ivtv/ivtv-streams.c | 12 +- + drivers/media/pci/meye/meye.c | 2 +- + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + drivers/media/pci/saa7134/saa7134-empress.c | 2 +- + drivers/media/pci/saa7146/hexium_gemini.c | 2 +- + drivers/media/pci/saa7146/hexium_orion.c | 2 +- + drivers/media/pci/saa7146/mxb.c | 2 +- + drivers/media/pci/saa7164/saa7164-encoder.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +- + drivers/media/pci/ttpci/av7110_v4l.c | 2 +- + drivers/media/pci/ttpci/budget-av.c | 2 +- + drivers/media/pci/tw5864/tw5864-video.c | 2 +- + drivers/media/pci/tw68/tw68-video.c | 2 +- + drivers/media/pci/tw686x/tw686x-video.c | 2 +- + drivers/media/platform/Kconfig | 86 +- + drivers/media/platform/am437x/am437x-vpfe.c | 2 +- + drivers/media/platform/aspeed-video.c | 86 +- + drivers/media/platform/atmel/atmel-isc-base.c | 224 +- + drivers/media/platform/atmel/atmel-isc.h | 23 +- + drivers/media/platform/atmel/atmel-isi.c | 2 +- + drivers/media/platform/coda/coda-common.c | 2 +- + drivers/media/platform/davinci/isif.c | 2 +- + drivers/media/platform/davinci/vpbe_display.c | 2 +- + drivers/media/platform/davinci/vpfe_capture.c | 4 +- + drivers/media/platform/davinci/vpif_capture.c | 2 +- + drivers/media/platform/davinci/vpif_display.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +- + drivers/media/platform/exynos4-is/Kconfig | 2 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 2 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 5 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 2 +- + drivers/media/platform/fsl-viu.c | 2 +- + drivers/media/platform/imx-pxp.c | 2 +- + drivers/media/platform/m2m-deinterlace.c | 2 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 2 +- + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 29 +- + drivers/media/platform/mx2_emmaprp.c | 2 +- + drivers/media/platform/omap/omap_vout.c | 2 +- + drivers/media/platform/omap3isp/ispccdc.c | 4 + + drivers/media/platform/omap3isp/ispvideo.c | 8 +- + drivers/media/platform/pxa_camera.c | 22 +- + drivers/media/platform/qcom/camss/camss-video.c | 6 +- + drivers/media/platform/qcom/venus/Makefile | 2 +- + drivers/media/platform/qcom/venus/core.c | 167 +- + drivers/media/platform/qcom/venus/core.h | 32 +- + drivers/media/platform/qcom/venus/firmware.c | 3 +- + drivers/media/platform/qcom/venus/helpers.c | 448 ++-- + drivers/media/platform/qcom/venus/helpers.h | 4 - + drivers/media/platform/qcom/venus/hfi_cmds.c | 2 + + drivers/media/platform/qcom/venus/hfi_helper.h | 6 + + drivers/media/platform/qcom/venus/hfi_parser.c | 1 + + drivers/media/platform/qcom/venus/hfi_parser.h | 5 + + drivers/media/platform/qcom/venus/pm_helpers.c | 959 +++++++++ + drivers/media/platform/qcom/venus/pm_helpers.h | 65 + + drivers/media/platform/qcom/venus/vdec.c | 86 +- + drivers/media/platform/qcom/venus/venc.c | 77 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 91 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 34 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 28 +- + drivers/media/platform/rcar_drif.c | 12 +- + drivers/media/platform/rcar_fdp1.c | 2 +- + drivers/media/platform/rcar_jpu.c | 4 +- + drivers/media/platform/renesas-ceu.c | 2 +- + drivers/media/platform/rockchip/rga/rga.c | 2 +- + drivers/media/platform/s3c-camif/camif-capture.c | 2 +- + drivers/media/platform/s5p-g2d/g2d.c | 2 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 +- + drivers/media/platform/sh_veu.c | 2 +- + drivers/media/platform/sh_vou.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 2 +- + drivers/media/platform/sti/delta/delta-v4l2.c | 2 +- + drivers/media/platform/sti/hva/hva-v4l2.c | 2 +- + drivers/media/platform/stm32/stm32-dcmi.c | 13 +- + drivers/media/platform/sunxi/Makefile | 1 + + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 8 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 8 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 7 +- + drivers/media/platform/sunxi/sun8i-rotate/Makefile | 5 + + .../platform/sunxi/sun8i-rotate/sun8i-formats.h | 25 + + .../platform/sunxi/sun8i-rotate/sun8i-rotate.h | 135 ++ + .../platform/sunxi/sun8i-rotate/sun8i_formats.c | 273 +++ + .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 924 +++++++++ + drivers/media/platform/ti-vpe/cal.c | 18 +- + drivers/media/platform/ti-vpe/vpe.c | 2 +- + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/vicodec/vicodec-core.c | 164 +- + drivers/media/platform/vim2m.c | 2 +- + drivers/media/platform/vimc/vimc-capture.c | 20 +- + drivers/media/platform/vimc/vimc-common.c | 2 - + drivers/media/platform/vimc/vimc-common.h | 27 +- + drivers/media/platform/vimc/vimc-core.c | 93 +- + drivers/media/platform/vimc/vimc-debayer.c | 21 +- + drivers/media/platform/vimc/vimc-scaler.c | 21 +- + drivers/media/platform/vimc/vimc-sensor.c | 20 +- + drivers/media/platform/vimc/vimc-streamer.c | 17 +- + drivers/media/platform/vivid/vivid-core.c | 10 +- + drivers/media/platform/vsp1/vsp1_histo.c | 4 +- + drivers/media/platform/vsp1/vsp1_regs.h | 2 +- + drivers/media/platform/vsp1/vsp1_video.c | 4 +- + drivers/media/platform/xilinx/xilinx-dma.c | 15 +- + drivers/media/radio/si470x/Kconfig | 4 +- + drivers/media/rc/iguanair.c | 2 +- + drivers/media/rc/ir-xmp-decoder.c | 2 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-videostrong-kii-pro.c | 83 + + drivers/media/spi/gs1662.c | 20 +- + drivers/media/usb/Kconfig | 1 - + drivers/media/usb/Makefile | 1 - + drivers/media/usb/au0828/au0828-video.c | 4 +- + drivers/media/usb/b2c2/flexcop-usb.c | 6 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 4 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 + + drivers/media/usb/dvb-usb/cxusb-analog.c | 12 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 4 +- + drivers/media/usb/em28xx/em28xx-video.c | 4 +- + drivers/media/usb/go7007/go7007-usb.c | 4 +- + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/gspca/gspca.c | 2 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +- + drivers/media/usb/pwc/pwc-if.c | 2 +- + drivers/media/usb/s2255/s2255drv.c | 4 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 2 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 2 +- + drivers/media/usb/tm6000/tm6000-video.c | 4 +- + drivers/media/usb/usbtv/usbtv-core.c | 2 +- + drivers/media/usb/usbtv/usbtv-video.c | 7 +- + drivers/media/usb/uvc/uvc_driver.c | 2 +- + drivers/media/usb/zr364xx/zr364xx.c | 2 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 11 +- + drivers/media/v4l2-core/v4l2-dev.c | 10 +- + drivers/media/v4l2-core/v4l2-device.c | 8 +- + drivers/media/v4l2-core/v4l2-i2c.c | 10 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- + drivers/media/v4l2-core/v4l2-mc.c | 18 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 221 +- + drivers/staging/media/Kconfig | 4 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/allegro-dvt/allegro-core.c | 28 +- + drivers/staging/media/hantro/hantro.h | 2 +- + drivers/staging/media/hantro/hantro_drv.c | 12 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 19 +- + drivers/staging/media/hantro/hantro_jpeg.c | 76 +- + drivers/staging/media/hantro/hantro_jpeg.h | 2 +- + drivers/staging/media/hantro/hantro_v4l2.c | 2 +- + .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 24 +- + drivers/staging/media/imx/imx-media-capture.c | 8 +- + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 2 + + drivers/staging/media/imx/imx7-media-csi.c | 2 + + drivers/staging/media/ipu3/TODO | 2 - + drivers/staging/media/ipu3/ipu3-mmu.c | 4 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 2 +- + drivers/staging/media/meson/vdec/Makefile | 4 +- + drivers/staging/media/meson/vdec/codec_h264.c | 485 +++++ + drivers/staging/media/meson/vdec/codec_h264.h | 14 + + .../staging/media/meson/vdec/codec_hevc_common.c | 297 +++ + .../staging/media/meson/vdec/codec_hevc_common.h | 71 + + drivers/staging/media/meson/vdec/codec_vp9.c | 2141 ++++++++++++++++++++ + drivers/staging/media/meson/vdec/codec_vp9.h | 13 + + drivers/staging/media/meson/vdec/esparser.c | 200 +- + drivers/staging/media/meson/vdec/hevc_regs.h | 218 ++ + drivers/staging/media/meson/vdec/vdec.c | 107 +- + drivers/staging/media/meson/vdec/vdec.h | 14 +- + drivers/staging/media/meson/vdec/vdec_helpers.c | 123 +- + drivers/staging/media/meson/vdec/vdec_helpers.h | 10 +- + drivers/staging/media/meson/vdec/vdec_hevc.c | 231 +++ + drivers/staging/media/meson/vdec/vdec_hevc.h | 13 + + drivers/staging/media/meson/vdec/vdec_platform.c | 109 + + drivers/staging/media/omap4iss/iss_video.c | 8 +- + drivers/staging/media/rkisp1/TODO | 1 - + drivers/staging/media/rkisp1/rkisp1-capture.c | 13 +- + drivers/staging/media/rkisp1/rkisp1-common.h | 3 + + drivers/staging/media/rkisp1/rkisp1-dev.c | 20 +- + drivers/staging/media/rkisp1/rkisp1-isp.c | 61 +- + drivers/staging/media/rkisp1/rkisp1-params.c | 2 +- + drivers/staging/media/rkisp1/rkisp1-resizer.c | 27 +- + drivers/staging/media/rkisp1/rkisp1-stats.c | 5 +- + drivers/staging/media/soc_camera/soc_camera.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- + drivers/staging/media/tegra-vde/vde.c | 55 +- + .../{media/usb => staging/media}/usbvision/Kconfig | 9 +- + .../usb => staging/media}/usbvision/Makefile | 0 + drivers/staging/media/usbvision/TODO | 11 + + .../media}/usbvision/usbvision-cards.c | 0 + .../media}/usbvision/usbvision-cards.h | 0 + .../media}/usbvision/usbvision-core.c | 0 + .../media}/usbvision/usbvision-i2c.c | 0 + .../media}/usbvision/usbvision-video.c | 2 +- + .../usb => staging/media}/usbvision/usbvision.h | 0 + drivers/staging/most/video/video.c | 4 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +- + drivers/usb/gadget/function/f_uvc.c | 2 +- + include/linux/atmel-isc-media.h | 58 + + include/media/h264-ctrls.h | 2 + + include/media/i2c/smiapp.h | 63 - + include/media/rc-map.h | 1 + + include/media/v4l2-dev.h | 4 +- + include/media/v4l2-device.h | 16 +- + include/media/v4l2-mc.h | 40 +- + include/media/v4l2-mem2mem.h | 133 ++ + include/media/v4l2-subdev.h | 2 +- + include/media/videobuf2-core.h | 7 +- + include/uapi/linux/v4l2-controls.h | 6 + + samples/v4l/v4l2-pci-skeleton.c | 2 +- + 279 files changed, 11124 insertions(+), 2093 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/imx219.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8996-venus.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm845-venus.yaml + delete mode 100644 Documentation/devicetree/bindings/media/qcom,venus.txt + create mode 100644 drivers/media/i2c/imx219.c + create mode 100644 drivers/media/platform/qcom/venus/pm_helpers.c + create mode 100644 drivers/media/platform/qcom/venus/pm_helpers.h + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/Makefile + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c + create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c + create mode 100644 drivers/media/rc/keymaps/rc-videostrong-kii-pro.c + create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c + create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h + create mode 100644 drivers/staging/media/meson/vdec/codec_hevc_common.c + create mode 100644 drivers/staging/media/meson/vdec/codec_hevc_common.h + create mode 100644 drivers/staging/media/meson/vdec/codec_vp9.c + create mode 100644 drivers/staging/media/meson/vdec/codec_vp9.h + create mode 100644 drivers/staging/media/meson/vdec/hevc_regs.h + create mode 100644 drivers/staging/media/meson/vdec/vdec_hevc.c + create mode 100644 drivers/staging/media/meson/vdec/vdec_hevc.h + rename drivers/{media/usb => staging/media}/usbvision/Kconfig (51%) + rename drivers/{media/usb => staging/media}/usbvision/Makefile (100%) + create mode 100644 drivers/staging/media/usbvision/TODO + rename drivers/{media/usb => staging/media}/usbvision/usbvision-cards.c (100%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision-cards.h (100%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision-core.c (100%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision-i2c.c (100%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision-video.c (99%) + rename drivers/{media/usb => staging/media}/usbvision/usbvision.h (100%) + create mode 100644 include/linux/atmel-isc-media.h + delete mode 100644 include/media/i2c/smiapp.h +Merging v4l-dvb-next/master (54ecb8f7028c Linux 5.4-rc1) +$ 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 (b5028d145af7 Merge branch 'pm-tools' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/media/platform/via-camera.c +Auto-merging MAINTAINERS +Auto-merging Documentation/index.rst +Removing Documentation/cpu-freq/pcc-cpufreq.txt +Removing Documentation/cpu-freq/index.txt +Removing Documentation/cpu-freq/cpufreq-nforce2.txt +Removing Documentation/cpu-freq/amd-powernow.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/pm/cpufreq_drivers.rst | 274 ++++++++++ + Documentation/admin-guide/pm/cpuidle.rst | 73 ++- + Documentation/admin-guide/pm/working-state.rst | 1 + + Documentation/cpu-freq/amd-powernow.txt | 38 -- + Documentation/cpu-freq/{core.txt => core.rst} | 65 +-- + .../cpu-freq/{cpu-drivers.txt => cpu-drivers.rst} | 129 +++-- + Documentation/cpu-freq/cpufreq-nforce2.txt | 19 - + .../{cpufreq-stats.txt => cpufreq-stats.rst} | 119 +++-- + Documentation/cpu-freq/index.rst | 39 ++ + Documentation/cpu-freq/index.txt | 56 --- + Documentation/cpu-freq/pcc-cpufreq.txt | 207 -------- + Documentation/index.rst | 1 + + Documentation/power/pm_qos_interface.rst | 88 ++-- + Documentation/power/runtime_pm.rst | 6 + + Documentation/trace/events-power.rst | 21 +- + MAINTAINERS | 1 + + arch/x86/platform/intel/iosf_mbi.c | 13 +- + drivers/acpi/Kconfig | 24 + + drivers/acpi/Makefile | 1 + + drivers/acpi/ac.c | 25 +- + drivers/acpi/acpi_video.c | 2 +- + drivers/acpi/acpica/acconvert.h | 4 +- + drivers/acpi/acpica/acmacros.h | 4 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 12 + + drivers/acpi/acpica/nsnames.c | 6 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/tbxface.c | 12 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/battery.c | 10 +- + drivers/acpi/button.c | 3 - + drivers/acpi/osl.c | 2 + + drivers/acpi/proc.c | 14 +- + drivers/acpi/tiny-power-button.c | 46 ++ + drivers/acpi/wakeup.c | 24 +- + drivers/base/power/main.c | 12 +- + drivers/base/power/runtime.c | 36 +- + drivers/base/power/wakeup.c | 13 +- + drivers/cpufreq/Kconfig.x86 | 2 +- + drivers/cpuidle/cpuidle.c | 40 +- + drivers/cpuidle/governor.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 4 +- + drivers/gpu/drm/i915/i915_drv.c | 12 +- + drivers/gpu/drm/i915/intel_sideband.c | 5 +- + drivers/hsi/clients/cmt_speech.c | 9 +- + drivers/idle/intel_idle.c | 302 +++++------ + drivers/media/pci/saa7134/saa7134-video.c | 5 +- + drivers/media/platform/via-camera.c | 4 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 14 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 13 +- + drivers/net/wireless/ath/ath10k/core.c | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 10 +- + drivers/powercap/idle_inject.c | 2 +- + drivers/spi/spi-fsl-qspi.c | 4 +- + drivers/tty/serial/8250/8250_omap.c | 13 +- + drivers/tty/serial/omap-serial.c | 15 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 12 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/button.h | 4 + + include/linux/pm_qos.h | 81 +-- + include/linux/pm_runtime.h | 12 +- + include/trace/events/power.h | 59 +-- + kernel/power/qos.c | 559 ++++++--------------- + sound/core/pcm_native.c | 14 +- + sound/soc/intel/atom/sst/sst.c | 5 +- + sound/soc/intel/atom/sst/sst_loader.c | 4 +- + sound/soc/ti/omap-dmic.c | 7 +- + sound/soc/ti/omap-mcbsp.c | 16 +- + sound/soc/ti/omap-mcpdm.c | 16 +- + .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 2 +- + .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 2 +- + .../cpupower/utils/idle_monitor/cpupower-monitor.c | 2 + + .../cpupower/utils/idle_monitor/cpupower-monitor.h | 2 +- + 74 files changed, 1247 insertions(+), 1420 deletions(-) + create mode 100644 Documentation/admin-guide/pm/cpufreq_drivers.rst + delete mode 100644 Documentation/cpu-freq/amd-powernow.txt + rename Documentation/cpu-freq/{core.txt => core.rst} (69%) + rename Documentation/cpu-freq/{cpu-drivers.txt => cpu-drivers.rst} (72%) + delete mode 100644 Documentation/cpu-freq/cpufreq-nforce2.txt + rename Documentation/cpu-freq/{cpufreq-stats.txt => cpufreq-stats.rst} (53%) + create mode 100644 Documentation/cpu-freq/index.rst + delete mode 100644 Documentation/cpu-freq/index.txt + delete mode 100644 Documentation/cpu-freq/pcc-cpufreq.txt + create mode 100644 drivers/acpi/tiny-power-button.c +Merging cpufreq-arm/cpufreq/arm/linux-next (0c868627e617 cpufreq: dt: Allow platform specific intermediate callbacks) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/cpufreq-dt.c | 4 +++ + drivers/cpufreq/cpufreq-dt.h | 4 +++ + drivers/cpufreq/imx-cpufreq-dt.c | 13 ++++++- + drivers/cpufreq/imx6q-cpufreq.c | 75 +++++++++++++++++++++++----------------- + drivers/cpufreq/ti-cpufreq.c | 7 ++++ + 5 files changed, 71 insertions(+), 32 deletions(-) +Merging cpupower/cpupower (2de7fb60a474 cpupower: avoid multiple definition with gcc -fno-common) +$ 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 (0bf3a650ab8d thermal: qoriq: Fix a compiling issue) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 16 + + .../devicetree/bindings/thermal/imx8mm-thermal.txt | 15 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../devicetree/bindings/thermal/sprd-thermal.yaml | 108 ++++ + Documentation/driver-api/thermal/sysfs-api.rst | 30 +- + drivers/thermal/Kconfig | 42 +- + drivers/thermal/Makefile | 3 + + drivers/thermal/imx8mm_thermal.c | 131 +++++ + drivers/thermal/imx_sc_thermal.c | 148 ++++++ + drivers/thermal/imx_thermal.c | 6 +- + drivers/thermal/of-thermal.c | 62 ++- + drivers/thermal/rcar_gen3_thermal.c | 27 +- + drivers/thermal/samsung/exynos_tmu.c | 4 +- + drivers/thermal/sprd_thermal.c | 552 +++++++++++++++++++++ + drivers/thermal/thermal_core.c | 3 +- + drivers/thermal/thermal_core.h | 2 + + drivers/thermal/thermal_sysfs.c | 77 +++ + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 44 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 4 +- + include/linux/thermal.h | 10 + + 20 files changed, 1208 insertions(+), 77 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/imx8mm-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/sprd-thermal.yaml + create mode 100644 drivers/thermal/imx8mm_thermal.c + create mode 100644 drivers/thermal/imx_sc_thermal.c + create mode 100644 drivers/thermal/sprd_thermal.c +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 (0aeb3622ea6f RDMA/hns: fix spelling mistake "attatch" -> "attach") +$ git merge rdma/for-next +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/core/cm.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cache.c | 19 +- + drivers/infiniband/core/cm.c | 7 +- + drivers/infiniband/core/cma.c | 100 +-- + drivers/infiniband/core/cma_configfs.c | 6 +- + drivers/infiniband/core/cma_priv.h | 6 +- + drivers/infiniband/core/mad_priv.h | 4 +- + drivers/infiniband/core/multicast.c | 2 +- + drivers/infiniband/core/sa_query.c | 2 +- + drivers/infiniband/core/ucma.c | 61 +- + drivers/infiniband/core/umem.c | 11 +- + drivers/infiniband/core/verbs.c | 22 +- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 24 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 921 +++++++++++++-------- + drivers/infiniband/hw/bnxt_re/main.c | 463 ++++++----- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 416 +++++----- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 94 +-- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 463 ++++++----- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 85 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 470 +++++++---- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 145 +++- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 48 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 +- + drivers/infiniband/hw/cxgb4/qp.c | 2 +- + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 8 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 7 +- + drivers/infiniband/hw/efa/efa_admin_defs.h | 4 +- + drivers/infiniband/hw/efa/efa_com.c | 158 ++-- + drivers/infiniband/hw/efa/efa_com_cmd.c | 29 +- + drivers/infiniband/hw/efa/efa_common_defs.h | 13 +- + drivers/infiniband/hw/efa/efa_regs_defs.h | 25 +- + drivers/infiniband/hw/efa/efa_verbs.c | 44 +- + drivers/infiniband/hw/hfi1/mad.c | 4 +- + drivers/infiniband/hw/hfi1/mad.h | 2 +- + drivers/infiniband/hw/hfi1/pio.h | 4 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.h | 4 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 2 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 44 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 28 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 731 +++++----------- + drivers/infiniband/hw/hns/hns_roce_qp.c | 878 ++++++++++++-------- + drivers/infiniband/hw/hns/hns_roce_srq.c | 3 +- + drivers/infiniband/hw/i40iw/i40iw_cm.h | 4 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 18 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 2 +- + drivers/infiniband/hw/mlx5/cong.c | 20 + + drivers/infiniband/hw/mlx5/main.c | 6 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 +- + drivers/infiniband/hw/mlx5/qp.c | 2 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 2 +- + drivers/infiniband/hw/mthca/mthca_memfree.h | 2 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.h | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 2 +- + drivers/infiniband/sw/rdmavt/qp.c | 2 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 7 +- + drivers/infiniband/sw/rxe/rxe_queue.h | 2 +- + drivers/infiniband/sw/siw/siw_cm.c | 137 +-- + drivers/infiniband/sw/siw/siw_verbs.c | 11 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 2 - + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 3 - + drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 - + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 4 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 2 - + .../infiniband/ulp/opa_vnic/opa_vnic_internal.h | 1 - + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 5 - + drivers/infiniband/ulp/srp/ib_srp.h | 2 +- + include/rdma/ib_cache.h | 1 + + include/rdma/ib_fmr_pool.h | 2 +- + include/rdma/ib_verbs.h | 49 +- + include/rdma/opa_vnic.h | 2 +- + include/rdma/rdmavt_mr.h | 2 +- + include/rdma/rdmavt_qp.h | 2 +- + 77 files changed, 3004 insertions(+), 2677 deletions(-) +Merging net-next/master (a8eceea84a3a inet: Use fallthrough;) +$ git merge net-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/smc/smc_ib.c +Auto-merging net/sctp/diag.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/mptcp/options.c +Auto-merging net/ipv6/seg6_iptunnel.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/udp_diag.c +Auto-merging net/ipv4/raw_diag.c +Auto-merging net/ipv4/inet_diag.c +CONFLICT (content): Merge conflict in net/ipv4/inet_diag.c +Auto-merging net/ipv4/inet_connection_sock.c +Auto-merging net/dsa/slave.c +Auto-merging net/dsa/port.c +Auto-merging net/core/sock_map.c +Auto-merging net/core/sock.c +Auto-merging net/core/devlink.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/bpf_struct_ops.c +Auto-merging include/net/drop_monitor.h +Auto-merging include/linux/sysfs.h +Auto-merging include/linux/phy.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/inet_diag.h +Auto-merging include/linux/device.h +Auto-merging fs/sysfs/group.c +CONFLICT (content): Merge conflict in fs/sysfs/group.c +Auto-merging drivers/s390/net/qeth_l3_main.c +Auto-merging drivers/s390/net/qeth_l2_main.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/s390/net/qeth_core.h +Auto-merging drivers/s390/cio/qdio_setup.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/net/wireless/mediatek/mt76/dma.c +Removing drivers/net/wireless/mediatek/mt76/airtime.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/phy/phylink.c +Auto-merging drivers/net/ethernet/sfc/tx.c +Auto-merging drivers/net/ethernet/sfc/net_driver.h +Auto-merging drivers/net/ethernet/sfc/efx_channels.c +Auto-merging drivers/net/ethernet/sfc/efx.h +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_lif.c +Removing drivers/net/ethernet/mscc/ocelot_vcap.h +Auto-merging drivers/net/ethernet/mscc/ocelot.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mscc/ocelot.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Removing drivers/net/ethernet/aquantia/atlantic/ver.h +Auto-merging drivers/net/dsa/sja1105/sja1105_main.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_ethtool.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/base/core.c +Auto-merging MAINTAINERS +Resolved 'drivers/net/ethernet/mscc/ocelot.c' using previous resolution. +Resolved 'fs/sysfs/group.c' using previous resolution. +Resolved 'net/ipv4/inet_diag.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 867484d92e08] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/bpf_devel_QA.rst | 29 +- + .../devicetree/bindings/net/dsa/ocelot.txt | 116 ++ + .../devicetree/bindings/net/qcom,ipa.yaml | 198 ++ + .../devicetree/bindings/net/qcom,ipq8064-mdio.yaml | 53 + + .../bindings/net/wireless/mediatek,mt76.txt | 29 +- + .../devicetree/bindings/net/wireless/ti,wl1251.txt | 3 +- + .../devicetree/bindings/ptp/ptp-idt82p33.yaml | 45 + + Documentation/networking/bareudp.rst | 52 + + .../networking/device_drivers/mellanox/mlx5.rst | 2 +- + Documentation/networking/devlink/devlink-trap.rst | 9 + + Documentation/networking/devlink/mlx5.rst | 6 + + Documentation/networking/ethtool-netlink.rst | 272 ++- + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.txt | 9 + + Documentation/networking/page_pool.rst | 159 ++ + Documentation/networking/sfp-phylink.rst | 49 +- + MAINTAINERS | 20 + + arch/um/drivers/vector_kern.c | 1 + + drivers/base/core.c | 120 ++ + drivers/base/power/power.h | 3 + + drivers/base/power/sysfs.c | 55 +- + drivers/crypto/chelsio/Kconfig | 11 + + drivers/crypto/chelsio/Makefile | 3 + + drivers/crypto/chelsio/chcr_common.h | 135 ++ + drivers/crypto/chelsio/chcr_core.c | 51 +- + drivers/crypto/chelsio/chcr_core.h | 7 + + drivers/crypto/chelsio/chcr_ktls.c | 2021 +++++++++++++++++++ + drivers/crypto/chelsio/chcr_ktls.h | 98 + + drivers/infiniband/hw/mlx5/main.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 2 + + drivers/net/Kconfig | 15 + + drivers/net/Makefile | 2 + + drivers/net/bareudp.c | 817 ++++++++ + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/bonding/bonding_priv.h | 5 +- + drivers/net/can/slcan.c | 7 +- + drivers/net/dsa/b53/b53_common.c | 4 +- + drivers/net/dsa/b53/b53_priv.h | 4 +- + drivers/net/dsa/bcm_sf2.c | 4 +- + drivers/net/dsa/lantiq_gswip.c | 4 +- + drivers/net/dsa/microchip/ksz_common.c | 26 +- + drivers/net/dsa/microchip/ksz_common.h | 3 +- + drivers/net/dsa/mt7530.c | 64 +- + drivers/net/dsa/mt7530.h | 7 + + drivers/net/dsa/mv88e6xxx/chip.c | 123 +- + drivers/net/dsa/mv88e6xxx/chip.h | 5 + + drivers/net/dsa/mv88e6xxx/serdes.c | 77 + + drivers/net/dsa/mv88e6xxx/serdes.h | 5 + + drivers/net/dsa/ocelot/felix.c | 54 +- + drivers/net/dsa/ocelot/felix.h | 3 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 134 +- + drivers/net/dsa/qca/ar9331.c | 4 +- + drivers/net/dsa/sja1105/sja1105_main.c | 5 +- + drivers/net/dummy.c | 3 - + drivers/net/ethernet/3com/3c509.c | 8 +- + drivers/net/ethernet/3com/3c515.c | 16 +- + drivers/net/ethernet/3com/3c589_cs.c | 2 - + drivers/net/ethernet/3com/typhoon.c | 1 - + drivers/net/ethernet/adaptec/starfire.c | 19 +- + drivers/net/ethernet/aeroflex/greth.c | 2 - + drivers/net/ethernet/agere/et131x.c | 1 - + drivers/net/ethernet/agere/et131x.h | 1 - + drivers/net/ethernet/alacritech/slicoss.c | 3 - + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 - + drivers/net/ethernet/alteon/acenic.c | 5 +- + drivers/net/ethernet/altera/altera_tse_ethtool.c | 1 - + drivers/net/ethernet/amazon/ena/ena_com.c | 4 - + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 7 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 17 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 16 +- + drivers/net/ethernet/amd/amd8111e.c | 5 +- + drivers/net/ethernet/amd/au1000_eth.c | 5 - + drivers/net/ethernet/amd/nmclan_cs.c | 9 +- + drivers/net/ethernet/amd/pcnet32.c | 7 - + drivers/net/ethernet/amd/sunlance.c | 10 - + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 27 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe.h | 1 - + drivers/net/ethernet/apm/xgene-v2/ethtool.c | 2 - + drivers/net/ethernet/apm/xgene-v2/main.c | 1 - + drivers/net/ethernet/apm/xgene-v2/main.h | 1 - + .../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 2 - + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 1 - + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 - + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 4 - + drivers/net/ethernet/aquantia/atlantic/aq_common.h | 1 - + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 16 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 1 - + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 2 +- + drivers/net/ethernet/aquantia/atlantic/ver.h | 12 - + drivers/net/ethernet/arc/emac.h | 1 - + drivers/net/ethernet/arc/emac_arc.c | 2 - + drivers/net/ethernet/arc/emac_main.c | 1 - + drivers/net/ethernet/arc/emac_rockchip.c | 2 - + drivers/net/ethernet/atheros/Kconfig | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 188 +- + drivers/net/ethernet/atheros/alx/main.c | 5 +- + drivers/net/ethernet/atheros/atl1c/atl1c.h | 1 - + drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 2 - + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 11 +- + drivers/net/ethernet/atheros/atl1e/atl1e.h | 1 - + drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 2 - + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 - + drivers/net/ethernet/atheros/atlx/atl1.c | 6 - + drivers/net/ethernet/atheros/atlx/atl2.c | 10 - + drivers/net/ethernet/broadcom/b44.c | 5 - + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 11 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 7 +- + drivers/net/ethernet/broadcom/bnx2.c | 16 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 8 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 7 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 125 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 19 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 9 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 1 - + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 70 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 81 +- + drivers/net/ethernet/broadcom/tg3.c | 16 +- + drivers/net/ethernet/brocade/bna/bnad.c | 11 +- + drivers/net/ethernet/brocade/bna/bnad.h | 4 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 4 +- + drivers/net/ethernet/cadence/macb.h | 1 - + drivers/net/ethernet/cadence/macb_main.c | 57 +- + drivers/net/ethernet/cavium/common/cavium_ptp.c | 10 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 13 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 8 - + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 5 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 6 - + .../net/ethernet/cavium/liquidio/octeon_console.c | 12 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 6 - + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 - + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 9 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 4 +- + drivers/net/ethernet/chelsio/cxgb/common.h | 1 - + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 6 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 5 +- + drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h | 2 +- + drivers/net/ethernet/chelsio/cxgb3/version.h | 2 - + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 8 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 37 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 10 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 10 - + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 8 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h | 3 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 3 +- + .../ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 32 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 20 + + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/sched.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 5 + + drivers/net/ethernet/chelsio/cxgb4/smt.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 30 +- + drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h | 62 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 4 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 11 +- + drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c | 2 - + drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h | 4 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 - + drivers/net/ethernet/cisco/enic/enic.h | 2 - + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 24 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 6 +- + drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 8 +- + drivers/net/ethernet/cisco/enic/vnic_vic.h | 2 +- + drivers/net/ethernet/cortina/gemini.c | 4 +- + drivers/net/ethernet/davicom/dm9000.c | 2 - + drivers/net/ethernet/dec/tulip/de2104x.c | 15 - + drivers/net/ethernet/dec/tulip/dmfe.c | 14 - + drivers/net/ethernet/dec/tulip/tulip.h | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 26 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 13 - + drivers/net/ethernet/dec/tulip/winbond-840.c | 12 - + drivers/net/ethernet/dlink/dl2k.c | 9 - + drivers/net/ethernet/dlink/sundance.c | 20 - + drivers/net/ethernet/dnet.c | 1 - + drivers/net/ethernet/dnet.h | 1 - + drivers/net/ethernet/emulex/benet/be.h | 1 - + drivers/net/ethernet/emulex/benet/be_ethtool.c | 4 +- + drivers/net/ethernet/emulex/benet/be_main.c | 5 +- + drivers/net/ethernet/faraday/ftgmac100.c | 5 - + drivers/net/ethernet/faraday/ftmac100.c | 3 - + drivers/net/ethernet/fealnx.c | 20 - + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 16 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 17 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 7 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 11 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 61 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 1 + + drivers/net/ethernet/freescale/enetc/Kconfig | 16 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 70 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 35 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 22 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 11 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 18 - + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 12 - + drivers/net/ethernet/freescale/fec.h | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 4 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 50 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 10 +- + drivers/net/ethernet/freescale/fman/fman_tgec.c | 10 +- + drivers/net/ethernet/freescale/fman/mac.c | 13 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 - + drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 2 - + drivers/net/ethernet/freescale/gianfar.c | 2 - + drivers/net/ethernet/freescale/gianfar.h | 1 - + drivers/net/ethernet/freescale/gianfar_ethtool.c | 35 +- + drivers/net/ethernet/freescale/ucc_geth.c | 1 - + drivers/net/ethernet/freescale/ucc_geth.h | 1 - + drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 2 - + drivers/net/ethernet/hisilicon/hip04_eth.c | 16 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 5 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 9 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 159 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 3 - + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 32 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 1 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 +- + drivers/net/ethernet/ibm/emac/core.c | 3 +- + drivers/net/ethernet/ibm/ibmveth.c | 59 +- + drivers/net/ethernet/ibm/ibmveth.h | 3 + + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 1 + + drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 3 + + drivers/net/ethernet/intel/e1000e/hw.h | 6 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 7 + + drivers/net/ethernet/intel/e1000e/mac.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 14 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 1 + + drivers/net/ethernet/intel/fm10k/fm10k.h | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 + + drivers/net/ethernet/intel/i40e/i40e.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 5 + + drivers/net/ethernet/intel/iavf/iavf.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 24 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 10 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 27 - + drivers/net/ethernet/intel/ice/ice.h | 11 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 11 + + drivers/net/ethernet/intel/ice/ice_base.c | 54 +- + drivers/net/ethernet/intel/ice/ice_base.h | 4 +- + drivers/net/ethernet/intel/ice/ice_common.c | 10 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 84 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 1 + + drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 58 +- + drivers/net/ethernet/intel/ice/ice_devids.h | 26 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 134 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 65 +- + drivers/net/ethernet/intel/ice/ice_flow.c | 8 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 5 + + drivers/net/ethernet/intel/ice/ice_lib.c | 325 ++-- + drivers/net/ethernet/intel/ice/ice_lib.h | 10 +- + drivers/net/ethernet/intel/ice/ice_main.c | 241 ++- + drivers/net/ethernet/intel/ice/ice_nvm.c | 32 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 2 - + drivers/net/ethernet/intel/ice/ice_switch.c | 24 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 5 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 711 ++++--- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 45 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 36 +- + drivers/net/ethernet/intel/ice/ice_xsk.h | 4 +- + drivers/net/ethernet/intel/igb/igb.h | 2 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 22 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 1 + + drivers/net/ethernet/intel/igc/Makefile | 2 +- + drivers/net/ethernet/intel/igc/igc.h | 12 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 6 + + drivers/net/ethernet/intel/igc/igc_dump.c | 323 +++ + drivers/net/ethernet/intel/igc/igc_ethtool.c | 83 +- + drivers/net/ethernet/intel/igc/igc_main.c | 144 ++ + drivers/net/ethernet/intel/igc/igc_ptp.c | 2 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 5 + + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 17 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 1 + + drivers/net/ethernet/jme.c | 7 +- + drivers/net/ethernet/marvell/mvneta.c | 363 +++- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 6 + + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 102 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 192 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 16 +- + .../net/ethernet/marvell/octeontx2/af/cgx_fw_if.h | 8 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 38 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 165 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 32 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 79 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 287 ++- + .../net/ethernet/marvell/octeontx2/af/rvu_npa.c | 13 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 68 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 7 + + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 41 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 12 + + drivers/net/ethernet/marvell/skge.h | 8 +- + drivers/net/ethernet/marvell/sky2.h | 8 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 10 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 40 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 6 + + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.c | 286 +++ + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.h | 58 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 38 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 45 + + .../net/ethernet/mellanox/mlx5/core/en/devlink.h | 14 + + .../net/ethernet/mellanox/mlx5/core/en/health.c | 107 +- + .../net/ethernet/mellanox/mlx5/core/en/health.h | 8 +- + .../net/ethernet/mellanox/mlx5/core/en/mapping.c | 218 +++ + .../net/ethernet/mellanox/mlx5/core/en/mapping.h | 27 + + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 253 ++- + drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 8 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 266 ++- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 181 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 1356 +++++++++++++ + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 171 ++ + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 112 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 3 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 55 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 134 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 206 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 173 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 12 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 72 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1113 ++++++++--- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 54 + + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 22 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 36 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 585 +++++- + .../mellanox/mlx5/core/eswitch_offloads_chains.c | 198 +- + .../mellanox/mlx5/core/eswitch_offloads_chains.h | 19 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 19 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 40 + + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 3 + + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 4 +- + .../net/ethernet/mellanox/mlx5/core/lib/crypto.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 + + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 130 +- + .../mellanox/mlx5/core/steering/dr_action.c | 10 +- + .../mellanox/mlx5/core/steering/dr_domain.c | 17 +- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 2 +- + .../mellanox/mlx5/core/steering/dr_matcher.c | 12 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 18 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 16 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 2 +- + .../mellanox/mlx5/core/steering/dr_table.c | 8 +- + .../mellanox/mlx5/core/steering/dr_types.h | 2 +- + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 2 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 4 +- + drivers/net/ethernet/mellanox/mlxfw/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 50 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 296 ++- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 2 +- + .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 134 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 101 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 390 +++- + .../mellanox/mlxsw/core_acl_flex_actions.h | 7 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 9 + + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 7 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 26 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 161 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 61 +- + .../net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 80 +- + .../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 2 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 4 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c | 25 +- + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 35 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 13 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 39 +- + .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 18 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 54 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 28 +- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 258 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 381 ++-- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 43 + + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 102 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 263 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 306 +-- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 2 + + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 82 +- + drivers/net/ethernet/mscc/ocelot.h | 10 - + drivers/net/ethernet/mscc/ocelot_ace.c | 561 +++--- + drivers/net/ethernet/mscc/ocelot_ace.h | 26 +- + drivers/net/ethernet/mscc/ocelot_board.c | 163 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 262 +-- + drivers/net/ethernet/mscc/ocelot_tc.c | 22 +- + drivers/net/ethernet/mscc/ocelot_vcap.h | 403 ---- + drivers/net/ethernet/natsemi/jazzsonic.c | 31 +- + drivers/net/ethernet/natsemi/macsonic.c | 48 +- + drivers/net/ethernet/natsemi/sonic.c | 66 +- + drivers/net/ethernet/natsemi/sonic.h | 2 +- + drivers/net/ethernet/natsemi/xtsonic.c | 40 +- + drivers/net/ethernet/netronome/nfp/bpf/fw.h | 6 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 4 + + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 4 +- + drivers/net/ethernet/netronome/nfp/nfp_main.h | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_debugdump.c | 8 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 22 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.h | 2 +- + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 24 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 2 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 3 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 27 +- + .../net/ethernet/pensando/ionic/ionic_devlink.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 48 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 38 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 53 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 15 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 20 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 9 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 2 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 10 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 8 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 7 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 36 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 13 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 3 +- + drivers/net/ethernet/realtek/r8169_main.c | 313 ++- + drivers/net/ethernet/renesas/sh_eth.c | 104 +- + drivers/net/ethernet/renesas/sh_eth.h | 2 +- + drivers/net/ethernet/sfc/efx.c | 1 - + drivers/net/ethernet/sfc/efx.h | 18 - + drivers/net/ethernet/sfc/efx_channels.c | 25 +- + drivers/net/ethernet/sfc/ethtool.c | 36 +- + drivers/net/ethernet/sfc/falcon/net_driver.h | 2 +- + drivers/net/ethernet/sfc/net_driver.h | 2 +- + drivers/net/ethernet/sfc/tx.c | 3 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 29 +- + drivers/net/ethernet/socionext/netsec.c | 29 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 3 + + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 12 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 16 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 98 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 27 + + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 35 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 9 +- + drivers/net/ethernet/sun/cassini.c | 28 +- + drivers/net/ethernet/sun/sungem.c | 30 +- + drivers/net/ethernet/tehuti/tehuti.h | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.h | 2 +- + drivers/net/ethernet/toshiba/spider_net.h | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac.h | 8 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 198 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 37 +- + drivers/net/fddi/skfp/drvfbi.c | 4 +- + drivers/net/fddi/skfp/h/skfbi.h | 5 - + drivers/net/hyperv/netvsc_drv.c | 46 +- + drivers/net/ipa/Kconfig | 19 + + drivers/net/ipa/Makefile | 12 + + drivers/net/ipa/gsi.c | 2055 ++++++++++++++++++++ + drivers/net/ipa/gsi.h | 257 +++ + drivers/net/ipa/gsi_private.h | 118 ++ + drivers/net/ipa/gsi_reg.h | 417 ++++ + drivers/net/ipa/gsi_trans.c | 786 ++++++++ + drivers/net/ipa/gsi_trans.h | 226 +++ + drivers/net/ipa/ipa.h | 148 ++ + drivers/net/ipa/ipa_clock.c | 313 +++ + drivers/net/ipa/ipa_clock.h | 53 + + drivers/net/ipa/ipa_cmd.c | 680 +++++++ + drivers/net/ipa/ipa_cmd.h | 195 ++ + drivers/net/ipa/ipa_data-sc7180.c | 307 +++ + drivers/net/ipa/ipa_data-sdm845.c | 329 ++++ + drivers/net/ipa/ipa_data.h | 280 +++ + drivers/net/ipa/ipa_endpoint.c | 1707 ++++++++++++++++ + drivers/net/ipa/ipa_endpoint.h | 110 ++ + drivers/net/ipa/ipa_gsi.c | 54 + + drivers/net/ipa/ipa_gsi.h | 60 + + drivers/net/ipa/ipa_interrupt.c | 253 +++ + drivers/net/ipa/ipa_interrupt.h | 117 ++ + drivers/net/ipa/ipa_main.c | 954 +++++++++ + drivers/net/ipa/ipa_mem.c | 314 +++ + drivers/net/ipa/ipa_mem.h | 90 + + drivers/net/ipa/ipa_modem.c | 383 ++++ + drivers/net/ipa/ipa_modem.h | 31 + + drivers/net/ipa/ipa_qmi.c | 538 +++++ + drivers/net/ipa/ipa_qmi.h | 41 + + drivers/net/ipa/ipa_qmi_msg.c | 663 +++++++ + drivers/net/ipa/ipa_qmi_msg.h | 252 +++ + drivers/net/ipa/ipa_reg.c | 38 + + drivers/net/ipa/ipa_reg.h | 476 +++++ + drivers/net/ipa/ipa_smp2p.c | 335 ++++ + drivers/net/ipa/ipa_smp2p.h | 48 + + drivers/net/ipa/ipa_table.c | 700 +++++++ + drivers/net/ipa/ipa_table.h | 103 + + drivers/net/ipa/ipa_uc.c | 211 ++ + drivers/net/ipa/ipa_uc.h | 32 + + drivers/net/ipa/ipa_version.h | 23 + + drivers/net/netdevsim/dev.c | 117 +- + drivers/net/netdevsim/netdevsim.h | 2 + + drivers/net/phy/Kconfig | 18 +- + drivers/net/phy/Makefile | 5 +- + drivers/net/phy/broadcom.c | 24 +- + drivers/net/phy/dp83867.c | 150 ++ + drivers/net/phy/linkmode.c | 95 + + drivers/net/phy/marvell10g.c | 318 ++- + drivers/net/phy/mdio-ipq8064.c | 166 ++ + drivers/net/phy/mdio-xpcs.c | 612 ++++++ + drivers/net/phy/mdio_bus.c | 17 + + drivers/net/phy/mscc.c | 16 +- + drivers/net/phy/phy-c45.c | 5 +- + drivers/net/phy/phy-core.c | 2 +- + drivers/net/phy/phy_device.c | 48 +- + drivers/net/phy/phylink.c | 176 +- + drivers/net/slip/slip.c | 7 +- + drivers/net/tun.c | 108 +- + drivers/net/usb/cdc-phonet.c | 2 +- + drivers/net/usb/cdc_ncm.c | 411 +++- + drivers/net/usb/huawei_cdc_ncm.c | 8 +- + drivers/net/usb/r8152.c | 33 +- + drivers/net/virtio_net.c | 109 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 5 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 24 +- + drivers/net/wan/farsync.h | 2 +- + drivers/net/wan/wanxl.c | 2 +- + drivers/net/wireless/ath/ath10k/mac.c | 3 +- + drivers/net/wireless/ath/ath9k/main.c | 3 + + drivers/net/wireless/ath/ath9k/xmit.c | 7 +- + drivers/net/wireless/ath/wil6210/ethtool.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 + + .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 12 +- + drivers/net/wireless/marvell/mwifiex/11ac.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11ac.h | 8 +- + drivers/net/wireless/marvell/mwifiex/11h.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11n.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11n.h | 8 +- + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11n_aggr.h | 8 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 8 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.h | 8 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.h | 8 +- + drivers/net/wireless/marvell/mwifiex/cfp.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 8 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 8 +- + drivers/net/wireless/marvell/mwifiex/decl.h | 8 +- + drivers/net/wireless/marvell/mwifiex/ethtool.c | 8 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 8 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 8 +- + drivers/net/wireless/marvell/mwifiex/init.c | 8 +- + drivers/net/wireless/marvell/mwifiex/ioctl.h | 8 +- + drivers/net/wireless/marvell/mwifiex/join.c | 8 +- + drivers/net/wireless/marvell/mwifiex/main.c | 8 +- + drivers/net/wireless/marvell/mwifiex/main.h | 8 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 8 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 6 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sdio.h | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_rx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_tx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 9 +- + drivers/net/wireless/marvell/mwifiex/txrx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 8 +- + drivers/net/wireless/marvell/mwifiex/uap_event.c | 8 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 8 +- + drivers/net/wireless/marvell/mwifiex/usb.h | 6 +- + drivers/net/wireless/marvell/mwifiex/util.c | 8 +- + drivers/net/wireless/marvell/mwifiex/util.h | 8 +- + drivers/net/wireless/marvell/mwifiex/wmm.c | 8 +- + drivers/net/wireless/marvell/mwifiex/wmm.h | 8 +- + drivers/net/wireless/mediatek/mt76/Makefile | 2 +- + drivers/net/wireless/mediatek/mt76/agg-rx.c | 17 +- + drivers/net/wireless/mediatek/mt76/airtime.c | 326 ---- + drivers/net/wireless/mediatek/mt76/dma.c | 49 +- + drivers/net/wireless/mediatek/mt76/eeprom.c | 20 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 392 ++-- + drivers/net/wireless/mediatek/mt76/mcu.c | 12 +- + drivers/net/wireless/mediatek/mt76/mmio.c | 3 - + drivers/net/wireless/mediatek/mt76/mt76.h | 165 +- + drivers/net/wireless/mediatek/mt76/mt7603/core.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 21 +- + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 22 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 39 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 25 +- + drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 22 +- + drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 7 +- + drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 15 +- + drivers/net/wireless/mediatek/mt76/mt7615/Kconfig | 11 + + drivers/net/wireless/mediatek/mt76/mt7615/Makefile | 7 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 120 +- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 178 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 38 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h | 3 +- + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 350 +++- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 991 +++++++--- + drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 77 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 380 +++- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 1051 ++++++---- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.h | 126 +- + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 115 ++ + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 203 +- + .../wireless/mediatek/mt76/mt7615/mt7615_trace.h | 56 + + drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 98 +- + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 163 +- + drivers/net/wireless/mediatek/mt76/mt7615/soc.c | 77 + + drivers/net/wireless/mediatek/mt76/mt7615/trace.c | 12 + + drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 8 +- + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 9 +- + .../net/wireless/mediatek/mt76/mt76x0/pci_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 32 +- + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 31 +- + .../net/wireless/mediatek/mt76/mt76x0/usb_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02.h | 13 +- + .../net/wireless/mediatek/mt76/mt76x02_beacon.c | 91 +- + drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 43 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 5 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 31 +- + drivers/net/wireless/mediatek/mt76/mt76x02_phy.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x02_phy.h | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 12 +- + drivers/net/wireless/mediatek/mt76/mt76x02_trace.h | 46 - + drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c | 7 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 61 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 28 +- + drivers/net/wireless/mediatek/mt76/mt76x2/Makefile | 2 - + drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_init.c | 6 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_main.c | 25 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_phy.c | 8 +- + drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 26 +- + drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 4 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_init.c | 20 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_main.c | 19 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_phy.c | 6 +- + drivers/net/wireless/mediatek/mt76/trace.c | 3 + + drivers/net/wireless/mediatek/mt76/trace.h | 54 +- + drivers/net/wireless/mediatek/mt76/tx.c | 85 +- + drivers/net/wireless/mediatek/mt76/usb.c | 455 +++-- + drivers/net/wireless/mediatek/mt76/util.c | 8 +- + drivers/net/wireless/mediatek/mt76/util.h | 14 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 64 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 651 +++---- + drivers/net/wireless/quantenna/qtnfmac/commands.h | 4 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 47 +- + drivers/net/wireless/quantenna/qtnfmac/core.h | 26 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 67 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 329 +++- + .../net/wireless/quantenna/qtnfmac/qlink_util.h | 45 +- + drivers/net/wireless/realtek/rtw88/bf.c | 6 +- + drivers/net/wireless/realtek/rtw88/coex.c | 3 + + drivers/net/wireless/realtek/rtw88/fw.c | 11 +- + drivers/net/wireless/realtek/rtw88/hci.h | 26 + + drivers/net/wireless/realtek/rtw88/mac.c | 25 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 37 +- + drivers/net/wireless/realtek/rtw88/main.c | 19 +- + drivers/net/wireless/realtek/rtw88/main.h | 32 +- + drivers/net/wireless/realtek/rtw88/pci.c | 9 +- + drivers/net/wireless/realtek/rtw88/pci.h | 1 + + drivers/net/wireless/realtek/rtw88/phy.c | 10 - + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 30 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 50 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 5 + + drivers/net/wireless/rsi/rsi_91x_sdio.c | 9 +- + drivers/net/wireless/ti/wl1251/sdio.c | 32 +- + drivers/nfc/fdp/fdp.c | 2 +- + drivers/nfc/st21nfca/dep.c | 4 +- + drivers/pci/pci-bridge-emul.c | 14 +- + drivers/pci/pci.c | 57 + + drivers/ptp/Kconfig | 24 + + drivers/ptp/Makefile | 2 + + drivers/ptp/ptp_idt82p33.c | 1008 ++++++++++ + drivers/ptp/ptp_idt82p33.h | 171 ++ + drivers/ptp/ptp_qoriq.c | 29 +- + drivers/ptp/ptp_vmw.c | 144 ++ + drivers/remoteproc/Kconfig | 6 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/qcom_q6v5_ipa_notify.c | 85 + + drivers/remoteproc/qcom_q6v5_mss.c | 38 + + drivers/s390/cio/qdio_setup.c | 11 +- + drivers/s390/net/qeth_core.h | 10 +- + drivers/s390/net/qeth_core_main.c | 41 +- + drivers/s390/net/qeth_core_mpc.h | 10 +- + drivers/s390/net/qeth_ethtool.c | 31 + + drivers/s390/net/qeth_l2_main.c | 29 +- + drivers/s390/net/qeth_l3_main.c | 16 +- + drivers/scsi/qedf/qedf_main.c | 18 +- + drivers/staging/qlge/qlge_ethtool.c | 2 + + fs/sysfs/file.c | 148 ++ + fs/sysfs/group.c | 115 ++ + include/linux/bitfield.h | 14 + + include/linux/bpf-cgroup.h | 2 +- + include/linux/bpf.h | 41 +- + include/linux/dccp.h | 2 +- + include/linux/device.h | 1 + + include/linux/ethtool.h | 64 +- + include/linux/filter.h | 37 +- + include/linux/fsl/ptp_qoriq.h | 2 - + include/linux/ieee80211.h | 26 +- + include/linux/inet_diag.h | 27 +- + include/linux/kernel.h | 7 + + include/linux/linkmode.h | 8 +- + include/linux/mdio-xpcs.h | 41 + + include/linux/mlx5/driver.h | 12 +- + include/linux/mlx5/eswitch.h | 38 +- + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 37 +- + include/linux/mlx5/mlx5_ifc_fpga.h | 2 +- + include/linux/netdevice.h | 11 +- + include/linux/netlink.h | 4 +- + include/linux/pci.h | 13 + + include/linux/phy.h | 4 + + include/linux/phylink.h | 83 +- + include/linux/preempt.h | 30 + + include/linux/remoteproc/qcom_q6v5_ipa_notify.h | 82 + + include/linux/skbuff.h | 12 +- + include/linux/skmsg.h | 20 +- + include/linux/stmmac.h | 1 + + include/linux/sysfs.h | 46 + + include/linux/usb/cdc_ncm.h | 15 +- + include/net/act_api.h | 4 + + include/net/af_unix.h | 4 +- + include/net/bareudp.h | 20 + + include/net/bonding.h | 2 +- + include/net/bpf_sk_storage.h | 27 + + include/net/cfg80211.h | 179 +- + include/net/devlink.h | 22 +- + include/net/dn_fib.h | 2 +- + include/net/drop_monitor.h | 3 + + include/net/dsa.h | 10 +- + include/net/flow_offload.h | 117 +- + include/net/inet_sock.h | 2 +- + include/net/ip6_checksum.h | 9 + + include/net/ip6_fib.h | 2 +- + include/net/ip6_route.h | 2 +- + include/net/ip_fib.h | 4 +- + include/net/ipv6.h | 6 + + include/net/lwtunnel.h | 2 +- + include/net/mac80211.h | 50 +- + include/net/mip6.h | 2 +- + include/net/mld.h | 6 +- + include/net/mpls_iptunnel.h | 2 +- + include/net/ndisc.h | 6 +- + include/net/neighbour.h | 2 +- + include/net/netfilter/nf_flow_table.h | 32 + + include/net/netns/ipv4.h | 1 + + include/net/nexthop.h | 2 +- + include/net/nfc/nci.h | 14 +- + include/net/nfc/nfc.h | 2 +- + include/net/page_pool.h | 36 +- + include/net/pie.h | 31 +- + include/net/pkt_cls.h | 30 +- + include/net/pkt_sched.h | 2 +- + include/net/route.h | 6 + + include/net/sch_generic.h | 3 + + include/net/sctp/structs.h | 2 +- + include/net/sock.h | 37 +- + include/net/sock_reuseport.h | 4 +- + include/net/tc_act/tc_ct.h | 25 +- + include/net/tc_act/tc_police.h | 6 +- + include/net/tc_act/tc_tunnel_key.h | 2 +- + include/net/tcp.h | 7 + + include/soc/mscc/ocelot.h | 92 +- + include/soc/mscc/ocelot_vcap.h | 205 ++ + include/uapi/linux/bpf.h | 27 +- + include/uapi/linux/devlink.h | 3 + + include/uapi/linux/ethtool.h | 4 +- + include/uapi/linux/ethtool_netlink.h | 82 + + include/uapi/linux/if_arcnet.h | 6 +- + include/uapi/linux/if_link.h | 12 + + include/uapi/linux/inet_diag.h | 5 +- + include/uapi/linux/net_dropmon.h | 5 +- + include/uapi/linux/nl80211.h | 168 ++ + include/uapi/linux/openvswitch.h | 7 + + include/uapi/linux/pkt_cls.h | 22 + + include/uapi/linux/sock_diag.h | 26 + + include/uapi/linux/tcp.h | 3 + + include/uapi/linux/wireless.h | 5 +- + kernel/bpf/bpf_struct_ops.c | 2 +- + kernel/bpf/hashtab.c | 174 +- + kernel/bpf/lpm_trie.c | 14 +- + kernel/bpf/percpu_freelist.c | 20 +- + kernel/bpf/reuseport_array.c | 5 - + kernel/bpf/stackmap.c | 18 +- + kernel/bpf/syscall.c | 42 +- + kernel/bpf/trampoline.c | 9 +- + kernel/bpf/verifier.c | 50 +- + kernel/events/core.c | 2 - + kernel/seccomp.c | 4 +- + kernel/trace/bpf_trace.c | 52 +- + kernel/trace/trace_uprobe.c | 11 +- + lib/objagg.c | 4 +- + lib/test_bpf.c | 4 +- + net/802/psnap.c | 2 +- + net/8021q/vlan_core.c | 5 +- + net/batman-adv/distributed-arp-table.c | 2 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/translation-table.c | 8 +- + net/bpf/test_run.c | 8 +- + net/core/bpf_sk_storage.c | 285 ++- + net/core/datagram.c | 25 +- + net/core/dev.c | 13 +- + net/core/devlink.c | 115 +- + net/core/drop_monitor.c | 35 +- + net/core/filter.c | 28 +- + net/core/flow_dissector.c | 4 +- + net/core/flow_offload.c | 28 + + net/core/neighbour.c | 3 - + net/core/net-sysfs.c | 133 ++ + net/core/net-sysfs.h | 2 + + net/core/page_pool.c | 70 +- + net/core/pktgen.c | 4 +- + net/core/rtnetlink.c | 18 +- + net/core/skmsg.c | 10 +- + net/core/sock.c | 14 +- + net/core/sock_map.c | 169 +- + net/core/sock_reuseport.c | 50 +- + net/core/xdp.c | 2 +- + net/dccp/ccid.h | 2 +- + net/dccp/diag.c | 9 +- + net/dccp/minisocks.c | 1 + + net/dsa/port.c | 7 +- + net/dsa/slave.c | 64 + + net/dsa/tag_ocelot.c | 3 +- + net/ethtool/Makefile | 3 +- + net/ethtool/bitset.c | 94 + + net/ethtool/bitset.h | 4 + + net/ethtool/channels.c | 227 +++ + net/ethtool/common.c | 32 + + net/ethtool/common.h | 3 + + net/ethtool/debug.c | 6 +- + net/ethtool/features.c | 304 +++ + net/ethtool/ioctl.c | 157 +- + net/ethtool/linkinfo.c | 6 +- + net/ethtool/linkmodes.c | 7 +- + net/ethtool/netlink.c | 99 +- + net/ethtool/netlink.h | 15 +- + net/ethtool/privflags.c | 209 ++ + net/ethtool/rings.c | 200 ++ + net/ethtool/wol.c | 5 +- + net/hsr/hsr_debugfs.c | 5 +- + net/hsr/hsr_device.c | 64 +- + net/hsr/hsr_device.h | 3 +- + net/hsr/hsr_framereg.c | 3 +- + net/hsr/hsr_main.c | 3 +- + net/hsr/hsr_main.h | 1 - + net/hsr/hsr_netlink.c | 49 +- + net/hsr/hsr_slave.c | 63 +- + net/hsr/hsr_slave.h | 2 +- + net/ipv4/af_inet.c | 4 +- + net/ipv4/ah4.c | 2 +- + net/ipv4/arp.c | 2 +- + net/ipv4/devinet.c | 6 +- + net/ipv4/fib_semantics.c | 4 +- + net/ipv4/fib_trie.c | 5 - + net/ipv4/icmp.c | 2 +- + net/ipv4/igmp.c | 2 - + net/ipv4/inet_connection_sock.c | 36 +- + net/ipv4/inet_diag.c | 307 +-- + net/ipv4/ip_output.c | 2 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/netfilter/nf_log_ipv4.c | 2 +- + net/ipv4/netfilter/nf_nat_pptp.c | 4 +- + net/ipv4/nexthop.c | 2 +- + net/ipv4/raw.c | 2 + + net/ipv4/raw_diag.c | 24 +- + net/ipv4/route.c | 48 + + net/ipv4/sysctl_net_ipv4.c | 33 +- + net/ipv4/tcp.c | 29 +- + net/ipv4/tcp_bpf.c | 18 +- + net/ipv4/tcp_diag.c | 8 +- + net/ipv4/tcp_input.c | 6 +- + net/ipv4/tcp_ipv4.c | 10 +- + net/ipv4/tcp_minisocks.c | 3 + + net/ipv4/tcp_ulp.c | 6 +- + net/ipv4/udp.c | 16 +- + net/ipv4/udp_diag.c | 41 +- + net/ipv6/addrconf.c | 6 +- + net/ipv6/ah6.c | 4 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/icmp.c | 2 +- + net/ipv6/ip6_fib.c | 8 +- + net/ipv6/ip6_output.c | 70 + + net/ipv6/ip6mr.c | 5 +- + net/ipv6/ndisc.c | 2 +- + net/ipv6/netfilter/nf_log_ipv6.c | 2 +- + net/ipv6/raw.c | 8 +- + net/ipv6/route.c | 2 +- + net/ipv6/seg6_iptunnel.c | 2 +- + net/ipv6/sysctl_net_ipv6.c | 21 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/kcm/kcmsock.c | 4 +- + net/l2tp/l2tp_core.h | 2 +- + net/llc/af_llc.c | 2 +- + net/llc/llc_proc.c | 2 +- + net/mac80211/aes_cmac.c | 21 +- + net/mac80211/aes_gmac.c | 24 +- + net/mac80211/cfg.c | 177 +- + net/mac80211/debugfs.c | 56 +- + net/mac80211/debugfs_key.c | 31 + + net/mac80211/debugfs_key.h | 10 + + net/mac80211/debugfs_netdev.c | 13 +- + net/mac80211/debugfs_sta.c | 6 +- + net/mac80211/driver-ops.h | 27 + + net/mac80211/he.c | 4 + + net/mac80211/ht.c | 64 +- + net/mac80211/ieee80211_i.h | 31 +- + net/mac80211/iface.c | 82 +- + net/mac80211/key.c | 59 +- + net/mac80211/key.h | 3 + + net/mac80211/main.c | 31 +- + net/mac80211/mlme.c | 139 +- + net/mac80211/rx.c | 93 +- + net/mac80211/scan.c | 3 +- + net/mac80211/sta_info.c | 16 +- + net/mac80211/sta_info.h | 4 +- + net/mac80211/status.c | 91 +- + net/mac80211/tx.c | 202 +- + net/mac80211/util.c | 83 +- + net/mac80211/vht.c | 58 +- + net/mac80211/wep.c | 4 +- + net/mac80211/wep.h | 2 +- + net/mpls/internal.h | 4 +- + net/mptcp/options.c | 16 +- + net/mptcp/protocol.c | 402 +++- + net/mptcp/protocol.h | 11 +- + net/mptcp/subflow.c | 32 +- + net/netfilter/nf_flow_table_core.c | 60 + + net/netfilter/nf_flow_table_ip.c | 15 +- + net/netfilter/nf_flow_table_offload.c | 27 +- + net/netlink/af_netlink.c | 3 +- + net/netrom/af_netrom.c | 2 + + net/netrom/nr_route.c | 4 + + net/nfc/digital_dep.c | 4 +- + net/openvswitch/actions.c | 67 + + net/openvswitch/flow_netlink.c | 70 + + net/qrtr/Makefile | 2 +- + net/qrtr/ns.c | 757 +++++++ + net/qrtr/qrtr.c | 43 +- + net/qrtr/qrtr.h | 4 + + net/sched/Kconfig | 2 +- + net/sched/act_api.c | 36 + + net/sched/act_ct.c | 569 +++++- + net/sched/act_sample.c | 2 - + net/sched/cls_api.c | 162 +- + net/sched/cls_flower.c | 6 +- + net/sched/cls_matchall.c | 4 +- + net/sched/em_ipt.c | 2 +- + net/sched/em_nbyte.c | 2 +- + net/sched/sch_atm.c | 2 +- + net/sched/sch_fifo.c | 97 +- + net/sched/sch_fq_pie.c | 1 - + net/sched/sch_generic.c | 8 + + net/sched/sch_ingress.c | 11 +- + net/sched/sch_netem.c | 2 +- + net/sched/sch_pie.c | 49 +- + net/sctp/diag.c | 7 +- + net/sctp/input.c | 1 + + net/sctp/socket.c | 4 +- + net/smc/smc_clc.c | 5 +- + net/smc/smc_core.c | 26 +- + net/smc/smc_core.h | 8 +- + net/smc/smc_ib.c | 63 +- + net/smc/smc_ib.h | 1 + + net/smc/smc_llc.c | 2 +- + net/smc/smc_tx.c | 2 +- + net/switchdev/switchdev.c | 11 +- + net/tls/tls_main.c | 3 +- + net/unix/af_unix.c | 29 +- + net/vmw_vsock/virtio_transport_common.c | 1 + + net/wireless/core.h | 2 +- + net/wireless/mlme.c | 33 +- + net/wireless/nl80211.c | 373 +++- + net/wireless/rdev-ops.h | 37 + + net/wireless/reg.c | 2 + + net/wireless/scan.c | 11 +- + net/wireless/sme.c | 11 +- + net/wireless/trace.h | 54 + + net/wireless/util.c | 9 +- + net/x25/x25_forward.c | 12 +- + net/xdp/xsk_queue.h | 4 +- + net/xfrm/espintcp.c | 2 +- + scripts/bpf_helpers_doc.py | 2 +- + sound/pci/bt87x.c | 7 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 19 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 3 +- + tools/bpf/bpftool/bash-completion/bpftool | 6 +- + tools/bpf/bpftool/feature.c | 283 +-- + tools/bpf/bpftool/main.h | 3 + + tools/bpf/bpftool/prog.c | 4 +- + tools/include/uapi/linux/bpf.h | 25 +- + tools/lib/bpf/libbpf.c | 38 +- + tools/lib/bpf/libbpf.h | 4 + + tools/lib/bpf/libbpf.map | 5 + + tools/testing/selftests/.gitignore | 5 +- + tools/testing/selftests/bpf/Makefile | 9 +- + .../selftests/bpf/prog_tests/perf_branches.c | 170 ++ + .../selftests/bpf/prog_tests/select_reuseport.c | 79 +- + .../selftests/bpf/prog_tests/sockmap_ktls.c | 124 ++ + .../selftests/bpf/prog_tests/sockmap_listen.c | 1496 ++++++++++++++ + .../selftests/bpf/prog_tests/trampoline_count.c | 25 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 16 +- + .../selftests/bpf/progs/test_perf_branches.c | 50 + + .../selftests/bpf/progs/test_sockmap_listen.c | 98 + + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 4 +- + tools/testing/selftests/bpf/test_bpftool.py | 178 ++ + tools/testing/selftests/bpf/test_bpftool.sh | 5 + + tools/testing/selftests/bpf/test_maps.c | 6 +- + tools/testing/selftests/bpf/test_progs.c | 25 + + .../drivers/net/mlxsw/blackhole_routes.sh | 5 +- + .../drivers/net/mlxsw/devlink_trap_acl_drops.sh | 151 ++ + .../drivers/net/mlxsw/devlink_trap_l2_drops.sh | 28 +- + .../drivers/net/mlxsw/devlink_trap_l3_drops.sh | 55 +- + .../drivers/net/mlxsw/devlink_trap_tunnel_vxlan.sh | 4 +- + .../testing/selftests/drivers/net/mlxsw/extack.sh | 45 +- + .../selftests/drivers/net/mlxsw/mlxsw_lib.sh | 13 + + .../selftests/drivers/net/mlxsw/qos_defprio.sh | 18 +- + .../selftests/drivers/net/mlxsw/router_scale.sh | 53 +- + .../selftests/drivers/net/mlxsw/rtnetlink.sh | 68 +- + .../testing/selftests/drivers/net/mlxsw/sch_ets.sh | 14 +- + .../selftests/drivers/net/mlxsw/sch_red_core.sh | 499 +++++ + .../selftests/drivers/net/mlxsw/sch_red_ets.sh | 83 + + .../selftests/drivers/net/mlxsw/sch_red_prio.sh | 5 + + .../selftests/drivers/net/mlxsw/sch_red_root.sh | 60 + + .../selftests/drivers/net/mlxsw/sharedbuffer.sh | 222 +++ + .../net/mlxsw/sharedbuffer_configuration.py | 416 ++++ + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 5 +- + .../drivers/net/mlxsw/tc_flower_restrictions.sh | 186 ++ + .../selftests/drivers/net/mlxsw/tc_flower_scale.sh | 31 +- + tools/testing/selftests/drivers/net/mlxsw/vxlan.sh | 229 ++- + .../drivers/net/netdevsim/devlink_trap.sh | 5 + + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 2 + + .../selftests/net/forwarding/devlink_lib.sh | 29 +- + tools/testing/selftests/net/forwarding/lib.sh | 79 +- + tools/testing/selftests/net/forwarding/sch_ets.sh | 9 +- + .../selftests/net/forwarding/sch_ets_tests.sh | 10 +- + .../testing/selftests/net/forwarding/tc_common.sh | 32 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 45 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 24 +- + .../selftests/net/reuseaddr_ports_exhausted.c | 162 ++ + .../selftests/net/reuseaddr_ports_exhausted.sh | 35 + + tools/testing/selftests/tc-testing/config | 6 + + .../tc-testing/tc-tests/filters/basic.json | 902 +++++++++ + tools/testing/vsock/vsock_test.c | 77 + + 1090 files changed, 54856 insertions(+), 12203 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/ocelot.txt + create mode 100644 Documentation/devicetree/bindings/net/qcom,ipa.yaml + create mode 100644 Documentation/devicetree/bindings/net/qcom,ipq8064-mdio.yaml + create mode 100644 Documentation/devicetree/bindings/ptp/ptp-idt82p33.yaml + create mode 100644 Documentation/networking/bareudp.rst + create mode 100644 Documentation/networking/page_pool.rst + create mode 100644 drivers/crypto/chelsio/chcr_common.h + create mode 100644 drivers/crypto/chelsio/chcr_ktls.c + create mode 100644 drivers/crypto/chelsio/chcr_ktls.h + create mode 100644 drivers/net/bareudp.c + delete mode 100644 drivers/net/ethernet/aquantia/atlantic/ver.h + create mode 100644 drivers/net/ethernet/intel/igc/igc_dump.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/mapping.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h + delete mode 100644 drivers/net/ethernet/mscc/ocelot_vcap.h + create mode 100644 drivers/net/ipa/Kconfig + create mode 100644 drivers/net/ipa/Makefile + create mode 100644 drivers/net/ipa/gsi.c + create mode 100644 drivers/net/ipa/gsi.h + create mode 100644 drivers/net/ipa/gsi_private.h + create mode 100644 drivers/net/ipa/gsi_reg.h + create mode 100644 drivers/net/ipa/gsi_trans.c + create mode 100644 drivers/net/ipa/gsi_trans.h + create mode 100644 drivers/net/ipa/ipa.h + create mode 100644 drivers/net/ipa/ipa_clock.c + create mode 100644 drivers/net/ipa/ipa_clock.h + create mode 100644 drivers/net/ipa/ipa_cmd.c + create mode 100644 drivers/net/ipa/ipa_cmd.h + create mode 100644 drivers/net/ipa/ipa_data-sc7180.c + create mode 100644 drivers/net/ipa/ipa_data-sdm845.c + create mode 100644 drivers/net/ipa/ipa_data.h + create mode 100644 drivers/net/ipa/ipa_endpoint.c + create mode 100644 drivers/net/ipa/ipa_endpoint.h + create mode 100644 drivers/net/ipa/ipa_gsi.c + create mode 100644 drivers/net/ipa/ipa_gsi.h + create mode 100644 drivers/net/ipa/ipa_interrupt.c + create mode 100644 drivers/net/ipa/ipa_interrupt.h + create mode 100644 drivers/net/ipa/ipa_main.c + create mode 100644 drivers/net/ipa/ipa_mem.c + create mode 100644 drivers/net/ipa/ipa_mem.h + create mode 100644 drivers/net/ipa/ipa_modem.c + create mode 100644 drivers/net/ipa/ipa_modem.h + create mode 100644 drivers/net/ipa/ipa_qmi.c + create mode 100644 drivers/net/ipa/ipa_qmi.h + create mode 100644 drivers/net/ipa/ipa_qmi_msg.c + create mode 100644 drivers/net/ipa/ipa_qmi_msg.h + create mode 100644 drivers/net/ipa/ipa_reg.c + create mode 100644 drivers/net/ipa/ipa_reg.h + create mode 100644 drivers/net/ipa/ipa_smp2p.c + create mode 100644 drivers/net/ipa/ipa_smp2p.h + create mode 100644 drivers/net/ipa/ipa_table.c + create mode 100644 drivers/net/ipa/ipa_table.h + create mode 100644 drivers/net/ipa/ipa_uc.c + create mode 100644 drivers/net/ipa/ipa_uc.h + create mode 100644 drivers/net/ipa/ipa_version.h + create mode 100644 drivers/net/phy/linkmode.c + create mode 100644 drivers/net/phy/mdio-ipq8064.c + create mode 100644 drivers/net/phy/mdio-xpcs.c + delete mode 100644 drivers/net/wireless/mediatek/mt76/airtime.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/mmio.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/soc.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/trace.c + create mode 100644 drivers/ptp/ptp_idt82p33.c + create mode 100644 drivers/ptp/ptp_idt82p33.h + create mode 100644 drivers/ptp/ptp_vmw.c + create mode 100644 drivers/remoteproc/qcom_q6v5_ipa_notify.c + create mode 100644 include/linux/mdio-xpcs.h + create mode 100644 include/linux/remoteproc/qcom_q6v5_ipa_notify.h + create mode 100644 include/net/bareudp.h + create mode 100644 include/soc/mscc/ocelot_vcap.h + create mode 100644 net/ethtool/channels.c + create mode 100644 net/ethtool/features.c + create mode 100644 net/ethtool/privflags.c + create mode 100644 net/ethtool/rings.c + create mode 100644 net/qrtr/ns.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/perf_branches.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sockmap_listen.c + create mode 100644 tools/testing/selftests/bpf/progs/test_perf_branches.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_listen.c + create mode 100644 tools/testing/selftests/bpf/test_bpftool.py + create mode 100755 tools/testing/selftests/bpf/test_bpftool.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap_acl_drops.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/mlxsw_lib.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sch_red_ets.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sch_red_prio.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sch_red_root.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sharedbuffer.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sharedbuffer_configuration.py + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/tc_flower_restrictions.sh + create mode 100644 tools/testing/selftests/net/reuseaddr_ports_exhausted.c + create mode 100755 tools/testing/selftests/net/reuseaddr_ports_exhausted.sh +Merging bpf-next/master (fb6a088e834e Merge branch 'generalize-bpf-ksym') +$ git merge bpf-next/master +Removing tools/testing/selftests/bpf/bpf_trace_helpers.h +Auto-merging net/core/sock_map.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/btf.c +Auto-merging kernel/bpf/bpf_struct_ops.c +Auto-merging arch/riscv/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/sysctl/kernel.rst +Recorded preimage for 'Documentation/admin-guide/sysctl/kernel.rst' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/admin-guide/sysctl/kernel.rst'. +[master 7ab428f16c10] Merge remote-tracking branch 'bpf-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysctl/kernel.rst | 24 + + Documentation/admin-guide/sysctl/net.rst | 3 +- + Documentation/networking/filter.txt | 2 +- + MAINTAINERS | 16 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/net/Makefile | 9 +- + arch/riscv/net/bpf_jit.h | 514 ++++++++ + arch/riscv/net/bpf_jit_comp32.c | 1310 ++++++++++++++++++++ + .../riscv/net/{bpf_jit_comp.c => bpf_jit_comp64.c} | 605 +-------- + arch/riscv/net/bpf_jit_core.c | 166 +++ + arch/x86/mm/init_32.c | 14 +- + arch/x86/net/bpf_jit_comp.c | 260 ++-- + fs/nsfs.c | 14 + + include/linux/bpf.h | 109 +- + include/linux/filter.h | 15 +- + include/linux/proc_ns.h | 2 + + include/linux/skmsg.h | 56 +- + include/net/inet_connection_sock.h | 6 + + include/net/tcp.h | 20 +- + include/net/udp.h | 5 + + include/trace/bpf_probe.h | 18 +- + include/uapi/linux/bpf.h | 221 +++- + kernel/bpf/bpf_struct_ops.c | 10 +- + kernel/bpf/btf.c | 27 +- + kernel/bpf/core.c | 121 +- + kernel/bpf/dispatcher.c | 5 +- + kernel/bpf/helpers.c | 45 + + kernel/bpf/inode.c | 42 +- + kernel/bpf/syscall.c | 306 ++++- + kernel/bpf/trampoline.c | 150 +-- + kernel/bpf/verifier.c | 29 +- + kernel/events/core.c | 9 +- + kernel/extable.c | 2 - + kernel/trace/bpf_trace.c | 13 + + net/bpf/test_run.c | 64 +- + net/core/filter.c | 65 +- + net/core/sock_map.c | 157 ++- + net/ipv4/Makefile | 1 + + net/ipv4/tcp_bpf.c | 114 +- + net/ipv4/tcp_ulp.c | 7 - + net/ipv4/udp_bpf.c | 53 + + scripts/bpf_helpers_doc.py | 1 + + scripts/link-vmlinux.sh | 28 +- + tools/bpf/bpftool/.gitignore | 2 + + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 19 + + tools/bpf/bpftool/Makefile | 37 +- + tools/bpf/bpftool/bash-completion/bpftool | 76 +- + tools/bpf/bpftool/btf.c | 5 + + tools/bpf/bpftool/common.c | 40 +- + tools/bpf/bpftool/main.c | 7 - + tools/bpf/bpftool/main.h | 7 +- + tools/bpf/bpftool/map.c | 2 +- + tools/bpf/bpftool/prog.c | 454 ++++++- + tools/bpf/bpftool/skeleton/profiler.bpf.c | 119 ++ + tools/bpf/bpftool/skeleton/profiler.h | 46 + + tools/bpf/runqslower/runqslower.bpf.c | 4 +- + tools/build/feature/Makefile | 9 +- + tools/build/feature/test-clang-bpf-global-var.c | 4 + + tools/include/uapi/linux/bpf.h | 223 +++- + tools/lib/bpf/bpf_tracing.h | 120 +- + tools/lib/bpf/btf_dump.c | 10 +- + tools/lib/bpf/libbpf.c | 152 ++- + tools/lib/bpf/libbpf.h | 5 + + tools/lib/bpf/libbpf.map | 5 + + tools/scripts/Makefile.include | 1 + + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 14 +- + tools/testing/selftests/bpf/bpf_tcp_helpers.h | 2 +- + tools/testing/selftests/bpf/bpf_trace_helpers.h | 120 -- + .../bpf/prog_tests/cgroup_attach_autodetach.c | 2 +- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 2 +- + .../bpf/prog_tests/cgroup_attach_override.c | 2 +- + .../selftests/bpf/prog_tests/fentry_fexit.c | 12 +- + .../testing/selftests/bpf/prog_tests/fentry_test.c | 14 +- + .../testing/selftests/bpf/prog_tests/fexit_test.c | 69 +- + .../selftests/bpf/prog_tests/link_pinning.c | 105 ++ + .../selftests/bpf/prog_tests/modify_return.c | 65 + + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 88 ++ + .../selftests/bpf/prog_tests/select_reuseport.c | 6 - + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 1 + + .../selftests/bpf/prog_tests/sockmap_listen.c | 204 ++- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 32 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 53 + + tools/testing/selftests/bpf/progs/bpf_dctcp.c | 2 +- + .../bpf/progs/btf_dump_test_case_syntax.c | 2 +- + tools/testing/selftests/bpf/progs/fentry_test.c | 2 +- + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 2 +- + .../selftests/bpf/progs/fexit_bpf2bpf_simple.c | 2 +- + tools/testing/selftests/bpf/progs/fexit_test.c | 2 +- + tools/testing/selftests/bpf/progs/kfree_skb.c | 2 +- + tools/testing/selftests/bpf/progs/modify_return.c | 49 + + .../selftests/bpf/progs/test_attach_probe.c | 3 +- + .../selftests/bpf/progs/test_link_pinning.c | 25 + + .../selftests/bpf/progs/test_ns_current_pid_tgid.c | 37 + + tools/testing/selftests/bpf/progs/test_overhead.c | 7 +- + .../selftests/bpf/progs/test_perf_branches.c | 2 +- + .../testing/selftests/bpf/progs/test_perf_buffer.c | 2 +- + .../testing/selftests/bpf/progs/test_probe_user.c | 1 - + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 2 + + .../selftests/bpf/progs/test_trampoline_count.c | 3 +- + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 26 +- + .../selftests/bpf/test_current_pid_tgid_new_ns.c | 159 +++ + tools/testing/selftests/bpf/test_progs.c | 9 + + tools/testing/selftests/bpf/verifier/ctx_skb.c | 47 + + 104 files changed, 5485 insertions(+), 1680 deletions(-) + create mode 100644 arch/riscv/net/bpf_jit.h + create mode 100644 arch/riscv/net/bpf_jit_comp32.c + rename arch/riscv/net/{bpf_jit_comp.c => bpf_jit_comp64.c} (69%) + create mode 100644 arch/riscv/net/bpf_jit_core.c + create mode 100644 net/ipv4/udp_bpf.c + create mode 100644 tools/bpf/bpftool/skeleton/profiler.bpf.c + create mode 100644 tools/bpf/bpftool/skeleton/profiler.h + create mode 100644 tools/build/feature/test-clang-bpf-global-var.c + delete mode 100644 tools/testing/selftests/bpf/bpf_trace_helpers.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/link_pinning.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/modify_return.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c + create mode 100644 tools/testing/selftests/bpf/progs/modify_return.c + create mode 100644 tools/testing/selftests/bpf/progs/test_link_pinning.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c + create mode 100644 tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c +Merging ipsec-next/master (dda520c4d462 ESP: Export esp_output_fill_trailer function) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + include/net/esp.h | 16 ++++++++++++++++ + net/ipv4/esp4.c | 16 ---------------- + net/ipv6/esp6.c | 16 ---------------- + net/xfrm/xfrm_state.c | 2 +- + 4 files changed, 17 insertions(+), 33 deletions(-) +Merging mlx5-next/mlx5-next (e0ebd8eb36ed net/mlx5: HW bit for goto chain offload support) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (bd63666189e7 netfilter: xt_IDLETIMER: clean up some indenting) +$ git merge netfilter-next/master +Auto-merging net/netfilter/xt_recent.c +Auto-merging net/netfilter/nft_tunnel.c +Removing net/netfilter/nf_tables_set_core.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/nf_flow_table_offload.c +CONFLICT (content): Merge conflict in net/netfilter/nf_flow_table_offload.c +Recorded preimage for 'net/netfilter/nf_flow_table_offload.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'net/netfilter/nf_flow_table_offload.c'. +[master cdee328f0fcc] Merge remote-tracking branch 'netfilter-next/master' +$ git diff -M --stat --summary HEAD^.. + include/linux/netfilter/ipset/ip_set.h | 2 +- + include/linux/netfilter/x_tables.h | 8 +- + include/linux/netfilter_arp/arp_tables.h | 2 +- + include/linux/netfilter_bridge/ebtables.h | 2 +- + include/linux/netfilter_ipv4/ip_tables.h | 2 +- + include/linux/netfilter_ipv6/ip6_tables.h | 2 +- + include/net/netfilter/nf_conntrack_extend.h | 2 +- + include/net/netfilter/nf_conntrack_timeout.h | 2 +- + include/net/netfilter/nf_tables.h | 16 +- + include/net/netfilter/nf_tables_core.h | 12 +- + include/uapi/linux/netfilter/nf_tables.h | 10 + + include/uapi/linux/netfilter/xt_IDLETIMER.h | 12 +- + include/uapi/linux/netfilter_bridge/ebt_among.h | 2 +- + net/bridge/netfilter/ebtables.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 4 +- + net/ipv4/netfilter/ip_tables.c | 4 +- + net/ipv6/netfilter/ip6_tables.c | 4 +- + net/netfilter/Kconfig | 8 - + net/netfilter/Makefile | 9 +- + net/netfilter/ipset/ip_set_bitmap_ip.c | 2 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 2 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 2 +- + net/netfilter/ipset/ip_set_hash_gen.h | 4 +- + net/netfilter/nf_conntrack_core.c | 1 - + net/netfilter/nf_flow_table_offload.c | 26 +-- + net/netfilter/nf_tables_api.c | 55 ++---- + net/netfilter/nf_tables_set_core.c | 31 --- + net/netfilter/nfnetlink_acct.c | 2 +- + net/netfilter/nft_bitwise.c | 14 +- + net/netfilter/nft_set_bitmap.c | 3 +- + net/netfilter/nft_set_hash.c | 9 +- + net/netfilter/nft_set_pipapo.c | 9 +- + net/netfilter/nft_set_rbtree.c | 3 +- + net/netfilter/nft_tunnel.c | 110 +++++++++-- + net/netfilter/xt_IDLETIMER.c | 248 ++++++++++++++++++++++-- + net/netfilter/xt_SECMARK.c | 2 - + net/netfilter/xt_hashlimit.c | 2 +- + net/netfilter/xt_recent.c | 4 +- + 38 files changed, 433 insertions(+), 201 deletions(-) + delete mode 100644 net/netfilter/nf_tables_set_core.c +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 (ca44e47a2b86 ssb: Use scnprintf() for avoiding potential buffer overflow) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/carl9170/debug.c | 2 +- + drivers/net/wireless/broadcom/b43/debugfs.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/debugfs.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/sysfs.c | 6 ++- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 16 +++---- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 48 +++++++++---------- + drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 4 +- + drivers/net/wireless/intel/ipw2x00/libipw_wx.c | 8 ++-- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 4 +- + drivers/net/wireless/intel/iwlegacy/4965.c | 3 +- + drivers/net/wireless/intersil/prism54/oid_mgt.c | 34 +++++++------- + drivers/net/wireless/marvell/libertas/if_spi.c | 3 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 53 ++++++++++++++++++--- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 38 ++++++++++++++- + drivers/net/wireless/quantenna/qtnfmac/commands.h | 2 + + drivers/net/wireless/quantenna/qtnfmac/core.c | 18 ++++++-- + drivers/net/wireless/quantenna/qtnfmac/core.h | 5 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 54 ++++++++++++++++++++-- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 33 ++++++++++++- + .../net/wireless/quantenna/qtnfmac/qlink_util.c | 2 + + drivers/net/wireless/realtek/rtw88/main.c | 6 --- + drivers/net/wireless/realtek/rtw88/main.h | 1 - + drivers/ssb/sprom.c | 4 +- + 24 files changed, 256 insertions(+), 94 deletions(-) +Merging bluetooth/master (b354e6c10eaf Bluetooth: L2CAP: Fix a condition in l2cap_sock_recvmsg()) +$ git merge bluetooth/master +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/index.rst +Auto-merging Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 2 + + .../networking/{6lowpan.txt => 6lowpan.rst} | 29 +- + Documentation/networking/index.rst | 1 + + MAINTAINERS | 2 +- + drivers/bluetooth/Kconfig | 4 +- + drivers/bluetooth/bfusb.c | 33 +- + drivers/bluetooth/btintel.c | 4 +- + drivers/bluetooth/btqca.c | 10 +- + drivers/bluetooth/btqca.h | 6 +- + drivers/bluetooth/btrtl.c | 12 + + drivers/bluetooth/btrtl.h | 4 +- + drivers/bluetooth/btusb.c | 23 +- + drivers/bluetooth/hci_ag6xx.c | 2 +- + drivers/bluetooth/hci_h4.c | 4 +- + drivers/bluetooth/hci_h5.c | 49 +- + drivers/bluetooth/hci_intel.c | 2 +- + drivers/bluetooth/hci_qca.c | 174 ++++-- + include/net/6lowpan.h | 2 +- + include/net/bluetooth/bluetooth.h | 17 + + include/net/bluetooth/hci.h | 74 ++- + include/net/bluetooth/hci_core.h | 46 ++ + include/net/bluetooth/hci_sock.h | 6 +- + include/net/bluetooth/l2cap.h | 52 +- + include/net/bluetooth/mgmt.h | 5 +- + include/net/bluetooth/rfcomm.h | 3 +- + net/bluetooth/a2mp.h | 10 +- + net/bluetooth/bnep/bnep.h | 6 +- + net/bluetooth/hci_conn.c | 146 ++++- + net/bluetooth/hci_core.c | 142 ++++- + net/bluetooth/hci_event.c | 93 +++- + net/bluetooth/hci_request.c | 333 +++++++++-- + net/bluetooth/hci_request.h | 2 + + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap_core.c | 618 +++++++++++++++++++-- + net/bluetooth/l2cap_sock.c | 59 +- + net/bluetooth/mgmt.c | 113 +++- + net/bluetooth/rfcomm/core.c | 13 +- + net/bluetooth/rfcomm/tty.c | 4 +- + net/bluetooth/sco.c | 13 + + net/bluetooth/smp.c | 29 +- + 40 files changed, 1838 insertions(+), 311 deletions(-) + rename Documentation/networking/{6lowpan.txt => 6lowpan.rst} (64%) +Merging mac80211-next/master (a862889b18ba cfg80211: fix documentation format) +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + include/net/cfg80211.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gfs2/for-next (cc44457f1629 gfs2: leaf_dealloc needs to allocate one more revoke) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/ops_fstype.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 11 +- + fs/gfs2/dir.c | 3 +- + fs/gfs2/glock.c | 127 +++++++++++++--- + fs/gfs2/glops.c | 157 +++++++++++++++---- + fs/gfs2/incore.h | 26 +++- + fs/gfs2/lock_dlm.c | 52 +++++++ + fs/gfs2/log.c | 238 +++++++++++++++++++---------- + fs/gfs2/log.h | 1 + + fs/gfs2/lops.c | 8 +- + fs/gfs2/meta_io.c | 3 +- + fs/gfs2/ops_fstype.c | 59 ++------ + fs/gfs2/quota.c | 7 +- + fs/gfs2/recovery.c | 10 ++ + fs/gfs2/rgrp.c | 71 ++++----- + fs/gfs2/rgrp.h | 1 - + fs/gfs2/super.c | 75 ++++++--- + fs/gfs2/super.h | 1 - + fs/gfs2/sys.c | 5 +- + fs/gfs2/trans.c | 4 + + fs/gfs2/util.c | 419 ++++++++++++++++++++++++++++++++++++++++----------- + fs/gfs2/util.h | 76 +++++++--- + 21 files changed, 984 insertions(+), 370 deletions(-) +Merging mtd/mtd/next (4da0ea71ea93 mtd: lpddr: Fix a double free in probe()) +$ git merge mtd/mtd/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 + + drivers/mtd/inftlmount.c | 2 +- + drivers/mtd/lpddr/lpddr_cmds.c | 1 - + drivers/mtd/mtdchar.c | 12 +- + drivers/mtd/mtdcore.c | 250 ++++++++++---- + drivers/mtd/mtdpart.c | 695 ++++++++++---------------------------- + drivers/mtd/nand/raw/diskonchip.c | 2 +- + include/linux/mtd/mtd.h | 125 ++++++- + include/linux/mtd/partitions.h | 1 - + 9 files changed, 483 insertions(+), 608 deletions(-) +Merging nand/nand/next (9f9ae0c253c1 mtd: spinand: micron: Add new Micron SPI NAND devices with multiple dies) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 10 +- + .../devicetree/bindings/mtd/nand-macronix.txt | 27 ++ + arch/arm/mach-omap1/board-ams-delta.c | 47 +++- + arch/mips/boot/dts/brcm/bcm7425.dtsi | 4 +- + drivers/mtd/nand/raw/ams-delta.c | 237 +++++++++++------ + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 293 ++++++++++++++++++++- + drivers/mtd/nand/raw/cadence-nand-controller.c | 34 ++- + drivers/mtd/nand/raw/denali.c | 1 + + drivers/mtd/nand/raw/denali.h | 2 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 21 +- + drivers/mtd/nand/raw/ingenic/Kconfig | 1 + + drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 4 +- + drivers/mtd/nand/raw/internals.h | 1 + + drivers/mtd/nand/raw/marvell_nand.c | 40 ++- + drivers/mtd/nand/raw/meson_nand.c | 2 +- + drivers/mtd/nand/raw/mtk_nand.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 45 +++- + drivers/mtd/nand/raw/nand_hynix.c | 2 +- + drivers/mtd/nand/raw/nand_macronix.c | 153 +++++++++++ + drivers/mtd/nand/raw/qcom_nandc.c | 105 +++++--- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 44 +++- + drivers/mtd/nand/raw/sunxi_nand.c | 17 +- + drivers/mtd/nand/spi/core.c | 104 +++++--- + drivers/mtd/nand/spi/gigadevice.c | 45 +--- + drivers/mtd/nand/spi/macronix.c | 30 +-- + drivers/mtd/nand/spi/micron.c | 172 +++++++++--- + drivers/mtd/nand/spi/paragon.c | 28 +- + drivers/mtd/nand/spi/toshiba.c | 46 ++-- + drivers/mtd/nand/spi/winbond.c | 34 +-- + include/linux/mtd/rawnand.h | 7 +- + include/linux/mtd/spinand.h | 67 +++-- + 31 files changed, 1204 insertions(+), 421 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/nand-macronix.txt +Merging spi-nor/spi-nor/next (2dcbfe365b13 mtd: spi-nor: Refactor spi_nor_read_id()) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/spi-nor.c | 209 +++++++++++++++++++++++++++++------------- + include/linux/mtd/spi-nor.h | 8 ++ + 2 files changed, 151 insertions(+), 66 deletions(-) +Merging crypto/master (0eae14a067c5 crypto: ccree - refactor AEAD IV in AAD handling) +$ git merge crypto/master +Auto-merging include/linux/debugfs.h +Auto-merging fs/debugfs/file.c +Auto-merging drivers/crypto/chelsio/chcr_core.h +Auto-merging drivers/crypto/chelsio/chcr_core.c +Auto-merging crypto/testmgr.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-uacce | 39 + + .../bindings/crypto/xlnx,zynqmp-aes.yaml | 37 + + Documentation/misc-devices/uacce.rst | 176 + + MAINTAINERS | 16 +- + arch/arm/crypto/ghash-ce-core.S | 5 +- + arch/arm64/crypto/.gitignore | 1 + + arch/arm64/crypto/sha1-ce-glue.c | 20 + + arch/arm64/crypto/sha2-ce-glue.c | 23 + + arch/x86/crypto/curve25519-x86_64.c | 3546 +++++++------------- + crypto/authencesn.c | 2 +- + crypto/ccm.c | 29 +- + crypto/cryptd.c | 37 +- + crypto/ctr.c | 29 +- + crypto/cts.c | 27 +- + crypto/gcm.c | 66 +- + crypto/geniv.c | 17 +- + crypto/lrw.c | 28 +- + crypto/md5.c | 3 - + crypto/pcrypt.c | 33 +- + crypto/proc.c | 2 +- + crypto/rng.c | 8 +- + crypto/rsa-pkcs1pad.c | 59 +- + crypto/tcrypt.c | 4 +- + crypto/testmgr.c | 28 +- + crypto/xts.c | 28 +- + drivers/char/hw_random/Kconfig | 17 +- + drivers/char/hw_random/imx-rngc.c | 85 +- + drivers/char/hw_random/omap3-rom-rng.c | 1 + + drivers/crypto/Kconfig | 35 + + drivers/crypto/Makefile | 1 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 4 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 2 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 2 +- + drivers/crypto/caam/Kconfig | 1 + + drivers/crypto/caam/caamalg.c | 415 +-- + drivers/crypto/caam/caamalg_desc.c | 30 +- + drivers/crypto/caam/caamalg_qi.c | 4 +- + drivers/crypto/caam/caamalg_qi2.h | 6 +- + drivers/crypto/caam/caamhash.c | 340 +- + drivers/crypto/caam/caampkc.c | 185 +- + drivers/crypto/caam/caampkc.h | 10 + + drivers/crypto/caam/caamrng.c | 4 +- + drivers/crypto/caam/intern.h | 2 + + drivers/crypto/caam/jr.c | 36 +- + drivers/crypto/caam/key_gen.c | 2 +- + drivers/crypto/caam/qi.c | 60 +- + drivers/crypto/caam/qi.h | 4 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 2 +- + drivers/crypto/ccp/psp-dev.c | 3 + + drivers/crypto/ccp/sev-dev.c | 39 +- + drivers/crypto/ccp/sp-dev.h | 1 + + drivers/crypto/ccp/sp-pci.c | 9 + + drivers/crypto/ccree/cc_aead.c | 175 +- + drivers/crypto/ccree/cc_aead.h | 3 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 229 +- + drivers/crypto/ccree/cc_buffer_mgr.h | 5 +- + drivers/crypto/ccree/cc_cipher.c | 78 +- + drivers/crypto/ccree/cc_debugfs.c | 29 +- + drivers/crypto/ccree/cc_driver.c | 127 +- + drivers/crypto/ccree/cc_driver.h | 18 +- + drivers/crypto/ccree/cc_hash.c | 228 +- + drivers/crypto/ccree/cc_hash.h | 31 +- + drivers/crypto/ccree/cc_hw_queue_defs.h | 332 +- + drivers/crypto/ccree/cc_pm.c | 60 +- + drivers/crypto/ccree/cc_pm.h | 21 - + drivers/crypto/ccree/cc_request_mgr.c | 48 +- + drivers/crypto/ccree/cc_request_mgr.h | 19 +- + drivers/crypto/ccree/cc_sram_mgr.c | 78 +- + drivers/crypto/ccree/cc_sram_mgr.h | 45 +- + drivers/crypto/chelsio/chcr_algo.c | 360 +- + drivers/crypto/chelsio/chcr_core.c | 3 + + drivers/crypto/chelsio/chcr_core.h | 6 +- + drivers/crypto/chelsio/chcr_crypto.h | 16 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 7 +- + drivers/crypto/chelsio/chtls/chtls_main.c | 10 +- + drivers/crypto/hisilicon/Kconfig | 2 + + drivers/crypto/hisilicon/hpre/hpre_main.c | 108 +- + drivers/crypto/hisilicon/qm.c | 494 ++- + drivers/crypto/hisilicon/qm.h | 41 +- + drivers/crypto/hisilicon/sec2/sec.h | 7 + + drivers/crypto/hisilicon/sec2/sec_crypto.c | 243 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 213 +- + drivers/crypto/hisilicon/zip/zip_main.c | 232 +- + drivers/crypto/img-hash.c | 2 +- + drivers/crypto/mediatek/mtk-sha.c | 2 +- + drivers/crypto/mxs-dcp.c | 58 +- + drivers/crypto/nx/nx.h | 2 +- + drivers/crypto/omap-sham.c | 4 +- + drivers/crypto/qat/qat_common/qat_algs.c | 2 +- + drivers/crypto/qat/qat_common/qat_crypto.c | 3 +- + drivers/crypto/qce/common.c | 2 - + drivers/crypto/qce/common.h | 3 + + drivers/crypto/qce/dma.c | 11 +- + drivers/crypto/qce/dma.h | 2 +- + drivers/crypto/qce/skcipher.c | 30 +- + drivers/crypto/s5p-sss.c | 2 +- + drivers/crypto/xilinx/Makefile | 2 + + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 457 +++ + drivers/firmware/xilinx/zynqmp.c | 25 + + drivers/misc/Kconfig | 1 + + drivers/misc/Makefile | 1 + + drivers/misc/uacce/Kconfig | 13 + + drivers/misc/uacce/Makefile | 2 + + drivers/misc/uacce/uacce.c | 633 ++++ + fs/debugfs/file.c | 8 + + include/crypto/aead.h | 48 +- + include/crypto/if_alg.h | 2 +- + include/linux/debugfs.h | 1 + + include/linux/firmware/xlnx-zynqmp.h | 2 + + include/linux/uacce.h | 163 + + include/uapi/misc/uacce/hisi_qm.h | 23 + + include/uapi/misc/uacce/uacce.h | 38 + + kernel/padata.c | 9 +- + 113 files changed, 5685 insertions(+), 4697 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-uacce + create mode 100644 Documentation/devicetree/bindings/crypto/xlnx,zynqmp-aes.yaml + create mode 100644 Documentation/misc-devices/uacce.rst + create mode 100644 drivers/crypto/xilinx/Makefile + create mode 100644 drivers/crypto/xilinx/zynqmp-aes-gcm.c + create mode 100644 drivers/misc/uacce/Kconfig + create mode 100644 drivers/misc/uacce/Makefile + create mode 100644 drivers/misc/uacce/uacce.c + create mode 100644 include/linux/uacce.h + create mode 100644 include/uapi/misc/uacce/hisi_qm.h + create mode 100644 include/uapi/misc/uacce/uacce.h +Merging drm/drm-next (69ddce0970d9 Merge tag 'amd-drm-next-5.7-2020-03-10' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dss.c +Removing drivers/gpu/drm/omapdrm/dss/dss-of.c +Removing drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c +Removing drivers/gpu/drm/omapdrm/displays/encoder-opa362.c +Removing drivers/gpu/drm/omapdrm/displays/connector-hdmi.c +Removing drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c +Auto-merging drivers/gpu/drm/i915/intel_sideband.c +Auto-merging drivers/gpu/drm/i915/i915_request.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/intel_timeline.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +Removing drivers/gpu/drm/bridge/dumb-vga-dac.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/sitronix,st7735r.txt +Removing Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt +Removing Documentation/devicetree/bindings/display/panel/winstar,wf35ltiacd.txt +Removing Documentation/devicetree/bindings/display/panel/vl050_8048nt_c01.txt +Removing Documentation/devicetree/bindings/display/panel/urt,umsh-8596md.txt +Removing Documentation/devicetree/bindings/display/panel/tpk,f10a-0102.txt +Removing Documentation/devicetree/bindings/display/panel/tpk,f07a-0102.txt +Removing Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt +Removing Documentation/devicetree/bindings/display/panel/tianma,tm070rvhg71.txt +Removing Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt +Removing Documentation/devicetree/bindings/display/panel/starry,kr122ea0sra.txt +Removing Documentation/devicetree/bindings/display/panel/shelly,sca07010-bfn-lnn.txt +Removing Documentation/devicetree/bindings/display/panel/sharp,lq123p1jx31.txt +Removing Documentation/devicetree/bindings/display/panel/sharp,lq101k1ly04.txt +Removing Documentation/devicetree/bindings/display/panel/sharp,lq070y3dg3b.txt +Removing Documentation/devicetree/bindings/display/panel/sharp,lq035q7db03.txt +Removing Documentation/devicetree/bindings/display/panel/samsung,ltn140at29-301.txt +Removing Documentation/devicetree/bindings/display/panel/samsung,ltn101nt05.txt +Removing Documentation/devicetree/bindings/display/panel/samsung,lsn122dl01-c01.txt +Removing Documentation/devicetree/bindings/display/panel/rocktech,rk070er9427.txt +Removing Documentation/devicetree/bindings/display/panel/raydium,rm68200.txt +Removing Documentation/devicetree/bindings/display/panel/qiaodian,qd43003c0-40.txt +Removing Documentation/devicetree/bindings/display/panel/panel-dpi.txt +Removing Documentation/devicetree/bindings/display/panel/panasonic,vvx10f034n00.txt +Removing Documentation/devicetree/bindings/display/panel/panasonic,vvx10f004b00.txt +Removing Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2045-53ts.txt +Removing Documentation/devicetree/bindings/display/panel/osddisplays,osd070t1718-19ts.txt +Removing Documentation/devicetree/bindings/display/panel/ortustech,com43h4m85ulc.txt +Removing Documentation/devicetree/bindings/display/panel/ortustech,com37h3m99dtc.txt +Removing Documentation/devicetree/bindings/display/panel/ortustech,com37h3m05dtc.txt +Removing Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.txt +Removing Documentation/devicetree/bindings/display/panel/ontat,yx700wv03.txt +Removing Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino-43-ts.txt +Removing Documentation/devicetree/bindings/display/panel/okaya,rs800480t-7x0gp.txt +Removing Documentation/devicetree/bindings/display/panel/nvd,9128.txt +Removing Documentation/devicetree/bindings/display/panel/nlt,nl192108ac18-02d.txt +Removing Documentation/devicetree/bindings/display/panel/newhaven,nhd-4.3-480272ef-atxl.txt +Removing Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt +Removing Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt +Removing Documentation/devicetree/bindings/display/panel/nec,nl12880b20-05.txt +Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa070mc01.txt +Removing Documentation/devicetree/bindings/display/panel/lg,lp129qe.txt +Removing Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt +Removing Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt +Removing Documentation/devicetree/bindings/display/panel/lg,lp079qx1-sp0v.txt +Removing Documentation/devicetree/bindings/display/panel/lg,lb070wv8.txt +Removing Documentation/devicetree/bindings/display/panel/lemaker,bl035-rgb-002.txt +Removing Documentation/devicetree/bindings/display/panel/kyo,tcg121xglp.txt +Removing Documentation/devicetree/bindings/display/panel/koe,tx31d200vm0baa.txt +Removing Documentation/devicetree/bindings/display/panel/koe,tx14d24vm1bpa.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,zj070na-01p.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,n156bge-l21.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,n116bge.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,g121x1-l03.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,g121i1-l01.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,g101ice-l01.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,g070y2-l01.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,at070tn92.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,at043tn24.txt +Removing Documentation/devicetree/bindings/display/panel/hit,tx23d38vm0caa.txt +Removing Documentation/devicetree/bindings/display/panel/hannstar,hsd100pxn1.txt +Removing Documentation/devicetree/bindings/display/panel/hannstar,hsd070pww1.txt +Removing Documentation/devicetree/bindings/display/panel/giantplus,gpg482739qs5.txt +Removing Documentation/devicetree/bindings/display/panel/friendlyarm,hd702e.txt +Removing Documentation/devicetree/bindings/display/panel/foxlink,fl500wvr00-a0t.txt +Removing Documentation/devicetree/bindings/display/panel/evervision,vgg804821.txt +Removing Documentation/devicetree/bindings/display/panel/edt,et-series.txt +Removing Documentation/devicetree/bindings/display/panel/dlc,dlc1010gig.txt +Removing Documentation/devicetree/bindings/display/panel/dataimage,scf0700c48ggu18.txt +Removing Documentation/devicetree/bindings/display/panel/chunghwa,claa101wb03.txt +Removing Documentation/devicetree/bindings/display/panel/chunghwa,claa101wa01a.txt +Removing Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt +Removing Documentation/devicetree/bindings/display/panel/cdtech,s070wv95-ct16.txt +Removing Documentation/devicetree/bindings/display/panel/cdtech,s043wq26h-ct7.txt +Removing Documentation/devicetree/bindings/display/panel/boe,tv080wum-nl0.txt +Removing Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt +Removing Documentation/devicetree/bindings/display/panel/boe,hv070wsa-100.txt +Removing Documentation/devicetree/bindings/display/panel/avic,tm070ddh03.txt +Removing Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt +Removing Documentation/devicetree/bindings/display/panel/auo,p320hvn03.txt +Removing Documentation/devicetree/bindings/display/panel/auo,g185han01.txt +Removing Documentation/devicetree/bindings/display/panel/auo,g133han01.txt +Removing Documentation/devicetree/bindings/display/panel/auo,g104sn02.txt +Removing Documentation/devicetree/bindings/display/panel/auo,g101evn010.txt +Removing Documentation/devicetree/bindings/display/panel/auo,g070vvn01.txt +Removing Documentation/devicetree/bindings/display/panel/auo,b133xtn01.txt +Removing Documentation/devicetree/bindings/display/panel/auo,b133htn01.txt +Removing Documentation/devicetree/bindings/display/panel/auo,b116xw03.txt +Removing Documentation/devicetree/bindings/display/panel/auo,b101xtn01.txt +Removing Documentation/devicetree/bindings/display/panel/auo,b101ean01.txt +Removing Documentation/devicetree/bindings/display/panel/auo,b101aw03.txt +Removing Documentation/devicetree/bindings/display/panel/auo,b080uan01.txt +Merge made by the 'recursive' strategy. + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 6 + + .../bindings/display/bridge/adi,adv7511.txt | 23 +- + .../devicetree/bindings/display/bridge/ps8640.yaml | 112 + + .../bindings/display/bridge/toshiba,tc358768.yaml | 159 + + .../bindings/display/ilitek,ili9486.yaml | 73 + + .../bindings/display/panel/auo,b080uan01.txt | 7 - + .../bindings/display/panel/auo,b101aw03.txt | 7 - + .../bindings/display/panel/auo,b101ean01.txt | 7 - + .../bindings/display/panel/auo,b101xtn01.txt | 7 - + .../bindings/display/panel/auo,b116xw03.txt | 7 - + .../bindings/display/panel/auo,b133htn01.txt | 7 - + .../bindings/display/panel/auo,b133xtn01.txt | 7 - + .../bindings/display/panel/auo,g070vvn01.txt | 29 - + .../bindings/display/panel/auo,g101evn010.txt | 12 - + .../bindings/display/panel/auo,g104sn02.txt | 12 - + .../bindings/display/panel/auo,g133han01.txt | 7 - + .../bindings/display/panel/auo,g185han01.txt | 7 - + .../bindings/display/panel/auo,p320hvn03.txt | 8 - + .../bindings/display/panel/auo,t215hvn01.txt | 7 - + .../bindings/display/panel/avic,tm070ddh03.txt | 7 - + .../bindings/display/panel/boe,hv070wsa-100.txt | 28 - + .../bindings/display/panel/boe,nv101wxmn51.txt | 7 - + .../bindings/display/panel/boe,tv080wum-nl0.txt | 7 - + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 80 + + .../display/panel/cdtech,s043wq26h-ct7.txt | 12 - + .../display/panel/cdtech,s070wv95-ct16.txt | 12 - + .../display/panel/chunghwa,claa070wp03xg.txt | 7 - + .../display/panel/chunghwa,claa101wa01a.txt | 7 - + .../display/panel/chunghwa,claa101wb03.txt | 7 - + .../display/panel/dataimage,scf0700c48ggu18.txt | 8 - + .../bindings/display/panel/display-timing.txt | 124 +- + .../bindings/display/panel/display-timings.yaml | 77 + + .../bindings/display/panel/dlc,dlc1010gig.txt | 12 - + .../bindings/display/panel/edt,et-series.txt | 55 - + .../bindings/display/panel/elida,kd35t133.yaml | 49 + + .../display/panel/evervision,vgg804821.txt | 12 - + .../display/panel/feixin,k101-im2ba02.yaml | 55 + + .../display/panel/foxlink,fl500wvr00-a0t.txt | 7 - + .../bindings/display/panel/friendlyarm,hd702e.txt | 32 - + .../display/panel/giantplus,gpg482739qs5.txt | 7 - + .../bindings/display/panel/hannstar,hsd070pww1.txt | 7 - + .../bindings/display/panel/hannstar,hsd100pxn1.txt | 7 - + .../bindings/display/panel/hit,tx23d38vm0caa.txt | 7 - + .../bindings/display/panel/innolux,at043tn24.txt | 7 - + .../bindings/display/panel/innolux,at070tn92.txt | 7 - + .../bindings/display/panel/innolux,g070y2-l01.txt | 12 - + .../bindings/display/panel/innolux,g101ice-l01.txt | 7 - + .../bindings/display/panel/innolux,g121i1-l01.txt | 7 - + .../bindings/display/panel/innolux,g121x1-l03.txt | 7 - + .../bindings/display/panel/innolux,n116bge.txt | 7 - + .../bindings/display/panel/innolux,n156bge-l21.txt | 7 - + .../bindings/display/panel/innolux,zj070na-01p.txt | 7 - + .../bindings/display/panel/koe,tx14d24vm1bpa.txt | 42 - + .../bindings/display/panel/koe,tx31d200vm0baa.txt | 25 - + .../bindings/display/panel/kyo,tcg121xglp.txt | 7 - + .../display/panel/lemaker,bl035-rgb-002.txt | 12 - + .../bindings/display/panel/lg,lb070wv8.txt | 7 - + .../bindings/display/panel/lg,lp079qx1-sp0v.txt | 7 - + .../bindings/display/panel/lg,lp097qx1-spa1.txt | 7 - + .../bindings/display/panel/lg,lp120up1.txt | 7 - + .../bindings/display/panel/lg,lp129qe.txt | 7 - + .../display/panel/mitsubishi,aa070mc01.txt | 7 - + .../bindings/display/panel/nec,nl12880b20-05.txt | 8 - + .../bindings/display/panel/nec,nl4827hc19-05b.txt | 7 - + .../bindings/display/panel/netron-dy,e231732.txt | 7 - + .../panel/newhaven,nhd-4.3-480272ef-atxl.txt | 7 - + .../display/panel/nlt,nl192108ac18-02d.txt | 8 - + .../bindings/display/panel/novatek,nt35510.yaml | 56 + + .../devicetree/bindings/display/panel/nvd,9128.txt | 7 - + .../display/panel/okaya,rs800480t-7x0gp.txt | 7 - + .../display/panel/olimex,lcd-olinuxino-43-ts.txt | 7 - + .../bindings/display/panel/ontat,yx700wv03.txt | 7 - + .../bindings/display/panel/orisetech,otm8009a.txt | 23 - + .../bindings/display/panel/orisetech,otm8009a.yaml | 53 + + .../display/panel/ortustech,com37h3m05dtc.txt | 12 - + .../display/panel/ortustech,com37h3m99dtc.txt | 12 - + .../display/panel/ortustech,com43h4m85ulc.txt | 7 - + .../display/panel/osddisplays,osd070t1718-19ts.txt | 12 - + .../display/panel/osddisplays,osd101t2045-53ts.txt | 11 - + .../display/panel/panasonic,vvx10f004b00.txt | 7 - + .../display/panel/panasonic,vvx10f034n00.txt | 20 - + .../bindings/display/panel/panel-common.yaml | 15 +- + .../bindings/display/panel/panel-dpi.txt | 50 - + .../bindings/display/panel/panel-dpi.yaml | 81 + + .../bindings/display/panel/panel-simple-dsi.yaml | 67 + + .../bindings/display/panel/panel-simple.yaml | 209 ++ + .../bindings/display/panel/panel-timing.yaml | 227 ++ + .../display/panel/qiaodian,qd43003c0-40.txt | 7 - + .../bindings/display/panel/raydium,rm68200.txt | 25 - + .../bindings/display/panel/raydium,rm68200.yaml | 56 + + .../display/panel/rocktech,rk070er9427.txt | 25 - + .../display/panel/samsung,lsn122dl01-c01.txt | 7 - + .../bindings/display/panel/samsung,ltn101nt05.txt | 7 - + .../display/panel/samsung,ltn140at29-301.txt | 7 - + .../display/panel/samsung,s6e88a0-ams452ef01.yaml | 50 + + .../bindings/display/panel/sharp,lq035q7db03.txt | 12 - + .../bindings/display/panel/sharp,lq070y3dg3b.txt | 12 - + .../bindings/display/panel/sharp,lq101k1ly04.txt | 7 - + .../bindings/display/panel/sharp,lq123p1jx31.txt | 7 - + .../display/panel/shelly,sca07010-bfn-lnn.txt | 7 - + .../bindings/display/panel/starry,kr122ea0sra.txt | 7 - + .../bindings/display/panel/tianma,tm070jdhg30.txt | 7 - + .../bindings/display/panel/tianma,tm070rvhg71.txt | 29 - + .../display/panel/toshiba,lt089ac29000.txt | 8 - + .../bindings/display/panel/tpk,f07a-0102.txt | 8 - + .../bindings/display/panel/tpk,f10a-0102.txt | 8 - + .../bindings/display/panel/urt,umsh-8596md.txt | 16 - + .../bindings/display/panel/vl050_8048nt_c01.txt | 12 - + .../bindings/display/panel/winstar,wf35ltiacd.txt | 48 - + .../bindings/display/rockchip/rockchip-drm.txt | 19 - + .../bindings/display/rockchip/rockchip-drm.yaml | 40 + + .../bindings/display/sitronix,st7735r.txt | 35 - + .../bindings/display/sitronix,st7735r.yaml | 78 + + .../bindings/display/ti/ti,am65x-dss.yaml | 152 + + .../bindings/display/ti/ti,j721e-dss.yaml | 208 ++ + .../devicetree/bindings/display/ti/ti,k2g-dss.yaml | 106 + + .../devicetree/bindings/vendor-prefixes.yaml | 10 + + Documentation/gpu/drm-kms-helpers.rst | 18 +- + Documentation/gpu/todo.rst | 53 +- + MAINTAINERS | 42 +- + arch/arm/configs/davinci_all_defconfig | 2 +- + arch/arm/configs/integrator_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 7 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/configs/sunxi_defconfig | 2 +- + arch/arm/configs/versatile_defconfig | 2 +- + drivers/dma-buf/Kconfig | 12 +- + drivers/dma-buf/dma-buf.c | 110 +- + drivers/gpu/drm/Kconfig | 8 +- + drivers/gpu/drm/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 13 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 26 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 26 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 95 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 89 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 175 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 124 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 78 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 208 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 93 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 111 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 179 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 250 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 12 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 4 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 10 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 110 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 148 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 241 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 2 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 67 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 71 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 12 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 29 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 12 + + drivers/gpu/drm/amd/amdgpu/mmsch_v2_0.h | 338 ++ + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 36 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 3 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 84 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 39 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 257 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 32 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 152 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 150 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 254 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 34 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 91 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 242 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 16 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 43 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 4 +- + .../amd/display/dc/bios/command_table_helper2.c | 13 +- + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 46 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 25 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 26 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 8 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 21 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 165 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 208 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 60 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 289 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 60 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 197 +- + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 5 +- + drivers/gpu/drm/amd/display/dc/dc.h | 38 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 48 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 20 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 4 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 16 + + .../gpu/drm/amd/display/dc/dce/dce_scl_filters.c | 2204 +++++++------ + .../drm/amd/display/dc/dce/dce_scl_filters_old.c | 25 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 92 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 11 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 58 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 4 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 13 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 168 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 8 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 130 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 4 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 5 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 8 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 78 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 11 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 129 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 7 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 5 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.h | 20 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 9 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 219 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 2 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.h | 7 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 138 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 39 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 5 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 204 +- + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 8 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 12 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 11 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 - + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 2 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 3 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 3 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 6 +- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 72 +- + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 13 +- + .../gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h | 75 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 48 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 69 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 9 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 50 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 28 +- + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 8 + + drivers/gpu/drm/amd/display/include/logger_types.h | 63 +- + .../drm/amd/display/modules/freesync/freesync.c | 8 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 68 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 38 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 4 - + .../amd/display/modules/hdcp/hdcp1_transition.c | 15 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- + .../amd/display/modules/hdcp/hdcp2_transition.c | 6 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 24 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 4 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 17 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 184 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 32 +- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 9 +- + drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 16 +- + .../include/asic_reg/wafl/wafl2_4_0_0_sh_mask.h | 69 + + .../amd/include/asic_reg/wafl/wafl2_4_0_0_smn.h | 29 + + .../amd/include/asic_reg/xgmi/xgmi_4_0_0_sh_mask.h | 69 + + .../drm/amd/include/asic_reg/xgmi/xgmi_4_0_0_smn.h | 29 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 31 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 150 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 51 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 7 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 9 +- + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 6 +- + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 4 +- + .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 10 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 5 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 71 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 47 +- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 11 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 123 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 87 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 69 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 16 - + drivers/gpu/drm/arc/arcpgu_hdmi.c | 2 +- + drivers/gpu/drm/armada/armada_fbdev.c | 8 +- + drivers/gpu/drm/ast/ast_drv.h | 6 +- + drivers/gpu/drm/ast/ast_main.c | 24 +- + drivers/gpu/drm/ast/ast_mode.c | 27 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 2 +- + drivers/gpu/drm/bochs/bochs_drv.c | 6 +- + drivers/gpu/drm/bochs/bochs_hw.c | 24 +- + drivers/gpu/drm/bochs/bochs_kms.c | 34 +- + drivers/gpu/drm/bridge/Kconfig | 51 +- + drivers/gpu/drm/bridge/Makefile | 6 +- + drivers/gpu/drm/bridge/adv7511/Kconfig | 13 +- + drivers/gpu/drm/bridge/adv7511/Makefile | 3 +- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 40 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 28 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 20 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 13 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 54 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 6 +- + drivers/gpu/drm/bridge/display-connector.c | 295 ++ + drivers/gpu/drm/bridge/dumb-vga-dac.c | 300 -- + drivers/gpu/drm/bridge/lvds-codec.c | 21 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 8 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 8 +- + drivers/gpu/drm/bridge/panel.c | 23 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 8 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 349 ++ + drivers/gpu/drm/bridge/sii902x.c | 8 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 3 +- + drivers/gpu/drm/bridge/simple-bridge.c | 342 ++ + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 10 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 11 +- + drivers/gpu/drm/bridge/tc358764.c | 11 +- + drivers/gpu/drm/bridge/tc358767.c | 9 +- + drivers/gpu/drm/bridge/tc358768.c | 1046 ++++++ + drivers/gpu/drm/bridge/thc63lvd1024.c | 5 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 267 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 235 +- + drivers/gpu/drm/bridge/ti-tpd12s015.c | 211 ++ + drivers/gpu/drm/cirrus/cirrus.c | 51 +- + drivers/gpu/drm/drm_atomic.c | 117 + + drivers/gpu/drm/drm_atomic_helper.c | 83 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 102 + + drivers/gpu/drm/drm_auth.c | 8 - + drivers/gpu/drm/drm_bridge.c | 751 ++++- + drivers/gpu/drm/drm_bridge_connector.c | 379 +++ + drivers/gpu/drm/drm_bufs.c | 20 +- + drivers/gpu/drm/drm_client.c | 2 +- + drivers/gpu/drm/drm_client_modeset.c | 12 +- + drivers/gpu/drm/drm_connector.c | 96 +- + drivers/gpu/drm/drm_crtc_helper.c | 4 - + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_debugfs.c | 3 +- + drivers/gpu/drm/drm_debugfs_crc.c | 2 +- + drivers/gpu/drm/drm_dma.c | 21 +- + drivers/gpu/drm/drm_dp_helper.c | 62 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 159 +- + drivers/gpu/drm/drm_drv.c | 20 +- + drivers/gpu/drm/drm_edid.c | 164 +- + drivers/gpu/drm/drm_fb_helper.c | 22 +- + drivers/gpu/drm/drm_file.c | 90 +- + drivers/gpu/drm/drm_format_helper.c | 2 +- + drivers/gpu/drm/drm_framebuffer.c | 122 + + drivers/gpu/drm/drm_gem_vram_helper.c | 61 + + drivers/gpu/drm/drm_hdcp.c | 158 +- + drivers/gpu/drm/drm_internal.h | 5 +- + drivers/gpu/drm/drm_ioctl.c | 1 + + drivers/gpu/drm/drm_irq.c | 4 - + drivers/gpu/drm/drm_mipi_dbi.c | 39 +- + drivers/gpu/drm/drm_mm.c | 8 +- + drivers/gpu/drm/drm_pci.c | 82 +- + drivers/gpu/drm/drm_scatter.c | 3 + + drivers/gpu/drm/drm_simple_kms_helper.c | 46 +- + drivers/gpu/drm/drm_syncobj.c | 87 +- + drivers/gpu/drm/drm_sysfs.c | 2 - + drivers/gpu/drm/drm_vblank.c | 177 +- + drivers/gpu/drm/drm_vm.c | 10 +- + drivers/gpu/drm/exynos/exynos_dp.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 10 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 3 + + drivers/gpu/drm/gma500/framebuffer.c | 6 +- + drivers/gpu/drm/gma500/intel_bios.h | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 4 - + drivers/gpu/drm/gma500/psb_drv.h | 6 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 3 + + drivers/gpu/drm/gma500/psb_irq.c | 12 +- + drivers/gpu/drm/gma500/psb_irq.h | 7 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 79 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 9 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h | 13 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 11 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 1 + + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 2 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 10 +- + drivers/gpu/drm/i915/Kconfig | 7 - + drivers/gpu/drm/i915/Makefile | 13 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 388 ++- + drivers/gpu/drm/i915/display/intel_acpi.c | 89 + + drivers/gpu/drm/i915/display/intel_acpi.h | 5 + + drivers/gpu/drm/i915/display/intel_atomic.c | 57 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 5 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 73 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 247 +- + drivers/gpu/drm/i915/display/intel_bios.c | 443 ++- + drivers/gpu/drm/i915/display/intel_bios.h | 11 + + drivers/gpu/drm/i915/display/intel_bw.c | 63 +- + drivers/gpu/drm/i915/display/intel_bw.h | 4 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 1084 ++++--- + drivers/gpu/drm/i915/display/intel_cdclk.h | 73 +- + drivers/gpu/drm/i915/display/intel_color.c | 222 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 163 +- + drivers/gpu/drm/i915/display/intel_connector.c | 5 +- + drivers/gpu/drm/i915/display/intel_crt.c | 127 +- + drivers/gpu/drm/i915/{ => display}/intel_csr.c | 42 +- + drivers/gpu/drm/i915/{ => display}/intel_csr.h | 0 + drivers/gpu/drm/i915/display/intel_ddi.c | 942 +++--- + drivers/gpu/drm/i915/display/intel_de.h | 72 + + drivers/gpu/drm/i915/display/intel_display.c | 3429 +++++++++++--------- + drivers/gpu/drm/i915/display/intel_display.h | 7 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 2129 ++++++++++++ + .../gpu/drm/i915/display/intel_display_debugfs.h | 20 + + drivers/gpu/drm/i915/display/intel_display_power.c | 740 +++-- + drivers/gpu/drm/i915/display/intel_display_power.h | 5 + + drivers/gpu/drm/i915/display/intel_display_types.h | 56 +- + drivers/gpu/drm/i915/display/intel_dp.c | 859 +++-- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 169 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 75 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 45 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 108 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 677 ++-- + drivers/gpu/drm/i915/display/intel_dsb.c | 30 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 6 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 167 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 49 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 202 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 13 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 17 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 37 +- + drivers/gpu/drm/i915/display/intel_global_state.c | 223 ++ + drivers/gpu/drm/i915/display/intel_global_state.h | 87 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 77 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 414 ++- + drivers/gpu/drm/i915/display/intel_hdcp.h | 5 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 423 +-- + drivers/gpu/drm/i915/display/intel_hotplug.c | 136 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 16 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 64 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 221 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 57 +- + drivers/gpu/drm/i915/display/intel_panel.c | 389 ++- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 34 +- + drivers/gpu/drm/i915/display/intel_psr.c | 361 ++- + drivers/gpu/drm/i915/display/intel_quirks.c | 10 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 113 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 385 ++- + drivers/gpu/drm/i915/display/intel_tc.c | 51 +- + drivers/gpu/drm/i915/display/intel_tv.c | 164 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 2 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 443 ++- + drivers/gpu/drm/i915/display/intel_vga.c | 14 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 445 +-- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 96 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 352 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 66 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 135 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 19 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 102 - + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 163 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 74 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 5 +- + drivers/gpu/drm/i915/gt/intel_context.c | 9 +- + drivers/gpu/drm/i915/gt/intel_context.h | 20 + + drivers/gpu/drm/i915/gt/intel_context_sseu.c | 98 + + drivers/gpu/drm/i915/gt/intel_context_types.h | 12 + + drivers/gpu/drm/i915/gt/intel_engine.h | 22 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 145 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 8 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 12 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 3 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 91 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 65 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 117 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.h | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 36 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 4 +- + drivers/gpu/drm/i915/gt/intel_llc.c | 6 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 267 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 1 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 76 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 10 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 83 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 6 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 87 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 20 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 6 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 138 +- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 4 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 3 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_llc.c | 11 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 1208 +++++-- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 24 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 188 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 9 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 30 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 255 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 7 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 9 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 19 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 7 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 69 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.h | 62 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 9 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 18 +- + drivers/gpu/drm/i915/gvt/handlers.c | 8 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 3 +- + drivers/gpu/drm/i915/i915_active.c | 16 +- + drivers/gpu/drm/i915/i915_active.h | 3 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 29 +- + drivers/gpu/drm/i915/i915_debugfs.c | 2302 +------------ + drivers/gpu/drm/i915/i915_debugfs.h | 8 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 250 ++ + drivers/gpu/drm/i915/i915_debugfs_params.h | 14 + + drivers/gpu/drm/i915/i915_drv.c | 758 +---- + drivers/gpu/drm/i915/i915_drv.h | 96 +- + drivers/gpu/drm/i915/i915_gem.c | 18 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 13 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 31 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 5 + + drivers/gpu/drm/i915/i915_irq.c | 256 +- + drivers/gpu/drm/i915/i915_irq.h | 6 +- + drivers/gpu/drm/i915/i915_params.c | 11 +- + drivers/gpu/drm/i915/i915_params.h | 74 +- + drivers/gpu/drm/i915/i915_pci.c | 16 +- + drivers/gpu/drm/i915/i915_perf.c | 80 +- + drivers/gpu/drm/i915/i915_pmu.c | 6 +- + drivers/gpu/drm/i915/i915_reg.h | 41 +- + drivers/gpu/drm/i915/i915_request.c | 54 +- + drivers/gpu/drm/i915/i915_request.h | 2 +- + drivers/gpu/drm/i915/i915_scheduler.c | 12 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 17 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 2 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 19 +- + drivers/gpu/drm/i915/i915_trace.h | 66 +- + drivers/gpu/drm/i915/i915_vgpu.c | 41 +- + drivers/gpu/drm/i915/i915_vma.c | 66 +- + drivers/gpu/drm/i915/i915_vma.h | 2 + + drivers/gpu/drm/i915/intel_device_info.c | 44 +- + drivers/gpu/drm/i915/intel_device_info.h | 4 + + drivers/gpu/drm/i915/intel_gvt.c | 15 +- + drivers/gpu/drm/i915/intel_memory_region.c | 4 +- + drivers/gpu/drm/i915/intel_pch.c | 66 +- + drivers/gpu/drm/i915/intel_pm.c | 642 ++-- + drivers/gpu/drm/i915/intel_pm.h | 5 +- + drivers/gpu/drm/i915/intel_sideband.c | 11 +- + drivers/gpu/drm/i915/intel_uncore.c | 54 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 6 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 1 + + .../gpu/drm/i915/selftests/intel_memory_region.c | 203 ++ + drivers/gpu/drm/i915/vlv_suspend.c | 489 +++ + drivers/gpu/drm/i915/vlv_suspend.h | 18 + + drivers/gpu/drm/imx/imx-ldb.c | 2 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- + drivers/gpu/drm/imx/parallel-display.c | 176 +- + drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +- + drivers/gpu/drm/lima/lima_drv.c | 16 +- + drivers/gpu/drm/lima/lima_drv.h | 1 + + drivers/gpu/drm/lima/lima_gem.c | 134 +- + drivers/gpu/drm/lima/lima_gem.h | 4 + + drivers/gpu/drm/lima/lima_gp.c | 63 +- + drivers/gpu/drm/lima/lima_mmu.c | 5 + + drivers/gpu/drm/lima/lima_mmu.h | 1 + + drivers/gpu/drm/lima/lima_regs.h | 1 + + drivers/gpu/drm/lima/lima_sched.c | 35 +- + drivers/gpu/drm/lima/lima_sched.h | 6 + + drivers/gpu/drm/lima/lima_vm.c | 46 +- + drivers/gpu/drm/lima/lima_vm.h | 1 + + drivers/gpu/drm/mcde/mcde_drv.c | 9 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 5 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 10 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 9 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 86 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 1 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 2 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 82 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 95 - + drivers/gpu/drm/msm/dsi/dsi_manager.c | 4 +- + drivers/gpu/drm/msm/edp/edp.c | 2 +- + drivers/gpu/drm/msm/edp/edp_bridge.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 10 +- + drivers/gpu/drm/msm/msm_drv.h | 3 + + drivers/gpu/drm/msm/msm_fbdev.c | 6 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 7 - + drivers/gpu/drm/nouveau/dispnv50/head.c | 5 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 8 - + drivers/gpu/drm/nouveau/nouveau_display.c | 28 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 11 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 5 - + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 2 +- + drivers/gpu/drm/omapdrm/displays/Kconfig | 22 - + drivers/gpu/drm/omapdrm/displays/Makefile | 4 - + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 97 - + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 183 -- + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 137 - + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 217 -- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 6 +- + drivers/gpu/drm/omapdrm/dss/Makefile | 2 +- + drivers/gpu/drm/omapdrm/dss/base.c | 55 +- + drivers/gpu/drm/omapdrm/dss/display.c | 9 - + drivers/gpu/drm/omapdrm/dss/dpi.c | 349 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 4 +- + drivers/gpu/drm/omapdrm/dss/dss-of.c | 28 - + drivers/gpu/drm/omapdrm/dss/dss.c | 46 +- + drivers/gpu/drm/omapdrm/dss/hdmi.h | 4 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 313 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 59 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.h | 4 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 295 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 48 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.h | 5 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 9 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 46 +- + drivers/gpu/drm/omapdrm/dss/output.c | 53 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 178 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 269 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 247 +- + drivers/gpu/drm/omapdrm/omap_connector.h | 3 - + drivers/gpu/drm/omapdrm/omap_crtc.c | 2 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 88 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 83 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 6 +- + drivers/gpu/drm/panel/Kconfig | 44 + + drivers/gpu/drm/panel/Makefile | 5 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 854 +++++ + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 352 ++ + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 526 +++ + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 1098 +++++++ + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 6 + + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 293 ++ + drivers/gpu/drm/panel/panel-simple.c | 317 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 17 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 123 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 26 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 30 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 18 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 6 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 73 + + drivers/gpu/drm/qxl/qxl_cmd.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 43 +- + drivers/gpu/drm/qxl/qxl_drv.c | 26 +- + drivers/gpu/drm/qxl/qxl_kms.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 6 - + drivers/gpu/drm/radeon/atombios_crtc.c | 1 + + drivers/gpu/drm/radeon/radeon_device.c | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 25 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 10 - + drivers/gpu/drm/radeon/radeon_drv.c | 18 - + drivers/gpu/drm/radeon/radeon_fb.c | 19 +- + drivers/gpu/drm/radeon/radeon_kms.c | 29 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 3 +- + drivers/gpu/drm/radeon/radeon_mode.h | 9 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 6 - + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 22 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 18 + + drivers/gpu/drm/sti/sti_crtc.c | 11 +- + drivers/gpu/drm/sti/sti_crtc.h | 2 - + drivers/gpu/drm/sti/sti_drv.c | 4 - + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 2 +- + drivers/gpu/drm/stm/drv.c | 2 - + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 4 +- + drivers/gpu/drm/stm/ltdc.c | 103 +- + drivers/gpu/drm/stm/ltdc.h | 6 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 104 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 14 + + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 129 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 2 +- + drivers/gpu/drm/tegra/fb.c | 8 +- + drivers/gpu/drm/tidss/Kconfig | 14 + + drivers/gpu/drm/tidss/Makefile | 12 + + drivers/gpu/drm/tidss/tidss_crtc.c | 432 +++ + drivers/gpu/drm/tidss/tidss_crtc.h | 48 + + drivers/gpu/drm/tidss/tidss_dispc.c | 2753 ++++++++++++++++ + drivers/gpu/drm/tidss/tidss_dispc.h | 137 + + drivers/gpu/drm/tidss/tidss_dispc_regs.h | 243 ++ + drivers/gpu/drm/tidss/tidss_drv.c | 285 ++ + drivers/gpu/drm/tidss/tidss_drv.h | 39 + + drivers/gpu/drm/tidss/tidss_encoder.c | 88 + + drivers/gpu/drm/tidss/tidss_encoder.h | 17 + + drivers/gpu/drm/tidss/tidss_irq.c | 146 + + drivers/gpu/drm/tidss/tidss_irq.h | 77 + + drivers/gpu/drm/tidss/tidss_kms.c | 299 ++ + drivers/gpu/drm/tidss/tidss_kms.h | 15 + + drivers/gpu/drm/tidss/tidss_plane.c | 217 ++ + drivers/gpu/drm/tidss/tidss_plane.h | 25 + + drivers/gpu/drm/tidss/tidss_scale_coefs.c | 202 ++ + drivers/gpu/drm/tidss/tidss_scale_coefs.h | 22 + + drivers/gpu/drm/tilcdc/tilcdc_external.c | 2 +- + drivers/gpu/drm/tiny/Kconfig | 22 +- + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/gm12u320.c | 9 - + drivers/gpu/drm/tiny/ili9225.c | 9 - + drivers/gpu/drm/tiny/ili9486.c | 286 ++ + drivers/gpu/drm/tiny/repaper.c | 21 +- + drivers/gpu/drm/tiny/st7586.c | 9 - + drivers/gpu/drm/tiny/st7735r.c | 76 +- + drivers/gpu/drm/ttm/ttm_bo.c | 268 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 3 +- + drivers/gpu/drm/udl/udl_connector.c | 1 - + drivers/gpu/drm/udl/udl_modeset.c | 11 - + drivers/gpu/drm/v3d/v3d_drv.h | 41 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 13 +- + drivers/gpu/drm/vboxvideo/vboxvideo.h | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 13 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.c | 3 - + drivers/gpu/drm/vc4/vc4_drv.h | 49 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 1 + + drivers/gpu/drm/virtio/virtgpu_display.c | 12 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 36 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 2 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 90 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 41 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 109 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 369 +-- + drivers/gpu/drm/vkms/vkms_crtc.c | 9 +- + drivers/gpu/drm/vkms/vkms_drv.c | 1 - + drivers/gpu/drm/vkms/vkms_drv.h | 4 - + drivers/gpu/drm/vkms/vkms_plane.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 3 + + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 3 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 3 + + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 6 - + drivers/gpu/drm/xen/xen_drm_front_kms.c | 19 + + drivers/gpu/drm/zte/zx_plane.c | 4 +- + drivers/video/backlight/Kconfig | 8 +- + drivers/video/console/Kconfig | 76 +- + drivers/video/fbdev/Kconfig | 9 +- + drivers/video/fbdev/aty/mach64_gx.c | 3 +- + drivers/video/fbdev/aty/radeon_base.c | 26 +- + drivers/video/fbdev/cg14.c | 3 +- + drivers/video/fbdev/core/Makefile | 1 - + drivers/video/fbdev/core/fbcon.c | 27 +- + drivers/video/fbdev/core/fbmem.c | 38 +- + drivers/video/fbdev/hyperv_fb.c | 4 +- + drivers/video/fbdev/kyro/STG4000OverlayDevice.c | 3 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 15 + + drivers/video/fbdev/mmp/hw/mmp_ctrl.h | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 41 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 4 - + drivers/video/fbdev/pxa168fb.c | 5 +- + drivers/video/fbdev/s1d13xxxfb.c | 16 +- + drivers/video/fbdev/sa1100fb.c | 2 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 4 +- + drivers/video/fbdev/ssd1307fb.c | 4 +- + drivers/video/fbdev/w100fb.c | 18 +- + drivers/video/fbdev/wm8505fb.c | 2 +- + drivers/video/hdmi.c | 11 +- + include/drm/bridge/mhl.h | 4 +- + include/drm/drm_atomic.h | 76 + + include/drm/drm_atomic_helper.h | 8 + + include/drm/drm_atomic_state_helper.h | 13 + + include/drm/drm_bridge.h | 405 ++- + include/drm/drm_bridge_connector.h | 18 + + include/drm/drm_client.h | 7 +- + include/drm/drm_connector.h | 24 +- + include/drm/drm_crtc.h | 80 +- + include/drm/drm_device.h | 2 +- + include/drm/drm_dp_helper.h | 5 + + include/drm/drm_dp_mst_helper.h | 6 +- + include/drm/drm_drv.h | 194 +- + include/drm/drm_encoder.h | 3 +- + include/drm/drm_fb_helper.h | 27 +- + include/drm/drm_file.h | 1 + + include/drm/drm_gem_vram_helper.h | 9 + + include/drm/drm_hdcp.h | 6 +- + include/drm/drm_legacy.h | 6 - + include/drm/drm_mipi_dbi.h | 12 + + include/drm/drm_modes.h | 11 +- + include/drm/drm_modeset_helper_vtables.h | 63 +- + include/drm/drm_panel.h | 3 +- + include/drm/drm_pci.h | 11 - + include/drm/drm_print.h | 78 +- + include/drm/drm_simple_kms_helper.h | 11 +- + include/drm/drm_vblank.h | 36 +- + include/drm/gpu_scheduler.h | 4 + + include/drm/ttm/ttm_bo_api.h | 11 +- + include/drm/ttm/ttm_bo_driver.h | 15 - + include/linux/dma-buf.h | 97 +- + include/linux/hdmi.h | 2 +- + include/linux/platform_data/simplefb.h | 2 +- + include/uapi/drm/amdgpu_drm.h | 5 +- + include/uapi/drm/drm.h | 2 + + include/uapi/drm/lima_drm.h | 9 +- + include/video/mmp_disp.h | 2 +- + include/video/samsung_fimd.h | 2 +- + 906 files changed, 44419 insertions(+), 21382 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ps8640.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358768.yaml + create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9486.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b080uan01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b101aw03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b101ean01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b101xtn01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b116xw03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b133htn01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b133xtn01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g070vvn01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g101evn010.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g104sn02.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g133han01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g185han01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,p320hvn03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/avic,tm070ddh03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,hv070wsa-100.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,tv080wum-nl0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,tv101wum-nl6.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/cdtech,s043wq26h-ct7.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/cdtech,s070wv95-ct16.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/chunghwa,claa101wa01a.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/chunghwa,claa101wb03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/dataimage,scf0700c48ggu18.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/display-timings.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc1010gig.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/edt,et-series.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/elida,kd35t133.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/evervision,vgg804821.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/feixin,k101-im2ba02.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/foxlink,fl500wvr00-a0t.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/friendlyarm,hd702e.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/giantplus,gpg482739qs5.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/hannstar,hsd070pww1.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/hannstar,hsd100pxn1.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/hit,tx23d38vm0caa.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,at043tn24.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,at070tn92.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g070y2-l01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g101ice-l01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g121i1-l01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g121x1-l03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,n116bge.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,n156bge-l21.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,zj070na-01p.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/koe,tx14d24vm1bpa.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/koe,tx31d200vm0baa.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/kyo,tcg121xglp.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/lemaker,bl035-rgb-002.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lb070wv8.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp079qx1-sp0v.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp129qe.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa070mc01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/nec,nl12880b20-05.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/newhaven,nhd-4.3-480272ef-atxl.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/nlt,nl192108ac18-02d.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/nvd,9128.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/okaya,rs800480t-7x0gp.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino-43-ts.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/ontat,yx700wv03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m05dtc.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m99dtc.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com43h4m85ulc.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd070t1718-19ts.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2045-53ts.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panasonic,vvx10f004b00.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panasonic,vvx10f034n00.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-dpi.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-dpi.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-timing.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/qiaodian,qd43003c0-40.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm68200.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm68200.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,rk070er9427.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,lsn122dl01-c01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,ltn101nt05.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,ltn140at29-301.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e88a0-ams452ef01.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq035q7db03.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq070y3dg3b.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq101k1ly04.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq123p1jx31.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/shelly,sca07010-bfn-lnn.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/starry,kr122ea0sra.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/tianma,tm070rvhg71.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/tpk,f07a-0102.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/tpk,f10a-0102.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/urt,umsh-8596md.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/vl050_8048nt_c01.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/winstar,wf35ltiacd.txt + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-drm.yaml + delete mode 100644 Documentation/devicetree/bindings/display/sitronix,st7735r.txt + create mode 100644 Documentation/devicetree/bindings/display/sitronix,st7735r.yaml + create mode 100644 Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml + create mode 100644 Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml + create mode 100644 Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_v2_0.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_scl_filters_old.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/wafl/wafl2_4_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/wafl/wafl2_4_0_0_smn.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/xgmi/xgmi_4_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/xgmi/xgmi_4_0_0_smn.h + create mode 100644 drivers/gpu/drm/bridge/display-connector.c + delete mode 100644 drivers/gpu/drm/bridge/dumb-vga-dac.c + create mode 100644 drivers/gpu/drm/bridge/parade-ps8640.c + create mode 100644 drivers/gpu/drm/bridge/simple-bridge.c + create mode 100644 drivers/gpu/drm/bridge/tc358768.c + create mode 100644 drivers/gpu/drm/bridge/ti-tpd12s015.c + create mode 100644 drivers/gpu/drm/drm_bridge_connector.c + rename drivers/gpu/drm/i915/{ => display}/intel_csr.c (94%) + rename drivers/gpu/drm/i915/{ => display}/intel_csr.h (100%) + create mode 100644 drivers/gpu/drm/i915/display/intel_de.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_debugfs.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_debugfs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_global_state.c + create mode 100644 drivers/gpu/drm/i915/display/intel_global_state.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_context_sseu.c + create mode 100644 drivers/gpu/drm/i915/i915_debugfs_params.c + create mode 100644 drivers/gpu/drm/i915/i915_debugfs_params.h + create mode 100644 drivers/gpu/drm/i915/vlv_suspend.c + create mode 100644 drivers/gpu/drm/i915/vlv_suspend.h + delete mode 100644 drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/dss-of.c + create mode 100644 drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c + create mode 100644 drivers/gpu/drm/panel/panel-elida-kd35t133.c + create mode 100644 drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt35510.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c + create mode 100644 drivers/gpu/drm/tidss/Kconfig + create mode 100644 drivers/gpu/drm/tidss/Makefile + create mode 100644 drivers/gpu/drm/tidss/tidss_crtc.c + create mode 100644 drivers/gpu/drm/tidss/tidss_crtc.h + create mode 100644 drivers/gpu/drm/tidss/tidss_dispc.c + create mode 100644 drivers/gpu/drm/tidss/tidss_dispc.h + create mode 100644 drivers/gpu/drm/tidss/tidss_dispc_regs.h + create mode 100644 drivers/gpu/drm/tidss/tidss_drv.c + create mode 100644 drivers/gpu/drm/tidss/tidss_drv.h + create mode 100644 drivers/gpu/drm/tidss/tidss_encoder.c + create mode 100644 drivers/gpu/drm/tidss/tidss_encoder.h + create mode 100644 drivers/gpu/drm/tidss/tidss_irq.c + create mode 100644 drivers/gpu/drm/tidss/tidss_irq.h + create mode 100644 drivers/gpu/drm/tidss/tidss_kms.c + create mode 100644 drivers/gpu/drm/tidss/tidss_kms.h + create mode 100644 drivers/gpu/drm/tidss/tidss_plane.c + create mode 100644 drivers/gpu/drm/tidss/tidss_plane.h + create mode 100644 drivers/gpu/drm/tidss/tidss_scale_coefs.c + create mode 100644 drivers/gpu/drm/tidss/tidss_scale_coefs.h + create mode 100644 drivers/gpu/drm/tiny/ili9486.c + create mode 100644 include/drm/drm_bridge_connector.h +Merging amdgpu/drm-next (c448ed62de73 drm/amdgpu/display: fix logic inversion in program_timing_sync()) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/acp/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 10 +++- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 8 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 18 +++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 35 +++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 21 +++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 31 ++++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 40 ++++++++++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 ++ + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 16 +++--- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 ++++-- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 3 ++ + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 38 ++++++-------- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 6 +++ + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 7 ++- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 ++- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 35 ++++++------- + 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 | 58 ++++++++++++++-------- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 ++++ + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 23 +++++---- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 8 ++- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 6 +-- + drivers/gpu/drm/scheduler/sched_entity.c | 10 ++-- + drivers/gpu/drm/scheduler/sched_main.c | 6 +-- + include/drm/gpu_scheduler.h | 6 +-- + include/uapi/drm/amdgpu_drm.h | 11 +++- + include/uapi/linux/kfd_ioctl.h | 19 ++++++- + 58 files changed, 455 insertions(+), 182 deletions(-) +Merging drm-intel/for-linux-next (175c4d9b3b9a Revert "drm/i915/tgl: Add extra hdc flush workaround") +$ git merge drm-intel/for-linux-next +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/i915/i915_utils.h +Auto-merging drivers/gpu/drm/i915/i915_request.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/vgpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/vgpu.c +Auto-merging drivers/gpu/drm/i915/gvt/dmabuf.c +Auto-merging drivers/gpu/drm/i915/gvt/display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/display.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/drm_dp_helper.c +Auto-merging Documentation/gpu/i915.rst +Resolved 'drivers/gpu/drm/i915/gt/intel_lrc.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_workarounds.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gvt/display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gvt/vgpu.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_request.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4d8741a3a84e] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 4 +- + drivers/gpu/drm/drm_dp_helper.c | 79 ++ + drivers/gpu/drm/drm_dp_mst_topology.c | 3 +- + drivers/gpu/drm/i915/Kconfig.profile | 25 +- + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 18 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 24 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 3 + + drivers/gpu/drm/i915/display/intel_audio.c | 10 +- + drivers/gpu/drm/i915/display/intel_bios.c | 1 - + drivers/gpu/drm/i915/display/intel_bios.h | 2 - + drivers/gpu/drm/i915/display/intel_cdclk.c | 22 + + drivers/gpu/drm/i915/display/intel_color.c | 434 ++++++----- + drivers/gpu/drm/i915/display/intel_crt.c | 1 - + drivers/gpu/drm/i915/display/intel_csr.c | 4 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 461 +---------- + drivers/gpu/drm/i915/display/intel_ddi.h | 4 - + drivers/gpu/drm/i915/display/intel_display.c | 131 ++-- + drivers/gpu/drm/i915/display/intel_display.h | 10 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 9 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 18 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 63 +- + drivers/gpu/drm/i915/display/intel_dp.c | 21 +- + drivers/gpu/drm/i915/display/intel_dp.h | 2 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 24 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 35 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 848 +++++++++++++++++---- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 14 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 28 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 1 - + drivers/gpu/drm/i915/display/intel_dvo.c | 1 - + drivers/gpu/drm/i915/display/intel_fbc.c | 62 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 1 - + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 29 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 34 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 115 +-- + drivers/gpu/drm/i915/display/intel_hdcp.h | 2 - + drivers/gpu/drm/i915/display/intel_hdmi.c | 10 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 2 - + drivers/gpu/drm/i915/display/intel_hotplug.c | 73 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 2 - + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 23 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 44 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 2 - + drivers/gpu/drm/i915/display/intel_overlay.c | 12 +- + drivers/gpu/drm/i915/display/intel_panel.c | 18 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 17 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.h | 4 +- + drivers/gpu/drm/i915/display/intel_psr.c | 2 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 10 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 1 - + drivers/gpu/drm/i915/display/intel_sdvo.h | 2 - + drivers/gpu/drm/i915/display/intel_sprite.c | 80 +- + drivers/gpu/drm/i915/display/intel_tv.c | 1 - + drivers/gpu/drm/i915/display/intel_vdsc.c | 2 - + drivers/gpu/drm/i915/display/vlv_dsi.c | 55 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 362 ++++++--- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 731 +++++++----------- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 - + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 - + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 1 - + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 1 - + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 - + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 15 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 3 + + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 402 ++++++++++ + drivers/gpu/drm/i915/gt/gen7_renderclear.h | 15 + + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 27 + + drivers/gpu/drm/i915/gt/hsw_clear_kernel.c | 61 ++ + drivers/gpu/drm/i915/gt/intel_context.c | 5 + + drivers/gpu/drm/i915/gt/intel_context_param.c | 63 ++ + drivers/gpu/drm/i915/gt/intel_context_param.h | 14 + + drivers/gpu/drm/i915/gt/intel_context_types.h | 4 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 15 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 37 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 15 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 17 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 3 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 29 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 7 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 151 ++-- + drivers/gpu/drm/i915/gt/intel_rc6.c | 9 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 21 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 149 +++- + drivers/gpu/drm/i915/gt/intel_rps.c | 45 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 83 +- + drivers/gpu/drm/i915/gt/ivb_clear_kernel.c | 61 ++ + drivers/gpu/drm/i915/gt/mock_engine.c | 4 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 30 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 785 ++++++++++++++++++- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 296 +++++++ + drivers/gpu/drm/i915/gt/sysfs_engines.c | 445 +++++++++++ + drivers/gpu/drm/i915/gt/sysfs_engines.h | 13 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 84 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 27 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 208 +++-- + drivers/gpu/drm/i915/gvt/debugfs.c | 45 +- + drivers/gpu/drm/i915/gvt/display.c | 26 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 8 +- + drivers/gpu/drm/i915/gvt/edid.c | 25 +- + drivers/gpu/drm/i915/gvt/execlist.c | 103 ++- + drivers/gpu/drm/i915/gvt/execlist.h | 5 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 6 +- + drivers/gpu/drm/i915/gvt/firmware.c | 16 +- + drivers/gpu/drm/i915/gvt/gtt.c | 63 +- + drivers/gpu/drm/i915/gvt/gvt.c | 43 +- + drivers/gpu/drm/i915/gvt/gvt.h | 62 +- + drivers/gpu/drm/i915/gvt/handlers.c | 203 ++--- + drivers/gpu/drm/i915/gvt/interrupt.c | 21 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 309 +++++--- + drivers/gpu/drm/i915/gvt/mmio.c | 32 +- + drivers/gpu/drm/i915/gvt/mmio.h | 4 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 127 ++- + drivers/gpu/drm/i915/gvt/mmio_context.h | 5 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 25 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 253 +++--- + drivers/gpu/drm/i915/gvt/scheduler.h | 9 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 18 +- + drivers/gpu/drm/i915/i915_active.c | 123 ++- + drivers/gpu/drm/i915/i915_active.h | 8 +- + drivers/gpu/drm/i915/i915_buddy.c | 3 +- + drivers/gpu/drm/i915/i915_debugfs.c | 216 ------ + drivers/gpu/drm/i915/i915_drv.c | 517 +------------ + drivers/gpu/drm/i915/i915_drv.h | 139 +--- + drivers/gpu/drm/i915/i915_gem.c | 1 - + drivers/gpu/drm/i915/i915_gem_evict.c | 17 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 3 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 - + drivers/gpu/drm/i915/i915_ioc32.c | 7 +- + drivers/gpu/drm/i915/i915_ioc32.h | 17 + + drivers/gpu/drm/i915/i915_irq.c | 31 +- + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_perf.c | 15 +- + drivers/gpu/drm/i915/i915_pmu.h | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 24 +- + drivers/gpu/drm/i915/i915_request.c | 206 ++--- + drivers/gpu/drm/i915/i915_request.h | 12 +- + drivers/gpu/drm/i915/i915_scheduler.c | 10 +- + drivers/gpu/drm/i915/i915_suspend.c | 2 - + drivers/gpu/drm/i915/i915_sysfs.c | 3 + + drivers/gpu/drm/i915/i915_utils.c | 1 - + drivers/gpu/drm/i915/i915_utils.h | 22 +- + drivers/gpu/drm/i915/i915_vgpu.c | 31 +- + drivers/gpu/drm/i915/i915_vgpu.h | 25 +- + drivers/gpu/drm/i915/i915_vma.c | 3 +- + drivers/gpu/drm/i915/i915_vma_types.h | 11 - + drivers/gpu/drm/i915/intel_device_info.c | 1 + + drivers/gpu/drm/i915/intel_dram.c | 500 ++++++++++++ + drivers/gpu/drm/i915/intel_dram.h | 14 + + drivers/gpu/drm/i915/intel_gvt.c | 6 + + drivers/gpu/drm/i915/intel_pm.c | 257 +++---- + drivers/gpu/drm/i915/selftests/i915_active.c | 78 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 25 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 - + include/drm/drm_dp_helper.h | 21 +- + include/drm/i915_mei_hdcp_interface.h | 1 - + include/uapi/drm/i915_drm.h | 21 + + 171 files changed, 6872 insertions(+), 4098 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gt/gen7_renderclear.c + create mode 100644 drivers/gpu/drm/i915/gt/gen7_renderclear.h + create mode 100644 drivers/gpu/drm/i915/gt/hsw_clear_kernel.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_context_param.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_context_param.h + create mode 100644 drivers/gpu/drm/i915/gt/ivb_clear_kernel.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_ring_submission.c + create mode 100644 drivers/gpu/drm/i915/gt/sysfs_engines.c + create mode 100644 drivers/gpu/drm/i915/gt/sysfs_engines.h + create mode 100644 drivers/gpu/drm/i915/i915_ioc32.h + create mode 100644 drivers/gpu/drm/i915/intel_dram.c + create mode 100644 drivers/gpu/drm/i915/intel_dram.h +Merging drm-tegra/drm/tegra/for-next (d87b2fea990c drm/tegra: dc: Silence RGB output deferred-probe error) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) +Merging drm-misc/for-linux-next (e1cf35b94c5f drm/edid: fix building error) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (5f9935f514d6 drm/msm: Fix error about comments within a comment block) +$ git merge drm-msm/msm-next +Already up to date. +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (2c76b324c794 drm/imx: parallel-display: Adjust bus_flags handling) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/parallel-display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/parallel-display.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging etnaviv/etnaviv/next (1442d81fef99 drm/etnaviv: Replace zero-length array with flexible-array member) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 44 ++++++++++++++++++++--- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 6 ++-- + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 42 +++++++++++++++++++++- + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 59 +++++++++++++++++++++++++++---- + drivers/gpu/drm/etnaviv/state_hi.xml.h | 36 +++++++++++++------ + 6 files changed, 161 insertions(+), 28 deletions(-) +Merging regmap/for-next (d29456d34def Merge branch 'regmap-5.6' into regmap-linus) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (3db1b00f2122 ALSA: firewire-tascam: Add missing annotation for tscm_hwdep_read_locked()) +$ git merge sound/for-next +Auto-merging sound/core/pcm_native.c +Auto-merging sound/core/oss/pcm_plugin.c +Merge made by the 'recursive' strategy. + include/linux/usb/audio-v2.h | 12 + + include/sound/pcm.h | 9 + + include/sound/pcm_params.h | 7 + + sound/core/info.c | 2 +- + sound/core/oss/pcm_oss.c | 23 +- + sound/core/oss/pcm_plugin.c | 120 ++++--- + sound/core/oss/rate.c | 2 +- + sound/core/pcm_dmaengine.c | 2 +- + sound/core/pcm_misc.c | 17 +- + sound/core/pcm_native.c | 47 +-- + sound/drivers/aloop.c | 6 +- + sound/drivers/dummy.c | 6 +- + sound/firewire/bebob/bebob.c | 2 +- + sound/firewire/digi00x/digi00x.c | 2 +- + sound/firewire/fireface/ff.c | 2 +- + sound/firewire/fireworks/fireworks.c | 2 +- + sound/firewire/tascam/tascam-hwdep.c | 2 + + sound/firewire/tascam/tascam.c | 2 +- + sound/isa/sb/emu8000_pcm.c | 4 +- + sound/pci/ali5451/ali5451.c | 6 +- + sound/pci/emu10k1/emu10k1_main.c | 4 +- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_controller.c | 2 +- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/hda/patch_hdmi.c | 313 ++++++------------ + sound/pci/korg1212/korg1212.c | 2 +- + sound/pci/rme9652/hdsp.c | 3 +- + sound/pci/via82xx.c | 6 +- + sound/pci/via82xx_modem.c | 6 +- + sound/usb/Makefile | 1 + + sound/usb/clock.c | 59 +++- + sound/usb/format.c | 37 +++ + sound/usb/midi.c | 2 +- + sound/usb/mixer.c | 16 + + sound/usb/mixer_quirks.c | 5 + + sound/usb/mixer_s1810c.c | 595 +++++++++++++++++++++++++++++++++++ + sound/usb/mixer_s1810c.h | 7 + + sound/usb/pcm.c | 7 +- + sound/usb/proc.c | 2 +- + sound/usb/quirks-table.h | 2 +- + sound/usb/quirks.c | 54 +++- + 41 files changed, 1031 insertions(+), 371 deletions(-) + create mode 100644 sound/usb/mixer_s1810c.c + create mode 100644 sound/usb/mixer_s1810c.h +Merging sound-asoc/for-next (c2807dc7c00b Merge branch 'asoc-5.7' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/core/pcm_misc.c +Auto-merging sound/core/pcm_dmaengine.c +Auto-merging include/sound/pcm.h +Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c +Removing Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt +Removing Documentation/devicetree/bindings/sound/st,stm32-i2s.txt +Removing Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt +Removing Documentation/devicetree/bindings/sound/cs42l51.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/amlogic,aiu.yaml | 113 ++ + .../bindings/sound/amlogic,g12a-toacodec.yaml | 51 + + .../bindings/sound/amlogic,gx-sound-card.yaml | 113 ++ + .../devicetree/bindings/sound/amlogic,t9015.yaml | 58 + + .../devicetree/bindings/sound/cirrus,cs42l51.yaml | 69 + + .../devicetree/bindings/sound/cs42l51.txt | 33 - + .../bindings/sound/google,cros-ec-codec.txt | 44 - + .../bindings/sound/google,cros-ec-codec.yaml | 67 + + .../bindings/sound/rockchip,rk3328-codec.txt | 7 +- + Documentation/devicetree/bindings/sound/rt5682.txt | 12 + + .../devicetree/bindings/sound/st,stm32-i2s.txt | 62 - + .../devicetree/bindings/sound/st,stm32-i2s.yaml | 87 ++ + .../devicetree/bindings/sound/st,stm32-spdifrx.txt | 56 - + .../bindings/sound/st,stm32-spdifrx.yaml | 80 + + .../devicetree/bindings/sound/tas2562.txt | 2 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 83 + + Documentation/sound/soc/codec-to-codec.rst | 9 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 54 +- + drivers/soundwire/qcom.c | 7 +- + drivers/spi/Kconfig | 2 +- + include/dt-bindings/sound/meson-aiu.h | 18 + + include/dt-bindings/sound/meson-g12a-toacodec.h | 10 + + include/sound/compress_driver.h | 40 +- + include/sound/hdaudio.h | 2 + + include/sound/pcm.h | 14 +- + include/sound/rt5682.h | 8 + + include/sound/soc-dai.h | 44 +- + include/sound/soc-dapm.h | 6 + + include/sound/soc-dpcm.h | 20 +- + include/sound/soc.h | 34 +- + include/sound/sof/header.h | 11 + + include/sound/sof/topology.h | 3 +- + include/uapi/sound/sof/abi.h | 2 +- + sound/core/compress_offload.c | 42 + + sound/core/pcm_dmaengine.c | 6 +- + sound/core/pcm_misc.c | 18 +- + sound/soc/amd/Kconfig | 10 + + sound/soc/amd/Makefile | 2 + + sound/soc/amd/acp3x-rt5682-max9836.c | 376 +++++ + sound/soc/amd/raven/acp3x-i2s.c | 44 +- + sound/soc/amd/raven/pci-acp3x.c | 7 +- + sound/soc/codecs/Kconfig | 627 ++++---- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/cros_ec_codec.c | 25 +- + sound/soc/codecs/cs4271.c | 4 +- + sound/soc/codecs/max98357a.c | 36 +- + sound/soc/codecs/mt6660.c | 79 +- + sound/soc/codecs/rk3328_codec.c | 31 +- + sound/soc/codecs/rl6231.c | 1 + + sound/soc/codecs/rl6231.h | 2 +- + sound/soc/codecs/rt1015.c | 10 +- + sound/soc/codecs/rt5659.c | 2 +- + sound/soc/codecs/rt5682-sdw.c | 333 ++++ + sound/soc/codecs/rt5682-sdw.h | 20 + + sound/soc/codecs/rt5682.c | 1268 +++++++++++++-- + sound/soc/codecs/rt5682.h | 98 +- + sound/soc/codecs/tas2562.c | 119 +- + sound/soc/codecs/tas2562.h | 12 +- + sound/soc/codecs/tlv320adcx140.c | 920 +++++++++++ + sound/soc/codecs/tlv320adcx140.h | 131 ++ + sound/soc/codecs/wcd934x.c | 37 +- + sound/soc/codecs/wm0010.c | 2 +- + sound/soc/dwc/dwc-i2s.c | 8 +- + sound/soc/fsl/fsl_asrc_dma.c | 4 +- + sound/soc/generic/simple-card-utils.c | 48 + + sound/soc/intel/atom/sst-atom-controls.c | 2 +- + sound/soc/intel/atom/sst/sst_pci.c | 2 +- + sound/soc/intel/boards/Kconfig | 14 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/cml_rt1011_rt5682.c | 3 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 8 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- + sound/soc/intel/boards/skl_hda_dsp_common.h | 4 + + sound/soc/intel/boards/skl_hda_dsp_generic.c | 25 +- + sound/soc/intel/boards/sof_pcm512x.c | 428 +++++ + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 7 + + sound/soc/intel/skylake/skl-pcm.c | 10 +- + sound/soc/jz4740/jz4740-i2s.c | 48 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 19 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 113 +- + sound/soc/meson/Kconfig | 41 + + sound/soc/meson/Makefile | 19 + + sound/soc/meson/aiu-acodec-ctrl.c | 203 +++ + sound/soc/meson/aiu-codec-ctrl.c | 151 ++ + sound/soc/meson/aiu-encoder-i2s.c | 365 +++++ + sound/soc/meson/aiu-encoder-spdif.c | 209 +++ + sound/soc/meson/aiu-fifo-i2s.c | 153 ++ + sound/soc/meson/aiu-fifo-spdif.c | 186 +++ + sound/soc/meson/aiu-fifo.c | 223 +++ + sound/soc/meson/aiu-fifo.h | 50 + + sound/soc/meson/aiu.c | 388 +++++ + sound/soc/meson/aiu.h | 89 ++ + sound/soc/meson/axg-card.c | 406 +---- + sound/soc/meson/g12a-toacodec.c | 252 +++ + sound/soc/meson/g12a-tohdmitx.c | 219 +-- + sound/soc/meson/gx-card.c | 141 ++ + sound/soc/meson/meson-card-utils.c | 385 +++++ + sound/soc/meson/meson-card.h | 55 + + sound/soc/meson/meson-codec-glue.c | 149 ++ + sound/soc/meson/meson-codec-glue.h | 32 + + sound/soc/meson/t9015.c | 333 ++++ + sound/soc/qcom/apq8016_sbc.c | 7 +- + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/sdm845.c | 20 +- + sound/soc/samsung/Kconfig | 4 +- + sound/soc/samsung/arndale.c | 4 +- + sound/soc/samsung/littlemill.c | 2 +- + sound/soc/samsung/lowland.c | 2 +- + sound/soc/samsung/odroid.c | 4 +- + sound/soc/samsung/smdk_wm8994.c | 2 +- + sound/soc/samsung/smdk_wm8994pcm.c | 2 +- + sound/soc/samsung/snow.c | 4 +- + sound/soc/samsung/speyside.c | 2 +- + sound/soc/samsung/tm2_wm5110.c | 3 +- + sound/soc/samsung/tobermory.c | 2 +- + sound/soc/sh/fsi.c | 3 +- + sound/soc/soc-compress.c | 5 +- + sound/soc/soc-core.c | 234 +-- + sound/soc/soc-dai.c | 18 +- + sound/soc/soc-dapm.c | 219 +-- + sound/soc/soc-generic-dmaengine-pcm.c | 26 +- + sound/soc/soc-pcm.c | 1638 ++++++++++---------- + sound/soc/soc-topology.c | 2 +- + sound/soc/sof/Kconfig | 9 + + sound/soc/sof/Makefile | 1 + + sound/soc/sof/compress.c | 146 ++ + sound/soc/sof/compress.h | 31 + + sound/soc/sof/core.c | 10 +- + sound/soc/sof/debug.c | 226 +++ + sound/soc/sof/imx/imx8.c | 57 +- + sound/soc/sof/intel/Kconfig | 9 + + sound/soc/sof/intel/Makefile | 1 + + sound/soc/sof/intel/apl.c | 9 + + sound/soc/sof/intel/cnl.c | 46 +- + sound/soc/sof/intel/hda-codec.c | 11 +- + sound/soc/sof/intel/hda-compress.c | 114 ++ + sound/soc/sof/intel/hda-dai.c | 28 + + sound/soc/sof/intel/hda-dsp.c | 288 +++- + sound/soc/sof/intel/hda-ipc.c | 4 +- + sound/soc/sof/intel/hda-loader.c | 6 + + sound/soc/sof/intel/hda-pcm.c | 8 +- + sound/soc/sof/intel/hda-stream.c | 25 +- + sound/soc/sof/intel/hda.c | 27 +- + sound/soc/sof/intel/hda.h | 53 +- + sound/soc/sof/ipc.c | 41 +- + sound/soc/sof/ops.h | 59 +- + sound/soc/sof/pcm.c | 15 +- + sound/soc/sof/pm.c | 176 +-- + sound/soc/sof/probe.c | 290 ++++ + sound/soc/sof/probe.h | 85 + + sound/soc/sof/sof-audio.c | 59 +- + sound/soc/sof/sof-audio.h | 3 +- + sound/soc/sof/sof-of-dev.c | 10 + + sound/soc/sof/sof-priv.h | 68 +- + sound/soc/sprd/Kconfig | 2 +- + sound/soc/sprd/sprd-mcdt.h | 2 +- + sound/soc/stm/stm32_i2s.c | 39 +- + sound/soc/stm/stm32_sai.c | 26 +- + sound/soc/stm/stm32_sai_sub.c | 11 +- + sound/soc/stm/stm32_spdifrx.c | 29 +- + sound/soc/sunxi/sun8i-codec.c | 3 - + sound/soc/ti/Kconfig | 8 +- + sound/soc/ti/Makefile | 2 + + sound/soc/ti/davinci-mcasp.c | 13 +- + sound/soc/ti/udma-pcm.c | 43 + + sound/soc/ti/udma-pcm.h | 18 + + sound/soc/zte/zx-spdif.c | 1 - + sound/soc/zte/zx-tdm.c | 3 +- + sound/usb/usx2y/usbusx2yaudio.c | 9 +- + 173 files changed, 11904 insertions(+), 2716 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,aiu.yaml + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,t9015.yaml + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/cs42l51.txt + delete mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt + create mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt + create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/tlv320adcx140.yaml + create mode 100644 include/dt-bindings/sound/meson-aiu.h + create mode 100644 include/dt-bindings/sound/meson-g12a-toacodec.h + create mode 100644 sound/soc/amd/acp3x-rt5682-max9836.c + create mode 100644 sound/soc/codecs/rt5682-sdw.c + create mode 100644 sound/soc/codecs/rt5682-sdw.h + create mode 100644 sound/soc/codecs/tlv320adcx140.c + create mode 100644 sound/soc/codecs/tlv320adcx140.h + create mode 100644 sound/soc/intel/boards/sof_pcm512x.c + create mode 100644 sound/soc/meson/aiu-acodec-ctrl.c + create mode 100644 sound/soc/meson/aiu-codec-ctrl.c + create mode 100644 sound/soc/meson/aiu-encoder-i2s.c + create mode 100644 sound/soc/meson/aiu-encoder-spdif.c + create mode 100644 sound/soc/meson/aiu-fifo-i2s.c + create mode 100644 sound/soc/meson/aiu-fifo-spdif.c + create mode 100644 sound/soc/meson/aiu-fifo.c + create mode 100644 sound/soc/meson/aiu-fifo.h + create mode 100644 sound/soc/meson/aiu.c + create mode 100644 sound/soc/meson/aiu.h + create mode 100644 sound/soc/meson/g12a-toacodec.c + create mode 100644 sound/soc/meson/gx-card.c + create mode 100644 sound/soc/meson/meson-card-utils.c + create mode 100644 sound/soc/meson/meson-card.h + create mode 100644 sound/soc/meson/meson-codec-glue.c + create mode 100644 sound/soc/meson/meson-codec-glue.h + create mode 100644 sound/soc/meson/t9015.c + create mode 100644 sound/soc/sof/compress.c + create mode 100644 sound/soc/sof/compress.h + create mode 100644 sound/soc/sof/intel/hda-compress.c + create mode 100644 sound/soc/sof/probe.c + create mode 100644 sound/soc/sof/probe.h + create mode 100644 sound/soc/ti/udma-pcm.c + create mode 100644 sound/soc/ti/udma-pcm.h +Merging modules/modules-next (0f74226649fb kernel: module: Replace zero-length array with flexible-array member) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging input/next (061706716384 Input: elants_i2c - report resolution information for touch major) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/touchscreen/elants_i2c.c | 1 + + drivers/input/touchscreen/goodix.c | 22 ++++++++++++++++++++++ + 2 files changed, 23 insertions(+) +Merging block/for-next (a227f192663c Merge branch 'for-5.7/drivers' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + Documentation/block/capability.rst | 16 +- + block/blk-core.c | 38 +- + block/blk-flush.c | 7 +- + block/blk-ioc.c | 7 + + block/blk-iocost.c | 3 - + block/blk-mq.c | 12 +- + block/blk-zoned.c | 2 +- + block/blk.h | 4 +- + block/opal_proto.h | 1 + + block/sed-opal.c | 2 +- + drivers/ata/acard-ahci.c | 4 - + drivers/ata/ahci.c | 20 +- + drivers/ata/ahci_qoriq.c | 4 - + drivers/ata/ata_piix.c | 3 - + drivers/ata/libahci.c | 15 +- + drivers/ata/libata-acpi.c | 62 +- + drivers/ata/libata-core.c | 229 ++--- + drivers/ata/libata-eh.c | 47 +- + drivers/ata/libata-pmp.c | 8 - + drivers/ata/libata-scsi.c | 59 +- + drivers/ata/libata-sff.c | 76 +- + drivers/ata/libata-trace.c | 29 + + drivers/ata/libata-transport.c | 24 +- + drivers/ata/pata_arasan_cf.c | 3 + + drivers/ata/pata_octeon_cf.c | 23 +- + drivers/ata/pata_pdc2027x.c | 81 +- + drivers/ata/pata_pdc202xx_old.c | 2 - + drivers/ata/pata_sil680.c | 1 - + drivers/ata/pdc_adma.c | 2 +- + drivers/ata/sata_dwc_460ex.c | 57 +- + drivers/ata/sata_fsl.c | 102 +- + drivers/ata/sata_inic162x.c | 2 +- + drivers/ata/sata_mv.c | 110 +- + drivers/ata/sata_nv.c | 29 +- + drivers/ata/sata_qstor.c | 2 +- + drivers/ata/sata_rcar.c | 8 +- + drivers/ata/sata_sil24.c | 5 +- + drivers/ata/sata_sx4.c | 2 +- + drivers/block/aoe/aoeblk.c | 4 +- + drivers/block/drbd/drbd_main.c | 11 - + drivers/block/loop.c | 18 +- + drivers/block/nbd.c | 27 +- + drivers/block/null_blk_main.c | 133 ++- + drivers/lightnvm/pblk-sysfs.c | 42 +- + fs/io-wq.c | 283 ++---- + fs/io-wq.h | 8 +- + fs/io_uring.c | 1946 +++++++++++++++++++++++++----------- + fs/splice.c | 6 +- + include/linux/blk-mq.h | 5 +- + include/linux/genhd.h | 69 +- + include/linux/iocontext.h | 1 + + include/linux/libata.h | 105 +- + include/linux/pci_ids.h | 2 + + include/linux/socket.h | 4 + + include/linux/splice.h | 3 + + include/net/compat.h | 3 + + include/trace/events/io_uring.h | 103 ++ + include/trace/events/libata.h | 377 +++++++ + include/uapi/linux/io_uring.h | 42 +- + kernel/task_work.c | 18 +- + net/compat.c | 30 +- + net/socket.c | 25 +- + 62 files changed, 2790 insertions(+), 1576 deletions(-) +Merging device-mapper/for-next (636be4241bdd dm: bump version of core and various targets) +$ 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 (d997c18ab48e mmc: sdhci: iproc: Add custom set_power() callback for bcm2711) +$ git merge mmc/next +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c +Auto-merging drivers/firmware/xilinx/zynqmp.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 5 + + Documentation/devicetree/bindings/mmc/mmci.txt | 2 + + .../devicetree/bindings/mmc/sdhci-am654.txt | 21 +- + .../devicetree/bindings/mmc/sdhci-msm.txt | 8 +- + .../devicetree/bindings/mmc/synopsys-dw-mshc.yaml | 2 +- + drivers/firmware/xilinx/zynqmp.c | 2 + + drivers/mmc/core/block.c | 85 +++-- + drivers/mmc/core/core.c | 36 +-- + drivers/mmc/core/mmc.c | 56 ++-- + drivers/mmc/core/mmc_ops.c | 156 +++++---- + drivers/mmc/core/mmc_ops.h | 13 +- + drivers/mmc/core/mmc_test.c | 52 ++- + drivers/mmc/core/queue.c | 22 +- + drivers/mmc/core/sd.c | 10 + + drivers/mmc/core/sdio_irq.c | 15 +- + drivers/mmc/host/Kconfig | 12 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/cqhci.c | 16 +- + drivers/mmc/host/cqhci.h | 6 +- + drivers/mmc/host/mmc_hsq.c | 348 +++++++++++++++++++++ + drivers/mmc/host/mmc_hsq.h | 30 ++ + drivers/mmc/host/mmci.c | 43 ++- + drivers/mmc/host/mmci.h | 8 + + drivers/mmc/host/mmci_stm32_sdmmc.c | 204 +++++++++++- + drivers/mmc/host/renesas_sdhi.h | 6 + + drivers/mmc/host/renesas_sdhi_core.c | 183 ++++++++--- + drivers/mmc/host/sdhci-acpi.c | 2 +- + drivers/mmc/host/sdhci-cadence.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 167 ++++++++-- + drivers/mmc/host/sdhci-esdhc.h | 1 + + drivers/mmc/host/sdhci-iproc.c | 17 +- + drivers/mmc/host/sdhci-milbeaut.c | 13 +- + drivers/mmc/host/sdhci-msm.c | 27 +- + drivers/mmc/host/sdhci-of-arasan.c | 74 ++++- + drivers/mmc/host/sdhci-of-at91.c | 18 +- + drivers/mmc/host/sdhci-omap.c | 57 ++++ + drivers/mmc/host/sdhci-pci.h | 2 +- + drivers/mmc/host/sdhci-pltfm.h | 2 +- + drivers/mmc/host/sdhci-sprd.c | 30 +- + drivers/mmc/host/sdhci-tegra.c | 35 ++- + drivers/mmc/host/sdhci.c | 35 ++- + drivers/mmc/host/sdhci.h | 8 +- + drivers/mmc/host/sdhci_am654.c | 264 ++++++++++------ + drivers/mmc/host/tmio_mmc.h | 11 +- + drivers/mmc/host/tmio_mmc_core.c | 77 +---- + drivers/mmc/host/vub300.c | 4 +- + include/linux/firmware/xlnx-zynqmp.h | 9 +- + include/linux/mmc/host.h | 7 +- + include/linux/mmc/mmc.h | 10 + + include/linux/mmc/sdio_func.h | 2 +- + include/linux/platform_data/mmc-esdhc-imx.h | 1 + + include/uapi/linux/mmc/ioctl.h | 2 +- + 52 files changed, 1730 insertions(+), 489 deletions(-) + create mode 100644 drivers/mmc/host/mmc_hsq.c + create mode 100644 drivers/mmc/host/mmc_hsq.h +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 (1129d6145ed5 mfd: Add support for Azoteq IQS620A/621/622/624/625) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/iqs62x-keys.yaml | 132 +++ + Documentation/devicetree/bindings/mfd/iqs62x.yaml | 179 ++++ + .../devicetree/bindings/pwm/iqs620a-pwm.yaml | 32 + + drivers/mfd/Kconfig | 22 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/cros_ec_dev.c | 2 +- + drivers/mfd/iqs62x.c | 1063 ++++++++++++++++++++ + drivers/mfd/omap-usb-tll.c | 2 +- + drivers/mfd/qcom-pm8xxx.c | 2 +- + include/linux/mfd/iqs62x.h | 139 +++ + 10 files changed, 1567 insertions(+), 7 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/iqs62x-keys.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/iqs62x.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/iqs620a-pwm.yaml + create mode 100644 drivers/mfd/iqs62x.c + create mode 100644 include/linux/mfd/iqs62x.h +Merging backlight/for-backlight-next (7af43a76695d backlight: qcom-wled: Fix unsigned comparison to zero) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (f78c55e3b480 power: reset: sc27xx: Allow the SC27XX poweroff driver building into a module) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + drivers/power/reset/Kconfig | 2 +- + drivers/power/reset/at91-reset.c | 190 +++++++++++++++---------------- + drivers/power/reset/sc27xx-poweroff.c | 21 +++- + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/ab8500_charger.c | 35 +++--- + drivers/power/supply/axp288_charger.c | 57 +++++++++- + drivers/power/supply/axp288_fuel_gauge.c | 4 +- + drivers/power/supply/bq27xxx_battery.c | 5 +- + drivers/power/supply/ingenic-battery.c | 3 +- + drivers/power/supply/sc27xx_fuel_gauge.c | 12 ++ + drivers/power/supply/twl4030_charger.c | 4 +- + include/linux/power/charger-manager.h | 2 +- + 12 files changed, 211 insertions(+), 126 deletions(-) +Merging regulator/for-next (385377acc5a1 Merge branch 'regulator-5.7' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 4 + + .../devicetree/bindings/regulator/mps,mp5416.yaml | 78 +++++++ + .../regulator/vqmmc-ipq4019-regulator.yaml | 42 ++++ + MAINTAINERS | 3 +- + drivers/regulator/Kconfig | 11 + + drivers/regulator/Makefile | 1 + + drivers/regulator/anatop-regulator.c | 10 +- + drivers/regulator/axp20x-regulator.c | 6 +- + drivers/regulator/da9062-regulator.c | 2 +- + drivers/regulator/da9063-regulator.c | 66 +++--- + drivers/regulator/mp5416.c | 245 +++++++++++++++++++++ + drivers/regulator/mp8859.c | 1 + + drivers/regulator/pwm-regulator.c | 6 +- + drivers/regulator/qcom_rpm-regulator.c | 9 + + 14 files changed, 445 insertions(+), 39 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mps,mp5416.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml + create mode 100644 drivers/regulator/mp5416.c +Merging security/next-testing (3e27a33932df security: remove duplicated include from security.h) +$ git merge security/next-testing +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Merge made by the 'recursive' strategy. + include/linux/lsm_hooks.h | 36 +++++++++++++++++++++++++++++++++++- + include/linux/security.h | 1 - + 2 files changed, 35 insertions(+), 2 deletions(-) +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 (9e2b4be377f0 ima: add a new CONFIG for loading arch-specific policies) +$ git merge integrity/next-integrity +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 1 + + arch/s390/Kconfig | 1 + + arch/s390/kernel/Makefile | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/Makefile | 4 +--- + include/linux/ima.h | 3 +-- + security/integrity/digsig.c | 2 -- + security/integrity/digsig_asymmetric.c | 2 -- + security/integrity/evm/evm_crypto.c | 2 -- + security/integrity/evm/evm_main.c | 2 -- + security/integrity/evm/evm_secfs.c | 2 -- + security/integrity/ima/Kconfig | 7 +++++++ + security/integrity/ima/Makefile | 6 +++--- + security/integrity/ima/ima_asymmetric_keys.c | 2 -- + security/integrity/ima/ima_crypto.c | 2 -- + security/integrity/ima/ima_fs.c | 2 -- + security/integrity/ima/ima_init.c | 2 -- + security/integrity/ima/ima_kexec.c | 1 - + security/integrity/ima/ima_main.c | 5 +++-- + security/integrity/ima/ima_policy.c | 2 -- + security/integrity/ima/ima_queue.c | 2 -- + security/integrity/ima/ima_queue_keys.c | 2 -- + security/integrity/ima/ima_template.c | 2 -- + security/integrity/ima/ima_template_lib.c | 2 -- + security/integrity/integrity.h | 6 ++++++ + 25 files changed, 25 insertions(+), 40 deletions(-) +Merging keys/keys-next (43672cf93c6d Merge branch 'notifications-pipe-core' into keys-next) +$ git merge keys/keys-next +Auto-merging security/selinux/hooks.c +Auto-merging init/Kconfig +Auto-merging include/linux/security.h +Auto-merging include/linux/pipe_fs_i.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/splice.c +Auto-merging fs/pipe.c +CONFLICT (content): Merge conflict in fs/pipe.c +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Resolved 'fs/pipe.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a0438287df23] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 58 ++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 354 +++++++++++ + fs/pipe.c | 242 +++++--- + fs/splice.c | 12 +- + include/linux/key.h | 3 + + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 ++ + include/linux/pipe_fs_i.h | 27 +- + include/linux/security.h | 31 + + include/linux/watch_queue.h | 127 ++++ + include/uapi/linux/keyctl.h | 2 + + include/uapi/linux/watch_queue.h | 104 ++++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/watch_queue.c | 659 +++++++++++++++++++++ + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 186 ++++++ + security/keys/Kconfig | 9 + + security/keys/compat.c | 3 + + security/keys/gc.c | 5 + + security/keys/internal.h | 30 +- + security/keys/key.c | 38 +- + security/keys/keyctl.c | 99 +++- + security/keys/keyring.c | 20 +- + security/keys/request_key.c | 4 +- + security/security.c | 23 + + security/selinux/hooks.c | 14 + + security/smack/smack_lsm.c | 83 ++- + 31 files changed, 2095 insertions(+), 105 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 +$ git am -3 ../patches/0001-io_uring-fix-up-get_pipe_info-API-change.patch +Applying: io_uring: fix up for get_pipe_info() API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/io_uring.c +$ git add -A . +$ git commit -v -a --amend +[master 7ab2bd3592e3] Merge remote-tracking branch 'keys/keys-next' + Date: Fri Mar 13 15:19:58 2020 +1100 +Merging selinux/next (28d4d0e16f09 When using NFSv4.2, the security label for the root inode should be set via a call to nfs_setsecurity() during the mount process, otherwise the inode will appear as unlabeled for up to acdirmin seconds. Currently the label for the root inode is allocated, retrieved, and freed entirely witin nfs4_proc_get_root().) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'security/selinux/hooks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1d7c67ccf358] Merge remote-tracking branch 'selinux/next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/obsolete/sysfs-selinux-checkreqprot | 23 ++ + Documentation/admin-guide/kernel-parameters.txt | 1 + + MAINTAINERS | 3 +- + fs/nfs/getroot.c | 39 ++- + fs/nfs/nfs4proc.c | 12 +- + fs/nfs/super.c | 25 -- + include/linux/nfs_xdr.h | 1 + + scripts/selinux/genheaders/genheaders.c | 11 +- + security/selinux/Kconfig | 3 + + security/selinux/Makefile | 4 +- + security/selinux/hooks.c | 18 +- + security/selinux/include/conditional.h | 8 +- + security/selinux/include/initial_sid_to_string.h | 57 ++-- + security/selinux/include/security.h | 12 + + security/selinux/selinuxfs.c | 19 +- + security/selinux/ss/avtab.c | 3 +- + security/selinux/ss/avtab.h | 2 +- + security/selinux/ss/conditional.c | 259 +++++++---------- + security/selinux/ss/conditional.h | 29 +- + security/selinux/ss/hashtab.c | 28 +- + security/selinux/ss/hashtab.h | 2 +- + security/selinux/ss/policydb.c | 319 ++++++++++----------- + security/selinux/ss/policydb.h | 13 +- + security/selinux/ss/services.c | 79 +++-- + security/selinux/ss/services.h | 2 - + security/selinux/{ss => }/status.c | 32 +-- + 26 files changed, 518 insertions(+), 486 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-selinux-checkreqprot + rename security/selinux/{ss => }/status.c (81%) +Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock) +$ git merge smack/for-next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. +Merging tomoyo/master (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (6390677444b0 MAINTAINERS: adjust to trusted keys subsystem creation) +$ git merge tpmdd/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + drivers/char/tpm/eventlog/common.c | 12 ++++-------- + drivers/char/tpm/eventlog/tpm1.c | 2 +- + drivers/char/tpm/eventlog/tpm2.c | 2 +- + drivers/char/tpm/tpm-chip.c | 4 +--- + drivers/char/tpm/tpm.h | 2 +- + drivers/char/tpm/tpm_tis_spi_cr50.c | 7 ++++++- + drivers/char/tpm/tpm_tis_spi_main.c | 3 ++- + 8 files changed, 18 insertions(+), 18 deletions(-) +Merging watchdog/master (44144c809e39 watchdog: da9062: Add dependency on I2C) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (a4909b4d377c Merge branches 'iommu/fixes', 'arm/qcom', 'arm/omap', 'x86/amd', 'virtio' and 'core' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/Kconfig | 20 +++++++------- + drivers/iommu/amd_iommu_types.h | 2 +- + drivers/iommu/dma-iommu.c | 16 +++++------ + drivers/iommu/dmar.c | 14 +++++----- + drivers/iommu/intel-iommu-debugfs.c | 53 ++++++++++++++++++++++++++----------- + drivers/iommu/intel-iommu.c | 28 +++++++++++++------- + drivers/iommu/io-pgtable-arm.c | 4 +-- + drivers/iommu/iommu.c | 15 ++++++----- + drivers/iommu/omap-iommu.c | 10 +++---- + drivers/iommu/omap-iopgtable.h | 3 ++- + drivers/iommu/qcom_iommu.c | 2 +- + drivers/iommu/virtio-iommu.c | 1 - + include/linux/dmar.h | 14 ++++++---- + include/linux/intel-iommu.h | 2 ++ + include/linux/iommu.h | 2 +- + 15 files changed, 114 insertions(+), 72 deletions(-) +Merging vfio/next (7b5372ba04ca vfio: platform: fix __iomem in vfio_platform_amdxgbe.c) +$ git merge vfio/next +Already up to date. +Merging audit/next (1320a4052ea1 audit: trigger accompanying records when no rules present) +$ git merge audit/next +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 1 + + kernel/audit.h | 8 ++++++++ + kernel/audit_watch.c | 2 -- + kernel/auditsc.c | 3 --- + 4 files changed, 9 insertions(+), 5 deletions(-) +Merging devicetree/for-next (905fc6b1bfb4 dt-bindings: rcar-vin: Convert bindings to json-schema) +$ git merge devicetree/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/serial/uniphier-uart.txt +Removing Documentation/devicetree/bindings/rng/brcm,bcm2835.txt +Removing Documentation/devicetree/bindings/reset/renesas,rst.txt +Removing Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt +Removing Documentation/devicetree/bindings/power/renesas,apmu.txt +Removing Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt +Removing Documentation/devicetree/bindings/net/can/m_can.txt +Removing Documentation/devicetree/bindings/net/can/can-transceiver.txt +Removing Documentation/devicetree/bindings/mtd/denali-nand.txt +Removing Documentation/devicetree/bindings/mmc/uniphier-sd.txt +Removing Documentation/devicetree/bindings/mmc/sdhci-cadence.txt +Removing Documentation/devicetree/bindings/media/renesas,vin.txt +Removing Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.txt +Removing Documentation/devicetree/bindings/i2c/i2c-uniphier.txt +Removing Documentation/devicetree/bindings/i2c/i2c-uniphier-f.txt +Removing Documentation/devicetree/bindings/gpio/gpio-uniphier.txt +Removing Documentation/devicetree/bindings/dma/uniphier-mio-dmac.txt +Removing Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt +Removing Documentation/devicetree/bindings/clock/uniphier-clock.txt +Removing Documentation/devicetree/bindings/bus/uniphier-system-bus.txt +Removing Documentation/devicetree/bindings/ata/sata_rcar.txt +Removing Documentation/devicetree/bindings/arm/socionext/uniphier.txt +Removing Documentation/devicetree/bindings/arm/socionext/cache-uniphier.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 10 + + Documentation/devicetree/bindings/arm/pmu.yaml | 41 +- + .../bindings/arm/socionext/cache-uniphier.txt | 60 -- + .../socionext/socionext,uniphier-system-cache.yaml | 102 ++++ + .../devicetree/bindings/arm/socionext/uniphier.txt | 47 -- + .../bindings/arm/socionext/uniphier.yaml | 61 ++ + .../devicetree/bindings/ata/renesas,rcar-sata.yaml | 71 +++ + .../devicetree/bindings/ata/sata_rcar.txt | 36 -- + .../bus/socionext,uniphier-system-bus.yaml | 96 ++++ + .../bindings/bus/uniphier-system-bus.txt | 66 --- + .../bindings/clock/socionext,uniphier-clock.yaml | 94 +++ + .../devicetree/bindings/clock/uniphier-clock.txt | 132 ----- + .../bindings/display/etnaviv/etnaviv-drm.txt | 36 -- + .../bindings/dma/socionext,uniphier-mio-dmac.yaml | 63 ++ + .../devicetree/bindings/dma/uniphier-mio-dmac.txt | 25 - + .../devicetree/bindings/example-schema.yaml | 4 +- + .../devicetree/bindings/gpio/gpio-uniphier.txt | 51 -- + .../bindings/gpio/socionext,uniphier-gpio.yaml | 92 +++ + .../devicetree/bindings/gpu/vivante,gc.yaml | 69 +++ + .../devicetree/bindings/i2c/i2c-uniphier-f.txt | 25 - + .../devicetree/bindings/i2c/i2c-uniphier.txt | 25 - + .../bindings/i2c/socionext,uniphier-fi2c.yaml | 50 ++ + .../bindings/i2c/socionext,uniphier-i2c.yaml | 50 ++ + .../socionext,uniphier-aidet.txt | 32 -- + .../socionext,uniphier-aidet.yaml | 61 ++ + .../devicetree/bindings/media/renesas,vin.txt | 217 ------- + .../devicetree/bindings/media/renesas,vin.yaml | 402 +++++++++++++ + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 143 +++++ + .../devicetree/bindings/mmc/sdhci-cadence.txt | 80 --- + .../bindings/mmc/socionext,uniphier-sd.yaml | 99 ++++ + .../devicetree/bindings/mmc/uniphier-sd.txt | 55 -- + .../devicetree/bindings/mtd/denali,nand.yaml | 148 +++++ + .../devicetree/bindings/mtd/denali-nand.txt | 61 -- + .../devicetree/bindings/net/can/bosch,m_can.yaml | 144 +++++ + .../bindings/net/can/can-transceiver.txt | 24 - + .../bindings/net/can/can-transceiver.yaml | 18 + + .../devicetree/bindings/net/can/m_can.txt | 75 --- + .../pinctrl/socionext,uniphier-pinctrl.txt | 27 - + .../pinctrl/socionext,uniphier-pinctrl.yaml | 42 ++ + .../devicetree/bindings/power/renesas,apmu.txt | 35 -- + .../devicetree/bindings/power/renesas,apmu.yaml | 55 ++ + .../bindings/power/renesas,rcar-sysc.txt | 62 -- + .../bindings/power/renesas,rcar-sysc.yaml | 73 +++ + .../devicetree/bindings/pwm/pwm-mediatek.txt | 5 + + .../devicetree/bindings/reset/renesas,rst.txt | 48 -- + .../devicetree/bindings/reset/renesas,rst.yaml | 63 ++ + .../devicetree/bindings/rng/brcm,bcm2835.txt | 40 -- + .../devicetree/bindings/rng/brcm,bcm2835.yaml | 59 ++ + .../bindings/serial/snps-dw-apb-uart.yaml | 1 + + .../bindings/serial/socionext,uniphier-uart.yaml | 46 ++ + .../devicetree/bindings/serial/uniphier-uart.txt | 22 - + .../devicetree/bindings/soc/imx/fsl,aips-bus.yaml | 47 ++ + Documentation/devicetree/bindings/usb/dwc2.yaml | 6 + + .../devicetree/bindings/usb/exynos-usb.txt | 9 +- + .../devicetree/bindings/vendor-prefixes.yaml | 14 + + MAINTAINERS | 9 +- + arch/microblaze/pci/pci-common.c | 7 +- + arch/powerpc/kernel/pci-common.c | 2 +- + drivers/of/address.c | 273 +++++---- + drivers/of/of_reserved_mem.c | 2 +- + drivers/of/property.c | 4 + + drivers/of/resolver.c | 5 +- + drivers/of/unittest-data/Makefile | 8 +- + drivers/of/unittest-data/overlay_gpio_01.dts | 23 + + drivers/of/unittest-data/overlay_gpio_02a.dts | 16 + + drivers/of/unittest-data/overlay_gpio_02b.dts | 16 + + drivers/of/unittest-data/overlay_gpio_03.dts | 23 + + drivers/of/unittest-data/overlay_gpio_04a.dts | 16 + + drivers/of/unittest-data/overlay_gpio_04b.dts | 16 + + drivers/of/unittest.c | 639 ++++++++++++++++++++- + include/linux/of_address.h | 13 +- + 71 files changed, 3115 insertions(+), 1476 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/socionext/cache-uniphier.txt + create mode 100644 Documentation/devicetree/bindings/arm/socionext/socionext,uniphier-system-cache.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/socionext/uniphier.txt + create mode 100644 Documentation/devicetree/bindings/arm/socionext/uniphier.yaml + create mode 100644 Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/sata_rcar.txt + create mode 100644 Documentation/devicetree/bindings/bus/socionext,uniphier-system-bus.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/uniphier-system-bus.txt + create mode 100644 Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/uniphier-clock.txt + delete mode 100644 Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt + create mode 100644 Documentation/devicetree/bindings/dma/socionext,uniphier-mio-dmac.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/uniphier-mio-dmac.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-uniphier.txt + create mode 100644 Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/gpu/vivante,gc.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier-f.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier.txt + create mode 100644 Documentation/devicetree/bindings/i2c/socionext,uniphier-fi2c.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/socionext,uniphier-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.yaml + delete mode 100644 Documentation/devicetree/bindings/media/renesas,vin.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,vin.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-cadence.txt + create mode 100644 Documentation/devicetree/bindings/mmc/socionext,uniphier-sd.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/uniphier-sd.txt + create mode 100644 Documentation/devicetree/bindings/mtd/denali,nand.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt + create mode 100644 Documentation/devicetree/bindings/net/can/bosch,m_can.yaml + delete mode 100644 Documentation/devicetree/bindings/net/can/can-transceiver.txt + create mode 100644 Documentation/devicetree/bindings/net/can/can-transceiver.yaml + delete mode 100644 Documentation/devicetree/bindings/net/can/m_can.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/power/renesas,apmu.txt + create mode 100644 Documentation/devicetree/bindings/power/renesas,apmu.yaml + delete mode 100644 Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt + create mode 100644 Documentation/devicetree/bindings/power/renesas,rcar-sysc.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/renesas,rst.txt + create mode 100644 Documentation/devicetree/bindings/reset/renesas,rst.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm2835.txt + create mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm2835.yaml + create mode 100644 Documentation/devicetree/bindings/serial/socionext,uniphier-uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/uniphier-uart.txt + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,aips-bus.yaml + create mode 100644 drivers/of/unittest-data/overlay_gpio_01.dts + create mode 100644 drivers/of/unittest-data/overlay_gpio_02a.dts + create mode 100644 drivers/of/unittest-data/overlay_gpio_02b.dts + create mode 100644 drivers/of/unittest-data/overlay_gpio_03.dts + create mode 100644 drivers/of/unittest-data/overlay_gpio_04a.dts + create mode 100644 drivers/of/unittest-data/overlay_gpio_04b.dts +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 (5abd978a85f0 Merge branch 'spi-5.7' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/Kconfig +Removing drivers/mtd/spi-nor/mtk-quadspi.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/spi/spi-rockchip.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/fsi/ibm,fsi2spi.yaml | 36 ++ + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 22 + + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 5 +- + .../devicetree/bindings/spi/qca,ar934x-spi.yaml | 41 ++ + .../devicetree/bindings/spi/spi-fsl-dspi.txt | 19 +- + .../{mtd/mtk-quadspi.txt => spi/spi-mtk-nor.txt} | 15 +- + Documentation/devicetree/bindings/spi/spi-mux.yaml | 89 +++ + .../devicetree/bindings/spi/spi-nxp-fspi.txt | 3 + + .../devicetree/bindings/spi/spi-rockchip.txt | 58 -- + .../devicetree/bindings/spi/spi-rockchip.yaml | 107 ++++ + MAINTAINERS | 8 + + drivers/mtd/spi-nor/Kconfig | 8 - + drivers/mtd/spi-nor/Makefile | 1 - + drivers/mtd/spi-nor/mtk-quadspi.c | 565 ----------------- + drivers/spi/Kconfig | 37 +- + drivers/spi/Makefile | 4 + + drivers/spi/spi-ar934x.c | 235 +++++++ + drivers/spi/spi-fsi.c | 558 +++++++++++++++++ + drivers/spi/spi-fsl-dspi.c | 574 +++++++++++------ + drivers/spi/spi-fsl-lpspi.c | 7 +- + drivers/spi/spi-geni-qcom.c | 26 +- + drivers/spi/spi-hisi-sfc-v3xx.c | 99 ++- + drivers/spi/spi-mem.c | 7 +- + drivers/spi/spi-meson-spicc.c | 496 +++++++++++---- + drivers/spi/spi-mtk-nor.c | 689 +++++++++++++++++++++ + drivers/spi/spi-mux.c | 187 ++++++ + drivers/spi/spi-nxp-fspi.c | 63 +- + drivers/spi/spi-pxa2xx.c | 33 +- + drivers/spi/spi-rockchip.c | 5 +- + drivers/spi/spi-rspi.c | 44 +- + drivers/spi/spi-stm32-qspi.c | 31 +- + drivers/spi/spi.c | 34 +- + drivers/spi/spidev.c | 23 +- + include/linux/spi/spi.h | 9 +- + tools/spi/Makefile | 2 +- + tools/spi/spidev_test.c | 14 +- + 36 files changed, 3086 insertions(+), 1068 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fsi/ibm,fsi2spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/qca,ar934x-spi.yaml + rename Documentation/devicetree/bindings/{mtd/mtk-quadspi.txt => spi/spi-mtk-nor.txt} (75%) + create mode 100644 Documentation/devicetree/bindings/spi/spi-mux.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-rockchip.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-rockchip.yaml + delete mode 100644 drivers/mtd/spi-nor/mtk-quadspi.c + create mode 100644 drivers/spi/spi-ar934x.c + create mode 100644 drivers/spi/spi-fsi.c + create mode 100644 drivers/spi/spi-mtk-nor.c + create mode 100644 drivers/spi/spi-mux.c +Merging tip/auto-latest (12481c767130 Merge branch 'core/objtool') +$ git merge tip/auto-latest +Auto-merging scripts/Makefile.lib +Auto-merging lib/Kconfig.debug +Auto-merging kernel/events/core.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging include/linux/arch_topology.h +CONFLICT (content): Merge conflict in include/linux/arch_topology.h +Removing drivers/rtc/rtc-efi-platform.c +Auto-merging drivers/clocksource/arm_arch_timer.c +Auto-merging arch/x86/mm/init_32.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/include/asm/mshyperv.h +Removing arch/x86/boot/compressed/eboot.h +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/kernel/smp.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/include/asm/topology.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/boot/compressed/head.S +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Recorded preimage for 'arch/x86/Kconfig' +Resolved 'include/linux/arch_topology.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/x86/Kconfig'. +[master 6a02515dcbf0] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 38 + + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 266 +++++++ + Documentation/driver-api/firmware/efi/index.rst | 11 + + Documentation/driver-api/firmware/index.rst | 1 + + Documentation/x86/boot.rst | 8 +- + MAINTAINERS | 12 +- + Makefile | 3 +- + arch/Kconfig | 16 +- + arch/arm/Kconfig | 1 - + arch/arm/boot/compressed/efi-header.S | 6 +- + arch/arm/boot/compressed/head.S | 58 +- + arch/arm/include/asm/clocksource.h | 5 +- + arch/arm/include/asm/thread_info.h | 1 - + arch/arm/include/asm/topology.h | 3 + + arch/arm/include/asm/vdso/gettimeofday.h | 18 +- + arch/arm/include/asm/vdso/vsyscall.h | 35 - + arch/arm64/Kconfig | 1 - + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/clocksource.h | 5 +- + arch/arm64/include/asm/efi.h | 10 - + arch/arm64/include/asm/thread_info.h | 4 +- + arch/arm64/include/asm/topology.h | 3 + + arch/arm64/include/asm/vdso/compat_gettimeofday.h | 11 +- + arch/arm64/include/asm/vdso/gettimeofday.h | 11 +- + arch/arm64/include/asm/vdso/vsyscall.h | 9 - + arch/arm64/kernel/efi-entry.S | 90 +-- + arch/arm64/kernel/efi-header.S | 6 +- + arch/arm64/kernel/image-vars.h | 7 +- + arch/ia64/kernel/efi.c | 55 +- + arch/ia64/kernel/esi.c | 21 +- + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/clocksource.h | 18 +- + arch/mips/include/asm/vdso/gettimeofday.h | 35 +- + arch/mips/include/asm/vdso/vsyscall.h | 9 - + arch/mips/kernel/csrc-r4k.c | 2 +- + arch/mips/kernel/smp.c | 9 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/perf/core-book3s.c | 1 + + arch/sparc/Kconfig | 1 + + arch/x86/Kconfig | 4 +- + arch/x86/boot/Makefile | 5 +- + arch/x86/boot/compressed/Makefile | 8 +- + arch/x86/boot/compressed/eboot.h | 31 - + arch/x86/boot/compressed/efi_thunk_64.S | 29 +- + arch/x86/boot/compressed/head_32.S | 92 ++- + arch/x86/boot/compressed/head_64.S | 209 +++++- + arch/x86/boot/header.S | 93 +-- + arch/x86/boot/setup.ld | 1 - + arch/x86/boot/tools/build.c | 106 ++- + arch/x86/entry/common.c | 1 + + arch/x86/entry/entry_32.S | 19 +- + arch/x86/entry/vdso/Makefile | 6 + + arch/x86/entry/vdso/vma.c | 8 +- + arch/x86/events/intel/core.c | 25 +- + arch/x86/events/intel/lbr.c | 9 + + arch/x86/events/intel/uncore.c | 12 + + arch/x86/events/intel/uncore.h | 2 + + arch/x86/events/intel/uncore_snb.c | 159 ++++ + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/include/asm/clocksource.h | 23 +- + arch/x86/include/asm/cpu.h | 12 + + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/dwarf2.h | 4 +- + arch/x86/include/asm/efi.h | 23 +- + arch/x86/include/asm/irq.h | 2 +- + arch/x86/include/asm/mce.h | 3 - + arch/x86/include/asm/mshyperv.h | 4 +- + arch/x86/include/asm/msr-index.h | 9 + + arch/x86/include/asm/mwait.h | 2 + + arch/x86/include/asm/pkeys.h | 5 + + arch/x86/include/asm/syscall.h | 5 + + arch/x86/include/asm/thread_info.h | 14 +- + arch/x86/include/asm/topology.h | 25 + + arch/x86/include/asm/traps.h | 17 +- + arch/x86/include/asm/vdso/gettimeofday.h | 6 +- + arch/x86/include/asm/vdso/vsyscall.h | 15 - + arch/x86/include/asm/vgtod.h | 6 - + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/apic/vector.c | 6 + + arch/x86/kernel/asm-offsets.c | 1 - + arch/x86/kernel/asm-offsets_32.c | 5 + + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/cpu/intel.c | 175 +++++ + arch/x86/kernel/cpu/mce/core.c | 14 +- + arch/x86/kernel/cpu/mce/intel.c | 26 +- + arch/x86/kernel/cpu/mce/internal.h | 5 + + arch/x86/kernel/cpu/mce/therm_throt.c | 9 +- + arch/x86/kernel/cpu/umwait.c | 1 + + arch/x86/kernel/e820.c | 10 +- + arch/x86/kernel/fpu/xstate.c | 75 +- + arch/x86/kernel/head_32.S | 6 - + arch/x86/kernel/ima_arch.c | 2 +- + arch/x86/kernel/ioport.c | 1 + + arch/x86/kernel/irq.c | 3 +- + arch/x86/kernel/irqinit.c | 2 +- + arch/x86/kernel/kexec-bzimage64.c | 5 +- + arch/x86/kernel/kvmclock.c | 9 +- + arch/x86/kernel/nmi.c | 4 +- + arch/x86/kernel/process.c | 3 + + arch/x86/kernel/pvclock.c | 2 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/smpboot.c | 292 +++++++- + arch/x86/kernel/time.c | 12 +- + arch/x86/kernel/traps.c | 65 +- + arch/x86/kernel/tsc.c | 34 +- + arch/x86/kernel/tsc_sync.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 7 +- + arch/x86/kvm/trace.h | 4 +- + arch/x86/kvm/vmx/vmx.c | 1 + + arch/x86/kvm/vmx/vmx.h | 2 - + arch/x86/kvm/x86.c | 22 +- + arch/x86/lib/Makefile | 4 + + arch/x86/mm/Makefile | 4 + + arch/x86/mm/init_32.c | 38 - + arch/x86/platform/efi/efi.c | 288 ++++---- + arch/x86/platform/efi/efi_32.c | 13 +- + arch/x86/platform/efi/efi_64.c | 14 +- + arch/x86/platform/efi/efi_stub_32.S | 21 +- + arch/x86/platform/efi/quirks.c | 6 +- + arch/x86/purgatory/Makefile | 2 + + arch/x86/realmode/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 4 + + arch/x86/realmode/rm/realmode.lds.S | 1 - + arch/x86/xen/time.c | 36 +- + block/partitions/efi.c | 35 +- + block/partitions/efi.h | 2 +- + drivers/clocksource/arm_arch_timer.c | 12 +- + drivers/clocksource/hyperv_timer.c | 7 + + drivers/clocksource/mips-gic-timer.c | 8 +- + drivers/cpufreq/intel_pstate.c | 1 + + drivers/firmware/efi/Kconfig | 5 + + drivers/firmware/efi/Makefile | 4 +- + drivers/firmware/efi/apple-properties.c | 12 +- + drivers/firmware/efi/arm-init.c | 83 +-- + drivers/firmware/efi/arm-runtime.c | 18 - + drivers/firmware/efi/capsule-loader.c | 2 +- + drivers/firmware/efi/dev-path-parser.c | 38 +- + drivers/firmware/efi/efi-bgrt.c | 7 +- + drivers/firmware/efi/efi-pstore.c | 4 +- + drivers/firmware/efi/efi.c | 476 +++++------- + drivers/firmware/efi/efivars.c | 34 +- + drivers/firmware/efi/embedded-firmware.c | 147 ++++ + drivers/firmware/efi/esrt.c | 6 +- + drivers/firmware/efi/fdtparams.c | 126 ++++ + drivers/firmware/efi/libstub/Makefile | 11 +- + drivers/firmware/efi/libstub/arm-stub.c | 193 ++--- + drivers/firmware/efi/libstub/arm32-stub.c | 1 + + drivers/firmware/efi/libstub/arm64-stub.c | 11 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 822 ++++----------------- + drivers/firmware/efi/libstub/efistub.h | 611 ++++++++++++++- + drivers/firmware/efi/libstub/fdt.c | 7 +- + drivers/firmware/efi/libstub/file.c | 258 +++++++ + drivers/firmware/efi/libstub/hidden.h | 6 + + drivers/firmware/efi/libstub/mem.c | 309 ++++++++ + drivers/firmware/efi/libstub/random.c | 136 +--- + drivers/firmware/efi/libstub/randomalloc.c | 124 ++++ + drivers/firmware/efi/libstub/skip_spaces.c | 11 + + drivers/firmware/efi/libstub/string.c | 56 ++ + .../firmware/efi/libstub/x86-stub.c | 298 +++----- + drivers/firmware/efi/memattr.c | 13 +- + drivers/firmware/efi/reboot.c | 4 +- + drivers/firmware/efi/runtime-wrappers.c | 4 +- + drivers/firmware/efi/vars.c | 2 +- + drivers/firmware/pcdp.c | 8 +- + drivers/infiniband/hw/hfi1/efivar.c | 2 +- + drivers/pci/pcie/Kconfig | 1 + + drivers/pci/pcie/aer_inject.c | 6 +- + drivers/rtc/Makefile | 4 - + drivers/rtc/rtc-efi-platform.c | 35 - + drivers/scsi/isci/init.c | 2 +- + drivers/thermal/cpufreq_cooling.c | 19 +- + fs/efivarfs/super.c | 2 +- + fs/inode.c | 1 + + include/asm-generic/atomic-instrumented.h | 722 +++++++++--------- + include/asm-generic/atomic-long.h | 331 ++++----- + include/asm-generic/bitops.h | 5 +- + include/asm-generic/vdso/vsyscall.h | 14 - + include/linux/arch_topology.h | 10 + + include/linux/atomic-fallback.h | 340 ++++----- + include/linux/clocksource.h | 102 ++- + include/linux/compiler-clang.h | 11 +- + include/linux/compiler-gcc.h | 6 + + include/linux/compiler.h | 60 +- + include/linux/efi.h | 700 +++--------------- + include/linux/efi_embedded_fw.h | 41 + + include/linux/fs.h | 1 + + include/linux/futex.h | 17 +- + include/linux/interrupt.h | 2 + + include/linux/irq.h | 13 + + include/linux/kcsan-checks.h | 93 +++ + include/linux/kcsan.h | 108 +++ + include/linux/min_heap.h | 134 ++++ + include/linux/pe.h | 21 + + include/linux/percpu-rwsem.h | 83 ++- + include/linux/perf_event.h | 19 + + include/linux/posix-timers.h | 2 +- + include/linux/rwsem.h | 6 - + include/linux/sched.h | 35 +- + include/linux/sched/topology.h | 8 + + include/linux/seqlock.h | 51 +- + include/linux/wait.h | 1 + + include/trace/events/sched.h | 53 +- + include/uapi/linux/perf_event.h | 8 +- + include/vdso/datapage.h | 2 - + init/Kconfig | 4 + + init/init_task.c | 8 + + init/main.c | 2 + + kernel/Makefile | 6 + + kernel/context_tracking.c | 2 + + kernel/cpu.c | 4 +- + kernel/events/core.c | 337 ++++++--- + kernel/exit.c | 12 +- + kernel/futex.c | 185 ++--- + kernel/irq/Kconfig | 5 + + kernel/irq/chip.c | 2 +- + kernel/irq/debugfs.c | 28 +- + kernel/irq/internals.h | 10 +- + kernel/irq/irqdesc.c | 6 + + kernel/irq/irqdomain.c | 14 +- + kernel/irq/resend.c | 143 +++- + kernel/kcsan/Makefile | 12 + + kernel/kcsan/atomic.h | 27 + + kernel/kcsan/core.c | 621 ++++++++++++++++ + kernel/kcsan/debugfs.c | 271 +++++++ + kernel/kcsan/encoding.h | 95 +++ + kernel/kcsan/kcsan.h | 109 +++ + kernel/kcsan/report.c | 318 ++++++++ + kernel/kcsan/test.c | 121 +++ + kernel/locking/lockdep.c | 331 +++++++-- + kernel/locking/lockdep_internals.h | 14 +- + kernel/locking/lockdep_proc.c | 31 +- + kernel/locking/percpu-rwsem.c | 192 +++-- + kernel/locking/rwsem.c | 7 +- + kernel/locking/rwsem.h | 10 - + kernel/sched/Makefile | 6 + + kernel/sched/core.c | 27 +- + kernel/sched/cpupri.c | 167 +++-- + kernel/sched/cpupri.h | 6 +- + kernel/sched/cputime.c | 41 +- + kernel/sched/deadline.c | 6 +- + kernel/sched/debug.c | 17 +- + kernel/sched/fair.c | 754 +++++++++++++------ + kernel/sched/pelt.c | 90 ++- + kernel/sched/pelt.h | 31 + + kernel/sched/rt.c | 66 +- + kernel/sched/sched.h | 62 +- + kernel/sched/topology.c | 27 +- + kernel/smp.c | 14 +- + kernel/sys.c | 2 + + kernel/time/clocksource.c | 9 + + kernel/time/hrtimer.c | 2 +- + kernel/time/namespace.c | 7 +- + kernel/time/posix-cpu-timers.c | 148 ++-- + kernel/time/posix-timers.c | 3 +- + kernel/time/tick-common.c | 36 +- + kernel/time/timekeeping.c | 3 +- + kernel/time/timer.c | 16 +- + kernel/time/vsyscall.c | 12 +- + lib/Kconfig.debug | 12 + + lib/Kconfig.kcsan | 116 +++ + lib/Makefile | 5 + + lib/test_min_heap.c | 194 +++++ + lib/vdso/gettimeofday.c | 133 +++- + 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 +- + security/integrity/platform_certs/load_uefi.c | 2 +- + tools/include/uapi/asm/errno.h | 14 +- + tools/objtool/check.c | 104 ++- + tools/objtool/elf.c | 14 +- + tools/objtool/elf.h | 1 + + tools/perf/arch/arm64/util/arm-spe.c | 20 +- + tools/perf/arch/arm64/util/perf_regs.c | 2 +- + tools/perf/arch/powerpc/util/perf_regs.c | 4 +- + tools/perf/arch/x86/util/auxtrace.c | 14 +- + tools/perf/arch/x86/util/event.c | 12 +- + tools/perf/arch/x86/util/header.c | 4 +- + tools/perf/arch/x86/util/intel-bts.c | 24 +- + tools/perf/arch/x86/util/intel-pt.c | 30 +- + tools/perf/arch/x86/util/machine.c | 6 +- + tools/perf/arch/x86/util/perf_regs.c | 8 +- + tools/perf/arch/x86/util/pmu.c | 6 +- + tools/perf/bench/bench.h | 4 + + tools/perf/bench/epoll-ctl.c | 8 +- + tools/perf/bench/epoll-wait.c | 12 +- + tools/perf/bench/futex-hash.c | 13 +- + tools/perf/bench/futex-lock-pi.c | 12 +- + tools/perf/bench/futex-requeue.c | 1 + + tools/perf/bench/futex-wake-parallel.c | 1 + + tools/perf/bench/futex-wake.c | 5 +- + tools/perf/builtin-diff.c | 3 +- + tools/perf/builtin-top.c | 4 +- + tools/perf/pmu-events/jevents.c | 15 +- + tools/perf/tests/bp_account.c | 2 +- + tools/perf/util/block-info.c | 3 +- + tools/perf/util/env.c | 4 +- + tools/perf/util/map.c | 2 +- + tools/perf/util/parse-events.c | 10 +- + tools/perf/util/symbol.c | 13 +- + 323 files changed, 10334 insertions(+), 5099 deletions(-) + create mode 100644 Documentation/dev-tools/kcsan.rst + create mode 100644 Documentation/driver-api/firmware/efi/index.rst + delete mode 100644 arch/x86/boot/compressed/eboot.h + create mode 100644 drivers/firmware/efi/embedded-firmware.c + create mode 100644 drivers/firmware/efi/fdtparams.c + create mode 100644 drivers/firmware/efi/libstub/file.c + create mode 100644 drivers/firmware/efi/libstub/hidden.h + create mode 100644 drivers/firmware/efi/libstub/mem.c + create mode 100644 drivers/firmware/efi/libstub/randomalloc.c + create mode 100644 drivers/firmware/efi/libstub/skip_spaces.c + rename arch/x86/boot/compressed/eboot.c => drivers/firmware/efi/libstub/x86-stub.c (80%) + delete mode 100644 drivers/rtc/rtc-efi-platform.c + create mode 100644 include/linux/efi_embedded_fw.h + create mode 100644 include/linux/kcsan-checks.h + create mode 100644 include/linux/kcsan.h + create mode 100644 include/linux/min_heap.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 lib/test_min_heap.c + create mode 100644 scripts/Makefile.kcsan +Merging clockevents/timers/drivers/next (cc2550b421aa clocksource: Replace setup_irq() by request_irq()) +$ git merge clockevents/timers/drivers/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/faraday,fttmr010.txt | 1 + + .../devicetree/bindings/timer/ingenic,tcu.txt | 1 + + drivers/clocksource/Kconfig | 8 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/bcm2835_timer.c | 8 +- + drivers/clocksource/bcm_kona_timer.c | 10 +- + drivers/clocksource/dw_apb_timer.c | 11 +- + drivers/clocksource/exynos_mct.c | 12 +- + drivers/clocksource/ingenic-ost.c | 189 +++++++++++++++++++++ + drivers/clocksource/ingenic-timer.c | 3 +- + drivers/clocksource/mxs_timer.c | 10 +- + drivers/clocksource/nomadik-mtu.c | 11 +- + drivers/clocksource/samsung_pwm_timer.c | 12 +- + drivers/clocksource/timer-atlas7.c | 50 +++--- + drivers/clocksource/timer-cs5535.c | 10 +- + drivers/clocksource/timer-efm32.c | 10 +- + drivers/clocksource/timer-fsl-ftm.c | 10 +- + drivers/clocksource/timer-fttmr010.c | 68 ++++++-- + drivers/clocksource/timer-imx-gpt.c | 10 +- + drivers/clocksource/timer-integrator-ap.c | 11 +- + drivers/clocksource/timer-meson6.c | 11 +- + drivers/clocksource/timer-orion.c | 9 +- + drivers/clocksource/timer-owl.c | 15 +- + drivers/clocksource/timer-prima2.c | 14 +- + drivers/clocksource/timer-pxa.c | 10 +- + drivers/clocksource/timer-sp804.c | 11 +- + drivers/clocksource/timer-ti-dm.c | 34 +--- + drivers/clocksource/timer-u300.c | 9 +- + drivers/clocksource/timer-vf-pit.c | 10 +- + drivers/clocksource/timer-vt8500.c | 11 +- + drivers/clocksource/timer-zevio.c | 13 +- + include/linux/dw_apb_timer.h | 1 - + 32 files changed, 350 insertions(+), 244 deletions(-) + create mode 100644 drivers/clocksource/ingenic-ost.c +Merging edac/edac-for-next (ffa9a9758be2 Merge branch 'edac-urgent' into edac-for-next) +$ git merge edac/edac-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/edac/dmc-520.yaml | 59 ++ + MAINTAINERS | 6 + + drivers/edac/Kconfig | 7 + + drivers/edac/Makefile | 1 + + drivers/edac/dmc520_edac.c | 656 +++++++++++++++++++++ + drivers/edac/edac_mc.c | 511 ++++++++-------- + drivers/edac/edac_mc.h | 6 +- + drivers/edac/edac_mc_sysfs.c | 110 ++-- + drivers/edac/edac_module.h | 1 - + drivers/edac/ghes_edac.c | 16 +- + drivers/edac/mce_amd.c | 2 +- + include/linux/edac.h | 9 +- + 12 files changed, 1030 insertions(+), 354 deletions(-) + create mode 100644 Documentation/devicetree/bindings/edac/dmc-520.yaml + create mode 100644 drivers/edac/dmc520_edac.c +Merging irqchip/irq/irqchip-next (850fc6a2ae5b irqchip/sifive-plic: Add support for multiple PLICs) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + arch/riscv/kernel/traps.c | 2 +- + drivers/irqchip/Kconfig | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 387 ++++++++++++++++++++++++++++-- + drivers/irqchip/irq-gic-v3.c | 13 +- + drivers/irqchip/irq-gic-v4.c | 134 ++++++++++- + drivers/irqchip/irq-i8259.c | 16 +- + drivers/irqchip/irq-ingenic.c | 9 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +- + drivers/irqchip/irq-sifive-plic.c | 119 ++++++--- + drivers/irqchip/irq-stm32-exti.c | 14 +- + drivers/irqchip/irq-vic.c | 9 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 45 +++- + include/kvm/arm_vgic.h | 1 + + include/linux/cpuhotplug.h | 1 + + include/linux/irqchip/arm-gic-common.h | 2 + + include/linux/irqchip/arm-gic-v3.h | 20 +- + include/linux/irqchip/arm-gic-v4.h | 25 +- + virt/kvm/arm/vgic/vgic-v3.c | 4 +- + virt/kvm/arm/vgic/vgic-v4.c | 34 ++- + 19 files changed, 725 insertions(+), 114 deletions(-) +Merging ftrace/for-next (2910b5aa6f54 bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (a5ba56ed4232 rcu-tasks: Add stall warnings for RCU Tasks Trace) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/time/timer.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging include/linux/wait.h +Auto-merging include/linux/sched.h +Auto-merging fs/nfs/dir.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 8 +- + Documentation/RCU/listRCU.rst | 281 +++++-- + Documentation/RCU/rcu.rst | 18 +- + Documentation/RCU/torture.txt | 147 +++- + Documentation/admin-guide/kernel-parameters.txt | 24 + + ...b__after_atomic-is-stronger-than-acquire.litmus | 32 + + ...Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus | 24 + + Documentation/atomic-tests/README | 16 + + Documentation/atomic_t.txt | 24 +- + Documentation/dev-tools/kcsan.rst | 227 +++-- + Documentation/memory-barriers.txt | 8 +- + MAINTAINERS | 1 + + arch/x86/lib/Makefile | 5 + + arch/x86/mm/pat/set_memory.c | 2 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- + fs/nfs/dir.c | 2 +- + include/asm-generic/atomic-instrumented.h | 395 +++++---- + include/asm-generic/bitops/instrumented-atomic.h | 14 +- + include/asm-generic/bitops/instrumented-lock.h | 10 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 16 +- + include/linux/compiler.h | 16 +- + include/linux/instrumented.h | 109 +++ + include/linux/kcsan-checks.h | 220 ++++- + include/linux/kcsan.h | 46 +- + include/linux/rculist.h | 10 +- + include/linux/rcupdate.h | 9 +- + include/linux/rcupdate_trace.h | 84 ++ + include/linux/rcupdate_wait.h | 19 + + include/linux/rcutiny.h | 1 + + include/linux/rcutree.h | 1 + + include/linux/sched.h | 10 +- + include/linux/seqlock.h | 2 +- + include/linux/timer.h | 2 +- + include/linux/torture.h | 2 +- + include/linux/uaccess.h | 14 +- + include/linux/wait.h | 2 + + include/trace/events/rcu.h | 29 + + init/init_task.c | 5 + + kernel/fork.c | 12 +- + kernel/kcsan/Makefile | 2 + + kernel/kcsan/atomic.h | 21 +- + kernel/kcsan/core.c | 225 +++-- + kernel/kcsan/debugfs.c | 84 +- + kernel/kcsan/encoding.h | 14 +- + kernel/kcsan/kcsan.h | 36 +- + kernel/kcsan/report.c | 358 +++++++- + kernel/kcsan/test.c | 10 + + kernel/locking/Makefile | 3 + + kernel/locking/locktorture.c | 15 +- + kernel/locking/rtmutex.c | 2 +- + kernel/rcu/Kconfig | 30 +- + kernel/rcu/Kconfig.debug | 15 +- + kernel/rcu/Makefile | 4 + + kernel/rcu/rcu.h | 25 +- + kernel/rcu/rcu_segcblist.c | 4 +- + kernel/rcu/rcuperf.c | 14 +- + kernel/rcu/rcutorture.c | 167 +++- + kernel/rcu/srcutree.c | 26 +- + kernel/rcu/tasks.h | 936 +++++++++++++++++++++ + kernel/rcu/tree.c | 474 ++++++++--- + kernel/rcu/tree.h | 5 + + kernel/rcu/tree_exp.h | 63 +- + kernel/rcu/tree_plugin.h | 85 +- + kernel/rcu/tree_stall.h | 113 ++- + kernel/rcu/update.c | 388 +-------- + kernel/sched/core.c | 49 ++ + kernel/time/timer.c | 7 +- + kernel/torture.c | 29 +- + kernel/trace/Makefile | 3 + + lib/Kconfig.debug | 2 + + lib/Kconfig.kcsan | 94 ++- + lib/iov_iter.c | 7 +- + lib/usercopy.c | 7 +- + scripts/atomic/gen-atomic-instrumented.sh | 19 +- + tools/memory-model/Documentation/explanation.txt | 83 +- + tools/memory-model/Documentation/references.txt | 21 +- + tools/memory-model/README | 10 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 + + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 + + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 16 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 17 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/configs/rcu/CFLIST | 2 + + .../selftests/rcutorture/configs/rcu/CFcommon | 2 + + .../selftests/rcutorture/configs/rcu/RUDE01 | 10 + + .../selftests/rcutorture/configs/rcu/RUDE01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TRACE01 | 10 + + .../selftests/rcutorture/configs/rcu/TRACE01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE10 | 18 + + 105 files changed, 4399 insertions(+), 1471 deletions(-) + create mode 100644 Documentation/atomic-tests/Atomic-RMW+mb__after_atomic-is-stronger-than-acquire.litmus + create mode 100644 Documentation/atomic-tests/Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus + create mode 100644 Documentation/atomic-tests/README + create mode 100644 include/linux/instrumented.h + create mode 100644 include/linux/rcupdate_trace.h + create mode 100644 kernel/rcu/tasks.h + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/RUDE01 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/RUDE01.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE01 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE01.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE10 +Merging kvm/linux-next (a93236fcbe1d KVM: s390: rstify new ioctls in api.rst) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (e43f1331e2ef arm64: Ask the compiler to __always_inline functions used by KVM at HYP) +$ 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 (e0d5710dc73f KVM: s390: mark sie block as 512 byte aligned) +$ git merge kvms390/next +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/kernel/Makefile +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/include/asm/page.h +Auto-merging arch/s390/boot/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/virt/kvm/api.rst | 65 ++- + Documentation/virt/kvm/devices/s390_flic.rst | 11 +- + Documentation/virt/kvm/index.rst | 2 + + Documentation/virt/kvm/s390-pv-boot.rst | 84 +++ + Documentation/virt/kvm/s390-pv.rst | 116 +++++ + MAINTAINERS | 1 + + arch/s390/boot/Makefile | 2 +- + arch/s390/boot/uv.c | 20 + + arch/s390/include/asm/gmap.h | 6 + + arch/s390/include/asm/kvm_host.h | 115 ++++- + arch/s390/include/asm/mmu.h | 2 + + arch/s390/include/asm/mmu_context.h | 1 + + arch/s390/include/asm/page.h | 5 + + arch/s390/include/asm/pgtable.h | 35 +- + arch/s390/include/asm/uv.h | 251 ++++++++- + arch/s390/kernel/Makefile | 1 + + arch/s390/kernel/entry.h | 2 + + arch/s390/kernel/pgm_check.S | 4 +- + arch/s390/kernel/setup.c | 9 +- + arch/s390/kernel/uv.c | 414 +++++++++++++++ + arch/s390/kvm/Makefile | 2 +- + arch/s390/kvm/diag.c | 6 +- + arch/s390/kvm/gaccess.c | 23 +- + arch/s390/kvm/intercept.c | 122 ++++- + arch/s390/kvm/interrupt.c | 401 +++++++++------ + arch/s390/kvm/kvm-s390.c | 567 ++++++++++++++++++--- + arch/s390/kvm/kvm-s390.h | 51 +- + arch/s390/kvm/priv.c | 13 +- + arch/s390/kvm/pv.c | 303 +++++++++++ + arch/s390/mm/fault.c | 78 +++ + arch/s390/mm/gmap.c | 71 ++- + include/uapi/linux/kvm.h | 43 +- + tools/testing/selftests/kvm/s390x/resets.c | 132 ++++- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 11 +- + 35 files changed, 2622 insertions(+), 352 deletions(-) + create mode 100644 Documentation/virt/kvm/s390-pv-boot.rst + create mode 100644 Documentation/virt/kvm/s390-pv.rst + create mode 100644 arch/s390/kernel/uv.c + create mode 100644 arch/s390/kvm/pv.c +Merging xen-tip/linux-next (e63de44d28ca xen/xenbus: remove unused xenbus_map_ring()) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/xenbus/xenbus_client.c | 126 +++++++++++++------------------------ + include/xen/xenbus.h | 7 --- + 2 files changed, 42 insertions(+), 91 deletions(-) +Merging percpu/for-next (cfe2a689f755 Merge branch 'for-5.7' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/bitmap.h | 8 +++++++- + lib/percpu-refcount.c | 7 ++++--- + 2 files changed, 11 insertions(+), 4 deletions(-) +Merging workqueues/for-next (4acf8a423cd3 Merge branch 'for-5.7' into for-next) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 4 ++-- + kernel/workqueue.c | 12 ++++-------- + 2 files changed, 6 insertions(+), 10 deletions(-) +Merging drivers-x86/for-next (8d92e160dd8f platform/x86: Kconfig: Fix a typo) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 82 +- + drivers/platform/x86/Kconfig | 1320 ++++++++++----------- + drivers/platform/x86/Makefile | 197 +-- + drivers/platform/x86/dell_rbu.c | 173 +-- + drivers/platform/x86/i2c-multi-instantiate.c | 2 +- + drivers/platform/x86/intel-hid.c | 2 +- + drivers/platform/x86/intel-uncore-frequency.c | 51 +- + drivers/platform/x86/intel-vbtn.c | 2 +- + drivers/platform/x86/intel_pmc_core.c | 323 ++++- + drivers/platform/x86/intel_pmc_core.h | 28 + + drivers/platform/x86/pmc_atom.c | 8 + + tools/power/x86/intel-speed-select/isst-config.c | 5 +- + tools/power/x86/intel-speed-select/isst-display.c | 4 +- + 13 files changed, 1245 insertions(+), 952 deletions(-) +Merging chrome-platform/for-next (7e11f4c0c5cc platform/chrome: Kconfig: Remove CONFIG_ prefix from MFD_CROS_EC section) +$ git merge chrome-platform/for-next +Auto-merging drivers/power/supply/Kconfig +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 16 ++- + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/cros_ec.c | 32 ++++- + drivers/platform/chrome/cros_ec_chardev.c | 2 +- + drivers/platform/chrome/cros_ec_lightbar.c | 50 ++----- + drivers/platform/chrome/cros_ec_proto.c | 9 +- + drivers/platform/chrome/cros_ec_rpmsg.c | 16 ++- + drivers/platform/chrome/cros_ec_spi.c | 6 +- + drivers/platform/chrome/cros_ec_sysfs.c | 36 ++--- + drivers/platform/chrome/cros_ec_vbc.c | 4 +- + drivers/platform/chrome/cros_usbpd_notify.c | 169 ++++++++++++++++++++++++ + drivers/platform/chrome/wilco_ec/properties.c | 3 + + drivers/platform/chrome/wilco_ec/sysfs.c | 4 + + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 50 +++---- + include/linux/platform_data/cros_ec_proto.h | 4 + + include/linux/platform_data/cros_usbpd_notify.h | 17 +++ + include/linux/platform_data/wilco-ec.h | 8 +- + 18 files changed, 330 insertions(+), 99 deletions(-) + create mode 100644 drivers/platform/chrome/cros_usbpd_notify.c + create mode 100644 include/linux/platform_data/cros_usbpd_notify.h +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (dd47a83453e4 leds: pwm: convert to atomic PWM API) +$ git merge leds/for-next +Removing include/linux/platform_data/leds-kirkwood-ns2.h +Merge made by the 'recursive' strategy. + drivers/leds/Kconfig | 11 +++ + drivers/leds/Makefile | 1 + + drivers/leds/leds-bd2802.c | 2 - + drivers/leds/leds-ip30.c | 86 +++++++++++++++++++++ + drivers/leds/leds-lm3697.c | 2 +- + drivers/leds/leds-ns2.c | 99 ++++++++++++++----------- + drivers/leds/leds-pwm.c | 41 +++------- + include/linux/platform_data/leds-kirkwood-ns2.h | 38 ---------- + 8 files changed, 164 insertions(+), 116 deletions(-) + create mode 100644 drivers/leds/leds-ip30.c + delete mode 100644 include/linux/platform_data/leds-kirkwood-ns2.h +Merging ipmi/for-next (26455d00ee58 drivers: char: ipmi: ipmi_msghandler: Pass lockdep expression to RCU lists) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) +Merging driver-core/driver-core-next (9a2dd570591e Merge 5.6-rc5 into driver-core-next) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/platform_device.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/arch_topology.h +Auto-merging drivers/of/property.c +Auto-merging drivers/firmware/efi/arm-init.c +Auto-merging drivers/base/core.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 24 +++- + drivers/base/core.c | 39 +++++- + drivers/base/dd.c | 82 +++++------- + drivers/base/firmware_loader/main.c | 6 +- + drivers/firmware/efi/arm-init.c | 2 +- + drivers/of/property.c | 8 +- + drivers/pinctrl/devicetree.c | 9 +- + drivers/regulator/core.c | 25 ++-- + fs/exec.c | 26 ++++ + include/linux/arch_topology.h | 7 +- + include/linux/device/driver.h | 2 +- + include/linux/fs.h | 2 + + include/linux/fwnode.h | 2 + + include/linux/platform_device.h | 2 +- + tools/testing/selftests/firmware/Makefile | 9 +- + tools/testing/selftests/firmware/fw_namespace.c | 151 +++++++++++++++++++++++ + tools/testing/selftests/firmware/fw_run_tests.sh | 4 + + 17 files changed, 298 insertions(+), 102 deletions(-) + create mode 100644 tools/testing/selftests/firmware/fw_namespace.c +Merging usb/usb-next (8e567ed9e244 Merge 5.6-rc5 into usb-next) +$ git merge usb/usb-next +Auto-merging include/linux/usb/audio-v2.h +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-typec | 23 +- + Documentation/driver-api/usb/typec_bus.rst | 22 +- + MAINTAINERS | 6 + + drivers/base/property.c | 1 + + drivers/thunderbolt/usb4.c | 4 + + drivers/usb/atm/ueagle-atm.c | 2 +- + drivers/usb/atm/usbatm.h | 2 +- + drivers/usb/cdns3/core.c | 22 +- + drivers/usb/cdns3/gadget.c | 2 +- + drivers/usb/chipidea/core.c | 10 +- + drivers/usb/core/driver.c | 58 +++- + drivers/usb/core/generic.c | 48 ++- + drivers/usb/core/sysfs.c | 6 +- + drivers/usb/core/usb-acpi.c | 11 +- + drivers/usb/core/usb.h | 8 + + drivers/usb/dwc2/hcd.h | 2 +- + drivers/usb/dwc3/dwc3-meson-g12a.c | 10 +- + drivers/usb/dwc3/dwc3-qcom.c | 2 +- + drivers/usb/gadget/function/f_phonet.c | 2 +- + drivers/usb/gadget/function/f_uac1_legacy.c | 2 - + drivers/usb/gadget/legacy/gmidi.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 2 +- + drivers/usb/gadget/udc/amd5536udc.h | 2 +- + drivers/usb/gadget/udc/amd5536udc_pci.c | 2 +- + drivers/usb/gadget/udc/at91_udc.c | 2 +- + drivers/usb/gadget/udc/dummy_hcd.c | 4 +- + drivers/usb/gadget/udc/fotg210-udc.c | 2 +- + drivers/usb/gadget/udc/fusb300_udc.c | 2 +- + drivers/usb/gadget/udc/goku_udc.c | 2 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 2 +- + drivers/usb/gadget/udc/m66592-udc.c | 2 +- + drivers/usb/gadget/udc/net2280.c | 7 +- + drivers/usb/gadget/udc/omap_udc.c | 2 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 28 +- + drivers/usb/gadget/udc/s3c-hsudc.c | 3 +- + drivers/usb/gadget/udc/tegra-xudc.c | 8 +- + drivers/usb/host/ehci-pci.c | 2 +- + drivers/usb/host/ehci-platform.c | 127 ++++++++ + drivers/usb/host/ehci-tegra.c | 2 +- + drivers/usb/host/ehci.h | 4 +- + drivers/usb/host/fhci-hcd.c | 1 + + drivers/usb/host/fotg210.h | 2 +- + drivers/usb/host/ohci-pci.c | 2 +- + drivers/usb/host/ohci.h | 4 +- + drivers/usb/host/sl811-hcd.c | 2 +- + drivers/usb/host/uhci-pci.c | 2 +- + drivers/usb/host/xhci-hub.c | 2 + + drivers/usb/host/xhci-mtk.h | 2 +- + drivers/usb/host/xhci-pci.c | 2 +- + drivers/usb/host/xhci.h | 4 +- + drivers/usb/misc/Kconfig | 10 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/apple-mfi-fastcharge.c | 237 ++++++++++++++ + drivers/usb/mtu3/mtu3_dr.c | 9 +- + drivers/usb/musb/mediatek.c | 16 +- + drivers/usb/musb/musb_core.c | 2 +- + drivers/usb/musb/musb_host.c | 2 +- + drivers/usb/phy/phy-tegra-usb.c | 3 +- + drivers/usb/roles/class.c | 31 +- + drivers/usb/roles/intel-xhci-usb-role-switch.c | 26 +- + drivers/usb/serial/io_usbvend.h | 4 +- + drivers/usb/serial/ti_usb_3410_5052.c | 4 +- + drivers/usb/storage/usb.c | 10 +- + drivers/usb/storage/usb.h | 5 +- + drivers/usb/storage/usual-tables.c | 6 +- + drivers/usb/typec/bus.c | 12 +- + drivers/usb/typec/bus.h | 2 - + drivers/usb/typec/class.c | 173 +++++----- + drivers/usb/typec/mux.c | 72 ++-- + drivers/usb/typec/mux/Kconfig | 9 + + drivers/usb/typec/mux/Makefile | 1 + + drivers/usb/typec/mux/intel_pmc_mux.c | 434 +++++++++++++++++++++++++ + drivers/usb/typec/tcpm/tcpm.c | 62 +++- + drivers/usb/typec/ucsi/ucsi.c | 14 +- + drivers/usb/typec/ucsi/ucsi.h | 7 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 2 + + include/linux/usb.h | 11 +- + include/linux/usb/audio-v2.h | 2 +- + include/linux/usb/audio-v3.h | 2 +- + include/linux/usb/ehci_def.h | 2 +- + include/linux/usb/gadget.h | 2 +- + include/linux/usb/hcd.h | 2 +- + include/linux/usb/role.h | 23 +- + include/linux/usb/typec.h | 3 +- + include/linux/usb/typec_altmode.h | 7 - + include/linux/usb/typec_mux.h | 25 +- + include/linux/usb/typec_tbt.h | 53 +++ + include/linux/usb_usual.h | 2 +- + include/linux/usbdevice_fs.h | 2 +- + 90 files changed, 1430 insertions(+), 335 deletions(-) + create mode 100644 drivers/usb/misc/apple-mfi-fastcharge.c + create mode 100644 drivers/usb/typec/mux/intel_pmc_mux.c + create mode 100644 include/linux/usb/typec_tbt.h +Merging usb-gadget/next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (615e58ccfbc0 USB: serial: fix tty cleanup-op kernel-doc) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/digi_acceleport.c | 2 +- + drivers/usb/serial/f81232.c | 221 +++++++++++++++++++++++++++++------ + drivers/usb/serial/generic.c | 12 +- + drivers/usb/serial/usb-serial.c | 2 +- + 4 files changed, 192 insertions(+), 45 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (cbdfbda4a166 usb: chipidea: otg: handling vbus disconnect event occurred during system suspend) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/otg.c | 7 +++++++ + drivers/usb/chipidea/udc.c | 13 +++++-------- + 2 files changed, 12 insertions(+), 8 deletions(-) +Merging phy-next/next (33f12efe336f phy: phy-mtk-tphy: add a new reference clock) +$ git merge phy-next/next +Removing drivers/phy/cadence/phy-cadence-dp.c +Removing Documentation/devicetree/bindings/phy/phy-cadence-dp.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/phy-cadence-dp.txt | 30 - + .../bindings/phy/phy-cadence-torrent.yaml | 143 ++ + .../devicetree/bindings/phy/phy-mtk-tphy.txt | 32 +- + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 15 + + .../devicetree/bindings/phy/uniphier-pcie-phy.txt | 13 +- + .../bindings/phy/uniphier-usb3-hsphy.txt | 6 +- + .../bindings/phy/uniphier-usb3-ssphy.txt | 5 +- + drivers/phy/amlogic/phy-meson-g12a-usb2.c | 2 +- + drivers/phy/cadence/Kconfig | 6 +- + drivers/phy/cadence/Makefile | 2 +- + drivers/phy/cadence/phy-cadence-dp.c | 541 ------ + drivers/phy/cadence/phy-cadence-torrent.c | 1944 ++++++++++++++++++++ + drivers/phy/mediatek/phy-mtk-tphy.c | 64 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 425 ++++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 114 ++ + drivers/phy/socionext/phy-uniphier-pcie.c | 102 +- + drivers/phy/socionext/phy-uniphier-usb3hs.c | 92 +- + drivers/phy/socionext/phy-uniphier-usb3ss.c | 8 +- + 18 files changed, 2881 insertions(+), 663 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/phy-cadence-dp.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml + delete mode 100644 drivers/phy/cadence/phy-cadence-dp.c + create mode 100644 drivers/phy/cadence/phy-cadence-torrent.c +Merging tty/tty-next (cb05c6c82fb0 Merge 5.6-rc5 into tty-next) +$ git merge tty/tty-next +Auto-merging lib/Kconfig.debug +Auto-merging drivers/tty/serial/8250/8250_omap.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/fsl-imx-uart.txt | 4 + + arch/arm64/Kconfig.platforms | 2 +- + drivers/tty/mips_ejtag_fdc.c | 1 + + drivers/tty/n_gsm.c | 140 +++--- + drivers/tty/n_hdlc.c | 558 ++++++++------------- + drivers/tty/n_tty.c | 6 +- + drivers/tty/serial/8250/8250.h | 6 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 80 ++- + drivers/tty/serial/8250/8250_core.c | 6 +- + drivers/tty/serial/8250/8250_dwlib.h | 2 +- + drivers/tty/serial/8250/8250_exar.c | 2 +- + drivers/tty/serial/8250/8250_lpss.c | 6 + + drivers/tty/serial/8250/8250_mtk.c | 50 +- + drivers/tty/serial/8250/8250_of.c | 67 +-- + drivers/tty/serial/8250/8250_omap.c | 34 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/tty/serial/8250/8250_port.c | 188 +++++-- + drivers/tty/serial/8250/8250_pxa.c | 2 +- + drivers/tty/serial/8250/8250_tegra.c | 198 ++++++++ + drivers/tty/serial/8250/Kconfig | 9 + + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/Kconfig | 14 +- + drivers/tty/serial/ar933x_uart.c | 113 ++++- + drivers/tty/serial/atmel_serial.c | 3 - + drivers/tty/serial/atmel_serial.h | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart.h | 6 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 48 +- + drivers/tty/serial/earlycon.c | 11 + + drivers/tty/serial/efm32-uart.c | 2 +- + drivers/tty/serial/icom.h | 2 +- + drivers/tty/serial/ifx6x60.h | 2 +- + drivers/tty/serial/imx.c | 44 +- + drivers/tty/serial/jsm/jsm.h | 2 +- + drivers/tty/serial/kgdboc.c | 4 +- + drivers/tty/serial/lantiq.c | 1 - + drivers/tty/serial/pic32_uart.h | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 30 ++ + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/serial_core.c | 171 +++++-- + drivers/tty/serial/serial_mctrl_gpio.h | 2 +- + drivers/tty/serial/sirfsoc_uart.h | 2 +- + drivers/tty/serial/stm32-usart.h | 2 +- + drivers/tty/serial/timbuart.h | 2 +- + drivers/tty/sysrq.c | 12 + + drivers/tty/vt/selection.c | 200 ++++---- + drivers/tty/vt/vt.c | 7 +- + drivers/tty/vt/vt_ioctl.c | 35 +- + include/linux/selection.h | 4 +- + include/linux/serial_8250.h | 3 + + include/linux/serial_core.h | 1 + + include/linux/sysrq.h | 7 + + include/linux/vt_kern.h | 64 +-- + kernel/sysctl.c | 41 +- + lib/Kconfig.debug | 8 + + 54 files changed, 1318 insertions(+), 895 deletions(-) + create mode 100644 drivers/tty/serial/8250/8250_tegra.c +Merging char-misc/char-misc-next (bb3a151dd427 Merge 5.6-rc5 into char-misc-next) +$ git merge char-misc/char-misc-next +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + Documentation/admin-guide/dynamic-debug-howto.rst | 3 +++ + drivers/char/pcmcia/cm4000_cs.c | 4 +++- + drivers/char/ppdev.c | 20 +++++++--------- + drivers/char/virtio_console.c | 2 +- + drivers/misc/lkdtm/stackleak.c | 25 +++++++++++++------- + drivers/misc/mei/bus-fixup.c | 4 ++-- + drivers/misc/mei/client.c | 4 ++-- + drivers/misc/mei/hw.h | 3 +++ + drivers/misc/mei/pci-me.c | 11 +-------- + drivers/misc/mei/pci-txe.c | 5 +--- + drivers/misc/mic/host/mic_boot.c | 2 +- + lib/Kconfig.debug | 7 +++--- + lib/dynamic_debug.c | 28 +++++++++++++++++++---- + scripts/ver_linux | 24 ++++++------------- + 14 files changed, 76 insertions(+), 66 deletions(-) +Merging extcon/extcon-next (87ccafd3bd64 extcon: palmas: Hide error messages if gpio returns -EPROBE_DEFER) +$ git merge extcon/extcon-next +Removing Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt +Merge made by the 'recursive' strategy. + .../bindings/extcon/extcon-usbc-cros-ec.txt | 24 ---------- + .../bindings/extcon/extcon-usbc-cros-ec.yaml | 56 ++++++++++++++++++++++ + drivers/extcon/extcon-palmas.c | 8 +++- + include/linux/extcon-provider.h | 28 +++++------ + 4 files changed, 76 insertions(+), 40 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.yaml +Merging soundwire/next (5de79ba865d7 soundwire: bus: provide correct return value on error) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + Documentation/driver-api/soundwire/stream.rst | 61 ++- + drivers/soundwire/bus.c | 537 +++++++++++++++++++++++--- + drivers/soundwire/bus.h | 9 + + drivers/soundwire/bus_type.c | 5 + + drivers/soundwire/cadence_master.h | 8 - + drivers/soundwire/intel.c | 198 +++++++++- + drivers/soundwire/slave.c | 4 + + drivers/soundwire/stream.c | 90 ++++- + include/linux/soundwire/sdw.h | 47 +++ + 9 files changed, 858 insertions(+), 101 deletions(-) +Merging thunderbolt/next (3010518964dc thunderbolt: Use scnprintf() for avoiding potential buffer overflow) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + drivers/thunderbolt/domain.c | 4 ++-- + drivers/thunderbolt/eeprom.c | 2 +- + drivers/thunderbolt/icm.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging staging/staging-next (c15e7f072288 staging: rtl8712: Fixes for simple typos in C comments) +$ git merge staging/staging-next +Removing drivers/staging/wusbcore/wusbhc.h +Removing drivers/staging/wusbcore/wusbhc.c +Removing drivers/staging/wusbcore/wa-xfer.c +Removing drivers/staging/wusbcore/wa-rpipe.c +Removing drivers/staging/wusbcore/wa-nep.c +Removing drivers/staging/wusbcore/wa-hc.h +Removing drivers/staging/wusbcore/wa-hc.c +Removing drivers/staging/wusbcore/security.c +Removing drivers/staging/wusbcore/rh.c +Removing drivers/staging/wusbcore/reservation.c +Removing drivers/staging/wusbcore/pal.c +Removing drivers/staging/wusbcore/mmc.c +Removing drivers/staging/wusbcore/include/wusb.h +Removing drivers/staging/wusbcore/include/wusb-wa.h +Removing drivers/staging/wusbcore/include/association.h +Removing drivers/staging/wusbcore/host/whci/wusb.c +Removing drivers/staging/wusbcore/host/whci/whci-hc.h +Removing drivers/staging/wusbcore/host/whci/whcd.h +Removing drivers/staging/wusbcore/host/whci/qset.c +Removing drivers/staging/wusbcore/host/whci/pzl.c +Removing drivers/staging/wusbcore/host/whci/int.c +Removing drivers/staging/wusbcore/host/whci/init.c +Removing drivers/staging/wusbcore/host/whci/hw.c +Removing drivers/staging/wusbcore/host/whci/hcd.c +Removing drivers/staging/wusbcore/host/whci/debug.c +Removing drivers/staging/wusbcore/host/whci/asl.c +Removing drivers/staging/wusbcore/host/whci/Makefile +Removing drivers/staging/wusbcore/host/hwa-hc.c +Removing drivers/staging/wusbcore/host/Makefile +Removing drivers/staging/wusbcore/host/Kconfig +Removing drivers/staging/wusbcore/devconnect.c +Removing drivers/staging/wusbcore/dev-sysfs.c +Removing drivers/staging/wusbcore/crypto.c +Removing drivers/staging/wusbcore/cbaf.c +Removing drivers/staging/wusbcore/TODO +Removing drivers/staging/wusbcore/Makefile +Removing drivers/staging/wusbcore/Kconfig +Removing drivers/staging/wusbcore/Documentation/wusb-design-overview.rst +Removing drivers/staging/wusbcore/Documentation/wusb-cbaf +Removing drivers/staging/wilc1000/microchip,wilc1000,spi.txt +Removing drivers/staging/wilc1000/microchip,wilc1000,sdio.txt +Auto-merging drivers/staging/wfx/sta.c +Auto-merging drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt +Removing drivers/staging/vt6656/int.h +Removing drivers/staging/vt6656/int.c +Removing drivers/staging/vt6656/dpc.h +Removing drivers/staging/vt6656/dpc.c +Removing drivers/staging/uwb/whci.c +Removing drivers/staging/uwb/whc-rc.c +Removing drivers/staging/uwb/uwbd.c +Removing drivers/staging/uwb/uwb.h +Removing drivers/staging/uwb/uwb-internal.h +Removing drivers/staging/uwb/uwb-debug.c +Removing drivers/staging/uwb/umc-drv.c +Removing drivers/staging/uwb/umc-dev.c +Removing drivers/staging/uwb/umc-bus.c +Removing drivers/staging/uwb/scan.c +Removing drivers/staging/uwb/rsv.c +Removing drivers/staging/uwb/reset.c +Removing drivers/staging/uwb/radio.c +Removing drivers/staging/uwb/pal.c +Removing drivers/staging/uwb/neh.c +Removing drivers/staging/uwb/lc-rc.c +Removing drivers/staging/uwb/lc-dev.c +Removing drivers/staging/uwb/include/whci.h +Removing drivers/staging/uwb/include/umc.h +Removing drivers/staging/uwb/include/spec.h +Removing drivers/staging/uwb/include/debug-cmd.h +Removing drivers/staging/uwb/ie.c +Removing drivers/staging/uwb/ie-rcv.c +Removing drivers/staging/uwb/i1480/i1480-est.c +Removing drivers/staging/uwb/i1480/dfu/usb.c +Removing drivers/staging/uwb/i1480/dfu/phy.c +Removing drivers/staging/uwb/i1480/dfu/mac.c +Removing drivers/staging/uwb/i1480/dfu/i1480-dfu.h +Removing drivers/staging/uwb/i1480/dfu/dfu.c +Removing drivers/staging/uwb/i1480/dfu/Makefile +Removing drivers/staging/uwb/i1480/Makefile +Removing drivers/staging/uwb/hwa-rc.c +Removing drivers/staging/uwb/est.c +Removing drivers/staging/uwb/drp.c +Removing drivers/staging/uwb/drp-ie.c +Removing drivers/staging/uwb/drp-avail.c +Removing drivers/staging/uwb/driver.c +Removing drivers/staging/uwb/beacon.c +Removing drivers/staging/uwb/allocator.c +Removing drivers/staging/uwb/address.c +Removing drivers/staging/uwb/TODO +Removing drivers/staging/uwb/Makefile +Removing drivers/staging/uwb/Kconfig +Auto-merging drivers/staging/qlge/qlge_ethtool.c +Auto-merging drivers/staging/media/allegro-dvt/allegro-core.c +Removing drivers/staging/exfat/exfat_upcase.c +Removing drivers/staging/exfat/exfat_super.c +Removing drivers/staging/exfat/exfat_nls.c +Removing drivers/staging/exfat/exfat_core.c +Removing drivers/staging/exfat/exfat_cache.c +Removing drivers/staging/exfat/exfat_blkdev.c +Removing drivers/staging/exfat/exfat.h +Removing drivers/staging/exfat/TODO +Removing drivers/staging/exfat/Makefile +CONFLICT (modify/delete): drivers/staging/exfat/Kconfig deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/exfat/Kconfig left in tree. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/exfat/Kconfig +rm 'drivers/staging/exfat/Kconfig' +$ git commit --no-edit -v -a +[master 3f657c7b7481] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 16 - + .../cavium-octeon/executive/cvmx-helper-board.c | 4 +- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 6 +- + .../cavium-octeon/executive/cvmx-helper-sgmii.c | 8 +- + .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 6 +- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 6 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +- + arch/mips/include/asm/octeon/cvmx-helper-board.h | 2 +- + arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-spi.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-util.h | 2 +- + arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper.h | 8 +- + arch/mips/include/asm/octeon/cvmx-pko.h | 10 +- + arch/mips/include/asm/octeon/cvmx-pow.h | 22 +- + arch/mips/include/asm/octeon/cvmx-wqe.h | 16 +- + drivers/staging/Kconfig | 9 +- + drivers/staging/Makefile | 5 +- + drivers/staging/comedi/drivers/dt282x.c | 30 +- + drivers/staging/comedi/drivers/ni_660x.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 1 + + drivers/staging/comedi/drivers/ni_pcimio.c | 2 + + drivers/staging/comedi/drivers/ni_routes.c | 63 +- + drivers/staging/comedi/drivers/ni_routes.h | 1 + + drivers/staging/comedi/drivers/ni_stc.h | 1 + + drivers/staging/exfat/Kconfig | 41 - + drivers/staging/exfat/Makefile | 10 - + drivers/staging/exfat/TODO | 69 - + drivers/staging/exfat/exfat.h | 824 ----- + drivers/staging/exfat/exfat_blkdev.c | 136 - + drivers/staging/exfat/exfat_cache.c | 555 --- + drivers/staging/exfat/exfat_core.c | 2582 ------------- + drivers/staging/exfat/exfat_nls.c | 212 -- + drivers/staging/exfat/exfat_super.c | 3883 -------------------- + drivers/staging/exfat/exfat_upcase.c | 740 ---- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 3 +- + drivers/staging/gasket/gasket_core.c | 9 +- + drivers/staging/gdm724x/gdm_mux.h | 2 +- + drivers/staging/gdm724x/hci_packet.h | 6 +- + drivers/staging/greybus/audio_apbridgea.h | 2 +- + drivers/staging/greybus/gpio.c | 15 +- + drivers/staging/greybus/i2c.c | 14 - + drivers/staging/greybus/raw.c | 2 +- + drivers/staging/hp/hp100.c | 6 - + drivers/staging/kpc2000/kpc2000/core.c | 4 +- + drivers/staging/kpc2000/kpc2000_spi.c | 4 +- + drivers/staging/ks7010/ks7010_sdio.c | 3 +- + drivers/staging/ks7010/ks_hostif.h | 4 +- + drivers/staging/media/allegro-dvt/allegro-core.c | 2 +- + drivers/staging/most/core.c | 6 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 102 +- + drivers/staging/netlogic/platform_net.h | 4 +- + drivers/staging/netlogic/xlr_net.h | 4 +- + drivers/staging/octeon-usb/Kconfig | 11 + + drivers/staging/octeon-usb/Makefile | 2 + + drivers/staging/octeon-usb/TODO | 8 + + drivers/staging/octeon-usb/octeon-hcd.c | 3737 +++++++++++++++++++ + drivers/staging/octeon-usb/octeon-hcd.h | 1847 ++++++++++ + drivers/staging/octeon/Kconfig | 15 + + drivers/staging/octeon/Makefile | 19 + + drivers/staging/octeon/TODO | 9 + + drivers/staging/octeon/ethernet-defines.h | 40 + + drivers/staging/octeon/ethernet-mdio.c | 178 + + drivers/staging/octeon/ethernet-mdio.h | 28 + + drivers/staging/octeon/ethernet-mem.c | 154 + + drivers/staging/octeon/ethernet-mem.h | 9 + + drivers/staging/octeon/ethernet-rgmii.c | 158 + + drivers/staging/octeon/ethernet-rx.c | 538 +++ + drivers/staging/octeon/ethernet-rx.h | 31 + + drivers/staging/octeon/ethernet-sgmii.c | 30 + + drivers/staging/octeon/ethernet-spi.c | 226 ++ + drivers/staging/octeon/ethernet-tx.c | 717 ++++ + drivers/staging/octeon/ethernet-tx.h | 14 + + drivers/staging/octeon/ethernet-util.h | 47 + + drivers/staging/octeon/ethernet.c | 992 +++++ + drivers/staging/octeon/octeon-ethernet.h | 107 + + drivers/staging/octeon/octeon-stubs.h | 1434 ++++++++ + .../Documentation/devicetree/pi433-overlay.dts | 73 +- + drivers/staging/pi433/pi433_if.h | 4 +- + drivers/staging/pi433/rf69.h | 4 +- + drivers/staging/pi433/rf69_enum.h | 4 +- + drivers/staging/pi433/rf69_registers.h | 4 +- + drivers/staging/qlge/qlge.h | 69 +- + drivers/staging/qlge/qlge_dbg.c | 33 +- + drivers/staging/qlge/qlge_ethtool.c | 18 +- + drivers/staging/qlge/qlge_main.c | 25 +- + drivers/staging/qlge/qlge_mpi.c | 6 + + drivers/staging/rtl8188eu/core/rtw_debug.c | 16 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 42 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 4 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 20 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 36 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 26 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 14 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192e/rtllib.h | 30 +- + drivers/staging/rtl8192e/rtllib_rx.c | 4 +- + drivers/staging/rtl8192e/rtllib_tx.c | 2 +- + drivers/staging/rtl8192e/rtllib_wx.c | 8 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 28 +- + drivers/staging/rtl8192u/r819xU_phy.c | 2 +- + drivers/staging/rtl8712/ieee80211.h | 4 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 2 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 4 +- + drivers/staging/rtl8712/rtl871x_recv.h | 4 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 14 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 8 - + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 6 +- + drivers/staging/rtl8723bs/hal/odm.h | 2 +- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 7 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 +- + drivers/staging/rtl8723bs/include/HalVerDef.h | 32 +- + drivers/staging/rtl8723bs/include/cmd_osdep.h | 4 +- + drivers/staging/rtl8723bs/include/drv_types.h | 10 +- + drivers/staging/rtl8723bs/include/hal_com.h | 98 +- + drivers/staging/rtl8723bs/include/hal_com_h2c.h | 8 +- + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 2 +- + drivers/staging/rtl8723bs/include/hal_com_reg.h | 14 +- + drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- + drivers/staging/rtl8723bs/include/hal_phy.h | 2 +- + drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 4 +- + drivers/staging/rtl8723bs/include/hal_pwr_seq.h | 4 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 22 +- + drivers/staging/rtl8723bs/include/osdep_intf.h | 2 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 10 +- + .../rtl8723bs/include/osdep_service_linux.h | 2 +- + drivers/staging/rtl8723bs/include/recv_osdep.h | 4 +- + drivers/staging/rtl8723bs/include/rtl8723b_cmd.h | 2 +- + drivers/staging/rtl8723bs/include/rtl8723b_rf.h | 2 +- + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_byteorder.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 112 +- + drivers/staging/rtl8723bs/include/rtw_debug.h | 28 +- + drivers/staging/rtl8723bs/include/rtw_eeprom.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_efuse.h | 8 +- + drivers/staging/rtl8723bs/include/rtw_event.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_ht.h | 12 +- + drivers/staging/rtl8723bs/include/rtw_io.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 66 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 40 +- + drivers/staging/rtl8723bs/include/rtw_mp.h | 16 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 18 +- + drivers/staging/rtl8723bs/include/rtw_security.h | 30 +- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 26 +- + drivers/staging/rtl8723bs/include/sta_info.h | 8 +- + drivers/staging/rtl8723bs/include/wifi.h | 8 +- + drivers/staging/rtl8723bs/include/xmit_osdep.h | 4 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 124 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 284 +- + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 6 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 8 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 12 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 +- + drivers/staging/speakup/keyhelp.c | 2 +- + drivers/staging/speakup/speakup_soft.c | 2 +- + drivers/staging/unisys/visorinput/visorinput.c | 2 +- + drivers/staging/uwb/Kconfig | 72 - + drivers/staging/uwb/Makefile | 32 - + drivers/staging/uwb/TODO | 8 - + drivers/staging/uwb/address.c | 352 -- + drivers/staging/uwb/allocator.c | 374 -- + drivers/staging/uwb/beacon.c | 595 --- + drivers/staging/uwb/driver.c | 143 - + drivers/staging/uwb/drp-avail.c | 278 -- + drivers/staging/uwb/drp-ie.c | 305 -- + drivers/staging/uwb/drp.c | 842 ----- + drivers/staging/uwb/est.c | 450 --- + drivers/staging/uwb/hwa-rc.c | 929 ----- + drivers/staging/uwb/i1480/Makefile | 2 - + drivers/staging/uwb/i1480/dfu/Makefile | 10 - + drivers/staging/uwb/i1480/dfu/dfu.c | 198 - + drivers/staging/uwb/i1480/dfu/i1480-dfu.h | 246 -- + drivers/staging/uwb/i1480/dfu/mac.c | 496 --- + drivers/staging/uwb/i1480/dfu/phy.c | 190 - + drivers/staging/uwb/i1480/dfu/usb.c | 448 --- + drivers/staging/uwb/i1480/i1480-est.c | 85 - + drivers/staging/uwb/ie-rcv.c | 42 - + drivers/staging/uwb/ie.c | 366 -- + drivers/staging/uwb/include/debug-cmd.h | 57 - + drivers/staging/uwb/include/spec.h | 767 ---- + drivers/staging/uwb/include/umc.h | 192 - + drivers/staging/uwb/include/whci.h | 102 - + drivers/staging/uwb/lc-dev.c | 457 --- + drivers/staging/uwb/lc-rc.c | 569 --- + drivers/staging/uwb/neh.c | 606 --- + drivers/staging/uwb/pal.c | 128 - + drivers/staging/uwb/radio.c | 196 - + drivers/staging/uwb/reset.c | 379 -- + drivers/staging/uwb/rsv.c | 1000 ----- + drivers/staging/uwb/scan.c | 120 - + drivers/staging/uwb/umc-bus.c | 211 -- + drivers/staging/uwb/umc-dev.c | 94 - + drivers/staging/uwb/umc-drv.c | 31 - + drivers/staging/uwb/uwb-debug.c | 354 -- + drivers/staging/uwb/uwb-internal.h | 366 -- + drivers/staging/uwb/uwb.h | 817 ---- + drivers/staging/uwb/uwbd.c | 356 -- + drivers/staging/uwb/whc-rc.c | 467 --- + drivers/staging/uwb/whci.c | 257 -- + .../interface/vchiq_arm/vchiq_2835_arm.c | 43 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 536 +-- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 76 - + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 306 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 35 +- + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 2 - + drivers/staging/vt6655/card.h | 2 +- + drivers/staging/vt6655/device_main.c | 3 +- + drivers/staging/vt6655/power.c | 10 +- + drivers/staging/vt6656/Makefile | 4 +- + drivers/staging/vt6656/baseband.c | 20 +- + drivers/staging/vt6656/device.h | 12 - + drivers/staging/vt6656/dpc.c | 124 - + drivers/staging/vt6656/dpc.h | 24 - + drivers/staging/vt6656/int.c | 164 - + drivers/staging/vt6656/int.h | 47 - + drivers/staging/vt6656/key.c | 5 +- + drivers/staging/vt6656/main_usb.c | 25 +- + drivers/staging/vt6656/rxtx.c | 296 +- + drivers/staging/vt6656/rxtx.h | 61 - + drivers/staging/vt6656/usbpipe.c | 233 +- + drivers/staging/vt6656/usbpipe.h | 23 + + .../bindings/net/wireless/siliabs,wfx.txt | 11 +- + drivers/staging/wfx/bh.c | 8 +- + drivers/staging/wfx/bus_sdio.c | 16 +- + drivers/staging/wfx/bus_spi.c | 45 +- + drivers/staging/wfx/data_rx.c | 3 +- + drivers/staging/wfx/data_tx.c | 12 +- + drivers/staging/wfx/data_tx.h | 2 +- + drivers/staging/wfx/hif_api_cmd.h | 4 - + drivers/staging/wfx/hwio.c | 2 +- + drivers/staging/wfx/main.c | 23 +- + drivers/staging/wfx/main.h | 1 - + drivers/staging/wfx/queue.c | 18 +- + drivers/staging/wfx/sta.c | 3 +- + drivers/staging/wilc1000/cfg80211.c | 386 +- + drivers/staging/wilc1000/hif.c | 5 +- + .../staging/wilc1000/microchip,wilc1000,sdio.txt | 38 - + .../staging/wilc1000/microchip,wilc1000,spi.txt | 34 - + drivers/staging/wilc1000/microchip,wilc1000.yaml | 72 + + drivers/staging/wilc1000/mon.c | 2 +- + drivers/staging/wilc1000/netdev.c | 26 +- + drivers/staging/wilc1000/netdev.h | 10 - + drivers/staging/wilc1000/sdio.c | 316 +- + drivers/staging/wilc1000/spi.c | 807 ++-- + drivers/staging/wilc1000/wlan.c | 135 +- + drivers/staging/wilc1000/wlan.h | 97 +- + drivers/staging/wlan-ng/hfa384x.h | 4 +- + drivers/staging/wlan-ng/p80211types.h | 4 +- + drivers/staging/wusbcore/Documentation/wusb-cbaf | 130 - + .../Documentation/wusb-design-overview.rst | 457 --- + drivers/staging/wusbcore/Kconfig | 39 - + drivers/staging/wusbcore/Makefile | 28 - + drivers/staging/wusbcore/TODO | 8 - + drivers/staging/wusbcore/cbaf.c | 645 ---- + drivers/staging/wusbcore/crypto.c | 441 --- + drivers/staging/wusbcore/dev-sysfs.c | 124 - + drivers/staging/wusbcore/devconnect.c | 1085 ------ + drivers/staging/wusbcore/host/Kconfig | 28 - + drivers/staging/wusbcore/host/Makefile | 3 - + drivers/staging/wusbcore/host/hwa-hc.c | 875 ----- + drivers/staging/wusbcore/host/whci/Makefile | 14 - + drivers/staging/wusbcore/host/whci/asl.c | 376 -- + drivers/staging/wusbcore/host/whci/debug.c | 153 - + drivers/staging/wusbcore/host/whci/hcd.c | 356 -- + drivers/staging/wusbcore/host/whci/hw.c | 93 - + drivers/staging/wusbcore/host/whci/init.c | 177 - + drivers/staging/wusbcore/host/whci/int.c | 82 - + drivers/staging/wusbcore/host/whci/pzl.c | 404 -- + drivers/staging/wusbcore/host/whci/qset.c | 831 ----- + drivers/staging/wusbcore/host/whci/whcd.h | 202 - + drivers/staging/wusbcore/host/whci/whci-hc.h | 401 -- + drivers/staging/wusbcore/host/whci/wusb.c | 210 -- + drivers/staging/wusbcore/include/association.h | 151 - + drivers/staging/wusbcore/include/wusb-wa.h | 304 -- + drivers/staging/wusbcore/include/wusb.h | 362 -- + drivers/staging/wusbcore/mmc.c | 303 -- + drivers/staging/wusbcore/pal.c | 45 - + drivers/staging/wusbcore/reservation.c | 110 - + drivers/staging/wusbcore/rh.c | 426 --- + drivers/staging/wusbcore/security.c | 599 --- + drivers/staging/wusbcore/wa-hc.c | 88 - + drivers/staging/wusbcore/wa-hc.h | 467 --- + drivers/staging/wusbcore/wa-nep.c | 289 -- + drivers/staging/wusbcore/wa-rpipe.c | 539 --- + drivers/staging/wusbcore/wa-xfer.c | 2927 --------------- + drivers/staging/wusbcore/wusbhc.c | 490 --- + drivers/staging/wusbcore/wusbhc.h | 487 --- + 299 files changed, 12773 insertions(+), 41576 deletions(-) + delete mode 100644 drivers/staging/exfat/Kconfig + delete mode 100644 drivers/staging/exfat/Makefile + delete mode 100644 drivers/staging/exfat/TODO + delete mode 100644 drivers/staging/exfat/exfat.h + delete mode 100644 drivers/staging/exfat/exfat_blkdev.c + delete mode 100644 drivers/staging/exfat/exfat_cache.c + delete mode 100644 drivers/staging/exfat/exfat_core.c + delete mode 100644 drivers/staging/exfat/exfat_nls.c + delete mode 100644 drivers/staging/exfat/exfat_super.c + delete mode 100644 drivers/staging/exfat/exfat_upcase.c + create mode 100644 drivers/staging/octeon-usb/Kconfig + create mode 100644 drivers/staging/octeon-usb/Makefile + create mode 100644 drivers/staging/octeon-usb/TODO + create mode 100644 drivers/staging/octeon-usb/octeon-hcd.c + create mode 100644 drivers/staging/octeon-usb/octeon-hcd.h + create mode 100644 drivers/staging/octeon/Kconfig + create mode 100644 drivers/staging/octeon/Makefile + create mode 100644 drivers/staging/octeon/TODO + create mode 100644 drivers/staging/octeon/ethernet-defines.h + create mode 100644 drivers/staging/octeon/ethernet-mdio.c + create mode 100644 drivers/staging/octeon/ethernet-mdio.h + create mode 100644 drivers/staging/octeon/ethernet-mem.c + create mode 100644 drivers/staging/octeon/ethernet-mem.h + create mode 100644 drivers/staging/octeon/ethernet-rgmii.c + create mode 100644 drivers/staging/octeon/ethernet-rx.c + create mode 100644 drivers/staging/octeon/ethernet-rx.h + create mode 100644 drivers/staging/octeon/ethernet-sgmii.c + create mode 100644 drivers/staging/octeon/ethernet-spi.c + create mode 100644 drivers/staging/octeon/ethernet-tx.c + create mode 100644 drivers/staging/octeon/ethernet-tx.h + create mode 100644 drivers/staging/octeon/ethernet-util.h + create mode 100644 drivers/staging/octeon/ethernet.c + create mode 100644 drivers/staging/octeon/octeon-ethernet.h + create mode 100644 drivers/staging/octeon/octeon-stubs.h + delete mode 100644 drivers/staging/uwb/Kconfig + delete mode 100644 drivers/staging/uwb/Makefile + delete mode 100644 drivers/staging/uwb/TODO + delete mode 100644 drivers/staging/uwb/address.c + delete mode 100644 drivers/staging/uwb/allocator.c + delete mode 100644 drivers/staging/uwb/beacon.c + delete mode 100644 drivers/staging/uwb/driver.c + delete mode 100644 drivers/staging/uwb/drp-avail.c + delete mode 100644 drivers/staging/uwb/drp-ie.c + delete mode 100644 drivers/staging/uwb/drp.c + delete mode 100644 drivers/staging/uwb/est.c + delete mode 100644 drivers/staging/uwb/hwa-rc.c + delete mode 100644 drivers/staging/uwb/i1480/Makefile + delete mode 100644 drivers/staging/uwb/i1480/dfu/Makefile + delete mode 100644 drivers/staging/uwb/i1480/dfu/dfu.c + delete mode 100644 drivers/staging/uwb/i1480/dfu/i1480-dfu.h + delete mode 100644 drivers/staging/uwb/i1480/dfu/mac.c + delete mode 100644 drivers/staging/uwb/i1480/dfu/phy.c + delete mode 100644 drivers/staging/uwb/i1480/dfu/usb.c + delete mode 100644 drivers/staging/uwb/i1480/i1480-est.c + delete mode 100644 drivers/staging/uwb/ie-rcv.c + delete mode 100644 drivers/staging/uwb/ie.c + delete mode 100644 drivers/staging/uwb/include/debug-cmd.h + delete mode 100644 drivers/staging/uwb/include/spec.h + delete mode 100644 drivers/staging/uwb/include/umc.h + delete mode 100644 drivers/staging/uwb/include/whci.h + delete mode 100644 drivers/staging/uwb/lc-dev.c + delete mode 100644 drivers/staging/uwb/lc-rc.c + delete mode 100644 drivers/staging/uwb/neh.c + delete mode 100644 drivers/staging/uwb/pal.c + delete mode 100644 drivers/staging/uwb/radio.c + delete mode 100644 drivers/staging/uwb/reset.c + delete mode 100644 drivers/staging/uwb/rsv.c + delete mode 100644 drivers/staging/uwb/scan.c + delete mode 100644 drivers/staging/uwb/umc-bus.c + delete mode 100644 drivers/staging/uwb/umc-dev.c + delete mode 100644 drivers/staging/uwb/umc-drv.c + delete mode 100644 drivers/staging/uwb/uwb-debug.c + delete mode 100644 drivers/staging/uwb/uwb-internal.h + delete mode 100644 drivers/staging/uwb/uwb.h + delete mode 100644 drivers/staging/uwb/uwbd.c + delete mode 100644 drivers/staging/uwb/whc-rc.c + delete mode 100644 drivers/staging/uwb/whci.c + delete mode 100644 drivers/staging/vt6656/dpc.c + delete mode 100644 drivers/staging/vt6656/dpc.h + delete mode 100644 drivers/staging/vt6656/int.c + delete mode 100644 drivers/staging/vt6656/int.h + delete mode 100644 drivers/staging/wilc1000/microchip,wilc1000,sdio.txt + delete mode 100644 drivers/staging/wilc1000/microchip,wilc1000,spi.txt + create mode 100644 drivers/staging/wilc1000/microchip,wilc1000.yaml + delete mode 100644 drivers/staging/wusbcore/Documentation/wusb-cbaf + delete mode 100644 drivers/staging/wusbcore/Documentation/wusb-design-overview.rst + delete mode 100644 drivers/staging/wusbcore/Kconfig + delete mode 100644 drivers/staging/wusbcore/Makefile + delete mode 100644 drivers/staging/wusbcore/TODO + delete mode 100644 drivers/staging/wusbcore/cbaf.c + delete mode 100644 drivers/staging/wusbcore/crypto.c + delete mode 100644 drivers/staging/wusbcore/dev-sysfs.c + delete mode 100644 drivers/staging/wusbcore/devconnect.c + delete mode 100644 drivers/staging/wusbcore/host/Kconfig + delete mode 100644 drivers/staging/wusbcore/host/Makefile + delete mode 100644 drivers/staging/wusbcore/host/hwa-hc.c + delete mode 100644 drivers/staging/wusbcore/host/whci/Makefile + delete mode 100644 drivers/staging/wusbcore/host/whci/asl.c + delete mode 100644 drivers/staging/wusbcore/host/whci/debug.c + delete mode 100644 drivers/staging/wusbcore/host/whci/hcd.c + delete mode 100644 drivers/staging/wusbcore/host/whci/hw.c + delete mode 100644 drivers/staging/wusbcore/host/whci/init.c + delete mode 100644 drivers/staging/wusbcore/host/whci/int.c + delete mode 100644 drivers/staging/wusbcore/host/whci/pzl.c + delete mode 100644 drivers/staging/wusbcore/host/whci/qset.c + delete mode 100644 drivers/staging/wusbcore/host/whci/whcd.h + delete mode 100644 drivers/staging/wusbcore/host/whci/whci-hc.h + delete mode 100644 drivers/staging/wusbcore/host/whci/wusb.c + delete mode 100644 drivers/staging/wusbcore/include/association.h + delete mode 100644 drivers/staging/wusbcore/include/wusb-wa.h + delete mode 100644 drivers/staging/wusbcore/include/wusb.h + delete mode 100644 drivers/staging/wusbcore/mmc.c + delete mode 100644 drivers/staging/wusbcore/pal.c + delete mode 100644 drivers/staging/wusbcore/reservation.c + delete mode 100644 drivers/staging/wusbcore/rh.c + delete mode 100644 drivers/staging/wusbcore/security.c + delete mode 100644 drivers/staging/wusbcore/wa-hc.c + delete mode 100644 drivers/staging/wusbcore/wa-hc.h + delete mode 100644 drivers/staging/wusbcore/wa-nep.c + delete mode 100644 drivers/staging/wusbcore/wa-rpipe.c + delete mode 100644 drivers/staging/wusbcore/wa-xfer.c + delete mode 100644 drivers/staging/wusbcore/wusbhc.c + delete mode 100644 drivers/staging/wusbcore/wusbhc.h +Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging icc/icc-next (03c4e6186bbb interconnect: qcom: Add OSM L3 support on SC7180) +$ git merge icc/icc-next +Removing Documentation/devicetree/bindings/interconnect/qcom,sdm845.txt +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,bcm-voter.yaml | 45 + + .../bindings/interconnect/qcom,osm-l3.yaml | 62 ++ + .../bindings/interconnect/qcom,sc7180.yaml | 85 ++ + .../bindings/interconnect/qcom,sdm845.txt | 24 - + .../bindings/interconnect/qcom,sdm845.yaml | 74 ++ + drivers/interconnect/qcom/Kconfig | 25 + + drivers/interconnect/qcom/Makefile | 8 + + drivers/interconnect/qcom/bcm-voter.c | 366 +++++++ + drivers/interconnect/qcom/bcm-voter.h | 27 + + drivers/interconnect/qcom/icc-rpmh.c | 150 +++ + drivers/interconnect/qcom/icc-rpmh.h | 149 +++ + drivers/interconnect/qcom/osm-l3.c | 276 +++++ + drivers/interconnect/qcom/sc7180.c | 641 ++++++++++++ + drivers/interconnect/qcom/sc7180.h | 151 +++ + drivers/interconnect/qcom/sdm845.c | 1055 +++++++------------- + drivers/interconnect/qcom/sdm845.h | 142 +++ + include/dt-bindings/interconnect/qcom,osm-l3.h | 12 + + include/dt-bindings/interconnect/qcom,sc7180.h | 161 +++ + include/dt-bindings/interconnect/qcom,sdm845.h | 263 ++--- + 19 files changed, 2875 insertions(+), 841 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,bcm-voter.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml + delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.txt + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml + create mode 100644 drivers/interconnect/qcom/bcm-voter.c + create mode 100644 drivers/interconnect/qcom/bcm-voter.h + create mode 100644 drivers/interconnect/qcom/icc-rpmh.c + create mode 100644 drivers/interconnect/qcom/icc-rpmh.h + create mode 100644 drivers/interconnect/qcom/osm-l3.c + create mode 100644 drivers/interconnect/qcom/sc7180.c + create mode 100644 drivers/interconnect/qcom/sc7180.h + create mode 100644 drivers/interconnect/qcom/sdm845.h + create mode 100644 include/dt-bindings/interconnect/qcom,osm-l3.h + create mode 100644 include/dt-bindings/interconnect/qcom,sc7180.h +Merging slave-dma/next (3a5a8a27545d dmaengine: ppc4xx: Use scnprintf() for avoiding potential buffer overflow) +$ git merge slave-dma/next +Auto-merging drivers/dma/ti/k3-udma.c +CONFLICT (content): Merge conflict in drivers/dma/ti/k3-udma.c +Auto-merging drivers/dma/tegra20-apb-dma.c +Auto-merging drivers/dma/idxd/sysfs.c +Auto-merging drivers/dma/idxd/cdev.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging Documentation/devicetree/bindings/dma/ti/k3-udma.yaml +Resolved 'drivers/dma/ti/k3-udma.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d9db0590b61e] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/dma/socionext,uniphier-xdmac.yaml | 63 +++ + Documentation/devicetree/bindings/dma/ti-edma.txt | 2 +- + .../devicetree/bindings/dma/ti/k3-udma.yaml | 19 +- + drivers/dma/Kconfig | 15 +- + drivers/dma/Makefile | 1 + + drivers/dma/at_hdmac.c | 121 ++-- + drivers/dma/at_hdmac_regs.h | 2 - + drivers/dma/at_xdmac.c | 44 +- + drivers/dma/bcm-sba-raid.c | 2 +- + drivers/dma/dmaengine.c | 102 +++- + drivers/dma/dmaengine.h | 16 + + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 15 + + drivers/dma/fsl-dpaa2-qdma/dpdmai.c | 21 + + drivers/dma/fsl-dpaa2-qdma/dpdmai.h | 2 + + drivers/dma/idxd/cdev.c | 4 +- + drivers/dma/idxd/device.c | 4 +- + drivers/dma/idxd/sysfs.c | 19 +- + drivers/dma/ioat/dca.c | 2 +- + drivers/dma/ppc4xx/adma.c | 2 +- + drivers/dma/sa11x0-dma.c | 2 +- + drivers/dma/sprd-dma.c | 2 +- + drivers/dma/stm32-dma.c | 96 +++- + drivers/dma/stm32-dmamux.c | 93 +++- + drivers/dma/stm32-mdma.c | 78 ++- + drivers/dma/sun4i-dma.c | 4 +- + drivers/dma/tegra20-apb-dma.c | 508 +++++++++-------- + drivers/dma/tegra210-adma.c | 2 +- + drivers/dma/ti/dma-crossbar.c | 8 +- + drivers/dma/ti/edma.c | 79 +++ + drivers/dma/ti/k3-udma-glue.c | 18 +- + drivers/dma/ti/k3-udma.c | 113 +++- + drivers/dma/ti/omap-dma.c | 2 +- + drivers/dma/uniphier-mdmac.c | 2 +- + drivers/dma/uniphier-xdmac.c | 611 +++++++++++++++++++++ + drivers/dma/xilinx/xilinx_dma.c | 65 +-- + include/linux/dmaengine.h | 68 +-- + include/uapi/linux/idxd.h | 21 +- + 37 files changed, 1694 insertions(+), 534 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/socionext,uniphier-xdmac.yaml + create mode 100644 drivers/dma/uniphier-xdmac.c +Merging cgroup/for-next (ef2289f941de Merge branch 'for-5.7' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 5 +- + include/linux/cgroup.h | 23 +- + include/linux/cpuset.h | 3 - + include/linux/sched/task.h | 4 + + include/uapi/linux/sched.h | 5 + + kernel/cgroup/cgroup-v1.c | 34 +- + kernel/cgroup/cgroup.c | 358 ++++++++++++++++------ + kernel/cgroup/cpuset.c | 31 +- + kernel/cgroup/pids.c | 15 +- + kernel/fork.c | 19 +- + kernel/power/process.c | 2 - + tools/testing/selftests/cgroup/Makefile | 6 +- + tools/testing/selftests/cgroup/cgroup_util.c | 126 ++++++++ + tools/testing/selftests/cgroup/cgroup_util.h | 4 + + tools/testing/selftests/cgroup/test_core.c | 177 +++++++++++ + tools/testing/selftests/clone3/clone3_selftests.h | 19 +- + 16 files changed, 678 insertions(+), 153 deletions(-) +Merging scsi/for-next (93615c72d129 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Auto-merging scripts/documentation-file-ref-check +Auto-merging arch/mips/configs/jazz_defconfig +Auto-merging arch/m68k/configs/sun3x_defconfig +Auto-merging arch/m68k/configs/sun3_defconfig +Auto-merging arch/m68k/configs/q40_defconfig +Auto-merging arch/m68k/configs/mvme16x_defconfig +Auto-merging arch/m68k/configs/mvme147_defconfig +Auto-merging arch/m68k/configs/multi_defconfig +Auto-merging arch/m68k/configs/mac_defconfig +Auto-merging arch/m68k/configs/hp300_defconfig +Auto-merging arch/m68k/configs/bvme6000_defconfig +Auto-merging arch/m68k/configs/atari_defconfig +Auto-merging arch/m68k/configs/apollo_defconfig +Auto-merging arch/m68k/configs/amiga_defconfig +Auto-merging MAINTAINERS +Removing Documentation/scsi/wd719x.txt +Removing Documentation/scsi/sd-parameters.txt +Removing Documentation/scsi/scsi_transport_srp/Makefile +Removing Documentation/scsi/scsi_mid_low_api.txt +Removing Documentation/scsi/ppa.txt +Removing Documentation/scsi/g_NCR5380.txt +Removing Documentation/scsi/dpti.txt +Removing Documentation/scsi/arcmsr_spec.txt +Removing Documentation/scsi/aic7xxx.txt +Removing Documentation/scsi/aic79xx.txt +Removing Documentation/scsi/NinjaSCSI.txt +Removing Documentation/scsi/FlashPoint.txt +Auto-merging Documentation/index.rst +Merge made by the 'recursive' strategy. + Documentation/driver-api/libata.rst | 2 +- + Documentation/index.rst | 1 + + Documentation/scsi/{53c700.txt => 53c700.rst} | 61 +- + Documentation/scsi/{BusLogic.txt => BusLogic.rst} | 89 +- + Documentation/scsi/FlashPoint.rst | 176 ++ + Documentation/scsi/FlashPoint.txt | 163 -- + Documentation/scsi/NinjaSCSI.rst | 164 ++ + Documentation/scsi/NinjaSCSI.txt | 128 -- + Documentation/scsi/{aacraid.txt => aacraid.rst} | 59 +- + Documentation/scsi/{advansys.txt => advansys.rst} | 129 +- + Documentation/scsi/{aha152x.txt => aha152x.rst} | 73 +- + Documentation/scsi/aic79xx.rst | 593 +++++++ + Documentation/scsi/aic79xx.txt | 497 ------ + Documentation/scsi/aic7xxx.rst | 458 +++++ + Documentation/scsi/aic7xxx.txt | 394 ----- + Documentation/scsi/arcmsr_spec.rst | 907 ++++++++++ + Documentation/scsi/arcmsr_spec.txt | 574 ------ + Documentation/scsi/{bfa.txt => bfa.rst} | 28 +- + Documentation/scsi/{bnx2fc.txt => bnx2fc.rst} | 18 +- + Documentation/scsi/{cxgb3i.txt => cxgb3i.rst} | 22 +- + Documentation/scsi/{dc395x.txt => dc395x.rst} | 79 +- + Documentation/scsi/dpti.rst | 92 + + Documentation/scsi/dpti.txt | 83 - + Documentation/scsi/g_NCR5380.rst | 93 + + Documentation/scsi/g_NCR5380.txt | 68 - + Documentation/scsi/{hpsa.txt => hpsa.rst} | 79 +- + Documentation/scsi/{hptiop.txt => hptiop.rst} | 45 +- + Documentation/scsi/index.rst | 51 + + Documentation/scsi/{libsas.txt => libsas.rst} | 352 ++-- + ...policy.txt => link_power_management_policy.rst} | 12 +- + Documentation/scsi/{lpfc.txt => lpfc.rst} | 16 +- + Documentation/scsi/{megaraid.txt => megaraid.rst} | 47 +- + .../scsi/{ncr53c8xx.txt => ncr53c8xx.rst} | 1871 ++++++++++++-------- + Documentation/scsi/ppa.rst | 18 + + Documentation/scsi/ppa.txt | 14 - + .../scsi/{qlogicfas.txt => qlogicfas.rst} | 17 +- + .../scsi/{scsi-changer.txt => scsi-changer.rst} | 36 +- + .../scsi/{scsi-generic.txt => scsi-generic.rst} | 75 +- + .../{scsi-parameters.txt => scsi-parameters.rst} | 28 +- + Documentation/scsi/{scsi.txt => scsi.rst} | 31 +- + Documentation/scsi/{scsi_eh.txt => scsi_eh.rst} | 213 ++- + ...scsi_fc_transport.txt => scsi_fc_transport.rst} | 242 ++- + Documentation/scsi/scsi_mid_low_api.rst | 1334 ++++++++++++++ + Documentation/scsi/scsi_mid_low_api.txt | 1280 ------------- + Documentation/scsi/scsi_transport_srp/Makefile | 7 - + Documentation/scsi/scsi_transport_srp/figures.rst | 6 + + Documentation/scsi/sd-parameters.rst | 27 + + Documentation/scsi/sd-parameters.txt | 22 - + Documentation/scsi/{smartpqi.txt => smartpqi.rst} | 52 +- + Documentation/scsi/{st.txt => st.rst} | 301 ++-- + .../scsi/{sym53c500_cs.txt => sym53c500_cs.rst} | 8 +- + .../scsi/{sym53c8xx_2.txt => sym53c8xx_2.rst} | 1131 +++++++----- + .../scsi/{tcm_qla2xxx.txt => tcm_qla2xxx.rst} | 26 +- + Documentation/scsi/{ufs.txt => ufs.rst} | 84 +- + Documentation/scsi/wd719x.rst | 24 + + Documentation/scsi/wd719x.txt | 21 - + MAINTAINERS | 28 +- + arch/alpha/configs/defconfig | 1 - + arch/arm/configs/rpc_defconfig | 1 - + arch/arm/configs/s3c2410_defconfig | 1 - + arch/ia64/configs/zx1_defconfig | 1 - + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/fuloong2e_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_kvm_guest_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/powerpc/configs/85xx-hw.config | 1 - + arch/powerpc/configs/amigaone_defconfig | 1 - + arch/powerpc/configs/chrp32_defconfig | 1 - + arch/powerpc/configs/g5_defconfig | 1 - + arch/powerpc/configs/maple_defconfig | 1 - + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/pmac32_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc64e_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sparc/configs/sparc64_defconfig | 1 - + arch/x86/configs/i386_defconfig | 1 - + arch/x86/configs/x86_64_defconfig | 1 - + block/scsi_ioctl.c | 4 + + drivers/message/fusion/mptlan.h | 5 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/Kconfig | 51 +- + drivers/scsi/aacraid/aachba.c | 83 +- + drivers/scsi/aacraid/comminit.c | 35 +- + drivers/scsi/aacraid/commsup.c | 48 +- + drivers/scsi/aacraid/linit.c | 154 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/aha152x.c | 4 +- + drivers/scsi/aic7xxx/Kconfig.aic79xx | 2 +- + drivers/scsi/aic7xxx/Kconfig.aic7xxx | 2 +- + drivers/scsi/arcmsr/arcmsr_attr.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- + drivers/scsi/ch.c | 40 +- + drivers/scsi/dpt/dpti_ioctl.h | 2 +- + drivers/scsi/dpt_i2o.c | 27 +- + drivers/scsi/dpti.h | 5 +- + drivers/scsi/fnic/vnic_devcmd.h | 2 +- + drivers/scsi/g_NCR5380.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 +- + drivers/scsi/hosts.c | 65 + + drivers/scsi/ibmvscsi/ibmvfc.c | 207 ++- + drivers/scsi/ibmvscsi/ibmvfc.h | 3 +- + drivers/scsi/ipr.h | 6 +- + drivers/scsi/isci/sas.h | 2 +- + drivers/scsi/lpfc/lpfc.h | 33 +- + drivers/scsi/lpfc/lpfc_attr.c | 5 +- + drivers/scsi/lpfc/lpfc_crtn.h | 3 +- + drivers/scsi/lpfc/lpfc_ct.c | 141 +- + drivers/scsi/lpfc/lpfc_els.c | 519 +++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 65 +- + drivers/scsi/lpfc/lpfc_hw.h | 62 +- + drivers/scsi/lpfc/lpfc_hw4.h | 19 + + drivers/scsi/lpfc/lpfc_init.c | 40 +- + drivers/scsi/lpfc/lpfc_scsi.c | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 16 +- + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- + drivers/scsi/mvsas/mv_sas.h | 2 +- + drivers/scsi/mvumi.h | 4 +- + drivers/scsi/ncr53c8xx.c | 2 +- + drivers/scsi/pcmcia/Kconfig | 2 +- + drivers/scsi/pmcraid.h | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 133 +- + drivers/scsi/qla2xxx/qla_bsg.c | 36 +- + drivers/scsi/qla2xxx/qla_dbg.c | 23 +- + drivers/scsi/qla2xxx/qla_def.h | 387 ++-- + drivers/scsi/qla2xxx/qla_dfs.c | 11 +- + drivers/scsi/qla2xxx/qla_fw.h | 173 +- + drivers/scsi/qla2xxx/qla_gbl.h | 23 +- + drivers/scsi/qla2xxx/qla_gs.c | 1707 ++++++++---------- + drivers/scsi/qla2xxx/qla_init.c | 202 +-- + drivers/scsi/qla2xxx/qla_iocb.c | 42 +- + drivers/scsi/qla2xxx/qla_isr.c | 295 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 388 +++- + drivers/scsi/qla2xxx/qla_mid.c | 13 +- + drivers/scsi/qla2xxx/qla_mr.c | 13 +- + drivers/scsi/qla2xxx/qla_nvme.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 699 +++++++- + drivers/scsi/qla2xxx/qla_sup.c | 13 +- + drivers/scsi/qla2xxx/qla_target.c | 38 +- + drivers/scsi/qla2xxx/qla_target.h | 2 + + drivers/scsi/qla2xxx/qla_tmpl.c | 17 +- + drivers/scsi/qla2xxx/qla_tmpl.h | 4 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 25 + + drivers/scsi/scsi.c | 18 - + drivers/scsi/scsi_error.c | 1 - + drivers/scsi/scsi_lib.c | 98 +- + drivers/scsi/scsi_priv.h | 3 - + drivers/scsi/scsi_scan.c | 1 - + drivers/scsi/scsi_sysfs.c | 8 +- + drivers/scsi/scsi_transport_iscsi.c | 106 ++ + drivers/scsi/smartpqi/Kconfig | 2 +- + drivers/scsi/snic/vnic_devcmd.h | 2 +- + drivers/scsi/sr.c | 20 +- + drivers/scsi/sr.h | 2 + + drivers/scsi/sr_vendor.c | 8 - + drivers/scsi/st.c | 2 +- + drivers/scsi/stex.c | 2 +- + drivers/scsi/ufs/Kconfig | 2 +- + drivers/scsi/ufs/cdns-pltfrm.c | 2 +- + drivers/scsi/ufs/ufs-hisi.c | 2 +- + drivers/scsi/ufs/ufs-mediatek.c | 127 +- + drivers/scsi/ufs/ufs-mediatek.h | 14 + + drivers/scsi/ufs/ufs-qcom.c | 121 +- + drivers/scsi/ufs/ufs.h | 3 + + drivers/scsi/ufs/ufs_quirks.h | 1 + + drivers/scsi/ufs/ufshcd-pci.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 264 ++- + drivers/scsi/ufs/ufshcd.h | 115 +- + drivers/scsi/ufs/unipro.h | 7 + + drivers/scsi/virtio_scsi.c | 1 - + drivers/scsi/zorro_esp.c | 5 +- + drivers/target/target_core_configfs.c | 4 +- + drivers/target/target_core_device.c | 4 +- + drivers/target/target_core_spc.c | 13 +- + drivers/target/target_core_tmr.c | 6 +- + drivers/target/target_core_transport.c | 3 +- + drivers/target/target_core_ua.c | 8 +- + include/scsi/iscsi_if.h | 11 +- + include/scsi/scsi_bsg_iscsi.h | 2 +- + include/scsi/scsi_cmnd.h | 1 - + include/scsi/scsi_device.h | 8 +- + include/scsi/scsi_host.h | 17 +- + include/scsi/scsi_ioctl.h | 2 +- + include/scsi/scsi_transport_iscsi.h | 2 + + include/scsi/sg.h | 2 +- + include/scsi/srp.h | 8 +- + include/target/target_core_base.h | 45 +- + include/trace/events/qla.h | 39 + + include/uapi/scsi/fc/fc_els.h | 211 ++- + include/uapi/scsi/scsi_bsg_fc.h | 2 +- + scripts/documentation-file-ref-check | 2 +- + 216 files changed, 11732 insertions(+), 8028 deletions(-) + rename Documentation/scsi/{53c700.txt => 53c700.rst} (75%) + rename Documentation/scsi/{BusLogic.txt => BusLogic.rst} (93%) + create mode 100644 Documentation/scsi/FlashPoint.rst + delete mode 100644 Documentation/scsi/FlashPoint.txt + create mode 100644 Documentation/scsi/NinjaSCSI.rst + delete mode 100644 Documentation/scsi/NinjaSCSI.txt + rename Documentation/scsi/{aacraid.txt => aacraid.rst} (83%) + rename Documentation/scsi/{advansys.txt => advansys.rst} (73%) + rename Documentation/scsi/{aha152x.txt => aha152x.rst} (76%) + create mode 100644 Documentation/scsi/aic79xx.rst + delete mode 100644 Documentation/scsi/aic79xx.txt + create mode 100644 Documentation/scsi/aic7xxx.rst + delete mode 100644 Documentation/scsi/aic7xxx.txt + create mode 100644 Documentation/scsi/arcmsr_spec.rst + delete mode 100644 Documentation/scsi/arcmsr_spec.txt + rename Documentation/scsi/{bfa.txt => bfa.rst} (72%) + rename Documentation/scsi/{bnx2fc.txt => bnx2fc.rst} (91%) + rename Documentation/scsi/{cxgb3i.txt => cxgb3i.rst} (86%) + rename Documentation/scsi/{dc395x.txt => dc395x.rst} (64%) + create mode 100644 Documentation/scsi/dpti.rst + delete mode 100644 Documentation/scsi/dpti.txt + create mode 100644 Documentation/scsi/g_NCR5380.rst + delete mode 100644 Documentation/scsi/g_NCR5380.txt + rename Documentation/scsi/{hpsa.txt => hpsa.rst} (77%) + rename Documentation/scsi/{hptiop.txt => hptiop.rst} (78%) + create mode 100644 Documentation/scsi/index.rst + rename Documentation/scsi/{libsas.txt => libsas.rst} (57%) + rename Documentation/scsi/{link_power_management_policy.txt => link_power_management_policy.rst} (65%) + rename Documentation/scsi/{lpfc.txt => lpfc.rst} (93%) + rename Documentation/scsi/{megaraid.txt => megaraid.rst} (66%) + rename Documentation/scsi/{ncr53c8xx.txt => ncr53c8xx.rst} (55%) + create mode 100644 Documentation/scsi/ppa.rst + delete mode 100644 Documentation/scsi/ppa.txt + rename Documentation/scsi/{qlogicfas.txt => qlogicfas.rst} (92%) + rename Documentation/scsi/{scsi-changer.txt => scsi-changer.rst} (87%) + rename Documentation/scsi/{scsi-generic.txt => scsi-generic.rst} (70%) + rename Documentation/scsi/{scsi-parameters.txt => scsi-parameters.rst} (81%) + rename Documentation/scsi/{scsi.txt => scsi.rst} (82%) + rename Documentation/scsi/{scsi_eh.txt => scsi_eh.rst} (73%) + rename Documentation/scsi/{scsi_fc_transport.txt => scsi_fc_transport.rst} (74%) + create mode 100644 Documentation/scsi/scsi_mid_low_api.rst + delete mode 100644 Documentation/scsi/scsi_mid_low_api.txt + delete mode 100644 Documentation/scsi/scsi_transport_srp/Makefile + create mode 100644 Documentation/scsi/scsi_transport_srp/figures.rst + create mode 100644 Documentation/scsi/sd-parameters.rst + delete mode 100644 Documentation/scsi/sd-parameters.txt + rename Documentation/scsi/{smartpqi.txt => smartpqi.rst} (67%) + rename Documentation/scsi/{st.txt => st.rst} (79%) + rename Documentation/scsi/{sym53c500_cs.txt => sym53c500_cs.rst} (89%) + rename Documentation/scsi/{sym53c8xx_2.txt => sym53c8xx_2.rst} (53%) + rename Documentation/scsi/{tcm_qla2xxx.txt => tcm_qla2xxx.rst} (57%) + rename Documentation/scsi/{ufs.txt => ufs.rst} (79%) + create mode 100644 Documentation/scsi/wd719x.rst + delete mode 100644 Documentation/scsi/wd719x.txt + create mode 100644 include/trace/events/qla.h +Merging scsi-mkp/for-next (efa75c21c487 scsi: core: Allow non-root users to perform ZBC commands) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (d40662d5f12b virtio-net: Introduce hash report feature) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + include/uapi/linux/virtio_net.h | 102 ++++++++++++++++++++++++++++++++++++++-- + tools/virtio/Makefile | 27 ++++++++++- + 2 files changed, 124 insertions(+), 5 deletions(-) +Merging rpmsg/for-next (2bbad2db0749 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/remoteproc/qcom_q6v5_mss.c +Merge made by the 'recursive' strategy. + Documentation/remoteproc.txt | 2 +- + drivers/hwspinlock/Kconfig | 12 +- + drivers/remoteproc/imx_rproc.c | 11 +- + drivers/remoteproc/keystone_remoteproc.c | 4 +- + drivers/remoteproc/mtk_scp.c | 2 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- + drivers/remoteproc/qcom_q6v5_mss.c | 133 ++++++++++++++------ + drivers/remoteproc/qcom_q6v5_pas.c | 2 +- + drivers/remoteproc/qcom_q6v5_wcss.c | 2 +- + drivers/remoteproc/qcom_wcnss.c | 2 +- + drivers/remoteproc/remoteproc_core.c | 104 ++++++++------- + drivers/remoteproc/remoteproc_debugfs.c | 16 +-- + drivers/remoteproc/remoteproc_elf_helpers.h | 96 ++++++++++++++ + drivers/remoteproc/remoteproc_elf_loader.c | 189 +++++++++++++++++++--------- + drivers/remoteproc/remoteproc_internal.h | 16 ++- + drivers/remoteproc/remoteproc_virtio.c | 1 + + drivers/remoteproc/st_remoteproc.c | 4 +- + drivers/remoteproc/st_slim_rproc.c | 6 +- + drivers/remoteproc/stm32_rproc.c | 4 +- + drivers/remoteproc/wkup_m3_rproc.c | 4 +- + include/linux/remoteproc.h | 13 +- + 21 files changed, 445 insertions(+), 180 deletions(-) + create mode 100644 drivers/remoteproc/remoteproc_elf_helpers.h +Merging gpio/for-next (9cd0c5e02ee4 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-mockup.c | 2 +- + drivers/gpio/gpio-pxa.c | 4 +- + drivers/gpio/gpio-rcar.c | 4 +- + drivers/gpio/gpio-siox.c | 28 +-- + drivers/gpio/gpio-uniphier.c | 2 +- + drivers/gpio/gpio-wcd934x.c | 9 +- + drivers/gpio/gpiolib-of.c | 139 +++++++++++++-- + drivers/gpio/gpiolib-of.h | 2 + + drivers/gpio/gpiolib.c | 383 ++++++++++++++++++++++++++++++++---------- + drivers/gpio/gpiolib.h | 4 + + include/asm-generic/gpio.h | 4 +- + include/linux/gpio.h | 2 - + include/linux/gpio/consumer.h | 5 +- + include/linux/kfifo.h | 73 ++++++++ + include/linux/of_gpio.h | 9 +- + include/uapi/linux/gpio.h | 30 ++++ + tools/gpio/.gitignore | 1 + + tools/gpio/Build | 1 + + tools/gpio/Makefile | 11 +- + tools/gpio/gpio-watch.c | 99 +++++++++++ + 20 files changed, 671 insertions(+), 141 deletions(-) + create mode 100644 tools/gpio/gpio-watch.c +Merging gpio-brgl/gpio/for-next (8c97246c39b5 gpio: mxs: add COMPILE_TEST support for GPIO_MXS) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/gpio/driver.rst | 4 ++-- + drivers/gpio/Kconfig | 4 ++-- + drivers/gpio/gpio-pl061.c | 6 ++---- + include/uapi/linux/gpio.h | 8 ++++---- + 4 files changed, 10 insertions(+), 12 deletions(-) +Merging gpio-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (ab5644db943f Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/stm32/pinctrl-stm32.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.txt +Removing Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.txt +Removing Documentation/devicetree/bindings/pinctrl/fsl,imx8mm-pinctrl.txt +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/fsl,imx8mm-pinctrl.txt | 36 - + .../bindings/pinctrl/fsl,imx8mm-pinctrl.yaml | 82 ++ + .../bindings/pinctrl/fsl,imx8mn-pinctrl.txt | 39 - + .../bindings/pinctrl/fsl,imx8mn-pinctrl.yaml | 82 ++ + .../bindings/pinctrl/fsl,imx8mp-pinctrl.yaml | 25 +- + .../bindings/pinctrl/fsl,imx8mq-pinctrl.txt | 36 - + .../bindings/pinctrl/fsl,imx8mq-pinctrl.yaml | 82 ++ + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 153 +++ + MAINTAINERS | 37 +- + drivers/gpio/gpiolib.c | 1 + + drivers/pinctrl/Kconfig | 12 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/actions/pinctrl-s700.c | 510 ++++----- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 111 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 5 +- + drivers/pinctrl/core.c | 1 + + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 11 +- + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 7 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 264 ++++- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 16 + + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 5 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 363 ++++--- + drivers/pinctrl/mediatek/pinctrl-paris.h | 3 + + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 7 +- + drivers/pinctrl/pinconf-generic.c | 1 + + drivers/pinctrl/pinctrl-amd.c | 5 +- + drivers/pinctrl/pinctrl-at91.c | 5 +- + drivers/pinctrl/pinctrl-axp209.c | 7 +- + drivers/pinctrl/pinctrl-da9062.c | 300 ++++++ + drivers/pinctrl/pinctrl-ingenic.c | 55 +- + drivers/pinctrl/pinctrl-ocelot.c | 5 +- + drivers/pinctrl/pinctrl-oxnas.c | 5 +- + drivers/pinctrl/pinctrl-pic32.c | 5 +- + drivers/pinctrl/pinctrl-pistachio.c | 5 +- + drivers/pinctrl/pinctrl-rk805.c | 7 +- + drivers/pinctrl/pinctrl-rockchip.c | 5 +- + drivers/pinctrl/pinctrl-rza1.c | 5 +- + drivers/pinctrl/pinctrl-rza2.c | 6 +- + drivers/pinctrl/pinctrl-st.c | 14 +- + drivers/pinctrl/pinctrl-stmfx.c | 17 +- + drivers/pinctrl/pinctrl-sx150x.c | 9 +- + drivers/pinctrl/qcom/Kconfig | 10 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-ipq6018.c | 1107 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-ipq8064.c | 10 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 4 +- + drivers/pinctrl/sh-pfc/Kconfig | 4 +- + drivers/pinctrl/sh-pfc/core.c | 307 ++++-- + drivers/pinctrl/sh-pfc/gpio.c | 5 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 2 +- + drivers/pinctrl/sprd/Kconfig | 10 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 3 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 16 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 2 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 6 +- + 57 files changed, 3149 insertions(+), 692 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mm-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mm-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq6018-pinctrl.yaml + create mode 100644 drivers/pinctrl/pinctrl-da9062.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq6018.c +Merging pinctrl-intel/for-next (2c523b344dfa Linux 5.6-rc5) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9871abffc810 pwm: Remove set but not set variable 'pwm') +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (a0d4a141750d Proc mount option handling is broken, and it has been since I accidentally broke it in the middle 2016.) +$ git merge userns/for-next +Auto-merging kernel/pid.c +CONFLICT (content): Merge conflict in kernel/pid.c +Auto-merging kernel/exit.c +Auto-merging include/linux/proc_ns.h +Auto-merging fs/proc/base.c +Resolved 'kernel/pid.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b4094bc9d0a4] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/um/drivers/mconsole_kern.c | 28 +++++++++- + fs/proc/base.c | 111 +++++++++++++--------------------------- + fs/proc/inode.c | 73 ++++++++++++++++++++++++-- + fs/proc/internal.h | 4 +- + fs/proc/proc_sysctl.c | 45 +++------------- + fs/proc/root.c | 36 ------------- + include/linux/pid.h | 1 + + include/linux/pid_namespace.h | 2 - + include/linux/proc_fs.h | 4 +- + include/linux/proc_ns.h | 5 -- + kernel/exit.c | 4 +- + kernel/pid.c | 9 +--- + kernel/pid_namespace.c | 38 +++++++------- + 13 files changed, 166 insertions(+), 194 deletions(-) +Merging ktest/for-next (1091c8fce8aa ktest: Fix typos in ktest.pl) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (e00d996a4317 random: fix data races at timer_rand_state) +$ git merge random/dev +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/archrandom.h | 14 +++++++ + drivers/char/Kconfig | 2 +- + drivers/char/random.c | 84 ++++++++++++++++++++++--------------- + include/linux/random.h | 22 ++++++++++ + 4 files changed, 87 insertions(+), 35 deletions(-) +Merging kselftest/next (3032e3a7c7e3 selftests/resctrl: Add the test in MAINTAINERS) +$ git merge kselftest/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + tools/testing/selftests/resctrl/Makefile | 17 + + tools/testing/selftests/resctrl/README | 53 ++ + tools/testing/selftests/resctrl/cache.c | 272 +++++++++ + tools/testing/selftests/resctrl/cat_test.c | 250 ++++++++ + tools/testing/selftests/resctrl/cqm_test.c | 176 ++++++ + tools/testing/selftests/resctrl/fill_buf.c | 213 +++++++ + tools/testing/selftests/resctrl/mba_test.c | 171 ++++++ + tools/testing/selftests/resctrl/mbm_test.c | 145 +++++ + tools/testing/selftests/resctrl/resctrl.h | 107 ++++ + tools/testing/selftests/resctrl/resctrl_tests.c | 202 +++++++ + tools/testing/selftests/resctrl/resctrl_val.c | 744 ++++++++++++++++++++++++ + tools/testing/selftests/resctrl/resctrlfs.c | 722 +++++++++++++++++++++++ + 13 files changed, 3073 insertions(+) + create mode 100644 tools/testing/selftests/resctrl/Makefile + create mode 100644 tools/testing/selftests/resctrl/README + create mode 100644 tools/testing/selftests/resctrl/cache.c + create mode 100644 tools/testing/selftests/resctrl/cat_test.c + create mode 100644 tools/testing/selftests/resctrl/cqm_test.c + create mode 100644 tools/testing/selftests/resctrl/fill_buf.c + create mode 100644 tools/testing/selftests/resctrl/mba_test.c + create mode 100644 tools/testing/selftests/resctrl/mbm_test.c + create mode 100644 tools/testing/selftests/resctrl/resctrl.h + create mode 100644 tools/testing/selftests/resctrl/resctrl_tests.c + create mode 100644 tools/testing/selftests/resctrl/resctrl_val.c + create mode 100644 tools/testing/selftests/resctrl/resctrlfs.c +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (d28b4c1b2b3d Merge branch 'for-5.6/selftests' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (749c4ad29ea7 coresight: cti: Remove unnecessary NULL check in cti_sig_type_name) +$ git merge coresight/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-cti | 221 ++++ + .../devicetree/bindings/arm/coresight-cti.yaml | 336 ++++++ + .../devicetree/bindings/arm/coresight.txt | 7 + + Documentation/trace/coresight/coresight-ect.rst | 211 ++++ + Documentation/trace/coresight/coresight.rst | 13 + + MAINTAINERS | 3 + + drivers/hwtracing/coresight/Kconfig | 21 + + drivers/hwtracing/coresight/Makefile | 3 + + .../hwtracing/coresight/coresight-cti-platform.c | 485 ++++++++ + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 1173 ++++++++++++++++++++ + drivers/hwtracing/coresight/coresight-cti.c | 745 +++++++++++++ + drivers/hwtracing/coresight/coresight-cti.h | 235 ++++ + drivers/hwtracing/coresight/coresight-platform.c | 20 + + drivers/hwtracing/coresight/coresight-priv.h | 15 + + drivers/hwtracing/coresight/coresight.c | 86 +- + include/dt-bindings/arm/coresight-cti-dt.h | 37 + + include/linux/coresight.h | 27 + + 17 files changed, 3624 insertions(+), 14 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-cti + create mode 100644 Documentation/devicetree/bindings/arm/coresight-cti.yaml + create mode 100644 Documentation/trace/coresight/coresight-ect.rst + create mode 100644 drivers/hwtracing/coresight/coresight-cti-platform.c + create mode 100644 drivers/hwtracing/coresight/coresight-cti-sysfs.c + create mode 100644 drivers/hwtracing/coresight/coresight-cti.c + create mode 100644 drivers/hwtracing/coresight/coresight-cti.h + create mode 100644 include/dt-bindings/arm/coresight-cti-dt.h +Merging rtc/rtc-next (ebc8fddc50ff rtc: ab8500: switch to rtc_time64_to_tm/rtc_tm_to_time64) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 3 ++- + drivers/rtc/rtc-ab8500.c | 10 ++++---- + drivers/rtc/rtc-au1xxx.c | 29 +++++++++------------- + drivers/rtc/rtc-cmos.c | 5 ++-- + drivers/rtc/rtc-cpcap.c | 13 +++++----- + drivers/rtc/rtc-davinci.c | 58 ++++++++++--------------------------------- + drivers/rtc/rtc-ds1305.c | 10 +++----- + drivers/rtc/rtc-ds1374.c | 27 +++++++++++--------- + drivers/rtc/rtc-imx-sc.c | 2 +- + drivers/rtc/rtc-mpc5121.c | 61 ++++++++++++++++++++++++---------------------- + drivers/rtc/rtc-pl030.c | 27 ++++++-------------- + drivers/rtc/rtc-pl031.c | 53 +++++++++++++++------------------------- + drivers/rtc/rtc-pm8xxx.c | 29 ++++++++-------------- + drivers/rtc/rtc-sa1100.c | 40 +++++++++++++----------------- + drivers/rtc/rtc-sh.c | 3 +-- + drivers/rtc/rtc-sirfsoc.c | 44 +++++++++++++++------------------ + drivers/rtc/rtc-snvs.c | 1 - + drivers/rtc/rtc-starfire.c | 10 +++++--- + drivers/rtc/rtc-zynqmp.c | 27 +++++++++++++++++--- + drivers/rtc/sysfs.c | 2 +- + 20 files changed, 198 insertions(+), 256 deletions(-) +Merging nvdimm/libnvdimm-for-next (7b27a8622f80 libnvdimm/e820: Retrieve and populate correct 'target_node' info) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/platforms/pseries/papr_scm.c +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/pseries/papr_scm.c | 21 +--------- + arch/x86/Kconfig | 1 + + arch/x86/mm/numa.c | 67 ++++++++++++++++++++++++------- + drivers/acpi/numa/srat.c | 41 ------------------- + drivers/nvdimm/e820.c | 18 ++------- + include/linux/acpi.h | 23 ++++++++++- + include/linux/numa.h | 30 +++++++++++++- + mm/Kconfig | 5 +++ + mm/mempolicy.c | 26 ++++++++++++ + 9 files changed, 140 insertions(+), 92 deletions(-) +Merging at24/at24/for-next (4837621cd61e eeprom: at24: add TPF0001 ACPI ID for 24c1024 device) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 1 + + 1 file changed, 1 insertion(+) +Merging ntb/ntb-next (fd8cab9aee2c NTB: add pci shutdown handler for AMD NTB) +$ git merge ntb/ntb-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/ntb/hw/amd/ntb_hw_amd.c | 290 +++++++++++++++++++++++++++------ + drivers/ntb/hw/amd/ntb_hw_amd.h | 8 +- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +- + drivers/ntb/ntb_transport.c | 58 +++---- + drivers/ntb/test/ntb_tool.c | 14 +- + 6 files changed, 285 insertions(+), 88 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 (f8788d86ab28 Linux 5.6-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Auto-merging drivers/fsi/Kconfig +CONFLICT (content): Merge conflict in drivers/fsi/Kconfig +Resolved 'drivers/fsi/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 66cdbe069239] Merge remote-tracking branch 'fsi/next' +$ git diff -M --stat --summary HEAD^.. +Merging slimbus/for-next (ba1589ff458e slimbus: ngd: add v2.1.0 compatible) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (c609408c27be nvmem: jz4780-efuse: fix build warnings on ARCH=x86_64 or riscv) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-jz4780-efuse | 16 ++ + .../bindings/nvmem/ingenic,jz4780-efuse.yaml | 45 ++++ + drivers/nvmem/Kconfig | 12 ++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 83 +++---- + drivers/nvmem/imx-ocotp.c | 29 ++- + drivers/nvmem/jz4780-efuse.c | 239 +++++++++++++++++++++ + drivers/nvmem/nvmem-sysfs.c | 6 + + include/linux/nvmem-consumer.h | 7 + + 9 files changed, 397 insertions(+), 42 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-jz4780-efuse + create mode 100644 Documentation/devicetree/bindings/nvmem/ingenic,jz4780-efuse.yaml + create mode 100644 drivers/nvmem/jz4780-efuse.c +Merging xarray/xarray (7e934cf5ace1 xarray: Fix early termination of xas_for_each_marked) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + include/linux/xarray.h | 10 +++- + lib/radix-tree.c | 8 --- + lib/test_xarray.c | 55 ++++++++++++++++++ + lib/xarray.c | 9 ++- + tools/testing/radix-tree/Makefile | 4 +- + tools/testing/radix-tree/iteration_check_2.c | 87 ++++++++++++++++++++++++++++ + tools/testing/radix-tree/linux.c | 32 ++++++---- + tools/testing/radix-tree/linux/slab.h | 6 +- + tools/testing/radix-tree/main.c | 1 + + tools/testing/radix-tree/test.h | 1 + + 10 files changed, 182 insertions(+), 31 deletions(-) + create mode 100644 tools/testing/radix-tree/iteration_check_2.c +Merging hyperv/hyperv-next (40d1d2d6e89e HID: hyperv: NULL check before some freeing functions is not needed.) +$ git merge hyperv/hyperv-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging auxdisplay/auxdisplay (2f920c0f0e29 auxdisplay: charlcd: replace zero-length array with flexible-array member) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (5ea771abd5a3 kdb: Censor attempts to set PROMPT without ENABLE_MEM_READ) +$ git merge kgdb/kgdb/for-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_main.c | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) +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 (d4aaf8643cff PM / devfreq: Fix a typo in a comment) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/devfreq.c | 10 +-- + drivers/devfreq/governor.h | 21 +++---- + 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, 69 insertions(+), 72 deletions(-) +Merging hmm/hmm (fdf8822d38ed mm/mmu_notifier: prevent unpaired invalidate_start and invalidate_end) +$ git merge hmm/hmm +Merge made by the 'recursive' strategy. + mm/mmu_notifier.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 50 insertions(+), 3 deletions(-) +Merging fpga/for-next (2fb2e7cdfbb0 arm64: dts: agilex: correct service layer driver's compatible value) +$ git merge fpga/for-next +Auto-merging arch/arm64/boot/dts/intel/socfpga_agilex.dtsi +Merge made by the 'recursive' strategy. + .../bindings/firmware/intel,stratix10-svc.txt | 2 +- + .../bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 3 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 +-- + drivers/fpga/dfl-afu-main.c | 26 +++++++++------- + drivers/fpga/dfl-fme-main.c | 19 +++++++----- + drivers/fpga/dfl-pci.c | 6 ++-- + drivers/fpga/dfl.c | 15 ++++++++-- + drivers/fpga/dfl.h | 35 +++++++++++++++++----- + drivers/fpga/ice40-spi.c | 10 +++++-- + drivers/fpga/machxo2-spi.c | 12 +++++--- + drivers/fpga/stratix10-soc.c | 3 +- + drivers/fpga/zynq-fpga.c | 3 +- + 12 files changed, 96 insertions(+), 42 deletions(-) +Merging kunit/test (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge kunit/test +Already up to date. +Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6) +$ git merge cel/cel-next +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (b6fe8bc67d2d mtd: hyperbus: move direct mapping setup to AM654 HBMC driver) +$ git merge cfi/cfi/next +Merge made by the 'recursive' strategy. + drivers/mtd/hyperbus/hbmc-am654.c | 12 ++++++++++++ + drivers/mtd/hyperbus/hyperbus-core.c | 15 +++------------ + 2 files changed, 15 insertions(+), 12 deletions(-) +Merging kunit-next/kunit (be886ba90cce kunit: run kunit_tool from any directory) +$ git merge kunit-next/kunit +Already up to date. +Merging akpm-current/current (05e265818063 ipc/mqueue.c: fix a brace coding style issue) +$ git merge --no-ff akpm-current/current +Auto-merging mm/mempolicy.c +Auto-merging mm/memcontrol.c +Auto-merging mm/Makefile +Auto-merging mm/Kconfig +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/pid.c +Auto-merging kernel/module.c +Auto-merging kernel/fork.c +Auto-merging kernel/extable.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/Kconfig +Auto-merging include/linux/wait.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/proc_fs.h +Auto-merging include/linux/pid.h +Auto-merging include/linux/cgroup-defs.h +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/inode.c +Auto-merging fs/pipe.c +Auto-merging fs/io_uring.c +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c +Auto-merging arch/powerpc/platforms/powernv/memtrace.c +Auto-merging arch/microblaze/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/microblaze/include/asm/Kbuild +Auto-merging arch/m68k/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/m68k/include/asm/Kbuild +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'arch/m68k/include/asm/Kbuild' using previous resolution. +Resolved 'arch/microblaze/include/asm/Kbuild' using previous resolution. +Recorded preimage for 'arch/x86/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/Kconfig'. +[master 367d5dc7901b] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v1/hugetlb.rst | 103 ++- + Documentation/admin-guide/cgroup-v2.rst | 11 + + Documentation/admin-guide/kernel-parameters.txt | 20 +- + Documentation/admin-guide/mm/transhuge.rst | 14 + + Documentation/admin-guide/mm/userfaultfd.rst | 51 ++ + Documentation/admin-guide/sysctl/vm.rst | 3 + + Documentation/core-api/mm-api.rst | 3 + + Documentation/core-api/pin_user_pages.rst | 86 ++- + Documentation/dev-tools/kcov.rst | 17 +- + Documentation/vm/free_page_reporting.rst | 41 ++ + Documentation/vm/zswap.rst | 20 +- + MAINTAINERS | 7 + + arch/alpha/include/asm/Kbuild | 11 - + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/alpha/kernel/syscalls/syscallhdr.sh | 2 +- + arch/alpha/mm/fault.c | 6 +- + arch/arc/include/asm/Kbuild | 21 - + arch/arc/mm/fault.c | 35 +- + arch/arm/include/asm/Kbuild | 12 - + arch/arm/mm/fault.c | 7 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/Kbuild | 18 - + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/mm/fault.c | 26 +- + arch/arm64/mm/init.c | 6 + + arch/c6x/include/asm/Kbuild | 37 - + arch/csky/include/asm/Kbuild | 36 - + arch/csky/mm/fault.c | 2 +- + arch/h8300/include/asm/Kbuild | 46 -- + arch/hexagon/include/asm/Kbuild | 33 - + arch/hexagon/mm/vm_fault.c | 5 +- + arch/ia64/include/asm/Kbuild | 7 - + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/ia64/kernel/syscalls/syscallhdr.sh | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 2 + + arch/ia64/mm/fault.c | 5 +- + arch/m68k/include/asm/Kbuild | 24 - + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/mm/fault.c | 9 +- + arch/microblaze/include/asm/Kbuild | 29 - + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscallhdr.sh | 2 +- + arch/microblaze/mm/fault.c | 5 +- + arch/mips/include/asm/Kbuild | 13 - + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscallhdr.sh | 3 +- + arch/mips/mm/fault.c | 7 +- + arch/nds32/include/asm/Kbuild | 37 - + arch/nds32/kernel/vmlinux.lds.S | 1 + + arch/nds32/mm/fault.c | 5 +- + arch/nios2/include/asm/Kbuild | 38 -- + arch/nios2/mm/fault.c | 7 +- + arch/openrisc/include/asm/Kbuild | 36 - + arch/openrisc/mm/fault.c | 5 +- + arch/parisc/include/asm/Kbuild | 18 - + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/parisc/kernel/syscalls/syscallhdr.sh | 2 +- + arch/parisc/mm/fault.c | 8 +- + arch/powerpc/include/asm/Kbuild | 4 - + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscallhdr.sh | 3 +- + arch/powerpc/kvm/e500_mmu_host.c | 2 +- + arch/powerpc/mm/book3s64/pkeys.c | 12 - + arch/powerpc/mm/fault.c | 22 +- + arch/powerpc/platforms/powernv/memtrace.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- + arch/riscv/include/asm/Kbuild | 28 - + arch/riscv/mm/fault.c | 9 +- + arch/s390/include/asm/Kbuild | 15 - + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/mm/fault.c | 10 +- + arch/sh/include/asm/Kbuild | 16 - + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscallhdr.sh | 2 +- + arch/sh/mm/fault.c | 15 +- + arch/sparc/include/asm/Kbuild | 14 - + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscallhdr.sh | 2 +- + arch/sparc/mm/fault_32.c | 5 +- + arch/sparc/mm/fault_64.c | 5 +- + arch/um/kernel/trap.c | 3 +- + arch/unicore32/include/asm/Kbuild | 34 - + arch/unicore32/mm/fault.c | 8 +- + arch/x86/Kconfig | 3 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/Kbuild | 2 - + arch/x86/include/asm/mmu_context.h | 15 - + arch/x86/include/asm/pgtable.h | 67 ++ + arch/x86/include/asm/pgtable_64.h | 8 +- + arch/x86/include/asm/pgtable_types.h | 11 +- + arch/x86/kernel/setup.c | 4 + + arch/x86/mm/fault.c | 58 +- + arch/xtensa/include/asm/Kbuild | 26 - + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + arch/xtensa/kernel/syscalls/syscallhdr.sh | 2 +- + arch/xtensa/mm/fault.c | 5 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/base/memory.c | 197 ++---- + drivers/base/node.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 12 +- + drivers/hv/hv_balloon.c | 2 +- + drivers/misc/lkdtm/bugs.c | 75 ++ + drivers/misc/lkdtm/core.c | 3 + + drivers/misc/lkdtm/lkdtm.h | 3 + + drivers/usb/core/hcd.c | 3 + + drivers/virtio/Kconfig | 1 + + drivers/virtio/virtio_balloon.c | 180 +++-- + fs/aio.c | 9 +- + fs/binfmt_elf.c | 48 +- + fs/buffer.c | 56 +- + fs/eventpoll.c | 72 +- + fs/fs_parser.c | 2 - + fs/io_uring.c | 2 +- + fs/ocfs2/alloc.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 2 - + fs/ocfs2/cluster/tcp.c | 3 +- + fs/ocfs2/cluster/tcp.h | 2 +- + fs/ocfs2/dir.c | 4 +- + fs/ocfs2/dlm/dlmcommon.h | 8 +- + fs/ocfs2/dlm/dlmmaster.c | 2 - + fs/ocfs2/dlm/dlmthread.c | 3 - + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/journal.c | 2 +- + fs/ocfs2/ocfs2_fs.h | 18 +- + fs/ocfs2/refcounttree.c | 2 + + fs/ocfs2/reservations.c | 3 - + fs/ocfs2/stackglue.c | 2 - + fs/ocfs2/suballoc.c | 5 - + fs/pipe.c | 2 +- + fs/proc/array.c | 39 +- + fs/proc/cpuinfo.c | 1 + + fs/proc/generic.c | 31 +- + fs/proc/inode.c | 188 +++-- + fs/proc/internal.h | 6 + + fs/proc/kmsg.c | 1 + + fs/proc/page.c | 40 +- + fs/proc/stat.c | 1 + + fs/ramfs/inode.c | 12 + + fs/userfaultfd.c | 168 +++-- + include/asm-generic/Kbuild | 52 ++ + include/asm-generic/pgtable.h | 1 + + include/asm-generic/pgtable_uffd.h | 66 ++ + include/asm-generic/tlb.h | 3 +- + include/linux/bitops.h | 4 +- + include/linux/bits.h | 22 +- + include/linux/cgroup-defs.h | 5 + + include/linux/gfp.h | 6 + + include/linux/huge_mm.h | 6 +- + include/linux/hugetlb.h | 57 +- + include/linux/hugetlb_cgroup.h | 169 ++++- + include/linux/kasan.h | 2 +- + include/linux/kthread.h | 3 +- + include/linux/list.h | 50 +- + include/linux/memcontrol.h | 54 +- + include/linux/memory.h | 1 - + include/linux/memory_hotplug.h | 13 +- + include/linux/mempolicy.h | 29 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 245 ++++++- + include/linux/mm_types.h | 11 +- + include/linux/mmzone.h | 52 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 13 +- + include/linux/page_ref.h | 9 + + include/linux/page_reporting.h | 26 + + include/linux/pagemap.h | 8 +- + include/linux/percpu_counter.h | 4 +- + include/linux/pid.h | 1 + + include/linux/proc_fs.h | 17 +- + include/linux/sched.h | 11 + + include/linux/sched/signal.h | 16 + + include/linux/stackdepot.h | 2 + + include/linux/swapops.h | 5 +- + include/linux/syscalls.h | 3 + + include/linux/userfaultfd_k.h | 42 +- + include/linux/vm_event_item.h | 5 + + include/linux/vmalloc.h | 5 +- + include/linux/wait.h | 4 +- + include/trace/events/huge_memory.h | 1 + + include/trace/events/mmflags.h | 1 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/mman.h | 5 +- + include/uapi/linux/userfaultfd.h | 40 +- + include/uapi/linux/virtio_balloon.h | 1 + + init/Kconfig | 8 +- + ipc/mqueue.c | 5 +- + ipc/util.c | 1 + + kernel/cgroup/cgroup.c | 17 +- + kernel/events/core.c | 3 +- + kernel/exit.c | 17 - + kernel/extable.c | 3 +- + kernel/fork.c | 23 +- + kernel/gcov/fs.c | 2 +- + kernel/gcov/gcc_3_4.c | 6 +- + kernel/gcov/gcc_4_7.c | 2 +- + kernel/hung_task.c | 44 ++ + kernel/kallsyms.c | 2 - + kernel/kcov.c | 221 ++++-- + kernel/module.c | 1 + + kernel/notifier.c | 2 +- + kernel/pid.c | 17 + + kernel/relay.c | 17 +- + kernel/sched/fair.c | 2 +- + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 27 +- + kernel/watchdog.c | 22 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 27 + + lib/Kconfig.ubsan | 49 +- + lib/Makefile | 8 + + lib/bch.c | 2 +- + lib/cpumask.c | 102 ++- + lib/rbtree.c | 4 +- + lib/scatterlist.c | 2 +- + lib/stackdepot.c | 39 +- + lib/test_bitmap.c | 2 + + lib/test_kasan.c | 19 + + lib/test_kmod.c | 2 +- + lib/test_lockup.c | 554 +++++++++++++++ + lib/test_stackinit.c | 28 +- + lib/ts_bm.c | 2 +- + lib/ts_fsm.c | 2 +- + lib/ts_kmp.c | 2 +- + lib/ubsan.c | 47 +- + mm/Kconfig | 129 +++- + mm/Makefile | 2 + + mm/compaction.c | 31 +- + mm/debug.c | 44 +- + mm/filemap.c | 33 +- + mm/gup.c | 633 +++++++++++++---- + mm/gup_benchmark.c | 71 +- + mm/huge_memory.c | 63 +- + mm/hugetlb.c | 755 ++++++++++++++++----- + mm/hugetlb_cgroup.c | 317 +++++++-- + mm/internal.h | 11 +- + mm/kasan/common.c | 49 +- + mm/kasan/generic.c | 9 +- + mm/kasan/generic_report.c | 11 + + mm/kasan/kasan.h | 2 +- + mm/kasan/report.c | 15 +- + mm/kasan/tags.c | 9 +- + mm/kasan/tags_report.c | 11 + + mm/khugepaged.c | 27 +- + mm/kmemleak.c | 2 +- + mm/ksm.c | 5 +- + mm/list_lru.c | 14 +- + mm/madvise.c | 156 ++++- + mm/mapping_dirty_helpers.c | 42 +- + mm/memblock.c | 2 +- + mm/memcontrol.c | 531 +++++++++------ + mm/memory.c | 35 +- + mm/memory_hotplug.c | 46 +- + mm/mempolicy.c | 76 ++- + mm/memremap.c | 20 + + mm/migrate.c | 102 +-- + mm/mm_init.c | 2 +- + mm/mmap.c | 53 +- + mm/mprotect.c | 74 +- + mm/mremap.c | 92 ++- + mm/nommu.c | 10 +- + mm/page-writeback.c | 17 +- + mm/page_alloc.c | 284 +++++--- + mm/page_counter.c | 23 +- + mm/page_ext.c | 5 +- + mm/page_isolation.c | 6 +- + mm/page_reporting.c | 364 ++++++++++ + mm/page_reporting.h | 54 ++ + mm/rmap.c | 43 +- + mm/shmem.c | 132 ++-- + mm/shuffle.c | 14 +- + mm/shuffle.h | 6 + + mm/slab.h | 22 +- + mm/slab_common.c | 3 +- + mm/slub.c | 30 +- + mm/sparse.c | 171 +++-- + mm/swap.c | 5 +- + mm/swap_slots.c | 12 +- + mm/swapfile.c | 52 +- + mm/userfaultfd.c | 94 ++- + mm/vmalloc.c | 11 +- + mm/vmpressure.c | 8 +- + mm/vmscan.c | 87 +-- + mm/vmstat.c | 5 + + mm/zsmalloc.c | 10 +- + mm/zswap.c | 24 +- + samples/hw_breakpoint/data_breakpoint.c | 11 +- + scripts/Makefile.ubsan | 16 +- + scripts/checkpatch.pl | 141 +++- + scripts/spelling.txt | 1 + + tools/lib/rbtree.c | 4 +- + .../filesystems/epoll/epoll_wakeup_test.c | 67 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 2 + + .../selftests/vm/charge_reserved_hugetlb.sh | 575 ++++++++++++++++ + tools/testing/selftests/vm/gup_benchmark.c | 15 +- + .../selftests/vm/hugetlb_reparenting_test.sh | 244 +++++++ + tools/testing/selftests/vm/map_hugetlb.c | 14 +- + tools/testing/selftests/vm/mremap_dontunmap.c | 313 +++++++++ + tools/testing/selftests/vm/run_vmtests | 37 + + tools/testing/selftests/vm/userfaultfd.c | 225 ++++-- + tools/testing/selftests/vm/write_hugetlb_memory.sh | 23 + + tools/testing/selftests/vm/write_to_hugetlbfs.c | 242 +++++++ + 305 files changed, 8865 insertions(+), 3044 deletions(-) + create mode 100644 Documentation/vm/free_page_reporting.rst + create mode 100644 include/asm-generic/pgtable_uffd.h + create mode 100644 include/linux/page_reporting.h + create mode 100644 lib/test_lockup.c + create mode 100644 mm/page_reporting.c + create mode 100644 mm/page_reporting.h + create mode 100644 tools/testing/selftests/vm/charge_reserved_hugetlb.sh + create mode 100644 tools/testing/selftests/vm/hugetlb_reparenting_test.sh + create mode 100644 tools/testing/selftests/vm/mremap_dontunmap.c + create mode 100644 tools/testing/selftests/vm/write_hugetlb_memory.sh + create mode 100644 tools/testing/selftests/vm/write_to_hugetlbfs.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/dma/tegra20-apb-dma.c: fix platform_get_irq.cocci warnings +Applying: mm/frontswap: mark various intentional data races +Applying: mm/page_io: mark various intentional data races +Applying: mm-page_io-mark-various-intentional-data-races-v2 +Applying: mm/swap_state: mark various intentional data races +Applying: mm/filemap.c: fix a data race in filemap_fault() +Applying: mm/swapfile: fix and annotate various data races +Applying: mm-swapfile-fix-and-annotate-various-data-races-v2 +Applying: mm/page_counter: fix various data races at memsw +Applying: mm/memcontrol: fix a data race in scan count +Applying: mm/list_lru: fix a data race in list_lru_count_one +Applying: mm/mempool: fix a data race in mempool_free() +Applying: mm/util.c: annotate an data race at vm_committed_as +Applying: mm/rmap: annotate a data race at tlb_flush_batched +Applying: mm: annotate a data race in page_zonenum() +Applying: mm/swap.c: annotate data races for lru_rotate_pvecs +Applying: mm/memory.c: refactor insert_page to prepare for batched-lock insert +Applying: mm: bring sparc pte_index() semantics inline with other platforms +Applying: mm: define pte_index as macro for x86 +Applying: mm/memory.c: add vm_insert_pages() +Applying: mm-add-vm_insert_pages-fix +Applying: add missing page_count() check to vm_insert_pages(). +Applying: mm: vm_insert_pages() checks if pte_index defined. +Applying: net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy +Applying: net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix +Applying: mm/vma: define a default value for VM_DATA_DEFAULT_FLAGS +Applying: mm/vma: introduce VM_ACCESS_FLAGS +Applying: mm/memory_hotplug: drop the flags field from struct mhp_restrictions +Applying: mm/memory_hotplug: rename mhp_restrictions to mhp_params +Applying: x86/mm: thread pgprot_t through init_memory_mapping() +Applying: x86/mm: introduce __set_memory_prot() +Applying: powerpc/mm: thread pgprot_t through create_section_mapping() +Applying: mm/memory_hotplug: add pgprot_t to mhp_params +Applying: mm/memremap: set caching mode for PCI P2PDMA memory to WC +Applying: mm/special: create generic fallbacks for pte_special() and pte_mkspecial() +Applying: mm-special-create-generic-fallbacks-for-pte_special-and-pte_mkspecial-v3 +Applying: mm/debug: add tests validating architecture page table helpers +Applying: kmod: make request_module() return an error when autoloading is disabled +Applying: fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once() +Applying: docs: admin-guide: document the kernel.modprobe sysctl +Applying: selftests: kmod: test disabling module autoloading +Applying: fs/seq_file.c: seq_read(): add info message about buggy .next functions +Applying: seq_read-info-message-about-buggy-next-functions-fix +Applying: kernel/gcov/fs.c: gcov_seq_next() should increase position index +Applying: ipc/util.c: sysvipc_find_ipc() should increase position index +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 + + 5e0fbbff1c74...893619530eeb akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (893619530eeb drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 21 ++ + .../debug/debug-vm-pgtable/arch-support.txt | 34 ++ + arch/alpha/include/asm/page.h | 3 - + arch/alpha/include/asm/pgtable.h | 2 - + arch/arc/Kconfig | 1 + + arch/arc/include/asm/page.h | 2 +- + arch/arm/include/asm/page.h | 4 +- + arch/arm/include/asm/pgtable-2level.h | 2 - + arch/arm/include/asm/pgtable.h | 15 +- + arch/arm/mm/fault.c | 2 +- + arch/arm/mm/mmu.c | 14 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/page.h | 4 +- + arch/arm64/mm/fault.c | 2 +- + arch/arm64/mm/mmu.c | 7 +- + arch/c6x/include/asm/page.h | 5 +- + arch/csky/include/asm/page.h | 3 - + arch/csky/include/asm/pgtable.h | 3 - + arch/h8300/include/asm/page.h | 2 - + arch/hexagon/include/asm/page.h | 3 +- + arch/hexagon/include/asm/pgtable.h | 2 - + arch/ia64/include/asm/page.h | 5 +- + arch/ia64/include/asm/pgtable.h | 2 - + arch/ia64/mm/init.c | 7 +- + arch/m68k/include/asm/mcf_pgtable.h | 10 - + arch/m68k/include/asm/motorola_pgtable.h | 2 - + arch/m68k/include/asm/page.h | 3 - + arch/m68k/include/asm/sun3_pgtable.h | 2 - + arch/microblaze/include/asm/page.h | 2 - + arch/microblaze/include/asm/pgtable.h | 4 - + arch/mips/include/asm/page.h | 5 +- + arch/mips/include/asm/pgtable.h | 44 ++- + arch/nds32/include/asm/page.h | 3 - + arch/nds32/include/asm/pgtable.h | 9 - + arch/nds32/mm/fault.c | 2 +- + arch/nios2/include/asm/page.h | 3 +- + arch/nios2/include/asm/pgtable.h | 3 - + arch/openrisc/include/asm/page.h | 5 - + arch/openrisc/include/asm/pgtable.h | 2 - + arch/parisc/include/asm/page.h | 3 - + arch/parisc/include/asm/pgtable.h | 2 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/book3s/64/hash.h | 3 +- + arch/powerpc/include/asm/book3s/64/radix.h | 3 +- + arch/powerpc/include/asm/page.h | 9 +- + arch/powerpc/include/asm/page_64.h | 7 +- + arch/powerpc/include/asm/sparsemem.h | 3 +- + arch/powerpc/mm/book3s64/hash_utils.c | 5 +- + arch/powerpc/mm/book3s64/pgtable.c | 7 +- + arch/powerpc/mm/book3s64/pkeys.c | 2 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 18 +- + arch/powerpc/mm/mem.c | 10 +- + arch/riscv/include/asm/page.h | 3 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/page.h | 3 +- + arch/s390/mm/fault.c | 2 +- + arch/s390/mm/init.c | 9 +- + arch/sh/include/asm/page.h | 3 - + arch/sh/mm/init.c | 7 +- + arch/sparc/include/asm/page_32.h | 3 - + arch/sparc/include/asm/page_64.h | 3 - + arch/sparc/include/asm/pgtable_32.h | 7 - + arch/sparc/include/asm/pgtable_64.h | 10 +- + arch/um/include/asm/pgtable.h | 10 - + arch/unicore32/include/asm/page.h | 3 - + arch/unicore32/include/asm/pgtable.h | 3 - + arch/unicore32/mm/fault.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/page_types.h | 7 +- + arch/x86/include/asm/pgtable.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/set_memory.h | 1 + + arch/x86/kernel/amd_gart_64.c | 3 +- + arch/x86/mm/init.c | 9 +- + arch/x86/mm/init_32.c | 19 +- + arch/x86/mm/init_64.c | 40 ++- + arch/x86/mm/mm_internal.h | 3 +- + arch/x86/mm/pat/set_memory.c | 13 + + arch/x86/mm/pkeys.c | 2 +- + arch/x86/platform/uv/bios_uv.c | 3 +- + arch/x86/um/asm/vm-flags.h | 10 +- + arch/xtensa/include/asm/page.h | 3 - + arch/xtensa/include/asm/pgtable.h | 3 - + drivers/dma/tegra20-apb-dma.c | 1 - + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/staging/gasket/gasket_core.c | 2 +- + drivers/tty/serial/sh-sci.c | 2 +- + fs/filesystems.c | 4 +- + fs/seq_file.c | 7 +- + include/linux/memcontrol.h | 2 +- + include/linux/memory_hotplug.h | 21 +- + include/linux/mm.h | 35 +- + include/linux/mmdebug.h | 5 + + init/main.c | 2 + + ipc/util.c | 2 +- + kernel/gcov/fs.c | 2 +- + kernel/kmod.c | 4 +- + lib/Kconfig.debug | 26 ++ + mm/Makefile | 1 + + mm/debug_vm_pgtable.c | 392 +++++++++++++++++++++ + mm/filemap.c | 20 +- + mm/frontswap.c | 8 +- + mm/list_lru.c | 2 +- + mm/memory.c | 172 ++++++++- + mm/memory_hotplug.c | 11 +- + mm/mempool.c | 2 +- + mm/memremap.c | 17 +- + mm/mmap.c | 2 +- + mm/mprotect.c | 4 +- + mm/page_counter.c | 13 +- + mm/page_io.c | 8 +- + mm/rmap.c | 2 +- + mm/swap.c | 5 +- + mm/swap_state.c | 4 +- + mm/swapfile.c | 31 +- + mm/util.c | 8 +- + net/ipv4/tcp.c | 70 +++- + tools/testing/selftests/kmod/kmod.sh | 43 ++- + 118 files changed, 1083 insertions(+), 367 deletions(-) + create mode 100644 Documentation/features/debug/debug-vm-pgtable/arch-support.txt + create mode 100644 mm/debug_vm_pgtable.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..60ec6cc9b303 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 5.5 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..b545d9427e4a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200313 |