diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-02-26 15:30:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-02-26 15:30:51 +1100 |
| commit | f3fef7e990dae5fcd7cd8ccbd9b2a98bdb481da8 (patch) | |
| tree | 5c33a4c9eddc2a9185fc251a5e54595a032d3301 | |
| parent | dd1e9e3fbdc616bdef3601b6fc8b41f68d4f03fc (diff) | |
| download | linux-next-f3fef7e990dae5fcd7cd8ccbd9b2a98bdb481da8.tar.gz | |
Add linux-next specific files for 20200226next-20200226
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 316 | ||||
| -rw-r--r-- | Next/Trees | 317 | ||||
| -rw-r--r-- | Next/merge.log | 6109 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6745 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1f39e2b5ffc6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,316 @@ +Name SHA1 +---- ---- +origin c5f86891185c408b2241ba9a82ae8622d8386aff +fixes eb239a5f369fda911065f48d4e2c98cc3f70a6f3 +kbuild-current 743de36e106d0797c5654b1be93333e37dbd2e3d +arc-current 3b00b042eeaaea43b8702b2dd4b9cb0916a2e052 +arm-current 89604523a76eb3e13014b2bdab7f8870becee284 +arm-soc-fixes f1e4920fe3303aa983073197bcbc97d6c6119ba7 +arm64-fixes dcde237319e626d1ec3c9d8b7613032f0fd4663a +m68k-current 6aabc1facdb24e837cfea755ba46a6be22a8860f +powerpc-fixes 9eb425b2e04e0e3006adffea5bf5f227a896f128 +s390-fixes f8788d86ab28f61f7b46eb6be375f8a726783636 +sparc 11648b8339f840d4b1f4c54a1abec8025d9e077d +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net a8e41f6033a0c5633d55d6e35993c9e2005d872f +bpf 41f57cfde186dba6e357f9db25eafbed017e4487 +ipsec a1a7e3a36e01ca6e67014f8cf673cb8e47be5550 +netfilter d0820556507bd7aef4f3a615b1b6eb66eb9785fe +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers a9149d243f259ad8f02b1e23dfe8ba06128f15e1 +mac80211 3614d05b5e6baf487e88fb114d884da172edd61a +rdma-fixes 6affca140cbea01f497c4f4e16f1e2be7f74bd04 +sound-current c37c0ab029569a75fd180edb03d411e7a28a936f +sound-asoc-fixes 51c8b77b5631b28073c12961f7ad13280be2b989 +regmap-fixes d29456d34def5e7edd1a0b94485eb4ff07cc9773 +regulator-fixes a0d87fa6ec10d3f5eab48b00b8851cf68ce86100 +spi-fixes 491727eab5565f59bda902251cd9f23c85d0de37 +pci-current bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +driver-core.current ae91c92565494a37c30ce9a691c87890f800d826 +tty.current f8788d86ab28f61f7b46eb6be375f8a726783636 +usb.current f8788d86ab28f61f7b46eb6be375f8a726783636 +usb-gadget-fixes 42cd5ffe46c1037d5d9a253c72e71a024a7bfbef +usb-serial-fixes f8788d86ab28f61f7b46eb6be375f8a726783636 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 0ed41b33882c577e1d6582913163a2f5727765fe +staging.current f8788d86ab28f61f7b46eb6be375f8a726783636 +char-misc.current f8788d86ab28f61f7b46eb6be375f8a726783636 +soundwire-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +thunderbolt-fixes da0f3e0201b87ee4bbd2175925dd57e1228c35fb +input-current 3dbae15538972c9e1578cb216964c2840361a538 +crypto-current c9cc0517bba9f0213f1e55172feceb99e5512daf +ide 94f2630b18975bb56eee5d1a36371db967643479 +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes ef89d0545132d685f73da6f58b7e7fe002536f91 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +slave-dma-fixes 25962e1a7f1d522f1b57ead2f266fab570042a70 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes def9d2780727cec3313ed3522d0123158d87224d +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes d171c45da874e3858a83e6377e00280a507fe2f2 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 3234f4ed3066a58cd5ce8edcf752fa4fe0c95cb5 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes e500ba0e71f0b8652e67f8801cf7c33dad3ee4a4 +kvm-fixes a93236fcbe1d0248461b29c0f87cb0b510c94e6f +kvms390-fixes 5ef8acbdd687c9d72582e2c05c0b9756efb37863 +hwmon-fixes 47555027eae210de1c69210a24d130ce439fe0da +nvdimm-fixes 96222d53842dfe54869ec4e1b9d4856daf9105a2 +btrfs-fixes 5db834fa2a2b899248c150473a64f6801828695f +vfs-fixes bf4498ad3f9a0f7202cf90e52b5ce9bb31700b91 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes f8788d86ab28f61f7b46eb6be375f8a726783636 +samsung-krzk-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl-samsung-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +devicetree-fixes a40df28c5640f13405f5617aff3e985f7e72cde7 +scsi-fixes 03264ddde2453f6877a7d637d84068079632a3c5 +drm-fixes 97d9a4e9619a822c5baf6a63e6f5b80fee4d4213 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes f8788d86ab28f61f7b46eb6be375f8a726783636 +mmc-fixes 9051db381fabe75079ef38135ab73c5dd3a7c3e5 +rtc-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +gnss-fixes f8788d86ab28f61f7b46eb6be375f8a726783636 +hyperv-fixes af42d3466bdc8f39806b26f593604fdc54140bcb +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 8458ca147c204e7db124e8baa8fede219006e80d +pidfd-fixes 0bef168e88595a1c42fa83009ffabb26535368f8 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +gpio-intel-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl-intel-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +drm-misc-fixes eb9d8ddbc107d02e489681f9dcbf93949e1a99a4 +kspp-gustavo d5180902be1cf9f6b33a7b270bac94db453f2d80 +kbuild 5693febe8be818baa6930fb0262cd7fa5bc8a0a2 +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 75467ee48a5e04cf3ae3cb39aea6adee73aeff91 +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm c0cf33e910fe247ea9612805fe41629a1743d017 +arm64 e533dbe9dcb199bb637a2c465f3a6e70564994fe +arm-perf 8703317ae576c9bf3e07e5b97275e3f957e8d74b +arm-soc f6063ec6ce3c8a40af166f7d00b6beea33082f74 +amlogic 7ef59ea6bce077cd9ce0c96fa5b42d2d50349274 +aspeed 5a020d80bbef3176e034e5d47677044289e78186 +at91 1c8bb10f82fb893dab2b2e529217d1cdf9cfbc68 +imx-mxs 48b4bfe7105f646e270596bf9d22df0e8a4ae217 +keystone a1766a49fc90df3ac1ab3004dd3d4a80480c1a31 +mediatek 00862b8de3aa94454914a5de88a477268de925db +mvebu c0d03b53ef47dbade7be742ec897c77879ad7ccb +omap e500ba0e71f0b8652e67f8801cf7c33dad3ee4a4 +qcom bc50f20a31b1dea6efcc6c96b40775ad34bbfeea +raspberrypi ec3d259408cee162596d61bb9e1f01ba2e0c3165 +realtek 45698e00d5a904bdefd5d4cd4a751803674815f1 +renesas ddd8444ef822bc0f3a006da8a69a80c4b7e5567f +reset 4e0b9bc98c4a09c6e0bbd621ca57734170f1b820 +rockchip 152f9a049efc1c2bcd9ce3e3f365c0b610cd6944 +samsung-krzk 0c09ac8e27a03113d89dfc33bff67b52830b2726 +scmi 6143a33281e2618035b481721adabead639742ee +sunxi ac970cb5c6d40e9f2b70800f03e6169f2e7c60c3 +tegra 56568eebf45e3fe67cf0173845ca9e76b94d45dd +clk 931cfff0458a4d3b1fb45ab9dce9d4cdd6b33e0d +clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky f8788d86ab28f61f7b46eb6be375f8a726783636 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 240b62d381fe5b66c496a6fd55edff3976a9be51 +m68k dff527e7a0a831459efcda23ba1577d2cc7aa6e5 +m68knommu f8788d86ab28f61f7b46eb6be375f8a726783636 +microblaze 519fa60b6007fe19a32c5a50541dd7b38bd11b37 +mips 91f40e896444b4e4096290d3e1eeb3f9ed4cafad +nds32 d785c5a324cd8812720a409dc85050558281a567 +nios2 051d75d3bb31d456a41c7dc8cf2b8bd23a96774f +openrisc fc74d716600545304a066bfd9d54cbd07e531701 +parisc-hd bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +powerpc 71c3a888cbcaf453aecf8d2f8fb003271d28073f +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 6a7f10c795743a7f81e89df99866d7532811c324 +risc-v 704dd3cad2e6b091e938d559b2e122506d2b933a +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 b059a39cfa27c04e8e03e4ddf44f16501f36357d +sh a193018e5290ee9d9fe62ad80cd8f874711eb575 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml d65197ad52494bed3b5e64708281b8295f76c391 +xtensa 362961f4063fc9b6aa8347175442071d1e22fa4f +fscrypt edc440e3d27fb31e6f9663cf413fad97d714c060 +afs 4fe171bb81b13b40bf568330ec3716dfb304ced1 +btrfs 4948f16553e6dd0438fc0a5e02921f8644abfb6b +ceph 3b20bc2fe4c0cfd82d35838965dc7ff0b93415c6 +cifs b7493db932a4036a96511c562742f5cfd355bafc +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs 2c2a7552dd6465e8fde6bc9cccf8d66ed1c1eb72 +erofs bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +ext3 daf1cd925487599ac1a9191ff264bf928c61834c +ext4 9db176bceb5c5df4990486709da386edadc6bd1d +f2fs b19e8c68470385dd2c5440876591fddb02c8c402 +fsverity da3a3da4e6c68459618a1043dcb12b450312a4e2 +fuse 3e8cb8b2eaeb22f540f1cbc00cbb594047b7ba89 +jfs 802a5017ffb27ade616d0fe605f699a3c6303aa3 +nfs 63623fd44972d1ed2bfb6e0fb631dfcf547fd1e7 +nfs-anna 5d63944f8206a80636ae8cb4b9107d3b49f43d37 +nfsd 3d96208c30f84d6edf9ab4fac813306ac0d20c10 +orangefs 9f198a2ac543eaaf47be275531ad5cbd50db3edf +overlayfs c2e87fd933969bd3df90dc28348d309bf6f76d71 +ubifs fe357dbae113f6ad89b77818ef92784eb11e21ba +v9fs 79fb9216b7be1832b90c8ddf3c2d465b46670e81 +xfs cdbcf82b86ea24aa942991b4233cd8ddf13f590c +zonefs bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +iomap 243145bc4336684c69f95de0a303b31f2e5bf264 +djw-vfs 3253d9d093376d62b4a56e609f15d2ec5085ac73 +file-locks 98ca480a8f22fdbd768e3dad07024c8d4856576c +vfs 0fd169576648452725fa2949bf391d10883d3991 +printk d34f14ae521f076f68f3ce213c64193f9a5a8adf +pci daf98fffe4dc61b86edee09cbc49ed0a12734198 +pstore e163fdb3f7f8c62dccf194f3f37a7bcb3c333aa8 +hid 530c6c3b37e2197b27fa6bb53c6ad561c2549f2b +i2c bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +i3c de8964995c798fcf372980e5d819eec8cf3e41e1 +dmi 6eaaa9e897193a42fc21fe643bb2815455179e62 +hwmon-staging 75ce99ed1ec83bac27a7ed5ecacd3a3c760d6c84 +jc_docs ef45e78fdc11ac1794940c2ff4a6bf3bc4c45372 +v4l-dvb ef0ed05dcef8a74178a8b480cce23a377b1de2b8 +v4l-dvb-next d45331b00ddb179e291766617259261c112db872 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 49d2c63e171c150bb9683c6660121e596e9e1a39 +cpufreq-arm a30f8a91f3c25ad7df897bf7877bad410ad19f79 +cpupower bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +opp 03758d60265c773e1d06d436b99ee338f2ac55d6 +thermal bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 6ccad8483b28666bdafbb52fe94e64f41e7836be +net-next f13e4415d2715145017cbdc35f33634acf935a6f +bpf-next 503d539a6e417b018616bf3060e0b5814fafce47 +ipsec-next dda520c4d4623701dd70cf7b40d29a4eed232d0f +mlx5-next 339ffae598ed74a0220a92c9b8d1cecb2e9a0dc8 +netfilter-next d5110b5d84d3d8efd8ac127e586a0bb38827821a +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next 932183aa35c62e9657585382de641716088a0023 +bluetooth eed467b517e8c6987e3f227758ff3e67c889e17b +mac80211-next 3b3e808cd883dd2e39c85e6d8debc0020b5ef5e7 +gfs2 9357fd4b0167404f28e21d263c7c4806a1d757be +mtd 4575243c5c173f8adbc08a5c6ea2269742ea2b47 +nand d85339d9ea2660b550f12aca8bd040be4395c963 +spi-nor df5c21002cf4bb9c755c6330d101487c5d530c10 +crypto ff462ddfd95b915345c3c7c037c3bfafdc58bae7 +drm 1b245ec5b685ebf8e6e5d1e6b5bcc03b6608e8b0 +amdgpu 2ef91cd0b9268c19b89a2f5bdcdc3d7ce58018a5 +drm-intel cb4d5dc3e7a8420f9894668268676a66a0e8a601 +drm-tegra 98ae41adb252866158dd4e998551dfa85e612bed +drm-misc e1cf35b94c5fd122a8780587559fc6da9fc2dd12 +drm-msm 5f9935f514d66ddba868e587d9e976a567232547 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8 +regmap d29456d34def5e7edd1a0b94485eb4ff07cc9773 +sound 2948f4a4e583a4d283a4b57b7b1101761daee5cc +sound-asoc ab6a1752d1dd8bf7bd089f231167b2e4c18fec82 +modules 0f74226649fb2875a91b68f3750f55220aa73425 +input c5ccf2ad3d33413fee06ae87d0b970d8cc540db6 +block 6b6eb301e9762e54ff6c636cd2017c1d47c32a6f +device-mapper 47ace7e012b9f7ad71d43ac9063d335ea3d6820b +pcmcia 71705c611263cad99edf85a5ea021e098cac032b +mmc b6559a9563d646eb8549d0eddcf07f3a7e2c1615 +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 1129d6145ed58362738d9411279132b0c5e71e85 +backlight 7af43a76695db71a57203793fb9dd3c81a5783b1 +battery 1c5dfc5e3f2df5892a849621d729daa87cfef436 +regulator 33f2ecda24644478b1383666ef5ac0dc8f1c6d0e +security 3e27a33932df104f4f9ff811467b0b4ccebde773 +apparmor 01df52d726b5d55d2970f5c957f1961930acd5d6 +integrity 5780b9abd530982c2bb1018e2c52c05ab3c30b45 +keys bda7978b1956a6828924150d3c51fe0665294c08 +selinux e4cfa05e9bfe286457082477b32ecd17737bdbce +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +tpmdd 14c3bf32cb4ac0c4e4827981960b37ab4bbd3d88 +watchdog 44144c809e39d64ff9931c7e8956c42b2baa89e6 +iommu e3b5ee0cfb65646f4a915643fe53e0a51829d891 +vfio 7b5372ba04ca1caabed1470d4ec23001cde2eb91 +audit 70b3eeed49e8190d97139806f6fbaf8964306cdb +devicetree 632c99084052aef1c9dcfe43d2720306026d6d21 +mailbox c6c6bc6ea9fce31baaca053befc31215cfcb3dd9 +spi 5c0fd1c4c90965911fa0b98caf6368e0675c88b4 +tip f4a4fb5f1572c12bfcde18b9aa200e86b1d5a2d8 +clockevents e4c3b4213b79017001be2a311d7aafebe7497e8a +edac c7f7b1c8fecae67e3503d3718796a64a6a03da3c +irqchip 5186a6cc3ef5a3fa327c258924ef098b0de77006 +ftrace 5f811c57c99205e048926293bb812c750a6ea562 +rcu 8aa63de65a79bd8c5c1c2b19452e35f58b043ac7 +kvm a93236fcbe1d0248461b29c0f87cb0b510c94e6f +kvm-arm e43f1331e2ef913b8c566920c9af75e0ccdd1d3f +kvm-ppc fd24a8624eb29d3b6b7df68096ce0321b19b03c6 +kvms390 b35e8878e1d313044863855f3cbaee0040d0bd39 +xen-tip 8645e56a4ad6dcbf504872db7f14a2f67db88ef2 +percpu 9391e7a9a1e29c94b432cea0d27ee043a7560758 +workqueues 1cd27003497accca0c2dc7cfe3abe7512ecd911d +drivers-x86 7adb1e8aeeb5d4d88012568b2049599c1a247cf2 +chrome-platform 42cd0ab476e2daffc23982c37822a78f9a53cdd5 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 11a48a5a18c63fd7621bb050228cebf13566e4d8 +ipmi ef0129a4d06a669a0a4d49654d2130ff4343a262 +driver-core 99c73ce158a44a1a11cb146062bc32df0c1d95db +usb 24e6aea4801bae1dce3b16da6bc64fc06742ac14 +usb-gadget bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +usb-serial 0a68ec3d8a2ce75666b813b90cbf1d2e85684714 +usb-chipidea-next cbdfbda4a1661a779c58d1aee3bb4d82ee75fa22 +phy-next a5c86c557fe90391a19e4b41c32f125b91d8a3c2 +tty ba08cf452f3493e96793c9fec4ebb45e7101a0c0 +char-misc 1f836f5b10f2524d33efde47d2b694b861ecf319 +extcon 87ccafd3bd641932499d2f843ccfba401c91d7ed +soundwire dde73538c9a5f537fe1d6ae4a563507343ec6587 +thunderbolt 3084ea9ea88906576d0bfc0d66cb1735045266c8 +staging c85f15519d45588ce6ab8ad18616d2c0175a25d6 +mux f356d58c3a04159f35003b26f8c5183f9456f95d +icc bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +slave-dma 4721e67698cd93caa0bb614aebea715932445321 +cgroup 9bd5910d7f3db2f65be139d2679dd9daa4a3419a +scsi 214527ada4ee167d8339f886357393ce6a7b24e1 +scsi-mkp 162e250031cc6caca35738813720e4ed83f1b1bb +vhost 370e2c82a4a5f533ea8680cdf72e20143699a602 +rpmsg 5a87e60312a93c3989bd1f983b872164438d7243 +gpio ee82ebf16ccb97780b02aba6f58cd9b397723a5b +gpio-brgl b8419b06739021a6e891b01e2567b0e408926ffb +gpio-intel bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl 2d2177ffa2695e340c7bcfd88be76d73bf75bd89 +pinctrl-intel bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl-samsung bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pwm 9871abffc81048e20f02e15d6aa4558a44ad53ea +userns 61a47c1ad3a4dc6882f01ebdc88138ac62d0df03 +ktest 9b5f852ae20d998a534eea46d54e68584868ae8c +random 4cb760b02419061209b9b4cc2557986a6bf93e73 +kselftest 3032e3a7c7e3ef4a9839ec99c60ffeed76830bf2 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching d28b4c1b2b3d1337069cbe0bf0bec151d0e4d576 +coresight bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +rtc 4594d082dbe6385c2df6b838817ccd214c16b358 +nvdimm 7b27a8622f802761d5c6abd6c37b22312a35343c +at24 4837621cd61e6b81a182098889143c6c9a06b0f3 +ntb 1ef512b16bc8e51453d7105609c88f51fba4dcf5 +kspp c79f46a282390e0f5b306007bf7b11a46d529538 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f8788d86ab28f61f7b46eb6be375f8a726783636 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus 526eaf5d08a21d2ea4b84f7df348702ba5cae00a +nvmem 8daa313031947c8e0a46e0258d633c8d854e6401 +xarray 3a00e7c47c382b30524e78b36ab047c16b8fcfef +hyperv 54e19d34011fea26d39aa74781131de0ce642a01 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb 5ea771abd5a3734dfc55dee3772ff94ecc0b6f6a +pidfd 8d19f1c8e1937baf74e1962aae9f90fa3aeab463 +devfreq 46dbfe265841a05ffb6812f01b97dc0591b74243 +hmm bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +fpga 309db92e29b12f7f5d1049e9ad5639ca787c6571 +kunit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +cel a99d8080aaf358d5d23581244e5da23b35e340b9 +kasan-bitops 4f4afc2c9599520300b3f2b3666d2034fca03df3 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +kunit-next be886ba90cce2fb2f5a4dbcda8f3be3fd1b2f484 +akpm-current 447805d7b070f4aa86309c049200e595f538794f +akpm 9a0ec8b33c10f21baa77b5b75f56f424575be234 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..1ff50c644d7f --- /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 +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#for-next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..6c1ad50f7e7e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6109 @@ +$ date -R +Wed, 26 Feb 2020 07:48:45 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 63623fd44972 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm +Merging origin/master (c5f86891185c Merge tag 'riscv-for-linux-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge origin/master +Updating 63623fd44972..c5f86891185c +Fast-forward + CREDITS | 5 ++++ + MAINTAINERS | 6 ++-- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 17 ++++++----- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 17 ++++++----- + arch/mips/boot/dts/ingenic/x1000.dtsi | 6 ++-- + arch/mips/include/asm/sync.h | 4 ++- + arch/mips/kernel/vpe.c | 2 +- + arch/mips/vdso/Makefile | 28 ++++++++++++++++-- + arch/riscv/boot/.gitignore | 2 ++ + arch/riscv/include/asm/csr.h | 12 ++++++++ + arch/riscv/kernel/head.S | 6 ++++ + arch/riscv/kernel/traps.c | 4 +-- + arch/riscv/mm/kasan_init.c | 53 ++++++++++++++++++++-------------- + 13 files changed, 109 insertions(+), 53 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 (743de36e106d kbuild: add comment for V=2 mode) +$ git merge kbuild-current/fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 1 + + 1 file changed, 1 insertion(+) +Merging arc-current/for-curr (3b00b042eeaa ARC: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ 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/kernel/setup.c | 2 +- + 7 files changed, 5 insertions(+), 11 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 (f1e4920fe330 Merge tag 'imx-fixes-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/intel,rcu-gw.yaml | 6 +- + MAINTAINERS | 2 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 4 +- + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 1 - + arch/arm/boot/dts/imx7-colibri.dtsi | 1 - + arch/arm/boot/dts/imx7d.dtsi | 6 +- + arch/arm/boot/dts/ls1021a.dtsi | 4 +- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 13 +- + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-imx/Makefile | 2 + + arch/arm/mach-imx/common.h | 4 +- + arch/arm/mach-imx/resume-imx6.S | 24 ++ + arch/arm/mach-imx/suspend-imx6.S | 14 -- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 5 - + drivers/firmware/imx/imx-scu.c | 27 +++ + drivers/firmware/imx/misc.c | 8 +- + drivers/firmware/imx/scu-pd.c | 2 +- + drivers/reset/Kconfig | 3 +- + drivers/soc/imx/soc-imx-scu.c | 2 +- + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/led_bl.c | 260 +++++++++++++++++++++ + 22 files changed, 356 insertions(+), 41 deletions(-) + create mode 100644 arch/arm/mach-imx/resume-imx6.S + create mode 100644 drivers/video/backlight/led_bl.c +Merging arm64-fixes/for-next/fixes (dcde237319e6 mm: Avoid creating virtual address aliases in brk()/mmap()/mremap()) +$ 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 (9eb425b2e04e powerpc/entry: Fix an #if which should be an #ifdef in entry_32.S) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (f8788d86ab28 Linux 5.6-rc3) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (11648b8339f8 sparc64: fix adjtimex regression) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (a8e41f6033a0 icmp: allow icmpv6_ndo_send to work with CONFIG_IPV6=n) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/phy.rst | 5 +- + drivers/net/ethernet/micrel/ks8851_mll.c | 14 +- + drivers/net/ethernet/xilinx/ll_temac.h | 4 + + drivers/net/ethernet/xilinx/ll_temac_main.c | 209 +++++++++++++++++++++++----- + drivers/net/hyperv/netvsc.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 3 + + drivers/net/phy/phy_device.c | 5 +- + drivers/net/usb/qmi_wwan.c | 3 + + drivers/vhost/net.c | 10 +- + include/linux/icmpv6.h | 16 ++- + net/bridge/br_device.c | 6 +- + net/core/devlink.c | 21 ++- + net/ipv4/cipso_ipv4.c | 7 +- + net/ipv4/tcp_input.c | 6 +- + net/mac80211/mlme.c | 6 +- + net/mac80211/rx.c | 2 +- + net/netlink/genetlink.c | 5 +- + net/wireless/nl80211.c | 5 +- + net/wireless/reg.c | 2 +- + 19 files changed, 243 insertions(+), 88 deletions(-) +Merging bpf/master (41f57cfde186 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (a1a7e3a36e01 xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/Kconfig | 1 + + net/ipv4/ip_vti.c | 38 ++++++++++++++++++++++++++++++-------- + net/ipv6/ip6_vti.c | 32 +++++++++++++++++++++++++------- + net/xfrm/xfrm_device.c | 1 + + net/xfrm/xfrm_user.c | 6 +++++- + 5 files changed, 62 insertions(+), 16 deletions(-) +Merging netfilter/master (d0820556507b selftests: nft_concat_range: Move option for 'list ruleset' before command) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + tools/testing/selftests/netfilter/nft_concat_range.sh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (a9149d243f25 iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging mac80211/master (3614d05b5e6b Merge tag 'mac80211-for-net-2020-02-24' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (6affca140cbe RDMA/rw: Fix error flow during RDMA context initialization) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 15 +++++++++++---- + drivers/infiniband/core/rw.c | 31 ++++++++++++++++++++----------- + drivers/infiniband/core/security.c | 2 +- + 3 files changed, 32 insertions(+), 16 deletions(-) +Merging sound-current/for-linus (c37c0ab02956 ALSA: hda/realtek - Fix a regression for mute led on Lenovo Carbon X1) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging sound-asoc-fixes/for-linus (51c8b77b5631 Merge branch 'asoc-5.6' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc.h | 2 +- + sound/soc/codecs/pcm512x.c | 8 +++++--- + sound/soc/codecs/tas2562.c | 3 ++- + sound/soc/intel/skylake/skl-debug.c | 32 +++++++++++++++++--------------- + sound/soc/intel/skylake/skl-ssp-clk.c | 4 +++- + sound/soc/meson/g12a-tohdmitx.c | 6 ++++++ + sound/soc/soc-compress.c | 2 +- + sound/soc/soc-pcm.c | 18 +++++++++--------- + sound/soc/soc-topology.c | 17 ++++++++++------- + 9 files changed, 54 insertions(+), 38 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 (a0d87fa6ec10 Merge branch 'regulator-5.6' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (491727eab556 Merge branch 'spi-5.6' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-omap2-mcspi.c | 103 ++++++++++++++++---------- + drivers/spi/spi-qup.c | 11 ++- + drivers/spi/spidev.c | 5 ++ + include/linux/platform_data/spi-omap2-mcspi.h | 1 + + 4 files changed, 77 insertions(+), 43 deletions(-) +Merging pci-current/for-linus (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (ae91c9256549 debugfs: remove return value of debugfs_create_regset32()) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + Documentation/filesystems/debugfs.txt | 6 +++--- + fs/debugfs/file.c | 17 ++++------------- + include/linux/debugfs.h | 13 ++++++------- + 3 files changed, 13 insertions(+), 23 deletions(-) +Merging tty.current/tty-linus (f8788d86ab28 Linux 5.6-rc3) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (f8788d86ab28 Linux 5.6-rc3) +$ git merge usb.current/usb-linus +Already up to date. +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 (f8788d86ab28 Linux 5.6-rc3) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (0ed41b33882c phy: brcm-sata: Correct MDIO operations for 40nm platforms) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/broadcom/phy-brcm-sata.c | 148 ++++++++++++---------------- + drivers/phy/motorola/phy-mapphone-mdm6600.c | 9 +- + drivers/phy/phy-core.c | 18 ++-- + drivers/phy/ti/phy-gmii-sel.c | 10 +- + 4 files changed, 84 insertions(+), 101 deletions(-) +Merging staging.current/staging-linus (f8788d86ab28 Linux 5.6-rc3) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (f8788d86ab28 Linux 5.6-rc3) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (da0f3e0201b8 MAINTAINERS: Sort entries in database for THUNDERBOLT) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (3dbae1553897 Input: cyapa - replace zero-length array with flexible-array member) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (c9cc0517bba9 crypto: chacha20poly1305 - prevent integer overflow on large input) +$ git merge crypto-current/master +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 (ef89d0545132 selftests/rseq: Fix out-of-tree compilation) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + .gitignore | 4 ++++ + tools/testing/selftests/ftrace/Makefile | 2 +- + tools/testing/selftests/livepatch/Makefile | 2 ++ + tools/testing/selftests/net/mptcp/Makefile | 2 ++ + tools/testing/selftests/rseq/Makefile | 4 +++- + tools/testing/selftests/rtc/Makefile | 2 ++ + 6 files changed, 14 insertions(+), 2 deletions(-) +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (25962e1a7f1d dmaengine: imx-sdma: Fix the event id check to include RX event for UART6) +$ git merge slave-dma-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/driver-api/dmaengine/client.rst | 14 +- + drivers/dma/coh901318.c | 4 - + drivers/dma/idxd/cdev.c | 4 +- + drivers/dma/idxd/sysfs.c | 27 +- + drivers/dma/imx-sdma.c | 5 +- + drivers/dma/tegra20-apb-dma.c | 6 +- + drivers/dma/ti/k3-udma.c | 493 +++++++++++++++++++------- + 7 files changed, 400 insertions(+), 153 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 (d171c45da874 media: hantro: Fix broken media controller links) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/mc/mc-entity.c | 4 +-- + drivers/media/platform/vicodec/codec-v4l2-fwht.c | 34 +++++++----------------- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 12 +++++---- + drivers/media/v4l2-core/v4l2-mem2mem.c | 4 +-- + drivers/staging/media/hantro/hantro_drv.c | 4 +-- + 5 files changed, 22 insertions(+), 36 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 (3234f4ed3066 MAINTAINERS: Hand MIPS over to Thomas) +$ 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 (e500ba0e71f0 Merge branch 'omap-for-v5.6/fixes-rc2' into fixes) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am437x-idk-evm.dts | 4 ++-- + arch/arm/boot/dts/dra7-evm.dts | 4 ++-- + arch/arm/boot/dts/dra7-l4.dtsi | 4 ++++ + arch/arm/boot/dts/dra7xx-clocks.dtsi | 12 ++---------- + 4 files changed, 10 insertions(+), 14 deletions(-) +Merging kvm-fixes/master (a93236fcbe1d KVM: s390: rstify new ioctls in api.rst) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (5ef8acbdd687 KVM: nVMX: Emulate MTF when performing instruction emulation) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (47555027eae2 hwmon: (pmbus/xdpe12284) Add callback for vout limits conversion) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/adm1177.rst | 3 +-- + drivers/hwmon/pmbus/xdpe12284.c | 55 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+), 2 deletions(-) +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 (5db834fa2a2b Merge branch 'misc-5.6' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +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 (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (a40df28c5640 docs: dt: fix several broken doc references) +$ git merge devicetree-fixes/dt/linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scmi.txt | 2 +- + Documentation/devicetree/bindings/arm/arm,scpi.txt | 2 +- + Documentation/devicetree/bindings/arm/bcm/brcm,bcm63138.txt | 2 +- + .../devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt | 2 +- + .../devicetree/bindings/arm/msm/qcom,idle-state.txt | 2 +- + Documentation/devicetree/bindings/arm/omap/mpu.txt | 2 +- + Documentation/devicetree/bindings/arm/psci.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-apq8064.yaml | 2 +- + Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt | 2 +- + Documentation/devicetree/bindings/leds/common.yaml | 2 +- + Documentation/devicetree/bindings/leds/register-bit-led.txt | 2 +- + .../devicetree/bindings/memory-controllers/ti/emif.txt | 2 +- + Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt | 2 +- + .../devicetree/bindings/mtd/cadence-nand-controller.txt | 2 +- + .../devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt | 2 +- + .../devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 2 +- + .../devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 2 +- + .../devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 2 +- + .../devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml | 2 +- + Documentation/devicetree/bindings/reset/st,stm32mp1-rcc.txt | 2 +- + Documentation/devicetree/bindings/sound/st,stm32-sai.txt | 2 +- + .../devicetree/bindings/sound/st,stm32-spdifrx.txt | 2 +- + Documentation/devicetree/bindings/spi/st,stm32-spi.yaml | 2 +- + .../devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml | 2 +- + MAINTAINERS | 13 ++++++------- + .../devicetree/bindings/net/wireless/siliabs,wfx.txt | 2 +- + 26 files changed, 31 insertions(+), 32 deletions(-) +Merging scsi-fixes/fixes (03264ddde245 scsi: compat_ioctl: cdrom: Replace .ioctl with .compat_ioctl in four appropriate places) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/block/paride/pcd.c | 2 +- + drivers/cdrom/gdrom.c | 2 +- + drivers/ide/ide-gd.c | 2 +- + drivers/s390/scsi/zfcp_fsf.h | 2 +- + drivers/s390/scsi/zfcp_sysfs.c | 2 +- + drivers/scsi/libfc/fc_disc.c | 2 ++ + drivers/scsi/sd_zbc.c | 7 ++++++- + drivers/scsi/sr.c | 2 +- + 8 files changed, 14 insertions(+), 7 deletions(-) +Merging drm-fixes/drm-fixes (97d9a4e9619a Merge tag 'drm-intel-fixes-2020-02-20' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (f8788d86ab28 Linux 5.6-rc3) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (9051db381fab mmc: sdhci-msm: Mark sdhci_msm_cqe_disable static) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci-msm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f8788d86ab28 Linux 5.6-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (af42d3466bdc Linux 5.4-rc8) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (8458ca147c20 riscv: adjust the indent) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (0bef168e8859 exit: Fix Sparse errors and warnings) +$ git merge pidfd-fixes/fixes +Auto-merging kernel/fork.c +Merge made by the 'recursive' strategy. + kernel/exit.c | 4 ++-- + kernel/fork.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2) +$ git merge erofs-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (eb9d8ddbc107 drm/panfrost: Don't try to map on error faults) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/panfrost/panfrost_mmu.c | 44 ++++++++++++++------------------- + drivers/gpu/drm/virtio/virtgpu_object.c | 4 +-- + 2 files changed, 21 insertions(+), 27 deletions(-) +$ git am -3 ../patches/0001-Revert-hwmon-pmbus-xdpe12284-Add-callback-for-vout-l.patch +Applying: Revert "hwmon: (pmbus/xdpe12284) Add callback for vout limits conversion" +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 (5693febe8be8 kbuild: remove wrong documentation about mandatory-y) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.rst | 3 --- + Makefile | 2 +- + lib/Kconfig.debug | 3 +-- + scripts/mkcompile_h | 11 ----------- + 4 files changed, 2 insertions(+), 17 deletions(-) +Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (75467ee48a5e dma-direct: improve DMA mask overflow reporting) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (c0cf33e910fe Merge branches 'fixes' and 'misc' 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 | 52 +++++++++++++++++++++++++++- + arch/arm/boot/compressed/vmlinux.lds.S | 1 - + arch/arm/kernel/unwind.c | 2 +- + 5 files changed, 109 insertions(+), 4 deletions(-) + create mode 100644 arch/arm/boot/compressed/fdt_get_mem_start.c +Merging arm64/for-next/core (e533dbe9dcb1 arm64: acpi: fix DAIF manipulation with pNMI) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (8703317ae576 drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (f6063ec6ce3c ARM: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (7ef59ea6bce0 Merge branch 'v5.7/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 40 ++++ + arch/arm/mach-meson/Kconfig | 1 - + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 6 + + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 + + drivers/firmware/meson/meson_sm.c | 2 + + drivers/soc/amlogic/Kconfig | 13 ++ + drivers/soc/amlogic/Makefile | 1 + + drivers/soc/amlogic/meson-secure-pwrc.c | 204 +++++++++++++++++++++ + include/dt-bindings/power/meson-a1-power.h | 32 ++++ + include/linux/firmware/meson/meson_sm.h | 2 + + 10 files changed, 301 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml + create mode 100644 drivers/soc/amlogic/meson-secure-pwrc.c + create mode 100644 include/dt-bindings/power/meson-a1-power.h +$ git am -3 ../patches/soc-amlogic-fix-compile-failure-with-MESON_SECURE_PM_DOMAINS-MESON_SM.patch +Applying: soc: amlogic: fix compile failure with MESON_SECURE_PM_DOMAINS & !MESON_SM +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/soc/amlogic/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 5bfc9b2bdc8d] Merge remote-tracking branch 'amlogic/for-next' + Date: Wed Feb 26 08:18:00 2020 +1100 +Merging aspeed/for-next (5a020d80bbef ARM: dts: aspeed: g4: add video engine support) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 74 ++++++++++ + .../boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 151 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 4 + + arch/arm/boot/dts/aspeed-g4.dtsi | 10 ++ + arch/arm/boot/dts/aspeed-g5.dtsi | 18 +++ + arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 25 ++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 79 +++++++++++ + 8 files changed, 362 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts +Merging at91/at91-next (1c8bb10f82fb Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi | 2 +- + arch/arm/boot/dts/at91-sam9x60ek.dts | 5 + + arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 2 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 2 +- + arch/arm/boot/dts/at91sam9x5dm.dtsi | 2 +- + arch/arm/boot/dts/sam9x60.dtsi | 8 ++ + arch/arm/configs/at91_dt_defconfig | 1 + + arch/arm/mach-at91/Kconfig | 1 - + arch/arm/mach-at91/pm.c | 35 ++++- + arch/arm/mach-at91/pm.h | 2 + + arch/arm/mach-at91/pm_data-offsets.c | 4 + + arch/arm/mach-at91/pm_suspend.S | 189 ++++++++++++++++++++++++-- + drivers/clk/at91/clk-sam9x60-pll.c | 91 +++++-------- + include/linux/clk/at91_pmc.h | 23 ++++ + 14 files changed, 288 insertions(+), 79 deletions(-) +Merging imx-mxs/for-next (48b4bfe7105f Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Removing Documentation/devicetree/bindings/clock/imx8mq-clock.txt +Removing Documentation/devicetree/bindings/clock/imx8mm-clock.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 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 ++ + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/imx25-pinfunc.h | 4 + + arch/arm/boot/dts/imx25.dtsi | 4 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 10 + + arch/arm/boot/dts/imx31.dtsi | 4 +- + arch/arm/boot/dts/imx35.dtsi | 4 +- + arch/arm/boot/dts/imx50.dtsi | 4 +- + arch/arm/boot/dts/imx51.dtsi | 4 +- + arch/arm/boot/dts/imx53.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 2 + + arch/arm/boot/dts/imx6dl.dtsi | 4 +- + arch/arm/boot/dts/imx6q-novena.dts | 2 +- + arch/arm/boot/dts/imx6q.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 31 + + arch/arm/boot/dts/imx6qdl.dtsi | 16 +- + arch/arm/boot/dts/imx6qp.dtsi | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 16 +- + arch/arm/boot/dts/imx6sll.dtsi | 4 +- + 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 | 8 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 28 +- + arch/arm/boot/dts/imx6sx.dtsi | 20 +- + arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 2 +- + arch/arm/boot/dts/imx6ul-pico.dtsi | 39 +- + arch/arm/boot/dts/imx6ul.dtsi | 18 +- + 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 | 26 +- + arch/arm/boot/dts/imx7ulp-evk.dts | 3 +- + arch/arm/boot/dts/vf500.dtsi | 4 +- + arch/arm/boot/dts/vf610-zii-cfu1.dts | 8 + + arch/arm/boot/dts/vf610-zii-dev.dtsi | 8 + + arch/arm/boot/dts/vf610-zii-spb4.dts | 8 + + arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 8 + + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 8 + + arch/arm/boot/dts/vfxxx.dtsi | 4 +- + arch/arm/configs/imx_v6_v7_defconfig | 3 + + arch/arm/mach-imx/Kconfig | 10 +- + arch/arm/mach-imx/anatop.c | 6 +- + arch/arm/mach-imx/gpc.c | 3 +- + arch/arm/mach-imx/mach-imx6q.c | 13 - + arch/arm/mach-imx/mach-imx6sl.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/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 | 1 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 162 ++++ + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 2 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 13 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 249 ++++++ + arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h | 931 +++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 616 ++++++++++++++ + 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 | 41 + + arch/arm64/boot/dts/freescale/s32v234.dtsi | 4 +- + arch/arm64/configs/defconfig | 2 + + 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-pll14xx.c | 4 + + 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 | 9 +- + drivers/soc/imx/gpcv2.c | 1 + + 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 | 1 - + 109 files changed, 4019 insertions(+), 604 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 +Merging keystone/next (a1766a49fc90 Merge tag 'drivers_soc_for_5.6' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (00862b8de3aa Merge branch 'v5.6-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + arch/arm/boot/dts/mt2701.dtsi | 2 +- + arch/arm/boot/dts/mt7623.dtsi | 2 +- + arch/arm/boot/dts/mt7629.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt6797.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 53 +++++++++ + drivers/soc/mediatek/mtk-cmdq-helper.c | 1 + + drivers/soc/mediatek/mtk-pmic-wrap.c | 128 +++++++++++++++++++++ + 11 files changed, 191 insertions(+), 7 deletions(-) +Merging mvebu/for-next (c0d03b53ef47 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (e500ba0e71f0 Merge branch 'omap-for-v5.6/fixes-rc2' into fixes) +$ git merge omap/for-next +Already up to date. +Merging qcom/for-next (bc50f20a31b1 Merge branches 'arm64-for-5.7', 'defconfig-for-5.7', 'drivers-for-5.7' and 'dts-for-5.7' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 71 ++++++++++++++++++++++ + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 25 ++++++++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 9 +++ + arch/arm/configs/qcom_defconfig | 4 ++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 8 +++ + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 7 ++- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 4 ++ + arch/arm64/configs/defconfig | 1 + + drivers/soc/qcom/qcom_aoss.c | 6 +- + drivers/soc/qcom/rpmh-internal.h | 1 + + drivers/soc/qcom/rpmh.c | 22 +++---- + include/soc/qcom/rpmh.h | 5 -- + 13 files changed, 144 insertions(+), 21 deletions(-) +Merging raspberrypi/for-next (ec3d259408ce ARM: bcm2835_defconfig: add support for Raspberry Pi4) +$ git merge raspberrypi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 73 +++++++++++++++++++++++++++++++++++ + arch/arm/configs/bcm2835_defconfig | 5 +++ + 2 files changed, 78 insertions(+) +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 (ddd8444ef822 Merge branch 'renesas-arm-dt-for-v5.7' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r7s72100-gr-peach.dts | 3 +++ + arch/arm/boot/dts/r7s72100.dtsi | 5 +++-- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 7 ++----- + arch/arm/boot/dts/r8a7743.dtsi | 5 +++-- + arch/arm/boot/dts/r8a7744.dtsi | 5 +++-- + arch/arm/boot/dts/r8a7745.dtsi | 3 ++- + arch/arm/boot/dts/r8a77470.dtsi | 5 +++-- + arch/arm/boot/dts/r8a7779.dtsi | 2 +- + 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 | 4 ---- + 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 +++++++++++++--- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 9 +++++++++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 16 +++++++++++++--- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 4 +++- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 7 ++++--- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 14 +++++++++++--- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 14 +++++++++++--- + arch/arm64/configs/defconfig | 23 ++++++++++++++++++++++- + drivers/soc/renesas/Kconfig | 18 ++++++++++-------- + drivers/soc/renesas/rcar-sysc.h | 4 ++-- + drivers/soc/renesas/renesas-soc.c | 2 +- + 41 files changed, 163 insertions(+), 77 deletions(-) +Merging reset/reset/next (4e0b9bc98c4a dt-bindings: reset: meson: add gxl internal dac reset) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + include/dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rockchip/for-next (152f9a049efc Merge branch 'v5.6-clk/fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-rockchip/rockchip.c | 2 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 43 +++++++++++-- + drivers/clk/rockchip/clk-pll.c | 70 +++++++++++++--------- + drivers/clk/rockchip/clk-rk3228.c | 17 ++---- + 6 files changed, 87 insertions(+), 53 deletions(-) +Merging samsung-krzk/for-next (0c09ac8e27a0 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 9 ++++ + arch/arm/boot/dts/exynos5250-arndale.dts | 10 ++-- + arch/arm/boot/dts/exynos5422-cpus.dtsi | 8 +++ + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 30 +++++++++++ + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 59 ++++++++++++++++++++++ + arch/arm/configs/exynos_defconfig | 5 +- + drivers/soc/samsung/exynos-chipid.c | 2 +- + 7 files changed, 118 insertions(+), 5 deletions(-) +Merging scmi/for-linux-next (6143a33281e2 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + 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 (ac970cb5c6d4 Merge branches 'sunxi/dt-for-5.7' and 'sunxi/fixes-for-5.6' 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 | 16 + + .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + + .../media/allwinner,sun8i-h3-deinterlace.yaml | 6 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 11 +- + arch/arm/boot/dts/Makefile | 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 | 2 - + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 8 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 6 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 28 ++ + arch/arm/mach-sunxi/sunxi.c | 2 +- + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 17 + + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 111 +++-- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 460 +++++++++++++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 22 + + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 21 + + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 9 + + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 19 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 55 +++ + drivers/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 +- + 29 files changed, 1125 insertions(+), 142 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-pinetab.dts +Merging tegra/for-next (56568eebf45e Merge branch for-5.7/arm64/dt into for-next) +$ git merge tegra/for-next +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 +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 | 23 +- + 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 | 63 ++++ + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 151 +++++++- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 34 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 22 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 25 +- + drivers/clk/tegra/clk-id.h | 5 +- + drivers/clk/tegra/clk-tegra-fixed.c | 37 +- + drivers/clk/tegra/clk-tegra-pmc.c | 12 +- + drivers/clk/tegra/clk-tegra114.c | 21 +- + drivers/clk/tegra/clk-tegra124.c | 10 +- + drivers/clk/tegra/clk-tegra210.c | 10 +- + drivers/clk/tegra/clk-tegra30.c | 10 +- + drivers/cpuidle/Kconfig.arm | 8 + + drivers/cpuidle/Makefile | 1 + + drivers/cpuidle/cpuidle-tegra.c | 389 +++++++++++++++++++++ + drivers/firmware/tegra/Kconfig | 2 +- + 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 ++ + 65 files changed, 1725 insertions(+), 1156 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 + 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 (931cfff0458a Merge branch 'clk-socfpga' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + drivers/clk/at91/Makefile | 3 + + drivers/clk/at91/at91sam9g45.c | 220 +++++++++++++++++++ + drivers/clk/at91/at91sam9n12.c | 238 ++++++++++++++++++++ + drivers/clk/at91/clk-usb.c | 9 +- + drivers/clk/at91/sam9x60.c | 14 +- + drivers/clk/at91/sama5d3.c | 240 +++++++++++++++++++++ + drivers/clk/clk-si5341.c | 212 ++++++++++++++++-- + drivers/clk/clk.c | 127 ++++++----- + drivers/clk/qcom/clk-alpha-pll.c | 17 +- + drivers/clk/qcom/clk-rpmh.c | 25 ++- + drivers/clk/qcom/dispcc-sc7180.c | 19 -- + drivers/clk/qcom/gpucc-sc7180.c | 37 ++++ + drivers/clk/qcom/videocc-sc7180.c | 2 +- + drivers/clk/samsung/clk.c | 4 - + drivers/clk/socfpga/clk-gate-s10.c | 40 ++-- + drivers/clk/socfpga/clk-periph-s10.c | 42 ++-- + drivers/clk/socfpga/clk-pll-s10.c | 17 +- + drivers/clk/socfpga/clk-s10.c | 29 +-- + drivers/clk/socfpga/stratix10-clk.h | 25 +-- + include/dt-bindings/clock/qcom,gpucc-sc7180.h | 3 +- + include/dt-bindings/clock/qcom,rpmh.h | 4 +- + include/linux/of_clk.h | 8 +- + 23 files changed, 1125 insertions(+), 211 deletions(-) + create mode 100644 drivers/clk/at91/at91sam9g45.c + create mode 100644 drivers/clk/at91/at91sam9n12.c + create mode 100644 drivers/clk/at91/sama5d3.c +Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (f8788d86ab28 Linux 5.6-rc3) +$ git merge csky/linux-next +Already up to date. +Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (240b62d381fe ia64: remove stale paravirt leftovers) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (dff527e7a0a8 m68k: Switch to asm-generic/hardirq.h) +$ git merge m68k/for-next +Removing arch/m68k/include/asm/hardirq.h +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.bus | 2 +- + arch/m68k/Kconfig.debug | 16 +-- + arch/m68k/Kconfig.machine | 8 +- + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/asm/hardirq.h | 29 ---- + arch/m68k/include/asm/mcf_pgalloc.h | 31 ++--- + arch/m68k/include/asm/motorola_pgalloc.h | 74 ++++------ + arch/m68k/include/asm/motorola_pgtable.h | 36 +++-- + arch/m68k/include/asm/page.h | 16 ++- + arch/m68k/include/asm/pgtable_mm.h | 10 +- + arch/m68k/mm/init.c | 34 +++-- + arch/m68k/mm/kmap.c | 36 +++-- + arch/m68k/mm/memory.c | 103 -------------- + arch/m68k/mm/motorola.c | 228 +++++++++++++++++++++++++------ + drivers/dio/dio-driver.c | 9 +- + drivers/video/fbdev/c2p_core.h | 12 +- + drivers/zorro/zorro-driver.c | 16 +-- + drivers/zorro/zorro.h | 7 + + include/linux/dio.h | 5 - + include/linux/zorro.h | 12 -- + 20 files changed, 338 insertions(+), 347 deletions(-) + delete mode 100644 arch/m68k/include/asm/hardirq.h +Merging m68knommu/for-next (f8788d86ab28 Linux 5.6-rc3) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (519fa60b6007 microblaze: Use asm generic cmpxchg.h for !SMP case) +$ 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/vmlinux.lds.S | 3 ++ + arch/microblaze/mm/init.c | 2 ++ + 50 files changed, 65 insertions(+), 216 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 (91f40e896444 mips/jazz: Update jazz_defconfig for MIPS Magnum) +$ git merge mips/mips-next +Merge made by the 'recursive' strategy. + arch/mips/ath79/setup.c | 2 +- + arch/mips/bmips/setup.c | 2 +- + 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/generic/init.c | 2 +- + arch/mips/jz4740/time.c | 2 +- + arch/mips/pic32/pic32mzda/time.c | 2 +- + arch/mips/pistachio/time.c | 2 +- + arch/mips/ralink/timer-gic.c | 2 +- + drivers/video/fbdev/g364fb.c | 29 +-- + 25 files changed, 26 insertions(+), 311 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 (fc74d7166005 openrisc: use mmgrab) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + Documentation/openrisc/openrisc_port.rst | 4 ++-- + arch/openrisc/configs/or1ksim_defconfig | 1 - + arch/openrisc/configs/simple_smp_defconfig | 1 - + arch/openrisc/kernel/smp.c | 3 ++- + 4 files changed, 4 insertions(+), 5 deletions(-) +Merging parisc-hd/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (71c3a888cbca Merge tag 'powerpc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (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 (704dd3cad2e6 RISC-V: Stop putting .sbss in .sdata) +$ git merge risc-v/for-next +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/kernel/setup.c | 8 ++++++-- + arch/riscv/kernel/vmlinux.lds.S | 1 - + 5 files changed, 9 insertions(+), 4 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 (b059a39cfa27 s390/arch: install kernels with their proper version ID) +$ git merge s390/features +Auto-merging drivers/s390/cio/qdio_setup.c +Merge made by the 'recursive' strategy. + arch/s390/boot/install.sh | 17 ++++++--------- + arch/s390/kernel/perf_cpum_sf.c | 40 +++++++++++++++++++----------------- + drivers/s390/cio/qdio.h | 2 +- + drivers/s390/cio/qdio_main.c | 13 +++++------- + drivers/s390/cio/qdio_setup.c | 20 +++++++++--------- + drivers/s390/crypto/zcrypt_ccamisc.c | 25 +++++++++++----------- + 6 files changed, 56 insertions(+), 61 deletions(-) +Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay) +$ git merge sh/sh-next +Merge made by the 'recursive' strategy. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/kernel/Makefile | 2 -- + arch/sh/kernel/sh_ksyms_32.c | 17 +++++++++++++++++ + arch/sh/lib/delay.c | 1 + + 5 files changed, 22 insertions(+), 8 deletions(-) +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (d65197ad5249 um: Fix time-travel=inf-cpu with xor/raid6) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (362961f4063f Merge branch 'xtensa-5.6-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (edc440e3d27f fscrypt: improve format of no-key names) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret') +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (4948f16553e6 Merge branch 'for-next-next-v5.6-20200224' into for-next-20200224) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.c | 173 +++++--- + fs/btrfs/block-group.c | 85 ++-- + fs/btrfs/block-rsv.c | 92 ++++ + fs/btrfs/btrfs_inode.h | 6 + + fs/btrfs/check-integrity.c | 200 ++------- + fs/btrfs/check-integrity.h | 2 - + fs/btrfs/ctree.c | 63 +-- + fs/btrfs/ctree.h | 52 ++- + fs/btrfs/delalloc-space.c | 102 +++++ + fs/btrfs/delayed-inode.c | 5 +- + fs/btrfs/dev-replace.c | 44 +- + fs/btrfs/disk-io.c | 798 +++++++++++++++++++---------------- + 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 | 90 ++-- + fs/btrfs/extent_io.c | 168 +++++--- + fs/btrfs/extent_io.h | 11 +- + fs/btrfs/file-item.c | 91 ++++ + fs/btrfs/file.c | 44 +- + fs/btrfs/free-space-cache.c | 49 ++- + fs/btrfs/free-space-cache.h | 1 + + fs/btrfs/free-space-tree.c | 4 +- + fs/btrfs/inode.c | 97 ++++- + fs/btrfs/ioctl.c | 948 +++++++----------------------------------- + fs/btrfs/locking.c | 42 ++ + fs/btrfs/ordered-data.c | 140 +------ + fs/btrfs/ordered-data.h | 10 +- + fs/btrfs/qgroup.c | 28 +- + fs/btrfs/raid56.c | 37 +- + fs/btrfs/reflink.c | 783 ++++++++++++++++++++++++++++++++++ + fs/btrfs/relocation.c | 159 +++++-- + fs/btrfs/root-tree.c | 37 +- + fs/btrfs/scrub.c | 5 +- + fs/btrfs/send.c | 35 +- + fs/btrfs/space-info.c | 147 +++++++ + fs/btrfs/super.c | 33 +- + 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 | 39 +- + fs/btrfs/transaction.h | 13 + + fs/btrfs/tree-log.c | 107 ++--- + fs/btrfs/uuid-tree.c | 57 ++- + fs/btrfs/volumes.c | 224 ++++------ + fs/btrfs/volumes.h | 6 +- + include/trace/events/btrfs.h | 6 +- + include/uapi/linux/btrfs.h | 28 +- + 51 files changed, 2953 insertions(+), 2254 deletions(-) + create mode 100644 fs/btrfs/reflink.c +Merging ceph/master (3b20bc2fe4c0 ceph: noacl mount option is effectively ignored) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (b7493db932a4 smb3: fix performance regression with setting mtime) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_dfs_ref.c | 2 + + fs/cifs/cifsfs.c | 2 + + fs/cifs/cifsglob.h | 7 +++ + fs/cifs/cifspdu.h | 1 + + fs/cifs/cifsproto.h | 10 ++- + fs/cifs/cifssmb.c | 25 +++++--- + fs/cifs/connect.c | 70 +++++---------------- + fs/cifs/dfs_cache.c | 38 +++++++++++ + fs/cifs/dfs_cache.h | 4 ++ + fs/cifs/file.c | 19 +++--- + fs/cifs/inode.c | 61 +++++++++++------- + fs/cifs/misc.c | 80 ++++++++++++++++++++++++ + fs/cifs/readdir.c | 82 ++++++++++++++++++++++++ + fs/cifs/smb1ops.c | 2 +- + fs/cifs/smb2inode.c | 4 +- + fs/cifs/smb2ops.c | 6 +- + fs/cifs/smb2pdu.c | 166 ++++++++++++++++++++++++++++++++++++++++++++----- + fs/cifs/smb2pdu.h | 53 +++++++++++++++- + fs/cifs/smb2proto.h | 2 + + 19 files changed, 513 insertions(+), 121 deletions(-) +Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (2c2a7552dd64 ecryptfs: replace BUG_ON with error handling code) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge erofs/dev +Already up to date. +Merging ext3/for_next (daf1cd925487 Pull macro cleanup patches.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (9db176bceb5c ext4: fix mount failure with quota configured as module) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (b19e8c684703 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (da3a3da4e6c6 fs-verity: use u64_to_user_ptr()) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (3e8cb8b2eaeb fuse: fix stack use after return) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 6 +++--- + fs/fuse/fuse_i.h | 2 ++ + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging jfs/jfs-next (802a5017ffb2 jfs: remove unused MAXL2PAGES) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (63623fd44972 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (5d63944f8206 NFSv4: Ensure the delegation cred is pinned when we call delegreturn) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (3d96208c30f8 sunrpc: expiry_time should be seconds not timeval) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (9f198a2ac543 help_next should increase position index) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (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 (cdbcf82b86ea xfs: fix xfs_buf_ioerror_alert location reporting) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (243145bc4336 fs: Fix page_mkwrite off-by-one errors) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (3253d9d09337 splice: only read in as much information as there is pipe buffer space) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (98ca480a8f22 locks: print unsigned ino in /proc/locks) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (0fd169576648 fs: Add VirtualBox guest shared folder (vboxsf) support) +$ git merge vfs/for-next +Already up to date. +Merging printk/for-next (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 (daf98fffe4dc Merge branch 'pci/misc') +$ git merge pci/next +Merge made by the 'recursive' strategy. + drivers/pci/hotplug/pciehp.h | 1 + + drivers/pci/hotplug/pciehp_hpc.c | 53 ++++++++++++++++++++++++++++++++++++++-- + drivers/pci/pci-acpi.c | 2 +- + include/uapi/linux/pci_regs.h | 2 ++ + 4 files changed, 55 insertions(+), 3 deletions(-) +Merging pstore/for-next/pstore (e163fdb3f7f8 pstore/ram: Regularize prz label allocation lifetime) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (530c6c3b37e2 Merge branch 'for-5.6/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-alps.c | 2 +- + drivers/hid/hid-apple.c | 3 ++- + drivers/hid/hid-bigbenff.c | 31 +++++++++++++++++------ + drivers/hid/hid-core.c | 4 ++- + drivers/hid/hid-ite.c | 5 ++-- + drivers/hid/hid-logitech-dj.c | 2 ++ + drivers/hid/hid-logitech-hidpp.c | 43 ++++++++++++++++---------------- + drivers/hid/hid-quirks.c | 3 --- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++++++ + drivers/hid/usbhid/hiddev.c | 2 +- + include/linux/hid.h | 2 +- + 11 files changed, 66 insertions(+), 39 deletions(-) +Merging i2c/i2c/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (de8964995c79 i3c: master: no need to iterate master device twice) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dmi/master (6eaaa9e89719 firmware/dmi: Report DMI Bios & EC firmware release) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 6 ++++++ + drivers/firmware/dmi_scan.c | 30 ++++++++++++++++++++++++++++++ + include/linux/mod_devicetable.h | 2 ++ + scripts/mod/file2alias.c | 2 ++ + 4 files changed, 40 insertions(+) +Merging hwmon-staging/hwmon-next (75ce99ed1ec8 hwmon: (lm73) Add support for of_match_table) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/hwmon/adi,axi-fan-control.yaml | 62 +++ + .../devicetree/bindings/hwmon/ltc2978.txt | 22 +- + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/k10temp.rst | 29 +- + Documentation/hwmon/ltc2978.rst | 198 ++++++--- + Documentation/hwmon/pmbus-core.rst | 22 +- + Documentation/hwmon/pmbus.rst | 8 +- + Documentation/hwmon/tps53679.rst | 178 ++++++++ + MAINTAINERS | 8 + + drivers/hwmon/Kconfig | 9 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/axi-fan-control.c | 469 +++++++++++++++++++++ + drivers/hwmon/ibmaem.c | 2 +- + drivers/hwmon/k10temp.c | 60 +-- + drivers/hwmon/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 | 55 +++ + drivers/hwmon/pmbus/zl6100.c | 5 +- + 36 files changed, 1531 insertions(+), 267 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml + create mode 100644 Documentation/hwmon/tps53679.rst + create mode 100644 drivers/hwmon/axi-fan-control.c +Merging jc_docs/docs-next (ef45e78fdc11 docs: kref: Clarify the use of two kref_put() in example code) +$ git merge jc_docs/docs-next +Removing Documentation/filesystems/nfs/nfs41-server.txt +Removing Documentation/debugging-modules.txt +Merge made by the 'recursive' strategy. + .../ABI/{testing => removed}/sysfs-kernel-uids | 2 +- + Documentation/Makefile | 2 +- + Documentation/admin-guide/blockdev/zram.rst | 2 - + Documentation/admin-guide/bootconfig.rst | 2 +- + Documentation/{driver-api => admin-guide}/edid.rst | 4 +- + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/admin-guide/sysctl/kernel.rst | 1037 ++++++++++---------- + Documentation/arm/tcm.rst | 6 +- + Documentation/core-api/gcc-plugins.rst | 4 + + Documentation/debugging-modules.txt | 22 - + Documentation/driver-api/index.rst | 1 - + .../features/vm/pte_special/arch-support.txt | 2 +- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/nfs/index.rst | 13 + + .../nfs/{knfsd-stats.txt => knfsd-stats.rst} | 17 +- + Documentation/filesystems/nfs/nfs41-server.rst | 256 +++++ + Documentation/filesystems/nfs/nfs41-server.txt | 173 ---- + .../filesystems/nfs/{pnfs.txt => pnfs.rst} | 25 +- + .../nfs/{rpc-cache.txt => rpc-cache.rst} | 136 +-- + .../nfs/{rpc-server-gss.txt => rpc-server-gss.rst} | 19 +- + Documentation/gpu/i915.rst | 4 +- + Documentation/kref.txt | 4 + + Documentation/process/2.Process.rst | 108 +- + Documentation/process/coding-style.rst | 18 +- + Documentation/process/email-clients.rst | 4 +- + Documentation/process/howto.rst | 17 +- + Documentation/sphinx/parallel-wrapper.sh | 2 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + Documentation/x86/index.rst | 1 - + scripts/check-sysctl-docs | 181 ++++ + scripts/documentation-file-ref-check | 11 +- + {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 + 41 files changed, 1204 insertions(+), 876 deletions(-) + rename Documentation/ABI/{testing => removed}/sysfs-kernel-uids (91%) + rename Documentation/{driver-api => admin-guide}/edid.rst (98%) + delete mode 100644 Documentation/debugging-modules.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%) + 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 (ef0ed05dcef8 media: staging/imx: Missing assignment in imx_media_capture_device_register()) +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/aspeed-video.txt | 5 +- + .../devicetree/bindings/media/rockchip-rga.txt | 5 +- + 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 +- + .../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 +- + .../zh_CN/video4linux/v4l2-framework.txt | 4 +- + MAINTAINERS | 1 + + drivers/media/Kconfig | 6 +- + drivers/media/common/saa7146/saa7146_fops.c | 12 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 4 +- + drivers/media/i2c/adv7180.c | 12 ++ + 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 | 74 +++---- + drivers/media/platform/am437x/am437x-vpfe.c | 2 +- + drivers/media/platform/aspeed-video.c | 77 ++++--- + 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 +- + drivers/media/platform/mx2_emmaprp.c | 2 +- + drivers/media/platform/omap/omap_vout.c | 2 +- + drivers/media/platform/omap3isp/ispvideo.c | 4 +- + drivers/media/platform/pxa_camera.c | 22 +- + drivers/media/platform/qcom/camss/camss-video.c | 2 +- + drivers/media/platform/qcom/venus/vdec.c | 2 +- + drivers/media/platform/qcom/venus/venc.c | 2 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 91 +++++++-- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 28 ++- + drivers/media/platform/rcar-vin/rcar-vin.h | 28 ++- + drivers/media/platform/rcar_drif.c | 6 +- + 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 +- + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 2 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 4 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 7 +- + drivers/media/platform/ti-vpe/cal.c | 2 +- + drivers/media/platform/ti-vpe/vpe.c | 2 +- + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/vicodec/vicodec-core.c | 2 +- + drivers/media/platform/vim2m.c | 2 +- + drivers/media/platform/vimc/vimc-capture.c | 2 +- + 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_video.c | 4 +- + drivers/media/platform/xilinx/xilinx-dma.c | 15 +- + drivers/media/radio/si470x/Kconfig | 4 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-videostrong-kii-pro.c | 83 ++++++++ + 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/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-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/usbvision/usbvision-video.c | 2 +- + drivers/media/usb/uvc/uvc_driver.c | 2 +- + drivers/media/usb/zr364xx/zr364xx.c | 2 +- + drivers/media/v4l2-core/v4l2-dev.c | 10 +- + drivers/media/v4l2-core/v4l2-i2c.c | 10 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- + 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 | 4 +- + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 2 +- + drivers/staging/media/meson/vdec/vdec.c | 2 +- + drivers/staging/media/omap4iss/iss_video.c | 4 +- + drivers/staging/media/rkisp1/rkisp1-capture.c | 2 +- + 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/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/rc-map.h | 1 + + include/media/v4l2-dev.h | 4 +- + include/uapi/linux/v4l2-controls.h | 6 + + samples/v4l/v4l2-pci-skeleton.c | 2 +- + 181 files changed, 1177 insertions(+), 709 deletions(-) + create mode 100644 drivers/media/rc/keymaps/rc-videostrong-kii-pro.c + create mode 100644 include/linux/atmel-isc-media.h +Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (49d2c63e171c Merge branch 'pm-qos' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/media/platform/via-camera.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../admin-guide/acpi/fan_performance_states.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 4 + + Documentation/admin-guide/pm/cpuidle.rst | 73 ++- + Documentation/power/index.rst | 1 - + Documentation/power/pm_qos_interface.rst | 88 ++-- + Documentation/trace/events-power.rst | 21 +- + arch/x86/platform/intel/iosf_mbi.c | 13 +- + drivers/acpi/Kconfig | 24 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_watchdog.c | 15 +- + drivers/acpi/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/button.c | 3 - + drivers/acpi/tiny-power-button.c | 46 ++ + drivers/cpuidle/cpuidle.c | 40 +- + drivers/cpuidle/governor.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 4 +- + drivers/gpu/drm/i915/i915_drv.c | 12 +- + drivers/gpu/drm/i915/intel_sideband.c | 5 +- + drivers/hsi/clients/cmt_speech.c | 9 +- + drivers/media/pci/saa7134/saa7134-video.c | 5 +- + drivers/media/platform/via-camera.c | 4 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 14 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 13 +- + drivers/net/wireless/ath/ath10k/core.c | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 10 +- + drivers/spi/spi-fsl-qspi.c | 4 +- + drivers/tty/serial/8250/8250_omap.c | 13 +- + drivers/tty/serial/omap-serial.c | 15 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 12 +- + drivers/watchdog/wdat_wdt.c | 25 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actypes.h | 3 +- + include/acpi/button.h | 4 + + include/linux/pm_qos.h | 81 +-- + include/trace/events/power.h | 59 +-- + kernel/power/qos.c | 557 ++++++--------------- + kernel/power/snapshot.c | 2 +- + 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 +- + 51 files changed, 555 insertions(+), 745 deletions(-) + create mode 100644 drivers/acpi/tiny-power-button.c +Merging cpufreq-arm/cpufreq/arm/linux-next (a30f8a91f3c2 cpufreq: imx-cpufreq-dt: Add "cpu-supply" property check) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/imx-cpufreq-dt.c | 3 +++ + drivers/cpufreq/imx6q-cpufreq.c | 3 +++ + drivers/cpufreq/ti-cpufreq.c | 7 +++++++ + 3 files changed, 13 insertions(+) +Merging cpupower/cpupower (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge thermal/thermal/linux-next +Already up to date. +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 (6ccad8483b28 RDMA/bnxt_re: use ibdev based message printing functions) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/core/cma.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 | 12 +- + 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 | 923 ++++++++++++++--------- + drivers/infiniband/hw/bnxt_re/main.c | 264 ++++--- + 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 | 467 +++++++----- + 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/t4fw_ri_api.h | 8 +- + 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 | 38 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 9 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 598 ++++----------- + drivers/infiniband/hw/hns/hns_roce_qp.c | 63 +- + 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/mthca/mthca_memfree.c | 2 +- + drivers/infiniband/hw/mthca/mthca_memfree.h | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.h | 2 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 7 +- + drivers/infiniband/sw/rxe/rxe_queue.h | 2 +- + drivers/infiniband/sw/siw/siw_verbs.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 4 +- + 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 +- + 50 files changed, 2157 insertions(+), 1814 deletions(-) +Merging net-next/master (f13e4415d271 Merge branch 'mlxsw-Implement-ACL-dropped-packets-identification') +$ git merge net-next/master +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/core/devlink.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Removing drivers/net/ethernet/aquantia/atlantic/ver.h +Merge made by the 'recursive' strategy. + Documentation/bpf/bpf_devel_QA.rst | 29 +- + .../devicetree/bindings/net/dsa/ocelot.txt | 116 ++ + .../devicetree/bindings/ptp/ptp-idt82p33.yaml | 45 + + Documentation/networking/bareudp.rst | 52 + + Documentation/networking/devlink/devlink-trap.rst | 9 + + Documentation/networking/index.rst | 1 + + Documentation/networking/page_pool.rst | 159 +++ + drivers/net/Kconfig | 13 + + drivers/net/Makefile | 1 + + drivers/net/bareudp.c | 806 +++++++++++ + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/bonding/bonding_priv.h | 5 +- + drivers/net/dsa/bcm_sf2.c | 3 + + drivers/net/dsa/bcm_sf2_regs.h | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 32 +- + drivers/net/dsa/mv88e6xxx/chip.h | 5 + + drivers/net/dsa/mv88e6xxx/serdes.c | 77 + + drivers/net/dsa/mv88e6xxx/serdes.h | 5 + + drivers/net/dsa/ocelot/felix.c | 3 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 3 +- + 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 | 5 - + drivers/net/ethernet/amazon/ena/ena_netdev.c | 17 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 11 - + 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 | 1 - + 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 | 1 - + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 1 - + 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/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/genet/bcmgenet.c | 62 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 81 +- + drivers/net/ethernet/brocade/bna/bnad.c | 7 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h | 2 +- + drivers/net/ethernet/chelsio/cxgb3/t3_cpl.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_debugfs.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 2 +- + .../ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sched.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/smt.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 2 +- + drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h | 4 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 3 +- + drivers/net/ethernet/freescale/enetc/Kconfig | 6 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 2 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 2 +- + drivers/net/ethernet/freescale/fec.h | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 63 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 5 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 1 + + drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 2 + + 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/i40e/i40e.h | 4 +- + drivers/net/ethernet/intel/ice/ice.h | 4 + + 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 | 6 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 67 +- + 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 | 15 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 65 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 5 + + drivers/net/ethernet/intel/ice/ice_lib.c | 98 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 6 +- + drivers/net/ethernet/intel/ice/ice_main.c | 184 ++- + 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 | 4 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 5 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 393 +++-- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 30 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 36 +- + drivers/net/ethernet/intel/igb/igb.h | 2 +- + 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 | 61 + + 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/jme.c | 7 +- + drivers/net/ethernet/marvell/mvneta.c | 276 ++-- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 18 - + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 2 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 55 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 131 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.c | 286 ++++ + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.h | 58 + + .../net/ethernet/mellanox/mlx5/core/en/health.c | 107 +- + .../net/ethernet/mellanox/mlx5/core/en/health.h | 8 +- + 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 ++- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 1 - + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 71 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 40 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 + + 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/mlxsw/core.c | 117 +- + 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 | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 25 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 46 +- + .../net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 54 +- + .../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 | 22 +- + .../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_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 | 228 ++- + .../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/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/cmsg.h | 4 +- + drivers/net/ethernet/netronome/nfp/nfp_main.h | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_debugdump.c | 8 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.h | 2 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 5 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 7 +- + drivers/net/ethernet/realtek/r8169_main.c | 242 ++-- + 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/tx.c | 3 +- + drivers/net/ethernet/socionext/netsec.c | 29 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 35 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 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/hyperv/netvsc_drv.c | 5 +- + drivers/net/netdevsim/dev.c | 117 +- + drivers/net/netdevsim/netdevsim.h | 2 + + drivers/net/phy/Kconfig | 4 +- + drivers/net/phy/Makefile | 3 +- + drivers/net/phy/broadcom.c | 24 +- + drivers/net/phy/dp83867.c | 150 ++ + drivers/net/phy/linkmode.c | 95 ++ + drivers/net/phy/mdio_bus.c | 17 + + 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 | 162 ++- + drivers/net/tun.c | 2 - + drivers/net/usb/cdc-phonet.c | 2 +- + drivers/net/usb/r8152.c | 26 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 5 +- + drivers/net/wireless/ath/ath10k/mac.c | 3 +- + drivers/net/wireless/ath/ath9k/main.c | 3 + + drivers/net/wireless/ath/ath9k/xmit.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 12 +- + drivers/ptp/Kconfig | 12 + + drivers/ptp/Makefile | 1 + + drivers/ptp/ptp_idt82p33.c | 1008 +++++++++++++ + drivers/ptp/ptp_idt82p33.h | 171 +++ + drivers/ptp/ptp_qoriq.c | 29 +- + include/linux/fsl/ptp_qoriq.h | 2 - + include/linux/ieee80211.h | 26 +- + include/linux/linkmode.h | 8 +- + include/linux/mlx5/driver.h | 1 + + include/linux/phy.h | 4 + + include/linux/phylink.h | 34 +- + include/linux/skmsg.h | 20 +- + include/net/bareudp.h | 20 + + include/net/cfg80211.h | 179 ++- + include/net/devlink.h | 22 +- + include/net/drop_monitor.h | 3 + + include/net/flow_offload.h | 11 + + include/net/ip6_checksum.h | 9 + + include/net/ipv6.h | 6 + + include/net/mac80211.h | 50 +- + include/net/page_pool.h | 36 +- + include/net/pkt_cls.h | 2 +- + include/net/route.h | 6 + + include/net/sock.h | 37 +- + include/net/sock_reuseport.h | 2 - + include/net/tc_act/tc_ct.h | 6 +- + include/net/tc_act/tc_police.h | 6 +- + include/net/tc_act/tc_tunnel_key.h | 2 +- + include/net/tcp.h | 7 + + include/uapi/linux/bpf.h | 25 +- + include/uapi/linux/devlink.h | 2 + + include/uapi/linux/ethtool.h | 4 +- + include/uapi/linux/if_link.h | 12 + + include/uapi/linux/net_dropmon.h | 1 + + include/uapi/linux/nl80211.h | 168 +++ + include/uapi/linux/openvswitch.h | 7 + + include/uapi/linux/tcp.h | 2 + + include/uapi/linux/wireless.h | 5 +- + kernel/bpf/reuseport_array.c | 5 - + kernel/bpf/verifier.c | 10 +- + kernel/trace/bpf_trace.c | 45 +- + lib/objagg.c | 4 +- + net/802/psnap.c | 2 +- + net/8021q/vlan_core.c | 5 +- + net/core/dev.c | 1 - + net/core/devlink.c | 111 +- + net/core/drop_monitor.c | 33 +- + net/core/filter.c | 28 +- + net/core/flow_offload.c | 21 + + net/core/neighbour.c | 3 - + net/core/page_pool.c | 70 +- + net/core/rtnetlink.c | 18 +- + net/core/skmsg.c | 2 +- + net/core/sock.c | 14 +- + net/core/sock_map.c | 169 ++- + net/core/sock_reuseport.c | 50 +- + net/core/xdp.c | 2 +- + net/dccp/minisocks.c | 1 + + net/ethtool/common.c | 1 + + net/ethtool/linkmodes.c | 1 + + net/ipv4/fib_trie.c | 5 - + net/ipv4/igmp.c | 2 - + net/ipv4/route.c | 48 + + net/ipv4/sysctl_net_ipv4.c | 24 +- + net/ipv4/tcp.c | 21 +- + net/ipv4/tcp_bpf.c | 18 +- + net/ipv4/tcp_ipv4.c | 6 +- + net/ipv4/tcp_minisocks.c | 2 + + net/ipv4/tcp_ulp.c | 6 +- + net/ipv6/ip6_output.c | 70 + + net/ipv6/ip6mr.c | 3 +- + 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/netlink/af_netlink.c | 2 +- + 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 | 751 ++++++++++ + net/qrtr/qrtr.c | 51 +- + net/qrtr/qrtr.h | 4 + + net/sched/act_sample.c | 2 - + net/sched/cls_api.c | 56 +- + net/sched/cls_flower.c | 6 +- + net/sched/cls_matchall.c | 4 +- + net/sctp/input.c | 1 + + net/sctp/socket.c | 4 +- + net/smc/smc_clc.c | 2 +- + net/smc/smc_core.c | 26 +- + net/smc/smc_core.h | 8 +- + net/smc/smc_ib.c | 44 +- + net/smc/smc_llc.c | 2 +- + net/smc/smc_tx.c | 2 +- + net/switchdev/switchdev.c | 2 +- + net/tls/tls_main.c | 3 +- + net/unix/af_unix.c | 1 + + 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 +- + 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/bpf/Makefile | 4 +- + .../selftests/bpf/prog_tests/perf_branches.c | 170 +++ + .../selftests/bpf/prog_tests/select_reuseport.c | 63 +- + .../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_maps.c | 6 +- + .../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 | 44 +- + .../drivers/net/mlxsw/devlink_trap_tunnel_vxlan.sh | 4 +- + .../testing/selftests/drivers/net/mlxsw/extack.sh | 45 +- + .../drivers/net/mlxsw/tc_flower_restrictions.sh | 100 ++ + tools/testing/selftests/drivers/net/mlxsw/vxlan.sh | 27 +- + .../drivers/net/netdevsim/devlink_trap.sh | 5 + + .../selftests/net/forwarding/devlink_lib.sh | 7 +- + .../tc-testing/tc-tests/filters/basic.json | 682 +++++++++ + tools/testing/vsock/vsock_test.c | 77 + + 401 files changed, 14839 insertions(+), 3341 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/ocelot.txt + 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/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/phy/linkmode.c + create mode 100644 drivers/ptp/ptp_idt82p33.c + create mode 100644 drivers/ptp/ptp_idt82p33.h + create mode 100644 include/net/bareudp.h + 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 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap_acl_drops.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/tc_flower_restrictions.sh +Merging bpf-next/master (503d539a6e41 virtio_net: Add XDP meta data support) +$ git merge bpf-next/master +Merge made by the 'recursive' strategy. + drivers/net/virtio_net.c | 56 ++++--- + include/linux/bpf.h | 38 ++++- + include/linux/filter.h | 37 ++++- + include/linux/kernel.h | 7 + + include/linux/preempt.h | 30 ++++ + kernel/bpf/hashtab.c | 172 +++++++++++++++------ + kernel/bpf/lpm_trie.c | 12 +- + kernel/bpf/percpu_freelist.c | 20 +-- + kernel/bpf/stackmap.c | 18 ++- + kernel/bpf/syscall.c | 27 +--- + kernel/bpf/trampoline.c | 9 +- + kernel/bpf/verifier.c | 40 +++-- + kernel/events/core.c | 2 - + kernel/seccomp.c | 4 +- + kernel/trace/bpf_trace.c | 7 +- + kernel/trace/trace_uprobe.c | 11 +- + lib/test_bpf.c | 4 +- + net/bpf/test_run.c | 8 +- + net/core/flow_dissector.c | 4 +- + net/core/skmsg.c | 8 +- + net/kcm/kcmsock.c | 4 +- + tools/testing/selftests/bpf/Makefile | 2 +- + .../selftests/bpf/prog_tests/select_reuseport.c | 30 ++-- + tools/testing/selftests/bpf/test_progs.c | 25 +++ + 24 files changed, 395 insertions(+), 180 deletions(-) +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 (339ffae598ed net/mlx5e: Replace zero-length array with flexible-array member) +$ git merge mlx5-next/mlx5-next +Merge made by the 'recursive' strategy. + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 4 ++-- + include/linux/mlx5/mlx5_ifc_fpga.h | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) +Merging netfilter-next/master (d5110b5d84d3 netfilter: cleanup unused macro) +$ git merge netfilter-next/master +Removing net/netfilter/nf_tables_set_core.c +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_tables.h | 10 -- + include/net/netfilter/nf_tables_core.h | 12 +- + include/uapi/linux/netfilter/nf_tables.h | 10 ++ + include/uapi/linux/netfilter/xt_IDLETIMER.h | 12 +- + net/netfilter/Kconfig | 8 - + net/netfilter/Makefile | 9 +- + net/netfilter/nf_conntrack_core.c | 1 - + net/netfilter/nf_flow_table_offload.c | 24 +-- + net/netfilter/nf_tables_api.c | 55 ++----- + net/netfilter/nf_tables_set_core.c | 31 ---- + net/netfilter/nft_set_bitmap.c | 3 +- + net/netfilter/nft_set_hash.c | 9 +- + net/netfilter/nft_set_pipapo.c | 3 +- + net/netfilter/nft_set_rbtree.c | 3 +- + net/netfilter/nft_tunnel.c | 110 +++++++++++-- + net/netfilter/xt_IDLETIMER.c | 247 ++++++++++++++++++++++++++-- + net/netfilter/xt_SECMARK.c | 2 - + 17 files changed, 392 insertions(+), 157 deletions(-) + delete mode 100644 net/netfilter/nf_tables_set_core.c +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/se.c +CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 92848ddf5dc1] Merge remote-tracking branch 'nfc-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 3 +-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 25 insertions(+), 52 deletions(-) +Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (932183aa35c6 mwifiex: change license text from MARVELL to NXP) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/wireless/ti,wl1251.txt | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 + + .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + + drivers/net/wireless/marvell/mwifiex/11ac.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11ac.h | 8 +- + drivers/net/wireless/marvell/mwifiex/11h.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11n.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11n.h | 8 +- + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 8 +- + drivers/net/wireless/marvell/mwifiex/11n_aggr.h | 8 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 8 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.h | 8 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.h | 8 +- + drivers/net/wireless/marvell/mwifiex/cfp.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 8 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 8 +- + drivers/net/wireless/marvell/mwifiex/decl.h | 8 +- + drivers/net/wireless/marvell/mwifiex/ethtool.c | 8 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 8 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 8 +- + drivers/net/wireless/marvell/mwifiex/init.c | 8 +- + drivers/net/wireless/marvell/mwifiex/ioctl.h | 8 +- + drivers/net/wireless/marvell/mwifiex/join.c | 8 +- + drivers/net/wireless/marvell/mwifiex/main.c | 8 +- + drivers/net/wireless/marvell/mwifiex/main.h | 8 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 8 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 6 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sdio.h | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_rx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sta_tx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 9 +- + drivers/net/wireless/marvell/mwifiex/txrx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 8 +- + drivers/net/wireless/marvell/mwifiex/uap_event.c | 8 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 8 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 8 +- + drivers/net/wireless/marvell/mwifiex/usb.h | 6 +- + drivers/net/wireless/marvell/mwifiex/util.c | 8 +- + drivers/net/wireless/marvell/mwifiex/util.h | 8 +- + drivers/net/wireless/marvell/mwifiex/wmm.c | 8 +- + drivers/net/wireless/marvell/mwifiex/wmm.h | 8 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 64 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 651 +++++++++------------ + drivers/net/wireless/quantenna/qtnfmac/commands.h | 4 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 47 +- + drivers/net/wireless/quantenna/qtnfmac/core.h | 26 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 67 +-- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 329 ++++++++--- + .../net/wireless/quantenna/qtnfmac/qlink_util.h | 45 +- + drivers/net/wireless/realtek/rtw88/bf.c | 6 +- + drivers/net/wireless/realtek/rtw88/coex.c | 3 + + drivers/net/wireless/realtek/rtw88/fw.c | 11 +- + drivers/net/wireless/realtek/rtw88/hci.h | 26 + + drivers/net/wireless/realtek/rtw88/mac.c | 25 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 37 +- + drivers/net/wireless/realtek/rtw88/main.c | 19 +- + drivers/net/wireless/realtek/rtw88/main.h | 32 +- + drivers/net/wireless/realtek/rtw88/pci.c | 9 +- + drivers/net/wireless/realtek/rtw88/pci.h | 1 + + drivers/net/wireless/realtek/rtw88/phy.c | 10 - + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 30 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 50 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 5 + + drivers/net/wireless/rsi/rsi_91x_sdio.c | 9 +- + drivers/net/wireless/ti/wl1251/sdio.c | 32 +- + 75 files changed, 981 insertions(+), 927 deletions(-) +Merging bluetooth/master (eed467b517e8 Bluetooth: fix passkey uninitialized when used) +$ git merge bluetooth/master +Auto-merging Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 2 + + drivers/bluetooth/Kconfig | 4 +- + drivers/bluetooth/btintel.c | 4 +- + drivers/bluetooth/btrtl.c | 12 +++ + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/hci_ag6xx.c | 2 +- + drivers/bluetooth/hci_h5.c | 23 ++++- + drivers/bluetooth/hci_intel.c | 2 +- + drivers/bluetooth/hci_qca.c | 115 ++++++++++++++------- + include/net/bluetooth/bluetooth.h | 17 +++ + include/net/bluetooth/hci_core.h | 2 + + include/net/bluetooth/rfcomm.h | 1 - + net/bluetooth/hci_conn.c | 114 +++++++++++++++++++- + net/bluetooth/hci_event.c | 10 ++ + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap_core.c | 26 +++-- + net/bluetooth/l2cap_sock.c | 31 +++++- + net/bluetooth/rfcomm/core.c | 13 +-- + net/bluetooth/sco.c | 13 +++ + net/bluetooth/smp.c | 29 +++++- + 20 files changed, 347 insertions(+), 76 deletions(-) +Merging mac80211-next/master (3b3e808cd883 Merge tag 'mac80211-next-for-net-next-2020-02-24' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (9357fd4b0167 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 (4575243c5c17 Merge tag 'nand/for-5.6' into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (d85339d9ea26 mtd: onenand: Rename omap2 driver to avoid a build warning) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (df5c21002cf4 mtd: spi-nor: use spi-mem dirmap API) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/spi-nor.c | 183 ++++++++++++++++++++++++++++++------------ + include/linux/mtd/spi-nor.h | 8 ++ + 2 files changed, 139 insertions(+), 52 deletions(-) +Merging crypto/master (ff462ddfd95b crypto: chelsio - Endianess bug in create_authenc_wr) +$ git merge crypto/master +Auto-merging include/linux/debugfs.h +Auto-merging fs/debugfs/file.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-uacce | 39 + + Documentation/misc-devices/uacce.rst | 176 + + arch/arm64/crypto/.gitignore | 1 + + arch/x86/crypto/curve25519-x86_64.c | 3546 ++++++++------------- + crypto/proc.c | 2 +- + crypto/rng.c | 8 +- + crypto/tcrypt.c | 4 +- + drivers/char/hw_random/Kconfig | 3 +- + drivers/crypto/Kconfig | 23 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 4 +- + drivers/crypto/caam/Kconfig | 1 + + drivers/crypto/caam/caamalg.c | 413 +-- + drivers/crypto/caam/caamhash.c | 338 +- + 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/ccree/cc_aead.c | 62 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 142 +- + drivers/crypto/ccree/cc_buffer_mgr.h | 5 +- + drivers/crypto/ccree/cc_cipher.c | 77 +- + drivers/crypto/ccree/cc_debugfs.c | 29 +- + drivers/crypto/ccree/cc_driver.c | 127 +- + drivers/crypto/ccree/cc_driver.h | 13 +- + drivers/crypto/ccree/cc_hash.c | 225 +- + drivers/crypto/ccree/cc_hash.h | 31 +- + drivers/crypto/ccree/cc_hw_queue_defs.h | 255 +- + drivers/crypto/ccree/cc_pm.c | 60 +- + drivers/crypto/ccree/cc_pm.h | 21 - + drivers/crypto/ccree/cc_request_mgr.c | 47 +- + 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 | 27 +- + drivers/crypto/chelsio/chcr_core.c | 1 + + drivers/crypto/chelsio/chcr_core.h | 3 +- + drivers/crypto/chelsio/chcr_crypto.h | 1 + + drivers/crypto/chelsio/chtls/chtls_main.c | 3 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 108 +- + drivers/crypto/hisilicon/qm.c | 455 ++- + drivers/crypto/hisilicon/qm.h | 36 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 162 +- + drivers/crypto/hisilicon/zip/zip_main.c | 232 +- + drivers/crypto/img-hash.c | 2 +- + drivers/crypto/qat/qat_common/qat_algs.c | 2 +- + 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/misc/Kconfig | 1 + + drivers/misc/Makefile | 1 + + drivers/misc/uacce/Kconfig | 13 + + drivers/misc/uacce/Makefile | 2 + + drivers/misc/uacce/uacce.c | 617 ++++ + fs/debugfs/file.c | 8 + + include/linux/debugfs.h | 1 + + include/linux/uacce.h | 161 + + include/uapi/misc/uacce/hisi_qm.h | 23 + + include/uapi/misc/uacce/uacce.h | 38 + + kernel/padata.c | 2 +- + 66 files changed, 4128 insertions(+), 3918 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-uacce + create mode 100644 Documentation/misc-devices/uacce.rst + 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 (1b245ec5b685 Merge tag 'drm-misc-next-2020-02-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/video/backlight/Kconfig +Auto-merging drivers/gpu/drm/panfrost/panfrost_mmu.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_job.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/sitronix,st7735r.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/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. + .../devicetree/bindings/display/bridge/ps8640.yaml | 112 + + .../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/dlc,dlc1010gig.txt | 12 - + .../bindings/display/panel/edt,et-series.txt | 55 - + .../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 - + .../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-simple-dsi.yaml | 67 + + .../bindings/display/panel/panel-simple.yaml | 205 ++ + .../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/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 | 6 + + Documentation/gpu/todo.rst | 22 + + MAINTAINERS | 28 +- + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 - + drivers/gpu/drm/arc/arcpgu_crtc.c | 16 - + drivers/gpu/drm/ast/ast_main.c | 24 +- + drivers/gpu/drm/ast/ast_mode.c | 2 - + drivers/gpu/drm/bochs/bochs_kms.c | 31 +- + drivers/gpu/drm/bridge/Kconfig | 11 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 44 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 348 +++ + drivers/gpu/drm/cirrus/cirrus.c | 8 - + drivers/gpu/drm/drm_atomic.c | 116 + + drivers/gpu/drm/drm_atomic_helper.c | 83 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 103 + + drivers/gpu/drm/drm_auth.c | 8 - + drivers/gpu/drm/drm_bridge.c | 437 ++- + drivers/gpu/drm/drm_bufs.c | 20 +- + drivers/gpu/drm/drm_connector.c | 81 +- + 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 | 3 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 41 +- + drivers/gpu/drm/drm_file.c | 44 +- + drivers/gpu/drm/drm_framebuffer.c | 122 + + drivers/gpu/drm/drm_gem_vram_helper.c | 61 + + drivers/gpu/drm/drm_ioctl.c | 1 + + drivers/gpu/drm/drm_mipi_dbi.c | 39 +- + drivers/gpu/drm/drm_pci.c | 36 +- + drivers/gpu/drm/drm_syncobj.c | 87 +- + drivers/gpu/drm/drm_vblank.c | 28 + + drivers/gpu/drm/drm_vm.c | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 1 + + drivers/gpu/drm/i915/display/icl_dsi.c | 5 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 2 - + drivers/gpu/drm/i915/display/intel_dp.c | 11 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 5 +- + drivers/gpu/drm/i915/i915_drv.c | 2 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 2 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- + drivers/gpu/drm/imx/parallel-display.c | 176 +- + 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 | 58 +- + 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/nouveau/nouveau_bo.c | 8 - + drivers/gpu/drm/nouveau/nouveau_vga.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 24 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 854 ++++++ + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 526 ++++ + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 293 +++ + drivers/gpu/drm/panel/panel-simple.c | 133 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 17 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 7 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 6 +- + drivers/gpu/drm/qxl/qxl_display.c | 14 - + drivers/gpu/drm/qxl/qxl_ttm.c | 6 - + drivers/gpu/drm/radeon/radeon_device.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 6 - + drivers/gpu/drm/rcar-du/rcar_lvds.c | 11 +- + 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/stm/dw_mipi_dsi-stm.c | 4 +- + drivers/gpu/drm/stm/ltdc.c | 37 +- + drivers/gpu/drm/stm/ltdc.h | 1 + + drivers/gpu/drm/tidss/Kconfig | 14 + + drivers/gpu/drm/tidss/Makefile | 12 + + drivers/gpu/drm/tidss/tidss_crtc.c | 377 +++ + drivers/gpu/drm/tidss/tidss_crtc.h | 46 + + drivers/gpu/drm/tidss/tidss_dispc.c | 2768 ++++++++++++++++++++ + drivers/gpu/drm/tidss/tidss_dispc.h | 132 + + 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 | 249 ++ + 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/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 | 13 +- + drivers/gpu/drm/udl/udl_connector.c | 1 - + drivers/gpu/drm/udl/udl_modeset.c | 11 - + drivers/gpu/drm/vboxvideo/vbox_mode.c | 13 +- + drivers/gpu/drm/vc4/vc4_plane.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 1 + + drivers/gpu/drm/virtio/virtgpu_display.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + + drivers/gpu/drm/virtio/virtgpu_kms.c | 3 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 187 +- + drivers/gpu/drm/vkms/vkms_plane.c | 2 +- + 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/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/nvidia/nvidia.c | 41 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 4 - + drivers/video/fbdev/pxa168fb.c | 2 +- + drivers/video/fbdev/s1d13xxxfb.c | 16 +- + drivers/video/fbdev/sa1100fb.c | 2 +- + drivers/video/fbdev/ssd1307fb.c | 2 + + 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 | 179 +- + include/drm/drm_connector.h | 9 +- + include/drm/drm_crtc.h | 34 +- + include/drm/drm_device.h | 2 +- + include/drm/drm_dp_helper.h | 2 + + include/drm/drm_dp_mst_helper.h | 6 +- + include/drm/drm_drv.h | 38 +- + include/drm/drm_file.h | 1 + + include/drm/drm_gem_vram_helper.h | 9 + + include/drm/drm_legacy.h | 6 - + include/drm/drm_mipi_dbi.h | 12 + + include/drm/drm_panel.h | 3 +- + include/drm/drm_print.h | 29 + + include/drm/drm_simple_kms_helper.h | 7 +- + include/drm/drm_vblank.h | 1 + + include/drm/ttm/ttm_bo_driver.h | 15 - + include/uapi/drm/drm.h | 2 + + include/uapi/drm/lima_drm.h | 9 +- + include/video/samsung_fimd.h | 2 +- + 261 files changed, 11248 insertions(+), 1833 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ps8640.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 + delete mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc1010gig.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/edt,et-series.txt + 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 + 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 + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-simple-dsi.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/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/bridge/parade-ps8640.c + create mode 100644 drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c + create mode 100644 drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.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 +Merging amdgpu/drm-next (2ef91cd0b926 drm/amdgpu/display: Fix Pollock Variant Detection) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/bios/command_table2.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' using previous resolution. +Resolved 'drivers/gpu/drm/ttm/ttm_bo.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a97570945fa9] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 125 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +- + 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 | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 25 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 98 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 163 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 4 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 10 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 105 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 3 +- + 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 | 12 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 43 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 69 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 132 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 277 ++- + 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 | 241 ++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 9 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 14 +- + .../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/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 | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 165 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 51 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 60 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 213 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 56 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 193 +- + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 5 +- + drivers/gpu/drm/amd/display/dc/dc.h | 29 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 48 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 17 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- + 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 | 90 +- + 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 | 156 +- + .../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 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 11 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 134 +- + 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 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 84 +- + .../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 | 184 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 8 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 9 +- + .../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/dc_link_dp.h | 2 + + 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/dwb.h | 3 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 6 +- + .../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 | 20 +- + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 4 +- + .../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 + + .../drm/amd/display/modules/freesync/freesync.c | 8 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 49 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 11 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 4 - + .../amd/display/modules/hdcp/hdcp1_transition.c | 12 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 10 +- + .../amd/display/modules/hdcp/hdcp2_transition.c | 6 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 4 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 9 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 164 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 32 +- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 2 + + drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 16 +- + .../drm/amd/include/asic_reg/dce/dce_12_0_offset.h | 2 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 94 +- + 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 | 2 + + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 4 +- + .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 4 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 8 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 22 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 7 +- + drivers/gpu/drm/radeon/radeon_drv.c | 43 +- + drivers/gpu/drm/radeon/radeon_kms.c | 6 + + drivers/gpu/drm/ttm/ttm_bo.c | 249 +-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +- + include/drm/ttm/ttm_bo_api.h | 11 +- + include/uapi/drm/amdgpu_drm.h | 11 +- + include/uapi/linux/kfd_ioctl.h | 19 +- + 175 files changed, 5464 insertions(+), 2513 deletions(-) + 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 +Merging drm-intel/for-linux-next (cb4d5dc3e7a8 drm/i915/gem: Honour O_NONBLOCK before throttling execbuf submissions) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_sideband.c +Auto-merging drivers/gpu/drm/i915/i915_scheduler.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_scheduler.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ring.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_object_types.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/i915/display/intel_ddi.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/gt/intel_lrc.c' +Resolved 'drivers/gpu/drm/i915/i915_scheduler.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/gt/intel_lrc.c'. +[master 6a2faf3bf34e] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Kconfig | 7 - + drivers/gpu/drm/i915/Makefile | 16 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 383 ++- + drivers/gpu/drm/i915/display/intel_acpi.c | 89 + + drivers/gpu/drm/i915/display/intel_acpi.h | 5 + + drivers/gpu/drm/i915/display/intel_atomic.c | 57 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 5 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 73 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 247 +- + drivers/gpu/drm/i915/display/intel_bios.c | 443 ++- + drivers/gpu/drm/i915/display/intel_bios.h | 11 + + drivers/gpu/drm/i915/display/intel_bw.c | 63 +- + drivers/gpu/drm/i915/display/intel_bw.h | 4 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 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 | 3422 +++++++++++--------- + 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 | 737 +++-- + drivers/gpu/drm/i915/display/intel_display_power.h | 5 + + drivers/gpu/drm/i915/display/intel_display_types.h | 54 +- + drivers/gpu/drm/i915/display/intel_dp.c | 848 +++-- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 169 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 75 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 33 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 108 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 677 ++-- + drivers/gpu/drm/i915/display/intel_dsb.c | 30 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 6 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 167 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 49 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 202 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 13 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 13 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 37 +- + drivers/gpu/drm/i915/display/intel_global_state.c | 223 ++ + drivers/gpu/drm/i915/display/intel_global_state.h | 87 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 77 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 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 | 386 ++- + drivers/gpu/drm/i915/display/intel_psr.h | 1 + + 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 | 440 +-- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 96 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 422 ++- + 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 | 87 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + + 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 | 17 +- + 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_param.c | 63 + + drivers/gpu/drm/i915/gt/intel_context_param.h | 14 + + 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 | 268 +- + 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 | 58 +- + 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 | 756 +---- + drivers/gpu/drm/i915/i915_drv.h | 98 +- + 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 | 236 +- + drivers/gpu/drm/i915/i915_params.c | 11 +- + drivers/gpu/drm/i915/i915_params.h | 74 +- + drivers/gpu/drm/i915/i915_pci.c | 20 +- + drivers/gpu/drm/i915/i915_perf.c | 80 +- + drivers/gpu/drm/i915/i915_pmu.c | 65 +- + drivers/gpu/drm/i915/i915_pmu.h | 11 +- + drivers/gpu/drm/i915/i915_reg.h | 42 +- + 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_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_active.c | 46 + + drivers/gpu/drm/i915/selftests/i915_gem.c | 6 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 1 + + .../gpu/drm/i915/selftests/intel_memory_region.c | 203 ++ + drivers/gpu/drm/i915/vlv_suspend.c | 489 +++ + drivers/gpu/drm/i915/vlv_suspend.h | 18 + + include/uapi/drm/i915_drm.h | 21 + + 193 files changed, 16382 insertions(+), 11327 deletions(-) + 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_param.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_context_param.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_context_sseu.c + create mode 100644 drivers/gpu/drm/i915/i915_debugfs_params.c + create mode 100644 drivers/gpu/drm/i915/i915_debugfs_params.h + create mode 100644 drivers/gpu/drm/i915/vlv_suspend.c + create mode 100644 drivers/gpu/drm/i915/vlv_suspend.h +Merging drm-tegra/drm/tegra/for-next (98ae41adb252 gpu: host1x: Set DMA direction only for DMA-mapped buffer objects) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (e1cf35b94c5f drm/edid: fix building error) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (5f9935f514d6 drm/msm: Fix error about comments within a comment block) +$ git merge drm-msm/msm-next +Already up to date. +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt | 1 + + 1 file changed, 1 insertion(+) +Merging regmap/for-next (d29456d34def Merge branch 'regmap-5.6' into regmap-linus) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (2948f4a4e583 Merge branch 'topic/usb-uac2-effect-unit' into for-next) +$ git merge sound/for-next +Auto-merging sound/pci/hda/hda_codec.c +Auto-merging sound/core/pcm_native.c +Merge made by the 'recursive' strategy. + include/linux/usb/audio-v2.h | 12 + + include/sound/pcm.h | 9 + + include/sound/pcm_params.h | 7 + + sound/core/info.c | 2 +- + sound/core/oss/pcm_oss.c | 23 +- + sound/core/oss/rate.c | 2 +- + sound/core/pcm_dmaengine.c | 2 +- + sound/core/pcm_misc.c | 17 +- + sound/core/pcm_native.c | 47 ++-- + sound/drivers/aloop.c | 6 +- + sound/drivers/dummy.c | 6 +- + sound/isa/sb/emu8000_pcm.c | 4 +- + sound/pci/ali5451/ali5451.c | 6 +- + sound/pci/emu10k1/emu10k1_main.c | 4 +- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_controller.c | 2 +- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/hda/patch_hdmi.c | 313 ++++++-------------- + sound/pci/rme9652/hdsp.c | 3 +- + sound/pci/via82xx.c | 6 +- + sound/pci/via82xx_modem.c | 6 +- + sound/usb/Makefile | 1 + + sound/usb/format.c | 37 +++ + sound/usb/midi.c | 2 +- + sound/usb/mixer.c | 16 ++ + sound/usb/mixer_quirks.c | 5 + + sound/usb/mixer_s1810c.c | 595 +++++++++++++++++++++++++++++++++++++++ + sound/usb/mixer_s1810c.h | 7 + + sound/usb/proc.c | 2 +- + sound/usb/quirks.c | 36 +++ + 30 files changed, 895 insertions(+), 287 deletions(-) + create mode 100644 sound/usb/mixer_s1810c.c + create mode 100644 sound/usb/mixer_s1810c.h +Merging sound-asoc/for-next (ab6a1752d1dd Merge branch 'asoc-5.7' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/core/pcm_dmaengine.c +Auto-merging include/sound/pcm.h +Removing Documentation/devicetree/bindings/sound/st,stm32-i2s.txt +Removing Documentation/devicetree/bindings/sound/google,cros-ec-codec.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 ++ + .../bindings/sound/google,cros-ec-codec.txt | 44 - + .../bindings/sound/google,cros-ec-codec.yaml | 62 ++ + .../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/tlv320adcx140.yaml | 83 ++ + 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 | 5 + + include/sound/rt5682.h | 8 + + include/sound/soc-dai.h | 23 +- + include/sound/soc-dapm.h | 6 + + include/sound/soc-dpcm.h | 16 +- + include/sound/sof/header.h | 11 + + sound/core/compress_offload.c | 42 + + sound/core/pcm_dmaengine.c | 8 +- + sound/soc/codecs/Kconfig | 620 +++++++----- + sound/soc/codecs/Makefile | 2 + + 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 | 6 +- + sound/soc/codecs/rt5659.c | 2 +- + sound/soc/codecs/rt5682.c | 766 ++++++++++++--- + sound/soc/codecs/rt5682.h | 49 +- + sound/soc/codecs/tas2562.c | 110 ++- + sound/soc/codecs/tas2562.h | 12 +- + sound/soc/codecs/tlv320adcx140.c | 922 +++++++++++++++++ + sound/soc/codecs/tlv320adcx140.h | 131 +++ + sound/soc/codecs/wcd934x.c | 23 +- + sound/soc/codecs/wm0010.c | 2 +- + sound/soc/dwc/dwc-i2s.c | 8 +- + sound/soc/fsl/fsl_asrc_dma.c | 4 +- + 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/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/mediatek/mt8173/mt8173-rt5650.c | 17 +- + 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 | 404 +------- + 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/sh/fsi.c | 3 +- + sound/soc/soc-core.c | 56 +- + sound/soc/soc-dai.c | 18 +- + sound/soc/soc-dapm.c | 31 +- + sound/soc/soc-generic-dmaengine-pcm.c | 8 +- + sound/soc/soc-pcm.c | 1033 ++++++++------------ + 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 | 289 +++++- + sound/soc/sof/intel/hda-ipc.c | 4 +- + 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 | 29 +- + sound/soc/sof/ops.h | 59 +- + sound/soc/sof/pcm.c | 9 +- + sound/soc/sof/pm.c | 176 ++-- + sound/soc/sof/probe.c | 286 ++++++ + 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/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/usb/usx2y/usbusx2yaudio.c | 9 +- + 133 files changed, 9616 insertions(+), 2118 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 + 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 + 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/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 (c5ccf2ad3d33 Input: synaptics-rmi4 - switch to reduced reporting mode) +$ git merge input/next +Already up to date. +Merging block/for-next (6b6eb301e976 Merge branch 'io_uring-5.6' into for-next) +$ git merge block/for-next +Auto-merging fs/io_uring.c +Merge made by the 'recursive' strategy. + fs/io_uring.c | 155 ++++++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 114 insertions(+), 41 deletions(-) +Merging device-mapper/for-next (47ace7e012b9 dm: fix potential for q->make_request_fn NULL pointer) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (71705c611263 PCMCIA/i82092: remove #if 0 block) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (b6559a9563d6 mmc: host: hsq: Add missing MODULE_LICENSE() and MODULE_DESCRIPTION()) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmci.txt | 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/queue.c | 22 +- + drivers/mmc/core/sd.c | 10 + + drivers/mmc/host/Kconfig | 12 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/cqhci.c | 8 +- + 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 | 184 +++++++++---- + drivers/mmc/host/sdhci-msm.c | 18 +- + drivers/mmc/host/sdhci-of-arasan.c | 59 ++++- + drivers/mmc/host/sdhci-sprd.c | 28 ++ + drivers/mmc/host/sdhci.c | 14 +- + drivers/mmc/host/sdhci.h | 3 + + drivers/mmc/host/tmio_mmc.h | 11 +- + drivers/mmc/host/tmio_mmc_core.c | 77 +----- + include/linux/firmware/xlnx-zynqmp.h | 9 +- + include/linux/mmc/host.h | 3 + + include/linux/mmc/mmc.h | 10 + + 29 files changed, 1166 insertions(+), 292 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 (1c5dfc5e3f2d power: supply: sc27xx: Add POWER_SUPPLY_PROP_CHARGE_NOW attribute) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + drivers/power/supply/ingenic-battery.c | 3 ++- + drivers/power/supply/sc27xx_fuel_gauge.c | 12 ++++++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) +Merging regulator/for-next (22b95d91e94c Merge branch 'regulator-5.7' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/mps,mp5416.yaml | 78 +++ + MAINTAINERS | 3 +- + drivers/regulator/Kconfig | 19 + + drivers/regulator/Makefile | 2 + + 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/mt6359-regulator.c | 738 +++++++++++++++++++++ + include/linux/regulator/mt6359-regulator.h | 58 ++ + 11 files changed, 1183 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mps,mp5416.yaml + create mode 100644 drivers/regulator/mp5416.c + create mode 100644 drivers/regulator/mt6359-regulator.c + create mode 100644 include/linux/regulator/mt6359-regulator.h +$ git reset --hard HEAD^ +HEAD is now at c876e8926cea Merge remote-tracking branch 'battery/for-next' +Merging next-20200225 version of regulator +$ git merge -m next-20200225/regulator 33f2ecda24644478b1383666ef5ac0dc8f1c6d0e +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/mps,mp5416.yaml | 78 +++++++ + MAINTAINERS | 3 +- + drivers/regulator/Kconfig | 10 + + drivers/regulator/Makefile | 1 + + drivers/regulator/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 + + 9 files changed, 377 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mps,mp5416.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 (5780b9abd530 ima: add sm3 algorithm to hash algorithm configuration list) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (bda7978b1956 Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/selinux/hooks.c +Auto-merging net/wireless/reg.c +Auto-merging init/Kconfig +Auto-merging include/linux/security.h +Auto-merging include/linux/pipe_fs_i.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/pipe.c +CONFLICT (content): Merge conflict in fs/pipe.c +Auto-merging fs/ecryptfs/keystore.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Resolved 'fs/pipe.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 657e16ee3efe] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 186 +++++- + Documentation/security/keys/request-key.rst | 9 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 354 +++++++++++ + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-verity-verify-sig.c | 3 +- + drivers/nvdimm/security.c | 2 +- + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + fs/crypto/keyring.c | 29 +- + fs/crypto/keysetup_v1.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/fscache/object-list.c | 2 +- + fs/nfs/nfs4idmap.c | 30 +- + fs/pipe.c | 242 +++++--- + fs/splice.c | 12 +- + fs/ubifs/auth.c | 2 +- + fs/verity/signature.c | 15 +- + include/linux/key.h | 126 ++-- + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 ++ + include/linux/pipe_fs_i.h | 27 +- + include/linux/security.h | 31 + + include/linux/watch_queue.h | 127 ++++ + include/uapi/linux/keyctl.h | 68 +++ + include/uapi/linux/watch_queue.h | 104 ++++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/watch_queue.c | 659 +++++++++++++++++++++ + lib/digsig.c | 2 +- + net/ceph/ceph_common.c | 2 +- + net/dns_resolver/dns_key.c | 12 +- + net/dns_resolver/dns_query.c | 15 +- + net/rxrpc/key.c | 19 +- + net/wireless/reg.c | 6 +- + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 186 ++++++ + security/integrity/digsig.c | 31 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima_mok.c | 13 +- + security/integrity/integrity.h | 6 +- + .../integrity/platform_certs/platform_keyring.c | 14 +- + security/keys/Kconfig | 9 + + security/keys/compat.c | 5 + + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/keys/gc.c | 7 +- + security/keys/internal.h | 46 +- + security/keys/key.c | 67 +-- + security/keys/keyctl.c | 202 +++++-- + security/keys/keyring.c | 47 +- + security/keys/permission.c | 363 ++++++++++-- + security/keys/persistent.c | 27 +- + security/keys/proc.c | 22 +- + security/keys/process_keys.c | 86 ++- + security/keys/request_key.c | 38 +- + security/keys/request_key_auth.c | 15 +- + security/security.c | 23 + + security/selinux/hooks.c | 75 ++- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/security.h | 8 + + security/selinux/ss/services.c | 3 +- + security/smack/smack_lsm.c | 86 ++- + 71 files changed, 3183 insertions(+), 443 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 kernel/watch_queue.c + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +Merging selinux/next (e4cfa05e9bfe selinux: Add xfs quota command types) +$ git merge selinux/next +Auto-merging security/selinux/ss/services.c +CONFLICT (content): Merge conflict in security/selinux/ss/services.c +Auto-merging security/selinux/include/security.h +CONFLICT (content): Merge conflict in security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'security/selinux/hooks.c' using previous resolution. +Resolved 'security/selinux/include/security.h' using previous resolution. +Resolved 'security/selinux/ss/services.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a809b1adf3d1] Merge remote-tracking branch 'selinux/next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/obsolete/sysfs-selinux-checkreqprot | 23 ++ + Documentation/admin-guide/kernel-parameters.txt | 1 + + MAINTAINERS | 1 + + security/selinux/Kconfig | 3 + + security/selinux/Makefile | 4 +- + security/selinux/hooks.c | 18 +- + security/selinux/include/conditional.h | 8 +- + security/selinux/include/security.h | 12 + + security/selinux/selinuxfs.c | 13 +- + security/selinux/ss/conditional.c | 251 +++++++++------------ + security/selinux/ss/conditional.h | 27 ++- + security/selinux/ss/policydb.c | 218 ++++++++++-------- + security/selinux/ss/policydb.h | 11 +- + security/selinux/ss/services.c | 53 ++--- + security/selinux/ss/services.h | 2 - + security/selinux/{ss => }/status.c | 32 +-- + 16 files changed, 359 insertions(+), 318 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 (14c3bf32cb4a tpm: tpm2_bios_measurements_next should increase position index) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + 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 +- + 5 files changed, 8 insertions(+), 14 deletions(-) +Merging watchdog/master (44144c809e39 watchdog: da9062: Add dependency on I2C) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (e3b5ee0cfb65 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (7b5372ba04ca vfio: platform: fix __iomem in vfio_platform_amdxgbe.c) +$ git merge vfio/next +Already up to date. +Merging audit/next (70b3eeed49e8 audit: CONFIG_CHANGE don't log internal bookkeeping as an event) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit_watch.c | 2 -- + 1 file changed, 2 deletions(-) +Merging devicetree/for-next (632c99084052 of: of_reserved_mem: Increase limit on number of reserved regions) +$ git merge devicetree/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/net/can/m_can.txt +Removing Documentation/devicetree/bindings/net/can/can-transceiver.txt +CONFLICT (modify/delete): Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt +rm 'Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt' +$ git commit --no-edit -v -a +[master 0ec370262be7] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cpus.yaml | 10 ++ + Documentation/devicetree/bindings/arm/pmu.yaml | 41 +++--- + .../bindings/display/etnaviv/etnaviv-drm.txt | 37 ------ + .../devicetree/bindings/gpu/vivante,gc.yaml | 69 ++++++++++ + .../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 ----------- + .../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 | 10 ++ + MAINTAINERS | 1 - + drivers/of/of_reserved_mem.c | 2 +- + 14 files changed, 338 insertions(+), 155 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt + create mode 100644 Documentation/devicetree/bindings/gpu/vivante,gc.yaml + create mode 100644 Documentation/devicetree/bindings/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 + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,aips-bus.yaml +Merging mailbox/mailbox-for-next (c6c6bc6ea9fc mailbox: imx: add support for imx v1 mu) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (5c0fd1c4c909 Merge branch 'spi-5.7' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 5 +- + .../devicetree/bindings/spi/qca,ar934x-spi.yaml | 41 ++++ + Documentation/devicetree/bindings/spi/spi-mux.yaml | 89 ++++++++ + drivers/spi/Kconfig | 18 ++ + drivers/spi/Makefile | 2 + + drivers/spi/spi-ar934x.c | 235 +++++++++++++++++++++ + drivers/spi/spi-geni-qcom.c | 26 +-- + drivers/spi/spi-mem.c | 2 +- + drivers/spi/spi-mux.c | 187 ++++++++++++++++ + drivers/spi/spi-pxa2xx.c | 20 +- + drivers/spi/spi-rspi.c | 12 +- + drivers/spi/spi-stm32-qspi.c | 31 +-- + tools/spi/Makefile | 2 +- + tools/spi/spidev_test.c | 14 +- + 14 files changed, 631 insertions(+), 53 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/qca,ar934x-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/spi-mux.yaml + create mode 100644 drivers/spi/spi-ar934x.c + create mode 100644 drivers/spi/spi-mux.c +Merging tip/auto-latest (f4a4fb5f1572 Merge branch 'core/objtool') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging kernel/Makefile +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 22 + + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 266 ++++++++ + MAINTAINERS | 11 + + Makefile | 3 +- + arch/arm/Kconfig | 1 - + arch/arm/include/asm/clocksource.h | 5 +- + arch/arm/include/asm/vdso/gettimeofday.h | 18 +- + arch/arm/include/asm/vdso/vsyscall.h | 35 -- + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/clocksource.h | 5 +- + 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/mips/Kconfig | 1 - + 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/powerpc/perf/core-book3s.c | 1 + + arch/x86/Kconfig | 2 +- + arch/x86/boot/Makefile | 2 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/boot/compressed/head_64.S | 8 +- + arch/x86/boot/compressed/vmlinux.lds.S | 5 + + arch/x86/entry/common.c | 1 + + 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/mshyperv.h | 4 +- + arch/x86/include/asm/msr-index.h | 9 + + arch/x86/include/asm/mwait.h | 2 + + arch/x86/include/asm/syscall.h | 5 + + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/include/asm/topology.h | 25 + + 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/cpu/Makefile | 3 + + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/cpu/intel.c | 175 ++++++ + arch/x86/kernel/cpu/mce/core.c | 2 + + arch/x86/kernel/cpu/mce/intel.c | 17 + + arch/x86/kernel/cpu/mce/internal.h | 2 + + arch/x86/kernel/cpu/umwait.c | 1 + + arch/x86/kernel/fpu/xstate.c | 66 +- + arch/x86/kernel/ioport.c | 1 + + arch/x86/kernel/irqinit.c | 2 +- + 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 | 24 +- + arch/x86/kernel/tsc.c | 34 +- + arch/x86/kernel/tsc_sync.c | 2 +- + 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/purgatory/Makefile | 2 + + arch/x86/realmode/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 3 + + arch/x86/xen/time.c | 36 +- + drivers/clocksource/arm_arch_timer.c | 8 +- + drivers/clocksource/hyperv_timer.c | 7 + + drivers/clocksource/mips-gic-timer.c | 8 +- + drivers/cpufreq/intel_pstate.c | 1 + + drivers/firmware/efi/libstub/Makefile | 2 + + include/asm-generic/atomic-instrumented.h | 722 +++++++++++----------- + include/asm-generic/atomic-long.h | 331 +++++----- + include/asm-generic/vdso/vsyscall.h | 14 - + 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/kcsan-checks.h | 93 +++ + include/linux/kcsan.h | 108 ++++ + include/linux/percpu-rwsem.h | 83 ++- + include/linux/perf_event.h | 12 + + include/linux/rwsem.h | 6 - + include/linux/sched.h | 4 + + include/linux/seqlock.h | 51 +- + include/linux/wait.h | 1 + + include/uapi/linux/perf_event.h | 8 +- + include/vdso/datapage.h | 2 - + init/init_task.c | 8 + + init/main.c | 2 + + kernel/Makefile | 6 + + kernel/cpu.c | 4 +- + kernel/events/core.c | 10 + + kernel/exit.c | 1 + + kernel/kcsan/Makefile | 12 + + kernel/kcsan/atomic.h | 27 + + kernel/kcsan/core.c | 621 +++++++++++++++++++ + kernel/kcsan/debugfs.c | 271 ++++++++ + kernel/kcsan/encoding.h | 95 +++ + kernel/kcsan/kcsan.h | 109 ++++ + kernel/kcsan/report.c | 318 ++++++++++ + kernel/kcsan/test.c | 121 ++++ + kernel/locking/lockdep.c | 331 ++++++++-- + kernel/locking/lockdep_internals.h | 14 +- + kernel/locking/lockdep_proc.c | 31 +- + kernel/locking/percpu-rwsem.c | 192 ++++-- + kernel/locking/rwsem.c | 7 +- + kernel/locking/rwsem.h | 10 - + kernel/sched/Makefile | 6 + + kernel/sched/core.c | 2 +- + kernel/sched/fair.c | 92 ++- + kernel/sched/rt.c | 24 +- + kernel/sched/sched.h | 9 +- + kernel/sched/topology.c | 15 +- + kernel/time/clocksource.c | 9 + + kernel/time/namespace.c | 7 +- + kernel/time/posix-timers.c | 3 +- + kernel/time/timer.c | 16 +- + kernel/time/vsyscall.c | 12 +- + lib/Kconfig.debug | 2 + + lib/Kconfig.kcsan | 116 ++++ + lib/Makefile | 4 + + 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 +- + tools/objtool/check.c | 104 +++- + tools/objtool/elf.c | 14 +- + tools/objtool/elf.h | 1 + + 163 files changed, 5036 insertions(+), 1355 deletions(-) + create mode 100644 Documentation/dev-tools/kcsan.rst + create mode 100644 include/linux/kcsan-checks.h + create mode 100644 include/linux/kcsan.h + create mode 100644 kernel/kcsan/Makefile + create mode 100644 kernel/kcsan/atomic.h + create mode 100644 kernel/kcsan/core.c + create mode 100644 kernel/kcsan/debugfs.c + create mode 100644 kernel/kcsan/encoding.h + create mode 100644 kernel/kcsan/kcsan.h + create mode 100644 kernel/kcsan/report.c + create mode 100644 kernel/kcsan/test.c + create mode 100644 lib/Kconfig.kcsan + create mode 100644 scripts/Makefile.kcsan +Merging clockevents/timers/drivers/next (e4c3b4213b79 clocksource/hyperv: Set TSC clocksource as default w/ InvariantTSC) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/hv/hv_util.c +Auto-merging drivers/clocksource/hyperv_timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/hyperv_timer.c +Auto-merging Documentation/devicetree/bindings/arm/atmel-sysregs.txt +Resolved 'drivers/clocksource/hyperv_timer.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 357a936c0423] Merge remote-tracking branch 'clockevents/timers/drivers/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/edac-for-next (c7f7b1c8feca Merge branch 'edac-drivers' 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 (5186a6cc3ef5 irqchip/gic-v3-its: Rename VPENDBASER/VPROPBASER accessors) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (5f811c57c992 bootconfig: Add append value operator support) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_events_hist.c +Auto-merging kernel/trace/trace.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging Documentation/admin-guide/bootconfig.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/bootconfig.rst | 34 +++++++- + include/linux/bootconfig.h | 3 + + init/Kconfig | 3 +- + init/main.c | 38 +++++---- + kernel/trace/Kconfig | 3 +- + kernel/trace/synth_event_gen_test.c | 44 +++++------ + kernel/trace/trace.c | 2 + + kernel/trace/trace_events_hist.c | 112 ++++++++++++++++++++++++--- + lib/bootconfig.c | 36 ++++++--- + tools/bootconfig/include/linux/printk.h | 5 +- + tools/bootconfig/main.c | 51 +++++++----- + tools/bootconfig/samples/bad-mixed-kv1.bconf | 3 + + tools/bootconfig/samples/bad-mixed-kv2.bconf | 3 + + tools/bootconfig/samples/bad-samekey.bconf | 6 ++ + tools/bootconfig/test-bootconfig.sh | 18 ++++- + 15 files changed, 271 insertions(+), 90 deletions(-) + create mode 100644 tools/bootconfig/samples/bad-mixed-kv1.bconf + create mode 100644 tools/bootconfig/samples/bad-mixed-kv2.bconf + create mode 100644 tools/bootconfig/samples/bad-samekey.bconf +Merging rcu/rcu/next (8aa63de65a79 kcsan: Add option for verbose reporting) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/time/timer.c +Auto-merging kernel/fork.c +Auto-merging fs/nfs/dir.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 8 +- + Documentation/RCU/listRCU.rst | 281 ++++++++++--- + Documentation/RCU/rcu.rst | 18 +- + Documentation/RCU/torture.txt | 147 ++++++- + Documentation/admin-guide/kernel-parameters.txt | 19 + + Documentation/memory-barriers.txt | 8 +- + arch/x86/lib/Makefile | 5 + + 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 | 174 +++++++- + include/linux/kcsan.h | 46 +-- + include/linux/rculist.h | 6 +- + include/linux/rcutiny.h | 1 + + include/linux/rcutree.h | 1 + + include/linux/sched.h | 2 +- + include/linux/seqlock.h | 2 +- + include/linux/timer.h | 2 +- + include/linux/uaccess.h | 14 +- + include/trace/events/rcu.h | 29 ++ + init/init_task.c | 1 + + kernel/fork.c | 8 +- + kernel/kcsan/Makefile | 2 + + kernel/kcsan/atomic.h | 2 +- + kernel/kcsan/core.c | 207 +++++++--- + kernel/kcsan/debugfs.c | 65 ++- + 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/Makefile | 4 + + kernel/rcu/rcu.h | 23 +- + kernel/rcu/rcu_segcblist.c | 4 +- + kernel/rcu/rcuperf.c | 14 +- + kernel/rcu/rcutorture.c | 73 +++- + kernel/rcu/srcutree.c | 26 +- + kernel/rcu/tree.c | 451 +++++++++++++++------ + kernel/rcu/tree.h | 4 + + kernel/rcu/tree_exp.h | 63 ++- + kernel/rcu/tree_plugin.h | 85 ++-- + kernel/rcu/tree_stall.h | 63 +-- + kernel/rcu/update.c | 28 +- + kernel/time/timer.c | 7 +- + kernel/torture.c | 29 +- + kernel/trace/Makefile | 3 + + lib/Kconfig.debug | 2 + + lib/Kconfig.kcsan | 94 ++++- + lib/iov_iter.c | 7 +- + lib/usercopy.c | 7 +- + scripts/atomic/gen-atomic-instrumented.sh | 19 +- + tools/memory-model/Documentation/references.txt | 21 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 + + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 16 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 17 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 + + .../selftests/rcutorture/configs/rcu/TREE10 | 18 + + 82 files changed, 2720 insertions(+), 904 deletions(-) + create mode 100644 include/linux/instrumented.h + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE10 +Merging kvm/linux-next (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 +Auto-merging virt/kvm/arm/arm.c +Auto-merging arch/arm64/kvm/hyp/switch.c +Auto-merging arch/arm64/include/asm/kvm_hyp.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/include/asm/arch_gicv3.h +Auto-merging arch/arm/include/asm/kvm_host.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_host.h | 3 -- + arch/arm64/include/asm/arch_gicv3.h | 2 +- + arch/arm64/include/asm/cache.h | 2 +- + arch/arm64/include/asm/cacheflush.h | 2 +- + arch/arm64/include/asm/cpufeature.h | 10 +++---- + arch/arm64/include/asm/io.h | 4 +-- + arch/arm64/include/asm/kvm_emulate.h | 48 ++++++++++++++++---------------- + arch/arm64/include/asm/kvm_host.h | 32 --------------------- + arch/arm64/include/asm/kvm_hyp.h | 7 +++++ + arch/arm64/include/asm/kvm_mmu.h | 3 +- + arch/arm64/include/asm/virt.h | 2 +- + arch/arm64/kvm/hyp/switch.c | 39 ++++++++++++++++++++++++-- + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 4 +-- + virt/kvm/arm/arm.c | 2 -- + virt/kvm/arm/trace.h | 1 + + 15 files changed, 84 insertions(+), 77 deletions(-) +Merging kvm-ppc/kvm-ppc-next (fd24a8624eb2 KVM: PPC: Book3S PR: Fix -Werror=return-type build failure) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (b35e8878e1d3 KVM: s390/interrupt: do not pin adapter interrupt pages) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + arch/s390/include/asm/kvm_host.h | 3 - + arch/s390/kvm/interrupt.c | 146 +++++++++++++-------------------------- + 2 files changed, 49 insertions(+), 100 deletions(-) +Merging xen-tip/linux-next (8645e56a4ad6 xen: Enable interrupts when calling _cond_resched()) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (9391e7a9a1e2 Merge branch 'for-5.6' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (1cd27003497a workqueue: don't use wq_select_unbound_cpu() for bound works) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 16 ++++++++++++++++ + kernel/workqueue.c | 14 ++++++++------ + 2 files changed, 24 insertions(+), 6 deletions(-) +Merging drivers-x86/for-next (7adb1e8aeeb5 platform/x86: intel_pmc_core: Add debugfs support to access live status registers) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 82 +- + drivers/platform/x86/Kconfig | 1318 ++++++++++----------- + drivers/platform/x86/Makefile | 197 +-- + drivers/platform/x86/dell_rbu.c | 173 +-- + drivers/platform/x86/intel-hid.c | 2 +- + drivers/platform/x86/intel-vbtn.c | 2 +- + drivers/platform/x86/intel_pmc_core.c | 308 ++++- + drivers/platform/x86/intel_pmc_core.h | 28 + + drivers/platform/x86/pmc_atom.c | 8 + + tools/power/x86/intel-speed-select/isst-config.c | 5 +- + tools/power/x86/intel-speed-select/isst-display.c | 4 +- + 11 files changed, 1204 insertions(+), 923 deletions(-) +Merging chrome-platform/for-next (42cd0ab476e2 platform/chrome: cros_ec: Query EC protocol version if EC transitions between RO/RW) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 14 ++ + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/cros_ec.c | 30 +++++ + drivers/platform/chrome/cros_usbpd_notify.c | 169 ++++++++++++++++++++++++ + drivers/platform/chrome/wilco_ec/properties.c | 5 +- + drivers/platform/chrome/wilco_ec/sysfs.c | 4 + + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 50 +++---- + include/linux/platform_data/cros_ec_proto.h | 4 + + include/linux/platform_data/cros_usbpd_notify.h | 17 +++ + include/linux/platform_data/wilco-ec.h | 8 +- + 11 files changed, 268 insertions(+), 36 deletions(-) + create mode 100644 drivers/platform/chrome/cros_usbpd_notify.c + create mode 100644 include/linux/platform_data/cros_usbpd_notify.h +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (11a48a5a18c6 Linux 5.6-rc2) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (ef0129a4d06a drivers: char: ipmi: ipmi_msghandler: Pass lockdep expression to RCU lists) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 14 ++++++++++---- + drivers/char/ipmi/ipmi_si_platform.c | 4 ++-- + 2 files changed, 12 insertions(+), 6 deletions(-) +Merging driver-core/driver-core-next (99c73ce158a4 drivers base/arch_topology: Reformat topology_get_[cpu/freq]_scale() function name) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/firmware_loader/main.c | 6 +- + fs/exec.c | 26 ++++ + include/linux/arch_topology.h | 7 +- + include/linux/fs.h | 2 + + include/linux/platform_device.h | 2 +- + tools/testing/selftests/firmware/Makefile | 9 +- + tools/testing/selftests/firmware/fw_namespace.c | 151 +++++++++++++++++++++++ + tools/testing/selftests/firmware/fw_run_tests.sh | 4 + + 8 files changed, 193 insertions(+), 14 deletions(-) + create mode 100644 tools/testing/selftests/firmware/fw_namespace.c +Merging usb/usb-next (24e6aea4801b Merge 5.6-rc3 into usb-next) +$ git merge usb/usb-next +Auto-merging include/linux/usb/audio-v2.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-typec | 14 +- + Documentation/driver-api/usb/typec_bus.rst | 22 +-- + MAINTAINERS | 6 + + drivers/thunderbolt/usb4.c | 4 + + drivers/usb/atm/ueagle-atm.c | 2 +- + drivers/usb/atm/usbatm.h | 2 +- + drivers/usb/cdns3/gadget.c | 2 +- + drivers/usb/core/driver.c | 58 ++++++- + drivers/usb/core/generic.c | 48 +++++- + drivers/usb/core/sysfs.c | 6 +- + drivers/usb/core/usb-acpi.c | 11 +- + drivers/usb/core/usb.h | 8 + + drivers/usb/dwc2/hcd.h | 2 +- + 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 | 2 +- + drivers/usb/gadget/udc/omap_udc.c | 2 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 2 +- + 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-trace.h | 23 +-- + 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/musb/musb_core.c | 2 +- + drivers/usb/musb/musb_host.c | 2 +- + drivers/usb/roles/class.c | 2 +- + 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 | 137 ++++++++-------- + drivers/usb/typec/mux.c | 25 +-- + drivers/usb/typec/tcpm/tcpm.c | 53 +++++-- + 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/typec.h | 2 - + include/linux/usb/typec_altmode.h | 7 - + include/linux/usb_usual.h | 2 +- + include/linux/usbdevice_fs.h | 2 +- + 75 files changed, 711 insertions(+), 262 deletions(-) + create mode 100644 drivers/usb/misc/apple-mfi-fastcharge.c +Merging usb-gadget/next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (0a68ec3d8a2c USB: serial: f81232: set F81534A serial port with RS232 mode) +$ 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 | 4 +- + 3 files changed, 188 insertions(+), 39 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 +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 (a5c86c557fe9 phy: mapphone-mdm6600: Fix write timeouts with shorter GPIO toggle interval) +$ git merge phy-next/next +Auto-merging drivers/phy/motorola/phy-mapphone-mdm6600.c +Merge made by the 'recursive' strategy. +Merging tty/tty-next (ba08cf452f34 Merge 5.6-rc3 into tty-next) +$ git merge tty/tty-next +Merge made by the 'recursive' strategy. + drivers/tty/n_gsm.c | 140 ++++---- + drivers/tty/n_hdlc.c | 558 +++++++++++------------------- + drivers/tty/n_tty.c | 6 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 18 + + drivers/tty/serial/8250/8250_exar.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 28 -- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/tty/serial/8250/8250_port.c | 31 +- + 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 | 12 +- + drivers/tty/serial/efm32-uart.c | 2 +- + drivers/tty/serial/kgdboc.c | 4 +- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/serial_core.c | 96 ++--- + drivers/tty/vt/selection.c | 5 + + drivers/tty/vt/vt.c | 7 +- + drivers/tty/vt/vt_ioctl.c | 29 +- + include/linux/selection.h | 4 +- + 21 files changed, 609 insertions(+), 547 deletions(-) + create mode 100644 drivers/tty/serial/8250/8250_tegra.c +Merging char-misc/char-misc-next (1f836f5b10f2 Merge 5.6-rc3 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 (dde73538c9a5 soundwire: bus: don't treat CMD_IGNORED as error on ClockStop) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + Documentation/driver-api/soundwire/stream.rst | 61 ++- + drivers/soundwire/bus.c | 509 ++++++++++++++++++++++++-- + drivers/soundwire/bus.h | 9 + + drivers/soundwire/bus_type.c | 5 + + drivers/soundwire/intel.c | 198 +++++++++- + drivers/soundwire/slave.c | 4 + + drivers/soundwire/stream.c | 90 ++++- + include/linux/soundwire/sdw.h | 24 ++ + 8 files changed, 828 insertions(+), 72 deletions(-) +Merging thunderbolt/next (3084ea9ea889 thunderbolt: icm: Replace zero-length array with flexible-array member) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + drivers/thunderbolt/eeprom.c | 2 +- + drivers/thunderbolt/icm.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging staging/staging-next (c85f15519d45 Merge 5.6-rc3 into staging-next) +$ 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/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt +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/media/allegro-dvt/allegro-core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 - + .../cavium-octeon/executive/cvmx-helper-board.c | 4 +- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 6 +- + .../cavium-octeon/executive/cvmx-helper-sgmii.c | 8 +- + .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 6 +- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 6 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +- + arch/mips/include/asm/octeon/cvmx-helper-board.h | 2 +- + arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-spi.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-util.h | 2 +- + arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper.h | 8 +- + arch/mips/include/asm/octeon/cvmx-pko.h | 10 +- + arch/mips/include/asm/octeon/cvmx-pow.h | 22 +- + arch/mips/include/asm/octeon/cvmx-wqe.h | 16 +- + drivers/staging/Kconfig | 7 +- + drivers/staging/Makefile | 4 +- + drivers/staging/comedi/drivers/ni_660x.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 1 + + drivers/staging/comedi/drivers/ni_pcimio.c | 2 + + drivers/staging/comedi/drivers/ni_routes.c | 63 +- + drivers/staging/comedi/drivers/ni_routes.h | 1 + + drivers/staging/comedi/drivers/ni_stc.h | 1 + + drivers/staging/exfat/exfat.h | 92 +- + drivers/staging/exfat/exfat_cache.c | 38 - + drivers/staging/exfat/exfat_core.c | 91 +- + drivers/staging/exfat/exfat_super.c | 747 +--- + 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/raw.c | 2 +- + drivers/staging/ks7010/ks_hostif.h | 4 +- + drivers/staging/media/allegro-dvt/allegro-core.c | 2 +- + drivers/staging/netlogic/platform_net.h | 4 +- + drivers/staging/netlogic/xlr_net.h | 4 +- + drivers/staging/octeon-usb/Kconfig | 11 + + drivers/staging/octeon-usb/Makefile | 2 + + drivers/staging/octeon-usb/TODO | 8 + + drivers/staging/octeon-usb/octeon-hcd.c | 3737 ++++++++++++++++++++ + drivers/staging/octeon-usb/octeon-hcd.h | 1847 ++++++++++ + drivers/staging/octeon/Kconfig | 15 + + drivers/staging/octeon/Makefile | 19 + + drivers/staging/octeon/TODO | 9 + + drivers/staging/octeon/ethernet-defines.h | 40 + + drivers/staging/octeon/ethernet-mdio.c | 178 + + drivers/staging/octeon/ethernet-mdio.h | 28 + + drivers/staging/octeon/ethernet-mem.c | 154 + + drivers/staging/octeon/ethernet-mem.h | 9 + + drivers/staging/octeon/ethernet-rgmii.c | 158 + + drivers/staging/octeon/ethernet-rx.c | 538 +++ + drivers/staging/octeon/ethernet-rx.h | 31 + + drivers/staging/octeon/ethernet-sgmii.c | 30 + + drivers/staging/octeon/ethernet-spi.c | 226 ++ + drivers/staging/octeon/ethernet-tx.c | 717 ++++ + drivers/staging/octeon/ethernet-tx.h | 14 + + drivers/staging/octeon/ethernet-util.h | 47 + + drivers/staging/octeon/ethernet.c | 992 ++++++ + drivers/staging/octeon/octeon-ethernet.h | 107 + + drivers/staging/octeon/octeon-stubs.h | 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_dbg.c | 29 +- + drivers/staging/qlge/qlge_ethtool.c | 18 +- + drivers/staging/qlge/qlge_main.c | 25 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 2 +- + 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_tx.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 28 +- + drivers/staging/rtl8192u/r819xU_phy.c | 2 +- + drivers/staging/rtl8712/ieee80211.h | 4 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 4 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 4 +- + 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 | 280 +- + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 6 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 8 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 12 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 +- + drivers/staging/speakup/keyhelp.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/device_main.c | 3 +- + drivers/staging/vt6656/device.h | 1 - + drivers/staging/vt6656/int.c | 38 - + drivers/staging/vt6656/key.c | 5 +- + drivers/staging/vt6656/main_usb.c | 8 +- + drivers/staging/vt6656/rxtx.c | 235 +- + drivers/staging/vt6656/rxtx.h | 60 - + .../bindings/net/wireless/siliabs,wfx.txt | 11 +- + drivers/staging/wfx/bh.c | 8 +- + drivers/staging/wfx/bus_sdio.c | 16 +- + drivers/staging/wfx/bus_spi.c | 45 +- + drivers/staging/wfx/hwio.c | 2 +- + drivers/staging/wfx/main.c | 23 +- + drivers/staging/wfx/main.h | 1 - + drivers/staging/wfx/queue.c | 18 +- + drivers/staging/wilc1000/cfg80211.c | 360 +- + drivers/staging/wilc1000/hif.c | 3 +- + .../staging/wilc1000/microchip,wilc1000,sdio.txt | 38 - + .../staging/wilc1000/microchip,wilc1000,sdio.yaml | 68 + + .../staging/wilc1000/microchip,wilc1000,spi.txt | 34 - + .../staging/wilc1000/microchip,wilc1000,spi.yaml | 61 + + drivers/staging/wilc1000/mon.c | 2 +- + drivers/staging/wilc1000/netdev.c | 2 - + drivers/staging/wilc1000/netdev.h | 9 - + drivers/staging/wilc1000/sdio.c | 281 +- + drivers/staging/wilc1000/spi.c | 775 ++-- + drivers/staging/wilc1000/wlan.c | 129 +- + drivers/staging/wilc1000/wlan.h | 96 +- + 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 --- + 258 files changed, 12555 insertions(+), 32537 deletions(-) + create mode 100644 drivers/staging/octeon-usb/Kconfig + create mode 100644 drivers/staging/octeon-usb/Makefile + create mode 100644 drivers/staging/octeon-usb/TODO + create mode 100644 drivers/staging/octeon-usb/octeon-hcd.c + create mode 100644 drivers/staging/octeon-usb/octeon-hcd.h + create mode 100644 drivers/staging/octeon/Kconfig + create mode 100644 drivers/staging/octeon/Makefile + create mode 100644 drivers/staging/octeon/TODO + create mode 100644 drivers/staging/octeon/ethernet-defines.h + create mode 100644 drivers/staging/octeon/ethernet-mdio.c + create mode 100644 drivers/staging/octeon/ethernet-mdio.h + create mode 100644 drivers/staging/octeon/ethernet-mem.c + create mode 100644 drivers/staging/octeon/ethernet-mem.h + create mode 100644 drivers/staging/octeon/ethernet-rgmii.c + create mode 100644 drivers/staging/octeon/ethernet-rx.c + create mode 100644 drivers/staging/octeon/ethernet-rx.h + create mode 100644 drivers/staging/octeon/ethernet-sgmii.c + create mode 100644 drivers/staging/octeon/ethernet-spi.c + create mode 100644 drivers/staging/octeon/ethernet-tx.c + create mode 100644 drivers/staging/octeon/ethernet-tx.h + create mode 100644 drivers/staging/octeon/ethernet-util.h + create mode 100644 drivers/staging/octeon/ethernet.c + create mode 100644 drivers/staging/octeon/octeon-ethernet.h + create mode 100644 drivers/staging/octeon/octeon-stubs.h + delete mode 100644 drivers/staging/uwb/Kconfig + delete mode 100644 drivers/staging/uwb/Makefile + delete mode 100644 drivers/staging/uwb/TODO + delete mode 100644 drivers/staging/uwb/address.c + delete mode 100644 drivers/staging/uwb/allocator.c + delete mode 100644 drivers/staging/uwb/beacon.c + delete mode 100644 drivers/staging/uwb/driver.c + delete mode 100644 drivers/staging/uwb/drp-avail.c + delete mode 100644 drivers/staging/uwb/drp-ie.c + delete mode 100644 drivers/staging/uwb/drp.c + delete mode 100644 drivers/staging/uwb/est.c + delete mode 100644 drivers/staging/uwb/hwa-rc.c + delete mode 100644 drivers/staging/uwb/i1480/Makefile + delete mode 100644 drivers/staging/uwb/i1480/dfu/Makefile + delete mode 100644 drivers/staging/uwb/i1480/dfu/dfu.c + delete mode 100644 drivers/staging/uwb/i1480/dfu/i1480-dfu.h + delete mode 100644 drivers/staging/uwb/i1480/dfu/mac.c + delete mode 100644 drivers/staging/uwb/i1480/dfu/phy.c + delete mode 100644 drivers/staging/uwb/i1480/dfu/usb.c + delete mode 100644 drivers/staging/uwb/i1480/i1480-est.c + delete mode 100644 drivers/staging/uwb/ie-rcv.c + delete mode 100644 drivers/staging/uwb/ie.c + delete mode 100644 drivers/staging/uwb/include/debug-cmd.h + delete mode 100644 drivers/staging/uwb/include/spec.h + delete mode 100644 drivers/staging/uwb/include/umc.h + delete mode 100644 drivers/staging/uwb/include/whci.h + delete mode 100644 drivers/staging/uwb/lc-dev.c + delete mode 100644 drivers/staging/uwb/lc-rc.c + delete mode 100644 drivers/staging/uwb/neh.c + delete mode 100644 drivers/staging/uwb/pal.c + delete mode 100644 drivers/staging/uwb/radio.c + delete mode 100644 drivers/staging/uwb/reset.c + delete mode 100644 drivers/staging/uwb/rsv.c + delete mode 100644 drivers/staging/uwb/scan.c + delete mode 100644 drivers/staging/uwb/umc-bus.c + delete mode 100644 drivers/staging/uwb/umc-dev.c + delete mode 100644 drivers/staging/uwb/umc-drv.c + delete mode 100644 drivers/staging/uwb/uwb-debug.c + delete mode 100644 drivers/staging/uwb/uwb-internal.h + delete mode 100644 drivers/staging/uwb/uwb.h + delete mode 100644 drivers/staging/uwb/uwbd.c + delete mode 100644 drivers/staging/uwb/whc-rc.c + delete mode 100644 drivers/staging/uwb/whci.c + delete mode 100644 drivers/staging/wilc1000/microchip,wilc1000,sdio.txt + create mode 100644 drivers/staging/wilc1000/microchip,wilc1000,sdio.yaml + delete mode 100644 drivers/staging/wilc1000/microchip,wilc1000,spi.txt + create mode 100644 drivers/staging/wilc1000/microchip,wilc1000,spi.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 (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (4721e67698cd dmaengine: idxd: remove set but unused 'rc') +$ git merge slave-dma/next +Auto-merging drivers/dma/tegra20-apb-dma.c +Auto-merging drivers/dma/idxd/sysfs.c +Auto-merging drivers/dma/idxd/cdev.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/ti-edma.txt | 2 +- + drivers/dma/Kconfig | 4 +- + 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/idxd/cdev.c | 5 +- + drivers/dma/idxd/sysfs.c | 3 +- + drivers/dma/ioat/dca.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/omap-dma.c | 2 +- + drivers/dma/uniphier-mdmac.c | 2 +- + drivers/dma/xilinx/xilinx_dma.c | 65 +-- + 22 files changed, 658 insertions(+), 468 deletions(-) +Merging cgroup/for-next (9bd5910d7f3d selftests/cgroup: add tests for cloning into cgroups) +$ git merge cgroup/for-next +Auto-merging kernel/fork.c +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 5 +- + include/linux/cgroup.h | 24 +- + include/linux/cpuset.h | 3 - + include/linux/sched/task.h | 4 + + include/uapi/linux/sched.h | 5 + + kernel/cgroup/cgroup-v1.c | 1 + + kernel/cgroup/cgroup.c | 367 ++++++++++++++++------ + kernel/cgroup/cpuset.c | 31 +- + kernel/cgroup/pids.c | 15 +- + kernel/fork.c | 19 +- + kernel/power/process.c | 2 - + tools/testing/selftests/cgroup/Makefile | 6 +- + tools/testing/selftests/cgroup/cgroup_util.c | 126 ++++++++ + tools/testing/selftests/cgroup/cgroup_util.h | 4 + + tools/testing/selftests/cgroup/test_core.c | 177 +++++++++++ + tools/testing/selftests/clone3/clone3_selftests.h | 19 +- + 16 files changed, 674 insertions(+), 134 deletions(-) +Merging scsi/for-next (214527ada4ee Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging arch/mips/configs/jazz_defconfig +Merge made by the 'recursive' strategy. + 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 - + drivers/scsi/Kconfig | 9 - + drivers/scsi/advansys.c | 2 +- + drivers/scsi/ch.c | 40 +- + 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/qla2xxx/qla_attr.c | 133 ++- + drivers/scsi/qla2xxx/qla_bsg.c | 27 +- + drivers/scsi/qla2xxx/qla_def.h | 356 ++++-- + drivers/scsi/qla2xxx/qla_fw.h | 170 ++- + drivers/scsi/qla2xxx/qla_gbl.h | 19 +- + drivers/scsi/qla2xxx/qla_gs.c | 1703 ++++++++++++--------------- + drivers/scsi/qla2xxx/qla_init.c | 51 +- + drivers/scsi/qla2xxx/qla_iocb.c | 20 +- + drivers/scsi/qla2xxx/qla_isr.c | 179 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 257 +++- + drivers/scsi/qla2xxx/qla_mid.c | 10 + + drivers/scsi/qla2xxx/qla_os.c | 646 +++++++++- + drivers/scsi/qla2xxx/qla_target.c | 28 +- + drivers/scsi/qla2xxx/qla_target.h | 2 + + drivers/scsi/qla2xxx/qla_tmpl.c | 17 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 25 + + drivers/scsi/scsi.c | 4 - + drivers/scsi/scsi_priv.h | 1 - + drivers/scsi/scsi_transport_iscsi.c | 68 ++ + drivers/scsi/sr.c | 20 +- + drivers/scsi/sr.h | 2 + + drivers/scsi/sr_vendor.c | 8 - + drivers/scsi/ufs/cdns-pltfrm.c | 2 +- + drivers/scsi/ufs/ufs-hisi.c | 2 +- + drivers/scsi/ufs/ufs-mediatek.c | 79 +- + drivers/scsi/ufs/ufs-mediatek.h | 12 + + drivers/scsi/ufs/ufs-qcom.c | 118 +- + drivers/scsi/ufs/ufs.h | 3 + + drivers/scsi/ufs/ufshcd-pci.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 99 +- + drivers/scsi/ufs/ufshcd.h | 11 + + 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/scsi_host.h | 3 - + include/scsi/scsi_transport_iscsi.h | 1 + + include/target/target_core_base.h | 45 +- + include/uapi/scsi/fc/fc_els.h | 211 +++- + 104 files changed, 3621 insertions(+), 1777 deletions(-) +Merging scsi-mkp/for-next (162e250031cc scsi: lpfc: fix spelling mistake "Notication" -> "Notification") +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (370e2c82a4a5 vhost: use batched version by default) +$ git merge vhost/linux-next +Auto-merging include/linux/ptr_ring.h +Merge made by the 'recursive' strategy. + drivers/vhost/vhost.c | 232 ++++++++++++++++++++++++++++------------------- + drivers/vhost/vhost.h | 12 +++ + include/linux/ptr_ring.h | 79 +++++++++++++++- + tools/virtio/Makefile | 27 +++++- + 4 files changed, 253 insertions(+), 97 deletions(-) +Merging rpmsg/for-next (5a87e60312a9 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (ee82ebf16ccb 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-wcd934x.c | 9 +- + drivers/gpio/gpiolib-of.c | 139 ++++++++++++++-- + drivers/gpio/gpiolib-of.h | 2 + + drivers/gpio/gpiolib.c | 372 ++++++++++++++++++++++++++++++++---------- + 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 +++++++++++ + 19 files changed, 666 insertions(+), 133 deletions(-) + create mode 100644 tools/gpio/gpio-watch.c +Merging gpio-brgl/gpio/for-next (b8419b067390 gpiolib: fix unwatch ioctl()) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-uniphier.c | 2 +- + drivers/gpio/gpiolib.c | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 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 (2d2177ffa269 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +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/freescale/pinctrl-scu.c | 4 +- + 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/meson/pinctrl-meson-gxl.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 7 +- + 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 | 48 +- + 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/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 +- + 51 files changed, 2887 insertions(+), 622 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 (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9871abffc810 pwm: Remove set but not set variable 'pwm') +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (61a47c1ad3a4 sysctl: Remove the sysctl system call) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (9b5f852ae20d ktest: Make default build option oldconfig not randconfig) +$ git merge ktest/for-next +Merge made by the 'recursive' strategy. + tools/testing/ktest/ktest.pl | 2 +- + tools/testing/ktest/sample.conf | 22 +++++++++++----------- + 2 files changed, 12 insertions(+), 12 deletions(-) +Merging random/dev (4cb760b02419 s390x: Mark archrandom.h functions __must_check) +$ git merge random/dev +Already up to date. +Merging kselftest/next (3032e3a7c7e3 selftests/resctrl: Add the test in MAINTAINERS) +$ git merge kselftest/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + tools/testing/selftests/resctrl/Makefile | 17 + + tools/testing/selftests/resctrl/README | 53 ++ + tools/testing/selftests/resctrl/cache.c | 272 +++++++++ + tools/testing/selftests/resctrl/cat_test.c | 250 ++++++++ + tools/testing/selftests/resctrl/cqm_test.c | 176 ++++++ + tools/testing/selftests/resctrl/fill_buf.c | 213 +++++++ + tools/testing/selftests/resctrl/mba_test.c | 171 ++++++ + tools/testing/selftests/resctrl/mbm_test.c | 145 +++++ + tools/testing/selftests/resctrl/resctrl.h | 107 ++++ + tools/testing/selftests/resctrl/resctrl_tests.c | 202 +++++++ + tools/testing/selftests/resctrl/resctrl_val.c | 744 ++++++++++++++++++++++++ + tools/testing/selftests/resctrl/resctrlfs.c | 722 +++++++++++++++++++++++ + 13 files changed, 3073 insertions(+) + create mode 100644 tools/testing/selftests/resctrl/Makefile + create mode 100644 tools/testing/selftests/resctrl/README + create mode 100644 tools/testing/selftests/resctrl/cache.c + create mode 100644 tools/testing/selftests/resctrl/cat_test.c + create mode 100644 tools/testing/selftests/resctrl/cqm_test.c + create mode 100644 tools/testing/selftests/resctrl/fill_buf.c + create mode 100644 tools/testing/selftests/resctrl/mba_test.c + create mode 100644 tools/testing/selftests/resctrl/mbm_test.c + create mode 100644 tools/testing/selftests/resctrl/resctrl.h + create mode 100644 tools/testing/selftests/resctrl/resctrl_tests.c + create mode 100644 tools/testing/selftests/resctrl/resctrl_val.c + create mode 100644 tools/testing/selftests/resctrl/resctrlfs.c +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (d28b4c1b2b3d Merge branch 'for-5.6/selftests' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (4594d082dbe6 rtc: zynqmp: Clear alarm interrupt status before interrupt enable) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-sh.c | 3 +-- + drivers/rtc/rtc-zynqmp.c | 27 +++++++++++++++++++++++---- + 2 files changed, 24 insertions(+), 6 deletions(-) +Merging nvdimm/libnvdimm-for-next (7b27a8622f80 libnvdimm/e820: Retrieve and populate correct 'target_node' info) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging arch/x86/Kconfig +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 (1ef512b16bc8 NTB: Fix an error in get link status) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/amd/ntb_hw_amd.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 ++-- + drivers/ntb/hw/amd/ntb_hw_amd.h | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging kspp/for-next/kspp (c79f46a28239 Linux 5.5-rc5) +$ git merge kspp/for-next/kspp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (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 341d4ffadcbe] Merge remote-tracking branch 'fsi/next' +$ git diff -M --stat --summary HEAD^.. +Merging slimbus/for-next (526eaf5d08a2 slimbus: Use the correct style for SPDX License Identifier) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (8daa31303194 nvmem: release the write-protect pin) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + drivers/nvmem/core.c | 80 ++++++++++++++++++++++-------------------- + drivers/nvmem/imx-ocotp.c | 21 +++++++++++ + include/linux/nvmem-consumer.h | 7 ++++ + 3 files changed, 70 insertions(+), 38 deletions(-) +Merging xarray/xarray (3a00e7c47c38 ida: remove abandoned macros) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + include/linux/xarray.h | 4 ++-- + lib/radix-tree.c | 8 -------- + lib/test_xarray.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ + lib/xarray.c | 5 +++-- + 4 files changed, 60 insertions(+), 12 deletions(-) +Merging hyperv/hyperv-next (54e19d34011f hv_utils: Add the support of hibernation) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (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 (46dbfe265841 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 (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (309db92e29b1 fpga: zynq: Remove clk_get error message for probe defer) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-afu-main.c | 26 +++++++++++++++----------- + drivers/fpga/dfl-fme-main.c | 19 ++++++++++++------- + drivers/fpga/dfl.c | 15 +++++++++++++-- + drivers/fpga/dfl.h | 35 +++++++++++++++++++++++++++-------- + drivers/fpga/zynq-fpga.c | 3 ++- + 5 files changed, 69 insertions(+), 29 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 kasan-bitops/topic/kasan-bitops (4f4afc2c9599 docs/core-api: Remove possibly confusing sub-headings from Bit Operations) +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging kunit-next/kunit (be886ba90cce kunit: run kunit_tool from any directory) +$ git merge kunit-next/kunit +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/usage.rst | 1 + + tools/testing/kunit/kunit.py | 12 ++++++++++++ + tools/testing/kunit/kunit_kernel.py | 28 ++++++++++++++++------------ + 3 files changed, 29 insertions(+), 12 deletions(-) +$ git am -3 ../patches/0001-RDMA-bnxt_re-using-vmalloc-requires-includeing-vmall.patch +Applying: RDMA/bnxt_re: using vmalloc requires includeing vmalloc.h +Merging akpm-current/current (447805d7b070 init/Kconfig: clean up ANON_INODES and old IO schedulers options) +$ git merge --no-ff akpm-current/current +Auto-merging mm/shmem.c +Auto-merging mm/mempolicy.c +Auto-merging mm/Makefile +Auto-merging mm/Kconfig +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/fair.c +Auto-merging kernel/module.c +Auto-merging kernel/fork.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/wait.h +Auto-merging include/linux/sched.h +Auto-merging fs/pipe.c +Auto-merging arch/x86/Kconfig +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 arch/arm64/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/m68k/include/asm/Kbuild' using previous resolution. +Recorded preimage for 'arch/microblaze/include/asm/Kbuild' +Resolved 'init/main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/microblaze/include/asm/Kbuild'. +[master 39aeb3221e59] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v1/hugetlb.rst | 103 +++- + Documentation/admin-guide/kernel-parameters.txt | 13 +- + Documentation/core-api/pin_user_pages.rst | 86 ++- + .../debug/debug-vm-pgtable/arch-support.txt | 35 ++ + Documentation/process/deprecated.rst | 10 +- + Documentation/vm/free_page_reporting.rst | 41 ++ + Documentation/vm/zswap.rst | 20 +- + MAINTAINERS | 7 + + arch/Kconfig | 5 +- + arch/alpha/include/asm/Kbuild | 11 - + arch/alpha/kernel/syscalls/syscallhdr.sh | 2 +- + arch/arc/Kconfig | 1 + + arch/arc/include/asm/Kbuild | 21 - + arch/arm/include/asm/Kbuild | 12 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/Kbuild | 18 - + 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/ia64/include/asm/Kbuild | 7 - + arch/ia64/kernel/syscalls/syscallhdr.sh | 2 +- + arch/m68k/include/asm/Kbuild | 24 - + arch/m68k/mm/fault.c | 2 +- + arch/microblaze/include/asm/Kbuild | 29 - + arch/microblaze/kernel/syscalls/syscallhdr.sh | 2 +- + arch/mips/include/asm/Kbuild | 13 - + arch/mips/kernel/syscalls/syscallhdr.sh | 3 +- + arch/mips/mm/fault.c | 2 +- + arch/nds32/include/asm/Kbuild | 37 -- + arch/nios2/include/asm/Kbuild | 38 -- + arch/openrisc/include/asm/Kbuild | 36 -- + arch/parisc/include/asm/Kbuild | 18 - + arch/parisc/kernel/syscalls/syscallhdr.sh | 2 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/Kbuild | 4 - + arch/powerpc/kernel/syscalls/syscallhdr.sh | 3 +- + arch/powerpc/kvm/e500_mmu_host.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- + arch/riscv/include/asm/Kbuild | 28 - + arch/s390/Kconfig | 1 + + arch/s390/include/asm/Kbuild | 15 - + arch/sh/include/asm/Kbuild | 16 - + arch/sh/kernel/syscalls/syscallhdr.sh | 2 +- + arch/sh/mm/fault.c | 2 +- + arch/sparc/include/asm/Kbuild | 14 - + arch/sparc/kernel/syscalls/syscallhdr.sh | 2 +- + arch/unicore32/include/asm/Kbuild | 34 -- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/Kbuild | 2 - + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/mm/fault.c | 28 +- + arch/xtensa/include/asm/Kbuild | 26 - + arch/xtensa/kernel/syscalls/syscallhdr.sh | 2 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/base/memory.c | 126 ++--- + drivers/base/node.c | 2 +- + drivers/block/loop.c | 246 ++++++-- + drivers/block/loop.h | 14 +- + drivers/virtio/Kconfig | 1 + + drivers/virtio/virtio_balloon.c | 87 ++- + fs/aio.c | 9 +- + fs/binfmt_elf.c | 48 +- + fs/buffer.c | 56 +- + fs/eventpoll.c | 8 +- + fs/fat/inode.c | 19 +- + fs/ocfs2/alloc.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 2 - + fs/ocfs2/cluster/tcp.c | 3 +- + fs/ocfs2/dir.c | 4 +- + fs/ocfs2/dlm/dlmmaster.c | 2 - + fs/ocfs2/dlm/dlmthread.c | 3 - + fs/ocfs2/dlmglue.c | 2 +- + 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/cpuinfo.c | 1 + + fs/proc/generic.c | 31 +- + fs/proc/inode.c | 187 ++++-- + 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 + + include/asm-generic/Kbuild | 52 ++ + include/asm-generic/tlb.h | 3 +- + include/linux/hugetlb.h | 49 +- + include/linux/hugetlb_cgroup.h | 169 +++++- + include/linux/kthread.h | 3 +- + include/linux/memcontrol.h | 55 +- + include/linux/memory.h | 1 - + include/linux/mempolicy.h | 29 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 117 +++- + include/linux/mm_types.h | 7 +- + include/linux/mmdebug.h | 5 + + include/linux/mmzone.h | 50 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 11 + + include/linux/page_ref.h | 9 + + include/linux/page_reporting.h | 26 + + include/linux/percpu_counter.h | 4 +- + include/linux/proc_fs.h | 17 +- + include/linux/sched.h | 8 + + include/linux/stackdepot.h | 2 + + include/linux/string.h | 45 ++ + include/linux/vmalloc.h | 5 +- + include/linux/wait.h | 4 +- + include/trace/events/mmflags.h | 1 + + include/uapi/linux/mman.h | 5 +- + include/uapi/linux/virtio_balloon.h | 1 + + init/Kconfig | 3 +- + init/main.c | 2 + + ipc/util.c | 1 + + kernel/cgroup/cgroup.c | 1 + + kernel/events/core.c | 3 +- + kernel/extable.c | 3 +- + kernel/fork.c | 19 +- + kernel/hung_task.c | 44 ++ + kernel/kallsyms.c | 2 - + kernel/module.c | 1 + + kernel/notifier.c | 2 +- + kernel/relay.c | 17 +- + kernel/sched/fair.c | 2 +- + kernel/watchdog.c | 22 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 44 ++ + lib/Makefile | 6 + + lib/bch.c | 2 +- + lib/scatterlist.c | 2 +- + lib/stackdepot.c | 41 +- + lib/test_bitmap.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 +- + mm/Kconfig | 129 ++++- + mm/Makefile | 2 + + mm/debug.c | 44 +- + mm/debug_vm_pgtable.c | 389 +++++++++++++ + mm/filemap.c | 2 +- + mm/gup.c | 456 +++++++++++---- + mm/gup_benchmark.c | 71 ++- + mm/huge_memory.c | 32 +- + mm/hugetlb.c | 624 +++++++++++++++------ + mm/hugetlb_cgroup.c | 317 +++++++++-- + mm/internal.h | 2 + + mm/kasan/common.c | 23 - + mm/kmemleak.c | 2 +- + mm/list_lru.c | 12 +- + mm/mapping_dirty_helpers.c | 42 +- + mm/memcontrol.c | 104 ++-- + mm/memory.c | 40 +- + mm/memory_hotplug.c | 16 +- + mm/mempolicy.c | 70 ++- + mm/memremap.c | 20 + + mm/migrate.c | 96 ++-- + mm/mmap.c | 48 +- + mm/mprotect.c | 38 +- + mm/mremap.c | 90 ++- + mm/nommu.c | 10 +- + mm/page-writeback.c | 8 +- + mm/page_alloc.c | 174 ++++-- + mm/page_ext.c | 5 +- + mm/page_isolation.c | 6 +- + mm/page_reporting.c | 364 ++++++++++++ + mm/page_reporting.h | 54 ++ + mm/rmap.c | 19 +- + mm/shmem.c | 15 +- + mm/shuffle.c | 14 +- + mm/shuffle.h | 6 + + mm/slab.h | 22 +- + mm/slab_common.c | 3 +- + mm/slub.c | 18 +- + mm/sparse.c | 2 +- + mm/swap.c | 1 - + mm/swapfile.c | 52 +- + mm/vmalloc.c | 11 +- + mm/vmpressure.c | 8 +- + mm/vmscan.c | 33 +- + mm/vmstat.c | 2 + + mm/z3fold.c | 1 - + mm/zswap.c | 24 +- + samples/hw_breakpoint/data_breakpoint.c | 11 +- + scripts/checkpatch.pl | 141 ++++- + scripts/spelling.txt | 1 + + .../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/mremap_dontunmap.c | 313 +++++++++++ + tools/testing/selftests/vm/run_vmtests | 37 ++ + tools/testing/selftests/vm/write_hugetlb_memory.sh | 23 + + tools/testing/selftests/vm/write_to_hugetlbfs.c | 242 ++++++++ + 201 files changed, 6706 insertions(+), 1858 deletions(-) + create mode 100644 Documentation/features/debug/debug-vm-pgtable/arch-support.txt + create mode 100644 Documentation/vm/free_page_reporting.rst + create mode 100644 include/linux/page_reporting.h + create mode 100644 lib/test_lockup.c + create mode 100644 mm/debug_vm_pgtable.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: mm/frontswap: mark various intentional data races +Applying: mm/page_io: mark various intentional data races +Applying: mm-page_io-mark-various-intentional-data-races-v2 +Applying: mm/swap_state: mark various intentional data races +Applying: mm/kmemleak: annotate various data races obj->ptr +Applying: mm/filemap.c: fix a data race in filemap_fault() +Applying: mm/swapfile: fix and annotate various data races +Applying: mm-swapfile-fix-and-annotate-various-data-races-v2 +Applying: mm/page_counter: fix various data races at memsw +Applying: mm/memcontrol: fix a data race in scan count +Applying: mm/list_lru: fix a data race in list_lru_count_one +Applying: mm/mempool: fix a data race in mempool_free() +Applying: mm/util.c: annotate an data race at vm_committed_as +Applying: mm/rmap: annotate a data race at tlb_flush_batched +Applying: mm: annotate a data race in page_zonenum() +Applying: mm/memory.c: refactor insert_page to prepare for batched-lock insert +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: net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy +Applying: net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix +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 + + f263ace1401e...9a0ec8b33c10 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (9a0ec8b33c10 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/tty/serial/sh-sci.c | 2 +- + include/linux/memcontrol.h | 2 +- + include/linux/mm.h | 3 + + mm/filemap.c | 20 ++-- + mm/frontswap.c | 8 +- + mm/kmemleak.c | 9 +- + mm/list_lru.c | 2 +- + mm/memory.c | 157 +++++++++++++++++++++++---- + mm/mempool.c | 2 +- + mm/page_counter.c | 13 ++- + mm/page_io.c | 8 +- + mm/rmap.c | 2 +- + mm/swap_state.c | 4 +- + mm/swapfile.c | 31 +++--- + mm/util.c | 8 +- + net/ipv4/tcp.c | 70 ++++++++++-- + 17 files changed, 272 insertions(+), 73 deletions(-) +$ git am -3 ../patches/0001-Revert-net-zerocopy-use-vm_insert_pages-for-tcp-rcv-.patch +Applying: Revert "net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix" +$ git am -3 ../patches/0002-Revert-net-zerocopy-use-vm_insert_pages-for-tcp-rcv-.patch +Applying: Revert "net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy" +$ git am -3 ../patches/0003-Revert-add-missing-page_count-check-to-vm_insert_pag.patch +Applying: Revert "add missing page_count() check to vm_insert_pages()." +$ git am -3 ../patches/0004-Revert-mm-add-vm_insert_pages-fix.patch +Applying: Revert "mm-add-vm_insert_pages-fix" +$ git am -3 ../patches/0005-Revert-mm-memory.c-add-vm_insert_pages.patch +Applying: Revert "mm/memory.c: add vm_insert_pages()" 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..404b1cd8ad0a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200226 |