diff options
| -rw-r--r-- | Next/SHA1s | 315 | ||||
| -rw-r--r-- | Next/Trees | 317 | ||||
| -rw-r--r-- | Next/merge.log | 9604 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 10239 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..cd77b4a88569 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,315 @@ +Name SHA1 +---- ---- +origin c79f46a282390e0f5b306007bf7b11a46d529538 +fixes 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c +kbuild-current 3a562aee727a7bfbb3a37b1aa934118397dad701 +arc-current 7ecc6c1d5c8dbc713c647512a5267ca0eafe3e1c +arm-current 39f4d441048444f38fcfcfb1aa3102c030544e86 +arm-soc-fixes 850e0a99361b6fd88f8def26f9422a0561654c2f +arm64-fixes aa638cfe3e7358122a15cb1d295b622aae69e006 +m68k-current 5ed0794cde59365d4d5895b89bb2f7ef7ffdbd55 +powerpc-fixes 6da3eced8c5f3b03340b0c395bacd552c4d52411 +s390-fixes b4adfe55915d8363e244e42386d69567db1719b9 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net d89091a4930ee0d80bee3e259a98513f3a2543ec +bpf d89091a4930ee0d80bee3e259a98513f3a2543ec +ipsec 738d2902773e30939a982c8df7a7f94293659810 +netfilter 5acab91458ceae0e4b15205fda5437631089f7ee +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers 33328bfab892d676920abb440d41fbf4b16c2717 +mac80211 02a614499600af836137c3fbc4404cd96365fff2 +rdma-fixes fd6988496e79a6a4bdb514a4655d2920209eb85d +sound-current fbca72c1542b12495512debf9426426a6687dbde +sound-asoc-fixes 468c6402c71baca0ee0fbacc30a1abe86295bdd7 +regmap-fixes c79f46a282390e0f5b306007bf7b11a46d529538 +regulator-fixes f3218fe51b655a5ffb793af3ff99f4b980295e3c +spi-fixes 798a4942a83f9c5f83c6662f5fa484b9f3680771 +pci-current ca01e7987463e8675f223c366e262e82f633481a +driver-core.current d1eef1c619749b2a57e514a3fa67d9a516ffa919 +tty.current c5ee0b3104e0b292d353e63fd31cb8c692645d8c +usb.current 2548288b4fb059b2da9ceada172ef763077e8a59 +usb-gadget-fixes e5b5da96da50ef30abb39cb9f694e99366404d24 +usb-serial-fixes 2438c3a19dec5e98905fd3ffcc2f24716aceda6b +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 4f510aa10468954b1da4e94689c38ac6ea8d3627 +staging.current 58dcc5bf4030cab548d5c98cd4cd3632a5444d5a +char-misc.current c79f46a282390e0f5b306007bf7b11a46d529538 +soundwire-fixes e42617b825f8073569da76dc4510bfa019b1c35a +thunderbolt-fixes fd6988496e79a6a4bdb514a4655d2920209eb85d +input-current 1021dcf19db1387bc0db26d14bbcba719923a466 +crypto-current 84faa307249b341f6ad8de3e1869d77a65e26669 +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes c79f46a282390e0f5b306007bf7b11a46d529538 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +slave-dma-fixes b0b5ce1010ffc50015eaec72b0028aaae3f526bb +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes df8fed831cbcdce7b283b2d9c1aadadcf8940d05 +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes ce644cf3fa06504c2c71ab1b794160d54aaccbc0 +reset-fixes db23808615e29d9a04f96806cac56f78b0fee0ef +mips-fixes bbcc5672b0063b0e9d65dc8787a4f09c3b5bb5cc +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 03729cfa0d543bc996bf959e762ec999afc8f3d2 +kvm-fixes 2f13437b8917627119d163d62f73e7a78a92303a +kvms390-fixes fe33a928bfcd673ecf73b990d704ef18a907c409 +hwmon-fixes 20358214d96b05d87276bdf5a318dc200082206e +nvdimm-fixes c1468554776229d0db69e74a9aaf6f7e7095fd51 +btrfs-fixes 18cade6d99b4d5b5eba9a8760811bc3fd307ac1f +vfs-fixes 7b3083ba718b6c6c86fe2cdc143f85b814fc08a9 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 46cf053efec6a3a5f343fead837777efe8252a46 +samsung-krzk-fixes a2315d3aea5976acd919d3d3fcf82f752562c25b +pinctrl-samsung-fixes e42617b825f8073569da76dc4510bfa019b1c35a +devicetree-fixes dbce0b65046d1735d7054c54ec2387dba84ba258 +scsi-fixes e4dc9a4c31fe10d1751c542702afc85be8a5c56a +drm-fixes a6204fc7b83cbe3398f61cf1742b09f66f0ae220 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes fd6988496e79a6a4bdb514a4655d2920209eb85d +mmc-fixes f667216c5c7c967c3e568cdddefb51fe606bfe26 +rtc-fixes f01f4ffdfb703694035870f94b10f6ef2523f8de +gnss-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +hyperv-fixes af42d3466bdc8f39806b26f593604fdc54140bcb +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes c79f46a282390e0f5b306007bf7b11a46d529538 +pidfd-fixes 43cf75d96409a20ef06b756877a2e72b10a026fc +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx 2f13437b8917627119d163d62f73e7a78a92303a +gpio-intel-fixes e42617b825f8073569da76dc4510bfa019b1c35a +pinctrl-intel-fixes b9a19bdbc843abd659e8ec6b1b3c32ae3a2455eb +erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +drm-misc-fixes c4e4fccc5d52d881afaac11d3353265ef4eccb8b +kspp-gustavo 3d519d6d388ba4f9a75d0e0b6f60d890987bc096 +kbuild 673cbf22a7290836d872596930ae2c767a570ccf +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping a7ba70f1787f977f970cd116076c6fce4b9e01cc +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc 9fbea0b7e842890a76acffce9be9e430b9e11194 +arm 04bb96427d4ee33fbdf15648ddf578c6ba1aef54 +arm64 de858040ee80e6f41bf0b40090f1c71f966a61b3 +arm-perf 8703317ae576c9bf3e07e5b97275e3f957e8d74b +arm-soc e69c21d25d97bc7d66ef5decc95cf78ad584f872 +amlogic 714767cd90718f876789f61c7e7af700aa045db0 +aspeed e4aab38ed5d1b8316f25786e6ec6adb34449b294 +at91 0e2a6c95b2b9fc3a2ef4cef4acace2c319acc3b6 +bcm2835 f142341846711f8f3cb85e4df5e0130d9e017a9d +imx-mxs 3a0811a3b9c6689fe6535f504304439e7a441d82 +keystone 2af8e1f26c6596540d95965fd45fca2692696e1e +mediatek ca01a6367d0fed86ad4719f8aa5df2a955002fe2 +mvebu cd592187f9de3c6305d6c1c66f7fac084cb5b846 +omap cf9ea4b7c3706f0256784682b746cf01b4c25520 +qcom 99befae30d0896a7facdb5fc1fdacc56d6d2f483 +realtek 44242a468f3a303a88e76d902b02afb998c47720 +renesas 9604d3647916249d47ac9ff4662fa52600c969eb +reset 4cf176e52397853e4a4dd37e917c5eafb47ba8d1 +rockchip cfa95f7bcd3c267bd3228ac3bee88e9970d24bc1 +samsung-krzk 72475dbe8f40c660f591de2e3e8d309d78087d85 +scmi c79f46a282390e0f5b306007bf7b11a46d529538 +sunxi dddab4c4ad4a2d3503751ae37adbfcaef8663134 +tegra e0fd54137bf5a65d2523ffeec69e5a15935cb4e5 +clk 67d81d7a2ef388c66b472140e0d3f2d04e4da713 +clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 3566ce3b55af560e3661d5e4a1ae6d36da7a685a +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 240b62d381fe5b66c496a6fd55edff3976a9be51 +m68k 5ed0794cde59365d4d5895b89bb2f7ef7ffdbd55 +m68knommu c79f46a282390e0f5b306007bf7b11a46d529538 +microblaze 22648c989cb8305f51b96b5962df8674697bb2ab +mips a8d0f11ee50ddbd9f243c7a8b1a393a4f23ba093 +nds32 a7f96fce201c4969178c8709a49e005d9792186b +nios2 e32ea127d81c12882f39c2783d78634597ff21a2 +openrisc 0ecdcaa6d5e78649578ff32c37556a4140b64edf +parisc-hd 22b4b7c41c2addc9bdb7d03874621cfe633fb8fd +powerpc 3a9d970f17e05a7b26f782beb8f7f2118d1741ea +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 5a35435ef4e6e4bd2aabd6706b146b298a9cffe5 +risc-v 43dfc616798318d3fc8862c70c645c53cf976042 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 d1eef1c619749b2a57e514a3fa67d9a516ffa919 +sh a193018e5290ee9d9fe62ad80cd8f874711eb575 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 9807019a62dc670c73ce8e59e09b41ae458c34b3 +xtensa bd6d7558140c8b3094b7385fffd8162ccbeac6ab +fscrypt f4a0b08b39ae9c81c827c06550579f4580bd82ac +afs 4fe171bb81b13b40bf568330ec3716dfb304ced1 +btrfs 3ae03c13879da26b110cfd00bfafd6940b6e5fb0 +ceph da08e1e1d7c3f805f8771ad6a6fd3a7a30ba4fe2 +cifs 30b1b3802b204ac5b8b1822943d6d8972c71b179 +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs 2dd06edbd7ae11532ce5473eaf2f01d117cd0ce9 +ext3 d9e9866803f7b6c3fdd35d345e97fb0b2908bbbc +ext4 40eaaeb117586e3722acb6e50292737cbedbf385 +f2fs 846b67ccce8b6b2235fa6c44d8d68570735d7cd6 +fsverity 8086c974ecb937c26b16248c8270b2a89398defd +fuse 8d66fcb7488486bf144eab852e87e03a45e0fd3a +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs c79f46a282390e0f5b306007bf7b11a46d529538 +nfs-anna ffb855611b05e79497b81b7bc6234a105b820d7c +nfsd e44b4bf2648ef05ff1cde9f354079bce58a5ebde +orangefs f9bbb68233aa5bd5ef238bd3532fddf92fa1b53c +overlayfs 6c7bed08450710bb3c80c5f9620a0978f91b5c36 +ubifs 6e78c01fde9023e0701f3af880c1fd9de6e4e8e3 +v9fs 79fb9216b7be1832b90c8ddf3c2d465b46670e81 +xfs 461af564ded4c88db9d706d85b129e16f4793cbe +iomap 4a58d8158f6d8459dd042648d79bd627786b7cd7 +djw-vfs 3253d9d093376d62b4a56e609f15d2ec5085ac73 +file-locks 98ca480a8f22fdbd768e3dad07024c8d4856576c +vfs 912dfe068c43fa13c587b8d30e73d335c5ba7d44 +printk e616b43fb3a3c3ae2ba02dc6a7bbeb9003c03c7d +pci cb224132f23e2dda31a71c49f055dd5ce88927fa +pstore 9e5f1c19800b808a37fb9815a26d382132c26c3d +hid 71bceec41644edd1f67c4ebe1dca6835f126d247 +i2c 2b496a15c21db4428df65232d5390d46922ca952 +i3c 608b68b67a309e96ee6a97fdb090553b14a814d0 +dmi 2429c99fa13a6330cd9e1b9e6086b290735e77bb +hwmon-staging 00b379b51ea698de38c936815204e954e200beb4 +jc_docs 3697aa15563f3bb06c27af135dd7be77af4fe71a +v4l-dvb 51e40a0dbe53cebe1f4b85bb47e250dc5a89b254 +v4l-dvb-next d45331b00ddb179e291766617259261c112db872 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 205a31f03a11768b8bee4bb5a501128f1c45e5a1 +cpufreq-arm bdeb9bbf9684159a994f4c881d2709077de55f94 +cpupower e42617b825f8073569da76dc4510bfa019b1c35a +opp 03758d60265c773e1d06d436b99ee338f2ac55d6 +thermal 09a1f1817b04570b2b8ba8575eaaff121d3e202c +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma fd6988496e79a6a4bdb514a4655d2920209eb85d +net-next 17aa23ee72342efdc3b214f582399dd22478887f +bpf-next 17aa23ee72342efdc3b214f582399dd22478887f +ipsec-next e27cca96cd68fa2c6814c90f9a1cfd36bb68c593 +mlx5-next e42617b825f8073569da76dc4510bfa019b1c35a +netfilter-next 4460985fac06f8e0e5bd4b86dcef49ada451583c +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next ae0a723c4cfd89dad31ce238f47ccfbe81b35b84 +bluetooth 19220f35b3708dc069135046061fbe7366d5cb6e +mac80211-next 1ee7826ab68f7e9fa1a01533983acf6a6f62e297 +gfs2 b5ce5b99343c05e870629ebe9dc9a84f1926d211 +mtd 589e1b6c47ce72fcae103c2e45d899610c92c11e +nand 777260a5c99226cfa58325b6a7c2f39bb46f5aaf +spi-nor 707745e8d4e75b638b990d67950ab292b3b8ea2a +crypto 79bfa4e737f53ebb8fa0b1fe912889a034f6d92c +drm f5c547efa16c0ea5abff0596e829f502be11902e +amdgpu 0408dddce3d8af79df26dde19b9faa83e80995ef +drm-intel 1ee48a61aa57dbdbc3cd2808d8b28df40d938e44 +drm-tegra d66dfcf80d0f55f95b9ea4a45ca41cc7115e9789 +drm-misc 02da7c3d79528c8c6553e74c37562874fe898a21 +drm-msm 6b16f05aa39f9fae43c18d4fd1ddad7988ab6d90 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8 +regmap 62c51f0d39c34ada68e6422afef69e35da73782c +sound f1dd4795b1523fbca7ab4344dd5a8bb439cc770d +sound-asoc bae7f34b37ba9dfd16e5c35cb159c215d61b297b +modules ce2b617ce8cbb7ba7a956299061bbc784131333c +input fd7bba685e7d9ebc45de2a7e9bd974fdd615abdf +block af1a37012a26e916ba94c361ca2738fba99ac073 +device-mapper 7fc979f8204fb763e203d3e716c17d352eb96b35 +pcmcia 71705c611263cad99edf85a5ea021e098cac032b +mmc 9f606f11ea98c7a34c9e8c7405ec80ef3572ce69 +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd ea9a89ca3b9537db9734b7d3e43927d130886c26 +backlight 102a1b382177d89f75bc49b931c329a317cf531f +battery 921377c0b4e8e240e0b56cb13bc22f2ecc4e59df +regulator 4ef4d9ff2e9dd48931195610ef09b6984f313556 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 341c1fda5e17156619fb71acfc7082b2669b4b72 +integrity f47825c694851955fa4c492dd56809621529b086 +keys 48274e1e5d24407bb2acb768c093add00bf92823 +selinux f1268534027a792f3d97a0cfff8041d314ef2fca +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo a8772fad0172aeae339144598b809fd8d4823331 +tpmdd c79f46a282390e0f5b306007bf7b11a46d529538 +watchdog dcbce5fbcc69bf2553f650004aad44bf390eca73 +iommu cdd1a5d53fd599907015f72b3ac67ec28ea286f1 +vfio 9917b54aded12dff9beb9e709981617b788e44b0 +audit cb5172d96d16df72db8b55146b0ec00bfd97f079 +devicetree 0cec114e36606412908a35695a5db944cec2e3db +mailbox c6c6bc6ea9fce31baaca053befc31215cfcb3dd9 +spi 3bfc0bc5d7ebda90c30d91f66cabea6bef5bb3fe +tip a7ae58bdb1cb742da0134cf3bacfc3ef923dd83a +clockevents 8c82723414d554b0fe863cb1fbb0a05aece6f3e2 +edac a651c6c64431765c7a833e37dae5b135622bdf04 +irqchip c6d732c8cc6702f890fb91fa58d57355b427f161 +ftrace fe6e096a5bbf73a142f09c72e7aa2835026eb1a3 +rcu de73daec335f0227b7303abb0814a3c00c0c55b2 +kvm 7d73710d9ca2564f29d291d0b3badc09efdf25e9 +kvm-arm c7455589449251b6aebd895495b5d4d669eeb503 +kvm-ppc 30486e72093ea2e594f44876b7a445c219449bce +kvms390 c7b7de63124645089ccf9900b9e5ea08059ccae0 +xen-tip d6bd6cf9feb81737f9f64d2c1acf98fdaacebad1 +percpu 06557cf18eae12b324a1a9e2f21a24c5c4942883 +workqueues 49e9d1a9faf2f71fdfd80a30697ee9a15070626d +drivers-x86 554f269f0f384d34f7e8052242df3b97be325924 +chrome-platform 737d6777b2315a8b85925affa91325eebac268bd +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 3e0801b62a30f5c83df0b7c75afce50061401e30 +ipmi 6b8526d3abc02c08a2f888e8c20b7ac9e5776dfe +driver-core 4c002c978b7f2f2306d53de051c054504af920a9 +usb 203b7ee14d3a38f1b8c44dd86ce0313d8fc4107d +usb-gadget 726b4fba94bec7e4c16bc681316e82455652c3a8 +usb-serial d1eef1c619749b2a57e514a3fa67d9a516ffa919 +usb-chipidea-next 4d6141288c33b73027260e73df262464cbe1fd0d +phy-next 1544133d48c3c511f7ec0f8f6d681a1d052dfc7f +tty 749e4121d6ee7fd4495779730fbc6ae800d0317c +char-misc c79f46a282390e0f5b306007bf7b11a46d529538 +extcon 2ddf50a75dab49eeb534dbdad92972f56a84046d +soundwire 09f6a72d014386939d21899921dd379006471a4b +thunderbolt fd6988496e79a6a4bdb514a4655d2920209eb85d +staging 0469fc6a1a8715b5c09117a26700da0d67061fb5 +mux f356d58c3a04159f35003b26f8c5183f9456f95d +icc 2c5127a7fa0369801e623e8c6e58193f86d31d73 +slave-dma 02939cd167095f16328a1bd5cab5a90b550606df +cgroup 899969b46c28937195da510abf0ea53d300bf5c7 +scsi 202f93b5d605450a44e2f56fb8d40c2226c19955 +scsi-mkp 1d83f0df7076a199012bdf66b4590c42079231b2 +vhost d1281e3a562ec6a08f944a876481dd043ba739b9 +rpmsg 447e58a8d18a3e7b2fda8014d1a126c3d94037cb +gpio 331d7ae3fa15f36a25fa83590d4bfcfc0e37a73c +gpio-brgl 2ddac5ae1eaeb5da8e18749887e620d8566a80c9 +gpio-intel e42617b825f8073569da76dc4510bfa019b1c35a +pinctrl 3cb71c4cf0b644249c3270e19d2fe119b6309d3b +pinctrl-intel 3a67fe38e76a590d2c8ce4731cd64fbd477e5f79 +pinctrl-samsung 225a2ec19aac426ef29f0e4accfc890c87d38bdc +pwm bd88d319abe9a4bb6cc63b23cc760bec46e81fe6 +userns 61a47c1ad3a4dc6882f01ebdc88138ac62d0df03 +ktest 9b5f852ae20d998a534eea46d54e68584868ae8c +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest 5f70bde26a48769012006e22f16cb768f9681020 +y2038 b8c709bf963a7e87dcd02ed5fb1f80199e521c08 +livepatching 7f436b3066e330f78a626b3af72ff549137cf114 +coresight ad9882f158845df08627dd41af03dddd28104897 +rtc d53f9b68b359cb53076e32030e0cfc2a6fcfcbaf +nvdimm 0dfbb932bb67dc76646e579ec5cd21a12125a458 +at24 69afc4b623088665677be09ea59627aaf080bff7 +ntb 1ef512b16bc8e51453d7105609c88f51fba4dcf5 +kspp c79f46a282390e0f5b306007bf7b11a46d529538 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss d1eef1c619749b2a57e514a3fa67d9a516ffa919 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus 526eaf5d08a21d2ea4b84f7df348702ba5cae00a +nvmem 9d5e6165e3584c1a7ad46d8ae66e039080c1a84f +xarray 6b81141deb7358dbd64ce3e793cd1e3f5939f807 +hyperv 7a1323b5dfe44a9013a2cc56ef2973034a00bf88 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb c58ff643763c78bef12874ee39995c9f7f987bc2 +pidfd 04882c321b26fef30d8eaa7af63fa62c06e45c76 +devfreq 91d7f3f8f1346ac5899c7e25a0dbd409212cdf53 +hmm fd6988496e79a6a4bdb514a4655d2920209eb85d +fpga 1d39387ce8594988a079a1f2617ea137702c7b2f +kunit e42617b825f8073569da76dc4510bfa019b1c35a +cel a99d8080aaf358d5d23581244e5da23b35e340b9 +kasan-bitops 4f4afc2c9599520300b3f2b3666d2034fca03df3 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +kunit-next c79f46a282390e0f5b306007bf7b11a46d529538 +akpm-current 3d23629963c74da9500dfeaa31ed7438873b67c5 +akpm 1929d737563abf16e6116c2eb5e9c875a849dd58 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..6d43eda0755a --- /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 +bcm2835 git git://github.com/anholt/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#for-next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +kasan-bitops git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/kasan-bitops +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5bfe1dff2294 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9604 @@ +$ date -R +Tue, 07 Jan 2020 07:45:44 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 91% (5500/6003)
Updating files: 92% (5523/6003)
Updating files: 93% (5583/6003)
Updating files: 94% (5643/6003)
Updating files: 95% (5703/6003)
Updating files: 96% (5763/6003)
Updating files: 97% (5823/6003)
Updating files: 98% (5883/6003)
Updating files: 99% (5943/6003)
Updating files: 100% (6003/6003)
Updating files: 100% (6003/6003), done. +HEAD is now at 768fc661d125 Merge tag 'riscv/for-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux +Merging origin/master (c79f46a28239 Linux 5.5-rc5) +$ git merge origin/master +Updating 768fc661d125..c79f46a28239 +Fast-forward + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fixes/master (31f4f5b495a6 Linux 5.4-rc7) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (3a562aee727a Merge tag 'for-5.5-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (7ecc6c1d5c8d ARC: pt_regs: remove hardcoded registers offset) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/entry-arcv2.h | 8 ++++---- + arch/arc/include/asm/hugepage.h | 1 - + arch/arc/kernel/asm-offsets.c | 10 +++++++++- + arch/arc/plat-eznps/Kconfig | 2 +- + 4 files changed, 14 insertions(+), 7 deletions(-) +Merging arm-current/fixes (39f4d4410484 Merge branch 'misc' into fixes) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (850e0a99361b Merge tag 'tee-optee-fix-for-5.5' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/mmp3.dtsi | 12 ++++++------ + arch/arm/mach-mmp/time.c | 2 +- + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 ++++---- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 8 ++++---- + drivers/clk/mmp/clk-of-mmp2.c | 2 +- + drivers/tee/optee/shm_pool.c | 15 ++++++++++++++- + 6 files changed, 30 insertions(+), 17 deletions(-) +Merging arm64-fixes/for-next/fixes (aa638cfe3e73 arm64: cpu_errata: Add Hisilicon TSV110 to spectre-v2 safe list) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (5ed0794cde59 m68k/atari: Convert Falcon IDE drivers to platform drivers) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (6da3eced8c5f powerpc/spinlocks: Include correct header for static key) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (b4adfe55915d s390/ftrace: save traced function caller) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) +$ git merge sparc/master +Removing arch/sparc/include/uapi/asm/statfs.h +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/statfs.h | 7 ------- + 1 file changed, 7 deletions(-) + delete mode 100644 arch/sparc/include/uapi/asm/statfs.h +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (d89091a4930e macb: Don't unregister clks unconditionally) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 2 +- + Documentation/networking/netdev-FAQ.rst | 4 +- + MAINTAINERS | 12 ++--- + drivers/net/can/m_can/tcan4x5x.c | 63 ++++++++++++++++++---- + drivers/net/can/mscan/mscan.c | 21 ++++---- + drivers/net/can/usb/gs_usb.c | 4 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 2 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 2 +- + drivers/net/dsa/mv88e6xxx/port.c | 12 ++--- + drivers/net/ethernet/broadcom/b44.c | 9 ++-- + drivers/net/ethernet/cadence/macb_main.c | 4 +- + drivers/net/ethernet/freescale/fec_main.c | 9 ++++ + drivers/net/ethernet/google/gve/gve_rx.c | 2 - + drivers/net/ethernet/google/gve/gve_tx.c | 6 --- + drivers/net/phy/phylink.c | 3 ++ + drivers/net/vxlan.c | 4 +- + include/linux/can/dev.h | 34 ++++++++++++ + net/ipv4/tcp_input.c | 5 +- + net/qrtr/qrtr.c | 2 +- + net/sched/sch_cake.c | 2 +- + tools/testing/selftests/net/forwarding/loopback.sh | 8 +++ + 21 files changed, 150 insertions(+), 60 deletions(-) +Merging bpf/master (d89091a4930e macb: Don't unregister clks unconditionally) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (738d2902773e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (5acab91458ce netfilter: nf_tables: unbind callbacks from flowtable destroy path) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/ipv4/netfilter/arp_tables.c | 27 +++++++++++--------- + net/netfilter/nf_flow_table_offload.c | 46 ++++++++++++++++++++++++++--------- + net/netfilter/nf_tables_api.c | 8 ++++-- + net/netfilter/nft_flow_offload.c | 3 --- + 4 files changed, 56 insertions(+), 28 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 (33328bfab892 MAINTAINERS: change Gruszka's email address) +$ git merge wireless-drivers/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + drivers/net/wireless/marvell/libertas/cfg.c | 16 +++++++++++++--- + drivers/net/wireless/mediatek/mt76/airtime.c | 2 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 3 ++- + 4 files changed, 18 insertions(+), 7 deletions(-) +Merging mac80211/master (02a614499600 mac80211: mesh: restrict airtime metric to peered established plinks) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/mac80211/mesh_hwmp.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging rdma-fixes/for-rc (fd6988496e79 Linux 5.5-rc4) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (fbca72c1542b Merge tag 'asoc-fix-v5.5-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 3 +++ + sound/soc/fsl/fsl_audmix.c | 9 ++++++- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 1 - + sound/soc/soc-core.c | 14 ++++++----- + sound/soc/soc-topology.c | 6 ++--- + sound/soc/sof/imx/imx8.c | 5 +++- + sound/soc/sof/intel/hda-dai.c | 11 ++++++-- + sound/soc/sof/ipc.c | 3 +++ + sound/soc/stm/stm32_spdifrx.c | 40 +++++++++++++++++++----------- + sound/usb/quirks.c | 1 + + 10 files changed, 65 insertions(+), 28 deletions(-) +Merging sound-asoc-fixes/for-linus (468c6402c71b Merge branch 'asoc-5.5' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/rt5640.c | 7 +++++++ + sound/soc/intel/boards/bytcht_es8316.c | 3 ++- + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging regmap-fixes/for-linus (c79f46a28239 Linux 5.5-rc5) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (f3218fe51b65 Merge branch 'regulator-5.5' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/axp20x-regulator.c | 11 +++++++---- + drivers/regulator/bd70528-regulator.c | 1 - + 2 files changed, 7 insertions(+), 5 deletions(-) +Merging spi-fixes/for-linus (798a4942a83f Merge branch 'spi-5.5' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-controller.yaml | 4 +-- + drivers/spi/spi-dw.c | 18 ++++++++++--- + drivers/spi/spi-dw.h | 1 + + drivers/spi/spi-fsl-dspi.c | 24 +++++++---------- + drivers/spi/spi-uniphier.c | 31 +++++++++++++--------- + drivers/spi/spi.c | 22 ++++++--------- + include/linux/spi/spi.h | 4 +-- + 7 files changed, 57 insertions(+), 47 deletions(-) +Merging pci-current/for-linus (ca01e7987463 PCI: rockchip: Fix IO outbound ATU register number) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (d1eef1c61974 Linux 5.5-rc2) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (c5ee0b3104e0 serdev: Don't claim unsupported ACPI serial devices) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serdev/core.c | 10 ++++++++++ + drivers/tty/tty_port.c | 3 +-- + 2 files changed, 11 insertions(+), 2 deletions(-) +Merging usb.current/usb-linus (2548288b4fb0 USB: Fix: Don't skip endpoint descriptors with maxpacket=0) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/phy/motorola/phy-cpcap-usb.c | 128 ++++++++++++++++++-------- + drivers/phy/motorola/phy-mapphone-mdm6600.c | 11 +-- + drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 4 + + drivers/usb/cdns3/gadget.c | 14 +-- + drivers/usb/chipidea/host.c | 4 +- + drivers/usb/core/config.c | 82 +++++++++++++---- + drivers/usb/dwc3/gadget.c | 7 ++ + drivers/usb/gadget/udc/Kconfig | 1 + + drivers/usb/musb/jz4740.c | 7 +- + drivers/usb/musb/musbhsdma.c | 2 +- + drivers/usb/serial/option.c | 10 ++ + drivers/usb/serial/usb-wwan.h | 1 + + drivers/usb/serial/usb_wwan.c | 4 + + drivers/usb/typec/tcpm/tcpci.c | 20 +++- + 15 files changed, 216 insertions(+), 81 deletions(-) +Merging usb-gadget-fixes/fixes (e5b5da96da50 usb: gadget: fix wrong endpoint desc) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (2438c3a19dec USB: serial: option: add ZLP support for 0x1bc7/0x9010) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (4f510aa10468 phy/rockchip: inno-hdmi: round clock rate down to closest 1000 Hz) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (58dcc5bf4030 staging: rtl8188eu: Add device code for TP-Link TL-WN727N v5.21) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/comedi/drivers/adv_pci1710.c | 4 ++-- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + + drivers/staging/vt6656/baseband.c | 4 ++-- + drivers/staging/vt6656/card.c | 2 +- + drivers/staging/vt6656/device.h | 1 + + drivers/staging/vt6656/main_usb.c | 3 ++- + drivers/staging/vt6656/usbpipe.c | 25 +++++++++++++++++++++++-- + drivers/staging/vt6656/usbpipe.h | 5 +++++ + drivers/staging/vt6656/wcmd.c | 1 + + 9 files changed, 38 insertions(+), 8 deletions(-) +Merging char-misc.current/char-misc-linus (c79f46a28239 Linux 5.5-rc5) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (fd6988496e79 Linux 5.5-rc4) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (1021dcf19db1 Input: imx_sc_key - only take the valid data from SCU firmware as key state) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/evdev.c | 14 +++++++------- + drivers/input/input.c | 26 ++++++++++++++++---------- + drivers/input/keyboard/imx_sc_key.c | 8 +++++++- + drivers/input/misc/uinput.c | 19 ++++++++++++------- + include/uapi/linux/input.h | 1 + + 5 files changed, 43 insertions(+), 25 deletions(-) +Merging crypto-current/master (84faa307249b crypto: arm/curve25519 - add arch-specific key generation function) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/siimage.c | 3 +-- + drivers/ide/via82cxxx.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (c79f46a28239 Linux 5.5-rc5) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (b0b5ce1010ff ioat: ioat_alloc_ring() failure handling.) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (df8fed831cbc mtd: rawnand: au1550nd: Fix au_read_buf16() prototype) +$ 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 (ce644cf3fa06 media: intel-ipu3: Align struct ipu3_uapi_awb_fr_config_s to 32 bytes) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (db23808615e2 reset: Do not register resource data for missing resets) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (bbcc5672b006 MIPS: Avoid VDSO ABI breakage due to global register variable) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (03729cfa0d54 soc: ti: wkup_m3_ipc: Fix race condition with rproc_boot) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am571x-idk.dts | 6 +----- + arch/arm/boot/dts/am572x-idk-common.dtsi | 4 ---- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 25 +++++++++++++++++++++---- + arch/arm/mach-omap2/pdata-quirks.c | 6 +++++- + drivers/bus/ti-sysc.c | 10 ++++++++-- + drivers/soc/ti/wkup_m3_ipc.c | 4 ++-- + 6 files changed, 37 insertions(+), 18 deletions(-) +Merging kvm-fixes/master (2f13437b8917 Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (fe33a928bfcd KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups) +$ git merge kvms390-fixes/master +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging hwmon-fixes/hwmon (20358214d96b hwmon: (adt7475) Make volt2reg return same reg as reg2volt input) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/adt7475.c | 5 ++-- + drivers/hwmon/nct7802.c | 75 +++++++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 72 insertions(+), 8 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (c14685547762 tools/testing/nvdimm: Fix mock support for ioremap) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (18cade6d99b4 Merge branch 'misc-5.5' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/inode.c | 27 +++++++++++++++++++-------- + fs/btrfs/root-tree.c | 10 ++++++---- + 2 files changed, 25 insertions(+), 12 deletions(-) +Merging vfs-fixes/fixes (7b3083ba718b mountpoint_last(): fix the treatment of LAST_BIND) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/namei.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) +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 (46cf053efec6 Linux 5.5-rc3) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a2315d3aea59 ARM: exynos_defconfig: Restore debugfs support) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (dbce0b65046d dt-bindings: Add missing 'properties' keyword enclosing 'snps,tso') +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (e4dc9a4c31fe scsi: target/iblock: Fix protection error with blocks greater than 512B) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (a6204fc7b83c agp: remove unused variable arqsz in agp_3_5_enable()) +$ 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 (fd6988496e79 Linux 5.5-rc4) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (f667216c5c7c mmc: sdhci-of-esdhc: re-implement erratum A-009204 workaround) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (f01f4ffdfb70 rtc: cmos: Revert "rtc: Fix the AltCentury value on AMD/Hygon platform") +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-mc146818-lib.c | 15 +-------------- + drivers/rtc/rtc-mt6397.c | 39 +++++++++++++++++++++++++-------------- + drivers/rtc/rtc-sun6i.c | 16 ++++++++++++++++ + include/linux/mfd/mt6397/rtc.h | 8 ++++++++ + 4 files changed, 50 insertions(+), 28 deletions(-) +Merging gnss-fixes/gnss-linus (d1eef1c61974 Linux 5.5-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (af42d3466bdc Linux 5.4-rc8) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (c79f46a28239 Linux 5.5-rc5) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (43cf75d96409 exit: panic before exit_mm() on global init exit) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (2f13437b8917 Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (b9a19bdbc843 pinctrl: cherryview: Pass irqchip when adding gpiochip) +$ 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 (c4e4fccc5d52 drm/dp_mst: correct the shifting in DP_REMOTE_I2C_READ) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +$ git am -3 ../patches/0001-Revert-btrfs-fix-invalid-removal-of-root-ref.patch +Applying: Revert "btrfs: fix invalid removal of root ref" +Merging kspp-gustavo/for-next/kspp (3d519d6d388b sh: kgdb: Mark expected switch fall-throughs) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (673cbf22a729 Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Removing scripts/Makefile.modbuiltin +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig.rst | 5 - + Makefile | 21 +--- + include/linux/module.h | 12 ++- + scripts/Kbuild.include | 10 +- + scripts/Makefile.build | 4 +- + scripts/Makefile.lib | 21 ++-- + scripts/Makefile.modbuiltin | 57 ----------- + scripts/kconfig/Makefile | 24 ++--- + scripts/kconfig/conf.c | 16 +++ + scripts/kconfig/confdata.c | 61 ++++-------- + scripts/kconfig/expr.c | 3 +- + scripts/kconfig/expr.h | 2 +- + scripts/kconfig/lkc.h | 4 +- + scripts/kconfig/menu.c | 185 ++++++++++++++++++++--------------- + scripts/kconfig/parser.y | 21 ++-- + scripts/kconfig/streamline_config.pl | 4 +- + scripts/kconfig/symbol.c | 22 ----- + scripts/link-vmlinux.sh | 4 + + usr/include/Makefile | 107 ++++++++++---------- + 19 files changed, 263 insertions(+), 320 deletions(-) + delete mode 100644 scripts/Makefile.modbuiltin +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 (a7ba70f1787f dma-mapping: treat dev->bus_dma_mask as a DMA limit) +$ 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 +Merge made by the 'recursive' strategy. + arch/nds32/include/asm/cacheflush.h | 11 +++++++---- + arch/nds32/include/asm/pgtable.h | 2 +- + include/asm-generic/cacheflush.h | 33 ++++++++++++++++++++++++++++++++- + 3 files changed, 40 insertions(+), 6 deletions(-) +Merging arc/for-next (9fbea0b7e842 ARC: add kmemleak support) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (04bb96427d4e ARM: 8947/1: Fix __arch_get_hw_counter() access to CNTVCT) +$ git merge arm/for-next +Already up to date. +Merging arm64/for-next/core (de858040ee80 arm64: entry: refine comment of stack overflow check) +$ 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 (e69c21d25d97 ARM: Document merges) +$ git merge arm-soc/for-next +Removing arch/arm/boot/dts/ste-href-ab8505.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/ux500.yaml | 36 ++ + .../devicetree/bindings/net/can/rcar_can.txt | 5 +- + .../devicetree/bindings/net/can/rcar_canfd.txt | 5 +- + .../bindings/phy/marvell,mmp3-hsic-phy.yaml | 41 ++ + .../devicetree/bindings/timer/renesas,tmu.txt | 1 + + MAINTAINERS | 2 + + arch/arm/arm-soc-for-next-contents.txt | 51 ++ + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/exynos3250.dtsi | 4 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 6 +- + arch/arm/boot/dts/exynos4210.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 5 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 29 + + arch/arm/boot/dts/exynos4412-n710x.dts | 5 + + arch/arm/boot/dts/exynos4412.dtsi | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 4 +- + arch/arm/boot/dts/exynos5420.dtsi | 50 ++ + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 6 +- + arch/arm/boot/dts/exynos54xx.dtsi | 4 +- + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 88 ++- + arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 1 - + arch/arm/boot/dts/mmp3-dell-ariel.dts | 22 + + arch/arm/boot/dts/mmp3.dtsi | 44 ++ + arch/arm/boot/dts/r7s72100.dtsi | 18 +- + arch/arm/boot/dts/r8a73a4.dtsi | 42 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 3 +- + arch/arm/boot/dts/r8a7740.dtsi | 102 ++-- + arch/arm/boot/dts/r8a7743.dtsi | 162 +++--- + arch/arm/boot/dts/r8a7744.dtsi | 162 +++--- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 3 +- + arch/arm/boot/dts/r8a7745.dtsi | 122 ++-- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 3 +- + arch/arm/boot/dts/r8a77470.dtsi | 86 +-- + arch/arm/boot/dts/r8a7778.dtsi | 11 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 3 +- + arch/arm/boot/dts/r8a7779.dtsi | 16 +- + arch/arm/boot/dts/r8a7790-lager.dts | 6 +- + arch/arm/boot/dts/r8a7790.dtsi | 167 +++--- + arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +- + arch/arm/boot/dts/r8a7791-porter.dts | 6 +- + arch/arm/boot/dts/r8a7791.dtsi | 159 +++--- + arch/arm/boot/dts/r8a7792.dtsi | 67 +-- + arch/arm/boot/dts/r8a7793-gose.dts | 9 +- + arch/arm/boot/dts/r8a7793.dtsi | 123 ++-- + arch/arm/boot/dts/r8a7794-alt.dts | 6 +- + arch/arm/boot/dts/r8a7794-silk.dts | 3 +- + arch/arm/boot/dts/r8a7794.dtsi | 111 ++-- + arch/arm/boot/dts/sh73a0.dtsi | 139 +++-- + arch/arm/boot/dts/ste-ab8500.dtsi | 102 +++- + arch/arm/boot/dts/ste-ab8505.dtsi | 275 +++++++++ + arch/arm/boot/dts/ste-db8500.dtsi | 15 + + arch/arm/boot/dts/ste-db8520.dtsi | 15 + + arch/arm/boot/dts/ste-dbx5x0-pinctrl.dtsi | 632 +++++++++++++++++++++ + arch/arm/boot/dts/ste-dbx5x0.dtsi | 75 ++- + arch/arm/boot/dts/ste-href-ab8505.dtsi | 234 -------- + arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 532 +---------------- + arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 79 +++ + arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 58 ++ + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 71 +-- + arch/arm/boot/dts/ste-href.dtsi | 67 ++- + arch/arm/boot/dts/ste-href520-tvk.dts | 22 + + arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 10 +- + arch/arm/boot/dts/ste-hrefprev60-tvk.dts | 10 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- + arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 10 +- + arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | 10 +- + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 1 - + arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 5 + + arch/arm/boot/dts/ste-snowball.dts | 70 ++- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 455 +++++++++++++++ + arch/arm/configs/gemini_defconfig | 24 +- + arch/arm/configs/shmobile_defconfig | 3 + + arch/arm/configs/u8500_defconfig | 4 +- + arch/arm64/boot/dts/altera/Makefile | 3 +- + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 223 ++++++++ + arch/arm64/boot/dts/intel/Makefile | 3 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 76 ++- + .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 135 +++++ + arch/arm64/boot/dts/renesas/Makefile | 27 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 3 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 206 +++---- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 206 +++---- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 3 +- + .../boot/dts/renesas/r8a774c0-ek874-idk-2121wr.dts | 116 ++++ + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 164 +++--- + ...-es1-salvator-x.dts => r8a77950-salvator-x.dts} | 4 +- + ...{r8a7795-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} | 4 +- + .../{r8a7795-es1-h3ulcb.dts => r8a77950-ulcb.dts} | 4 +- + .../renesas/{r8a7795-es1.dtsi => r8a77950.dtsi} | 4 +- + ...7795-salvator-x.dts => r8a77951-salvator-x.dts} | 4 +- + ...95-salvator-xs.dts => r8a77951-salvator-xs.dts} | 8 +- + ...7795-es1-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} | 4 +- + .../{r8a7795-h3ulcb.dts => r8a77951-ulcb.dts} | 4 +- + .../dts/renesas/{r8a7795.dtsi => r8a77951.dtsi} | 216 +++---- + ...7796-salvator-x.dts => r8a77960-salvator-x.dts} | 4 +- + ...96-salvator-xs.dts => r8a77960-salvator-xs.dts} | 4 +- + ...{r8a7796-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} | 4 +- + .../{r8a7796-m3ulcb.dts => r8a77960-ulcb.dts} | 4 +- + .../dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} | 206 +++---- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 390 ++++++++++++- + ...8a77965-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} | 2 +- + .../{r8a77965-m3nulcb.dts => r8a77965-ulcb.dts} | 0 + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 206 +++---- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 52 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 96 ++-- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 7 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 164 +++--- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 74 +-- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 6 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 3 +- + arch/arm64/boot/dts/sprd/Makefile | 3 +- + arch/arm64/boot/dts/sprd/sc9863a.dtsi | 523 +++++++++++++++++ + arch/arm64/boot/dts/sprd/sharkl3.dtsi | 78 +++ + arch/arm64/boot/dts/sprd/sp9863a-1h10.dts | 39 ++ + drivers/clk/clk-scmi.c | 2 +- + drivers/clk/mmp/clk-of-mmp2.c | 6 + + drivers/cpufreq/scmi-cpufreq.c | 2 +- + drivers/firmware/arm_scmi/bus.c | 29 +- + drivers/firmware/arm_scmi/clock.c | 2 + + drivers/firmware/arm_scmi/common.h | 2 + + drivers/firmware/arm_scmi/driver.c | 110 +++- + drivers/firmware/arm_scmi/perf.c | 2 + + drivers/firmware/arm_scmi/power.c | 2 + + drivers/firmware/arm_scmi/reset.c | 2 + + drivers/firmware/arm_scmi/scmi_pm_domain.c | 2 +- + drivers/firmware/arm_scmi/sensors.c | 2 + + drivers/hwmon/scmi-hwmon.c | 2 +- + drivers/reset/reset-scmi.c | 2 +- + drivers/soc/renesas/Kconfig | 14 +- + drivers/soc/renesas/rcar-rst.c | 2 +- + drivers/tee/optee/core.c | 153 +++-- + include/dt-bindings/clock/marvell,mmp2.h | 2 + + include/linux/scmi_protocol.h | 5 +- + include/trace/events/scmi.h | 90 +++ + 134 files changed, 5745 insertions(+), 2710 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/ux500.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/ste-ab8505.dtsi + create mode 100644 arch/arm/boot/dts/ste-db8500.dtsi + create mode 100644 arch/arm/boot/dts/ste-db8520.dtsi + create mode 100644 arch/arm/boot/dts/ste-dbx5x0-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/ste-href-ab8505.dtsi + create mode 100644 arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi + create mode 100644 arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi + create mode 100644 arch/arm/boot/dts/ste-href520-tvk.dts + create mode 100644 arch/arm/boot/dts/ste-ux500-samsung-golden.dts + create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0-ek874-idk-2121wr.dts + rename arch/arm64/boot/dts/renesas/{r8a7795-es1-salvator-x.dts => r8a77950-salvator-x.dts} (96%) + rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} (75%) + rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb.dts => r8a77950-ulcb.dts} (89%) + rename arch/arm64/boot/dts/renesas/{r8a7795-es1.dtsi => r8a77950.dtsi} (98%) + rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-x.dts => r8a77951-salvator-x.dts} (96%) + rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-xs.dts => r8a77951-salvator-xs.dts} (96%) + rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} (75%) + rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb.dts => r8a77951-ulcb.dts} (92%) + rename arch/arm64/boot/dts/renesas/{r8a7795.dtsi => r8a77951.dtsi} (94%) + rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-x.dts => r8a77960-salvator-x.dts} (94%) + rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-xs.dts => r8a77960-salvator-xs.dts} (94%) + rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} (77%) + rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb.dts => r8a77960-ulcb.dts} (90%) + rename arch/arm64/boot/dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} (94%) + rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} (92%) + rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb.dts => r8a77965-ulcb.dts} (100%) + create mode 100644 arch/arm64/boot/dts/sprd/sc9863a.dtsi + create mode 100644 arch/arm64/boot/dts/sprd/sharkl3.dtsi + create mode 100644 arch/arm64/boot/dts/sprd/sp9863a-1h10.dts + create mode 100644 include/trace/events/scmi.h +Merging amlogic/for-next (714767cd9071 Merge branch 'v5.6/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../bindings/clock/amlogic,meson8-ddr-clkc.yaml | 50 +++ + .../bindings/clock/amlogic,meson8b-clkc.txt | 5 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/meson.dtsi | 7 + + arch/arm/boot/dts/meson6.dtsi | 7 - + arch/arm/boot/dts/meson8.dtsi | 26 +- + arch/arm/boot/dts/meson8b-ec100.dts | 2 +- + arch/arm/boot/dts/meson8b-mxq.dts | 2 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 2 +- + arch/arm/boot/dts/meson8b.dtsi | 24 +- + arch/arm64/boot/dts/amlogic/Makefile | 3 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 25 ++ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 23 ++ + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 375 +++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 78 +++++ + .../dts/amlogic/meson-gxl-s905d-libretech-pc.dts | 16 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9 + + .../dts/amlogic/meson-gxm-s912-libretech-pc.dts | 62 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 28 +- + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 + + arch/arm64/configs/defconfig | 2 + + drivers/clk/meson/clk-pll.c | 9 + + drivers/clk/meson/g12a.c | 1 + + drivers/soc/amlogic/meson-ee-pwrc.c | 24 +- + include/dt-bindings/clock/meson8-ddr-clkc.h | 4 + + include/dt-bindings/reset/amlogic,meson8b-reset.h | 6 +- + 27 files changed, 760 insertions(+), 39 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,meson8-ddr-clkc.yaml + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts + create mode 100644 include/dt-bindings/clock/meson8-ddr-clkc.h +Merging aspeed/for-next (e4aab38ed5d1 ARM: dts: aspeed: Add SD card for Vesnin) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 1 + + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 3 ++ + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 3 ++ + arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts | 1 - + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 1 - + arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 1 - + arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 2 - + arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 2 - + arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 18 ++++++-- + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 - + arch/arm/boot/dts/aspeed-g4.dtsi | 21 ++++++---- + arch/arm/boot/dts/aspeed-g5.dtsi | 49 ++++++++++++---------- + arch/arm/boot/dts/aspeed-g6.dtsi | 2 +- + .../boot/dts/ast2500-facebook-netbmc-common.dtsi | 1 - + arch/arm/boot/dts/ibm-power9-dual.dtsi | 4 +- + 15 files changed, 62 insertions(+), 49 deletions(-) +Merging at91/at91-next (0e2a6c95b2b9 Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.yaml | 25 ++ + arch/arm/Kconfig.debug | 6 +- + arch/arm/boot/dts/Makefile | 6 +- + arch/arm/boot/dts/at91-kizbox.dts | 172 ++++++------ + arch/arm/boot/dts/at91-kizboxmini-base.dts | 24 ++ + ...-kizboxmini.dts => at91-kizboxmini-common.dtsi} | 163 ++++++----- + arch/arm/boot/dts/at91-kizboxmini-mb.dts | 26 ++ + arch/arm/boot/dts/at91-kizboxmini-rd.dts | 49 ++++ + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 4 + + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 6 + + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 304 +++++++++++++++++++++ + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 270 ++++++++++++++++++ + arch/arm/boot/dts/at91-smartkiz.dts | 109 ++++++++ + arch/arm/boot/dts/at91sam9260.dtsi | 16 +- + arch/arm/boot/dts/at91sam9261.dtsi | 6 +- + arch/arm/boot/dts/at91sam9263.dtsi | 6 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 8 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 8 +- + arch/arm/boot/dts/sama5d2.dtsi | 10 +- + arch/arm/configs/at91_dt_defconfig | 55 ++-- + arch/arm/mach-at91/Kconfig | 24 +- + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/at91sam9.c | 18 -- + arch/arm/mach-at91/pm.c | 11 +- + arch/arm/mach-at91/sam9x60.c | 34 +++ + drivers/power/reset/Kconfig | 4 +- + drivers/soc/atmel/soc.c | 5 +- + 27 files changed, 1118 insertions(+), 252 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-kizboxmini-base.dts + rename arch/arm/boot/dts/{at91-kizboxmini.dts => at91-kizboxmini-common.dtsi} (51%) + create mode 100644 arch/arm/boot/dts/at91-kizboxmini-mb.dts + create mode 100644 arch/arm/boot/dts/at91-kizboxmini-rd.dts + create mode 100644 arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts + create mode 100644 arch/arm/boot/dts/at91-smartkiz.dts + create mode 100644 arch/arm/mach-at91/sam9x60.c +Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (3a0811a3b9c6 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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 12 + + .../devicetree/bindings/display/mxsfb.txt | 1 + + .../devicetree/bindings/media/fsl-pxp.txt | 2 +- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/e60k02.dtsi | 3 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 - + arch/arm/boot/dts/imx25-pdk.dts | 2 - + arch/arm/boot/dts/imx25.dtsi | 3 + + arch/arm/boot/dts/imx51-babbage.dts | 64 ++- + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 2 +- + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 2 +- + arch/arm/boot/dts/imx6q-logicpd.dts | 10 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 84 ++- + arch/arm/boot/dts/imx6sl-tolino-shine3.dts | 326 ++++++++++++ + arch/arm/boot/dts/imx6sll.dtsi | 9 + + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 1 + + arch/arm/boot/dts/imx6ull-colibri.dtsi | 188 +++---- + arch/arm/boot/dts/imx7d-sdb-reva.dts | 3 + + arch/arm/boot/dts/imx7s.dtsi | 7 + + arch/arm/boot/dts/imx7ulp-com.dts | 79 +++ + arch/arm/boot/dts/imx7ulp.dtsi | 4 +- + arch/arm/boot/dts/ls1021a-tsn.dts | 4 + + arch/arm/boot/dts/ls1021a.dtsi | 19 + + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 10 - + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 29 +- + arch/arm/configs/imx_v6_v7_defconfig | 5 + + arch/arm/mach-imx/Kconfig | 2 + + arch/arm/mach-imx/cpu.c | 30 +- + arch/arm64/boot/dts/freescale/Makefile | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 17 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 65 ++- + arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts | 14 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 16 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 24 + + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 24 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 13 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +- + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 127 +++++ + .../boot/dts/freescale/fsl-lx2160a-clearfog-cx.dts | 15 + + .../dts/freescale/fsl-lx2160a-clearfog-itx.dtsi | 57 ++ + .../boot/dts/freescale/fsl-lx2160a-honeycomb.dts | 15 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 28 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 21 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 20 + + arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 16 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 52 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 20 + + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 65 +++ + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 26 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 27 + + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 9 +- + arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts | 376 +++++++++++++ + .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 2 +- + .../boot/dts/freescale/imx8mq-zii-ultra-zest.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 107 +++- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 12 - + arch/arm64/configs/defconfig | 1 + + drivers/clk/imx/Makefile | 2 +- + drivers/clk/imx/clk-composite-7ulp.c | 2 +- + drivers/clk/imx/clk-composite-8m.c | 4 +- + drivers/clk/imx/clk-divider-gate.c | 12 +- + drivers/clk/imx/clk-frac-pll.c | 7 +- + drivers/clk/imx/clk-imx6q.c | 5 +- + drivers/clk/imx/clk-imx7ulp.c | 182 +++---- + drivers/clk/imx/clk-imx8mm.c | 565 ++++++++++---------- + drivers/clk/imx/clk-imx8mn.c | 498 +++++++++--------- + drivers/clk/imx/clk-imx8mq.c | 584 +++++++++++---------- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 11 + + drivers/clk/imx/clk-pfdv2.c | 2 +- + drivers/clk/imx/clk-pll14xx.c | 29 +- + drivers/clk/imx/clk-pllv1.c | 14 +- + drivers/clk/imx/clk-pllv2.c | 14 +- + drivers/clk/imx/clk-pllv4.c | 2 +- + drivers/clk/imx/{clk-sccg-pll.c => clk-sscg-pll.c} | 152 +++--- + drivers/clk/imx/clk.c | 12 +- + drivers/clk/imx/clk.h | 155 ++++-- + drivers/soc/imx/soc-imx8.c | 3 + + 80 files changed, 3094 insertions(+), 1264 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6sl-tolino-shine3.dts + create mode 100644 arch/arm/boot/dts/imx7ulp-com.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-cx.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-itx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-honeycomb.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts + rename drivers/clk/imx/{clk-sccg-pll.c => clk-sscg-pll.c} (70%) +Merging keystone/next (2af8e1f26c65 Merge branch 'for_5.5/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (ca01a6367d0f Merge branch 'v5.5-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/mediatek/scpsys.txt | 6 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +++ + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 ++ + drivers/soc/mediatek/mtk-cmdq-helper.c | 149 +++++++++++++++++---- + include/dt-bindings/power/mt6765-power.h | 14 ++ + include/linux/mailbox/mtk-cmdq-mailbox.h | 11 ++ + include/linux/soc/mediatek/mtk-cmdq.h | 53 ++++++++ + 7 files changed, 232 insertions(+), 28 deletions(-) + create mode 100644 include/dt-bindings/power/mt6765-power.h +Merging mvebu/for-next (cd592187f9de arm64: dts: uDPU: SFP cages support 3W modules) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging omap/for-next (cf9ea4b7c370 Merge branch 'omap-for-v5.6/ti-sysc-drop-pdata' into for-next) +$ git merge omap/for-next +Removing include/sound/aess.h +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-evm.dts | 40 +- + arch/arm/boot/dts/am335x-evmsk.dts | 38 +- + arch/arm/boot/dts/am335x-icev2.dts | 13 + + arch/arm/boot/dts/am33xx-l4.dtsi | 16 - + arch/arm/boot/dts/am33xx.dtsi | 69 +- + arch/arm/boot/dts/am3517.dtsi | 2 +- + arch/arm/boot/dts/am4372.dtsi | 142 ++- + arch/arm/boot/dts/am437x-l4.dtsi | 29 - + arch/arm/boot/dts/am57xx-idk-common.dtsi | 59 ++ + arch/arm/boot/dts/dra7-l4.dtsi | 55 +- + arch/arm/boot/dts/dra7.dtsi | 258 +++-- + arch/arm/boot/dts/dra74x.dtsi | 71 +- + arch/arm/boot/dts/dra76-evm.dts | 66 ++ + arch/arm/boot/dts/omap2.dtsi | 43 +- + arch/arm/boot/dts/omap2430.dtsi | 4 + + arch/arm/boot/dts/omap3-n900.dts | 5 + + arch/arm/boot/dts/omap3.dtsi | 46 +- + arch/arm/boot/dts/omap36xx.dtsi | 4 + + arch/arm/boot/dts/omap4-l4-abe.dtsi | 7 - + arch/arm/boot/dts/omap4-l4.dtsi | 30 +- + arch/arm/boot/dts/omap4.dtsi | 44 +- + arch/arm/boot/dts/omap5-l4-abe.dtsi | 6 - + arch/arm/boot/dts/omap5-l4.dtsi | 24 +- + arch/arm/boot/dts/omap5.dtsi | 40 +- + arch/arm/mach-omap2/clockdomains43xx_data.c | 10 + + arch/arm/mach-omap2/common.h | 3 + + arch/arm/mach-omap2/dma.c | 119 +-- + arch/arm/mach-omap2/omap-iommu.c | 128 ++- + arch/arm/mach-omap2/omap_device.c | 170 --- + arch/arm/mach-omap2/omap_device.h | 4 - + arch/arm/mach-omap2/omap_hwmod.c | 18 - + arch/arm/mach-omap2/omap_hwmod.h | 3 - + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 34 - + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 34 - + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 18 - + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 33 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 124 --- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 335 ------ + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 91 -- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 61 -- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 448 -------- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1099 +------------------- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 662 ------------ + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 873 ---------------- + arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 - + arch/arm/mach-omap2/omap_hwmod_reset.c | 24 - + arch/arm/mach-omap2/pdata-quirks.c | 44 +- + arch/arm/mach-omap2/pm24xx.c | 22 +- + arch/arm/mach-omap2/pm34xx.c | 5 - + arch/arm/mach-omap2/prcm43xx.h | 1 + + arch/arm/plat-omap/dma.c | 471 +-------- + drivers/bus/ti-sysc.c | 18 +- + drivers/dma/ti/omap-dma.c | 286 ++++- + include/linux/omap-dma.h | 18 - + include/linux/platform_data/ti-sysc.h | 1 + + include/sound/aess.h | 53 - + 56 files changed, 1232 insertions(+), 5090 deletions(-) + delete mode 100644 include/sound/aess.h +Merging qcom/for-next (99befae30d08 Merge branches 'arm64-for-5.5-fixes', 'drivers-for-5.5-fixes', 'arm64-defconfig-for-5.6', 'arm64-for-5.6', 'defconfig-for-5.6', 'drivers-for-5.6' and 'dts-for-5.6' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi +Removing arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi +Removing Documentation/devicetree/bindings/power/qcom,rpmpd.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 2 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 44 +- + .../devicetree/bindings/power/qcom,rpmpd.txt | 148 - + .../devicetree/bindings/power/qcom,rpmpd.yaml | 170 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 44 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 7 + + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 45 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 222 +- + arch/arm/configs/qcom_defconfig | 4 + + arch/arm64/boot/dts/qcom/Makefile | 2 + + .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 19 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 11 +- + arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 109 - + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 92 - + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 1392 +++++--- + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 385 +++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 5 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 3521 ++++++++++---------- + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 49 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 41 + + arch/arm64/boot/dts/qcom/msm8998-pins.dtsi | 25 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 262 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 72 + + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 31 + + arch/arm64/boot/dts/qcom/pm8004.dtsi | 10 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 + + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 1 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 160 +- + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 430 +++ + arch/arm64/boot/dts/qcom/sc7180.dtsi | 1998 +++++++++++ + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 14 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 11 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 26 +- + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 35 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 391 ++- + arch/arm64/configs/defconfig | 22 + + drivers/soc/qcom/Kconfig | 30 +- + drivers/soc/qcom/qmi_interface.c | 8 +- + drivers/soc/qcom/rpmhpd.c | 56 + + include/dt-bindings/power/qcom-rpmpd.h | 24 + + include/linux/qcom_scm.h | 6 + + 41 files changed, 7112 insertions(+), 2818 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/qcom,rpmpd.txt + create mode 100644 Documentation/devicetree/bindings/power/qcom,rpmpd.yaml + delete mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts + create mode 100644 arch/arm64/boot/dts/qcom/pm6150.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm6150l.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-idp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180.dtsi +Merging realtek/for-next (44242a468f3a Merge branch 'v5.6/dt' into next) +$ git merge realtek/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/realtek.yaml | 20 +++ + MAINTAINERS | 1 + + 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 | 139 +++++++++++++++++ + 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 | 5 + + 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-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 | 170 ++++++++++++--------- + 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 | 142 +++++++++++++++++ + arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts | 44 ++++++ + arch/arm64/boot/dts/realtek/rtd1619.dtsi | 12 ++ + arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 161 +++++++++++++++++++ + 28 files changed, 908 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/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 +Merging renesas/next (9604d3647916 Merge branches 'renesas-arm-dt-for-v5.6', 'renesas-arm64-dt-for-v5.6' and 'renesas-soc-for-v5.6' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. +Merging reset/reset/next (4cf176e52397 reset: Add Broadcom STB RESCAL reset controller) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../reset/brcm,bcm7216-pcie-sata-rescal.yaml | 37 +++ + .../devicetree/bindings/reset/intel,rcu-gw.yaml | 63 +++++ + .../bindings/reset/nuvoton,npcm-reset.txt | 32 +++ + drivers/reset/Kconfig | 23 ++ + drivers/reset/Makefile | 3 + + drivers/reset/core.c | 33 +-- + drivers/reset/reset-brcmstb-rescal.c | 107 ++++++++ + drivers/reset/reset-intel-gw.c | 262 +++++++++++++++++++ + drivers/reset/reset-npcm.c | 291 +++++++++++++++++++++ + drivers/reset/reset-uniphier.c | 13 +- + include/dt-bindings/reset/nuvoton,npcm7xx-reset.h | 91 +++++++ + 11 files changed, 934 insertions(+), 21 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/brcm,bcm7216-pcie-sata-rescal.yaml + create mode 100644 Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml + create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,npcm-reset.txt + create mode 100644 drivers/reset/reset-brcmstb-rescal.c + create mode 100644 drivers/reset/reset-intel-gw.c + create mode 100644 drivers/reset/reset-npcm.c + create mode 100644 include/dt-bindings/reset/nuvoton,npcm7xx-reset.h +Merging rockchip/for-next (cfa95f7bcd3c Merge branch 'v5.5-armsoc/dtsfixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 9 + + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 1 + + arch/arm/boot/dts/rk3288-tinker.dtsi | 13 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 9 + + .../boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi | 22 + + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 21 - + arch/arm/boot/dts/rk3288-veyron-fievel.dts | 2 - + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 22 + + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 22 + + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 9 + + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 21 + + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 22 + + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 21 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 59 +- + .../boot/dts/rockchip-radxa-dalang-carrier.dtsi | 81 +++ + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 11 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 187 ++++- + arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 17 + + .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 6 - + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 28 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 27 +- + .../boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 65 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 26 + + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 11 + + .../boot/dts/rockchip/rk3399-rockpro64-v2.dts | 30 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 759 +------------------- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 797 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 9 + + .../boot/dts/rockchip/rk3399pro-rock-pi-n10.dts | 17 + + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 333 +++++++++ + 34 files changed, 1783 insertions(+), 885 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi + create mode 100644 arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +Merging samsung-krzk/for-next (72475dbe8f40 Merge branch 'next/drivers' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/boot/dts/exynos5422-odroid-core.dtsi +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- + arch/arm/boot/dts/exynos5.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 2 +- + arch/arm/boot/dts/exynos5420.dtsi | 283 +-------------------- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 279 +++++++++++++++++++- + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 64 ++--- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 78 +++--- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 58 +++++ + arch/arm/boot/dts/exynos5800-peach-pi.dts | 13 + + arch/arm/boot/dts/exynos5800.dtsi | 52 ++-- + arch/arm/configs/exynos_defconfig | 6 + + drivers/memory/samsung/exynos5422-dmc.c | 7 +- + drivers/soc/samsung/exynos-pmu.c | 4 +- + 14 files changed, 481 insertions(+), 371 deletions(-) +Merging scmi/for-linux-next (c79f46a28239 Linux 5.5-rc5) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (f6c5c4fa1638 Merge branch 'sunxi/dt-for-5.6' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml +Removing Documentation/devicetree/bindings/clock/sun9i-usb.txt +Removing Documentation/devicetree/bindings/clock/sun9i-de.txt +Removing Documentation/devicetree/bindings/clock/sun8i-de2.txt +Auto-merging Documentation/devicetree/bindings/arm/sunxi.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 23 ++- + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 76 +++++++++ + .../clock/allwinner,sun9i-a80-de-clks.yaml | 67 ++++++++ + .../clock/allwinner,sun9i-a80-usb-clocks.yaml | 59 +++++++ + .../devicetree/bindings/clock/sun8i-de2.txt | 34 ---- + .../devicetree/bindings/clock/sun9i-de.txt | 28 ---- + .../devicetree/bindings/clock/sun9i-usb.txt | 24 --- + Documentation/devicetree/bindings/media/rc.yaml | 1 + + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 51 ++++++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun4i-a10.dtsi | 35 ++++ + arch/arm/boot/dts/sun5i.dtsi | 3 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 25 ++- + arch/arm/boot/dts/sun7i-a20.dtsi | 36 +++++ + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 13 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 42 ++++- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 1 + + .../dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts | 72 +++++++++ + arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi | 11 ++ + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 35 +++- + arch/arm/boot/dts/sun8i-r40.dtsi | 180 ++++++++++++++++++++- + arch/arm/boot/dts/sun8i-v3s.dtsi | 2 - + arch/arm/boot/dts/sun9i-a80.dtsi | 42 ++--- + arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi | 170 +++++++++++++++++++ + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 13 +- + arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi | 180 +++++++++++++++++++++ + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 3 + + arch/arm64/boot/dts/allwinner/axp803.dtsi | 43 +---- + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 6 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 43 +---- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 43 +---- + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 8 +- + .../dts/allwinner/sun50i-a64-olinuxino-emmc.dts | 12 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 62 +++---- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 45 +----- + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 7 +- + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 43 +---- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 43 +---- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 9 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 48 +----- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 48 +----- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 9 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 133 +++++++++------ + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 88 +--------- + .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 68 +------- + .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 6 +- + .../allwinner/sun50i-h5-libretech-all-h3-it.dts | 11 ++ + .../allwinner/sun50i-h5-libretech-all-h5-cc.dts | 61 +++++++ + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 45 +----- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 43 +---- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 43 +---- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 48 +----- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 9 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 43 +---- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 85 +++++----- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 14 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 10 +- + .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 6 +- + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 8 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 8 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 21 +++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 23 ++- + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 15 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 59 ++++++- + arch/arm64/configs/defconfig | 2 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 28 +++- + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 1 - + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 16 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.h | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23-a33.h | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 21 +-- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.h | 4 - + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 2 - + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 6 +- + include/dt-bindings/clock/sun50i-a64-ccu.h | 1 + + include/dt-bindings/clock/sun6i-a31-ccu.h | 2 + + include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 2 + + include/dt-bindings/clock/sun8i-r40-ccu.h | 2 +- + 83 files changed, 1562 insertions(+), 1092 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-de-clks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt + delete mode 100644 Documentation/devicetree/bindings/clock/sun9i-de.txt + delete mode 100644 Documentation/devicetree/bindings/clock/sun9i-usb.txt + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-it.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts +$ git reset --hard HEAD^ +HEAD is now at 413ae87a222a Merge remote-tracking branch 'samsung-krzk/for-next' +Merging next-20200106 version of sunxi +$ git merge -m next-20200106/sunxi dddab4c4ad4a2d3503751ae37adbfcaef8663134 +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml +Removing Documentation/devicetree/bindings/clock/sun9i-usb.txt +Removing Documentation/devicetree/bindings/clock/sun9i-de.txt +Removing Documentation/devicetree/bindings/clock/sun8i-de2.txt +Auto-merging Documentation/devicetree/bindings/arm/sunxi.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 18 ++- + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 76 +++++++++ + .../clock/allwinner,sun9i-a80-de-clks.yaml | 67 ++++++++ + .../clock/allwinner,sun9i-a80-usb-clocks.yaml | 59 +++++++ + .../devicetree/bindings/clock/sun8i-de2.txt | 34 ---- + .../devicetree/bindings/clock/sun9i-de.txt | 28 ---- + .../devicetree/bindings/clock/sun9i-usb.txt | 24 --- + Documentation/devicetree/bindings/media/rc.yaml | 1 + + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 51 ++++++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun5i.dtsi | 1 + + arch/arm/boot/dts/sun6i-a31.dtsi | 25 ++- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 13 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 36 +++++ + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 1 + + .../dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts | 72 +++++++++ + arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi | 11 ++ + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 35 +++- + arch/arm/boot/dts/sun8i-r40.dtsi | 52 +++++- + arch/arm/boot/dts/sun8i-v3s.dtsi | 2 - + arch/arm/boot/dts/sun9i-a80.dtsi | 42 ++--- + arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi | 170 +++++++++++++++++++ + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 + + arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi | 180 +++++++++++++++++++++ + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 2 + + arch/arm64/boot/dts/allwinner/axp803.dtsi | 43 +---- + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 6 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 43 +---- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 43 +---- + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 8 +- + .../dts/allwinner/sun50i-a64-olinuxino-emmc.dts | 12 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 62 +++---- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 45 +----- + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 7 +- + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 43 +---- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 43 +---- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 7 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 48 +----- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 48 +----- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 9 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 126 ++++++++++----- + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 88 +--------- + .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 68 +------- + .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 6 +- + .../allwinner/sun50i-h5-libretech-all-h3-it.dts | 11 ++ + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 45 +----- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 43 +---- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 43 +---- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 48 +----- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 9 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 43 +---- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 85 +++++----- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 14 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 10 +- + .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 6 +- + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 8 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 8 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 21 +++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 23 ++- + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 15 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 59 ++++++- + arch/arm64/configs/defconfig | 2 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 28 +++- + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 1 - + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 16 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.h | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23-a33.h | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 21 +-- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.h | 4 - + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 2 - + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 6 +- + include/dt-bindings/clock/sun50i-a64-ccu.h | 1 + + include/dt-bindings/clock/sun6i-a31-ccu.h | 2 + + include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 2 + + include/dt-bindings/clock/sun8i-r40-ccu.h | 2 +- + 80 files changed, 1283 insertions(+), 1081 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-de-clks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt + delete mode 100644 Documentation/devicetree/bindings/clock/sun9i-de.txt + delete mode 100644 Documentation/devicetree/bindings/clock/sun9i-usb.txt + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-it.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts +Merging tegra/for-next (e0fd54137bf5 Merge branch for-5.5/cpufreq into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (67d81d7a2ef3 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/meson/clk-pll.c +Removing Documentation/devicetree/bindings/clock/qcom,mmcc.txt +Removing Documentation/devicetree/bindings/clock/qcom,dispcc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qcom,dispcc.txt | 19 - + .../devicetree/bindings/clock/qcom,dispcc.yaml | 67 + + .../devicetree/bindings/clock/qcom,gcc.yaml | 73 +- + .../devicetree/bindings/clock/qcom,mmcc.txt | 28 - + .../devicetree/bindings/clock/qcom,mmcc.yaml | 98 + + .../bindings/mailbox/qcom,apcs-kpss-global.txt | 24 +- + drivers/clk/clk-bm1880.c | 3 +- + drivers/clk/clk.c | 48 +- + drivers/clk/meson/clk-mpll.c | 4 +- + drivers/clk/meson/clk-phase.c | 4 +- + drivers/clk/meson/clk-pll.c | 4 +- + drivers/clk/meson/sclk-div.c | 4 +- + drivers/clk/microchip/clk-core.c | 8 +- + drivers/clk/mmp/clk-frac.c | 4 +- + drivers/clk/mmp/clk-mix.c | 4 +- + drivers/clk/qcom/Kconfig | 19 + + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/apcs-msm8916.c | 3 +- + drivers/clk/qcom/clk-alpha-pll.c | 91 +- + drivers/clk/qcom/clk-alpha-pll.h | 5 + + drivers/clk/qcom/clk-hfpll.c | 6 +- + drivers/clk/qcom/clk-rcg.h | 1 + + drivers/clk/qcom/clk-rcg2.c | 77 + + drivers/clk/qcom/clk-smd-rpm.c | 5 + + drivers/clk/qcom/dispcc-sc7180.c | 776 ++++++ + drivers/clk/qcom/dispcc-sdm845.c | 214 +- + drivers/clk/qcom/gcc-msm8998.c | 14 + + drivers/clk/qcom/gcc-qcs404.c | 2 +- + drivers/clk/qcom/hfpll.c | 21 +- + drivers/clk/qcom/mmcc-msm8974.c | 13 - + drivers/clk/qcom/mmcc-msm8998.c | 2913 ++++++++++++++++++++ + drivers/clk/rockchip/clk-pll.c | 28 +- + drivers/clk/samsung/clk-exynos5420.c | 8 + + drivers/clk/tegra/clk.c | 4 +- + drivers/clk/ti/clock.h | 2 +- + drivers/clk/ti/clockdomain.c | 8 +- + drivers/net/phy/mdio-mux-meson-g12a.c | 4 +- + include/dt-bindings/clock/qcom,dispcc-sc7180.h | 46 + + include/dt-bindings/clock/qcom,dispcc-sdm845.h | 13 +- + include/dt-bindings/clock/qcom,gcc-msm8998.h | 1 + + include/dt-bindings/clock/qcom,mmcc-msm8998.h | 210 ++ + include/linux/clk-provider.h | 13 +- + 42 files changed, 4756 insertions(+), 135 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,mmcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,mmcc.yaml + create mode 100644 drivers/clk/qcom/dispcc-sc7180.c + create mode 100644 drivers/clk/qcom/mmcc-msm8998.c + create mode 100644 include/dt-bindings/clock/qcom,dispcc-sc7180.h + create mode 100644 include/dt-bindings/clock/qcom,mmcc-msm8998.h +Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (3566ce3b55af csky: kprobes/kretprobes support) +$ git merge csky/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/csky/Kconfig | 38 +++ + arch/csky/abiv1/inc/abi/entry.h | 19 +- + arch/csky/abiv2/inc/abi/entry.h | 67 +++++ + arch/csky/include/asm/fixmap.h | 9 +- + arch/csky/include/asm/kprobes.h | 36 +++ + arch/csky/include/asm/memory.h | 25 ++ + arch/csky/include/asm/pgtable.h | 6 +- + arch/csky/include/asm/probes.h | 23 ++ + arch/csky/include/asm/ptrace.h | 35 +++ + arch/csky/include/asm/stackprotector.h | 29 ++ + arch/csky/include/asm/tcm.h | 24 ++ + arch/csky/kernel/Makefile | 1 + + arch/csky/kernel/atomic.S | 8 +- + arch/csky/kernel/probes/Makefile | 3 + + arch/csky/kernel/probes/decode-insn.c | 32 +++ + arch/csky/kernel/probes/decode-insn.h | 20 ++ + arch/csky/kernel/probes/kprobes.c | 399 +++++++++++++++++++++++++++ + arch/csky/kernel/probes/kprobes_trampoline.S | 19 ++ + arch/csky/kernel/probes/simulate-insn.c | 25 ++ + arch/csky/kernel/probes/simulate-insn.h | 8 + + arch/csky/kernel/process.c | 6 + + arch/csky/kernel/ptrace.c | 103 +++++++ + arch/csky/kernel/setup.c | 2 + + arch/csky/kernel/traps.c | 5 + + arch/csky/kernel/vmlinux.lds.S | 50 ++++ + arch/csky/mm/Makefile | 1 + + arch/csky/mm/fault.c | 4 + + arch/csky/mm/highmem.c | 64 +---- + arch/csky/mm/init.c | 48 ++++ + arch/csky/mm/tcm.c | 169 ++++++++++++ + 31 files changed, 1206 insertions(+), 73 deletions(-) + create mode 100644 arch/csky/include/asm/kprobes.h + create mode 100644 arch/csky/include/asm/memory.h + create mode 100644 arch/csky/include/asm/probes.h + create mode 100644 arch/csky/include/asm/stackprotector.h + create mode 100644 arch/csky/include/asm/tcm.h + create mode 100644 arch/csky/kernel/probes/Makefile + create mode 100644 arch/csky/kernel/probes/decode-insn.c + create mode 100644 arch/csky/kernel/probes/decode-insn.h + create mode 100644 arch/csky/kernel/probes/kprobes.c + create mode 100644 arch/csky/kernel/probes/kprobes_trampoline.S + create mode 100644 arch/csky/kernel/probes/simulate-insn.c + create mode 100644 arch/csky/kernel/probes/simulate-insn.h + create mode 100644 arch/csky/mm/tcm.c +Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (240b62d381fe ia64: remove stale paravirt leftovers) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (5ed0794cde59 m68k/atari: Convert Falcon IDE drivers to platform drivers) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (c79f46a28239 Linux 5.5-rc5) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (22648c989cb8 microblaze: Increase max dtb size to 64K from 32K) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (a8d0f11ee50d MIPS: SGI-IP27: Enable ethernet phy on second Origin 200 module) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (a7f96fce201c MAINTAINERS: add nds32 maintainer) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (e32ea127d81c nios2: Fix ioremap) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (0ecdcaa6d5e7 openrisc: Fix Kconfig indentation) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (22b4b7c41c2a parisc: Use proper printk format for resource_size_t) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/kernel/drivers.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging powerpc/next (3a9d970f17e0 powerpc/85xx: Get twr_p102x to compile again) +$ git merge powerpc/next +Merge made by the 'recursive' strategy. + Documentation/powerpc/imc.rst | 199 ++++++++++++++++++++++ + Documentation/powerpc/index.rst | 1 + + arch/powerpc/boot/4xx.c | 2 +- + arch/powerpc/include/asm/firmware.h | 6 +- + arch/powerpc/include/asm/pci.h | 1 - + arch/powerpc/kernel/eeh_driver.c | 6 - + arch/powerpc/kernel/entry_64.S | 18 +- + arch/powerpc/kernel/pci-common.c | 50 +----- + arch/powerpc/kernel/pci-hotplug.c | 1 - + arch/powerpc/kernel/pci_of_scan.c | 1 - + arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 6 +- + arch/powerpc/platforms/85xx/twr_p102x.c | 5 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 19 ++- + arch/powerpc/platforms/powernv/pci.c | 4 - + arch/powerpc/platforms/pseries/Kconfig | 1 - + arch/powerpc/platforms/pseries/firmware.c | 10 +- + arch/powerpc/platforms/pseries/iommu.c | 64 ++++--- + arch/powerpc/platforms/pseries/papr_scm.c | 5 +- + tools/testing/selftests/powerpc/mm/.gitignore | 1 + + tools/testing/selftests/powerpc/mm/Makefile | 3 +- + tools/testing/selftests/powerpc/mm/bad_accesses.c | 171 +++++++++++++++++++ + 21 files changed, 461 insertions(+), 113 deletions(-) + create mode 100644 Documentation/powerpc/imc.rst + create mode 100644 tools/testing/selftests/powerpc/mm/bad_accesses.c +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (5a35435ef4e6 soc: fsl: qe: remove PPC32 dependency from CONFIG_QUICC_ENGINE) +$ git merge soc-fsl/next +Removing include/soc/fsl/qe/qe_ic.h +Removing drivers/soc/fsl/qe/qe_ic.h +Auto-merging arch/powerpc/platforms/85xx/twr_p102x.c +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/cpm.h | 172 +----------- + arch/powerpc/platforms/83xx/km83xx.c | 3 +- + arch/powerpc/platforms/83xx/misc.c | 23 -- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 3 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 3 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 3 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 3 +- + arch/powerpc/platforms/83xx/mpc83xx.h | 7 - + arch/powerpc/platforms/85xx/corenet_generic.c | 10 - + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 27 -- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 17 -- + arch/powerpc/platforms/85xx/twr_p102x.c | 15 - + drivers/net/ethernet/freescale/Kconfig | 2 +- + drivers/net/wan/fsl_ucc_hdlc.c | 23 +- + drivers/net/wan/fsl_ucc_hdlc.h | 2 +- + drivers/soc/fsl/qe/Kconfig | 3 +- + drivers/soc/fsl/qe/gpio.c | 34 ++- + drivers/soc/fsl/qe/qe.c | 104 +++---- + drivers/soc/fsl/qe/qe_common.c | 50 ++-- + drivers/soc/fsl/qe/qe_ic.c | 285 +++++++++---------- + drivers/soc/fsl/qe/qe_ic.h | 99 ------- + drivers/soc/fsl/qe/qe_io.c | 70 +++-- + drivers/soc/fsl/qe/qe_tdm.c | 8 +- + drivers/soc/fsl/qe/ucc.c | 27 +- + drivers/soc/fsl/qe/ucc_fast.c | 86 +++--- + drivers/soc/fsl/qe/ucc_slow.c | 60 ++-- + drivers/soc/fsl/qe/usb.c | 2 +- + drivers/tty/serial/ucc_uart.c | 385 ++++++++++++++------------ + include/soc/fsl/cpm.h | 171 ++++++++++++ + include/soc/fsl/qe/qe.h | 59 ++-- + include/soc/fsl/qe/qe_ic.h | 135 --------- + include/soc/fsl/qe/ucc_fast.h | 4 +- + include/soc/fsl/qe/ucc_slow.h | 6 +- + 33 files changed, 775 insertions(+), 1126 deletions(-) + delete mode 100644 drivers/soc/fsl/qe/qe_ic.h + create mode 100644 include/soc/fsl/cpm.h + delete mode 100644 include/soc/fsl/qe/qe_ic.h +Merging risc-v/for-next (43dfc6167983 kasan: Add riscv to KASAN documentation.) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kasan.rst | 4 +- + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/kasan.h | 27 ++++++++++ + arch/riscv/include/asm/pgtable-64.h | 5 ++ + arch/riscv/include/asm/string.h | 9 ++++ + arch/riscv/kernel/head.S | 3 ++ + arch/riscv/kernel/riscv_ksyms.c | 2 + + arch/riscv/kernel/setup.c | 5 ++ + arch/riscv/kernel/vmlinux.lds.S | 1 + + arch/riscv/lib/memcpy.S | 5 +- + arch/riscv/lib/memset.S | 5 +- + arch/riscv/mm/Makefile | 6 +++ + arch/riscv/mm/kasan_init.c | 104 ++++++++++++++++++++++++++++++++++++ + mm/kasan/common.c | 2 + + 14 files changed, 173 insertions(+), 6 deletions(-) + create mode 100644 arch/riscv/include/asm/kasan.h + create mode 100644 arch/riscv/mm/kasan_init.c +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 (d1eef1c61974 Linux 5.5-rc2) +$ git merge s390/features +Already up to date. +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 (9807019a62dc um: Loadable BPF "Firmware" for vector drivers) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (bd6d7558140c Merge branch 'xtensa-5.5' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (f4a0b08b39ae fscrypt: remove redundant bi_status check) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + Documentation/filesystems/fscrypt.rst | 35 +++++++- + fs/crypto/Kconfig | 21 +++-- + fs/crypto/bio.c | 2 - + fs/crypto/crypto.c | 50 ----------- + fs/crypto/fname.c | 69 +++++++++++--- + fs/crypto/fscrypt_private.h | 36 +------- + fs/crypto/hkdf.c | 2 +- + fs/crypto/keyring.c | 132 +++++++++++++++++++++++++-- + fs/crypto/keysetup.c | 21 ++--- + fs/crypto/keysetup_v1.c | 15 ---- + fs/crypto/policy.c | 163 ++++++++++++++++++++++------------ + fs/ext4/Kconfig | 1 + + fs/ext4/dir.c | 2 +- + fs/f2fs/Kconfig | 1 + + fs/f2fs/dir.c | 2 +- + fs/ubifs/Kconfig | 1 + + fs/ubifs/dir.c | 2 +- + include/linux/fscrypt.h | 28 +++++- + include/uapi/linux/fscrypt.h | 14 ++- + 19 files changed, 393 insertions(+), 204 deletions(-) +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 (3ae03c13879d Merge branch 'for-next-next-v5.5-20200106' into for-next-20200106) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/inode.c +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 2 +- + fs/btrfs/block-group.c | 115 ++++-- + fs/btrfs/block-group.h | 35 ++ + fs/btrfs/check-integrity.c | 4 +- + fs/btrfs/compression.c | 4 +- + fs/btrfs/ctree.h | 61 ++- + fs/btrfs/discard.c | 702 ++++++++++++++++++++++++++++++++++ + fs/btrfs/discard.h | 41 ++ + fs/btrfs/disk-io.c | 26 +- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 50 +-- + fs/btrfs/extent_io.c | 42 +-- + fs/btrfs/extent_io.h | 6 +- + fs/btrfs/file-item.c | 38 +- + fs/btrfs/file.c | 23 +- + fs/btrfs/free-space-cache.c | 619 ++++++++++++++++++++++++++---- + fs/btrfs/free-space-cache.h | 41 +- + fs/btrfs/inode-map.c | 13 +- + fs/btrfs/inode.c | 878 +++++-------------------------------------- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/ordered-data.c | 81 ++-- + fs/btrfs/ordered-data.h | 26 +- + fs/btrfs/print-tree.c | 2 +- + fs/btrfs/qgroup.c | 44 +-- + fs/btrfs/relocation.c | 20 +- + fs/btrfs/scrub.c | 7 +- + fs/btrfs/space-info.c | 42 +-- + fs/btrfs/super.c | 39 +- + fs/btrfs/sysfs.c | 253 +++++++++++-- + fs/btrfs/sysfs.h | 4 +- + fs/btrfs/tests/inode-tests.c | 44 ++- + fs/btrfs/tree-checker.c | 225 ++++++++--- + fs/btrfs/tree-log.c | 411 ++++++-------------- + fs/btrfs/volumes.c | 56 ++- + fs/btrfs/volumes.h | 2 +- + include/linux/bitmap.h | 35 ++ + include/trace/events/btrfs.h | 6 +- + mm/percpu.c | 61 +-- + 38 files changed, 2444 insertions(+), 1620 deletions(-) + create mode 100644 fs/btrfs/discard.c + create mode 100644 fs/btrfs/discard.h +Merging ceph/master (da08e1e1d7c3 ceph: add more debug info when decoding mdsmap) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (30b1b3802b20 fs/cifs/cifssmb.c: use true,false for bool variable) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifssmb.c | 4 ++-- + fs/cifs/smb2ops.c | 2 +- + 2 files changed, 3 insertions(+), 3 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 (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/messaging.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging erofs/dev (2dd06edbd7ae erofs: remove void tagging/untagging of workgroup pointers) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/internal.h | 4 ++-- + fs/erofs/utils.c | 15 ++++----------- + fs/erofs/xattr.h | 17 +++++++++-------- + fs/erofs/zdata.c | 5 ++--- + 4 files changed, 17 insertions(+), 24 deletions(-) +Merging ext3/for_next (d9e9866803f7 ext2: Adjust indentation in ext2_fill_super) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 7 ++++--- + fs/quota/quotaio_v1.h | 6 ++++-- + fs/reiserfs/super.c | 4 +++- + 3 files changed, 11 insertions(+), 6 deletions(-) +Merging ext4/dev (40eaaeb11758 memcg: fix a crash in wb_workfn when a device disappears) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/balloc.c | 5 +- + fs/ext4/ext4.h | 68 ++++++++++++- + fs/ext4/ext4_jbd2.c | 3 + + fs/ext4/extents.c | 1 + + fs/ext4/file.c | 203 ++++++++++++++++++++++++++++----------- + fs/ext4/ialloc.c | 6 +- + fs/ext4/inline.c | 2 + + fs/ext4/inode.c | 35 ++++++- + fs/ext4/mballoc.c | 4 + + fs/ext4/mmp.c | 6 +- + fs/ext4/namei.c | 15 ++- + fs/ext4/super.c | 70 +++++++++++++- + fs/ext4/sysfs.c | 88 ++++++++++++++++- + fs/ext4/xattr.c | 4 +- + fs/fs-writeback.c | 2 +- + include/linux/backing-dev.h | 10 ++ + include/trace/events/writeback.h | 37 ++++--- + mm/backing-dev.c | 1 + + 18 files changed, 472 insertions(+), 88 deletions(-) +Merging f2fs/dev (846b67ccce8b f2fs: show the CP_PAUSE reason in checkpoint traces) +$ git merge f2fs/dev +Auto-merging fs/f2fs/dir.c +Auto-merging fs/f2fs/Kconfig +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 52 ++ + fs/f2fs/Kconfig | 25 + + fs/f2fs/Makefile | 1 + + fs/f2fs/checkpoint.c | 6 +- + fs/f2fs/compress.c | 1139 ++++++++++++++++++++++++++++++++++++ + fs/f2fs/data.c | 715 ++++++++++++++++++---- + fs/f2fs/debug.c | 9 +- + fs/f2fs/dir.c | 14 + + fs/f2fs/f2fs.h | 296 ++++++++-- + fs/f2fs/file.c | 239 ++++++-- + fs/f2fs/gc.c | 4 +- + fs/f2fs/inline.c | 44 +- + fs/f2fs/inode.c | 42 ++ + fs/f2fs/namei.c | 121 ++-- + fs/f2fs/recovery.c | 20 +- + fs/f2fs/segment.c | 264 ++++++++- + fs/f2fs/segment.h | 12 - + fs/f2fs/super.c | 148 ++++- + fs/f2fs/sysfs.c | 19 +- + include/linux/f2fs_fs.h | 8 + + include/trace/events/f2fs.h | 102 +++- + 21 files changed, 3026 insertions(+), 254 deletions(-) + create mode 100644 fs/f2fs/compress.c +Merging fsverity/fsverity (8086c974ecb9 fs-verity: implement readahead for FS_IOC_ENABLE_VERITY) +$ git merge fsverity/fsverity +Merge made by the 'recursive' strategy. + fs/verity/enable.c | 45 +++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 39 insertions(+), 6 deletions(-) +Merging fuse/for-next (8d66fcb74884 fuse: fix Kconfig indentation) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (c79f46a28239 Linux 5.5-rc5) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (ffb855611b05 NFS: Attach supplementary error information to fs_context.) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/Makefile | 2 +- + fs/nfs/client.c | 80 +- + fs/nfs/fs_context.c | 1424 ++++++++++++++++++++++++++++++ + fs/nfs/fscache.c | 2 +- + fs/nfs/getroot.c | 73 +- + fs/nfs/internal.h | 132 +-- + fs/nfs/namespace.c | 146 ++-- + fs/nfs/nfs3_fs.h | 2 +- + fs/nfs/nfs3client.c | 6 +- + fs/nfs/nfs3proc.c | 2 +- + fs/nfs/nfs4_fs.h | 9 +- + fs/nfs/nfs4client.c | 99 +-- + fs/nfs/nfs4file.c | 1 + + fs/nfs/nfs4namespace.c | 292 ++++--- + fs/nfs/nfs4proc.c | 2 +- + fs/nfs/nfs4super.c | 257 +++--- + fs/nfs/proc.c | 2 +- + fs/nfs/super.c | 2217 ++++++----------------------------------------- + include/linux/nfs_xdr.h | 9 +- + 19 files changed, 2287 insertions(+), 2470 deletions(-) + create mode 100644 fs/nfs/fs_context.c +Merging nfsd/nfsd-next (e44b4bf2648e nfsd: use true,false for bool variable in nfssvc.c) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/Kconfig | 10 ++ + fs/nfsd/netns.h | 6 +- + fs/nfsd/nfs3xdr.c | 20 +-- + fs/nfsd/nfs4callback.c | 11 +- + fs/nfsd/nfs4layouts.c | 2 +- + fs/nfsd/nfs4proc.c | 449 ++++++++++++++++++++++++++++++++++++++++++++----- + fs/nfsd/nfs4recover.c | 8 +- + fs/nfsd/nfs4state.c | 262 ++++++++++++++++++++++------- + fs/nfsd/nfs4xdr.c | 161 +++++++++++++++++- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfsd.h | 34 +++- + fs/nfsd/nfsfh.h | 9 +- + fs/nfsd/nfsproc.c | 6 +- + fs/nfsd/nfssvc.c | 12 +- + fs/nfsd/state.h | 44 ++++- + fs/nfsd/vfs.c | 30 ++-- + fs/nfsd/vfs.h | 2 +- + fs/nfsd/xdr3.h | 2 +- + fs/nfsd/xdr4.h | 39 ++++- + 19 files changed, 943 insertions(+), 170 deletions(-) +Merging orangefs/for-next (f9bbb68233aa orangefs: posix open permission checking...) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (6c7bed084507 ovl: improving copy-up efficiency for big sparse file) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 41 +++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 39 insertions(+), 2 deletions(-) +Merging ubifs/linux-next (6e78c01fde90 Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()") +$ git merge ubifs/linux-next +Already up to date. +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 (461af564ded4 xfs: remove shadow variable in xfs_btree_lshift) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_btree.c | 2 -- + fs/xfs/xfs_dquot.c | 6 +++--- + fs/xfs/xfs_ioctl32.c | 2 +- + fs/xfs/xfs_ioctl32.h | 2 +- + fs/xfs/xfs_qm.h | 6 +++--- + fs/xfs/xfs_quotaops.c | 6 +++--- + fs/xfs/xfs_trans_dquot.c | 8 +++++--- + 7 files changed, 16 insertions(+), 16 deletions(-) +Merging iomap/iomap-for-next (4a58d8158f6d fs: Fix page_mkwrite off-by-one errors) +$ git merge iomap/iomap-for-next +Auto-merging fs/f2fs/file.c +CONFLICT (content): Merge conflict in fs/f2fs/file.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/inode.c +Recorded preimage for 'fs/f2fs/file.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/f2fs/file.c'. +[master 03578500af4a] Merge remote-tracking branch 'iomap/iomap-for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/inode.c | 15 ++++----------- + fs/buffer.c | 16 +++------------- + fs/ceph/addr.c | 2 +- + fs/ext4/inode.c | 14 ++++---------- + fs/f2fs/file.c | 18 +++++++----------- + fs/iomap/buffered-io.c | 18 +++++------------- + fs/ubifs/file.c | 3 +-- + include/linux/pagemap.h | 28 ++++++++++++++++++++++++++++ + 8 files changed, 53 insertions(+), 61 deletions(-) +Merging djw-vfs/vfs-for-next (3253d9d09337 splice: only read in as much information as there is pipe buffer space) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (98ca480a8f22 locks: print unsigned ino in /proc/locks) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (912dfe068c43 Merge branches 'work.openat2', 'work.recursive_removal' and 'imm.timestamp' into for-next) +$ git merge vfs/for-next +Auto-merging security/apparmor/apparmorfs.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/events/core.c +Auto-merging include/linux/syscalls.h +Auto-merging fs/ubifs/file.c +Auto-merging fs/nsfs.c +Auto-merging fs/namei.c +Auto-merging fs/inode.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ceph/mds_client.c +Merge made by the 'recursive' strategy. + CREDITS | 4 +- + Documentation/filesystems/path-lookup.rst | 68 ++- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/attr.c | 23 +- + fs/ceph/mds_client.c | 4 +- + fs/cifs/inode.c | 13 +- + fs/configfs/inode.c | 9 +- + fs/debugfs/inode.c | 121 +---- + fs/f2fs/file.c | 18 +- + fs/fat/misc.c | 10 +- + fs/inode.c | 33 +- + fs/kernfs/inode.c | 6 +- + fs/libfs.c | 70 +++ + fs/namei.c | 199 ++++++-- + fs/nsfs.c | 29 +- + fs/ntfs/inode.c | 18 +- + fs/open.c | 149 ++++-- + fs/proc/base.c | 3 +- + fs/proc/namespaces.c | 20 +- + fs/tracefs/inode.c | 114 +---- + fs/ubifs/file.c | 18 +- + fs/ubifs/sb.c | 11 +- + fs/utimes.c | 4 +- + include/linux/debugfs.h | 2 +- + include/linux/fcntl.h | 12 +- + include/linux/fs.h | 3 +- + include/linux/namei.h | 12 +- + include/linux/proc_ns.h | 4 +- + include/linux/syscalls.h | 3 + + include/linux/tracefs.h | 1 - + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/fcntl.h | 35 ++ + kernel/bpf/offload.c | 12 +- + kernel/events/core.c | 2 +- + kernel/trace/trace.c | 4 +- + kernel/trace/trace_events.c | 6 +- + kernel/trace/trace_hwlat.c | 2 +- + security/apparmor/apparmorfs.c | 6 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/openat2/.gitignore | 1 + + tools/testing/selftests/openat2/Makefile | 8 + + tools/testing/selftests/openat2/helpers.c | 109 +++++ + tools/testing/selftests/openat2/helpers.h | 107 +++++ + tools/testing/selftests/openat2/openat2_test.c | 320 +++++++++++++ + .../testing/selftests/openat2/rename_attack_test.c | 160 +++++++ + tools/testing/selftests/openat2/resolve_test.c | 523 +++++++++++++++++++++ + 63 files changed, 1862 insertions(+), 440 deletions(-) + create mode 100644 tools/testing/selftests/openat2/.gitignore + create mode 100644 tools/testing/selftests/openat2/Makefile + create mode 100644 tools/testing/selftests/openat2/helpers.c + create mode 100644 tools/testing/selftests/openat2/helpers.h + create mode 100644 tools/testing/selftests/openat2/openat2_test.c + create mode 100644 tools/testing/selftests/openat2/rename_attack_test.c + create mode 100644 tools/testing/selftests/openat2/resolve_test.c +Merging printk/for-next (e616b43fb3a3 Merge branch 'for-5.6' into for-next) +$ git merge printk/for-next +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging pci/next (cb224132f23e Merge branch 'remotes/lorenzo/pci/dwc') +$ git merge pci/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/intel-gw-pcie.yaml | 138 ++++++ + drivers/iommu/amd_iommu.c | 7 +- + drivers/pci/controller/dwc/Kconfig | 11 + + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-keystone.c | 2 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 8 +- + drivers/pci/controller/dwc/pcie-designware.c | 57 +++ + drivers/pci/controller/dwc/pcie-designware.h | 12 + + drivers/pci/controller/dwc/pcie-intel-gw.c | 545 +++++++++++++++++++++ + drivers/pci/controller/pci-tegra.c | 2 +- + drivers/pci/controller/pcie-iproc.c | 24 + + drivers/pci/iov.c | 9 +- + drivers/pci/p2pdma.c | 3 + + drivers/pci/pci.c | 24 +- + drivers/pci/pci.h | 3 + + drivers/pci/pcie/err.c | 12 +- + drivers/pci/quirks.c | 99 ++-- + drivers/pci/search.c | 4 +- + drivers/pci/setup-bus.c | 184 ++++--- + include/linux/pci.h | 2 +- + include/uapi/linux/pci_regs.h | 1 + + 21 files changed, 974 insertions(+), 174 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml + create mode 100644 drivers/pci/controller/dwc/pcie-intel-gw.c +Merging pstore/for-next/pstore (9e5f1c19800b pstore/ram: Write new dumps to start of recycled zones) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (71bceec41644 Merge branch 'for-5.5/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-asus.c | 3 +- + drivers/hid/hid-core.c | 6 + + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-input.c | 16 ++- + drivers/hid/hid-ite.c | 3 + + drivers/hid/hid-logitech-hidpp.c | 246 ++++++++++++++++++++++++++++++-- + drivers/hid/hid-multitouch.c | 5 +- + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hidraw.c | 13 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 16 ++- + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 2 + + drivers/hid/uhid.c | 2 +- + drivers/hid/usbhid/hiddev.c | 97 ++++++------- + drivers/hid/wacom_wac.c | 6 +- + include/uapi/linux/hidraw.h | 1 + + 16 files changed, 339 insertions(+), 83 deletions(-) +Merging i2c/i2c/for-next (2b496a15c21d Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 20 ++- + .../devicetree/bindings/i2c/i2c-jz4780.txt | 4 +- + .../devicetree/bindings/i2c/renesas,i2c.txt | 3 +- + .../devicetree/bindings/i2c/renesas,iic.txt | 1 + + drivers/i2c/busses/i2c-at91-core.c | 41 +----- + drivers/i2c/busses/i2c-bcm2835.c | 17 ++- + drivers/i2c/busses/i2c-jz4780.c | 156 +++++++++++++++------ + drivers/i2c/busses/i2c-tiny-usb.c | 8 +- + drivers/i2c/i2c-core-base.c | 20 +-- + include/linux/i2c.h | 115 ++++++++------- + 10 files changed, 214 insertions(+), 171 deletions(-) +Merging i3c/i3c/next (608b68b67a30 MAINTAINERS: fix style in CADENCE I3C MASTER IP entry) +$ git merge i3c/i3c/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +++--- + drivers/i3c/master.c | 4 +-- + drivers/i3c/master/i3c-master-cdns.c | 49 ++++++++++++++++++++++++++++++++---- + 3 files changed, 50 insertions(+), 11 deletions(-) +Merging dmi/master (2429c99fa13a firmware: dmi: Add dmi_memdev_handle) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (00b379b51ea6 hwmon: (pmbus/ibm-cffps) Fix the LED behavior when turned off) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../bindings/hwmon/pmbus/ti,ucd90320.yaml | 45 + + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/max20730.rst | 74 + + Documentation/hwmon/max31730.rst | 44 + + Documentation/hwmon/pmbus.rst | 10 + + Documentation/hwmon/ucd9000.rst | 12 +- + drivers/hwmon/Kconfig | 17 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/hwmon.c | 17 +- + drivers/hwmon/max31730.c | 440 +++++ + drivers/hwmon/pmbus/Kconfig | 19 +- + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ibm-cffps.c | 89 +- + drivers/hwmon/pmbus/max20730.c | 372 ++++ + drivers/hwmon/pmbus/pmbus.c | 1 + + drivers/hwmon/pmbus/pmbus.h | 11 + + drivers/hwmon/pmbus/pmbus_core.c | 12 + + drivers/hwmon/pmbus/ucd9000.c | 39 +- + drivers/hwmon/w83627ehf.c | 2017 +++++++------------- + include/linux/hwmon.h | 26 +- + include/linux/pmbus.h | 11 +- + 21 files changed, 1888 insertions(+), 1372 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml + create mode 100644 Documentation/hwmon/max20730.rst + create mode 100644 Documentation/hwmon/max31730.rst + create mode 100644 drivers/hwmon/max31730.c + create mode 100644 drivers/hwmon/pmbus/max20730.c +Merging jc_docs/docs-next (3697aa15563f docs/zh_CN: translate kernel enforcement statement) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/automount-support.txt | 2 +- + Documentation/kernel-hacking/hacking.rst | 4 +- + Documentation/locking/locktorture.rst | 3 +- + Documentation/misc-devices/xilinx_sdfec.rst | 1 + + .../process/embargoed-hardware-issues.rst | 25 ++- + Documentation/riscv/boot-image-header.rst | 4 +- + Documentation/trace/ftrace.rst | 9 +- + .../translations/ko_KR/memory-barriers.txt | 4 +- + .../zh_CN/process/embargoed-hardware-issues.rst | 228 +++++++++++++++++++++ + Documentation/translations/zh_CN/process/index.rst | 3 + + .../zh_CN/process/kernel-driver-statement.rst | 199 ++++++++++++++++++ + .../zh_CN/process/kernel-enforcement-statement.rst | 151 ++++++++++++++ + Documentation/w1/masters/omap-hdq.rst | 2 +- + Documentation/x86/boot.rst | 5 +- + Documentation/x86/x86_64/mm.rst | 6 +- + arch/riscv/include/asm/image.h | 4 +- + 16 files changed, 621 insertions(+), 29 deletions(-) + create mode 100644 Documentation/translations/zh_CN/process/embargoed-hardware-issues.rst + create mode 100644 Documentation/translations/zh_CN/process/kernel-driver-statement.rst + create mode 100644 Documentation/translations/zh_CN/process/kernel-enforcement-statement.rst +Merging v4l-dvb/master (51e40a0dbe53 media: sun4i-csi: Add support for A10 CSI1 camera sensor interface) +$ git merge v4l-dvb/master +Auto-merging drivers/staging/media/ipu3/include/intel-ipu3.h +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/media/usb/pulse8-cec/pulse8-cec.c +CONFLICT (content): Merge conflict in drivers/media/usb/pulse8-cec/pulse8-cec.c +Auto-merging MAINTAINERS +Removing Documentation/media/v4l-drivers/cx18.rst +Removing Documentation/devicetree/bindings/media/ti-cal.txt +Removing Documentation/devicetree/bindings/media/amlogic,vdec.txt +Auto-merging Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml +Resolved 'drivers/media/usb/pulse8-cec/pulse8-cec.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 159b7bdb6fa3] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 14 +- + .../devicetree/bindings/media/amlogic,gx-vdec.yaml | 141 ++++ + .../devicetree/bindings/media/amlogic,vdec.txt | 72 -- + .../devicetree/bindings/media/renesas,vin.txt | 4 +- + .../devicetree/bindings/media/ti,cal.yaml | 202 ++++++ + Documentation/devicetree/bindings/media/ti-cal.txt | 72 -- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 2 +- + Documentation/media/uapi/dvb/video-get-event.rst | 2 +- + Documentation/media/uapi/dvb/video_types.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-reserved.rst | 3 +- + Documentation/media/uapi/v4l/pixfmt-srggb12p.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-tch-td16.rst | 34 +- + Documentation/media/uapi/v4l/pixfmt-tch-tu16.rst | 34 +- + Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 4 +- + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 2 +- + Documentation/media/v4l-drivers/cx18.rst | 39 -- + Documentation/media/v4l-drivers/index.rst | 1 - + Documentation/media/v4l-drivers/ipu3.rst | 6 +- + MAINTAINERS | 10 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 4 +- + drivers/media/dvb-frontends/dvb_dummy_fe.c | 10 +- + drivers/media/i2c/adv748x/adv748x.h | 8 +- + drivers/media/i2c/adv7604.c | 32 +- + drivers/media/i2c/mt9v032.c | 10 +- + drivers/media/i2c/ov5640.c | 41 +- + drivers/media/i2c/smiapp/smiapp-core.c | 198 +++--- + drivers/media/i2c/smiapp/smiapp-regs.c | 3 - + drivers/media/i2c/smiapp/smiapp.h | 1 - + drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 69 +- + drivers/media/pci/cx18/cx18-alsa-pcm.c | 75 +- + drivers/media/pci/cx18/cx18-cards.c | 8 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 1 - + drivers/media/pci/cx23885/cx23885-cards.c | 24 + + drivers/media/pci/cx23885/cx23885-video.c | 3 +- + drivers/media/pci/cx23885/cx23885.h | 1 + + drivers/media/pci/cx25821/cx25821-alsa.c | 1 - + drivers/media/pci/cx88/cx88-alsa.c | 1 - + drivers/media/pci/ivtv/Kconfig | 5 +- + drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 76 +- + drivers/media/pci/ivtv/ivtv-driver.c | 3 +- + drivers/media/pci/ivtv/ivtv-driver.h | 1 - + drivers/media/pci/meye/meye.c | 4 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 1 - + drivers/media/pci/solo6x10/solo6x10-g723.c | 24 +- + drivers/media/pci/tw686x/tw686x-audio.c | 16 +- + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/atmel/atmel-isc-base.c | 94 ++- + drivers/media/platform/atmel/atmel-isi.c | 42 +- + drivers/media/platform/atmel/atmel-isi.h | 2 + + drivers/media/platform/coda/coda-bit.c | 29 +- + drivers/media/platform/coda/coda-common.c | 45 +- + drivers/media/platform/coda/coda-jpeg.c | 746 +++++++++++++++++++- + drivers/media/platform/coda/coda.h | 3 + + drivers/media/platform/coda/coda_regs.h | 83 +++ + drivers/media/platform/coda/trace.h | 10 + + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 3 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 9 +- + drivers/media/platform/omap3isp/isp.c | 8 +- + drivers/media/platform/omap3isp/ispccdc.c | 12 +- + drivers/media/platform/pxa_camera.c | 2 + + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 13 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 57 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h | 6 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 20 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 5 +- + drivers/media/platform/ti-vpe/cal.c | 773 ++++++++++++++++----- + drivers/media/platform/ti-vpe/cal_regs.h | 221 +++--- + drivers/media/platform/ti-vpe/csc.c | 32 +- + drivers/media/platform/vimc/vimc-scaler.c | 166 ++++- + drivers/media/platform/vivid/Makefile | 3 +- + drivers/media/platform/vivid/vivid-core.c | 203 +++++- + drivers/media/platform/vivid/vivid-core.h | 20 + + drivers/media/platform/vivid/vivid-ctrls.c | 11 + + drivers/media/platform/vivid/vivid-kthread-touch.c | 181 +++++ + drivers/media/platform/vivid/vivid-kthread-touch.h | 13 + + drivers/media/platform/vivid/vivid-touch-cap.c | 341 +++++++++ + drivers/media/platform/vivid/vivid-touch-cap.h | 39 ++ + drivers/media/platform/vivid/vivid-vid-common.c | 2 +- + drivers/media/rc/rc-main.c | 27 +- + drivers/media/rc/serial_ir.c | 2 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-audio.c | 79 +-- + drivers/media/usb/dvb-usb-v2/af9035.c | 15 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 + + drivers/media/usb/dvb-usb/af9005.c | 2 +- + drivers/media/usb/dvb-usb/cxusb.c | 33 +- + drivers/media/usb/dvb-usb/digitv.c | 10 +- + drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 +- + drivers/media/usb/dvb-usb/vp7045.c | 21 +- + drivers/media/usb/em28xx/em28xx-audio.c | 87 +-- + drivers/media/usb/go7007/s2250-board.c | 1 + + drivers/media/usb/go7007/snd-go7007.c | 60 +- + drivers/media/usb/gspca/gspca.c | 2 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 769 +++++++++++--------- + drivers/media/usb/stkwebcam/stk-webcam.c | 2 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 82 +-- + drivers/media/usb/usbtv/usbtv-audio.c | 29 +- + drivers/media/usb/usbvision/usbvision-video.c | 4 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 476 +++++++++++-- + drivers/media/v4l2-core/v4l2-event.c | 5 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 213 ++++-- + drivers/media/v4l2-core/v4l2-subdev.c | 26 +- + drivers/media/v4l2-core/videobuf-core.c | 5 +- + drivers/staging/media/hantro/Makefile | 1 + + drivers/staging/media/hantro/hantro.h | 66 +- + drivers/staging/media/hantro/hantro_drv.c | 11 +- + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 4 +- + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 6 +- + drivers/staging/media/hantro/hantro_g1_regs.h | 53 ++ + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 6 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +- + drivers/staging/media/hantro/hantro_h264.c | 2 +- + drivers/staging/media/hantro/hantro_hw.h | 17 +- + drivers/staging/media/hantro/hantro_postproc.c | 142 ++++ + drivers/staging/media/hantro/hantro_v4l2.c | 109 ++- + drivers/staging/media/hantro/rk3288_vpu_hw.c | 10 + + .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 +- + .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 4 +- + .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 4 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 3 - + drivers/staging/media/ipu3/TODO | 3 - + drivers/staging/media/ipu3/include/intel-ipu3.h | 4 - + drivers/staging/media/ipu3/ipu3-css.c | 2 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 79 +-- + drivers/staging/media/ipu3/ipu3.h | 5 +- + drivers/staging/media/meson/vdec/vdec.c | 18 +- + drivers/staging/media/meson/vdec/vdec.h | 1 + + drivers/staging/media/meson/vdec/vdec_1.c | 29 +- + drivers/staging/media/meson/vdec/vdec_platform.c | 60 ++ + drivers/staging/media/meson/vdec/vdec_platform.h | 4 + + include/media/dvb-usb-ids.h | 2 + + include/media/v4l2-common.h | 21 + + include/media/v4l2-device.h | 12 +- + include/media/v4l2-ioctl.h | 55 ++ + include/media/v4l2-subdev.h | 2 +- + include/trace/events/v4l2.h | 2 +- + include/uapi/linux/videodev2.h | 29 + + 138 files changed, 5190 insertions(+), 2006 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml + delete mode 100644 Documentation/devicetree/bindings/media/amlogic,vdec.txt + create mode 100644 Documentation/devicetree/bindings/media/ti,cal.yaml + delete mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt + delete mode 100644 Documentation/media/v4l-drivers/cx18.rst + create mode 100644 drivers/media/platform/vivid/vivid-kthread-touch.c + create mode 100644 drivers/media/platform/vivid/vivid-kthread-touch.h + create mode 100644 drivers/media/platform/vivid/vivid-touch-cap.c + create mode 100644 drivers/media/platform/vivid/vivid-touch-cap.h + create mode 100644 drivers/staging/media/hantro/hantro_postproc.c +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 (205a31f03a11 Merge branches 'pm-cpufreq' and 'pm-avs' into linux-next) +$ git merge pm/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .mailmap | 2 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 6 + + .../admin-guide/acpi/fan_performance_states.rst | 62 + + Documentation/admin-guide/acpi/index.rst | 1 + + Documentation/admin-guide/pm/cpuidle.rst | 3 + + .../devicetree/bindings/power/avs/qcom,cpr.txt | 130 ++ + Documentation/firmware-guide/acpi/enumeration.rst | 16 +- + MAINTAINERS | 10 +- + arch/x86/include/asm/intel-family.h | 1 + + drivers/acpi/Kconfig | 1 + + drivers/acpi/acpi_processor.c | 182 ++ + drivers/acpi/acpi_video.c | 2 +- + drivers/acpi/acpica/acobject.h | 3 +- + drivers/acpi/acpica/dbinput.c | 2 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 + + drivers/acpi/acpica/dswload.c | 21 + + drivers/acpi/acpica/exfield.c | 10 +- + drivers/acpi/battery.c | 75 +- + drivers/acpi/device_pm.c | 1 + + drivers/acpi/dptf/dptf_power.c | 1 + + drivers/acpi/dptf/int340x_thermal.c | 4 + + drivers/acpi/ec.c | 16 +- + drivers/acpi/fan.c | 97 +- + drivers/acpi/processor_idle.c | 174 +- + drivers/acpi/video_detect.c | 29 + + drivers/base/power/wakeup.c | 3 + + drivers/base/swnode.c | 154 +- + drivers/base/test/Makefile | 2 + + drivers/base/test/property-entry-test.c | 474 ++++++ + drivers/cpufreq/cppc_cpufreq.c | 8 +- + drivers/cpuidle/cpuidle-clps711x.c | 5 +- + drivers/cpuidle/cpuidle-kirkwood.c | 5 +- + drivers/cpuidle/cpuidle.c | 6 +- + drivers/cpuidle/sysfs.c | 10 + + drivers/idle/intel_idle.c | 349 +++- + drivers/platform/x86/intel-hid.c | 1 + + drivers/platform/x86/intel_cht_int33fe_typec.c | 81 +- + drivers/power/avs/Kconfig | 16 + + drivers/power/avs/Makefile | 1 + + drivers/power/avs/qcom-cpr.c | 1794 ++++++++++++++++++++ + drivers/powercap/intel_rapl_common.c | 2 + + .../intel/int340x_thermal/int3400_thermal.c | 1 + + .../intel/int340x_thermal/int3403_thermal.c | 1 + + include/acpi/acpixf.h | 2 +- + include/acpi/platform/acenv.h | 11 + + include/linux/acpi.h | 15 + + include/linux/cpuidle.h | 1 + + include/linux/property.h | 96 +- + kernel/power/suspend_test.c | 6 +- + tools/power/acpi/Makefile.config | 2 +- + 51 files changed, 3450 insertions(+), 449 deletions(-) + create mode 100644 Documentation/admin-guide/acpi/fan_performance_states.rst + create mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.txt + create mode 100644 drivers/base/test/property-entry-test.c + create mode 100644 drivers/power/avs/qcom-cpr.c +Merging cpufreq-arm/cpufreq/arm/linux-next (bdeb9bbf9684 cpufreq: imx-cpufreq-dt: Add i.MX8MP support) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/imx-cpufreq-dt.c | 6 ++++-- + drivers/cpufreq/kirkwood-cpufreq.c | 4 +--- + drivers/cpufreq/tegra186-cpufreq.c | 4 +--- + 4 files changed, 7 insertions(+), 8 deletions(-) +Merging cpupower/cpupower (e42617b825f8 Linux 5.5-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 +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 48 +++++++++++++++++++----------------------------- + drivers/opp/of.c | 31 ++++++++++++++++++------------- + drivers/opp/opp.h | 6 ++---- + 3 files changed, 39 insertions(+), 46 deletions(-) +Merging thermal/thermal/linux-next (09a1f1817b04 dt-bindings: thermal: Add YAML schema for sun8i-thermal driver bindings) +$ git merge thermal/thermal/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 160 ++++++ + .../driver-api/thermal/cpu-idle-cooling.rst | 189 ++++++ + .../driver-api/thermal/exynos_thermal.rst | 2 +- + MAINTAINERS | 13 +- + drivers/thermal/Kconfig | 35 +- + drivers/thermal/Makefile | 4 +- + drivers/thermal/amlogic_thermal.c | 6 +- + drivers/thermal/armada_thermal.c | 5 +- + drivers/thermal/clock_cooling.c | 2 +- + .../thermal/{cpu_cooling.c => cpufreq_cooling.c} | 7 +- + drivers/thermal/cpuidle_cooling.c | 232 ++++++++ + drivers/thermal/db8500_thermal.c | 4 +- + drivers/thermal/devfreq_cooling.c | 3 +- + drivers/thermal/fair_share.c | 4 +- + drivers/thermal/gov_bang_bang.c | 4 +- + .../int340x_thermal/processor_thermal_device.c | 4 + + drivers/thermal/intel/intel_pch_thermal.c | 10 +- + drivers/thermal/max77620_thermal.c | 2 +- + drivers/thermal/mtk_thermal.c | 12 +- + drivers/thermal/of-thermal.c | 68 +-- + drivers/thermal/qcom/tsens.c | 3 + + drivers/thermal/qoriq_thermal.c | 337 ++++++----- + drivers/thermal/rockchip_thermal.c | 34 +- + drivers/thermal/samsung/exynos_tmu.c | 5 +- + drivers/thermal/step_wise.c | 4 +- + drivers/thermal/sun8i_thermal.c | 639 +++++++++++++++++++++ + drivers/thermal/tegra/soctherm.c | 15 +- + drivers/thermal/thermal_core.h | 2 - + drivers/thermal/thermal_hwmon.c | 28 + + drivers/thermal/thermal_hwmon.h | 7 + + drivers/thermal/user_space.c | 4 +- + drivers/thermal/zx2967_thermal.c | 1 + + include/linux/clock_cooling.h | 2 +- + include/linux/cpu_cooling.h | 24 +- + 34 files changed, 1615 insertions(+), 256 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml + create mode 100644 Documentation/driver-api/thermal/cpu-idle-cooling.rst + rename drivers/thermal/{cpu_cooling.c => cpufreq_cooling.c} (98%) + create mode 100644 drivers/thermal/cpuidle_cooling.c + create mode 100644 drivers/thermal/sun8i_thermal.c +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (fd6988496e79 Linux 5.5-rc4) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (17aa23ee7234 fcnal-test: Fix vrf argument in local tcp tests) +$ git merge net-next/master +Removing tools/testing/selftests/bpf/test_cgroup_attach.c +Auto-merging net/sched/sch_cake.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging drivers/net/wan/fsl_ucc_hdlc.c +Auto-merging drivers/net/vxlan.c +Auto-merging drivers/net/phy/phylink.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Removing drivers/net/ethernet/freescale/enetc/enetc_mdio.h +Auto-merging drivers/net/ethernet/broadcom/b44.c +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/ip-sysctl.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 7 + + .../devicetree/bindings/net/dsa/ar9331.txt | 148 + + .../devicetree/bindings/net/mediatek-dwmac.txt | 33 +- + .../devicetree/bindings/net/ti,dp83867.txt | 12 +- + .../bindings/net/wireless/qcom,ath11k.yaml | 273 + + Documentation/devicetree/bindings/ptp/ptp-ines.txt | 35 + + .../devicetree/bindings/ptp/timestamper.txt | 42 + + .../networking/device_drivers/netronome/nfp.rst | 116 + + Documentation/networking/ethtool-netlink.rst | 520 ++ + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.txt | 4 + + Documentation/networking/phy.rst | 18 + + Documentation/networking/sfp-phylink.rst | 3 +- + MAINTAINERS | 18 +- + arch/arm/net/bpf_jit_32.c | 30 +- + arch/arm64/Kconfig | 1 + + arch/m68k/emu/nfeth.c | 2 +- + arch/mips/boot/dts/qca/ar9331.dtsi | 119 +- + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 13 + + arch/riscv/include/asm/perf_event.h | 4 + + arch/riscv/include/asm/pgtable.h | 4 + + arch/riscv/include/uapi/asm/bpf_perf_event.h | 9 + + arch/riscv/net/bpf_jit_comp.c | 531 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/vector_kern.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/net/bpf_jit_comp.c | 150 + + arch/xtensa/platforms/iss/network.c | 2 +- + drivers/atm/fore200e.c | 25 +- + drivers/bcma/scan.c | 7 +- + drivers/bluetooth/btbcm.c | 46 + + drivers/bluetooth/btbcm.h | 16 + + drivers/bluetooth/btusb.c | 12 +- + drivers/bluetooth/hci_bcm.c | 50 +- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/net/Kconfig | 43 + + drivers/net/Makefile | 1 + + drivers/net/appletalk/cops.c | 4 +- + drivers/net/arcnet/arcdevice.h | 2 +- + drivers/net/arcnet/arcnet.c | 2 +- + drivers/net/bonding/bond_3ad.c | 122 +- + drivers/net/caif/caif_serial.c | 4 +- + drivers/net/dsa/Kconfig | 5 +- + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 3 + + drivers/net/dsa/mv88e6xxx/serdes.c | 100 +- + drivers/net/dsa/mv88e6xxx/serdes.h | 9 + + drivers/net/dsa/ocelot/Kconfig | 2 + + drivers/net/dsa/ocelot/felix.c | 265 +- + drivers/net/dsa/ocelot/felix.h | 16 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 501 +- + drivers/net/dsa/qca/Kconfig | 9 + + drivers/net/dsa/qca/Makefile | 2 + + drivers/net/dsa/qca/ar9331.c | 855 +++ + drivers/net/dsa/sja1105/sja1105_main.c | 120 +- + drivers/net/dsa/sja1105/sja1105_ptp.c | 36 +- + drivers/net/dsa/sja1105/sja1105_ptp.h | 1 + + drivers/net/dsa/vitesse-vsc73xx-core.c | 2 + + drivers/net/ethernet/3com/3c509.c | 4 +- + drivers/net/ethernet/3com/3c515.c | 4 +- + drivers/net/ethernet/3com/3c574_cs.c | 4 +- + drivers/net/ethernet/3com/3c589_cs.c | 4 +- + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/3com/typhoon.c | 2 +- + drivers/net/ethernet/8390/8390.c | 4 +- + drivers/net/ethernet/8390/8390.h | 4 +- + drivers/net/ethernet/8390/8390p.c | 4 +- + drivers/net/ethernet/8390/axnet_cs.c | 4 +- + drivers/net/ethernet/8390/lib8390.c | 2 +- + drivers/net/ethernet/adaptec/starfire.c | 4 +- + drivers/net/ethernet/agere/et131x.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/alteon/acenic.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 959 +++- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 73 + + drivers/net/ethernet/amd/7990.c | 2 +- + drivers/net/ethernet/amd/7990.h | 2 +- + drivers/net/ethernet/amd/a2065.c | 2 +- + drivers/net/ethernet/amd/am79c961a.c | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 2 +- + drivers/net/ethernet/amd/ariadne.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 4 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/declance.c | 2 +- + drivers/net/ethernet/amd/lance.c | 4 +- + drivers/net/ethernet/amd/ni65.c | 4 +- + drivers/net/ethernet/amd/nmclan_cs.c | 4 +- + drivers/net/ethernet/amd/pcnet32.c | 4 +- + drivers/net/ethernet/amd/sunlance.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/apm/xgene-v2/main.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/apple/macmace.c | 4 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/atheros/atlx/atlx.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 10 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 115 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 4 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 3 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 4 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 11 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 25 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 253 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 66 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 8 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 18 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 14 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 1 + + drivers/net/ethernet/cirrus/cs89x0.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 7 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 4 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +- + drivers/net/ethernet/dlink/dl2k.c | 4 +- + drivers/net/ethernet/dlink/sundance.c | 4 +- + drivers/net/ethernet/emulex/benet/be_main.c | 2 +- + drivers/net/ethernet/ethoc.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + drivers/net/ethernet/fealnx.c | 4 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 20 + + drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h | 4 +- + drivers/net/ethernet/freescale/dpaa2/dprtc.h | 2 + + drivers/net/ethernet/freescale/enetc/Kconfig | 1 + + drivers/net/ethernet/freescale/enetc/Makefile | 2 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 14 + + drivers/net/ethernet/freescale/enetc/enetc.h | 3 + + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 1 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 11 +- + drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 120 +- + drivers/net/ethernet/freescale/enetc/enetc_mdio.h | 12 - + .../net/ethernet/freescale/enetc/enetc_pci_mdio.c | 43 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 47 + + drivers/net/ethernet/freescale/enetc/enetc_pf.h | 4 - + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 38 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- + drivers/net/ethernet/freescale/fman/mac.c | 4 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 12 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +- + drivers/net/ethernet/google/gve/gve_main.c | 2 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/Makefile | 2 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 240 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_trace.h | 139 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 16 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 84 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 4 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 212 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 20 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 2 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 213 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 14 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 2 +- + drivers/net/ethernet/i825xx/82596.c | 4 +- + drivers/net/ethernet/i825xx/ether1.c | 4 +- + drivers/net/ethernet/i825xx/lib82596.c | 4 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 4 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 2 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 19 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 8 +- + drivers/net/ethernet/intel/ice/ice_base.c | 16 +- + drivers/net/ethernet/intel/ice/ice_common.c | 104 - + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 6 + + drivers/net/ethernet/intel/ice/ice_devids.h | 18 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 57 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 9 - + drivers/net/ethernet/intel/ice/ice_lib.c | 254 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 8 + + drivers/net/ethernet/intel/ice/ice_main.c | 66 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 12 + + drivers/net/ethernet/intel/ice/ice_txrx.c | 28 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 6 + + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 485 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 4 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 7 +- + drivers/net/ethernet/intel/igb/igb.h | 1 + + drivers/net/ethernet/intel/igb/igb_ethtool.c | 8 + + drivers/net/ethernet/intel/igb/igb_main.c | 51 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/igc/igc.h | 2 + + drivers/net/ethernet/intel/igc/igc_defines.h | 31 + + drivers/net/ethernet/intel/igc/igc_main.c | 3812 +++++++------ + drivers/net/ethernet/intel/igc/igc_regs.h | 9 + + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 4 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 51 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 16 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 4 - + drivers/net/ethernet/mellanox/mlxsw/reg.h | 44 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 29 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 25 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 219 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 624 +-- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 4 + + drivers/net/ethernet/micrel/ks8842.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/microchip/enc28j60.c | 2 +- + drivers/net/ethernet/microchip/encx24j600.c | 2 +- + drivers/net/ethernet/microchip/lan743x_ptp.c | 3 + + drivers/net/ethernet/mscc/ocelot.c | 7 +- + drivers/net/ethernet/mscc/ocelot.h | 7 +- + drivers/net/ethernet/mscc/ocelot_board.c | 4 +- + drivers/net/ethernet/natsemi/natsemi.c | 4 +- + drivers/net/ethernet/natsemi/ns83820.c | 4 +- + drivers/net/ethernet/natsemi/sonic.c | 2 +- + drivers/net/ethernet/natsemi/sonic.h | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/s2io.h | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/netronome/nfp/abm/cls.c | 14 +- + drivers/net/ethernet/netronome/nfp/ccm.h | 1 + + drivers/net/ethernet/netronome/nfp/crypto/crypto.h | 15 + + drivers/net/ethernet/netronome/nfp/crypto/fw.h | 8 + + drivers/net/ethernet/netronome/nfp/crypto/tls.c | 89 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 65 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 11 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 106 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 38 +- + drivers/net/ethernet/netronome/nfp/flower/match.c | 260 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 144 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 498 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 6 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 35 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c | 48 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 25 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 116 +- + drivers/net/ethernet/nvidia/forcedeth.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/packetengines/hamachi.c | 4 +- + drivers/net/ethernet/packetengines/yellowfin.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 17 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 113 + + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 58 + + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 7 + + drivers/net/ethernet/pensando/ionic/ionic_if.h | 97 + + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 249 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 + + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 10 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 1 + + drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 2 +- + drivers/net/ethernet/realtek/8139cp.c | 2 +- + drivers/net/ethernet/realtek/8139too.c | 4 +- + drivers/net/ethernet/realtek/atp.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 67 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/rocker/rocker_main.c | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +- + drivers/net/ethernet/seeq/ether3.c | 4 +- + drivers/net/ethernet/seeq/sgiseeq.c | 2 +- + drivers/net/ethernet/sfc/Kconfig | 2 - + drivers/net/ethernet/sfc/ef10_sriov.c | 5 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/sfc/net_driver.h | 1 - + drivers/net/ethernet/sfc/nic.h | 1 - + drivers/net/ethernet/sgi/ioc3-eth.c | 4 +- + drivers/net/ethernet/sgi/meth.c | 4 +- + drivers/net/ethernet/silan/sc92031.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 4 +- + drivers/net/ethernet/smsc/epic100.c | 4 +- + drivers/net/ethernet/smsc/smc911x.c | 4 +- + drivers/net/ethernet/smsc/smc9194.c | 4 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/socionext/netsec.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 5 + + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 24 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 89 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 12 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 4 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 11 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 47 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 118 + + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 24 + + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 22 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 27 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 76 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 28 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 20 +- + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 16 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 92 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 137 + + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/sun/sunbmac.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 2 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.h | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/ti/cpmac.c | 2 +- + drivers/net/ethernet/ti/cpsw_priv.c | 2 +- + drivers/net/ethernet/ti/cpsw_priv.h | 2 +- + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/netcp_ethss.c | 8 +- + drivers/net/ethernet/ti/tlan.c | 6 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 4 +- + drivers/net/ethernet/via/via-rhine.c | 4 +- + drivers/net/ethernet/wiznet/w5100.c | 2 +- + drivers/net/ethernet/wiznet/w5300.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 4 +- + drivers/net/fjes/fjes_main.c | 4 +- + drivers/net/gtp.c | 9 +- + drivers/net/hamradio/hdlcdrv.c | 2 - + drivers/net/macvlan.c | 4 +- + drivers/net/netdevsim/fib.c | 5 +- + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 3 + + drivers/net/phy/aquantia_main.c | 7 +- + drivers/net/phy/bcm84881.c | 269 + + drivers/net/phy/dp83640.c | 217 +- + drivers/net/phy/dp83867.c | 62 +- + drivers/net/phy/dp83869.c | 2 +- + drivers/net/phy/fixed_phy.c | 11 +- + drivers/net/phy/lxt.c | 24 +- + drivers/net/phy/marvell.c | 209 +- + drivers/net/phy/marvell10g.c | 13 +- + drivers/net/phy/mdio-i2c.c | 28 +- + drivers/net/phy/mii_timestamper.c | 125 + + drivers/net/phy/mscc.c | 6 - + drivers/net/phy/phy.c | 4 +- + drivers/net/phy/phy_device.c | 103 +- + drivers/net/phy/phylink.c | 333 +- + drivers/net/phy/realtek.c | 59 +- + drivers/net/phy/sfp-bus.c | 124 +- + drivers/net/phy/sfp.c | 199 +- + drivers/net/phy/sfp.h | 2 + + drivers/net/phy/uPD60620.c | 7 +- + drivers/net/ppp/ppp_async.c | 18 +- + drivers/net/ppp/ppp_generic.c | 2 - + drivers/net/slip/slip.c | 2 +- + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kaweth.c | 2 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/usbnet.c | 2 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- + drivers/net/vxlan.c | 21 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wan/farsync.c | 2 +- + drivers/net/wan/fsl_ucc_hdlc.c | 16 +- + drivers/net/wan/lmc/lmc_main.c | 4 +- + drivers/net/wan/x25_asy.c | 2 +- + drivers/net/wimax/i2400m/netdev.c | 2 +- + drivers/net/wireguard/Makefile | 18 + + drivers/net/wireguard/allowedips.c | 376 ++ + drivers/net/wireguard/allowedips.h | 59 + + drivers/net/wireguard/cookie.c | 236 + + drivers/net/wireguard/cookie.h | 59 + + drivers/net/wireguard/device.c | 458 ++ + drivers/net/wireguard/device.h | 73 + + drivers/net/wireguard/main.c | 63 + + drivers/net/wireguard/messages.h | 128 + + drivers/net/wireguard/netlink.c | 642 +++ + drivers/net/wireguard/netlink.h | 12 + + drivers/net/wireguard/noise.c | 828 +++ + drivers/net/wireguard/noise.h | 137 + + drivers/net/wireguard/peer.c | 240 + + drivers/net/wireguard/peer.h | 83 + + drivers/net/wireguard/peerlookup.c | 221 + + drivers/net/wireguard/peerlookup.h | 64 + + drivers/net/wireguard/queueing.c | 53 + + drivers/net/wireguard/queueing.h | 194 + + drivers/net/wireguard/ratelimiter.c | 223 + + drivers/net/wireguard/ratelimiter.h | 19 + + drivers/net/wireguard/receive.c | 595 ++ + drivers/net/wireguard/selftest/allowedips.c | 683 +++ + drivers/net/wireguard/selftest/counter.c | 104 + + drivers/net/wireguard/selftest/ratelimiter.c | 226 + + drivers/net/wireguard/send.c | 413 ++ + drivers/net/wireguard/socket.c | 438 ++ + drivers/net/wireguard/socket.h | 44 + + drivers/net/wireguard/timers.c | 243 + + drivers/net/wireguard/timers.h | 31 + + drivers/net/wireguard/version.h | 1 + + drivers/net/wireless/ath/Kconfig | 1 + + drivers/net/wireless/ath/Makefile | 1 + + drivers/net/wireless/ath/ath10k/bmi.c | 52 +- + drivers/net/wireless/ath/ath10k/bmi.h | 10 + + drivers/net/wireless/ath/ath10k/core.c | 15 +- + drivers/net/wireless/ath/ath10k/core.h | 2 + + drivers/net/wireless/ath/ath10k/debug.c | 2 + + drivers/net/wireless/ath/ath10k/htc.c | 10 +- + drivers/net/wireless/ath/ath10k/htc.h | 23 +- + drivers/net/wireless/ath/ath10k/htt.h | 3 + + drivers/net/wireless/ath/ath10k/htt_rx.c | 63 +- + drivers/net/wireless/ath/ath10k/hw.h | 3 + + drivers/net/wireless/ath/ath10k/mac.c | 6 +- + drivers/net/wireless/ath/ath10k/qmi.c | 14 +- + drivers/net/wireless/ath/ath10k/sdio.c | 232 +- + drivers/net/wireless/ath/ath10k/sdio.h | 21 +- + drivers/net/wireless/ath/ath10k/snoc.c | 5 +- + drivers/net/wireless/ath/ath10k/testmode.c | 4 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 10 +- + drivers/net/wireless/ath/ath10k/wmi.c | 18 +- + drivers/net/wireless/ath/ath10k/wmi.h | 2 + + drivers/net/wireless/ath/ath11k/Kconfig | 35 + + drivers/net/wireless/ath/ath11k/Makefile | 26 + + drivers/net/wireless/ath/ath11k/ahb.c | 1003 ++++ + drivers/net/wireless/ath/ath11k/ahb.h | 35 + + drivers/net/wireless/ath/ath11k/ce.c | 808 +++ + drivers/net/wireless/ath/ath11k/ce.h | 183 + + drivers/net/wireless/ath/ath11k/core.c | 795 +++ + drivers/net/wireless/ath/ath11k/core.h | 826 +++ + drivers/net/wireless/ath/ath11k/debug.c | 1060 ++++ + drivers/net/wireless/ath/ath11k/debug.h | 281 + + drivers/net/wireless/ath/ath11k/debug_htt_stats.c | 4431 +++++++++++++++ + drivers/net/wireless/ath/ath11k/debug_htt_stats.h | 1620 ++++++ + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 543 ++ + drivers/net/wireless/ath/ath11k/dp.c | 899 +++ + drivers/net/wireless/ath/ath11k/dp.h | 1527 +++++ + drivers/net/wireless/ath/ath11k/dp_rx.c | 4194 ++++++++++++++ + drivers/net/wireless/ath/ath11k/dp_rx.h | 86 + + drivers/net/wireless/ath/ath11k/dp_tx.c | 962 ++++ + drivers/net/wireless/ath/ath11k/dp_tx.h | 40 + + drivers/net/wireless/ath/ath11k/hal.c | 1124 ++++ + drivers/net/wireless/ath/ath11k/hal.h | 897 +++ + drivers/net/wireless/ath/ath11k/hal_desc.h | 2468 ++++++++ + drivers/net/wireless/ath/ath11k/hal_rx.c | 1190 ++++ + drivers/net/wireless/ath/ath11k/hal_rx.h | 332 ++ + drivers/net/wireless/ath/ath11k/hal_tx.c | 154 + + drivers/net/wireless/ath/ath11k/hal_tx.h | 69 + + drivers/net/wireless/ath/ath11k/htc.c | 773 +++ + drivers/net/wireless/ath/ath11k/htc.h | 313 ++ + drivers/net/wireless/ath/ath11k/hw.h | 127 + + drivers/net/wireless/ath/ath11k/mac.c | 5908 ++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/mac.h | 147 + + drivers/net/wireless/ath/ath11k/peer.c | 236 + + drivers/net/wireless/ath/ath11k/peer.h | 35 + + drivers/net/wireless/ath/ath11k/qmi.c | 2433 ++++++++ + drivers/net/wireless/ath/ath11k/qmi.h | 445 ++ + drivers/net/wireless/ath/ath11k/reg.c | 702 +++ + drivers/net/wireless/ath/ath11k/reg.h | 35 + + drivers/net/wireless/ath/ath11k/rx_desc.h | 1212 ++++ + drivers/net/wireless/ath/ath11k/testmode.c | 199 + + drivers/net/wireless/ath/ath11k/testmode.h | 29 + + drivers/net/wireless/ath/ath11k/testmode_i.h | 50 + + drivers/net/wireless/ath/ath11k/trace.c | 9 + + drivers/net/wireless/ath/ath11k/trace.h | 113 + + drivers/net/wireless/ath/ath11k/wmi.c | 5810 +++++++++++++++++++ + drivers/net/wireless/ath/ath11k/wmi.h | 4764 ++++++++++++++++ + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- + drivers/net/wireless/ath/regd.c | 10 +- + drivers/net/wireless/ath/wcn36xx/main.c | 1 - + drivers/net/wireless/ath/wil6210/cfg80211.c | 34 + + drivers/net/wireless/ath/wil6210/main.c | 10 +- + drivers/net/wireless/ath/wil6210/txrx.c | 32 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 13 +- + drivers/net/wireless/ath/wil6210/txrx_edma.h | 8 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 6 +- + drivers/net/wireless/ath/wil6210/wil_crash_dump.c | 17 +- + drivers/net/wireless/ath/wil6210/wmi.c | 80 +- + drivers/net/wireless/ath/wil6210/wmi.h | 33 + + drivers/net/wireless/atmel/at76c50x-usb.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 18 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 68 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 54 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 + + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 18 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 1 - + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 5 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 9 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 5 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 5 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 +- + drivers/net/wireless/intersil/hostap/hostap_main.c | 2 +- + drivers/net/wireless/intersil/orinoco/main.c | 2 +- + drivers/net/wireless/intersil/orinoco/orinoco.h | 2 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 7 +- + drivers/net/wireless/intersil/prism54/islpci_eth.c | 2 +- + drivers/net/wireless/intersil/prism54/islpci_eth.h | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.h | 13 - + drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 21 +- + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 + + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 11 - + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 20 + + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/base.h | 4 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 10 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.h | 103 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 11 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 19 +- + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.h | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 11 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 48 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 49 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.h | 61 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 299 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 853 ++- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.h | 36 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.h | 30 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.h | 102 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 115 - + drivers/net/wireless/rsi/rsi_91x_hal.c | 12 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 49 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/net/wireless/zydas/zd1201.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 +- + drivers/net/xen-netback/interface.c | 10 +- + drivers/net/xen-netback/netback.c | 20 +- + drivers/net/xen-netback/xenbus.c | 349 +- + drivers/nfc/pn544/pn544.c | 2 +- + drivers/nfc/port100.c | 2 +- + drivers/of/of_mdio.c | 30 +- + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 20 +- + drivers/ptp/Kconfig | 10 + + drivers/ptp/Makefile | 1 + + drivers/ptp/ptp_clock.c | 6 + + drivers/ptp/ptp_clockmatrix.c | 2 +- + drivers/ptp/ptp_ines.c | 852 +++ + drivers/ptp/ptp_qoriq.c | 15 +- + drivers/s390/net/qeth_core.h | 73 +- + drivers/s390/net/qeth_core_main.c | 366 +- + drivers/s390/net/qeth_core_mpc.h | 21 +- + drivers/s390/net/qeth_l2_main.c | 40 - + drivers/s390/net/qeth_l3.h | 6 +- + drivers/s390/net/qeth_l3_main.c | 197 +- + drivers/s390/net/qeth_l3_sys.c | 172 +- + drivers/staging/ks7010/ks_wlan_net.c | 4 +- + drivers/staging/qlge/qlge_main.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/unisys/visornic/visornic_main.c | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/synclink.c | 2 +- + drivers/tty/synclink_gt.c | 2 +- + drivers/tty/synclinkmp.c | 2 +- + include/linux/bpf-cgroup.h | 4 +- + include/linux/bpf.h | 80 +- + include/linux/dsa/sja1105.h | 6 +- + include/linux/ethtool_netlink.h | 17 + + include/linux/filter.h | 41 +- + include/linux/fsl/enetc_mdio.h | 55 + + include/linux/fsl/ptp_qoriq.h | 1 + + include/linux/mii.h | 50 + + include/linux/mii_timestamper.h | 121 + + include/linux/mmc/sdio_ids.h | 2 + + include/linux/net.h | 1 + + include/linux/netdevice.h | 22 +- + include/linux/phy.h | 99 +- + include/linux/phylink.h | 2 + + include/linux/ptp_clock_kernel.h | 9 + + include/linux/sfp.h | 95 +- + include/linux/stmmac.h | 13 + + include/linux/sxgbe_platform.h | 2 +- + include/linux/usb/usbnet.h | 2 +- + include/net/addrconf.h | 8 +- + include/net/af_unix.h | 5 + + include/net/af_vsock.h | 2 + + include/net/dsa.h | 16 +- + include/net/dsfield.h | 2 +- + include/net/ip6_fib.h | 1 + + include/net/netlink.h | 8 +- + include/net/netns/ipv4.h | 1 + + include/net/pkt_cls.h | 36 +- + include/net/tcp.h | 24 +- + include/net/tls.h | 9 + + include/net/xdp_sock.h | 25 +- + include/soc/mscc/ocelot.h | 2 + + .../net/ethernet => include/soc}/mscc/ocelot_ana.h | 0 + .../net/ethernet => include/soc}/mscc/ocelot_dev.h | 0 + .../ethernet => include/soc}/mscc/ocelot_qsys.h | 0 + include/trace/events/sctp.h | 9 - + include/uapi/linux/audit.h | 1 + + include/uapi/linux/bpf.h | 10 + + include/uapi/linux/btf.h | 3 +- + include/uapi/linux/ethtool.h | 5 + + include/uapi/linux/ethtool_netlink.h | 204 + + include/uapi/linux/if_bonding.h | 10 + + include/uapi/linux/if_bridge.h | 10 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/mii.h | 12 + + include/uapi/linux/net_tstamp.h | 8 + + include/uapi/linux/netfilter/nf_tables.h | 4 + + include/uapi/linux/openvswitch.h | 31 + + include/uapi/linux/pkt_sched.h | 17 + + include/uapi/linux/tcp.h | 5 +- + include/uapi/linux/tipc_netlink.h | 2 + + include/uapi/linux/vm_sockets.h | 8 +- + include/uapi/linux/wireguard.h | 196 + + init/Kconfig | 7 + + kernel/bpf/Makefile | 1 + + kernel/bpf/cgroup.c | 97 +- + kernel/bpf/core.c | 6 +- + kernel/bpf/cpumap.c | 76 +- + kernel/bpf/devmap.c | 78 +- + kernel/bpf/dispatcher.c | 158 + + kernel/bpf/syscall.c | 63 +- + kernel/bpf/trampoline.c | 24 +- + kernel/bpf/xskmap.c | 18 +- + kernel/cgroup/cgroup.c | 5 +- + net/8021q/vlan_dev.c | 4 +- + net/Kconfig | 15 +- + net/Makefile | 2 +- + net/atm/lec.c | 2 +- + net/bluetooth/bnep/netdev.c | 2 +- + net/bpf/test_run.c | 54 +- + net/bridge/br_netlink.c | 13 + + net/bridge/br_private.h | 2 + + net/bridge/br_stp.c | 15 + + net/bridge/br_stp_bpdu.c | 4 + + net/core/Makefile | 2 +- + net/core/dev.c | 21 +- + net/core/dev_ioctl.c | 1 + + net/core/filter.c | 71 +- + net/core/page_pool.c | 89 +- + net/core/rtnetlink.c | 5 + + net/core/skbuff.c | 10 +- + net/core/timestamping.c | 20 +- + net/dsa/Kconfig | 6 + + net/dsa/Makefile | 1 + + net/dsa/dsa_priv.h | 18 - + net/dsa/master.c | 30 + + net/dsa/port.c | 39 +- + net/dsa/slave.c | 37 +- + net/dsa/tag_ar9331.c | 96 + + net/dsa/tag_sja1105.c | 18 +- + net/ethtool/Makefile | 8 + + net/ethtool/bitset.c | 735 +++ + net/ethtool/bitset.h | 28 + + net/ethtool/common.c | 227 + + net/ethtool/common.h | 29 + + net/{core/ethtool.c => ethtool/ioctl.c} | 166 +- + net/ethtool/linkinfo.c | 167 + + net/ethtool/linkmodes.c | 375 ++ + net/ethtool/linkstate.c | 74 + + net/ethtool/netlink.c | 687 +++ + net/ethtool/netlink.h | 341 ++ + net/ethtool/strset.c | 425 ++ + net/ipv4/fib_trie.c | 121 +- + net/ipv4/gre_offload.c | 2 +- + net/ipv4/sysctl_net_ipv4.c | 9 + + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_cubic.c | 83 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 127 +- + net/ipv4/tcp_metrics.c | 13 +- + net/ipv4/udp_offload.c | 2 +- + net/ipv6/ip6_fib.c | 108 +- + net/ipv6/route.c | 86 +- + net/ipv6/tcp_ipv6.c | 105 +- + net/ipv6/udp_offload.c | 2 +- + net/l2tp/l2tp_core.c | 2 - + net/ncsi/ncsi-manage.c | 3 - + net/ncsi/ncsi-rsp.c | 6 + + net/netfilter/nf_conntrack_core.c | 1 - + net/netfilter/nf_conntrack_extend.c | 1 - + net/netfilter/nft_meta.c | 440 +- + net/netfilter/nft_tunnel.c | 52 +- + net/openvswitch/actions.c | 30 +- + net/openvswitch/flow_netlink.c | 34 + + net/packet/af_packet.c | 30 +- + net/phonet/pn_dev.c | 2 - + net/sched/Kconfig | 17 + + net/sched/Makefile | 1 + + net/sched/sch_cake.c | 59 +- + net/sched/sch_ets.c | 828 +++ + net/sched/sch_generic.c | 2 +- + net/sctp/associola.c | 10 +- + net/sctp/chunk.c | 2 +- + net/sctp/endpointola.c | 6 +- + net/sctp/input.c | 5 +- + net/sctp/output.c | 2 +- + net/sctp/outqueue.c | 13 +- + net/sctp/sm_make_chunk.c | 7 +- + net/sctp/sm_sideeffect.c | 16 +- + net/sctp/sm_statefuns.c | 20 +- + net/sctp/socket.c | 12 +- + net/sctp/stream.c | 3 +- + net/sctp/stream_interleave.c | 23 +- + net/sctp/transport.c | 2 +- + net/sctp/ulpqueue.c | 15 +- + net/smc/smc_core.c | 3 +- + net/socket.c | 12 + + net/tipc/bcast.c | 11 +- + net/tipc/bearer.c | 11 +- + net/tipc/bearer.h | 6 +- + net/tipc/eth_media.c | 3 +- + net/tipc/ib_media.c | 5 +- + net/tipc/link.c | 199 +- + net/tipc/link.h | 9 +- + net/tipc/net.c | 56 + + net/tipc/net.h | 1 + + net/tipc/netlink.c | 6 + + net/tipc/node.c | 16 +- + net/tipc/udp_media.c | 3 +- + net/tls/tls_device.c | 5 +- + net/unix/af_unix.c | 56 +- + net/vmw_vsock/Kconfig | 12 + + net/vmw_vsock/Makefile | 1 + + net/vmw_vsock/af_vsock.c | 45 +- + net/vmw_vsock/virtio_transport.c | 61 +- + net/vmw_vsock/virtio_transport_common.c | 3 - + net/vmw_vsock/vmci_transport.c | 2 +- + net/vmw_vsock/vsock_loopback.c | 180 + + net/wireless/nl80211.c | 3 +- + net/xdp/xsk.c | 79 +- + net/xdp/xsk_queue.c | 15 +- + net/xdp/xsk_queue.h | 371 +- + samples/bpf/Makefile | 5 +- + samples/bpf/xdp1_user.c | 5 +- + samples/bpf/xdp_adjust_tail_user.c | 5 +- + samples/bpf/xdp_fwd_user.c | 17 +- + samples/bpf/xdp_redirect_cpu_user.c | 63 +- + samples/bpf/xdp_redirect_map_user.c | 5 +- + samples/bpf/xdp_redirect_user.c | 5 +- + samples/bpf/xdp_router_ipv4_user.c | 3 + + samples/bpf/xdp_rxq_info_user.c | 4 + + samples/bpf/xdp_sample_pkts_user.c | 12 +- + samples/bpf/xdp_tx_iptunnel_user.c | 5 +- + samples/bpf/xdpsock_user.c | 431 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 305 + + tools/bpf/bpftool/Documentation/bpftool-map.rst | 12 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 18 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 3 +- + tools/bpf/bpftool/bash-completion/bpftool | 156 +- + tools/bpf/bpftool/cgroup.c | 56 +- + tools/bpf/bpftool/gen.c | 609 ++ + tools/bpf/bpftool/main.c | 3 +- + tools/bpf/bpftool/main.h | 5 +- + tools/bpf/bpftool/map.c | 384 +- + tools/bpf/bpftool/net.c | 1 + + tools/bpf/bpftool/prog.c | 388 +- + tools/include/uapi/asm/bpf_perf_event.h | 2 + + tools/include/uapi/linux/bpf.h | 10 + + tools/include/uapi/linux/btf.h | 7 +- + tools/lib/bpf/Makefile | 18 +- + tools/lib/bpf/bpf.c | 17 +- + tools/lib/bpf/bpf.h | 17 +- + tools/lib/bpf/bpf_helpers.h | 11 + + tools/lib/bpf/btf.c | 48 +- + tools/lib/bpf/btf.h | 29 +- + tools/lib/bpf/btf_dump.c | 115 +- + tools/lib/bpf/libbpf.c | 1741 +++++- + tools/lib/bpf/libbpf.h | 107 +- + tools/lib/bpf/libbpf.map | 16 + + tools/lib/bpf/libbpf.pc.template | 2 +- + tools/lib/bpf/libbpf_common.h | 40 + + tools/lib/bpf/libbpf_internal.h | 21 +- + tools/testing/selftests/bpf/.gitignore | 3 +- + tools/testing/selftests/bpf/Makefile | 81 +- + .../selftests/bpf/prog_tests/attach_probe.c | 161 +- + .../bpf/prog_tests/cgroup_attach_autodetach.c | 111 + + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 285 + + .../bpf/prog_tests/cgroup_attach_override.c | 148 + + .../testing/selftests/bpf/prog_tests/core_extern.c | 169 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 4 + + tools/testing/selftests/bpf/prog_tests/cpu_mask.c | 78 + + .../selftests/bpf/prog_tests/fentry_fexit.c | 101 +- + .../testing/selftests/bpf/prog_tests/fentry_test.c | 69 +- + tools/testing/selftests/bpf/prog_tests/mmap.c | 56 +- + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 29 +- + .../testing/selftests/bpf/prog_tests/probe_user.c | 6 +- + .../testing/selftests/bpf/prog_tests/rdonly_maps.c | 11 +- + .../select_reuseport.c} | 514 +- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 7 + + tools/testing/selftests/bpf/prog_tests/skeleton.c | 63 + + .../selftests/bpf/prog_tests/stacktrace_build_id.c | 77 +- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 82 +- + tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 25 + + .../btf__core_reloc_arrays___equiv_zero_sz_arr.c | 3 + + .../btf__core_reloc_arrays___err_bad_zero_sz_arr.c | 3 + + .../bpf/progs/btf__core_reloc_arrays___fixed_arr.c | 3 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 39 + + .../selftests/bpf/progs/test_attach_probe.c | 34 +- + .../testing/selftests/bpf/progs/test_core_extern.c | 62 + + .../selftests/bpf/progs/test_core_reloc_arrays.c | 8 +- + .../bpf/progs/test_select_reuseport_kern.c | 2 +- + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 6 + + tools/testing/selftests/bpf/progs/test_skeleton.c | 46 + + tools/testing/selftests/bpf/test_cgroup_attach.c | 571 -- + tools/testing/selftests/bpf/test_cpp.cpp | 10 + + tools/testing/selftests/bpf/test_progs.h | 4 + + .../selftests/drivers/net/mlxsw/qos_defprio.sh | 176 + + .../testing/selftests/drivers/net/mlxsw/qos_lib.sh | 46 +- + .../testing/selftests/drivers/net/mlxsw/sch_ets.sh | 67 + + tools/testing/selftests/net/fcnal-test.sh | 466 +- + tools/testing/selftests/net/forwarding/lib.sh | 41 + + tools/testing/selftests/net/forwarding/router.sh | 189 +- + tools/testing/selftests/net/forwarding/sch_ets.sh | 44 + + .../selftests/net/forwarding/sch_ets_core.sh | 300 + + .../selftests/net/forwarding/sch_ets_tests.sh | 227 + + tools/testing/selftests/net/nettest.c | 84 +- + tools/testing/selftests/net/so_txtime.c | 84 +- + tools/testing/selftests/net/so_txtime.sh | 9 +- + .../selftests/tc-testing/tc-tests/qdiscs/ets.json | 940 ++++ + tools/testing/selftests/wireguard/netns.sh | 534 ++ + tools/testing/selftests/wireguard/qemu/.gitignore | 2 + + tools/testing/selftests/wireguard/qemu/Makefile | 387 ++ + .../selftests/wireguard/qemu/arch/aarch64.config | 5 + + .../wireguard/qemu/arch/aarch64_be.config | 6 + + .../selftests/wireguard/qemu/arch/arm.config | 9 + + .../selftests/wireguard/qemu/arch/armeb.config | 10 + + .../selftests/wireguard/qemu/arch/i686.config | 5 + + .../selftests/wireguard/qemu/arch/m68k.config | 9 + + .../selftests/wireguard/qemu/arch/mips.config | 11 + + .../selftests/wireguard/qemu/arch/mips64.config | 14 + + .../selftests/wireguard/qemu/arch/mips64el.config | 15 + + .../selftests/wireguard/qemu/arch/mipsel.config | 12 + + .../selftests/wireguard/qemu/arch/powerpc.config | 10 + + .../wireguard/qemu/arch/powerpc64le.config | 12 + + .../selftests/wireguard/qemu/arch/x86_64.config | 5 + + .../testing/selftests/wireguard/qemu/debug.config | 67 + + tools/testing/selftests/wireguard/qemu/init.c | 285 + + .../testing/selftests/wireguard/qemu/kernel.config | 88 + + tools/testing/vsock/.gitignore | 1 + + tools/testing/vsock/Makefile | 9 +- + tools/testing/vsock/README | 3 +- + tools/testing/vsock/control.c | 15 +- + tools/testing/vsock/control.h | 2 + + tools/testing/vsock/timeout.h | 1 + + tools/testing/vsock/util.c | 375 ++ + tools/testing/vsock/util.h | 49 + + tools/testing/vsock/vsock_diag_test.c | 202 +- + tools/testing/vsock/vsock_test.c | 379 ++ + 910 files changed, 90530 insertions(+), 11023 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/ar9331.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml + create mode 100644 Documentation/devicetree/bindings/ptp/ptp-ines.txt + create mode 100644 Documentation/devicetree/bindings/ptp/timestamper.txt + create mode 100644 Documentation/networking/ethtool-netlink.rst + create mode 100644 arch/riscv/include/uapi/asm/bpf_perf_event.h + create mode 100644 drivers/net/dsa/qca/Kconfig + create mode 100644 drivers/net/dsa/qca/Makefile + create mode 100644 drivers/net/dsa/qca/ar9331.c + delete mode 100644 drivers/net/ethernet/freescale/enetc/enetc_mdio.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_trace.h + create mode 100644 drivers/net/phy/bcm84881.c + create mode 100644 drivers/net/phy/mii_timestamper.c + create mode 100644 drivers/net/wireguard/Makefile + create mode 100644 drivers/net/wireguard/allowedips.c + create mode 100644 drivers/net/wireguard/allowedips.h + create mode 100644 drivers/net/wireguard/cookie.c + create mode 100644 drivers/net/wireguard/cookie.h + create mode 100644 drivers/net/wireguard/device.c + create mode 100644 drivers/net/wireguard/device.h + create mode 100644 drivers/net/wireguard/main.c + create mode 100644 drivers/net/wireguard/messages.h + create mode 100644 drivers/net/wireguard/netlink.c + create mode 100644 drivers/net/wireguard/netlink.h + create mode 100644 drivers/net/wireguard/noise.c + create mode 100644 drivers/net/wireguard/noise.h + create mode 100644 drivers/net/wireguard/peer.c + create mode 100644 drivers/net/wireguard/peer.h + create mode 100644 drivers/net/wireguard/peerlookup.c + create mode 100644 drivers/net/wireguard/peerlookup.h + create mode 100644 drivers/net/wireguard/queueing.c + create mode 100644 drivers/net/wireguard/queueing.h + create mode 100644 drivers/net/wireguard/ratelimiter.c + create mode 100644 drivers/net/wireguard/ratelimiter.h + create mode 100644 drivers/net/wireguard/receive.c + create mode 100644 drivers/net/wireguard/selftest/allowedips.c + create mode 100644 drivers/net/wireguard/selftest/counter.c + create mode 100644 drivers/net/wireguard/selftest/ratelimiter.c + create mode 100644 drivers/net/wireguard/send.c + create mode 100644 drivers/net/wireguard/socket.c + create mode 100644 drivers/net/wireguard/socket.h + create mode 100644 drivers/net/wireguard/timers.c + create mode 100644 drivers/net/wireguard/timers.h + create mode 100644 drivers/net/wireguard/version.h + create mode 100644 drivers/net/wireless/ath/ath11k/Kconfig + create mode 100644 drivers/net/wireless/ath/ath11k/Makefile + create mode 100644 drivers/net/wireless/ath/ath11k/ahb.c + create mode 100644 drivers/net/wireless/ath/ath11k/ahb.h + create mode 100644 drivers/net/wireless/ath/ath11k/ce.c + create mode 100644 drivers/net/wireless/ath/ath11k/ce.h + create mode 100644 drivers/net/wireless/ath/ath11k/core.c + create mode 100644 drivers/net/wireless/ath/ath11k/core.h + create mode 100644 drivers/net/wireless/ath/ath11k/debug.c + create mode 100644 drivers/net/wireless/ath/ath11k/debug.h + create mode 100644 drivers/net/wireless/ath/ath11k/debug_htt_stats.c + create mode 100644 drivers/net/wireless/ath/ath11k/debug_htt_stats.h + create mode 100644 drivers/net/wireless/ath/ath11k/debugfs_sta.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp.h + create mode 100644 drivers/net/wireless/ath/ath11k/dp_rx.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp_rx.h + create mode 100644 drivers/net/wireless/ath/ath11k/dp_tx.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp_tx.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal.c + create mode 100644 drivers/net/wireless/ath/ath11k/hal.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal_desc.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal_rx.c + create mode 100644 drivers/net/wireless/ath/ath11k/hal_rx.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal_tx.c + create mode 100644 drivers/net/wireless/ath/ath11k/hal_tx.h + create mode 100644 drivers/net/wireless/ath/ath11k/htc.c + create mode 100644 drivers/net/wireless/ath/ath11k/htc.h + create mode 100644 drivers/net/wireless/ath/ath11k/hw.h + create mode 100644 drivers/net/wireless/ath/ath11k/mac.c + create mode 100644 drivers/net/wireless/ath/ath11k/mac.h + create mode 100644 drivers/net/wireless/ath/ath11k/peer.c + create mode 100644 drivers/net/wireless/ath/ath11k/peer.h + create mode 100644 drivers/net/wireless/ath/ath11k/qmi.c + create mode 100644 drivers/net/wireless/ath/ath11k/qmi.h + create mode 100644 drivers/net/wireless/ath/ath11k/reg.c + create mode 100644 drivers/net/wireless/ath/ath11k/reg.h + create mode 100644 drivers/net/wireless/ath/ath11k/rx_desc.h + create mode 100644 drivers/net/wireless/ath/ath11k/testmode.c + create mode 100644 drivers/net/wireless/ath/ath11k/testmode.h + create mode 100644 drivers/net/wireless/ath/ath11k/testmode_i.h + create mode 100644 drivers/net/wireless/ath/ath11k/trace.c + create mode 100644 drivers/net/wireless/ath/ath11k/trace.h + create mode 100644 drivers/net/wireless/ath/ath11k/wmi.c + create mode 100644 drivers/net/wireless/ath/ath11k/wmi.h + create mode 100644 drivers/ptp/ptp_ines.c + create mode 100644 include/linux/ethtool_netlink.h + create mode 100644 include/linux/fsl/enetc_mdio.h + create mode 100644 include/linux/mii_timestamper.h + rename {drivers/net/ethernet => include/soc}/mscc/ocelot_ana.h (100%) + rename {drivers/net/ethernet => include/soc}/mscc/ocelot_dev.h (100%) + rename {drivers/net/ethernet => include/soc}/mscc/ocelot_qsys.h (100%) + create mode 100644 include/uapi/linux/ethtool_netlink.h + create mode 100644 include/uapi/linux/wireguard.h + create mode 100644 kernel/bpf/dispatcher.c + create mode 100644 net/dsa/tag_ar9331.c + create mode 100644 net/ethtool/Makefile + create mode 100644 net/ethtool/bitset.c + create mode 100644 net/ethtool/bitset.h + create mode 100644 net/ethtool/common.c + create mode 100644 net/ethtool/common.h + rename net/{core/ethtool.c => ethtool/ioctl.c} (93%) + create mode 100644 net/ethtool/linkinfo.c + create mode 100644 net/ethtool/linkmodes.c + create mode 100644 net/ethtool/linkstate.c + create mode 100644 net/ethtool/netlink.c + create mode 100644 net/ethtool/netlink.h + create mode 100644 net/ethtool/strset.c + create mode 100644 net/sched/sch_ets.c + create mode 100644 net/vmw_vsock/vsock_loopback.c + create mode 100644 tools/bpf/bpftool/Documentation/bpftool-gen.rst + create mode 100644 tools/bpf/bpftool/gen.c + create mode 100644 tools/lib/bpf/libbpf_common.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_attach_autodetach.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_attach_override.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_extern.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cpu_mask.c + rename tools/testing/selftests/bpf/{test_select_reuseport.c => prog_tests/select_reuseport.c} (54%) + create mode 100644 tools/testing/selftests/bpf/prog_tests/skeleton.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_perf.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___equiv_zero_sz_arr.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_zero_sz_arr.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___fixed_arr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_extern.c + create mode 100644 tools/testing/selftests/bpf/progs/test_skeleton.c + delete mode 100644 tools/testing/selftests/bpf/test_cgroup_attach.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/qos_defprio.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sch_ets.sh + create mode 100755 tools/testing/selftests/net/forwarding/sch_ets.sh + create mode 100644 tools/testing/selftests/net/forwarding/sch_ets_core.sh + create mode 100644 tools/testing/selftests/net/forwarding/sch_ets_tests.sh + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/ets.json + create mode 100755 tools/testing/selftests/wireguard/netns.sh + create mode 100644 tools/testing/selftests/wireguard/qemu/.gitignore + create mode 100644 tools/testing/selftests/wireguard/qemu/Makefile + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/aarch64.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/arm.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/armeb.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/i686.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/m68k.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/mips.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/mips64.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/mips64el.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/mipsel.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/powerpc.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config + create mode 100644 tools/testing/selftests/wireguard/qemu/arch/x86_64.config + create mode 100644 tools/testing/selftests/wireguard/qemu/debug.config + create mode 100644 tools/testing/selftests/wireguard/qemu/init.c + create mode 100644 tools/testing/selftests/wireguard/qemu/kernel.config + create mode 100644 tools/testing/vsock/util.c + create mode 100644 tools/testing/vsock/util.h + create mode 100644 tools/testing/vsock/vsock_test.c +Merging bpf-next/master (17aa23ee7234 fcnal-test: Fix vrf argument in local tcp tests) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (e27cca96cd68 xfrm: add espintcp (RFC 8229)) +$ git merge ipsec-next/master +Auto-merging net/unix/af_unix.c +CONFLICT (content): Merge conflict in net/unix/af_unix.c +Auto-merging net/ipv4/udp.c +Resolved 'net/unix/af_unix.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 163b1ef728eb] Merge remote-tracking branch 'ipsec-next/master' +$ git diff -M --stat --summary HEAD^.. + include/linux/skbuff.h | 11 +- + include/net/espintcp.h | 39 ++++ + include/net/xfrm.h | 4 + + include/uapi/linux/udp.h | 1 + + net/core/datagram.c | 27 ++- + net/ipv4/Kconfig | 11 + + net/ipv4/esp4.c | 264 +++++++++++++++++++++--- + net/ipv4/udp.c | 3 +- + net/ipv4/xfrm4_protocol.c | 9 + + net/unix/af_unix.c | 7 +- + net/xfrm/Makefile | 1 + + net/xfrm/espintcp.c | 509 ++++++++++++++++++++++++++++++++++++++++++++++ + net/xfrm/xfrm_input.c | 21 +- + net/xfrm/xfrm_policy.c | 7 + + net/xfrm/xfrm_state.c | 3 + + 15 files changed, 871 insertions(+), 46 deletions(-) + create mode 100644 include/net/espintcp.h + create mode 100644 net/xfrm/espintcp.c +Merging mlx5-next/mlx5-next (e42617b825f8 Linux 5.5-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (4460985fac06 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/se.c +CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7879c01d5994] 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 (ae0a723c4cfd Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (19220f35b370 Bluetooth: btusb: Add support for 04ca:3021 QCA_ROME device) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 1 + + drivers/bluetooth/btbcm.h | 4 +- + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/hci_bcm.c | 22 +- + drivers/bluetooth/hci_qca.c | 298 ++++++++++++++++++++- + include/net/bluetooth/bluetooth.h | 8 +- + include/net/bluetooth/hci.h | 8 + + include/net/bluetooth/hci_core.h | 2 + + net/bluetooth/hci_event.c | 41 ++- + net/bluetooth/l2cap_core.c | 54 +++- + net/bluetooth/lib.c | 16 ++ + 11 files changed, 430 insertions(+), 25 deletions(-) +Merging mac80211-next/master (1ee7826ab68f mac80211: Remove redundant assertion) +$ git merge mac80211-next/master +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/debugfs_sta.c +Merge made by the 'recursive' strategy. + include/linux/ieee80211.h | 2 +- + include/net/mac80211.h | 32 ++++++++ + include/uapi/linux/wireless.h | 5 +- + net/mac80211/debugfs_sta.c | 6 +- + net/mac80211/ieee80211_i.h | 9 +++ + net/mac80211/iface.c | 67 +++++++++++++++++ + net/mac80211/key.c | 11 +++ + net/mac80211/status.c | 71 ++++++++++++++++++ + net/mac80211/tx.c | 170 +++++++++++++++++++++++++++++++++++++++++- + net/mac80211/util.c | 1 - + 10 files changed, 362 insertions(+), 12 deletions(-) +Merging gfs2/for-next (b5ce5b99343c gfs2: eliminate ssize parameter from gfs2_struct2blk) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glops.c | 2 +- + fs/gfs2/incore.h | 1 + + fs/gfs2/log.c | 12 +++------ + fs/gfs2/log.h | 4 +-- + fs/gfs2/lops.c | 70 +++++++++++++++++++++++++++++++++------------------- + fs/gfs2/ops_fstype.c | 2 ++ + fs/gfs2/trans.c | 3 +-- + 7 files changed, 56 insertions(+), 38 deletions(-) +Merging mtd/mtd/next (589e1b6c47ce Merge tag 'nand/for-5.5' into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (777260a5c992 mtd: rawnand: remove unecessary checking if dmac is NULL) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (707745e8d4e7 mtd: spi-nor: Add support for mx25r3235f) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/intel-spi-pci.c | 1 + + drivers/mtd/spi-nor/spi-nor.c | 81 ++++++++++++++++++++++++++++--------- + include/linux/mtd/spi-nor.h | 4 +- + 3 files changed, 67 insertions(+), 19 deletions(-) +Merging crypto/master (79bfa4e737f5 Documentation: tee: add AMD-TEE driver details) +$ git merge crypto/master +Auto-merging fs/ecryptfs/keystore.c +Auto-merging drivers/crypto/chelsio/chtls/chtls_cm.c +Auto-merging crypto/essiv.c +Auto-merging MAINTAINERS +Removing Documentation/padata.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/padata.rst | 169 +++ + Documentation/crypto/devel-algos.rst | 38 +- + .../devicetree/bindings/rng/brcm,iproc-rng200.txt | 1 + + Documentation/padata.txt | 163 --- + Documentation/tee.txt | 81 ++ + MAINTAINERS | 4 +- + arch/arm64/crypto/aes-ce-ccm-core.S | 16 +- + arch/arm64/crypto/aes-ce-core.S | 16 +- + arch/arm64/crypto/aes-ce.S | 4 +- + arch/arm64/crypto/aes-cipher-core.S | 8 +- + arch/arm64/crypto/aes-modes.S | 16 +- + arch/arm64/crypto/aes-neon.S | 4 +- + arch/arm64/crypto/aes-neonbs-core.S | 40 +- + arch/arm64/crypto/chacha-neon-core.S | 16 +- + arch/arm64/crypto/crct10dif-ce-core.S | 12 +- + arch/arm64/crypto/ghash-ce-core.S | 8 +- + arch/arm64/crypto/ghash-ce-glue.c | 2 +- + arch/arm64/crypto/nh-neon-core.S | 4 +- + arch/arm64/crypto/sha1-ce-core.S | 4 +- + arch/arm64/crypto/sha1-ce-glue.c | 17 +- + arch/arm64/crypto/sha2-ce-core.S | 4 +- + arch/arm64/crypto/sha2-ce-glue.c | 34 +- + arch/arm64/crypto/sha256-glue.c | 32 +- + arch/arm64/crypto/sha3-ce-core.S | 4 +- + arch/arm64/crypto/sha512-ce-core.S | 4 +- + arch/arm64/crypto/sha512-ce-glue.c | 26 +- + arch/arm64/crypto/sha512-glue.c | 15 +- + arch/arm64/crypto/sm3-ce-core.S | 4 +- + arch/arm64/crypto/sm4-ce-core.S | 4 +- + arch/x86/crypto/aesni-intel_asm.S | 8 +- + arch/x86/crypto/aesni-intel_glue.c | 45 +- + arch/x86/crypto/camellia_aesni_avx2_glue.c | 74 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 72 +- + arch/x86/crypto/camellia_glue.c | 45 +- + arch/x86/crypto/cast6_avx_glue.c | 68 +- + arch/x86/crypto/glue_helper.c | 23 +- + arch/x86/crypto/serpent_avx2_glue.c | 65 +- + arch/x86/crypto/serpent_avx_glue.c | 63 +- + arch/x86/crypto/serpent_sse2_glue.c | 30 +- + arch/x86/crypto/twofish_avx_glue.c | 75 +- + arch/x86/crypto/twofish_glue_3way.c | 37 +- + arch/x86/include/asm/crypto/camellia.h | 63 +- + arch/x86/include/asm/crypto/glue_helper.h | 18 +- + arch/x86/include/asm/crypto/serpent-avx.h | 20 +- + arch/x86/include/asm/crypto/serpent-sse2.h | 28 +- + arch/x86/include/asm/crypto/twofish.h | 19 +- + crypto/acompress.c | 4 +- + crypto/af_alg.c | 6 +- + crypto/ahash.c | 4 +- + crypto/algapi.c | 160 ++- + crypto/api.c | 24 +- + crypto/cast6_generic.c | 18 +- + crypto/cbc.c | 15 +- + crypto/cfb.c | 5 +- + crypto/cipher.c | 92 +- + crypto/compress.c | 31 +- + crypto/crypto_user_base.c | 3 +- + crypto/ctr.c | 15 +- + crypto/ecb.c | 5 +- + crypto/essiv.c | 2 +- + crypto/hmac.c | 24 +- + crypto/internal.h | 4 - + crypto/keywrap.c | 15 +- + crypto/ofb.c | 5 +- + crypto/pcbc.c | 5 +- + crypto/pcrypt.c | 41 +- + crypto/scompress.c | 4 +- + crypto/serpent_generic.c | 6 +- + crypto/shash.c | 48 +- + crypto/skcipher.c | 31 +- + crypto/testmgr.c | 584 ++++++--- + crypto/testmgr.h | 14 +- + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/iproc-rng200.c | 1 + + drivers/crypto/Kconfig | 87 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 24 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c | 5 +- + drivers/crypto/allwinner/sun4i-ss/sun4i-ss.h | 9 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 2 +- + drivers/crypto/amlogic/Kconfig | 1 + + drivers/crypto/atmel-aes.c | 317 ++--- + drivers/crypto/atmel-sha.c | 424 ++----- + drivers/crypto/atmel-tdes.c | 344 ++--- + drivers/crypto/caam/Kconfig | 14 +- + drivers/crypto/caam/caamalg_qi2.c | 157 +-- + drivers/crypto/caam/caamhash.c | 158 +-- + drivers/crypto/caam/ctrl.c | 10 +- + drivers/crypto/ccp/Makefile | 4 +- + drivers/crypto/ccp/ccp-dev-v3.c | 1 + + drivers/crypto/ccp/psp-dev.c | 1042 ++------------- + drivers/crypto/ccp/psp-dev.h | 51 +- + drivers/crypto/ccp/sev-dev.c | 1077 ++++++++++++++++ + drivers/crypto/ccp/sev-dev.h | 63 + + drivers/crypto/ccp/sp-dev.h | 17 +- + drivers/crypto/ccp/sp-pci.c | 43 +- + drivers/crypto/ccp/tee-dev.c | 375 ++++++ + drivers/crypto/ccp/tee-dev.h | 110 ++ + drivers/crypto/ccree/cc_driver.c | 8 +- + drivers/crypto/ccree/cc_driver.h | 1 - + drivers/crypto/ccree/cc_fips.c | 2 +- + drivers/crypto/ccree/cc_hash.c | 2 - + drivers/crypto/ccree/cc_pm.c | 2 +- + drivers/crypto/ccree/cc_request_mgr.c | 13 +- + drivers/crypto/chelsio/Kconfig | 30 +- + drivers/crypto/chelsio/chcr_algo.c | 3 +- + drivers/crypto/chelsio/chtls/chtls.h | 7 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 27 +- + drivers/crypto/chelsio/chtls/chtls_cm.h | 21 + + drivers/crypto/chelsio/chtls/chtls_hw.c | 65 +- + drivers/crypto/chelsio/chtls/chtls_main.c | 23 +- + drivers/crypto/hisilicon/Kconfig | 3 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 28 +- + drivers/crypto/hisilicon/sgl.c | 17 +- + drivers/crypto/hisilicon/zip/zip.h | 4 + + drivers/crypto/hisilicon/zip/zip_crypto.c | 92 +- + drivers/crypto/img-hash.c | 6 +- + drivers/crypto/inside-secure/safexcel.c | 12 +- + drivers/crypto/inside-secure/safexcel.h | 34 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 557 +++++---- + drivers/crypto/inside-secure/safexcel_hash.c | 14 +- + drivers/crypto/inside-secure/safexcel_ring.c | 130 +- + drivers/crypto/omap-aes-gcm.c | 223 ++-- + drivers/crypto/omap-aes.c | 142 +-- + drivers/crypto/omap-aes.h | 12 +- + drivers/crypto/omap-crypto.c | 37 +- + drivers/crypto/omap-des.c | 13 +- + drivers/crypto/omap-sham.c | 191 +-- + drivers/crypto/padlock-sha.c | 26 +- + drivers/crypto/picoxcell_crypto.c | 15 +- + drivers/crypto/qce/Makefile | 7 +- + drivers/crypto/qce/common.c | 244 ++-- + drivers/crypto/qce/core.c | 4 + + drivers/crypto/qce/dma.c | 6 +- + drivers/crypto/qce/dma.h | 3 +- + drivers/crypto/qce/skcipher.c | 41 +- + drivers/crypto/stm32/Kconfig | 6 +- + drivers/crypto/stm32/stm32-hash.c | 6 +- + drivers/crypto/ux500/Kconfig | 16 +- + drivers/tee/Kconfig | 4 +- + drivers/tee/Makefile | 1 + + drivers/tee/amdtee/Kconfig | 8 + + drivers/tee/amdtee/Makefile | 5 + + drivers/tee/amdtee/amdtee_if.h | 183 +++ + drivers/tee/amdtee/amdtee_private.h | 159 +++ + drivers/tee/amdtee/call.c | 373 ++++++ + drivers/tee/amdtee/core.c | 516 ++++++++ + drivers/tee/amdtee/shm_pool.c | 93 ++ + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/keystore.c | 4 +- + include/crypto/aead.h | 10 + + include/crypto/algapi.h | 20 +- + include/crypto/cast6.h | 4 +- + include/crypto/hash.h | 13 + + include/crypto/internal/acompress.h | 4 +- + include/crypto/internal/aead.h | 10 - + include/crypto/internal/chacha.h | 2 +- + include/crypto/internal/hash.h | 18 +- + include/crypto/internal/scompress.h | 4 +- + include/crypto/internal/skcipher.h | 14 +- + include/crypto/serpent.h | 4 +- + include/crypto/skcipher.h | 26 +- + include/crypto/xts.h | 2 - + include/linux/cpuhotplug.h | 1 + + include/linux/crypto.h | 97 +- + include/linux/padata.h | 56 +- + include/linux/psp-tee.h | 91 ++ + include/uapi/linux/tee.h | 1 + + kernel/padata.c | 386 +++--- + lib/crypto/Makefile | 1 + + lib/crypto/curve25519-selftest.c | 1321 ++++++++++++++++++++ + lib/crypto/curve25519.c | 17 + + 173 files changed, 8247 insertions(+), 4304 deletions(-) + create mode 100644 Documentation/core-api/padata.rst + delete mode 100644 Documentation/padata.txt + create mode 100644 drivers/crypto/ccp/sev-dev.c + create mode 100644 drivers/crypto/ccp/sev-dev.h + create mode 100644 drivers/crypto/ccp/tee-dev.c + create mode 100644 drivers/crypto/ccp/tee-dev.h + create mode 100644 drivers/tee/amdtee/Kconfig + create mode 100644 drivers/tee/amdtee/Makefile + create mode 100644 drivers/tee/amdtee/amdtee_if.h + create mode 100644 drivers/tee/amdtee/amdtee_private.h + create mode 100644 drivers/tee/amdtee/call.c + create mode 100644 drivers/tee/amdtee/core.c + create mode 100644 drivers/tee/amdtee/shm_pool.c + create mode 100644 include/linux/psp-tee.h + create mode 100644 lib/crypto/curve25519-selftest.c +Merging drm/drm-next (f5c547efa16c Merge tag 'drm-misc-next-2020-01-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Removing include/linux/platform_data/tc35876x.h +Removing drivers/gpu/drm/udl/udl_fb.c +Removing drivers/gpu/drm/udl/udl_encoder.c +Removing drivers/gpu/drm/udl/udl_dmabuf.c +Removing drivers/gpu/drm/tilcdc/tilcdc_tfp410.h +Removing drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dsi.c +Removing drivers/gpu/drm/mediatek/mtk_drm_fb.h +Removing drivers/gpu/drm/mediatek/mtk_drm_fb.c +Removing drivers/gpu/drm/i915/selftests/mock_drm.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_sw_fence_work.c +Auto-merging drivers/gpu/drm/i915/i915_scheduler.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/gvt/hypercall.h +Removing drivers/gpu/drm/i915/gt/uc/selftest_guc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt_pm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object_types.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_object.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_domain.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_clflush.c +Auto-merging drivers/gpu/drm/i915/display/intel_overlay.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Removing drivers/gpu/drm/bridge/lvds-encoder.c +Removing drivers/gpu/drm/bridge/analogix-anx78xx.h +Auto-merging drivers/gpu/drm/amd/powerplay/vega20_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +Removing drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_offset.h +Removing drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/tilcdc/tfp410.txt +Removing Documentation/devicetree/bindings/display/bridge/ti,ds90c185.txt +Removing Documentation/devicetree/bindings/display/bridge/thine,thc63lvdm83d.txt +Removing Documentation/devicetree/bindings/display/bridge/lvds-transmitter.txt +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_object.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_gt_pm.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 92809edb7f69] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 33 +- + .../bindings/display/bridge/lvds-codec.yaml | 131 + + .../bindings/display/bridge/lvds-transmitter.txt | 66 - + .../bindings/display/bridge/thine,thc63lvdm83d.txt | 50 - + .../bindings/display/bridge/ti,ds90c185.txt | 55 - + .../bindings/display/dsi-controller.yaml | 91 + + .../devicetree/bindings/display/ingenic,lcd.txt | 1 + + .../bindings/display/panel/logicpd,type28.yaml | 42 + + .../bindings/display/panel/sony,acx424akp.yaml | 49 + + .../devicetree/bindings/display/renesas,cmm.yaml | 67 + + .../devicetree/bindings/display/renesas,du.txt | 15 +- + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 13 +- + .../devicetree/bindings/display/tilcdc/tfp410.txt | 21 - + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 6 +- + Documentation/fb/modedb.rst | 3 + + Documentation/gpu/drm-internals.rst | 4 +- + Documentation/gpu/drm-kms.rst | 19 +- + Documentation/gpu/drm-mm.rst | 68 +- + Documentation/gpu/drm-uapi.rst | 49 +- + Documentation/gpu/i915.rst | 3 - + Documentation/gpu/todo.rst | 68 +- + MAINTAINERS | 25 +- + .../intel-mid/device_libs/platform_tc35876x.c | 26 +- + drivers/acpi/acpi_lpss.c | 11 +- + drivers/auxdisplay/cfag12864bfb.c | 2 +- + drivers/auxdisplay/ht16k33.c | 2 +- + drivers/dma-buf/Kconfig | 11 + + drivers/dma-buf/Makefile | 2 + + drivers/dma-buf/dma-buf.c | 63 +- + drivers/dma-buf/dma-heap.c | 298 ++ + drivers/dma-buf/dma-resv.c | 32 + + drivers/dma-buf/heaps/Kconfig | 14 + + drivers/dma-buf/heaps/Makefile | 4 + + drivers/dma-buf/heaps/cma_heap.c | 177 ++ + drivers/dma-buf/heaps/heap-helpers.c | 271 ++ + drivers/dma-buf/heaps/heap-helpers.h | 53 + + drivers/dma-buf/heaps/system_heap.c | 123 + + drivers/dma-buf/udmabuf.c | 84 +- + drivers/gpu/drm/Kconfig | 8 +- + drivers/gpu/drm/Makefile | 4 +- + drivers/gpu/drm/amd/acp/Kconfig | 10 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 293 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 211 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 62 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 182 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 234 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 113 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 51 - + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 103 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 13 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 5 - + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 5 - + drivers/gpu/drm/amd/amdgpu/cik.c | 18 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 130 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 8 - + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 585 ++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h | 32 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 827 ++++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 42 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 641 ++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 232 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 270 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 4 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 78 - + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 4 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 27 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 29 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 65 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 109 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 84 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 89 +- + drivers/gpu/drm/amd/amdgpu/si.c | 6 + + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 82 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 12 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 1 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 78 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 3 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 481 +-- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 498 +--- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 13 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 248 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 22 + + drivers/gpu/drm/amd/amdkfd/Makefile | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 29 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 96 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 40 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c | 348 --- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 56 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 32 +- + ...d_kernel_queue_v9.c => kfd_packet_manager_v9.c} | 90 +- + ...d_kernel_queue_vi.c => kfd_packet_manager_vi.c} | 41 - + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 28 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 16 +- + drivers/gpu/drm/amd/display/Kconfig | 33 +- + drivers/gpu/drm/amd/display/Makefile | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 523 +++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 50 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 67 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 53 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 32 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 6 - + drivers/gpu/drm/amd/display/dc/Makefile | 18 +- + drivers/gpu/drm/amd/display/dc/basics/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 101 + + drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 42 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 8 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 78 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 85 + + .../amd/display/dc/bios/command_table_helper2.c | 6 +- + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 4 - + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +- + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 12 +- + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 40 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 6 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 176 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 238 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 744 ++++- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 85 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 54 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 66 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 34 +- + drivers/gpu/drm/amd/display/dc/dc.h | 72 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 134 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 60 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 62 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 20 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 267 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 28 - + drivers/gpu/drm/amd/display/dc/dc_link.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 38 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 4 - + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 46 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 6 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 87 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 13 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 17 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c | 19 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 8 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 43 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.h | 6 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 21 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 3 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce100/dce100_resource.c | 10 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 100 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 2 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 13 +- + .../amd/display/dc/dce112/dce112_hw_sequencer.c | 2 +- + .../amd/display/dc/dce112/dce112_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 10 +- + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 2 +- + .../amd/display/dc/dce120/dce120_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce120/dce120_resource.c | 14 +- + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 2 +- + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.h | 1 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 6 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 4 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.h | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 8 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 7 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 634 ++-- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 182 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.h | 43 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 111 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.h | 33 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 4 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 6 - + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 10 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 12 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 27 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 316 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 16 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 536 ++-- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 149 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 133 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.h | 33 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 7 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 8 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 16 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 114 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 4 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 15 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 414 ++- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 14 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 16 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 142 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.h | 33 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 2 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 78 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 - + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 10 - + drivers/gpu/drm/amd/display/dc/dm_services.h | 10 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 3 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 6 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 3 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 - + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 6 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 2 - + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 - + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 8 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 6 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 105 +- + drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/qp_tables.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 2 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 2 - + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 9 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 14 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.h | 2 - + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 - + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.h | 2 - + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 2 - + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.h | 2 - + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 2 - + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.h | 2 - + drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 12 - + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 16 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 12 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 23 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 32 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 12 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 36 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 11 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 7 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 12 - + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 - + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 12 - + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 15 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 17 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 10 - + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 5 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 11 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 8 - + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 362 +-- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 156 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 19 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 - + drivers/gpu/drm/amd/display/dc/irq/Makefile | 6 +- + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 8 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 4 +- + .../amd/display/dc/irq/dce80/irq_service_dce80.c | 4 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 4 +- + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 4 +- + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 4 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/os_types.h | 3 +- + .../display/dc/virtual/virtual_stream_encoder.c | 9 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 255 ++ + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 41 + + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_vbios.h | 41 + + .../gpu/drm/amd/display/dmub/inc/dmub_fw_state.h | 73 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 129 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 522 ++++ + .../drm/amd/display/dmub/inc/dmub_trace_buffer.h | 69 + + .../dmub/inc/dmub_types.h} | 61 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 27 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 152 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 63 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 141 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 48 + + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c | 109 + + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 120 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 453 +++ + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 16 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 4 - + .../amd/display/include/grph_object_ctrl_defs.h | 3 +- + .../drm/amd/display/include/link_service_types.h | 7 + + drivers/gpu/drm/amd/display/include/logger_types.h | 6 - + .../drm/amd/display/modules/color/color_gamma.c | 41 +- + .../drm/amd/display/modules/freesync/freesync.c | 2 +- + drivers/gpu/drm/amd/display/modules/hdcp/Makefile | 3 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 103 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 197 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 40 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 886 ++++++ + .../amd/display/modules/hdcp/hdcp2_transition.c | 674 +++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 326 ++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 118 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 98 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 507 +++- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 194 ++ + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 15 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 4 +- + .../gpu/drm/amd/display/modules/inc/mod_shared.h | 2 - + .../amd/display/modules/info_packet/info_packet.c | 46 +- + drivers/gpu/drm/amd/include/amd_shared.h | 5 +- + .../amd/include/asic_reg/mmhub/mmhub_1_0_offset.h | 16 + + .../amd/include/asic_reg/mmhub/mmhub_1_0_sh_mask.h | 122 + + .../include/asic_reg/mmhub/mmhub_9_4_0_offset.h | 53 - + .../include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h | 257 -- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 4 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 44 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 14 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 15 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 16 + + drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 30 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 10 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 161 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 9 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 13 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 35 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 175 ++ + drivers/gpu/drm/amd/powerplay/smu_internal.h | 4 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 77 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 109 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 7 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c | 56 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 14 + + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 27 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 3 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 36 +- + drivers/gpu/drm/arc/arcpgu_regs.h | 2 +- + drivers/gpu/drm/arm/display/Kconfig | 6 - + .../gpu/drm/arm/display/include/malidp_product.h | 3 +- + drivers/gpu/drm/arm/display/komeda/Makefile | 5 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 22 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 80 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h | 16 + + .../gpu/drm/arm/display/komeda/komeda_color_mgmt.c | 66 + + .../gpu/drm/arm/display/komeda/komeda_color_mgmt.h | 10 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 5 + + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 129 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 47 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 52 +- + drivers/gpu/drm/arm/display/komeda/komeda_event.c | 26 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 8 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 3 + + .../drm/arm/display/komeda/komeda_pipeline_state.c | 6 + + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/armada/armada_fbdev.c | 2 +- + drivers/gpu/drm/armada/armada_gem.c | 12 - + drivers/gpu/drm/ast/ast_drv.c | 67 +- + drivers/gpu/drm/ast/ast_drv.h | 20 +- + drivers/gpu/drm/ast/ast_main.c | 54 +- + drivers/gpu/drm/ast/ast_mode.c | 809 +++-- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 8 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- + drivers/gpu/drm/bochs/bochs_hw.c | 2 +- + drivers/gpu/drm/bridge/Kconfig | 26 +- + drivers/gpu/drm/bridge/Makefile | 6 +- + drivers/gpu/drm/bridge/analogix-anx78xx.h | 703 ----- + drivers/gpu/drm/bridge/analogix/Kconfig | 23 + + drivers/gpu/drm/bridge/analogix/Makefile | 4 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 817 +++++ + .../drm/bridge/{ => analogix}/analogix-anx78xx.c | 146 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h | 249 ++ + .../gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 165 ++ + .../gpu/drm/bridge/analogix/analogix-i2c-dptx.h | 256 ++ + .../drm/bridge/analogix/analogix-i2c-txcommon.h | 234 ++ + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +- + drivers/gpu/drm/bridge/lvds-codec.c | 151 + + drivers/gpu/drm/bridge/lvds-encoder.c | 155 - + drivers/gpu/drm/bridge/panel.c | 20 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 40 +- + drivers/gpu/drm/bridge/tc358764.c | 2 +- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- + drivers/gpu/drm/drm_agpsupport.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 30 +- + drivers/gpu/drm/drm_atomic_helper.c | 149 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 78 +- + drivers/gpu/drm/drm_atomic_uapi.c | 16 +- + drivers/gpu/drm/drm_bridge.c | 280 +- + drivers/gpu/drm/drm_client.c | 10 +- + drivers/gpu/drm/drm_color_mgmt.c | 40 +- + drivers/gpu/drm/drm_crtc_helper.c | 2 + + drivers/gpu/drm/drm_dp_mst_topology.c | 73 +- + drivers/gpu/drm/drm_drv.c | 5 +- + drivers/gpu/drm/drm_edid.c | 279 +- + drivers/gpu/drm/drm_encoder.c | 15 +- + drivers/gpu/drm/drm_fb_helper.c | 202 +- + drivers/gpu/drm/drm_file.c | 44 +- + drivers/gpu/drm/drm_fourcc.c | 8 +- + drivers/gpu/drm/drm_gem.c | 3 - + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 5 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 3 + + drivers/gpu/drm/drm_internal.h | 22 + + drivers/gpu/drm/drm_ioctl.c | 4 +- + drivers/gpu/drm/drm_mipi_dsi.c | 57 +- + drivers/gpu/drm/drm_mode_config.c | 28 + + drivers/gpu/drm/drm_mode_object.c | 14 + + drivers/gpu/drm/drm_modes.c | 246 +- + drivers/gpu/drm/drm_of.c | 116 + + drivers/gpu/drm/drm_panel.c | 109 +- + drivers/gpu/drm/drm_pci.c | 17 +- + drivers/gpu/drm/drm_prime.c | 9 +- + drivers/gpu/drm/drm_print.c | 18 +- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/drm_rect.c | 42 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 8 +- + drivers/gpu/drm/exynos/exynos_dp.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 15 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- + drivers/gpu/drm/gma500/accel_2d.c | 19 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 8 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 3 - + drivers/gpu/drm/gma500/framebuffer.c | 135 +- + drivers/gpu/drm/gma500/framebuffer.h | 15 - + drivers/gpu/drm/gma500/gma_display.c | 48 + + drivers/gpu/drm/gma500/gma_display.h | 6 + + drivers/gpu/drm/gma500/mdfld_intel_display.c | 23 - + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 4 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 1 + + drivers/gpu/drm/gma500/psb_drv.c | 44 +- + drivers/gpu/drm/gma500/psb_drv.h | 8 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 1 + + drivers/gpu/drm/gma500/psb_intel_drv.h | 3 + + drivers/gpu/drm/gma500/psb_irq.c | 20 +- + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 88 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +- + drivers/gpu/drm/i810/i810_dma.c | 2 +- + drivers/gpu/drm/i810/i810_drv.c | 3 +- + drivers/gpu/drm/i915/Kconfig.debug | 2 + + drivers/gpu/drm/i915/Makefile | 4 + + drivers/gpu/drm/i915/display/icl_dsi.c | 232 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 53 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 2 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 138 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 12 +- + drivers/gpu/drm/i915/display/intel_bios.c | 563 +++- + drivers/gpu/drm/i915/display/intel_bios.h | 5 + + drivers/gpu/drm/i915/display/intel_bw.c | 31 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 20 +- + drivers/gpu/drm/i915/display/intel_color.c | 198 +- + drivers/gpu/drm/i915/display/intel_crt.c | 34 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 412 +-- + drivers/gpu/drm/i915/display/intel_ddi.h | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 3112 +++++++++++--------- + drivers/gpu/drm/i915/display/intel_display.h | 46 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 75 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 75 +- + drivers/gpu/drm/i915/display/intel_dp.c | 151 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 81 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 14 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 20 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 37 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 2 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 14 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 309 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 11 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 87 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 7 + + drivers/gpu/drm/i915/display/intel_overlay.c | 12 +- + drivers/gpu/drm/i915/display/intel_panel.c | 30 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 6 +- + drivers/gpu/drm/i915/display/intel_psr.c | 153 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 29 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 411 +-- + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 62 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 303 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 11 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 318 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 48 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 28 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 36 - + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 184 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 320 +- + drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 3 - + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 471 ++- + drivers/gpu/drm/i915/gem/i915_gem_mman.h | 31 + + drivers/gpu/drm/i915/gem/i915_gem_object.c | 47 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 29 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 24 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 219 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 24 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 11 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 23 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 + + .../drm/i915/gem/selftests/i915_gem_coherency.c | 5 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 171 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 101 - + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 319 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 125 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 20 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 5 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 16 - + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h | 2 +- + drivers/gpu/drm/i915/gt/debugfs_engines.c | 36 + + drivers/gpu/drm/i915/gt/debugfs_engines.h | 14 + + drivers/gpu/drm/i915/gt/debugfs_gt.c | 42 + + drivers/gpu/drm/i915/gt/debugfs_gt.h | 39 + + drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 601 ++++ + drivers/gpu/drm/i915/gt/debugfs_gt_pm.h | 14 + + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 66 +- + drivers/gpu/drm/i915/gt/intel_context.c | 69 +- + drivers/gpu/drm/i915/gt/intel_context.h | 73 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 10 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 25 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 211 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 20 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 33 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 21 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 26 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 29 + + drivers/gpu/drm/i915/gt/intel_gt.c | 275 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 6 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 12 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 43 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 5 + + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 41 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.h | 1 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 7 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 382 ++- + drivers/gpu/drm/i915/gt/intel_lrc.h | 7 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 4 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 161 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 149 +- + drivers/gpu/drm/i915/gt/intel_rc6.h | 6 +- + drivers/gpu/drm/i915/gt/intel_rc6_types.h | 4 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 97 +- + drivers/gpu/drm/i915/gt/intel_renderstate.h | 17 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 105 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 228 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 121 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 3 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 90 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 4 +- + drivers/gpu/drm/i915/gt/intel_timeline_types.h | 14 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 47 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 50 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 120 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 360 ++- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 36 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 19 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 178 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 560 +++- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 419 +++ + drivers/gpu/drm/i915/gt/selftest_rc6.c | 203 ++ + drivers/gpu/drm/i915/gt/selftest_rc6.h | 13 + + drivers/gpu/drm/i915/gt/selftest_timeline.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 72 +- + drivers/gpu/drm/i915/gt/selftests/mock_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/selftests/mock_timeline.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 69 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 46 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 24 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 309 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 52 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 1 - + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 733 +---- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 54 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 68 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 58 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 5 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 299 -- + drivers/gpu/drm/i915/gvt/cmd_parser.h | 4 + + drivers/gpu/drm/i915/gvt/display.h | 5 + + drivers/gpu/drm/i915/gvt/edid.h | 4 + + drivers/gpu/drm/i915/gvt/execlist.h | 2 + + drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 + + drivers/gpu/drm/i915/gvt/gtt.c | 2 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 4 + + drivers/gpu/drm/i915/gvt/interrupt.h | 3 + + drivers/gpu/drm/i915/gvt/mmio.h | 2 + + drivers/gpu/drm/i915/gvt/page_track.h | 3 + + drivers/gpu/drm/i915/gvt/sched_policy.h | 3 + + drivers/gpu/drm/i915/gvt/scheduler.c | 43 +- + drivers/gpu/drm/i915/i915_active.c | 123 +- + drivers/gpu/drm/i915/i915_active.h | 28 +- + drivers/gpu/drm/i915/i915_active_types.h | 15 - + drivers/gpu/drm/i915/i915_cmd_parser.c | 318 +- + drivers/gpu/drm/i915/i915_debugfs.c | 343 +-- + drivers/gpu/drm/i915/i915_drv.c | 30 +- + drivers/gpu/drm/i915/i915_drv.h | 91 +- + drivers/gpu/drm/i915/i915_gem.c | 356 +-- + drivers/gpu/drm/i915/i915_gem.h | 10 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 39 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 86 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + + drivers/gpu/drm/i915/i915_getparam.c | 1 + + drivers/gpu/drm/i915/i915_globals.c | 53 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 47 +- + drivers/gpu/drm/i915/i915_irq.c | 66 +- + drivers/gpu/drm/i915/i915_memcpy.c | 75 +- + drivers/gpu/drm/i915/i915_memcpy.h | 2 + + drivers/gpu/drm/i915/i915_pci.c | 21 +- + drivers/gpu/drm/i915/i915_perf.c | 47 +- + drivers/gpu/drm/i915/i915_perf.h | 2 + + drivers/gpu/drm/i915/i915_perf_types.h | 1 - + drivers/gpu/drm/i915/i915_pmu.c | 63 +- + drivers/gpu/drm/i915/i915_reg.h | 143 +- + drivers/gpu/drm/i915/i915_request.c | 157 +- + drivers/gpu/drm/i915/i915_request.h | 27 +- + drivers/gpu/drm/i915/i915_scheduler.c | 14 +- + drivers/gpu/drm/i915/i915_scheduler.h | 1 + + drivers/gpu/drm/i915/i915_selftest.h | 4 + + drivers/gpu/drm/i915/i915_sw_fence.c | 40 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 5 +- + drivers/gpu/drm/i915/i915_sw_fence_work.c | 15 +- + drivers/gpu/drm/i915/i915_sysfs.c | 31 +- + drivers/gpu/drm/i915/i915_trace.h | 6 +- + drivers/gpu/drm/i915/i915_utils.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 74 +- + drivers/gpu/drm/i915/i915_vma.h | 29 +- + drivers/gpu/drm/i915/intel_device_info.c | 35 +- + drivers/gpu/drm/i915/intel_device_info.h | 9 +- + drivers/gpu/drm/i915/intel_memory_region.c | 3 + + drivers/gpu/drm/i915/intel_pch.c | 1 + + drivers/gpu/drm/i915/intel_pch.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 321 +- + drivers/gpu/drm/i915/intel_pm.h | 2 +- + drivers/gpu/drm/i915/intel_region_lmem.c | 6 +- + drivers/gpu/drm/i915/intel_wakeref.h | 19 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 43 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 9 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 31 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 4 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 13 + + drivers/gpu/drm/i915/selftests/i915_request.c | 129 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 43 + + drivers/gpu/drm/i915/selftests/igt_mmap.c | 39 + + drivers/gpu/drm/i915/selftests/igt_mmap.h | 19 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 40 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_drm.c | 73 - + drivers/gpu/drm/i915/selftests/mock_drm.h | 18 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 25 +- + drivers/gpu/drm/i915/selftests/mock_gtt.h | 3 + + drivers/gpu/drm/i915/selftests/mock_region.h | 5 + + drivers/gpu/drm/i915/selftests/mock_uncore.h | 3 + + drivers/gpu/drm/imx/imx-ldb.c | 2 +- + drivers/gpu/drm/imx/parallel-display.c | 2 +- + drivers/gpu/drm/ingenic/ingenic-drm.c | 38 +- + drivers/gpu/drm/lima/Kconfig | 2 +- + drivers/gpu/drm/mcde/mcde_display.c | 57 +- + drivers/gpu/drm/mcde/mcde_drm.h | 1 + + drivers/gpu/drm/mcde/mcde_drv.c | 18 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 416 ++- + drivers/gpu/drm/mcde/mcde_dsi_regs.h | 22 +- + drivers/gpu/drm/mediatek/Makefile | 1 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 92 - + drivers/gpu/drm/mediatek/mtk_drm_fb.h | 13 - + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 3 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 15 +- + drivers/gpu/drm/meson/Makefile | 1 + + drivers/gpu/drm/meson/meson_crtc.c | 79 +- + drivers/gpu/drm/meson/meson_drv.c | 50 +- + drivers/gpu/drm/meson/meson_drv.h | 23 + + drivers/gpu/drm/meson/meson_osd_afbcd.c | 389 +++ + drivers/gpu/drm/meson/meson_osd_afbcd.h | 28 + + drivers/gpu/drm/meson/meson_plane.c | 229 +- + drivers/gpu/drm/meson/meson_rdma.c | 135 + + drivers/gpu/drm/meson/meson_rdma.h | 21 + + drivers/gpu/drm/meson/meson_registers.h | 110 + + drivers/gpu/drm/meson/meson_viu.c | 83 +- + drivers/gpu/drm/meson/meson_viu.h | 19 + + drivers/gpu/drm/mga/mga_drv.h | 2 +- + drivers/gpu/drm/mgag200/Kconfig | 8 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 44 +- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 3 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 8 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 +- + .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- + drivers/gpu/drm/msm/edp/edp_bridge.c | 10 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 6 +- + drivers/gpu/drm/msm/msm_fbdev.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 19 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 2 +- + drivers/gpu/drm/nouveau/Kconfig | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 57 +- + drivers/gpu/drm/omapdrm/displays/Kconfig | 6 +- + drivers/gpu/drm/omapdrm/dss/Kconfig | 12 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 3 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 4 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 3 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 21 - + drivers/gpu/drm/panel/Kconfig | 11 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 6 +- + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 978 ++++++ + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 16 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 19 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 29 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 45 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 11 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 43 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 6 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 14 +- + drivers/gpu/drm/panel/panel-lvds.c | 46 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 6 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 6 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 29 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 11 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 37 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 62 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 11 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 8 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 26 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 35 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 31 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 54 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 34 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 6 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 37 +- + drivers/gpu/drm/panel/panel-simple.c | 131 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 23 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 49 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 6 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 20 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 6 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 26 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 32 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 6 +- + drivers/gpu/drm/pl111/pl111_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_kms.c | 2 +- + drivers/gpu/drm/r128/Makefile | 2 +- + drivers/gpu/drm/{ => r128}/ati_pcigart.c | 5 +- + .../drm => drivers/gpu/drm/r128}/ati_pcigart.h | 0 + drivers/gpu/drm/r128/r128_drv.c | 2 +- + drivers/gpu/drm/r128/r128_drv.h | 3 +- + drivers/gpu/drm/radeon/atom.h | 1 + + drivers/gpu/drm/radeon/atombios_dp.c | 3 - + drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- + drivers/gpu/drm/radeon/btc_dpm.c | 3 +- + drivers/gpu/drm/radeon/ci_dpm.c | 3 +- + drivers/gpu/drm/radeon/cik.c | 4 +- + drivers/gpu/drm/radeon/cypress_dpm.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/kv_dpm.c | 3 +- + drivers/gpu/drm/radeon/ni.c | 4 +- + drivers/gpu/drm/radeon/ni_dpm.c | 3 +- + drivers/gpu/drm/radeon/r100.c | 6 +- + drivers/gpu/drm/radeon/r300.c | 2 +- + drivers/gpu/drm/radeon/r420.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 6 +- + drivers/gpu/drm/radeon/r600_cs.c | 8 +- + drivers/gpu/drm/radeon/radeon_agp.c | 3 +- + drivers/gpu/drm/radeon/radeon_asic.c | 2 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 3 +- + drivers/gpu/drm/radeon/radeon_audio.c | 2 +- + drivers/gpu/drm/radeon/radeon_bios.c | 4 +- + drivers/gpu/drm/radeon/radeon_clocks.c | 3 +- + drivers/gpu/drm/radeon/radeon_combios.c | 6 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 143 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/gpu/drm/radeon/radeon_device.c | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 4 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 3 +- + drivers/gpu/drm/radeon/radeon_fb.c | 4 +- + drivers/gpu/drm/radeon/radeon_gart.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 3 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- + drivers/gpu/drm/radeon/radeon_kms.c | 2 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +- + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 8 +- + drivers/gpu/drm/radeon/radeon_pm.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 31 +- + drivers/gpu/drm/radeon/rs600.c | 2 +- + drivers/gpu/drm/radeon/rs690.c | 2 +- + drivers/gpu/drm/radeon/rs780_dpm.c | 3 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/radeon/si.c | 4 +- + drivers/gpu/drm/radeon/si_dpm.c | 8 +- + drivers/gpu/drm/radeon/trinity_dpm.c | 3 +- + drivers/gpu/drm/rcar-du/Kconfig | 8 + + drivers/gpu/drm/rcar-du/Makefile | 1 + + drivers/gpu/drm/rcar-du/rcar_cmm.c | 217 ++ + drivers/gpu/drm/rcar-du/rcar_cmm.h | 58 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 81 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 2 + + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 + + drivers/gpu/drm/rcar-du/rcar_du_group.c | 10 + + drivers/gpu/drm/rcar-du/rcar_du_group.h | 2 + + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 93 +- + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 + + drivers/gpu/drm/rcar-du/rcar_lvds.c | 320 +- + drivers/gpu/drm/rockchip/Kconfig | 9 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 175 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 6 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 7 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 54 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/savage/savage_drv.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 27 + + drivers/gpu/drm/selftests/Makefile | 3 +- + drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 5 + + drivers/gpu/drm/selftests/drm_modeset_selftests.h | 4 + + .../gpu/drm/selftests/test-drm_cmdline_parser.c | 122 + + .../gpu/drm/selftests/test-drm_modeset_common.h | 7 + + drivers/gpu/drm/selftests/test-drm_rect.c | 223 ++ + drivers/gpu/drm/sis/sis_drv.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 13 + + drivers/gpu/drm/stm/ltdc.c | 24 +- + drivers/gpu/drm/sun4i/Kconfig | 16 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 22 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 49 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 8 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 2 +- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/gem.c | 40 - + drivers/gpu/drm/tegra/output.c | 2 +- + drivers/gpu/drm/tilcdc/Makefile | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 11 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 379 --- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.h | 15 - + drivers/gpu/drm/tiny/st7586.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 36 - + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 - + drivers/gpu/drm/ttm/ttm_bo_vm.c | 27 +- + drivers/gpu/drm/ttm/ttm_tt.c | 5 +- + drivers/gpu/drm/tve200/tve200_drv.c | 2 +- + drivers/gpu/drm/udl/Kconfig | 3 +- + drivers/gpu/drm/udl/Makefile | 2 +- + drivers/gpu/drm/udl/udl_connector.c | 21 +- + drivers/gpu/drm/udl/udl_dmabuf.c | 255 -- + drivers/gpu/drm/udl/udl_drv.c | 47 +- + drivers/gpu/drm/udl/udl_drv.h | 85 +- + drivers/gpu/drm/udl/udl_encoder.c | 70 - + drivers/gpu/drm/udl/udl_fb.c | 527 ---- + drivers/gpu/drm/udl/udl_gem.c | 253 +- + drivers/gpu/drm/udl/udl_main.c | 9 - + drivers/gpu/drm/udl/udl_modeset.c | 378 ++- + drivers/gpu/drm/udl/udl_transfer.c | 12 +- + drivers/gpu/drm/vc4/Kconfig | 8 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 18 +- + drivers/gpu/drm/vc4/vc4_gem.c | 11 +- + drivers/gpu/drm/via/via_dmablit.c | 2 +- + drivers/gpu/drm/via/via_drv.c | 2 +- + drivers/gpu/drm/via/via_map.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 30 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 22 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 112 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 42 +- + drivers/gpu/drm/vkms/vkms_composer.c | 8 +- + drivers/gpu/drm/vkms/vkms_drv.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 33 - + drivers/gpu/drm/xen/xen_drm_front_kms.c | 9 +- + drivers/gpu/host1x/job.c | 21 +- + drivers/gpu/vga/Kconfig | 2 +- + drivers/hid/hid-picolcd_fb.c | 3 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 8 - + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 8 - + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 8 - + drivers/media/pci/ivtv/ivtvfb.c | 3 +- + drivers/media/platform/vivid/vivid-osd.c | 3 +- + drivers/mfd/intel_soc_pmic_core.c | 2 +- + drivers/misc/fastrpc.c | 8 - + drivers/staging/android/ion/ion.c | 14 - + drivers/tee/tee_shm.c | 6 - + drivers/video/fbdev/68328fb.c | 2 +- + drivers/video/fbdev/acornfb.c | 2 +- + drivers/video/fbdev/amba-clcd.c | 2 +- + drivers/video/fbdev/amifb.c | 2 +- + drivers/video/fbdev/arcfb.c | 2 +- + drivers/video/fbdev/arkfb.c | 2 +- + drivers/video/fbdev/asiliantfb.c | 2 +- + drivers/video/fbdev/atmel_lcdfb.c | 2 +- + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/atyfb.h | 2 +- + drivers/video/fbdev/aty/atyfb_base.c | 6 +- + drivers/video/fbdev/aty/mach64_cursor.c | 4 +- + drivers/video/fbdev/aty/radeon_base.c | 2 +- + drivers/video/fbdev/au1100fb.c | 2 +- + drivers/video/fbdev/au1200fb.c | 2 +- + drivers/video/fbdev/broadsheetfb.c | 2 +- + drivers/video/fbdev/bw2.c | 2 +- + drivers/video/fbdev/carminefb.c | 2 +- + drivers/video/fbdev/cg14.c | 2 +- + drivers/video/fbdev/cg3.c | 2 +- + drivers/video/fbdev/cg6.c | 2 +- + drivers/video/fbdev/chipsfb.c | 2 +- + drivers/video/fbdev/cirrusfb.c | 2 +- + drivers/video/fbdev/clps711x-fb.c | 2 +- + drivers/video/fbdev/cobalt_lcdfb.c | 2 +- + drivers/video/fbdev/controlfb.c | 2 +- + drivers/video/fbdev/core/fb_defio.c | 3 - + drivers/video/fbdev/core/fbmem.c | 22 +- + drivers/video/fbdev/cyber2000fb.c | 2 +- + drivers/video/fbdev/da8xx-fb.c | 2 +- + drivers/video/fbdev/dnfb.c | 2 +- + drivers/video/fbdev/efifb.c | 2 +- + drivers/video/fbdev/ep93xx-fb.c | 2 +- + drivers/video/fbdev/fb-puv3.c | 2 +- + drivers/video/fbdev/ffb.c | 2 +- + drivers/video/fbdev/fm2fb.c | 2 +- + drivers/video/fbdev/fsl-diu-fb.c | 2 +- + drivers/video/fbdev/g364fb.c | 2 +- + drivers/video/fbdev/gbefb.c | 2 +- + drivers/video/fbdev/geode/gx1fb_core.c | 2 +- + drivers/video/fbdev/geode/gxfb_core.c | 2 +- + drivers/video/fbdev/geode/lxfb_core.c | 2 +- + drivers/video/fbdev/goldfishfb.c | 2 +- + drivers/video/fbdev/grvga.c | 2 +- + drivers/video/fbdev/gxt4500.c | 2 +- + drivers/video/fbdev/hecubafb.c | 2 +- + drivers/video/fbdev/hgafb.c | 2 +- + drivers/video/fbdev/hitfb.c | 2 +- + drivers/video/fbdev/hpfb.c | 2 +- + drivers/video/fbdev/hyperv_fb.c | 2 +- + drivers/video/fbdev/i740fb.c | 2 +- + drivers/video/fbdev/imsttfb.c | 2 +- + drivers/video/fbdev/imxfb.c | 2 +- + drivers/video/fbdev/intelfb/intelfb.h | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/kyro/fbdev.c | 2 +- + drivers/video/fbdev/leo.c | 2 +- + drivers/video/fbdev/macfb.c | 2 +- + drivers/video/fbdev/matrox/matroxfb_crtc2.c | 2 +- + drivers/video/fbdev/maxinefb.c | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfb.h | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfb_accel.c | 15 +- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 4 +- + drivers/video/fbdev/mbx/mbxfb.c | 2 +- + drivers/video/fbdev/metronomefb.c | 2 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 2 +- + drivers/video/fbdev/mx3fb.c | 5 +- + drivers/video/fbdev/neofb.c | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 20 +- + drivers/video/fbdev/ocfb.c | 2 +- + drivers/video/fbdev/offb.c | 2 +- + drivers/video/fbdev/omap/omapfb_main.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- + drivers/video/fbdev/p9100.c | 2 +- + drivers/video/fbdev/platinumfb.c | 2 +- + drivers/video/fbdev/pm2fb.c | 2 +- + drivers/video/fbdev/pm3fb.c | 2 +- + drivers/video/fbdev/pmag-aa-fb.c | 2 +- + drivers/video/fbdev/pmag-ba-fb.c | 2 +- + drivers/video/fbdev/pmagb-b-fb.c | 2 +- + drivers/video/fbdev/ps3fb.c | 2 +- + drivers/video/fbdev/pvr2fb.c | 2 +- + drivers/video/fbdev/pxa168fb.c | 2 +- + drivers/video/fbdev/pxafb.c | 4 +- + drivers/video/fbdev/q40fb.c | 2 +- + drivers/video/fbdev/riva/fbdev.c | 2 +- + drivers/video/fbdev/s3c-fb.c | 2 +- + drivers/video/fbdev/s3c2410fb.c | 2 +- + drivers/video/fbdev/s3fb.c | 2 +- + drivers/video/fbdev/sa1100fb.c | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 2 +- + drivers/video/fbdev/sh7760fb.c | 2 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 4 +- + drivers/video/fbdev/simplefb.c | 2 +- + drivers/video/fbdev/sis/sis_main.c | 2 +- + drivers/video/fbdev/skeletonfb.c | 2 +- + drivers/video/fbdev/sm712fb.c | 2 +- + drivers/video/fbdev/smscufx.c | 3 +- + drivers/video/fbdev/ssd1307fb.c | 2 +- + drivers/video/fbdev/sstfb.c | 2 +- + drivers/video/fbdev/stifb.c | 2 +- + drivers/video/fbdev/sunxvr1000.c | 2 +- + drivers/video/fbdev/sunxvr2500.c | 2 +- + drivers/video/fbdev/sunxvr500.c | 2 +- + drivers/video/fbdev/tcx.c | 2 +- + drivers/video/fbdev/tdfxfb.c | 2 +- + drivers/video/fbdev/tgafb.c | 2 +- + drivers/video/fbdev/tmiofb.c | 2 +- + drivers/video/fbdev/tridentfb.c | 2 +- + drivers/video/fbdev/udlfb.c | 1 - + drivers/video/fbdev/uvesafb.c | 4 +- + drivers/video/fbdev/valkyriefb.c | 2 +- + drivers/video/fbdev/vesafb.c | 6 +- + drivers/video/fbdev/vfb.c | 2 +- + drivers/video/fbdev/vga16fb.c | 2 +- + drivers/video/fbdev/vt8500lcdfb.c | 2 +- + drivers/video/fbdev/vt8623fb.c | 2 +- + drivers/video/fbdev/w100fb.c | 2 +- + drivers/video/fbdev/wm8505fb.c | 2 +- + drivers/video/fbdev/xen-fbfront.c | 2 +- + drivers/video/fbdev/xilinxfb.c | 2 +- + drivers/xen/gntdev-dmabuf.c | 23 - + include/drm/bridge/dw_mipi_dsi.h | 9 + + include/drm/drm_atomic.h | 62 +- + include/drm/drm_atomic_helper.h | 8 +- + include/drm/drm_atomic_state_helper.h | 6 + + include/drm/drm_bridge.h | 136 +- + include/drm/drm_color_mgmt.h | 25 +- + include/drm/drm_connector.h | 24 +- + include/drm/drm_dp_helper.h | 4 +- + include/drm/drm_dp_mst_helper.h | 12 +- + include/drm/drm_encoder.h | 7 +- + include/drm/drm_fb_helper.h | 40 - + include/drm/drm_file.h | 3 + + include/drm/drm_gem.h | 4 +- + include/drm/drm_gem_vram_helper.h | 1 - + include/drm/drm_legacy.h | 29 +- + include/drm/drm_mipi_dsi.h | 4 + + include/drm/drm_of.h | 20 + + include/drm/drm_panel.h | 58 +- + include/drm/drm_pci.h | 19 +- + include/drm/drm_print.h | 304 +- + include/drm/drm_rect.h | 2 + + include/drm/drm_scdc_helper.h | 6 +- + include/drm/drm_util.h | 2 +- + include/drm/i915_pciids.h | 31 +- + include/drm/ttm/ttm_bo_api.h | 10 +- + include/linux/dma-buf.h | 27 - + include/linux/dma-heap.h | 59 + + include/linux/fb.h | 3 +- + include/linux/host1x.h | 13 - + include/linux/lockdep.h | 8 + + include/linux/platform_data/tc35876x.h | 11 - + include/uapi/drm/amdgpu_drm.h | 3 + + include/uapi/drm/drm_fourcc.h | 11 + + include/uapi/drm/i915_drm.h | 32 + + include/uapi/linux/dma-heap.h | 53 + + include/video/mipi_display.h | 24 +- + samples/vfio-mdev/mbochs.c | 16 - + samples/vfio-mdev/mdpy-fb.c | 2 +- + tools/testing/selftests/dmabuf-heaps/Makefile | 6 + + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 396 +++ + 1153 files changed, 40358 insertions(+), 21272 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/lvds-transmitter.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/thine,thc63lvdm83d.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ds90c185.txt + create mode 100644 Documentation/devicetree/bindings/display/dsi-controller.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/logicpd,type28.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml + create mode 100644 Documentation/devicetree/bindings/display/renesas,cmm.yaml + delete mode 100644 Documentation/devicetree/bindings/display/tilcdc/tfp410.txt + create mode 100644 drivers/dma-buf/dma-heap.c + create mode 100644 drivers/dma-buf/heaps/Kconfig + create mode 100644 drivers/dma-buf/heaps/Makefile + create mode 100644 drivers/dma-buf/heaps/cma_heap.c + create mode 100644 drivers/dma-buf/heaps/heap-helpers.c + create mode 100644 drivers/dma-buf/heaps/heap-helpers.h + create mode 100644 drivers/dma-buf/heaps/system_heap.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c + rename drivers/gpu/drm/amd/amdkfd/{kfd_kernel_queue_v9.c => kfd_packet_manager_v9.c} (81%) + rename drivers/gpu/drm/amd/amdkfd/{kfd_kernel_queue_vi.c => kfd_packet_manager_vi.c} (91%) + create mode 100644 drivers/gpu/drm/amd/display/dc/basics/dc_common.c + create mode 100644 drivers/gpu/drm/amd/display/dc/basics/dc_common.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer_private.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd_vbios.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_state.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_trace_buffer.h + rename drivers/gpu/drm/amd/{amdkfd/kfd_kernel_queue_cik.c => display/dmub/inc/dmub_types.h} (55%) + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_transition.c + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/bridge/analogix-anx78xx.h + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx6345.c + rename drivers/gpu/drm/bridge/{ => analogix}/analogix-anx78xx.c (90%) + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h + create mode 100644 drivers/gpu/drm/bridge/lvds-codec.c + delete mode 100644 drivers/gpu/drm/bridge/lvds-encoder.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_mman.h + create mode 100644 drivers/gpu/drm/i915/gt/debugfs_engines.c + create mode 100644 drivers/gpu/drm/i915/gt/debugfs_engines.h + create mode 100644 drivers/gpu/drm/i915/gt/debugfs_gt.c + create mode 100644 drivers/gpu/drm/i915/gt/debugfs_gt.h + create mode 100644 drivers/gpu/drm/i915/gt/debugfs_gt_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/debugfs_gt_pm.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_mocs.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_rc6.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_rc6.h + delete mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_perf_selftests.h + create mode 100644 drivers/gpu/drm/i915/selftests/igt_mmap.c + create mode 100644 drivers/gpu/drm/i915/selftests/igt_mmap.h + delete mode 100644 drivers/gpu/drm/i915/selftests/mock_drm.c + delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c + delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h + create mode 100644 drivers/gpu/drm/meson/meson_osd_afbcd.c + create mode 100644 drivers/gpu/drm/meson/meson_osd_afbcd.h + create mode 100644 drivers/gpu/drm/meson/meson_rdma.c + create mode 100644 drivers/gpu/drm/meson/meson_rdma.h + create mode 100644 drivers/gpu/drm/panel/panel-boe-himax8279d.c + rename drivers/gpu/drm/{ => r128}/ati_pcigart.c (98%) + rename {include/drm => drivers/gpu/drm/r128}/ati_pcigart.h (100%) + create mode 100644 drivers/gpu/drm/rcar-du/rcar_cmm.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_cmm.h + create mode 100644 drivers/gpu/drm/selftests/test-drm_rect.c + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_tfp410.h + delete mode 100644 drivers/gpu/drm/udl/udl_dmabuf.c + delete mode 100644 drivers/gpu/drm/udl/udl_encoder.c + delete mode 100644 drivers/gpu/drm/udl/udl_fb.c + create mode 100644 include/linux/dma-heap.h + delete mode 100644 include/linux/platform_data/tc35876x.h + create mode 100644 include/uapi/linux/dma-heap.h + create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile + create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c +Merging amdgpu/drm-next (0408dddce3d8 drm/amdgpu/smu: make the set_performance_level logic easier to follow) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging drivers/gpu/drm/amd/powerplay/vega20_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 113 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 139 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + .../inc/dmub_fw_state.h => amdgpu/amdgpu_tmz.c} | 67 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 15 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 151 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 61 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 101 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 16 - + drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h | 12 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 10 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 15 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 51 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 9 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 17 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 90 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 262 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 69 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 + + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 2 + + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 209 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 + + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 25 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 46 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 177 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 145 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 59 +- + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 7 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 13 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 4 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 68 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 20 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 20 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 36 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 1 - + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 180 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 1 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 34 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 314 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.h | 1 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.h | 39 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 48 +- + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 9 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 33 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + + drivers/gpu/drm/amd/display/dc/os_types.h | 32 + + .../gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h | 63 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 7 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 84 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 117 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 107 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 13 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 10 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 57 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 6 +- + .../drm/amd/display/modules/color/color_gamma.c | 6 +- + .../drm/amd/display/modules/freesync/freesync.c | 32 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 1 + + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 16 + + .../amd/include/asic_reg/dpcs/dpcs_2_0_0_offset.h | 647 ++++ + .../amd/include/asic_reg/dpcs/dpcs_2_0_0_sh_mask.h | 3912 ++++++++++++++++++++ + .../asic_reg/{dcn => dpcs}/dpcs_2_1_0_offset.h | 0 + .../asic_reg/{dcn => dpcs}/dpcs_2_1_0_sh_mask.h | 0 + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 8 + + .../amd/include/asic_reg/umc/umc_6_1_2_offset.h | 31 + + drivers/gpu/drm/amd/include/atomfirmware.h | 14 - + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 - + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 46 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1 + + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 15 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 3 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 47 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 2 + + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 48 +- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 4 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 39 + + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 5 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 7 +- + drivers/gpu/drm/lima/lima_sched.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 8 +- + drivers/gpu/drm/radeon/atombios_i2c.c | 5 - + drivers/gpu/drm/radeon/cik.c | 4 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/ni.c | 4 +- + drivers/gpu/drm/radeon/r100.c | 8 +- + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/radeon/si.c | 4 +- + drivers/gpu/drm/scheduler/sched_entity.c | 77 +- + drivers/gpu/drm/v3d/v3d_drv.c | 8 +- + include/drm/gpu_scheduler.h | 8 +- + include/drm/task_barrier.h | 107 + + include/uapi/drm/amdgpu_drm.h | 10 +- + include/uapi/linux/kfd_ioctl.h | 19 +- + 180 files changed, 7852 insertions(+), 1260 deletions(-) + rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_fw_state.h => amdgpu/amdgpu_tmz.c} (60%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_2_1_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_2_1_0_sh_mask.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_2_offset.h + create mode 100644 include/drm/task_barrier.h +Merging drm-intel/for-linux-next (1ee48a61aa57 drm/i915: Limit audio CDCLK>=2*BCLK constraint back to GLK only) +$ git merge drm-intel/for-linux-next +Removing drivers/gpu/drm/i915/oa/Makefile +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Removing drivers/gpu/drm/i915/gt/uc/Makefile +Removing drivers/gpu/drm/i915/gt/Makefile +Removing drivers/gpu/drm/i915/gem/Makefile +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Removing drivers/gpu/drm/i915/display/Makefile +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Merge made by the 'recursive' strategy. + arch/arm/mach-u300/core.c | 2 +- + drivers/gpu/drm/drm_client_modeset.c | 72 ++ + drivers/gpu/drm/drm_fb_helper.c | 4 +- + drivers/gpu/drm/i915/.gitignore | 1 + + drivers/gpu/drm/i915/Makefile | 33 +- + drivers/gpu/drm/i915/display/Makefile | 6 - + drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 32 + + drivers/gpu/drm/i915/display/intel_atomic.h | 6 + + drivers/gpu/drm/i915/display/intel_audio.c | 4 +- + drivers/gpu/drm/i915/display/intel_bw.c | 5 + + drivers/gpu/drm/i915/display/intel_bw.h | 1 + + drivers/gpu/drm/i915/display/intel_crt.c | 8 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 60 +- + drivers/gpu/drm/i915/display/intel_display.c | 836 ++++++++++++++------- + drivers/gpu/drm/i915/display/intel_display.h | 6 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 3 + + drivers/gpu/drm/i915/display/intel_dp.c | 34 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 180 ++++- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 5 + + drivers/gpu/drm/i915/display/intel_dsi.h | 5 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 130 +++- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 24 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 31 +- + drivers/gpu/drm/i915/gem/Makefile | 5 - + drivers/gpu/drm/i915/gem/i915_gem_context.c | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 40 - + drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 8 - + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 102 ++- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 79 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 3 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 + + .../gpu/drm/i915/gem/selftests/huge_gem_object.h | 6 + + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 41 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 12 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 428 ++++++++--- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 3 +- + .../gpu/drm/i915/gem/selftests/mock_gem_object.h | 2 + + drivers/gpu/drm/i915/gt/Makefile | 5 - + drivers/gpu/drm/i915/gt/intel_context.c | 26 +- + drivers/gpu/drm/i915/gt/intel_context.h | 2 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 2 + + drivers/gpu/drm/i915/gt/intel_engine.h | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 6 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 30 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 4 + + drivers/gpu/drm/i915/gt/intel_gt.c | 13 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 7 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 43 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 2 - + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 22 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 229 ++++-- + drivers/gpu/drm/i915/gt/intel_mocs.c | 18 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 35 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 30 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 5 + + drivers/gpu/drm/i915/gt/selftest_lrc.c | 48 +- + drivers/gpu/drm/i915/gt/uc/Makefile | 5 - + drivers/gpu/drm/i915/gvt/handlers.c | 8 +- + drivers/gpu/drm/i915/i915_active.c | 19 +- + drivers/gpu/drm/i915/i915_buddy.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 16 +- + drivers/gpu/drm/i915/i915_drv.c | 11 +- + drivers/gpu/drm/i915/i915_drv.h | 25 +- + drivers/gpu/drm/i915/i915_gem.c | 33 +- + drivers/gpu/drm/i915/i915_irq.c | 18 +- + drivers/gpu/drm/i915/i915_mm.c | 69 ++ + drivers/gpu/drm/i915/i915_pci.c | 230 +++--- + drivers/gpu/drm/i915/i915_reg.h | 8 +- + drivers/gpu/drm/i915/i915_request.c | 1 - + drivers/gpu/drm/i915/i915_request.h | 45 +- + drivers/gpu/drm/i915/intel_device_info.c | 10 +- + drivers/gpu/drm/i915/intel_memory_region.c | 29 +- + drivers/gpu/drm/i915/intel_memory_region.h | 14 + + drivers/gpu/drm/i915/intel_pm.c | 60 +- + drivers/gpu/drm/i915/intel_region_lmem.c | 2 + + drivers/gpu/drm/i915/intel_wakeref.c | 5 +- + drivers/gpu/drm/i915/intel_wakeref.h | 9 +- + drivers/gpu/drm/i915/oa/Makefile | 7 - + drivers/gpu/drm/i915/selftests/i915_gem.c | 2 - + .../gpu/drm/i915/selftests/i915_live_selftests.h | 8 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 8 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 8 +- + drivers/gpu/drm/i915/selftests/igt_atomic.c | 47 ++ + drivers/gpu/drm/i915/selftests/igt_atomic.h | 41 +- + drivers/gpu/drm/i915/selftests/igt_live_test.h | 2 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 33 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 + + drivers/mfd/intel_soc_pmic_core.c | 19 - + drivers/pinctrl/core.c | 41 +- + drivers/pinctrl/core.h | 4 - + drivers/pinctrl/devicetree.c | 4 +- + include/linux/pinctrl/machine.h | 5 + + 98 files changed, 2502 insertions(+), 1163 deletions(-) + create mode 100644 drivers/gpu/drm/i915/.gitignore + delete mode 100644 drivers/gpu/drm/i915/display/Makefile + delete mode 100644 drivers/gpu/drm/i915/gem/Makefile + delete mode 100644 drivers/gpu/drm/i915/gt/Makefile + delete mode 100644 drivers/gpu/drm/i915/gt/uc/Makefile + delete mode 100644 drivers/gpu/drm/i915/oa/Makefile + create mode 100644 drivers/gpu/drm/i915/selftests/igt_atomic.c +Merging drm-tegra/drm/tegra/for-next (d66dfcf80d0f drm/tegra: Run hub cleanup on ->remove()) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (02da7c3d7952 Revert "drm: atmel-hlcdc: enable sys_clk during initalization.") +$ git merge drm-misc/for-linux-next +Removing drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../display/panel/leadtek,ltk500hd1829.yaml | 49 ++ + .../bindings/display/panel/xinpeng,xpp055c272.yaml | 49 ++ + .../bindings/display/rockchip/rockchip-lvds.txt | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/fb/fbcon.rst | 13 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 19 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 6 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 2 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 13 +- + drivers/gpu/drm/drm_mipi_dbi.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 26 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 240 ---------- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 117 +---- + drivers/gpu/drm/meson/meson_crtc.c | 2 +- + drivers/gpu/drm/meson/meson_plane.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 21 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 531 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 398 +++++++++++++++ + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 3 + + drivers/gpu/drm/rockchip/rockchip_lvds.c | 488 +++++++++++++------ + drivers/gpu/drm/rockchip/rockchip_lvds.h | 19 +- + drivers/video/fbdev/68328fb.c | 12 - + drivers/video/fbdev/core/fbcon.c | 7 + + drivers/video/fbdev/core/fbmem.c | 13 +- + drivers/video/fbdev/fsl-diu-fb.c | 2 + + drivers/video/fbdev/matrox/matroxfb_misc.c | 5 +- + drivers/video/fbdev/mmp/Kconfig | 2 +- + drivers/video/fbdev/mmp/fb/Kconfig | 4 - + drivers/video/fbdev/mmp/fb/mmpfb.c | 2 +- + drivers/video/fbdev/mmp/hw/Kconfig | 7 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 57 ++- + drivers/video/fbdev/mmp/hw/mmp_ctrl.h | 10 +- + drivers/video/fbdev/mmp/hw/mmp_spi.c | 6 +- + drivers/video/fbdev/ocfb.c | 9 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 6 +- + drivers/video/fbdev/omap2/omapfb/vrfb.c | 4 +- + drivers/video/fbdev/pxa168fb.c | 6 +- + drivers/video/fbdev/pxafb.c | 10 +- + drivers/video/fbdev/s3c-fb.c | 3 +- + drivers/video/fbdev/sa1100fb.c | 4 +- + include/drm/drm_gem_vram_helper.h | 1 + + include/linux/fb.h | 1 + + 48 files changed, 1540 insertions(+), 675 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml + delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c + create mode 100644 drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c + create mode 100644 drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c +Merging drm-msm/msm-next (6b16f05aa39f drm/msm/dsi: split clk rate setting and enable) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_connector.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_manager.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/dpu.txt | 4 +- + .../devicetree/bindings/display/msm/gpu.txt | 6 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 8 + + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 8 + + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 11 +- + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 52 ++++- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 32 ++- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 3 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 81 ++++++- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 9 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 52 ++++- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 16 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 11 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 16 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 186 +++++++--------- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 73 ++----- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 73 +++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 18 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 241 ++++++++++++++++++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 38 ++-- + .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 92 +++++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 26 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 36 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 13 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 27 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 6 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 3 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 38 +++- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 62 ++++-- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 4 +- + drivers/gpu/drm/msm/msm_gpu.h | 7 + + 50 files changed, 972 insertions(+), 408 deletions(-) +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 (62c51f0d39c3 Merge branch 'regmap-5.6' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-i2c.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging sound/for-next (f1dd4795b152 ALSA: sh: Fix compile warning wrt const) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + Documentation/sound/alsa-configuration.rst | 3 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 8 +- + include/sound/ac97_codec.h | 5 +- + include/sound/control.h | 10 + + include/sound/core.h | 4 +- + include/sound/hda_codec.h | 1 - + include/sound/hdaudio.h | 2 + + include/sound/info.h | 2 +- + include/sound/initval.h | 6 +- + include/sound/pcm.h | 74 ++++- + include/sound/seq_midi_emul.h | 3 +- + include/sound/soc-component.h | 4 +- + include/sound/timer.h | 4 +- + include/sound/vx_core.h | 9 +- + include/uapi/sound/asoc.h | 1 - + include/uapi/sound/asound.h | 155 +++++++++-- + include/uapi/sound/emu10k1.h | 42 +-- + include/uapi/sound/hdsp.h | 13 +- + include/uapi/sound/hdspm.h | 10 +- + sound/ac97/snd_ac97_compat.c | 2 +- + sound/ac97_bus.c | 2 +- + sound/aoa/aoa.h | 2 +- + sound/aoa/codecs/onyx.c | 8 +- + sound/aoa/codecs/tas-basstreble.h | 4 +- + sound/aoa/codecs/tas-gain-table.h | 2 +- + sound/aoa/codecs/tas.c | 4 +- + sound/aoa/codecs/toonie.c | 2 +- + sound/aoa/core/alsa.c | 2 +- + sound/aoa/fabrics/layout.c | 2 +- + sound/aoa/soundbus/i2sbus/core.c | 2 +- + sound/aoa/soundbus/i2sbus/pcm.c | 13 +- + sound/arm/aaci.c | 46 ++-- + sound/arm/pxa2xx-ac97.c | 3 +- + sound/atmel/ac97c.c | 24 +- + sound/core/Kconfig | 9 + + sound/core/compress_offload.c | 2 +- + sound/core/control.c | 304 ++++++++++++++++----- + sound/core/device.c | 2 +- + sound/core/hwdep.c | 2 +- + sound/core/info.c | 4 +- + sound/core/jack.c | 4 +- + sound/core/oss/mixer_oss.c | 16 +- + sound/core/oss/pcm_plugin.c | 2 +- + sound/core/pcm.c | 28 +- + sound/core/pcm_compat.c | 282 +++++-------------- + sound/core/pcm_lib.c | 43 +-- + sound/core/pcm_misc.c | 5 +- + sound/core/pcm_native.c | 226 +++++++++++++-- + sound/core/pcm_timer.c | 2 +- + sound/core/rawmidi.c | 136 ++++++--- + sound/core/rawmidi_compat.c | 87 ++---- + sound/core/seq/oss/seq_oss_init.c | 4 +- + sound/core/seq/seq_midi_emul.c | 43 +-- + sound/core/seq/seq_midi_event.c | 6 +- + sound/core/seq_device.c | 2 +- + sound/core/timer.c | 234 ++++++++++++---- + sound/core/timer_compat.c | 62 +---- + sound/drivers/aloop.c | 17 +- + sound/drivers/dummy.c | 48 ++-- + sound/drivers/ml403-ac97cr.c | 35 +-- + sound/drivers/mts64.c | 18 +- + sound/drivers/opl3/opl3_drums.c | 28 +- + sound/drivers/opl3/opl3_lib.c | 6 +- + sound/drivers/opl3/opl3_midi.c | 6 +- + sound/drivers/opl3/opl3_oss.c | 2 +- + sound/drivers/opl3/opl3_seq.c | 2 +- + sound/drivers/opl3/opl3_voice.h | 2 +- + sound/drivers/opl4/opl4_lib.c | 2 +- + sound/drivers/opl4/opl4_mixer.c | 2 +- + sound/drivers/opl4/opl4_proc.c | 2 +- + sound/drivers/opl4/opl4_seq.c | 2 +- + sound/drivers/opl4/opl4_synth.c | 2 +- + sound/drivers/pcsp/pcsp.c | 2 +- + sound/drivers/pcsp/pcsp_lib.c | 18 +- + sound/drivers/pcsp/pcsp_mixer.c | 6 +- + sound/drivers/serial-u16550.c | 4 +- + sound/drivers/vx/vx_cmd.c | 2 +- + sound/drivers/vx/vx_core.c | 17 +- + sound/drivers/vx/vx_hwdep.c | 2 +- + sound/drivers/vx/vx_mixer.c | 2 +- + sound/drivers/vx/vx_pcm.c | 29 +- + sound/firewire/bebob/bebob_pcm.c | 13 +- + sound/firewire/dice/dice-pcm.c | 15 +- + sound/firewire/digi00x/digi00x-pcm.c | 13 +- + sound/firewire/fireface/ff-pcm.c | 13 +- + sound/firewire/fireworks/fireworks_pcm.c | 13 +- + sound/firewire/isight.c | 11 +- + sound/firewire/motu/motu-pcm.c | 13 +- + sound/firewire/oxfw/oxfw-pcm.c | 21 +- + sound/firewire/tascam/tascam-pcm.c | 13 +- + sound/hda/hdac_bus.c | 1 + + sound/hda/hdac_controller.c | 29 +- + sound/hda/hdac_device.c | 4 +- + sound/hda/hdmi_chmap.c | 2 +- + sound/hda/intel-nhlt.c | 2 +- + sound/i2c/cs8427.c | 2 +- + sound/i2c/i2c.c | 2 +- + sound/i2c/other/ak4113.c | 4 +- + sound/i2c/other/ak4114.c | 4 +- + sound/i2c/other/ak4117.c | 4 +- + sound/i2c/tea6330t.c | 4 +- + sound/isa/ad1816a/ad1816a_lib.c | 29 +- + sound/isa/cmi8328.c | 24 +- + sound/isa/cmi8330.c | 15 +- + sound/isa/cs423x/cs4236_lib.c | 16 +- + sound/isa/es1688/es1688.c | 6 +- + sound/isa/es1688/es1688_lib.c | 37 +-- + sound/isa/es18xx.c | 65 ++--- + sound/isa/gus/gus_io.c | 2 +- + sound/isa/gus/gus_main.c | 7 +- + sound/isa/gus/gus_mem_proc.c | 2 +- + sound/isa/gus/gus_mixer.c | 4 +- + sound/isa/gus/gus_pcm.c | 30 +- + sound/isa/gus/gus_timer.c | 4 +- + sound/isa/gus/gus_volume.c | 9 +- + sound/isa/gus/gusclassic.c | 6 +- + sound/isa/gus/gusextreme.c | 10 +- + sound/isa/gus/gusmax.c | 9 +- + sound/isa/gus/interwave.c | 11 +- + sound/isa/msnd/msnd.c | 2 - + sound/isa/msnd/msnd_pinnacle.c | 3 +- + sound/isa/msnd/msnd_pinnacle_mixer.c | 2 +- + sound/isa/opl3sa2.c | 5 +- + sound/isa/opti9xx/miro.c | 32 +-- + sound/isa/opti9xx/opti92x-ad1848.c | 21 +- + sound/isa/sb/emu8000.c | 32 +-- + sound/isa/sb/emu8000_pcm.c | 1 - + sound/isa/sb/jazz16.c | 10 +- + sound/isa/sb/sb16.c | 8 +- + sound/isa/sb/sb16_main.c | 23 +- + sound/isa/sb/sb8.c | 2 +- + sound/isa/sb/sb8_main.c | 23 +- + sound/isa/sb/sb_common.c | 3 +- + sound/isa/sb/sb_mixer.c | 40 +-- + sound/isa/sc6000.c | 4 +- + sound/isa/wavefront/wavefront.c | 1 + + sound/isa/wss/wss_lib.c | 38 +-- + sound/mips/hal2.c | 29 +- + sound/mips/sgio2audio.c | 25 +- + sound/parisc/harmony.c | 24 +- + sound/pci/ac97/ac97_codec.c | 17 +- + sound/pci/ac97/ac97_patch.c | 28 +- + sound/pci/ac97/ac97_pcm.c | 4 +- + sound/pci/ad1889.c | 32 +-- + sound/pci/ak4531_codec.c | 6 +- + sound/pci/ali5451/ali5451.c | 51 +--- + sound/pci/als300.c | 31 +-- + sound/pci/als4000.c | 25 +- + sound/pci/asihpi/asihpi.c | 31 +-- + sound/pci/asihpi/hpimsgx.c | 2 +- + sound/pci/atiixp.c | 27 +- + sound/pci/atiixp_modem.c | 19 +- + sound/pci/au88x0/au88x0.c | 3 +- + sound/pci/au88x0/au88x0_core.c | 2 +- + sound/pci/au88x0/au88x0_eq.c | 22 +- + sound/pci/au88x0/au88x0_eqdata.c | 18 +- + sound/pci/au88x0/au88x0_mixer.c | 2 +- + sound/pci/au88x0/au88x0_pcm.c | 22 +- + sound/pci/aw2/aw2-alsa.c | 50 +--- + sound/pci/aw2/aw2-tsl.c | 4 +- + sound/pci/azt3328.c | 43 +-- + sound/pci/bt87x.c | 21 +- + sound/pci/ca0106/ca0106.h | 2 +- + sound/pci/ca0106/ca0106_main.c | 79 +----- + sound/pci/ca0106/ca0106_mixer.c | 20 +- + sound/pci/ca0106/ca0106_proc.c | 2 +- + sound/pci/cmipci.c | 73 ++--- + sound/pci/cs4281.c | 37 +-- + sound/pci/cs46xx/cs46xx_lib.c | 23 +- + sound/pci/cs46xx/dsp_spos.c | 4 +- + sound/pci/cs46xx/dsp_spos_scb_lib.c | 6 +- + sound/pci/cs5530.c | 2 +- + sound/pci/cs5535audio/cs5535audio.c | 6 +- + sound/pci/cs5535audio/cs5535audio_olpc.c | 2 +- + sound/pci/cs5535audio/cs5535audio_pcm.c | 14 +- + sound/pci/ctxfi/ctatc.c | 6 +- + sound/pci/ctxfi/ctdaio.c | 4 +- + sound/pci/ctxfi/cthw20k1.c | 4 +- + sound/pci/ctxfi/cthw20k2.c | 1 + + sound/pci/ctxfi/ctpcm.c | 17 +- + sound/pci/ctxfi/ctresource.c | 2 +- + sound/pci/echoaudio/darla20.c | 2 +- + sound/pci/echoaudio/darla24.c | 2 +- + sound/pci/echoaudio/echo3g.c | 2 +- + sound/pci/echoaudio/echoaudio.c | 41 +-- + sound/pci/echoaudio/gina20.c | 2 +- + sound/pci/echoaudio/gina24.c | 2 +- + sound/pci/echoaudio/indigo.c | 2 +- + sound/pci/echoaudio/indigodj.c | 2 +- + sound/pci/echoaudio/indigodjx.c | 2 +- + sound/pci/echoaudio/indigoio.c | 2 +- + sound/pci/echoaudio/indigoiox.c | 2 +- + sound/pci/echoaudio/layla20.c | 2 +- + sound/pci/echoaudio/layla24.c | 2 +- + sound/pci/echoaudio/mia.c | 2 +- + sound/pci/echoaudio/mona.c | 2 +- + sound/pci/emu10k1/emu10k1_main.c | 17 +- + sound/pci/emu10k1/emu10k1x.c | 22 +- + sound/pci/emu10k1/emufx.c | 40 +-- + sound/pci/emu10k1/emumixer.c | 44 +-- + sound/pci/emu10k1/emupcm.c | 47 +--- + sound/pci/emu10k1/emuproc.c | 18 +- + sound/pci/emu10k1/io.c | 4 +- + sound/pci/emu10k1/p16v.c | 52 +--- + sound/pci/emu10k1/timer.c | 2 +- + sound/pci/ens1370.c | 52 +--- + sound/pci/es1938.c | 45 +-- + sound/pci/es1968.c | 15 +- + sound/pci/fm801.c | 35 +-- + sound/pci/hda/hda_beep.c | 2 +- + sound/pci/hda/hda_codec.c | 16 +- + sound/pci/hda/hda_controller.c | 76 +----- + sound/pci/hda/hda_eld.c | 6 +- + sound/pci/hda/hda_generic.c | 4 +- + sound/pci/hda/hda_intel.c | 24 +- + sound/pci/hda/hda_proc.c | 2 +- + sound/pci/hda/hda_sysfs.c | 2 +- + sound/pci/hda/hda_tegra.c | 9 +- + sound/pci/hda/patch_analog.c | 8 +- + sound/pci/hda/patch_ca0110.c | 2 +- + sound/pci/hda/patch_ca0132.c | 30 +- + sound/pci/hda/patch_conexant.c | 6 +- + sound/pci/hda/patch_hdmi.c | 3 +- + sound/pci/hda/patch_realtek.c | 190 +++++++------ + sound/pci/hda/patch_sigmatel.c | 12 +- + sound/pci/hda/patch_via.c | 4 +- + sound/pci/ice1712/aureon.c | 18 +- + sound/pci/ice1712/delta.c | 10 +- + sound/pci/ice1712/ews.c | 6 +- + sound/pci/ice1712/ice1712.c | 63 ++--- + sound/pci/ice1712/ice1712.h | 2 +- + sound/pci/ice1712/ice1724.c | 48 ++-- + sound/pci/ice1712/juli.c | 8 +- + sound/pci/ice1712/maya44.c | 12 +- + sound/pci/ice1712/phase.c | 8 +- + sound/pci/ice1712/pontis.c | 4 +- + sound/pci/ice1712/prodigy192.c | 6 +- + sound/pci/ice1712/prodigy_hifi.c | 20 +- + sound/pci/ice1712/psc724.c | 2 +- + sound/pci/ice1712/quartet.c | 10 +- + sound/pci/ice1712/se.c | 8 +- + sound/pci/ice1712/vt1720_mobo.c | 4 +- + sound/pci/ice1712/wm8766.c | 2 +- + sound/pci/ice1712/wm8776.c | 2 +- + sound/pci/ice1712/wtm.c | 8 +- + sound/pci/intel8x0.c | 69 ++--- + sound/pci/intel8x0m.c | 44 +-- + sound/pci/korg1212/korg1212.c | 13 +- + sound/pci/lola/lola.c | 4 +- + sound/pci/lola/lola_pcm.c | 12 +- + sound/pci/lx6464es/lx6464es.c | 19 +- + sound/pci/lx6464es/lx_core.c | 4 +- + sound/pci/maestro3.c | 24 +- + sound/pci/mixart/mixart.c | 23 +- + sound/pci/mixart/mixart_hwdep.c | 2 +- + sound/pci/mixart/mixart_mixer.c | 4 +- + sound/pci/nm256/nm256.c | 20 +- + sound/pci/nm256/nm256_coef.c | 4 +- + sound/pci/oxygen/oxygen_lib.c | 2 +- + sound/pci/oxygen/oxygen_pcm.c | 58 ++-- + sound/pci/pcxhr/pcxhr.c | 37 +-- + sound/pci/pcxhr/pcxhr_core.c | 6 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 2 +- + sound/pci/riptide/riptide.c | 77 +++--- + sound/pci/rme32.c | 46 +--- + sound/pci/rme96.c | 7 +- + sound/pci/rme9652/hdsp.c | 25 +- + sound/pci/rme9652/hdspm.c | 85 +++--- + sound/pci/rme9652/rme9652.c | 17 +- + sound/pci/sis7019.c | 32 +-- + sound/pci/sonicvibes.c | 31 +-- + sound/pci/trident/trident_main.c | 85 ++---- + sound/pci/via82xx.c | 61 ++--- + sound/pci/via82xx_modem.c | 18 +- + sound/pci/vx222/vx222.c | 15 +- + sound/pci/vx222/vx222.h | 4 +- + sound/pci/vx222/vx222_ops.c | 8 +- + sound/pci/ymfpci/ymfpci_main.c | 55 ++-- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 3 +- + sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 2 +- + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 26 +- + sound/pcmcia/vx/vxp_ops.c | 4 +- + sound/pcmcia/vx/vxpocket.c | 7 +- + sound/pcmcia/vx/vxpocket.h | 2 +- + sound/ppc/awacs.c | 50 ++-- + sound/ppc/beep.c | 2 +- + sound/ppc/burgundy.c | 20 +- + sound/ppc/daca.c | 2 +- + sound/ppc/pmac.c | 42 +-- + sound/ppc/pmac.h | 2 +- + sound/ppc/snd_ps3.c | 31 +-- + sound/ppc/tumbler.c | 24 +- + sound/ppc/tumbler_volume.h | 12 +- + sound/sh/aica.c | 34 +-- + sound/sh/sh_dac_audio.c | 26 +- + sound/soc/intel/skylake/skl-pcm.c | 4 +- + sound/sparc/amd7930.c | 26 +- + sound/sparc/cs4231.c | 31 +-- + sound/sparc/dbri.c | 18 +- + sound/spi/at73c213.c | 18 +- + sound/synth/emux/emux_nrpn.c | 4 +- + sound/synth/emux/emux_oss.c | 2 +- + sound/synth/emux/emux_seq.c | 2 +- + sound/synth/emux/emux_synth.c | 10 +- + sound/synth/emux/soundfont.c | 8 +- + sound/usb/6fire/control.c | 8 +- + sound/usb/6fire/pcm.c | 18 +- + sound/usb/bcd2000/bcd2000.c | 4 +- + sound/usb/caiaq/audio.c | 18 +- + sound/usb/caiaq/control.c | 20 +- + sound/usb/caiaq/input.c | 10 +- + sound/usb/format.c | 8 +- + sound/usb/hiface/pcm.c | 19 +- + sound/usb/line6/capture.c | 1 - + sound/usb/line6/pcm.c | 13 +- + sound/usb/line6/playback.c | 1 - + sound/usb/line6/pod.c | 2 +- + sound/usb/line6/podhd.c | 2 +- + sound/usb/line6/toneport.c | 2 +- + sound/usb/midi.c | 4 +- + sound/usb/misc/ua101.c | 25 +- + sound/usb/mixer.c | 68 ++--- + sound/usb/mixer.h | 2 +- + sound/usb/mixer_maps.c | 76 ++++-- + sound/usb/mixer_quirks.c | 22 +- + sound/usb/mixer_scarlett.c | 14 +- + sound/usb/mixer_us16x08.c | 38 +-- + sound/usb/mixer_us16x08.h | 2 +- + sound/usb/pcm.c | 58 ++-- + sound/usb/proc.c | 2 +- + sound/usb/quirks.c | 14 +- + sound/usb/stream.c | 4 +- + sound/usb/usx2y/us122l.c | 8 +- + sound/usb/usx2y/usX2Yhwdep.c | 14 +- + sound/usb/usx2y/usbusx2yaudio.c | 35 +-- + sound/usb/usx2y/usx2yhwdeppcm.c | 21 +- + sound/usb/validate.c | 4 +- + sound/x86/intel_hdmi_audio.c | 17 +- + sound/xen/xen_snd_front_alsa.c | 2 - + 339 files changed, 2997 insertions(+), 3779 deletions(-) +Merging sound-asoc/for-next (bae7f34b37ba Merge branch 'asoc-5.6' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/intel/skylake/skl-pcm.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/amlogic,axg-fifo.txt | 4 + + Documentation/devicetree/bindings/sound/gtm601.txt | 10 +- + .../devicetree/bindings/sound/qcom,sdm845.txt | 5 +- + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 175 + + include/sound/soc.h | 33 +- + include/sound/sof.h | 9 +- + include/sound/sof/channel_map.h | 61 + + include/sound/sof/dai-imx.h | 20 + + include/sound/sof/dai.h | 1 + + include/sound/sof/info.h | 15 + + include/sound/sof/topology.h | 27 + + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 9 +- + sound/soc/amd/acp-pcm-dma.c | 59 +- + sound/soc/amd/raven/Makefile | 2 + + sound/soc/amd/raven/acp3x-i2s.c | 358 ++ + sound/soc/amd/raven/acp3x-pcm-dma.c | 679 +-- + sound/soc/amd/raven/acp3x.h | 115 +- + sound/soc/amd/raven/pci-acp3x.c | 258 +- + sound/soc/atmel/atmel-pcm-pdc.c | 1 - + sound/soc/au1x/dbdma2.c | 15 +- + sound/soc/au1x/dma.c | 22 +- + sound/soc/bcm/cygnus-pcm.c | 1 - + sound/soc/codecs/Kconfig | 8 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/cros_ec_codec.c | 8 +- + sound/soc/codecs/cs42l51.c | 16 +- + sound/soc/codecs/cs47l15.c | 8 +- + sound/soc/codecs/cs47l35.c | 6 +- + sound/soc/codecs/cs47l85.c | 11 +- + sound/soc/codecs/cs47l90.c | 11 +- + sound/soc/codecs/cs47l92.c | 62 +- + sound/soc/codecs/gtm601.c | 30 +- + sound/soc/codecs/hdac_hda.c | 16 + + sound/soc/codecs/hdac_hda.h | 3 +- + sound/soc/codecs/hdac_hdmi.c | 63 +- + sound/soc/codecs/hdmi-codec.c | 32 +- + sound/soc/codecs/madera.c | 162 +- + sound/soc/codecs/madera.h | 2 + + sound/soc/codecs/max98090.c | 440 +- + sound/soc/codecs/max98090.h | 3 +- + sound/soc/codecs/rt5514-spi.c | 10 +- + sound/soc/codecs/rt5677-spi.c | 10 +- + sound/soc/codecs/tlv320aic31xx.c | 40 +- + sound/soc/codecs/tlv320aic31xx.h | 3 - + sound/soc/codecs/wcd934x.c | 5084 ++++++++++++++++++++ + sound/soc/dwc/dwc-pcm.c | 25 +- + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/fsl/fsl_asrc_dma.c | 1 - + sound/soc/fsl/fsl_dma.c | 1 - + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/fsl/imx-audmix.c | 2 +- + sound/soc/fsl/imx-pcm-fiq.c | 1 - + sound/soc/fsl/mpc5200_dma.c | 1 - + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 26 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 20 +- + sound/soc/intel/boards/Kconfig | 48 + + sound/soc/intel/boards/Makefile | 5 + + sound/soc/intel/boards/bdw-rt5650.c | 319 ++ + sound/soc/intel/boards/bytcht_es8316.c | 13 +- + sound/soc/intel/boards/bytcr_rt5640.c | 10 + + sound/soc/intel/boards/bytcr_rt5651.c | 22 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 8 +- + sound/soc/intel/boards/hda_dsp_common.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 13 - + sound/soc/intel/boards/kbl_da7219_max98927.c | 8 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 4 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 + + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 371 ++ + sound/soc/intel/boards/sof_rt5682.c | 43 +- + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 7 + + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 7 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 13 + + sound/soc/intel/haswell/sst-haswell-pcm.c | 18 +- + sound/soc/intel/skylake/skl-pcm.c | 27 +- + sound/soc/intel/skylake/skl.c | 7 +- + sound/soc/kirkwood/kirkwood-dma.c | 1 - + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 365 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.h | 16 + + .../soc/mediatek/common/mtk-afe-platform-driver.c | 13 +- + .../soc/mediatek/common/mtk-afe-platform-driver.h | 2 - + sound/soc/mediatek/common/mtk-base-afe.h | 28 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 1 - + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 - + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 2 - + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 2 +- + sound/soc/meson/axg-fifo.c | 61 +- + sound/soc/meson/axg-fifo.h | 9 +- + sound/soc/meson/axg-frddr.c | 36 +- + sound/soc/meson/axg-toddr.c | 24 +- + sound/soc/pxa/mioa701_wm9713.c | 2 +- + sound/soc/pxa/mmp-pcm.c | 1 - + sound/soc/pxa/pxa-ssp.c | 1 - + sound/soc/pxa/pxa2xx-ac97.c | 1 - + sound/soc/pxa/pxa2xx-i2s.c | 1 - + sound/soc/pxa/pxa2xx-pcm.c | 1 - + sound/soc/qcom/lpass-platform.c | 1 - + sound/soc/qcom/qdsp6/q6asm-dai.c | 3 +- + sound/soc/qcom/sdm845.c | 86 +- + sound/soc/samsung/bells.c | 14 +- + sound/soc/samsung/idma.c | 1 - + sound/soc/samsung/littlemill.c | 10 +- + sound/soc/samsung/lowland.c | 2 +- + sound/soc/samsung/neo1973_wm8753.c | 2 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/samsung/speyside.c | 6 +- + sound/soc/samsung/tm2_wm5110.c | 6 +- + sound/soc/samsung/tobermory.c | 6 +- + sound/soc/sh/dma-sh7760.c | 15 +- + sound/soc/sh/fsi.c | 19 +- + sound/soc/sh/rcar/core.c | 57 +- + sound/soc/sh/siu_pcm.c | 40 +- + sound/soc/soc-compress.c | 29 +- + sound/soc/soc-core.c | 417 +- + sound/soc/soc-generic-dmaengine-pcm.c | 14 +- + sound/soc/soc-topology.c | 88 +- + sound/soc/soc-utils.c | 1 - + sound/soc/sof/Kconfig | 2 +- + sound/soc/sof/Makefile | 2 +- + sound/soc/sof/control.c | 55 +- + sound/soc/sof/core.c | 288 +- + sound/soc/sof/imx/imx8.c | 3 +- + sound/soc/sof/intel/Kconfig | 1 + + sound/soc/sof/intel/apl.c | 14 +- + sound/soc/sof/intel/bdw.c | 41 +- + sound/soc/sof/intel/byt.c | 110 +- + sound/soc/sof/intel/cnl.c | 26 +- + sound/soc/sof/intel/hda-codec.c | 38 +- + sound/soc/sof/intel/hda-ctrl.c | 13 + + sound/soc/sof/intel/hda-dai.c | 5 + + sound/soc/sof/intel/hda-ipc.c | 23 +- + sound/soc/sof/intel/hda-loader.c | 1 - + sound/soc/sof/intel/hda-pcm.c | 4 +- + sound/soc/sof/intel/hda-stream.c | 21 +- + sound/soc/sof/intel/hda.c | 304 +- + sound/soc/sof/intel/hda.h | 19 +- + sound/soc/sof/intel/intel-ipc.c | 8 +- + sound/soc/sof/intel/shim.h | 6 +- + sound/soc/sof/ipc.c | 33 +- + sound/soc/sof/loader.c | 58 +- + sound/soc/sof/nocodec.c | 12 - + sound/soc/sof/ops.h | 34 + + sound/soc/sof/pcm.c | 172 +- + sound/soc/sof/pm.c | 240 +- + sound/soc/sof/sof-acpi-dev.c | 63 +- + sound/soc/sof/sof-audio.c | 445 ++ + sound/soc/sof/sof-audio.h | 211 + + sound/soc/sof/sof-of-dev.c | 24 +- + sound/soc/sof/sof-pci-dev.c | 59 +- + sound/soc/sof/sof-priv.h | 214 +- + sound/soc/sof/topology.c | 521 +- + sound/soc/sof/trace.c | 4 +- + sound/soc/sof/utils.c | 60 + + sound/soc/sof/xtensa/core.c | 2 +- + sound/soc/sprd/sprd-pcm-dma.c | 1 - + sound/soc/stm/stm32_adfsdm.c | 29 +- + sound/soc/tegra/tegra_wm8903.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 35 +- + sound/soc/ti/davinci-mcasp.h | 4 + + sound/soc/ti/rx51.c | 12 +- + sound/soc/txx9/txx9aclc.c | 15 +- + sound/soc/uniphier/aio-dma.c | 31 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 14 +- + sound/soc/xtensa/xtfpga-i2s.c | 10 +- + 168 files changed, 10585 insertions(+), 3050 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml + create mode 100644 include/sound/sof/channel_map.h + create mode 100644 sound/soc/amd/raven/acp3x-i2s.c + create mode 100644 sound/soc/codecs/wcd934x.c + create mode 100644 sound/soc/intel/boards/bdw-rt5650.c + create mode 100644 sound/soc/intel/boards/sof_da7219_max98373.c + create mode 100644 sound/soc/sof/sof-audio.c + create mode 100644 sound/soc/sof/sof-audio.h +Merging modules/modules-next (ce2b617ce8cb export.h: reduce __ksymtab_strings string duplication by using "MS" section flags) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + include/asm-generic/export.h | 8 +++-- + include/linux/export.h | 33 ++++++++++++------ + include/linux/moduleparam.h | 82 +++++++++++++++++++++++++++++++++++++++++--- + kernel/module.c | 9 +++-- + 4 files changed, 111 insertions(+), 21 deletions(-) +Merging input/next (fd7bba685e7d Input: apbps2 - add __iomem to register struct) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/misc/axp20x-pek.c | 7 ++-- + drivers/input/serio/apbps2.c | 2 +- + drivers/input/touchscreen/elants_i2c.c | 77 ++++++++++++++++++++++++++++++---- + 3 files changed, 74 insertions(+), 12 deletions(-) +Merging block/for-next (af1a37012a26 Merge branch 'for-5.6/io_uring' into for-next) +$ git merge block/for-next +Auto-merging include/linux/namei.h +Auto-merging fs/open.c +CONFLICT (content): Merge conflict in fs/open.c +Auto-merging fs/namei.c +Auto-merging fs/io-wq.c +Auto-merging fs/file.c +Resolved 'fs/open.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1127ade68cf8] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/ata/brcm,sata-brcm.txt | 7 + + block/blk-mq.c | 69 +- + drivers/android/binder.c | 6 +- + drivers/ata/ahci_brcm.c | 42 +- + fs/file.c | 6 +- + fs/internal.h | 7 + + fs/io-wq.c | 13 +- + fs/io-wq.h | 2 + + fs/io_uring.c | 1796 ++++++++++++++++---- + fs/namei.c | 21 +- + fs/open.c | 4 +- + fs/stat.c | 34 +- + include/linux/list.h | 10 + + include/linux/mm.h | 1 + + include/linux/namei.h | 1 + + include/linux/percpu-refcount.h | 26 +- + include/uapi/linux/io_uring.h | 17 + + mm/madvise.c | 7 +- + 18 files changed, 1635 insertions(+), 434 deletions(-) +$ git am -3 ../patches/0001-io_uring-fix-up-for-open-introduce-openat2-2-syscall.patch +Applying: io_uring: fix up for "open: introduce openat2(2) syscall" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/internal.h +M fs/io_uring.c +$ git add -A . +$ git commit -v -a --amend +[master 8b1ecb8b1e81] Merge remote-tracking branch 'block/for-next' + Date: Tue Jan 7 12:20:51 2020 +1100 +Merging device-mapper/for-next (7fc979f8204f docs: dm-integrity: remove reference to ARC4) +$ 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 +Merge made by the 'recursive' strategy. + drivers/pcmcia/i82092.c | 648 ++++++++++++++++++++++------------------------ + drivers/pcmcia/i82092aa.h | 11 - + 2 files changed, 311 insertions(+), 348 deletions(-) +Merging mmc/next (9f606f11ea98 Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging drivers/pinctrl/core.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib-of.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,sdhi.txt | 3 +- + .../devicetree/bindings/mmc/sdhci-atmel.txt | 13 ++- + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + drivers/gpio/gpiolib-of.c | 21 ----- + drivers/gpio/gpiolib.c | 11 +++ + drivers/mmc/core/host.c | 33 ++----- + drivers/mmc/core/slot-gpio.c | 31 +++--- + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/mmc/host/au1xmmc.c | 7 +- + drivers/mmc/host/cavium-thunderx.c | 16 +++- + drivers/mmc/host/davinci_mmc.c | 4 +- + drivers/mmc/host/jz4740_mmc.c | 2 +- + drivers/mmc/host/meson-gx-mmc.c | 10 +- + drivers/mmc/host/meson-mx-sdio.c | 4 +- + drivers/mmc/host/mmc_spi.c | 15 ++- + drivers/mmc/host/mmci.c | 96 ++++++++++++++----- + drivers/mmc/host/mmci.h | 10 +- + drivers/mmc/host/mtk-sd.c | 3 +- + drivers/mmc/host/mvsdio.c | 6 +- + drivers/mmc/host/omap_hsmmc.c | 10 +- + drivers/mmc/host/pxamci.c | 12 +-- + drivers/mmc/host/renesas_sdhi.h | 10 +- + drivers/mmc/host/renesas_sdhi_core.c | 22 ++--- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 25 +---- + drivers/mmc/host/s3cmci.c | 4 +- + drivers/mmc/host/sdhci-acpi.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 18 ++-- + drivers/mmc/host/sdhci-milbeaut.c | 4 +- + drivers/mmc/host/sdhci-msm.c | 6 +- + drivers/mmc/host/sdhci-of-at91.c | 105 ++++++++++++--------- + drivers/mmc/host/sdhci-of-esdhc.c | 3 +- + drivers/mmc/host/sdhci-pci-core.c | 4 +- + drivers/mmc/host/sdhci-s3c.c | 6 +- + drivers/mmc/host/sdhci-sirf.c | 2 +- + drivers/mmc/host/sdhci-spear.c | 6 +- + drivers/mmc/host/sdhci.c | 17 +--- + drivers/mmc/host/sdhci_am654.c | 4 +- + drivers/mmc/host/sdhci_f_sdh30.c | 4 +- + drivers/mmc/host/sh_mmcif.c | 4 +- + drivers/mmc/host/sunxi-mmc.c | 3 +- + drivers/mmc/host/tmio_mmc_core.c | 6 +- + drivers/mmc/host/uniphier-sd.c | 14 +-- + drivers/mmc/host/usdhi6rol0.c | 15 +-- + drivers/pinctrl/core.c | 33 ++++--- + include/linux/gpio/consumer.h | 7 ++ + include/linux/mfd/tmio.h | 3 - + include/linux/mmc/slot-gpio.h | 5 +- + include/linux/pinctrl/consumer.h | 6 ++ + 48 files changed, 313 insertions(+), 335 deletions(-) +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (ea9a89ca3b95 mfd: dln2: More sanity checking for endpoints) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/dln2.c | 13 +++++++++++-- + drivers/mfd/sm501.c | 19 +++++++------------ + drivers/mfd/syscon.c | 2 +- + 3 files changed, 19 insertions(+), 15 deletions(-) +Merging backlight/for-backlight-next (102a1b382177 backlight: qcom-wled: Fix spelling mistake "trigged" -> "triggered") +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (921377c0b4e8 power: supply: abx500_chargalg: Remove unneeded semicolon) +$ git merge battery/for-next +Auto-merging drivers/power/reset/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/battery.txt | 5 + + .../bindings/power/supply/max17040_battery.txt | 33 ++++++ + .../bindings/power/supply/max17042_battery.txt | 6 +- + .../devicetree/bindings/power/supply/sc27xx-fg.txt | 3 + + drivers/power/reset/Kconfig | 16 +-- + drivers/power/reset/gpio-restart.c | 8 +- + drivers/power/supply/Kconfig | 30 ++--- + drivers/power/supply/ab8500_charger.c | 6 +- + drivers/power/supply/ab8500_fg.c | 14 +-- + drivers/power/supply/abx500_chargalg.c | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 10 +- + drivers/power/supply/ingenic-battery.c | 15 ++- + drivers/power/supply/max17040_battery.c | 130 ++++++++++++++++++++- + drivers/power/supply/max17042_battery.c | 17 ++- + drivers/power/supply/max77650-charger.c | 7 ++ + drivers/power/supply/pda_power.c | 4 + + drivers/power/supply/power_supply_core.c | 67 ++++++++++- + drivers/power/supply/sbs-battery.c | 33 +++--- + drivers/power/supply/sc27xx_fuel_gauge.c | 49 +++++++- + drivers/power/supply/ucs1002_power.c | 42 ++++++- + include/linux/power/max17042_battery.h | 48 +++++++- + include/linux/power_supply.h | 10 ++ + 22 files changed, 473 insertions(+), 82 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/max17040_battery.txt +Merging regulator/for-next (4ef4d9ff2e9d Merge branch 'regulator-5.6' into regulator-next) +$ git merge regulator/for-next +Removing Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.txt +Removing Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.txt +Removing Documentation/devicetree/bindings/regulator/st,stm32-booster.txt +Merge made by the 'recursive' strategy. + .../bindings/regulator/rohm,bd71828-regulator.yaml | 107 +++ + .../bindings/regulator/st,stm32-booster.txt | 18 - + .../bindings/regulator/st,stm32-booster.yaml | 46 ++ + .../bindings/regulator/st,stm32-vrefbuf.txt | 20 - + .../bindings/regulator/st,stm32-vrefbuf.yaml | 52 ++ + .../bindings/regulator/st,stm32mp1-pwr-reg.txt | 43 -- + .../bindings/regulator/st,stm32mp1-pwr-reg.yaml | 64 ++ + drivers/regulator/Kconfig | 12 + + drivers/regulator/Makefile | 1 + + drivers/regulator/bd71828-regulator.c | 807 +++++++++++++++++++++ + drivers/regulator/rk808-regulator.c | 2 +- + drivers/regulator/s2mpa01.c | 2 +- + drivers/regulator/s2mps11.c | 2 +- + drivers/regulator/s5m8767.c | 2 +- + 14 files changed, 1093 insertions(+), 85 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-booster.txt + create mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-booster.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.txt + create mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.txt + create mode 100644 Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.yaml + create mode 100644 drivers/regulator/bd71828-regulator.c +Merging security/next-testing (45893a0abee6 kexec: Fix file verification on S390) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (341c1fda5e17 apparmor: make it so work buffers can be allocated from atomic context) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (f47825c69485 Merge branch 'next-integrity.measure-keys' into next-integrity) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/ima_policy.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 16 ++++- + include/linux/ima.h | 14 ++++ + security/integrity/ima/Makefile | 1 + + security/integrity/ima/ima.h | 9 ++- + security/integrity/ima/ima_api.c | 8 ++- + security/integrity/ima/ima_appraise.c | 4 +- + security/integrity/ima/ima_asymmetric_keys.c | 58 +++++++++++++++++ + security/integrity/ima/ima_crypto.c | 4 +- + security/integrity/ima/ima_main.c | 12 ++-- + security/integrity/ima/ima_policy.c | 95 ++++++++++++++++++++++++++-- + security/keys/key.c | 10 +++ + 11 files changed, 210 insertions(+), 21 deletions(-) + create mode 100644 security/integrity/ima/ima_asymmetric_keys.c +Merging keys/keys-next (a2337251cb6b Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/keys/key.c +Auto-merging security/keys/internal.h +Auto-merging security/keys/compat.c +Auto-merging security/keys/Kconfig +Auto-merging init/Kconfig +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/device.h +Auto-merging fs/pipe.c +Auto-merging fs/ecryptfs/keystore.c +Auto-merging block/blk-core.c +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7ed03d470b39] 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 | 385 ++++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/Kconfig | 9 + + block/blk-core.c | 29 + + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/base/Kconfig | 9 + + drivers/base/Makefile | 1 + + drivers/base/watch.c | 90 +++ + drivers/md/dm-crypt.c | 2 +- + drivers/nvdimm/security.c | 2 +- + drivers/usb/core/Kconfig | 9 + + drivers/usb/core/devio.c | 47 ++ + drivers/usb/core/hub.c | 4 + + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + 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 +- + include/linux/blkdev.h | 15 + + include/linux/device.h | 7 + + include/linux/key.h | 125 ++-- + 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/syscalls.h | 1 + + include/linux/usb.h | 18 + + include/linux/watch_queue.h | 127 ++++ + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/keyctl.h | 68 +++ + include/uapi/linux/watch_queue.h | 158 +++++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/sys_ni.c | 1 + + kernel/watch_queue.c | 658 +++++++++++++++++++++ + 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 | 251 ++++++++ + 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 | 201 +++++-- + 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 | 30 +- + security/smack/smack_lsm.c | 85 ++- + 95 files changed, 3497 insertions(+), 428 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 drivers/base/watch.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 kernel/watch_queue.c + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +$ git reset --hard HEAD^ +HEAD is now at 2b175d58d862 Merge remote-tracking branch 'integrity/next-integrity' +Merging next-20191211 version of keys +$ git merge -m next-20191211/keys 48274e1e5d24407bb2acb768c093add00bf92823 +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/keys/key.c +Auto-merging security/keys/internal.h +Auto-merging security/keys/compat.c +Auto-merging security/keys/Kconfig +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +CONFLICT (content): Merge conflict in include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/device.h +Auto-merging include/linux/blkdev.h +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/base/Kconfig +Auto-merging block/blk-core.c +Auto-merging block/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/security/keys/core.rst +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/linux/security.h' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Resolved 'samples/Kconfig' using previous resolution. +Resolved 'samples/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master af3128c58814] next-20191211/keys +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 58 ++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 460 +++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/Kconfig | 9 + + block/blk-core.c | 29 + + drivers/base/Kconfig | 9 + + drivers/base/Makefile | 1 + + drivers/base/watch.c | 90 +++ + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/watch_queue.c | 898 +++++++++++++++++++++ + drivers/usb/core/Kconfig | 9 + + drivers/usb/core/devio.c | 49 ++ + drivers/usb/core/hub.c | 4 + + include/linux/blkdev.h | 15 + + include/linux/device.h | 7 + + include/linux/key.h | 3 + + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 + + include/linux/sched/user.h | 3 +- + include/linux/security.h | 31 + + include/linux/syscalls.h | 1 + + include/linux/usb.h | 18 + + include/linux/watch_queue.h | 94 +++ + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/keyctl.h | 2 + + include/uapi/linux/watch_queue.h | 181 +++++ + kernel/sys_ni.c | 1 + + samples/Kconfig | 8 +- + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 231 ++++++ + security/keys/Kconfig | 9 + + security/keys/compat.c | 3 + + security/keys/gc.c | 5 + + security/keys/internal.h | 30 +- + security/keys/key.c | 38 +- + security/keys/keyctl.c | 99 ++- + security/keys/keyring.c | 20 +- + security/keys/request_key.c | 4 +- + security/security.c | 23 + + security/selinux/hooks.c | 14 + + security/smack/smack_lsm.c | 83 +- + 60 files changed, 2591 insertions(+), 30 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 drivers/base/watch.c + create mode 100644 drivers/misc/watch_queue.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +Merging selinux/next (f1268534027a selinux: remove set but not used variable 'sidtab') +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_audit.h +CONFLICT (content): Merge conflict in include/linux/lsm_audit.h +Resolved 'include/linux/lsm_audit.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 45435048702e] Merge remote-tracking branch 'selinux/next' +$ git diff -M --stat --summary HEAD^.. + include/linux/lsm_audit.h | 2 + + include/linux/security.h | 2 + + security/Makefile | 2 +- + security/lockdown/lockdown.c | 27 --- + security/lsm_audit.c | 5 + + security/security.c | 33 +++ + security/selinux/Kconfig | 23 +++ + security/selinux/avc.c | 95 ++++----- + security/selinux/hooks.c | 71 +++++-- + security/selinux/ibpkey.c | 2 +- + security/selinux/include/avc.h | 13 +- + security/selinux/include/classmap.h | 2 + + security/selinux/include/objsec.h | 2 +- + security/selinux/include/security.h | 7 +- + security/selinux/netif.c | 2 +- + security/selinux/netnode.c | 2 +- + security/selinux/netport.c | 2 +- + security/selinux/selinuxfs.c | 76 ++++++- + security/selinux/ss/context.h | 11 +- + security/selinux/ss/policydb.c | 5 + + security/selinux/ss/policydb.h | 2 +- + security/selinux/ss/services.c | 248 ++++++++++++++-------- + security/selinux/ss/services.h | 6 +- + security/selinux/ss/sidtab.c | 402 +++++++++++++++++++++++------------- + security/selinux/ss/sidtab.h | 70 +++++-- + 25 files changed, 751 insertions(+), 361 deletions(-) +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 (a8772fad0172 tomoyo: Use atomic_t for statistics counter) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/common.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) +Merging tpmdd/next (c79f46a28239 Linux 5.5-rc5) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (dcbce5fbcc69 watchdog: orion: fix platform_get_irq() complaints) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/Kconfig | 2 ++ + drivers/watchdog/imx7ulp_wdt.c | 2 +- + drivers/watchdog/orion_wdt.c | 4 ++-- + drivers/watchdog/rn5t618_wdt.c | 1 + + drivers/watchdog/w83627hf_wdt.c | 2 +- + 5 files changed, 7 insertions(+), 4 deletions(-) +Merging iommu/next (cdd1a5d53fd5 Merge branches 'arm/smmu', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/pci/pci.c +Auto-merging drivers/iommu/amd_iommu.c +Merge made by the 'recursive' strategy. + drivers/acpi/arm64/iort.c | 4 +- + drivers/iommu/Kconfig | 22 +++++-- + drivers/iommu/Makefile | 3 +- + drivers/iommu/amd_iommu.c | 11 +--- + drivers/iommu/amd_iommu_init.c | 41 ++++++------ + drivers/iommu/amd_iommu_types.h | 2 +- + drivers/iommu/arm-smmu-v3.c | 105 ++++++++++++++++++------------ + drivers/iommu/arm-smmu.c | 139 ++++++++++++++++++++++++++-------------- + drivers/iommu/intel-iommu.c | 14 +--- + drivers/iommu/iommu-sysfs.c | 5 ++ + drivers/iommu/iommu.c | 51 ++++++++++++++- + drivers/iommu/iova.c | 2 +- + drivers/iommu/of_iommu.c | 19 ++++-- + drivers/iommu/virtio-iommu.c | 14 +--- + drivers/pci/ats.c | 2 + + drivers/pci/pci.c | 1 + + include/linux/iommu.h | 6 +- + 17 files changed, 280 insertions(+), 161 deletions(-) +Merging vfio/next (9917b54aded1 Merge branch 'v5.5/vfio/jiang-yi-irq-bypass-unregister-v1' into v5.5/vfio/next) +$ git merge vfio/next +Already up to date. +Merging audit/next (cb5172d96d16 audit: Add __rcu annotation to RCU pointer) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging devicetree/for-next (0cec114e3660 scripts/dtc: Update to upstream version v1.5.1-22-gc40aeb60b47a) +$ git merge devicetree/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/sram/sunxi-sram.txt +Removing Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt +Removing Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt +Removing Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt +Removing Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt +Removing Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt +Removing Documentation/devicetree/bindings/mfd/sun6i-prcm.txt +Removing Documentation/devicetree/bindings/media/sun6i-csi.txt +Removing Documentation/devicetree/bindings/media/renesas,ceu.txt +Removing Documentation/devicetree/bindings/media/cedrus.txt +Removing Documentation/devicetree/bindings/dma/stm32-mdma.txt +Removing Documentation/devicetree/bindings/dma/stm32-dmamux.txt +Removing Documentation/devicetree/bindings/dma/stm32-dma.txt +Removing Documentation/devicetree/bindings/clock/sunxi.txt +Removing Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.txt +Removing Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt +Removing Documentation/devicetree/bindings/arm/stm32/stm32-syscon.txt +Removing Documentation/devicetree/bindings/arm/stm32/mlahb.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/stm32/mlahb.txt | 37 ---- + .../devicetree/bindings/arm/stm32/st,mlahb.yaml | 70 +++++++ + .../bindings/arm/stm32/st,stm32-syscon.yaml | 41 ++++ + .../devicetree/bindings/arm/stm32/stm32-syscon.txt | 16 -- + .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 65 ++++++ + .../devicetree/bindings/arm/sunxi/sunxi-mbus.txt | 37 ---- + .../devicetree/bindings/ata/ahci-platform.txt | 12 -- + .../bindings/ata/allwinner,sun4i-a10-ahci.yaml | 47 +++++ + .../bindings/ata/allwinner,sun8i-r40-ahci.yaml | 67 ++++++ + .../clock/allwinner,sun4i-a10-ahb-clk.yaml | 108 ++++++++++ + .../clock/allwinner,sun4i-a10-apb0-clk.yaml | 50 +++++ + .../clock/allwinner,sun4i-a10-apb1-clk.yaml | 52 +++++ + .../clock/allwinner,sun4i-a10-axi-clk.yaml | 61 ++++++ + .../clock/allwinner,sun4i-a10-cpu-clk.yaml | 52 +++++ + .../clock/allwinner,sun4i-a10-display-clk.yaml | 57 ++++++ + .../clock/allwinner,sun4i-a10-gates-clk.yaml | 152 ++++++++++++++ + .../clock/allwinner,sun4i-a10-mbus-clk.yaml | 63 ++++++ + .../clock/allwinner,sun4i-a10-mmc-clk.yaml | 87 ++++++++ + .../clock/allwinner,sun4i-a10-mod0-clk.yaml | 80 ++++++++ + .../clock/allwinner,sun4i-a10-mod1-clk.yaml | 57 ++++++ + .../clock/allwinner,sun4i-a10-osc-clk.yaml | 51 +++++ + .../clock/allwinner,sun4i-a10-pll1-clk.yaml | 71 +++++++ + .../clock/allwinner,sun4i-a10-pll3-clk.yaml | 50 +++++ + .../clock/allwinner,sun4i-a10-pll5-clk.yaml | 53 +++++ + .../clock/allwinner,sun4i-a10-pll6-clk.yaml | 53 +++++ + .../clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml | 77 +++++++ + .../clock/allwinner,sun4i-a10-usb-clk.yaml | 166 +++++++++++++++ + .../bindings/clock/allwinner,sun4i-a10-ve-clk.yaml | 55 +++++ + .../clock/allwinner,sun5i-a13-ahb-clk.yaml | 52 +++++ + .../clock/allwinner,sun6i-a31-pll6-clk.yaml | 53 +++++ + .../clock/allwinner,sun7i-a20-gmac-clk.yaml | 51 +++++ + .../clock/allwinner,sun7i-a20-out-clk.yaml | 52 +++++ + .../clock/allwinner,sun8i-h3-bus-gates-clk.yaml | 103 ++++++++++ + .../clock/allwinner,sun9i-a80-ahb-clk.yaml | 52 +++++ + .../clock/allwinner,sun9i-a80-apb0-clk.yaml | 63 ++++++ + .../clock/allwinner,sun9i-a80-cpus-clk.yaml | 52 +++++ + .../bindings/clock/allwinner,sun9i-a80-gt-clk.yaml | 52 +++++ + .../clock/allwinner,sun9i-a80-mmc-config-clk.yaml | 68 +++++++ + .../clock/allwinner,sun9i-a80-pll4-clk.yaml | 50 +++++ + .../clock/allwinner,sun9i-a80-usb-mod-clk.yaml | 60 ++++++ + .../clock/allwinner,sun9i-a80-usb-phy-clk.yaml | 60 ++++++ + .../devicetree/bindings/clock/st,stm32mp1-rcc.txt | 60 ------ + .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 79 ++++++++ + Documentation/devicetree/bindings/clock/sunxi.txt | 225 --------------------- + .../devicetree/bindings/dma/st,stm32-dma.yaml | 102 ++++++++++ + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 52 +++++ + .../devicetree/bindings/dma/st,stm32-mdma.yaml | 105 ++++++++++ + .../devicetree/bindings/dma/stm32-dma.txt | 83 -------- + .../devicetree/bindings/dma/stm32-dmamux.txt | 84 -------- + .../devicetree/bindings/dma/stm32-mdma.txt | 94 --------- + .../devicetree/bindings/i2c/i2c-imx-lpi2c.txt | 1 + + .../media/allwinner,sun4i-a10-video-engine.yaml | 83 ++++++++ + .../bindings/media/allwinner,sun6i-a31-csi.yaml | 115 +++++++++++ + Documentation/devicetree/bindings/media/cedrus.txt | 57 ------ + .../devicetree/bindings/media/renesas,ceu.txt | 86 -------- + .../devicetree/bindings/media/renesas,ceu.yaml | 78 +++++++ + .../devicetree/bindings/media/sun6i-csi.txt | 61 ------ + .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 219 ++++++++++++++++++++ + .../bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 200 ++++++++++++++++++ + .../devicetree/bindings/mfd/sun6i-prcm.txt | 59 ------ + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 1 + + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 1 + + .../devicetree/bindings/net/renesas,ravb.txt | 7 +- + .../devicetree/bindings/nvmem/st,stm32-romem.txt | 31 --- + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 46 +++++ + .../opp/allwinner,sun50i-h6-operating-points.yaml | 129 ++++++++++++ + .../bindings/opp/sun50i-nvmem-cpufreq.txt | 167 --------------- + .../bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 105 ++++++++++ + .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 106 ++++++++++ + .../bindings/phy/allwinner,sun50i-h6-usb-phy.yaml | 105 ++++++++++ + .../bindings/phy/allwinner,sun5i-a13-usb-phy.yaml | 93 +++++++++ + .../bindings/phy/allwinner,sun6i-a31-usb-phy.yaml | 119 +++++++++++ + .../bindings/phy/allwinner,sun8i-a23-usb-phy.yaml | 102 ++++++++++ + .../bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml | 122 +++++++++++ + .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 137 +++++++++++++ + .../bindings/phy/allwinner,sun8i-r40-usb-phy.yaml | 119 +++++++++++ + .../bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml | 86 ++++++++ + .../bindings/phy/rockchip,px30-dsi-dphy.yaml | 2 +- + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 68 ------- + .../reset/allwinner,sun6i-a31-clock-reset.yaml | 68 +++++++ + .../bindings/reset/allwinner,sunxi-clock-reset.txt | 21 -- + .../devicetree/bindings/rtc/st,stm32-rtc.txt | 61 ------ + .../devicetree/bindings/rtc/st,stm32-rtc.yaml | 139 +++++++++++++ + .../devicetree/bindings/serial/fsl-lpuart.txt | 2 + + .../sram/allwinner,sun4i-a10-system-control.yaml | 140 +++++++++++++ + Documentation/devicetree/bindings/sram/sram.yaml | 25 ++- + .../devicetree/bindings/sram/sunxi-sram.txt | 113 ----------- + .../devicetree/bindings/trivial-devices.yaml | 2 + + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 8 + + .../devicetree/bindings/watchdog/renesas,wdt.txt | 1 + + .../devicetree/bindings/watchdog/st,stm32-iwdg.txt | 26 --- + .../bindings/watchdog/st,stm32-iwdg.yaml | 57 ++++++ + MAINTAINERS | 2 +- + drivers/of/base.c | 130 ++---------- + drivers/of/dynamic.c | 2 +- + drivers/of/of_private.h | 6 +- + drivers/of/overlay.c | 10 - + scripts/dtc/checks.c | 5 + + scripts/dtc/dtc-parser.y | 4 + + scripts/dtc/fstree.c | 2 +- + scripts/dtc/libfdt/fdt.c | 9 +- + scripts/dtc/libfdt/fdt_addresses.c | 8 +- + scripts/dtc/libfdt/fdt_overlay.c | 28 ++- + scripts/dtc/libfdt/fdt_ro.c | 11 +- + scripts/dtc/libfdt/libfdt.h | 4 +- + scripts/dtc/libfdt/libfdt_internal.h | 12 +- + scripts/dtc/livetree.c | 3 +- + scripts/dtc/util.c | 3 +- + scripts/dtc/util.h | 4 + + scripts/dtc/version_gen.h | 2 +- + scripts/dtc/yamltree.c | 21 ++ + 112 files changed, 5305 insertions(+), 1570 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/stm32/mlahb.txt + create mode 100644 Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml + create mode 100644 Documentation/devicetree/bindings/arm/stm32/st,stm32-syscon.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/stm32/stm32-syscon.txt + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt + create mode 100644 Documentation/devicetree/bindings/ata/allwinner,sun4i-a10-ahci.yaml + create mode 100644 Documentation/devicetree/bindings/ata/allwinner,sun8i-r40-ahci.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ahb-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb0-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb1-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-axi-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-cpu-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-display-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-gates-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mbus-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mmc-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod0-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod1-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-osc-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll1-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll3-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll5-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll6-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-usb-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ve-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun5i-a13-ahb-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun6i-a31-pll6-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-gmac-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-out-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun8i-h3-bus-gates-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-ahb-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-apb0-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-cpus-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-gt-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-mmc-config-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-pll4-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-mod-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-phy-clk.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/sunxi.txt + create mode 100644 Documentation/devicetree/bindings/dma/st,stm32-dma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/st,stm32-dmamux.yaml + create mode 100644 Documentation/devicetree/bindings/dma/st,stm32-mdma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/stm32-dma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/stm32-dmamux.txt + delete mode 100644 Documentation/devicetree/bindings/dma/stm32-mdma.txt + create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml + create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml + delete mode 100644 Documentation/devicetree/bindings/media/cedrus.txt + delete mode 100644 Documentation/devicetree/bindings/media/renesas,ceu.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,ceu.yaml + delete mode 100644 Documentation/devicetree/bindings/media/sun6i-csi.txt + create mode 100644 Documentation/devicetree/bindings/mfd/allwinner,sun6i-a31-prcm.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/allwinner,sun8i-a23-prcm.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/sun6i-prcm.txt + delete mode 100644 Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/st,stm32-romem.yaml + create mode 100644 Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml + delete mode 100644 Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun4i-a10-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun50i-h6-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun5i-a13-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-a23-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-h3-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-r40-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/reset/allwinner,sun6i-a31-clock-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/st,stm32-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml + delete mode 100644 Documentation/devicetree/bindings/sram/sunxi-sram.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.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 (3bfc0bc5d7eb Merge branch 'spi-5.6' into spi-next) +$ git merge spi/for-next +Removing Documentation/devicetree/bindings/spi/spi-stm32.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-stm32.txt | 62 ------ + .../devicetree/bindings/spi/st,stm32-spi.yaml | 105 ++++++++++ + drivers/spi/spi-atmel.c | 29 +-- + drivers/spi/spi-bcm2835.c | 45 ++-- + drivers/spi/spi-bitbang.c | 21 +- + drivers/spi/spi-dw.c | 3 +- + drivers/spi/spi-fsl-dspi.c | 12 +- + drivers/spi/spi-fsl-lpspi.c | 4 +- + drivers/spi/spi-img-spfi.c | 18 +- + drivers/spi/spi-imx.c | 4 +- + drivers/spi/spi-meson-spicc.c | 25 +-- + drivers/spi/spi-mxs.c | 6 +- + drivers/spi/spi-oc-tiny.c | 50 +---- + drivers/spi/spi-rspi.c | 2 - + drivers/spi/spi-sirf.c | 12 +- + drivers/spi/spi-stm32-qspi.c | 30 ++- + drivers/spi/spi-stm32.c | 79 +++---- + drivers/spi/spi-tegra114.c | 4 +- + drivers/spi/spi-ti-qspi.c | 2 - + drivers/spi/spi-topcliff-pch.c | 4 +- + drivers/spi/spi-uniphier.c | 227 ++++++++++++++++++++- + drivers/spi/spi.c | 7 + + include/linux/spi/spi_oc_tiny.h | 4 - + 23 files changed, 487 insertions(+), 268 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/spi/spi-stm32.txt + create mode 100644 Documentation/devicetree/bindings/spi/st,stm32-spi.yaml +Merging tip/auto-latest (a7ae58bdb1cb Merge branch 'x86/cleanups') +$ git merge tip/auto-latest +Removing scripts/sortextable.h +Auto-merging scripts/link-vmlinux.sh +Auto-merging scripts/Makefile.lib +Auto-merging net/core/dev.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/module.c +Auto-merging init/Kconfig +Auto-merging include/linux/module.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging fs/btrfs/volumes.h +Auto-merging drivers/media/pci/ivtv/ivtvfb.c +Removing arch/x86/mm/pat_interval.c +Removing arch/x86/include/asm/pat.h +Removing arch/x86/boot/compressed/efi_stub_64.S +Removing arch/x86/boot/compressed/efi_stub_32.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/kernel/entry_64.S +Auto-merging arch/arm64/crypto/sha256-glue.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/x86/boot.rst +Merge made by the 'recursive' strategy. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 256 +++++++++ + Documentation/x86/boot.rst | 2 +- + MAINTAINERS | 11 + + Makefile | 3 +- + arch/alpha/include/asm/vmalloc.h | 4 + + arch/arc/Kconfig | 2 +- + arch/arc/include/asm/vmalloc.h | 4 + + arch/arc/kernel/entry.S | 6 +- + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/efi.h | 17 +- + arch/arm/include/asm/switch_to.h | 2 +- + arch/arm/include/asm/vmalloc.h | 4 + + arch/arm/kernel/Makefile | 4 +- + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/ftrace.c | 10 +- + arch/arm/kernel/traps.c | 2 + + arch/arm/mm/cache-v7.S | 4 +- + arch/arm/mm/cache-v7m.S | 4 +- + arch/arm64/Kconfig | 54 +- + arch/arm64/crypto/sha256-glue.c | 2 +- + arch/arm64/include/asm/assembler.h | 6 +- + arch/arm64/include/asm/efi.h | 16 +- + arch/arm64/include/asm/preempt.h | 4 +- + arch/arm64/include/asm/vmalloc.h | 4 + + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/kernel/traps.c | 3 + + arch/c6x/include/asm/vmalloc.h | 4 + + arch/c6x/kernel/entry.S | 8 +- + arch/csky/include/asm/vmalloc.h | 4 + + arch/csky/kernel/entry.S | 4 +- + arch/h8300/include/asm/vmalloc.h | 4 + + arch/h8300/kernel/entry.S | 6 +- + arch/hexagon/include/asm/vmalloc.h | 4 + + arch/hexagon/kernel/vm_entry.S | 6 +- + arch/ia64/include/asm/acpi.h | 5 +- + arch/ia64/include/asm/vmalloc.h | 4 + + arch/ia64/kernel/acpi.c | 2 - + arch/ia64/kernel/entry.S | 12 +- + arch/ia64/kernel/kprobes.c | 2 +- + arch/m68k/include/asm/vmalloc.h | 4 + + arch/microblaze/Kconfig | 2 +- + arch/microblaze/include/asm/vmalloc.h | 4 + + arch/microblaze/kernel/entry.S | 2 +- + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/asmmacro.h | 4 +- + arch/mips/include/asm/vmalloc.h | 4 + + arch/mips/kernel/entry.S | 6 +- + arch/nds32/Kconfig | 2 +- + arch/nds32/include/asm/vmalloc.h | 4 + + arch/nds32/kernel/ex-exit.S | 4 +- + arch/nds32/kernel/ftrace.c | 12 - + arch/nios2/include/asm/vmalloc.h | 4 + + arch/nios2/kernel/entry.S | 2 +- + arch/openrisc/include/asm/vmalloc.h | 4 + + arch/parisc/Kconfig | 4 +- + arch/parisc/include/asm/vmalloc.h | 4 + + arch/parisc/kernel/entry.S | 10 +- + arch/powerpc/Kconfig | 4 +- + arch/powerpc/include/asm/vmalloc.h | 4 + + arch/powerpc/kernel/entry_32.S | 4 +- + arch/powerpc/kernel/entry_64.S | 4 +- + arch/riscv/include/asm/vmalloc.h | 4 + + arch/riscv/kernel/entry.S | 4 +- + arch/s390/Kconfig | 4 +- + arch/s390/include/asm/preempt.h | 4 +- + arch/s390/include/asm/vmalloc.h | 4 + + arch/s390/kernel/dumpstack.c | 2 + + arch/s390/kernel/entry.S | 2 +- + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/vmalloc.h | 4 + + arch/sh/kernel/cpu/sh5/entry.S | 4 +- + arch/sh/kernel/entry-common.S | 4 +- + arch/sparc/Kconfig | 2 +- + arch/sparc/include/asm/vmalloc.h | 4 + + arch/sparc/kernel/rtrap_64.S | 2 +- + arch/um/include/asm/vmalloc.h | 4 + + arch/unicore32/include/asm/vmalloc.h | 4 + + arch/x86/Kconfig | 80 +-- + arch/x86/boot/Makefile | 2 + + arch/x86/boot/compressed/Makefile | 4 +- + arch/x86/boot/compressed/eboot.c | 290 +++++----- + arch/x86/boot/compressed/eboot.h | 30 +- + arch/x86/boot/compressed/efi_stub_32.S | 87 --- + arch/x86/boot/compressed/efi_stub_64.S | 5 - + arch/x86/boot/compressed/efi_thunk_64.S | 17 +- + arch/x86/boot/compressed/head_32.S | 64 +-- + arch/x86/boot/compressed/head_64.S | 100 +--- + arch/x86/boot/setup.ld | 5 +- + arch/x86/entry/vdso/Makefile | 3 + + arch/x86/entry/vdso/vdso32-setup.c | 1 + + arch/x86/events/intel/ds.c | 1 + + arch/x86/include/asm/acpi.h | 3 +- + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/include/asm/cpu_entry_area.h | 10 +- + arch/x86/include/asm/efi.h | 77 ++- + arch/x86/include/asm/ftrace.h | 2 - + arch/x86/include/asm/kdebug.h | 1 + + arch/x86/include/asm/kprobes.h | 14 +- + arch/x86/include/asm/memtype.h | 27 + + arch/x86/include/asm/microcode_amd.h | 2 +- + arch/x86/include/asm/mmu_context.h | 86 +-- + arch/x86/include/asm/mtrr.h | 4 +- + arch/x86/include/asm/nospec-branch.h | 1 - + arch/x86/include/asm/pat.h | 27 - + arch/x86/include/asm/pci.h | 2 +- + arch/x86/include/asm/pgtable_32_areas.h | 53 ++ + arch/x86/include/asm/pgtable_32_types.h | 57 +- + arch/x86/include/asm/pgtable_areas.h | 16 + + arch/x86/include/asm/pgtable_types.h | 143 ++--- + arch/x86/include/asm/processor.h | 7 - + arch/x86/include/asm/ptrace.h | 13 + + arch/x86/include/asm/realmode.h | 4 +- + arch/x86/include/asm/set_memory.h | 2 - + arch/x86/include/asm/text-patching.h | 86 ++- + arch/x86/include/asm/vmalloc.h | 6 + + arch/x86/kernel/Makefile | 5 + + arch/x86/kernel/acpi/sleep.c | 11 + + arch/x86/kernel/acpi/sleep.h | 2 +- + arch/x86/kernel/alternative.c | 198 +++++-- + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/cpu/bugs.c | 7 + + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/mce/core.c | 13 +- + arch/x86/kernel/cpu/mce/inject.c | 2 +- + arch/x86/kernel/cpu/mce/internal.h | 2 - + arch/x86/kernel/cpu/mce/therm_throt.c | 2 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + arch/x86/kernel/cpu/mtrr/if.c | 63 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- + arch/x86/kernel/cpu/resctrl/core.c | 2 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +- + arch/x86/kernel/cpu/scattered.c | 2 +- + arch/x86/kernel/cpu/topology.c | 2 +- + arch/x86/kernel/cpu/tsx.c | 5 +- + arch/x86/kernel/crash_core_32.c | 17 + + arch/x86/kernel/crash_core_64.c | 24 + + arch/x86/kernel/dumpstack.c | 26 +- + arch/x86/kernel/ftrace.c | 689 +++++----------------- + arch/x86/kernel/jump_label.c | 116 ++-- + arch/x86/kernel/kprobes/core.c | 21 +- + arch/x86/kernel/kprobes/opt.c | 67 ++- + arch/x86/kernel/ldt.c | 83 +++ + arch/x86/kernel/machine_kexec_32.c | 12 - + arch/x86/kernel/machine_kexec_64.c | 19 - + arch/x86/kernel/process.c | 4 - + arch/x86/kernel/setup.c | 165 ++---- + arch/x86/kernel/traps.c | 117 +++- + arch/x86/kernel/unwind_orc.c | 8 +- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/lib/Makefile | 4 + + arch/x86/lib/insn-eval.c | 26 +- + arch/x86/mm/Makefile | 12 +- + arch/x86/mm/fault.c | 1 + + arch/x86/mm/init_32.c | 29 +- + arch/x86/mm/init_64.c | 36 -- + arch/x86/mm/iomap_32.c | 6 +- + arch/x86/mm/ioremap.c | 12 +- + arch/x86/mm/kasan_init_64.c | 21 - + arch/x86/mm/pat/Makefile | 5 + + arch/x86/mm/{pageattr-test.c => pat/cpa-test.c} | 0 + arch/x86/mm/{pat.c => pat/memtype.c} | 203 ++++--- + arch/x86/mm/{pat_internal.h => pat/memtype.h} | 12 +- + arch/x86/mm/pat/memtype_interval.c | 194 +++++++ + arch/x86/mm/{pageattr.c => pat/set_memory.c} | 24 +- + arch/x86/mm/pat_interval.c | 185 ------ + arch/x86/mm/pgtable_32.c | 1 + + arch/x86/mm/physaddr.c | 1 + + arch/x86/pci/i386.c | 2 +- + arch/x86/platform/efi/efi.c | 12 +- + arch/x86/platform/efi/efi_64.c | 6 +- + arch/x86/platform/efi/quirks.c | 3 +- + arch/x86/platform/intel-quark/imr.c | 2 + + arch/x86/platform/intel-quark/imr_selftest.c | 2 + + arch/x86/purgatory/Makefile | 2 + + arch/x86/realmode/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 3 + + arch/x86/xen/Kconfig | 8 +- + arch/x86/xen/efi.c | 2 +- + arch/x86/xen/mmu_pv.c | 2 +- + arch/xtensa/Kconfig | 2 +- + arch/xtensa/include/asm/vmalloc.h | 4 + + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/traps.c | 7 +- + drivers/acpi/sleep.c | 3 + + drivers/firmware/efi/capsule-loader.c | 1 + + drivers/firmware/efi/earlycon.c | 16 +- + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/firmware/efi/libstub/arm-stub.c | 110 ++-- + drivers/firmware/efi/libstub/arm32-stub.c | 70 ++- + drivers/firmware/efi/libstub/arm64-stub.c | 32 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 278 +++++---- + drivers/firmware/efi/libstub/efistub.h | 48 +- + drivers/firmware/efi/libstub/fdt.c | 53 +- + drivers/firmware/efi/libstub/gop.c | 163 +----- + drivers/firmware/efi/libstub/random.c | 79 ++- + drivers/firmware/efi/libstub/secureboot.c | 11 +- + drivers/firmware/efi/libstub/tpm.c | 48 +- + drivers/infiniband/hw/hfi1/trace_tid.h | 8 +- + drivers/infiniband/hw/hfi1/trace_tx.h | 2 +- + drivers/infiniband/hw/mlx5/main.c | 2 +- + drivers/lightnvm/pblk-trace.h | 8 +- + drivers/media/pci/ivtv/ivtvfb.c | 2 +- + drivers/misc/vmw_balloon.c | 1 + + drivers/net/fjes/fjes_trace.h | 2 +- + drivers/net/wireless/ath/ath10k/trace.h | 6 +- + drivers/virt/vboxguest/vboxguest_core.c | 1 + + drivers/virt/vboxguest/vboxguest_utils.c | 1 + + drivers/xen/preempt.c | 4 +- + fs/btrfs/volumes.h | 2 +- + fs/stack.c | 6 +- + fs/xfs/scrub/trace.h | 6 +- + fs/xfs/xfs_trace.h | 4 +- + include/asm-generic/atomic-instrumented.h | 393 +++++++------ + include/linux/compiler-clang.h | 11 +- + include/linux/compiler-gcc.h | 7 + + include/linux/compiler.h | 57 +- + include/linux/efi.h | 730 ++++++++++-------------- + include/linux/fs.h | 4 +- + include/linux/genhd.h | 6 +- + include/linux/kasan.h | 6 + + include/linux/kcsan-checks.h | 93 +++ + include/linux/kcsan.h | 108 ++++ + include/linux/mm.h | 15 +- + include/linux/module.h | 4 - + include/linux/sched.h | 8 +- + include/linux/seqlock.h | 51 +- + include/linux/stop_machine.h | 7 - + include/linux/trace_events.h | 18 +- + include/linux/vmalloc.h | 2 + + include/trace/events/filemap.h | 2 +- + include/trace/trace_events.h | 64 +-- + include/xen/xen-ops.h | 4 +- + init/Kconfig | 2 +- + init/init_task.c | 8 + + init/main.c | 2 + + kernel/Kconfig.locks | 12 +- + kernel/Makefile | 6 + + kernel/cpu.c | 13 +- + kernel/kcsan/Makefile | 11 + + 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/kprobes.c | 4 +- + kernel/locking/lockdep.c | 7 +- + kernel/module.c | 43 -- + kernel/rseq.c | 2 + + kernel/sched/Makefile | 6 + + kernel/sched/clock.c | 6 +- + kernel/sched/core.c | 25 +- + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/cpupri.c | 25 +- + kernel/sched/cpupri.h | 4 +- + kernel/sched/fair.c | 72 ++- + kernel/sched/pelt.c | 20 +- + kernel/sched/rt.c | 83 ++- + kernel/sched/sched.h | 24 +- + kernel/sched/wait_bit.c | 1 + + kernel/stop_machine.c | 30 - + kernel/trace/trace.h | 31 +- + kernel/trace/trace_entries.h | 66 +-- + kernel/trace/trace_events.c | 20 +- + kernel/trace/trace_events_hist.c | 8 +- + kernel/trace/trace_export.c | 106 ++-- + kernel/trace/trace_kprobe.c | 16 +- + kernel/trace/trace_syscalls.c | 50 +- + kernel/trace/trace_uprobe.c | 9 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 4 +- + lib/Kconfig.kcsan | 116 ++++ + lib/Makefile | 3 + + mm/Makefile | 8 + + mm/highmem.c | 2 +- + mm/kasan/report.c | 40 ++ + mm/memory.c | 2 +- + mm/slub.c | 12 +- + mm/vmalloc.c | 8 + + net/core/dev.c | 2 +- + net/mac80211/trace.h | 28 +- + net/wireless/trace.h | 6 +- + scripts/.gitignore | 2 +- + scripts/Makefile | 13 +- + scripts/Makefile.kcsan | 6 + + scripts/Makefile.lib | 10 + + scripts/atomic/gen-atomic-instrumented.sh | 17 +- + scripts/link-vmlinux.sh | 13 +- + scripts/sortextable.h | 209 ------- + scripts/{sortextable.c => sorttable.c} | 305 +++++----- + scripts/sorttable.h | 380 ++++++++++++ + sound/soc/intel/skylake/skl-sst-cldma.c | 1 + + tools/lib/traceevent/parse-filter.c | 4 +- + tools/objtool/check.c | 18 + + tools/perf/builtin-report.c | 5 +- + tools/perf/util/hist.h | 4 +- + tools/perf/util/symbol-elf.c | 3 + + 300 files changed, 6228 insertions(+), 4351 deletions(-) + create mode 100644 Documentation/dev-tools/kcsan.rst + create mode 100644 arch/alpha/include/asm/vmalloc.h + create mode 100644 arch/arc/include/asm/vmalloc.h + create mode 100644 arch/arm/include/asm/vmalloc.h + create mode 100644 arch/arm64/include/asm/vmalloc.h + create mode 100644 arch/c6x/include/asm/vmalloc.h + create mode 100644 arch/csky/include/asm/vmalloc.h + create mode 100644 arch/h8300/include/asm/vmalloc.h + create mode 100644 arch/hexagon/include/asm/vmalloc.h + create mode 100644 arch/ia64/include/asm/vmalloc.h + create mode 100644 arch/m68k/include/asm/vmalloc.h + create mode 100644 arch/microblaze/include/asm/vmalloc.h + create mode 100644 arch/mips/include/asm/vmalloc.h + create mode 100644 arch/nds32/include/asm/vmalloc.h + create mode 100644 arch/nios2/include/asm/vmalloc.h + create mode 100644 arch/openrisc/include/asm/vmalloc.h + create mode 100644 arch/parisc/include/asm/vmalloc.h + create mode 100644 arch/powerpc/include/asm/vmalloc.h + create mode 100644 arch/riscv/include/asm/vmalloc.h + create mode 100644 arch/s390/include/asm/vmalloc.h + create mode 100644 arch/sh/include/asm/vmalloc.h + create mode 100644 arch/sparc/include/asm/vmalloc.h + create mode 100644 arch/um/include/asm/vmalloc.h + create mode 100644 arch/unicore32/include/asm/vmalloc.h + delete mode 100644 arch/x86/boot/compressed/efi_stub_32.S + delete mode 100644 arch/x86/boot/compressed/efi_stub_64.S + create mode 100644 arch/x86/include/asm/memtype.h + delete mode 100644 arch/x86/include/asm/pat.h + create mode 100644 arch/x86/include/asm/pgtable_32_areas.h + create mode 100644 arch/x86/include/asm/pgtable_areas.h + create mode 100644 arch/x86/include/asm/vmalloc.h + create mode 100644 arch/x86/kernel/crash_core_32.c + create mode 100644 arch/x86/kernel/crash_core_64.c + create mode 100644 arch/x86/mm/pat/Makefile + rename arch/x86/mm/{pageattr-test.c => pat/cpa-test.c} (100%) + rename arch/x86/mm/{pat.c => pat/memtype.c} (84%) + rename arch/x86/mm/{pat_internal.h => pat/memtype.h} (81%) + create mode 100644 arch/x86/mm/pat/memtype_interval.c + rename arch/x86/mm/{pageattr.c => pat/set_memory.c} (99%) + delete mode 100644 arch/x86/mm/pat_interval.c + create mode 100644 arch/xtensa/include/asm/vmalloc.h + 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 + delete mode 100644 scripts/sortextable.h + rename scripts/{sortextable.c => sorttable.c} (67%) + create mode 100644 scripts/sorttable.h +Merging clockevents/timers/drivers/next (8c82723414d5 clocksource/drivers/timer-ti-dm: Switch to platform_get_irq) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/clocksource/hyperv_timer.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-sysregs.txt | 6 + + .../devicetree/bindings/timer/renesas,cmt.txt | 2 + + drivers/clocksource/Kconfig | 76 ++-- + drivers/clocksource/Makefile | 1 + + drivers/clocksource/bcm2835_timer.c | 5 +- + drivers/clocksource/em_sti.c | 7 +- + drivers/clocksource/hyperv_timer.c | 36 +- + drivers/clocksource/timer-cadence-ttc.c | 26 +- + drivers/clocksource/timer-microchip-pit64b.c | 449 +++++++++++++++++++++ + drivers/clocksource/timer-ti-dm.c | 18 +- + 10 files changed, 561 insertions(+), 65 deletions(-) + create mode 100644 drivers/clocksource/timer-microchip-pit64b.c +Merging edac/edac-for-next (a651c6c64431 EDAC/aspeed: Remove unneeded semicolon) +$ git merge edac/edac-for-next +Auto-merging drivers/edac/Kconfig +Merge made by the 'recursive' strategy. + drivers/edac/Kconfig | 3 +-- + drivers/edac/aspeed_edac.c | 4 ++-- + drivers/edac/i5100_edac.c | 7 ------- + drivers/edac/skx_common.c | 2 +- + 4 files changed, 4 insertions(+), 12 deletions(-) +Merging irqchip/irq/irqchip-next (c6d732c8cc67 irqchip/aspeed-i2c-ic: Fix irq domain name memory leak) +$ git merge irqchip/irq/irqchip-next +Auto-merging include/linux/irqchip/arm-gic-v3.h +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 4 ++-- + drivers/irqchip/irq-aspeed-i2c-ic.c | 2 -- + drivers/irqchip/irq-gic-v3-its.c | 4 ++-- + include/linux/irqchip/arm-gic-v3.h | 3 +++ + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging ftrace/for-next (fe6e096a5bbf tracing: Fix endianness bug in histogram trigger) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (de73daec335f rcutorture: Make kvm-find-errors.sh abort on bad directory) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging kernel/kcsan/encoding.h +CONFLICT (content): Merge conflict in kernel/kcsan/encoding.h +Auto-merging kernel/kcsan/core.c +CONFLICT (content): Merge conflict in kernel/kcsan/core.c +Auto-merging kernel/kcsan/atomic.h +Auto-merging include/linux/rculist_nulls.h +Auto-merging include/linux/list.h +Auto-merging include/linux/compiler.h +Auto-merging .mailmap +Resolved 'kernel/kcsan/core.c' using previous resolution. +Resolved 'kernel/kcsan/encoding.h' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f2499c495ba1] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 4 + + Documentation/RCU/{NMI-RCU.txt => NMI-RCU.rst} | 53 +-- + Documentation/RCU/{arrayRCU.txt => arrayRCU.rst} | 34 +- + Documentation/RCU/index.rst | 5 + + Documentation/RCU/lockdep-splat.txt | 2 +- + .../{rcu_dereference.txt => rcu_dereference.rst} | 75 ++-- + .../RCU/{rcubarrier.txt => rcubarrier.rst} | 222 ++++++----- + Documentation/RCU/stallwarn.txt | 11 +- + Documentation/RCU/{whatisRCU.txt => whatisRCU.rst} | 291 +++++++++------ + Documentation/admin-guide/kernel-parameters.txt | 32 ++ + Documentation/dev-tools/kcsan.rst | 24 +- + arch/powerpc/include/asm/barrier.h | 2 - + drivers/net/wireless/mediatek/mt76/agg-rx.c | 4 +- + fs/nfs/dir.c | 2 +- + include/asm-generic/atomic-instrumented.h | 335 ++++++++--------- + include/asm-generic/atomic-long.h | 331 ++++++++--------- + include/linux/atomic-fallback.h | 340 ++++++++--------- + include/linux/compiler-gcc.h | 3 +- + include/linux/compiler.h | 7 +- + include/linux/list.h | 136 +++++-- + include/linux/list_nulls.h | 30 +- + include/linux/rcu_segcblist.h | 2 - + include/linux/rculist.h | 38 +- + include/linux/rculist_nulls.h | 20 +- + include/linux/rcupdate.h | 28 +- + include/linux/rcutiny.h | 2 + + include/linux/rcutree.h | 2 + + include/linux/tick.h | 5 +- + include/linux/timer.h | 2 +- + include/trace/events/rcu.h | 40 +- + kernel/kcsan/Makefile | 1 + + kernel/kcsan/atomic.h | 2 +- + kernel/kcsan/core.c | 18 +- + kernel/kcsan/encoding.h | 14 +- + kernel/rcu/Kconfig | 17 +- + kernel/rcu/Makefile | 1 - + kernel/rcu/rcu.h | 48 +-- + kernel/rcu/rcu_segcblist.c | 25 +- + kernel/rcu/rcu_segcblist.h | 25 +- + kernel/rcu/rcuperf.c | 173 ++++++++- + kernel/rcu/rcutorture.c | 152 ++++---- + kernel/rcu/srcutiny.c | 2 +- + kernel/rcu/srcutree.c | 11 +- + kernel/rcu/tiny.c | 28 +- + kernel/rcu/tree.c | 412 ++++++++++++++++++--- + kernel/rcu/tree.h | 22 +- + kernel/rcu/tree_exp.h | 148 +++++--- + kernel/rcu/tree_plugin.h | 172 ++++----- + kernel/rcu/tree_stall.h | 40 +- + kernel/rcu/update.c | 34 +- + kernel/sysctl.c | 2 +- + kernel/torture.c | 29 +- + lib/Kconfig.debug | 6 +- + lib/Makefile | 1 + + net/tipc/crypto.c | 5 +- + 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 | 7 +- + scripts/atomic/gen-atomic-long.sh | 3 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++++-- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/testing/selftests/rcutorture/bin/cpus2use.sh | 11 +- + tools/testing/selftests/rcutorture/bin/jitter.sh | 30 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 + + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 3 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 17 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 13 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 32 +- + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 55 +-- + .../selftests/rcutorture/configs/rcu/TREE10 | 18 + + 102 files changed, 2671 insertions(+), 1518 deletions(-) + rename Documentation/RCU/{NMI-RCU.txt => NMI-RCU.rst} (73%) + rename Documentation/RCU/{arrayRCU.txt => arrayRCU.rst} (85%) + rename Documentation/RCU/{rcu_dereference.txt => rcu_dereference.rst} (88%) + rename Documentation/RCU/{rcubarrier.txt => rcubarrier.rst} (72%) + rename Documentation/RCU/{whatisRCU.txt => whatisRCU.rst} (84%) + 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 +$ git am -3 ../patches/0001-rcu-fix-up-for-Remove-rcu_swap_protected.patch +Applying: rcu: fix up for "Remove rcu_swap_protected()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/misc/watch_queue.c +$ git add -A . +$ git commit -v -a --amend +[master 7b7782e7a9e5] Merge remote-tracking branch 'rcu/rcu/next' + Date: Tue Jan 7 13:31:54 2020 +1100 +Merging kvm/linux-next (7d73710d9ca2 kvm: vmx: Stop wasting a page for guest_msrs) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (c74555894492 KVM: arm/arm64: vgic: Handle GICR_PENDBASER.PTZ filed as RAZ) +$ git merge kvm-arm/next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_emulate.h | 5 +++++ + arch/arm/include/asm/kvm_mmio.h | 2 ++ + arch/arm64/include/asm/kvm_emulate.h | 5 +++++ + arch/arm64/include/asm/kvm_mmio.h | 6 ++---- + virt/kvm/arm/mmio.c | 6 ++++++ + virt/kvm/arm/vgic/vgic-its.c | 3 ++- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 5 ++++- + 7 files changed, 26 insertions(+), 6 deletions(-) +Merging kvm-ppc/kvm-ppc-next (30486e72093e KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (c7b7de631246 KVM: s390: Do not yield when target is already running) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (d6bd6cf9feb8 xen/grant-table: remove multiple BUG_ON on gnttab_interface) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (06557cf18eae Merge branch 'for-5.6' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/asm-generic/percpu.h | 10 +++++----- + include/linux/percpu-defs.h | 3 +-- + 2 files changed, 6 insertions(+), 7 deletions(-) +Merging workqueues/for-next (49e9d1a9faf2 workqueue: Add RCU annotation for pwq list walk) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (554f269f0f38 platform/x86: intel_pmc_core: Add Intel Elkhart Lake support) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/intel_pmc_core.c | 110 +++++++++++++++++++++++++++------- + drivers/platform/x86/intel_pmc_core.h | 4 +- + 2 files changed, 91 insertions(+), 23 deletions(-) +Merging chrome-platform/for-next (737d6777b231 cros_ec: treewide: Remove 'include/linux/mfd/cros_ec.h') +$ git merge chrome-platform/for-next +Removing include/linux/mfd/cros_ec.h +Auto-merging drivers/power/supply/cros_usbpd-charger.c +Merge made by the 'recursive' strategy. + drivers/iio/accel/cros_ec_accel_legacy.c | 1 - + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 1 - + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 1 - + drivers/iio/light/cros_ec_light_prox.c | 1 - + drivers/iio/pressure/cros_ec_baro.c | 1 - + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 1 - + drivers/mfd/cros_ec_dev.c | 1 - + drivers/platform/chrome/chromeos_laptop.c | 18 ++-- + drivers/platform/chrome/cros_ec_chardev.c | 1 - + drivers/platform/chrome/cros_ec_debugfs.c | 1 - + drivers/platform/chrome/cros_ec_ishtp.c | 2 +- + drivers/platform/chrome/cros_ec_lightbar.c | 1 - + drivers/platform/chrome/cros_ec_lpc.c | 2 +- + drivers/platform/chrome/cros_ec_proto.c | 6 +- + drivers/platform/chrome/cros_ec_sensorhub.c | 1 - + drivers/platform/chrome/cros_ec_sysfs.c | 1 - + drivers/platform/chrome/cros_ec_trace.c | 97 ++++++++++++++++++++-- + drivers/platform/chrome/cros_ec_trace.h | 26 ++++-- + drivers/platform/chrome/cros_ec_vbc.c | 1 - + drivers/platform/chrome/cros_usbpd_logger.c | 1 - + drivers/power/supply/cros_usbpd-charger.c | 1 - + drivers/rtc/rtc-cros-ec.c | 1 - + include/linux/mfd/cros_ec.h | 35 -------- + include/linux/platform_data/cros_ec_proto.h | 23 ++++- + 24 files changed, 149 insertions(+), 76 deletions(-) + delete mode 100644 include/linux/mfd/cros_ec.h +Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (3e0801b62a30 dt: bindings: lm3692x: Add led-max-microamp property) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lm3692x.txt | 8 ++ + Documentation/devicetree/bindings/mfd/tps6105x.txt | 47 ++++++++++- + drivers/leds/Kconfig | 10 +++ + drivers/leds/Makefile | 1 + + drivers/leds/led-class.c | 97 +++++++++++++++++++++- + drivers/leds/leds-as3645a.c | 3 +- + drivers/leds/leds-bd2802.c | 27 ++++-- + drivers/leds/leds-gpio.c | 10 ++- + drivers/leds/leds-lm3532.c | 11 ++- + drivers/leds/leds-lm3642.c | 37 ++++----- + drivers/leds/leds-lm3692x.c | 34 +++++++- + drivers/leds/leds-max77650.c | 7 ++ + drivers/leds/leds-pca963x.c | 8 +- + drivers/leds/leds-rb532.c | 1 - + drivers/leds/leds-tps6105x.c | 89 ++++++++++++++++++++ + drivers/leds/trigger/ledtrig-pattern.c | 4 +- + include/linux/leds-bd2802.h | 1 - + include/linux/leds.h | 6 ++ + 18 files changed, 352 insertions(+), 49 deletions(-) + create mode 100644 drivers/leds/leds-tps6105x.c +Merging ipmi/for-next (6b8526d3abc0 ipmi:ssif: Handle a possible NULL pointer reference) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/ipmb.rst | 4 ++++ + drivers/char/ipmi/ipmb_dev_int.c | 31 ++++++++++++++++++++++++++++++- + drivers/char/ipmi/ipmi_ssif.c | 10 +++++++--- + 3 files changed, 41 insertions(+), 4 deletions(-) +Merging driver-core/driver-core-next (4c002c978b7f device.h: move 'struct driver' stuff out to device/driver.h) +$ git merge driver-core/driver-core-next +Auto-merging init/main.c +Auto-merging include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Resolved 'include/linux/device.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4873144fbaa3] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + drivers/base/base.h | 19 + + drivers/base/bus.c | 1 + + drivers/base/class.c | 1 + + drivers/base/driver.c | 1 + + include/linux/dev_printk.h | 235 ++++++++++ + include/linux/device.h | 999 +----------------------------------------- + include/linux/device/bus.h | 288 ++++++++++++ + include/linux/device/class.h | 266 +++++++++++ + include/linux/device/driver.h | 292 ++++++++++++ + init/main.c | 2 +- + 10 files changed, 1108 insertions(+), 996 deletions(-) + create mode 100644 include/linux/dev_printk.h + create mode 100644 include/linux/device/bus.h + create mode 100644 include/linux/device/class.h + create mode 100644 include/linux/device/driver.h +Merging usb/usb-next (203b7ee14d3a phy: Enable compile testing for some of drivers) +$ git merge usb/usb-next +Removing include/linux/platform_data/ehci-sh.h +Auto-merging drivers/usb/cdns3/gadget.c +Auto-merging drivers/net/Makefile +Auto-merging drivers/net/Kconfig +Merge made by the 'recursive' strategy. + Documentation/admin-guide/thunderbolt.rst | 30 +- + .../bindings/connector/usb-connector.txt | 4 +- + .../boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts | 2 +- + drivers/Makefile | 2 +- + drivers/net/Kconfig | 10 +- + drivers/net/Makefile | 2 +- + drivers/phy/allwinner/Kconfig | 3 +- + drivers/phy/broadcom/Kconfig | 4 +- + drivers/phy/marvell/Kconfig | 8 +- + drivers/phy/mediatek/Kconfig | 10 +- + drivers/phy/samsung/Kconfig | 8 +- + drivers/phy/ti/Kconfig | 4 +- + drivers/thunderbolt/Kconfig | 11 +- + drivers/thunderbolt/Makefile | 4 +- + drivers/thunderbolt/cap.c | 11 +- + drivers/thunderbolt/ctl.c | 19 +- + drivers/thunderbolt/ctl.h | 3 +- + drivers/thunderbolt/eeprom.c | 137 ++-- + drivers/thunderbolt/nhi.c | 3 + + drivers/thunderbolt/nhi.h | 2 + + drivers/thunderbolt/switch.c | 439 +++++++++--- + drivers/thunderbolt/tb.c | 227 ++++-- + drivers/thunderbolt/tb.h | 101 +++ + drivers/thunderbolt/tb_msgs.h | 6 +- + drivers/thunderbolt/tb_regs.h | 65 +- + drivers/thunderbolt/tmu.c | 383 +++++++++++ + drivers/thunderbolt/tunnel.c | 169 ++++- + drivers/thunderbolt/tunnel.h | 9 + + drivers/thunderbolt/usb4.c | 764 +++++++++++++++++++++ + drivers/thunderbolt/xdomain.c | 6 + + drivers/usb/cdns3/gadget.c | 3 +- + drivers/usb/gadget/Kconfig | 28 - + drivers/usb/gadget/function/u_audio.c | 19 +- + drivers/usb/gadget/legacy/Kconfig | 28 + + drivers/usb/host/Kconfig | 52 +- + drivers/usb/host/ehci-mv.c | 19 +- + drivers/usb/host/ehci-sh.c | 7 - + drivers/usb/host/xhci-mtk.c | 5 - + drivers/usb/host/xhci-tegra.c | 439 ++++++++++-- + drivers/usb/misc/usb3503.c | 94 +-- + drivers/usb/phy/Kconfig | 4 +- + drivers/usb/phy/phy-ab8500-usb.c | 26 +- + drivers/usb/renesas_usbhs/common.c | 22 +- + drivers/usb/renesas_usbhs/rcar2.c | 2 - + drivers/usb/serial/Kconfig | 3 - + drivers/usb/typec/ucsi/ucsi.c | 94 ++- + drivers/usb/typec/ucsi/ucsi.h | 14 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 191 +++++- + include/linux/platform_data/ehci-sh.h | 16 - + include/linux/platform_data/mv_usb.h | 8 - + include/linux/platform_data/usb3503.h | 3 - + include/linux/usb/renesas_usbhs.h | 2 - + 52 files changed, 3006 insertions(+), 519 deletions(-) + create mode 100644 drivers/thunderbolt/tmu.c + create mode 100644 drivers/thunderbolt/usb4.c + delete mode 100644 include/linux/platform_data/ehci-sh.h +Merging usb-gadget/next (726b4fba94be usb: dwc3: of-simple: add a shutdown) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (d1eef1c61974 Linux 5.5-rc2) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (4d6141288c33 usb: chipidea: imx: pinctrl for HSIC is optional) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (1544133d48c3 phy: Enable compile testing for some of drivers) +$ git merge phy-next/next +Auto-merging drivers/usb/renesas_usbhs/rcar2.c +Auto-merging drivers/phy/ti/Kconfig +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp.c +Auto-merging drivers/phy/mediatek/Kconfig +CONFLICT (content): Merge conflict in drivers/phy/mediatek/Kconfig +Auto-merging Documentation/devicetree/bindings/phy/rockchip,px30-dsi-dphy.yaml +Recorded preimage for 'drivers/phy/mediatek/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/phy/mediatek/Kconfig'. +[master 8651532b7120] Merge remote-tracking branch 'phy-next/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/phy/brcm,brcmstb-usb-phy.txt | 69 +- + .../devicetree/bindings/phy/brcm-sata-phy.txt | 1 + + .../bindings/phy/intel,lgm-emmc-phy.yaml | 56 ++ + .../devicetree/bindings/phy/phy-cadence-sierra.txt | 13 +- + .../bindings/phy/rockchip,px30-dsi-dphy.yaml | 5 - + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 204 +++++ + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/broadcom/Makefile | 2 +- + drivers/phy/broadcom/phy-brcm-sata.c | 120 +++ + drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 414 ++++++++++ + drivers/phy/broadcom/phy-brcm-usb-init.c | 226 +++--- + drivers/phy/broadcom/phy-brcm-usb-init.h | 148 +++- + drivers/phy/broadcom/phy-brcm-usb.c | 269 ++++-- + drivers/phy/cadence/phy-cadence-sierra.c | 699 +++++++++++++--- + drivers/phy/hisilicon/Kconfig | 16 +- + drivers/phy/intel/Kconfig | 9 + + drivers/phy/intel/Makefile | 2 + + drivers/phy/intel/phy-intel-emmc.c | 283 +++++++ + drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 2 +- + drivers/phy/mediatek/Kconfig | 17 +- + drivers/phy/phy-core.c | 48 +- + drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 7 +- + drivers/phy/qualcomm/phy-qcom-qmp.h | 2 +- + drivers/phy/rockchip/Kconfig | 1 + + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 319 +++----- + drivers/phy/ti/Kconfig | 15 + + drivers/phy/ti/Makefile | 1 + + drivers/phy/ti/phy-j721e-wiz.c | 898 +++++++++++++++++++++ + drivers/phy/ti/phy-ti-pipe3.c | 18 +- + drivers/usb/renesas_usbhs/rcar2.c | 2 +- + drivers/usb/renesas_usbhs/rza2.c | 2 +- + include/linux/phy/phy.h | 9 +- + 34 files changed, 3288 insertions(+), 593 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/intel,lgm-emmc-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml + create mode 100644 drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c + create mode 100644 drivers/phy/intel/Kconfig + create mode 100644 drivers/phy/intel/Makefile + create mode 100644 drivers/phy/intel/phy-intel-emmc.c + create mode 100644 drivers/phy/ti/phy-j721e-wiz.c +Merging tty/tty-next (749e4121d6ee Merge 5.5-rc3 into tty-next) +$ git merge tty/tty-next +Auto-merging scripts/Makefile +Auto-merging scripts/.gitignore +Auto-merging drivers/tty/serial/ucc_uart.c +Removing drivers/tty/serial/samsung.h +Auto-merging drivers/tty/serdev/core.c +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/legacy_serial.c | 4 +- + drivers/tty/serdev/core.c | 14 +- + drivers/tty/serial/21285.c | 55 ++++- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 5 +- + drivers/tty/serial/8250/8250_core.c | 1 + + drivers/tty/serial/8250/8250_fsl.c | 4 - + drivers/tty/serial/8250/8250_of.c | 4 +- + drivers/tty/serial/8250/8250_omap.c | 5 +- + drivers/tty/serial/8250/8250_port.c | 5 +- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/amba-pl010.c | 5 +- + drivers/tty/serial/amba-pl011.c | 13 +- + drivers/tty/serial/apbuart.c | 5 +- + drivers/tty/serial/arc_uart.c | 5 +- + drivers/tty/serial/atmel_serial.c | 9 +- + drivers/tty/serial/bcm63xx_uart.c | 5 +- + drivers/tty/serial/clps711x.c | 5 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 9 +- + drivers/tty/serial/dz.c | 5 +- + drivers/tty/serial/efm32-uart.c | 5 +- + drivers/tty/serial/fsl_linflexuart.c | 8 +- + drivers/tty/serial/fsl_lpuart.c | 9 +- + drivers/tty/serial/imx.c | 7 +- + drivers/tty/serial/ip22zilog.c | 7 +- + drivers/tty/serial/meson_uart.c | 5 +- + drivers/tty/serial/milbeaut_usio.c | 5 +- + drivers/tty/serial/mpc52xx_uart.c | 11 +- + drivers/tty/serial/msm_serial.c | 5 +- + drivers/tty/serial/mux.c | 5 +- + drivers/tty/serial/mxs-auart.c | 5 +- + drivers/tty/serial/omap-serial.c | 12 +- + drivers/tty/serial/pch_uart.c | 12 +- + drivers/tty/serial/pmac_zilog.c | 5 +- + drivers/tty/serial/pnx8xxx_uart.c | 7 +- + drivers/tty/serial/pxa.c | 5 +- + drivers/tty/serial/qcom_geni_serial.c | 5 +- + drivers/tty/serial/sa1100.c | 7 +- + drivers/tty/serial/samsung.h | 147 ------------- + drivers/tty/serial/samsung_tty.c | 313 ++++++++++++++++++---------- + drivers/tty/serial/sb1250-duart.c | 5 +- + drivers/tty/serial/sccnxp.c | 5 +- + drivers/tty/serial/serial_txx9.c | 5 +- + drivers/tty/serial/sh-sci.c | 10 +- + drivers/tty/serial/sprd_serial.c | 5 +- + drivers/tty/serial/st-asc.c | 5 +- + drivers/tty/serial/stm32-usart.c | 5 +- + drivers/tty/serial/sunhv.c | 5 +- + drivers/tty/serial/sunsab.c | 5 +- + drivers/tty/serial/sunsu.c | 5 +- + drivers/tty/serial/sunzilog.c | 6 +- + drivers/tty/serial/ucc_uart.c | 2 - + drivers/tty/serial/vr41xx_siu.c | 5 +- + drivers/tty/serial/vt8500_serial.c | 5 +- + drivers/tty/serial/xilinx_uartps.c | 5 +- + drivers/tty/serial/zs.c | 5 +- + drivers/tty/sysrq.c | 9 +- + drivers/tty/tty_io.c | 2 +- + drivers/tty/vt/.gitignore | 1 + + drivers/tty/vt/Makefile | 6 +- + {scripts => drivers/tty/vt}/conmakehash.c | 0 + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 78 +++---- + scripts/.gitignore | 1 - + scripts/Makefile | 3 - + 64 files changed, 374 insertions(+), 555 deletions(-) + delete mode 100644 drivers/tty/serial/samsung.h + rename {scripts => drivers/tty/vt}/conmakehash.c (100%) +Merging char-misc/char-misc-next (c79f46a28239 Linux 5.5-rc5) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (2ddf50a75dab extcon: sm5502: Remove unneeded semicolon) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 354 ++++++++++++++++++++++------------------ + drivers/extcon/extcon-sm5502.c | 10 +- + 2 files changed, 199 insertions(+), 165 deletions(-) +Merging soundwire/next (09f6a72d0143 soundwire: intel: add clock stop quirks) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/intel.c | 20 +++-- + drivers/soundwire/intel.h | 13 +-- + drivers/soundwire/intel_init.c | 32 ++------ + include/linux/soundwire/sdw.h | 19 +++++ + include/linux/soundwire/sdw_intel.h | 156 +++++++++++++++++++++++++++++++++--- + 5 files changed, 196 insertions(+), 44 deletions(-) +Merging thunderbolt/next (fd6988496e79 Linux 5.5-rc4) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (0469fc6a1a87 staging: wfx: check for memory allocation failures from wfx_alloc_hif) +$ git merge staging/staging-next +Removing include/uapi/linux/hysdn_if.h +Removing include/uapi/linux/gigaset_dev.h +Removing include/uapi/linux/b1lli.h +Removing include/linux/b1pcmcia.h +Auto-merging drivers/staging/vt6656/baseband.c +Auto-merging drivers/staging/qlge/qlge_main.c +Removing drivers/staging/octeon/octeon-stubs.h +Removing drivers/staging/octeon/octeon-ethernet.h +Removing drivers/staging/octeon/ethernet.c +Removing drivers/staging/octeon/ethernet-util.h +Removing drivers/staging/octeon/ethernet-tx.h +Removing drivers/staging/octeon/ethernet-tx.c +Removing drivers/staging/octeon/ethernet-spi.c +Removing drivers/staging/octeon/ethernet-sgmii.c +Removing drivers/staging/octeon/ethernet-rx.h +Removing drivers/staging/octeon/ethernet-rx.c +Removing drivers/staging/octeon/ethernet-rgmii.c +Removing drivers/staging/octeon/ethernet-mem.h +Removing drivers/staging/octeon/ethernet-mem.c +Removing drivers/staging/octeon/ethernet-mdio.h +Removing drivers/staging/octeon/ethernet-mdio.c +Removing drivers/staging/octeon/ethernet-defines.h +Removing drivers/staging/octeon/TODO +Removing drivers/staging/octeon/Makefile +Removing drivers/staging/octeon/Kconfig +Removing drivers/staging/octeon-usb/octeon-hcd.h +Removing drivers/staging/octeon-usb/octeon-hcd.c +Removing drivers/staging/octeon-usb/TODO +Removing drivers/staging/octeon-usb/Makefile +Removing drivers/staging/octeon-usb/Kconfig +Removing drivers/staging/isdn/hysdn/ince1pc.h +Removing drivers/staging/isdn/hysdn/hysdn_sched.c +Removing drivers/staging/isdn/hysdn/hysdn_proclog.c +Removing drivers/staging/isdn/hysdn/hysdn_procconf.c +Removing drivers/staging/isdn/hysdn/hysdn_pof.h +Removing drivers/staging/isdn/hysdn/hysdn_net.c +Removing drivers/staging/isdn/hysdn/hysdn_init.c +Removing drivers/staging/isdn/hysdn/hysdn_defs.h +Removing drivers/staging/isdn/hysdn/hysdn_boot.c +Removing drivers/staging/isdn/hysdn/hycapi.c +Removing drivers/staging/isdn/hysdn/boardergo.h +Removing drivers/staging/isdn/hysdn/boardergo.c +Removing drivers/staging/isdn/hysdn/Makefile +Removing drivers/staging/isdn/hysdn/Kconfig +Removing drivers/staging/isdn/gigaset/usb-gigaset.c +Removing drivers/staging/isdn/gigaset/ser-gigaset.c +Removing drivers/staging/isdn/gigaset/proc.c +Removing drivers/staging/isdn/gigaset/isocdata.c +Removing drivers/staging/isdn/gigaset/interface.c +Removing drivers/staging/isdn/gigaset/gigaset.h +Removing drivers/staging/isdn/gigaset/ev-layer.c +Removing drivers/staging/isdn/gigaset/dummyll.c +Removing drivers/staging/isdn/gigaset/common.c +Removing drivers/staging/isdn/gigaset/capi.c +Removing drivers/staging/isdn/gigaset/bas-gigaset.c +Removing drivers/staging/isdn/gigaset/asyncdata.c +Removing drivers/staging/isdn/gigaset/Makefile +Removing drivers/staging/isdn/gigaset/Kconfig +Removing drivers/staging/isdn/avm/t1pci.c +Removing drivers/staging/isdn/avm/t1isa.c +Removing drivers/staging/isdn/avm/c4.c +Removing drivers/staging/isdn/avm/b1pcmcia.c +Removing drivers/staging/isdn/avm/b1pci.c +Removing drivers/staging/isdn/avm/b1isa.c +Removing drivers/staging/isdn/avm/b1dma.c +Removing drivers/staging/isdn/avm/b1.c +Removing drivers/staging/isdn/avm/avmcard.h +Removing drivers/staging/isdn/avm/avm_cs.c +Removing drivers/staging/isdn/avm/Makefile +Removing drivers/staging/isdn/avm/Kconfig +Removing drivers/staging/isdn/TODO +Removing drivers/staging/isdn/Makefile +Removing drivers/staging/isdn/Kconfig +Removing drivers/isdn/capi/capilib.c +Auto-merging MAINTAINERS +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Removing Documentation/isdn/hysdn.rst +Removing Documentation/isdn/gigaset.rst +Removing Documentation/isdn/avmb1.rst +Merge made by the 'recursive' strategy. + Documentation/isdn/avmb1.rst | 246 -- + Documentation/isdn/gigaset.rst | 465 --- + Documentation/isdn/hysdn.rst | 196 - + Documentation/isdn/index.rst | 3 - + Documentation/isdn/interface_capi.rst | 71 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 3 +- + drivers/isdn/Makefile | 2 +- + drivers/isdn/capi/Kconfig | 32 +- + drivers/isdn/capi/Makefile | 18 +- + drivers/isdn/capi/capi.c | 14 +- + drivers/isdn/capi/capilib.c | 202 -- + drivers/isdn/capi/capiutil.c | 231 +- + drivers/isdn/capi/kcapi.c | 409 +-- + drivers/isdn/capi/kcapi.h | 149 +- + drivers/isdn/capi/kcapi_proc.c | 36 +- + drivers/staging/Kconfig | 6 - + drivers/staging/Makefile | 5 +- + drivers/staging/exfat/Kconfig | 26 +- + drivers/staging/exfat/Makefile | 2 +- + drivers/staging/exfat/exfat.h | 14 +- + drivers/staging/exfat/exfat_blkdev.c | 12 +- + drivers/staging/exfat/exfat_core.c | 8 +- + drivers/staging/exfat/exfat_super.c | 54 +- + drivers/staging/hp/hp100.c | 11 +- + drivers/staging/isdn/Kconfig | 12 - + drivers/staging/isdn/Makefile | 8 - + drivers/staging/isdn/TODO | 22 - + drivers/staging/isdn/avm/Kconfig | 65 - + drivers/staging/isdn/avm/Makefile | 12 - + drivers/staging/isdn/avm/avm_cs.c | 166 - + drivers/staging/isdn/avm/avmcard.h | 581 --- + drivers/staging/isdn/avm/b1.c | 819 ----- + drivers/staging/isdn/avm/b1dma.c | 981 ----- + drivers/staging/isdn/avm/b1isa.c | 243 -- + drivers/staging/isdn/avm/b1pci.c | 416 --- + drivers/staging/isdn/avm/b1pcmcia.c | 224 -- + drivers/staging/isdn/avm/c4.c | 1317 ------- + drivers/staging/isdn/avm/t1isa.c | 594 ---- + drivers/staging/isdn/avm/t1pci.c | 259 -- + drivers/staging/isdn/gigaset/Kconfig | 62 - + drivers/staging/isdn/gigaset/Makefile | 17 - + drivers/staging/isdn/gigaset/asyncdata.c | 606 ---- + drivers/staging/isdn/gigaset/bas-gigaset.c | 2672 -------------- + drivers/staging/isdn/gigaset/capi.c | 2517 ------------- + drivers/staging/isdn/gigaset/common.c | 1153 ------ + drivers/staging/isdn/gigaset/dummyll.c | 74 - + drivers/staging/isdn/gigaset/ev-layer.c | 1910 ---------- + drivers/staging/isdn/gigaset/gigaset.h | 827 ----- + drivers/staging/isdn/gigaset/interface.c | 613 ---- + drivers/staging/isdn/gigaset/isocdata.c | 1006 ------ + drivers/staging/isdn/gigaset/proc.c | 77 - + drivers/staging/isdn/gigaset/ser-gigaset.c | 796 ----- + drivers/staging/isdn/gigaset/usb-gigaset.c | 959 ----- + drivers/staging/isdn/hysdn/Kconfig | 15 - + drivers/staging/isdn/hysdn/Makefile | 12 - + drivers/staging/isdn/hysdn/boardergo.c | 445 --- + drivers/staging/isdn/hysdn/boardergo.h | 100 - + drivers/staging/isdn/hysdn/hycapi.c | 785 ---- + drivers/staging/isdn/hysdn/hysdn_boot.c | 400 --- + drivers/staging/isdn/hysdn/hysdn_defs.h | 282 -- + drivers/staging/isdn/hysdn/hysdn_init.c | 213 -- + drivers/staging/isdn/hysdn/hysdn_net.c | 330 -- + drivers/staging/isdn/hysdn/hysdn_pof.h | 78 - + drivers/staging/isdn/hysdn/hysdn_procconf.c | 411 --- + drivers/staging/isdn/hysdn/hysdn_proclog.c | 357 -- + drivers/staging/isdn/hysdn/hysdn_sched.c | 197 -- + drivers/staging/isdn/hysdn/ince1pc.h | 134 - + drivers/staging/kpc2000/kpc_dma/fileops.c | 2 - + drivers/staging/most/cdev/cdev.c | 4 +- + drivers/staging/most/configfs.c | 32 +- + drivers/staging/most/core.c | 34 +- + drivers/staging/most/dim2/dim2.c | 2 +- + drivers/staging/most/i2c/i2c.c | 2 +- + drivers/staging/most/{core.h => most.h} | 26 +- + drivers/staging/most/net/net.c | 6 +- + drivers/staging/most/sound/sound.c | 53 +- + drivers/staging/most/usb/usb.c | 2 +- + drivers/staging/most/video/video.c | 6 +- + drivers/staging/nvec/nvec_kbd.c | 2 + + 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 | 16 - + drivers/staging/octeon/Makefile | 19 - + drivers/staging/octeon/TODO | 9 - + drivers/staging/octeon/ethernet-defines.h | 40 - + drivers/staging/octeon/ethernet-mdio.c | 178 - + drivers/staging/octeon/ethernet-mdio.h | 28 - + drivers/staging/octeon/ethernet-mem.c | 154 - + drivers/staging/octeon/ethernet-mem.h | 9 - + drivers/staging/octeon/ethernet-rgmii.c | 158 - + drivers/staging/octeon/ethernet-rx.c | 538 --- + drivers/staging/octeon/ethernet-rx.h | 31 - + drivers/staging/octeon/ethernet-sgmii.c | 30 - + drivers/staging/octeon/ethernet-spi.c | 226 -- + drivers/staging/octeon/ethernet-tx.c | 717 ---- + drivers/staging/octeon/ethernet-tx.h | 14 - + drivers/staging/octeon/ethernet-util.h | 47 - + drivers/staging/octeon/ethernet.c | 992 ------ + drivers/staging/octeon/octeon-ethernet.h | 107 - + drivers/staging/octeon/octeon-stubs.h | 1433 -------- + drivers/staging/qlge/qlge.h | 15 +- + drivers/staging/qlge/qlge_dbg.c | 32 +- + drivers/staging/qlge/qlge_ethtool.c | 39 +- + drivers/staging/qlge/qlge_main.c | 215 +- + drivers/staging/qlge/qlge_mpi.c | 26 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 151 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 34 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 54 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 12 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 44 +- + drivers/staging/rts5208/rtsx.c | 7 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 19 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 9 +- + drivers/staging/vt6656/baseband.c | 8 +- + drivers/staging/wfx/TODO | 81 +- + drivers/staging/wfx/bh.c | 3 +- + drivers/staging/wfx/bus_spi.c | 9 +- + drivers/staging/wfx/data_rx.c | 8 +- + drivers/staging/wfx/data_rx.h | 4 +- + drivers/staging/wfx/data_tx.c | 5 +- + drivers/staging/wfx/data_tx.h | 2 +- + drivers/staging/wfx/fwio.c | 28 +- + drivers/staging/wfx/hif_api_cmd.h | 32 +- + drivers/staging/wfx/hif_api_mib.h | 13 +- + drivers/staging/wfx/hif_rx.c | 103 +- + drivers/staging/wfx/hif_tx.c | 115 +- + drivers/staging/wfx/hif_tx.h | 17 +- + drivers/staging/wfx/hif_tx_mib.h | 26 +- + drivers/staging/wfx/hwio.h | 15 +- + drivers/staging/wfx/main.c | 3 +- + drivers/staging/wfx/queue.c | 8 +- + drivers/staging/wfx/scan.c | 323 +- + drivers/staging/wfx/scan.h | 25 +- + drivers/staging/wfx/secure_link.h | 8 +- + drivers/staging/wfx/sta.c | 351 +- + drivers/staging/wfx/sta.h | 9 +- + drivers/staging/wfx/traces.h | 14 +- + drivers/staging/wfx/wfx.h | 18 +- + drivers/staging/wilc1000/netdev.c | 9 +- + drivers/staging/wilc1000/wlan.c | 23 - + drivers/staging/wilc1000/wlan.h | 1 + + drivers/staging/wilc1000/wlan_cfg.c | 8 +- + include/linux/b1pcmcia.h | 21 - + include/linux/isdn/capilli.h | 18 - + include/linux/isdn/capiutil.h | 456 --- + include/linux/kernelcapi.h | 75 - + include/uapi/linux/b1lli.h | 74 - + include/uapi/linux/gigaset_dev.h | 39 - + include/uapi/linux/hysdn_if.h | 34 - + 154 files changed, 1123 insertions(+), 37030 deletions(-) + delete mode 100644 Documentation/isdn/avmb1.rst + delete mode 100644 Documentation/isdn/gigaset.rst + delete mode 100644 Documentation/isdn/hysdn.rst + delete mode 100644 drivers/isdn/capi/capilib.c + delete mode 100644 drivers/staging/isdn/Kconfig + delete mode 100644 drivers/staging/isdn/Makefile + delete mode 100644 drivers/staging/isdn/TODO + delete mode 100644 drivers/staging/isdn/avm/Kconfig + delete mode 100644 drivers/staging/isdn/avm/Makefile + delete mode 100644 drivers/staging/isdn/avm/avm_cs.c + delete mode 100644 drivers/staging/isdn/avm/avmcard.h + delete mode 100644 drivers/staging/isdn/avm/b1.c + delete mode 100644 drivers/staging/isdn/avm/b1dma.c + delete mode 100644 drivers/staging/isdn/avm/b1isa.c + delete mode 100644 drivers/staging/isdn/avm/b1pci.c + delete mode 100644 drivers/staging/isdn/avm/b1pcmcia.c + delete mode 100644 drivers/staging/isdn/avm/c4.c + delete mode 100644 drivers/staging/isdn/avm/t1isa.c + delete mode 100644 drivers/staging/isdn/avm/t1pci.c + delete mode 100644 drivers/staging/isdn/gigaset/Kconfig + delete mode 100644 drivers/staging/isdn/gigaset/Makefile + delete mode 100644 drivers/staging/isdn/gigaset/asyncdata.c + delete mode 100644 drivers/staging/isdn/gigaset/bas-gigaset.c + delete mode 100644 drivers/staging/isdn/gigaset/capi.c + delete mode 100644 drivers/staging/isdn/gigaset/common.c + delete mode 100644 drivers/staging/isdn/gigaset/dummyll.c + delete mode 100644 drivers/staging/isdn/gigaset/ev-layer.c + delete mode 100644 drivers/staging/isdn/gigaset/gigaset.h + delete mode 100644 drivers/staging/isdn/gigaset/interface.c + delete mode 100644 drivers/staging/isdn/gigaset/isocdata.c + delete mode 100644 drivers/staging/isdn/gigaset/proc.c + delete mode 100644 drivers/staging/isdn/gigaset/ser-gigaset.c + delete mode 100644 drivers/staging/isdn/gigaset/usb-gigaset.c + delete mode 100644 drivers/staging/isdn/hysdn/Kconfig + delete mode 100644 drivers/staging/isdn/hysdn/Makefile + delete mode 100644 drivers/staging/isdn/hysdn/boardergo.c + delete mode 100644 drivers/staging/isdn/hysdn/boardergo.h + delete mode 100644 drivers/staging/isdn/hysdn/hycapi.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_boot.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_defs.h + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_init.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_net.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_pof.h + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_procconf.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_proclog.c + delete mode 100644 drivers/staging/isdn/hysdn/hysdn_sched.c + delete mode 100644 drivers/staging/isdn/hysdn/ince1pc.h + rename drivers/staging/most/{core.h => most.h} (95%) + delete mode 100644 drivers/staging/octeon-usb/Kconfig + delete mode 100644 drivers/staging/octeon-usb/Makefile + delete mode 100644 drivers/staging/octeon-usb/TODO + delete mode 100644 drivers/staging/octeon-usb/octeon-hcd.c + delete mode 100644 drivers/staging/octeon-usb/octeon-hcd.h + delete mode 100644 drivers/staging/octeon/Kconfig + delete mode 100644 drivers/staging/octeon/Makefile + delete mode 100644 drivers/staging/octeon/TODO + delete mode 100644 drivers/staging/octeon/ethernet-defines.h + delete mode 100644 drivers/staging/octeon/ethernet-mdio.c + delete mode 100644 drivers/staging/octeon/ethernet-mdio.h + delete mode 100644 drivers/staging/octeon/ethernet-mem.c + delete mode 100644 drivers/staging/octeon/ethernet-mem.h + delete mode 100644 drivers/staging/octeon/ethernet-rgmii.c + delete mode 100644 drivers/staging/octeon/ethernet-rx.c + delete mode 100644 drivers/staging/octeon/ethernet-rx.h + delete mode 100644 drivers/staging/octeon/ethernet-sgmii.c + delete mode 100644 drivers/staging/octeon/ethernet-spi.c + delete mode 100644 drivers/staging/octeon/ethernet-tx.c + delete mode 100644 drivers/staging/octeon/ethernet-tx.h + delete mode 100644 drivers/staging/octeon/ethernet-util.h + delete mode 100644 drivers/staging/octeon/ethernet.c + delete mode 100644 drivers/staging/octeon/octeon-ethernet.h + delete mode 100644 drivers/staging/octeon/octeon-stubs.h + delete mode 100644 include/linux/b1pcmcia.h + delete mode 100644 include/uapi/linux/b1lli.h + delete mode 100644 include/uapi/linux/gigaset_dev.h + delete mode 100644 include/uapi/linux/hysdn_if.h +Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 2 + + drivers/i2c/muxes/i2c-mux-pca9541.c | 29 ++++----- + drivers/i2c/muxes/i2c-mux-pca954x.c | 69 ++++++++++++++-------- + 3 files changed, 63 insertions(+), 37 deletions(-) +Merging icc/icc-next (2c5127a7fa03 interconnect: Print the tag in the debugfs summary) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/interconnect.rst | 22 ++++ + drivers/interconnect/Makefile | 1 + + drivers/interconnect/core.c | 163 +++++++++++++++++++++++------- + drivers/interconnect/internal.h | 42 ++++++++ + drivers/interconnect/qcom/msm8974.c | 32 ++---- + drivers/interconnect/qcom/qcs404.c | 32 ++---- + drivers/interconnect/qcom/sdm845.c | 16 +-- + drivers/interconnect/trace.h | 88 ++++++++++++++++ + include/linux/interconnect-provider.h | 14 +++ + 9 files changed, 311 insertions(+), 99 deletions(-) + create mode 100644 drivers/interconnect/internal.h + create mode 100644 drivers/interconnect/trace.h +Merging slave-dma/next (02939cd16709 dmaengine: imx-sdma: Fix memory leak) +$ git merge slave-dma/next +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/dma/virt-dma.c +Auto-merging drivers/dma/dma-jz4780.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/fsl-edma.txt | 1 + + .../devicetree/bindings/dma/jz4780-dma.txt | 6 +- + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + drivers/dma/bcm2835-dma.c | 5 +- + drivers/dma/dma-axi-dmac.c | 10 +- + drivers/dma/dma-jz4780.c | 7 + + drivers/dma/dmaengine.c | 352 ++++++++++++--------- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 +- + drivers/dma/fsl-edma-common.c | 5 + + drivers/dma/fsl-edma-common.h | 1 + + drivers/dma/fsl-edma.c | 8 + + drivers/dma/imx-sdma.c | 37 ++- + drivers/dma/ioat/init.c | 38 ++- + drivers/dma/mediatek/mtk-uart-apdma.c | 3 +- + drivers/dma/owl-dma.c | 3 +- + drivers/dma/pl330.c | 16 +- + drivers/dma/s3c24xx-dma.c | 22 +- + drivers/dma/sf-pdma/sf-pdma.c | 4 +- + drivers/dma/sun4i-dma.c | 3 +- + drivers/dma/ti/edma.c | 39 ++- + drivers/dma/virt-dma.c | 10 +- + drivers/dma/virt-dma.h | 27 +- + include/dt-bindings/dma/x1830-dma.h | 39 +++ + include/linux/dmaengine.h | 12 +- + 24 files changed, 399 insertions(+), 258 deletions(-) + create mode 100644 include/dt-bindings/dma/x1830-dma.h +Merging cgroup/for-next (899969b46c28 Merge branch 'for-5.5' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (202f93b5d605 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + drivers/scsi/csiostor/csio_scsi.c | 2 +- + drivers/scsi/esp_scsi.c | 22 +- + drivers/scsi/esp_scsi.h | 41 +-- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 5 - + drivers/scsi/initio.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_expander.c | 4 +- + drivers/scsi/libsas/sas_internal.h | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 8 +- + drivers/scsi/libsas/sas_task.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 2 + + drivers/scsi/lpfc/lpfc_attr.c | 9 +- + drivers/scsi/lpfc/lpfc_crtn.h | 2 +- + drivers/scsi/lpfc/lpfc_ct.c | 88 ++++--- + drivers/scsi/lpfc/lpfc_debugfs.c | 11 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 5 + + drivers/scsi/lpfc/lpfc_hw4.h | 3 + + drivers/scsi/lpfc/lpfc_init.c | 12 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 108 +++++++- + drivers/scsi/lpfc/lpfc_scsi.c | 4 +- + drivers/scsi/lpfc/lpfc_sli.c | 25 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/mpi/mpi2.h | 6 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 19 +- + drivers/scsi/mpt3sas/mpi/mpi2_image.h | 7 + + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 8 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 340 ++++++++++++++++++------ + drivers/scsi/mpt3sas/mpt3sas_base.h | 45 +++- + drivers/scsi/mpt3sas/mpt3sas_config.c | 39 ++- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 46 ++-- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 220 ++++++++++++++-- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 11 +- + drivers/scsi/myrb.h | 4 +- + drivers/scsi/myrs.h | 4 +- + drivers/scsi/qla2xxx/qla_bsg.c | 11 +- + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 22 +- + drivers/scsi/qla2xxx/qla_fw.h | 50 ++-- + drivers/scsi/qla2xxx/qla_gbl.h | 11 +- + drivers/scsi/qla2xxx/qla_gs.c | 6 +- + drivers/scsi/qla2xxx/qla_init.c | 158 ++++++----- + drivers/scsi/qla2xxx/qla_inline.h | 24 ++ + drivers/scsi/qla2xxx/qla_iocb.c | 51 +++- + drivers/scsi/qla2xxx/qla_isr.c | 60 +++-- + drivers/scsi/qla2xxx/qla_mbx.c | 3 +- + drivers/scsi/qla2xxx/qla_mid.c | 6 +- + drivers/scsi/qla2xxx/qla_mr.c | 16 +- + drivers/scsi/qla2xxx/qla_nx.c | 15 +- + drivers/scsi/qla2xxx/qla_os.c | 66 ++--- + drivers/scsi/qla2xxx/qla_sup.c | 11 +- + drivers/scsi/qla2xxx/qla_target.c | 47 ++-- + drivers/scsi/qla2xxx/qla_target.h | 3 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/scsi_lib.c | 2 + + drivers/scsi/scsi_logging.h | 2 +- + drivers/scsi/sd_zbc.c | 38 +-- + drivers/scsi/sym53c8xx_2/sym_nvram.c | 4 +- + drivers/scsi/ufs/cdns-pltfrm.c | 107 ++++++++ + drivers/scsi/ufs/ufs-mediatek.c | 125 ++++++++- + drivers/scsi/ufs/ufs-mediatek.h | 27 ++ + drivers/scsi/ufs/ufs-sysfs.c | 20 -- + drivers/scsi/ufs/ufs-sysfs.h | 4 +- + drivers/scsi/ufs/ufs.h | 6 +- + drivers/scsi/ufs/ufshcd.c | 431 ++++++++++++++++--------------- + drivers/scsi/ufs/ufshcd.h | 21 +- + drivers/scsi/ufs/unipro.h | 11 + + drivers/scsi/vmw_pvscsi.c | 20 +- + drivers/target/tcm_fc/tfc_io.c | 1 - + include/linux/soc/mediatek/mtk_sip_svc.h | 25 ++ + include/scsi/scsi_device.h | 1 + + include/uapi/scsi/scsi_bsg_ufs.h | 3 +- + 75 files changed, 1743 insertions(+), 787 deletions(-) + create mode 100644 include/linux/soc/mediatek/mtk_sip_svc.h +Merging scsi-mkp/for-next (1d83f0df7076 Merge branch '5.6/scsi-queue' into 5.6/scsi-next) +$ git merge scsi-mkp/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging vhost/linux-next (d1281e3a562e virtio-blk: remove VIRTIO_BLK_F_SCSI support) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + arch/powerpc/configs/guest.config | 1 - + drivers/block/Kconfig | 10 ---- + drivers/block/virtio_blk.c | 115 +------------------------------------ + drivers/net/virtio_net.c | 9 +++ + drivers/virtio/virtio_balloon.c | 2 + + drivers/virtio/virtio_mmio.c | 15 +---- + drivers/virtio/virtio_pci_common.c | 2 +- + 7 files changed, 16 insertions(+), 138 deletions(-) +Merging rpmsg/for-next (447e58a8d18a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 44 ++++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 23 +- + MAINTAINERS | 1 + + drivers/hwspinlock/stm32_hwspinlock.c | 4 +- + drivers/remoteproc/qcom_q6v5_mss.c | 200 +++++++++++++++- + drivers/remoteproc/qcom_q6v5_pas.c | 260 ++++++++++++++++++++- + drivers/remoteproc/qcom_sysmon.c | 2 +- + 7 files changed, 522 insertions(+), 12 deletions(-) +Merging gpio/for-next (331d7ae3fa15 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 3 +- + .../bindings/gpio/xylon,logicvc-gpio.yaml | 69 +++++++++ + .../devicetree/bindings/mfd/xylon,logicvc.yaml | 50 ++++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/driver-model/devres.rst | 2 + + drivers/gpio/Kconfig | 6 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-logicvc.c | 170 +++++++++++++++++++++ + drivers/gpio/gpiolib-sysfs.c | 7 +- + drivers/gpio/gpiolib.c | 63 +++----- + drivers/gpio/gpiolib.h | 2 + + 11 files changed, 329 insertions(+), 46 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/xylon,logicvc.yaml + create mode 100644 drivers/gpio/gpio-logicvc.c +Merging gpio-brgl/gpio/for-next (2ddac5ae1eae gpio: gpiolib: fix confusing indention) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpio-pca953x.c +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-bcm-kona.c | 12 +++++++++--- + drivers/gpio/gpio-mvebu.c | 7 +++++-- + drivers/gpio/gpio-pca953x.c | 5 +---- + drivers/gpio/gpio-sama5d2-piobu.c | 1 - + drivers/gpio/gpio-tb10x.c | 1 - + drivers/gpio/gpio-tegra.c | 21 ++++++++++----------- + drivers/gpio/gpiolib.c | 2 +- + 7 files changed, 26 insertions(+), 23 deletions(-) +Merging gpio-intel/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (3cb71c4cf0b6 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 9 +- + .../bindings/pinctrl/qcom,sc7180-pinctrl.txt | 5 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 170 ++++----- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 212 +++++------ + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 387 ++++++++++++++++++++- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 50 +-- + drivers/pinctrl/aspeed/pinctrl-aspeed.h | 38 +- + drivers/pinctrl/aspeed/pinmux-aspeed.h | 1 + + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 8 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt2712.h | 2 +- + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7180.c | 78 +++-- + drivers/pinctrl/stm32/pinctrl-stm32.h | 2 +- + 13 files changed, 711 insertions(+), 253 deletions(-) +Merging pinctrl-intel/for-next (3a67fe38e76a pinctrl: lynxpoint: Update summary in the driver) +$ git merge pinctrl-intel/for-next +Removing drivers/gpio/gpio-lynxpoint.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/gpio/Kconfig | 8 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-lynxpoint.c | 471 -------------- + drivers/pinctrl/intel/Kconfig | 13 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 295 ++++----- + drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +- + drivers/pinctrl/intel/pinctrl-intel.c | 40 +- + drivers/pinctrl/intel/pinctrl-intel.h | 44 ++ + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 975 +++++++++++++++++++++++++++++ + 11 files changed, 1181 insertions(+), 673 deletions(-) + delete mode 100644 drivers/gpio/gpio-lynxpoint.c + create mode 100644 drivers/pinctrl/intel/pinctrl-lynxpoint.c +Merging pinctrl-samsung/for-next (225a2ec19aac pinctrl: samsung: Fix missing OF and GPIOLIB dependency on S3C24xx and S3C64xx) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/Kconfig | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) +Merging pwm/for-next (bd88d319abe9 pwm: imx27: Unconditionally write state to hardware) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/core.c | 6 +- + drivers/pwm/pwm-cros-ec.c | 58 ++++++++++++++++++-- + drivers/pwm/pwm-imx27.c | 137 +++++++++++++++++++++++++--------------------- + 3 files changed, 133 insertions(+), 68 deletions(-) +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 (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (5f70bde26a48 selftests: fix build behaviour on targets' failures) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) +Merging y2038/y2038 (b8c709bf963a Merge tags 'block-ioctl-cleanup-5.6' and 'y2038-drivers-for-v5.6-signed' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground into HEAD) +$ git merge y2038/y2038 +Auto-merging net/packet/af_packet.c +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/nfs/fscache.c +Auto-merging fs/internal.h +Removing fs/compat_ioctl.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Auto-merging drivers/block/virtio_blk.c +CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c +Removing block/compat_ioctl.c +Auto-merging Documentation/core-api/index.rst +CONFLICT (content): Merge conflict in Documentation/core-api/index.rst +Resolved 'Documentation/core-api/index.rst' using previous resolution. +Resolved 'drivers/block/virtio_blk.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 68fcc6e6816e] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/index.rst | 1 + + Documentation/core-api/ioctl.rst | 253 ++++++++++++ + arch/arm64/include/asm/compat.h | 22 +- + arch/mips/include/asm/compat.h | 18 - + arch/parisc/include/asm/compat.h | 17 - + arch/powerpc/include/asm/compat.h | 17 - + arch/powerpc/oprofile/backtrace.c | 2 +- + arch/s390/include/asm/compat.h | 6 +- + arch/sh/include/uapi/asm/sockios.h | 4 +- + arch/sparc/include/asm/compat.h | 17 - + arch/sparc/kernel/sys_sparc_64.c | 33 +- + arch/um/drivers/cow.h | 2 +- + arch/um/drivers/cow_user.c | 7 +- + arch/um/drivers/ubd_kern.c | 11 +- + arch/um/include/shared/os.h | 2 +- + arch/um/os-Linux/file.c | 2 +- + arch/x86/include/asm/compat.h | 17 - + .../platforms/iss/include/platform/simcall.h | 4 +- + block/Makefile | 1 - + block/bsg.c | 1 + + block/compat_ioctl.c | 427 --------------------- + block/ioctl.c | 319 ++++++++++++--- + block/scsi_ioctl.c | 214 +++++++---- + drivers/ata/libata-scsi.c | 9 + + drivers/block/aoe/aoeblk.c | 1 + + drivers/block/floppy.c | 3 + + drivers/block/paride/pcd.c | 3 + + drivers/block/paride/pd.c | 1 + + drivers/block/paride/pf.c | 1 + + drivers/block/pktcdvd.c | 26 +- + drivers/block/sunvdc.c | 1 + + drivers/block/xen-blkfront.c | 1 + + drivers/cdrom/cdrom.c | 35 +- + drivers/cdrom/gdrom.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 20 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 11 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 5 +- + drivers/gpu/drm/msm/msm_drv.h | 3 +- + drivers/ide/ide-cd.c | 38 ++ + drivers/ide/ide-disk.c | 1 + + drivers/ide/ide-floppy.c | 4 + + drivers/ide/ide-floppy.h | 2 + + drivers/ide/ide-floppy_ioctl.c | 35 ++ + drivers/ide/ide-gd.c | 17 + + drivers/ide/ide-ioctls.c | 47 ++- + drivers/ide/ide-tape.c | 11 + + drivers/scsi/aic94xx/aic94xx_init.c | 3 + + drivers/scsi/ch.c | 9 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 3 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 + + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 + + drivers/scsi/ipr.c | 3 + + drivers/scsi/isci/init.c | 3 + + drivers/scsi/mvsas/mv_init.c | 3 + + drivers/scsi/pm8001/pm8001_init.c | 3 + + drivers/scsi/scsi_ioctl.c | 54 ++- + drivers/scsi/sd.c | 50 +-- + drivers/scsi/sg.c | 170 ++++---- + drivers/scsi/sr.c | 53 ++- + drivers/scsi/st.c | 51 ++- + fs/Makefile | 2 +- + fs/compat_ioctl.c | 261 ------------- + fs/dlm/lowcomms.c | 6 +- + fs/fat/inode.c | 3 +- + fs/hfs/hfs_fs.h | 28 +- + fs/hfs/inode.c | 4 +- + fs/hfsplus/hfsplus_fs.h | 28 +- + fs/hfsplus/inode.c | 12 +- + fs/hostfs/hostfs.h | 22 +- + fs/hostfs/hostfs_kern.c | 15 +- + fs/internal.h | 6 - + fs/ioctl.c | 131 +++++-- + fs/nfs/fscache-index.c | 6 +- + fs/nfs/fscache.c | 18 +- + fs/nfs/fscache.h | 8 +- + fs/nfs/nfs4xdr.c | 10 +- + include/linux/blkdev.h | 7 + + include/linux/compat.h | 18 + + include/linux/falloc.h | 2 - + include/linux/fs.h | 4 - + include/linux/ide.h | 2 + + include/linux/jiffies.h | 20 - + include/linux/libata.h | 6 + + include/linux/sunrpc/cache.h | 42 +- + include/linux/sunrpc/gss_api.h | 4 +- + include/linux/sunrpc/gss_krb5.h | 2 +- + include/linux/syscalls.h | 9 +- + include/scsi/scsi_ioctl.h | 1 + + include/scsi/sg.h | 30 ++ + include/uapi/linux/acct.h | 2 + + include/uapi/linux/taskstats.h | 6 +- + include/uapi/linux/time_types.h | 5 + + include/uapi/linux/timex.h | 2 + + kernel/acct.c | 4 +- + kernel/time/itimer.c | 18 +- + kernel/time/time.c | 58 +-- + kernel/tsacct.c | 9 +- + net/packet/af_packet.c | 27 +- + net/sunrpc/auth_gss/gss_krb5_mech.c | 12 +- + net/sunrpc/auth_gss/gss_krb5_seal.c | 8 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 6 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 16 +- + net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 6 +- + net/sunrpc/cache.c | 16 +- + net/sunrpc/svcauth_unix.c | 10 +- + 109 files changed, 1558 insertions(+), 1453 deletions(-) + create mode 100644 Documentation/core-api/ioctl.rst + delete mode 100644 block/compat_ioctl.c + delete mode 100644 fs/compat_ioctl.c +Merging livepatching/for-next (7f436b3066e3 Merge branch 'for-5.5/core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (ad9882f15884 coresight: etm4x: Fix unused function warning) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm4x.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) +Merging rtc/rtc-next (d53f9b68b359 rtc: pcf8563: Use BIT) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-mt6397.c +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/ABI/testing/rtc-cdev | 8 + + drivers/rtc/rtc-abx80x.c | 7 +- + drivers/rtc/rtc-asm9260.c | 3 + + drivers/rtc/rtc-ds1343.c | 10 +- + drivers/rtc/rtc-hym8563.c | 19 +- + drivers/rtc/rtc-moxart.c | 5 +- + drivers/rtc/rtc-mt6397.c | 10 +- + drivers/rtc/rtc-omap.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 6 +- + drivers/rtc/rtc-pcf85063.c | 16 +- + drivers/rtc/rtc-pcf8523.c | 6 +- + drivers/rtc/rtc-pcf8563.c | 40 +--- + drivers/rtc/rtc-rv3028.c | 17 +- + drivers/rtc/rtc-rv3029c2.c | 442 +++++++++++++++---------------------- + drivers/rtc/rtc-rv8803.c | 16 +- + drivers/rtc/rtc-rx8010.c | 25 +-- + drivers/rtc/rtc-rx8025.c | 27 +-- + drivers/rtc/rtc-stm32.c | 5 +- + drivers/rtc/rtc-zynqmp.c | 4 +- + include/linux/rtc.h | 1 + + include/uapi/linux/rtc.h | 7 +- + 22 files changed, 267 insertions(+), 410 deletions(-) +Merging nvdimm/libnvdimm-for-next (0dfbb932bb67 MAINTAINERS: Remove Keith from NVDIMM maintainers) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (69afc4b62308 eeprom: at24: sort headers alphabetically) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) +Merging ntb/ntb-next (1ef512b16bc8 NTB: Fix an error in get link status) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/amd/ntb_hw_amd.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 ++-- + drivers/ntb/hw/amd/ntb_hw_amd.h | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging kspp/for-next/kspp (c79f46a28239 Linux 5.5-rc5) +$ git merge kspp/for-next/kspp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (d1eef1c61974 Linux 5.5-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Merge made by the 'recursive' strategy. +Merging slimbus/for-next (526eaf5d08a2 slimbus: Use the correct style for SPDX License Identifier) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/slimbus/bus.txt | 10 ++++++++++ + drivers/slimbus/qcom-ngd-ctrl.c | 20 ++++++++++++-------- + drivers/slimbus/slimbus.h | 2 +- + 3 files changed, 23 insertions(+), 9 deletions(-) +Merging nvmem/for-next (9d5e6165e358 nvmem: imx: ocotp: introduce ocotp_ctrl_reg) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + drivers/nvmem/core.c | 8 +++-- + drivers/nvmem/imx-ocotp-scu.c | 16 ++++----- + drivers/nvmem/imx-ocotp.c | 79 +++++++++++++++++++++++++++++++------------ + 3 files changed, 69 insertions(+), 34 deletions(-) +Merging xarray/xarray (6b81141deb73 XArray: Improve documentation of search marks) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 60 +++++++++++++++++++++++---------------- + lib/test_xarray.c | 22 ++++++++++++++ + lib/xarray.c | 8 ++++-- + 3 files changed, 63 insertions(+), 27 deletions(-) +Merging hyperv/hyperv-next (7a1323b5dfe4 Drivers: hv: vmbus: Fix crash handler reset of Hyper-V synic) +$ 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 (c58ff643763c kdb: Tweak escape handling for vi users) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (04882c321b26 Merge branch 'pidfd' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging devfreq/devfreq-next (91d7f3f8f134 PM / devfreq: exynos: Rename Exynos to lowercase) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 18 +- + .../memory-controllers/fsl/imx8m-ddrc.yaml | 72 ++++ + drivers/devfreq/Kconfig | 21 +- + drivers/devfreq/Makefile | 1 + + drivers/devfreq/devfreq-event.c | 4 +- + drivers/devfreq/devfreq.c | 84 +++- + drivers/devfreq/event/Kconfig | 6 +- + drivers/devfreq/event/exynos-nocp.c | 2 +- + drivers/devfreq/event/exynos-nocp.h | 2 +- + drivers/devfreq/event/exynos-ppmu.c | 15 +- + drivers/devfreq/event/exynos-ppmu.h | 2 +- + drivers/devfreq/event/rockchip-dfi.c | 5 +- + drivers/devfreq/exynos-bus.c | 155 ++++--- + drivers/devfreq/imx8m-ddrc.c | 471 +++++++++++++++++++++ + drivers/devfreq/rk3399_dmc.c | 19 +- + include/linux/devfreq.h | 29 +- + 16 files changed, 774 insertions(+), 132 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml + create mode 100644 drivers/devfreq/imx8m-ddrc.c +Merging hmm/hmm (fd6988496e79 Linux 5.5-rc4) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (1d39387ce859 fpga: remove redundant dev_err message) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-afu-main.c | 2 -- + drivers/fpga/dfl-fme-main.c | 2 -- + drivers/fpga/ts73xx-fpga.c | 4 +--- + 3 files changed, 1 insertion(+), 7 deletions(-) +Merging kunit/test (e42617b825f8 Linux 5.5-rc1) +$ git merge kunit/test +Already up to date. +Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6) +$ git merge cel/cel-next +Already up to date. +Merging kasan-bitops/topic/kasan-bitops (4f4afc2c9599 docs/core-api: Remove possibly confusing sub-headings from Bit Operations) +$ git merge kasan-bitops/topic/kasan-bitops +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Auto-merging sound/x86/intel_hdmi_audio.c +Auto-merging sound/soc/sh/fsi.c +Auto-merging sound/pci/ymfpci/ymfpci_main.c +Auto-merging sound/pci/sis7019.c +Auto-merging sound/pci/rme9652/rme9652.c +Auto-merging sound/pci/rme9652/hdspm.c +Auto-merging sound/pci/rme9652/hdsp.c +Auto-merging sound/pci/rme96.c +Auto-merging sound/pci/rme32.c +Auto-merging sound/pci/nm256/nm256.c +Auto-merging sound/pci/echoaudio/echoaudio.c +Auto-merging sound/pci/cs46xx/cs46xx_lib.c +Auto-merging sound/pci/aw2/aw2-alsa.c +Auto-merging sound/parisc/harmony.c +Auto-merging sound/isa/msnd/msnd_pinnacle.c +Auto-merging sound/drivers/ml403-ac97cr.c +Auto-merging drivers/video/fbdev/w100fb.c +Auto-merging drivers/video/fbdev/valkyriefb.c +Auto-merging drivers/video/fbdev/tridentfb.c +Auto-merging drivers/video/fbdev/tgafb.c +Auto-merging drivers/video/fbdev/tdfxfb.c +Auto-merging drivers/video/fbdev/stifb.c +Auto-merging drivers/video/fbdev/sstfb.c +Auto-merging drivers/video/fbdev/sh_mobile_lcdcfb.c +Auto-merging drivers/video/fbdev/sh7760fb.c +Auto-merging drivers/video/fbdev/pxa168fb.c +Auto-merging drivers/video/fbdev/pvr2fb.c +Auto-merging drivers/video/fbdev/pmagb-b-fb.c +Auto-merging drivers/video/fbdev/pmag-ba-fb.c +Auto-merging drivers/video/fbdev/pmag-aa-fb.c +Auto-merging drivers/video/fbdev/pm3fb.c +Auto-merging drivers/video/fbdev/pm2fb.c +Auto-merging drivers/video/fbdev/mmp/hw/mmp_ctrl.c +Auto-merging drivers/video/fbdev/mbx/mbxfb.c +Auto-merging drivers/video/fbdev/kyro/fbdev.c +Auto-merging drivers/video/fbdev/intelfb/intelfbdrv.c +Auto-merging drivers/video/fbdev/carminefb.c +Auto-merging drivers/tty/synclinkmp.c +Auto-merging drivers/tty/synclink_gt.c +Auto-merging drivers/tty/synclink.c +Auto-merging drivers/tty/serial/zs.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/sb1250-duart.c +Auto-merging drivers/tty/serial/mux.c +Auto-merging drivers/tty/serial/meson_uart.c +Auto-merging drivers/tty/serial/dz.c +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging drivers/tty/serial/8250/8250_omap.c +Auto-merging drivers/staging/rts5208/rtsx.c +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c +Auto-merging drivers/staging/qlge/qlge_main.c +Auto-merging drivers/scsi/qla2xxx/qla_mr.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +Auto-merging drivers/net/ethernet/ti/netcp_core.c +Auto-merging drivers/net/ethernet/sfc/falcon/efx.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/natsemi/ns83820.c +Auto-merging drivers/net/ethernet/marvell/sky2.c +Auto-merging drivers/net/ethernet/marvell/skge.c +Auto-merging drivers/net/ethernet/lantiq_etop.c +Auto-merging drivers/net/ethernet/korina.c +Auto-merging drivers/net/ethernet/ethoc.c +Auto-merging drivers/net/ethernet/dec/tulip/de2104x.c +Auto-merging drivers/net/ethernet/broadcom/sb1250-mac.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging drivers/net/ethernet/atheros/ag71xx.c +Auto-merging drivers/net/ethernet/amd/au1000_eth.c +Auto-merging drivers/mmc/host/sdhci-acpi.c +Auto-merging drivers/media/pci/ivtv/ivtv-driver.c +Auto-merging drivers/media/pci/cx18/cx18-driver.c +Auto-merging drivers/media/common/videobuf2/videobuf2-vmalloc.c +Auto-merging drivers/iommu/amd_iommu_init.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/tilcdc/tilcdc_drv.c +Auto-merging drivers/gpu/drm/sti/sti_dvo.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +Auto-merging drivers/gpu/drm/gma500/psb_drv.c +Auto-merging drivers/bcma/scan.c +Auto-merging Documentation/sound/kernel-api/writing-an-alsa-driver.rst +Auto-merging Documentation/driver-api/driver-model/devres.rst +Merge made by the 'recursive' strategy. + Documentation/driver-api/driver-model/devres.rst | 1 - + .../sound/kernel-api/writing-an-alsa-driver.rst | 2 +- + Documentation/x86/pat.rst | 2 -- + arch/alpha/include/asm/io.h | 10 ++------- + arch/arm/include/asm/io.h | 8 -------- + arch/arm/mach-bcm/platsmp.c | 4 ++-- + arch/arm/mach-davinci/devices.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 2 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 8 ++++---- + arch/arm/mach-shmobile/setup-r8a7778.c | 2 +- + arch/hexagon/include/asm/io.h | 1 - + arch/ia64/include/asm/vga.h | 2 +- + arch/ia64/kernel/cyclone.c | 8 ++++---- + arch/m68k/include/asm/kmap.h | 1 - + arch/mips/ar7/clock.c | 8 ++++---- + arch/mips/ar7/gpio.c | 2 +- + arch/mips/ar7/platform.c | 2 +- + arch/mips/ath25/ar2315.c | 4 ++-- + arch/mips/ath25/ar5312.c | 6 +++--- + arch/mips/ath25/board.c | 2 +- + arch/mips/ath79/common.c | 2 +- + arch/mips/ath79/setup.c | 4 ++-- + arch/mips/cavium-octeon/setup.c | 2 +- + arch/mips/generic/board-ocelot.c | 2 +- + arch/mips/include/asm/io.h | 24 +--------------------- + arch/mips/kernel/mips-cm.c | 4 ++-- + arch/mips/kernel/mips-cpc.c | 2 +- + arch/mips/lantiq/falcon/sysctrl.c | 6 +++--- + arch/mips/lantiq/irq.c | 4 ++-- + arch/mips/lantiq/xway/sysctrl.c | 6 +++--- + arch/mips/loongson2ef/common/reset.c | 4 ++-- + arch/mips/loongson32/common/prom.c | 8 ++++---- + arch/mips/loongson32/common/reset.c | 2 +- + arch/mips/loongson32/common/time.c | 2 +- + arch/mips/loongson64/reset.c | 2 +- + arch/mips/mti-malta/malta-dtshim.c | 2 +- + arch/mips/pci/pci-alchemy.c | 2 +- + arch/mips/pci/pci-ar2315.c | 2 +- + arch/mips/pci/pci-bcm63xx.c | 2 +- + arch/mips/pci/pci-rt2880.c | 2 +- + arch/mips/pic32/pic32mzda/early_console.c | 2 +- + arch/mips/pic32/pic32mzda/early_pin.c | 4 ++-- + arch/mips/pmcs-msp71xx/msp_serial.c | 4 ++-- + arch/mips/ralink/irq.c | 2 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/rb532/devices.c | 2 +- + arch/mips/rb532/gpio.c | 2 +- + arch/mips/rb532/prom.c | 2 +- + arch/mips/rb532/setup.c | 2 +- + arch/mips/sni/rm200.c | 4 ++-- + arch/parisc/include/asm/io.h | 5 ++--- + arch/parisc/kernel/perf.c | 2 +- + arch/powerpc/include/asm/io.h | 3 --- + arch/sh/boards/board-sh7785lcr.c | 2 +- + arch/sh/boards/mach-cayman/irq.c | 2 +- + arch/sh/boards/mach-cayman/setup.c | 2 +- + arch/sh/boards/mach-sdk7786/fpga.c | 2 +- + arch/sh/drivers/heartbeat.c | 2 +- + arch/sh/drivers/pci/pci-sh5.c | 4 ++-- + arch/sh/include/asm/io.h | 1 - + arch/sh/kernel/cpu/irq/intc-sh5.c | 2 +- + arch/sh/kernel/cpu/sh2/smp-j2.c | 4 ++-- + arch/sh/kernel/cpu/sh5/clock-sh5.c | 2 +- + arch/sh/kernel/dma-coherent.c | 2 +- + arch/sparc/include/asm/io_64.h | 1 - + arch/unicore32/include/asm/io.h | 1 - + arch/x86/kernel/apb_timer.c | 2 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/kernel/quirks.c | 2 +- + arch/x86/kernel/tboot.c | 2 +- + arch/x86/mm/testmmiotrace.c | 4 ++-- + arch/x86/pci/mmconfig_64.c | 2 +- + drivers/acpi/acpi_lpit.c | 2 +- + drivers/ata/pata_arasan_cf.c | 2 +- + drivers/ata/pata_octeon_cf.c | 6 +++--- + drivers/ata/pata_rb532_cf.c | 2 +- + drivers/atm/eni.c | 8 +------- + drivers/bcma/driver_chipcommon_b.c | 2 +- + drivers/bcma/driver_pci_host.c | 6 +++--- + drivers/bcma/host_soc.c | 2 +- + drivers/bcma/scan.c | 6 +++--- + drivers/block/umem.c | 2 +- + drivers/bus/fsl-mc/mc-io.c | 4 ++-- + drivers/char/agp/generic.c | 2 +- + drivers/char/agp/intel-gtt.c | 2 +- + drivers/char/applicom.c | 4 ++-- + drivers/char/hw_random/intel-rng.c | 2 +- + drivers/char/hw_random/octeon-rng.c | 4 ++-- + drivers/clk/renesas/clk-rz.c | 4 ++-- + drivers/clocksource/sh_cmt.c | 2 +- + drivers/clocksource/sh_mtu2.c | 2 +- + drivers/clocksource/sh_tmu.c | 2 +- + drivers/cpufreq/pcc-cpufreq.c | 2 +- + drivers/crypto/hifn_795x.c | 2 +- + drivers/dma/altera-msgdma.c | 4 ++-- + drivers/edac/i3000_edac.c | 2 +- + drivers/edac/i3200_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 2 +- + drivers/edac/ie31200_edac.c | 2 +- + drivers/edac/x38_edac.c | 2 +- + drivers/firewire/nosy.c | 2 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 2 +- + drivers/gpu/drm/gma500/gtt.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 4 ++-- + drivers/gpu/drm/sti/sti_hdmi.c | 2 +- + drivers/gpu/drm/sti/sti_tvout.c | 2 +- + drivers/gpu/drm/sti/sti_vtg.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 4 ++-- + drivers/hwmon/i5k_amb.c | 2 +- + drivers/i2c/busses/i2c-highlander.c | 2 +- + drivers/i2c/busses/i2c-pmcmsp.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 ++-- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 +- + drivers/infiniband/hw/hfi1/pcie.c | 4 ++-- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/hw/qib/qib_init.c | 4 ++-- + drivers/infiniband/hw/qib/qib_pcie.c | 2 +- + drivers/input/keyboard/pxa930_rotary.c | 2 +- + drivers/input/keyboard/sh_keysc.c | 2 +- + drivers/input/mouse/pxa930_trkball.c | 2 +- + drivers/input/serio/gscps2.c | 2 +- + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/ipack/carriers/tpci200.c | 4 ++-- + drivers/ipack/devices/ipoctal.c | 6 +++--- + drivers/irqchip/irq-mips-gic.c | 2 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 2 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/ivtv/ivtv-driver.c | 6 +++--- + drivers/media/platform/davinci/dm355_ccdc.c | 2 +- + drivers/media/platform/davinci/dm644x_ccdc.c | 2 +- + drivers/media/platform/davinci/isif.c | 2 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 2 +- + drivers/misc/cardreader/rtsx_pcr.c | 2 +- + drivers/misc/mic/scif/scif_nodeqp.c | 2 +- + drivers/misc/pti.c | 2 +- + drivers/mmc/host/sdhci-acpi.c | 2 +- + drivers/mmc/host/via-sdmmc.c | 2 +- + drivers/mtd/devices/bcm47xxsflash.c | 2 +- + drivers/mtd/maps/amd76xrom.c | 2 +- + drivers/mtd/maps/ck804xrom.c | 2 +- + drivers/mtd/maps/esb2rom.c | 2 +- + drivers/mtd/maps/ichxrom.c | 2 +- + drivers/mtd/maps/intel_vr_nor.c | 4 ++-- + drivers/mtd/maps/l440gx.c | 2 +- + drivers/mtd/maps/netsc520.c | 4 ++-- + drivers/mtd/maps/nettel.c | 8 ++++---- + drivers/mtd/maps/pci.c | 4 ++-- + drivers/mtd/maps/sc520cdp.c | 8 ++++---- + drivers/mtd/maps/scb2_flash.c | 2 +- + drivers/mtd/maps/ts5500_flash.c | 4 ++-- + drivers/mtd/nand/raw/au1550nd.c | 2 +- + drivers/mtd/nand/raw/denali_pci.c | 6 +++--- + drivers/mtd/nand/raw/fsl_upm.c | 2 +- + drivers/net/can/at91_can.c | 2 +- + drivers/net/can/cc770/cc770_isa.c | 2 +- + drivers/net/can/sja1000/sja1000_isa.c | 2 +- + drivers/net/can/sja1000/sja1000_platform.c | 2 +- + drivers/net/can/softing/softing_main.c | 2 +- + drivers/net/ethernet/alacritech/slicoss.c | 2 +- + drivers/net/ethernet/altera/altera_tse_main.c | 4 ++-- + drivers/net/ethernet/amd/au1000_eth.c | 6 +++--- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 3 +-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- + drivers/net/ethernet/ethoc.c | 4 ++-- + drivers/net/ethernet/i825xx/sni_82596.c | 6 +++--- + drivers/net/ethernet/korina.c | 6 +++--- + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/natsemi/ns83820.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 8 ++++---- + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 6 +++--- + drivers/net/ethernet/sfc/ef10.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++-- + drivers/net/fddi/defxx.c | 2 +- + drivers/net/fddi/defza.c | 2 +- + drivers/net/fjes/fjes_hw.c | 2 +- + drivers/net/wan/wanxl.c | 4 ++-- + drivers/net/wireless/ath/ath10k/ahb.c | 4 ++-- + drivers/net/wireless/ath/ath5k/ahb.c | 2 +- + drivers/net/wireless/ath/ath9k/ahb.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++-- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/opp/ti-opp-supply.c | 2 +- + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/dino.c | 2 +- + drivers/parisc/eisa.c | 4 ++-- + drivers/parisc/iosapic.c | 2 +- + drivers/parisc/lba_pci.c | 8 ++++---- + drivers/parisc/sba_iommu.c | 4 ++-- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 2 +- + drivers/pci/msi.c | 2 +- + drivers/pci/pci.c | 2 +- + drivers/pci/quirks.c | 4 ++-- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 2 +- + drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/platform/x86/intel_scu_ipc.c | 2 +- + drivers/platform/x86/intel_telemetry_pltdrv.c | 4 ++-- + drivers/platform/x86/pmc_atom.c | 2 +- + drivers/platform/x86/samsung-laptop.c | 4 ++-- + drivers/regulator/ti-abb-regulator.c | 4 ++-- + drivers/rtc/rtc-sh.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- + drivers/scsi/be2iscsi/be_main.c | 6 +++--- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 4 ++-- + drivers/scsi/csiostor/csio_init.c | 2 +- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/lasi700.c | 2 +- + drivers/scsi/megaraid/megaraid_mbox.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/myrb.c | 2 +- + drivers/scsi/myrs.c | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/qla2xxx/qla_mr.c | 4 ++-- + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- + drivers/scsi/sni_53c710.c | 2 +- + drivers/scsi/sun3x_esp.c | 4 ++-- + drivers/scsi/zalon.c | 2 +- + drivers/scsi/zorro_esp.c | 6 +++--- + drivers/sh/clk/core.c | 2 +- + drivers/sh/intc/core.c | 2 +- + drivers/sh/intc/userimask.c | 2 +- + drivers/soc/tegra/flowctrl.c | 2 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 2 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 4 ++-- + drivers/soc/tegra/pmc.c | 4 ++-- + drivers/soc/xilinx/xlnx_vcu.c | 4 ++-- + drivers/spi/spi-dw-mid.c | 2 +- + drivers/spi/spi-jcore.c | 2 +- + drivers/spi/spi-npcm-fiu.c | 2 +- + drivers/ssb/driver_extif.c | 2 +- + drivers/ssb/driver_pcicore.c | 6 +++--- + drivers/staging/gasket/gasket_core.c | 2 +- + drivers/staging/kpc2000/kpc2000/core.c | 4 ++-- + drivers/staging/kpc2000/kpc2000_i2c.c | 2 +- + drivers/staging/kpc2000/kpc2000_spi.c | 2 +- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 2 +- + drivers/staging/media/allegro-dvt/allegro-core.c | 4 ++-- + drivers/staging/qlge/qlge_main.c | 4 ++-- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rts5208/rtsx.c | 2 +- + drivers/staging/sm750fb/sm750_hw.c | 2 +- + drivers/staging/uwb/whc-rc.c | 6 +++--- + drivers/tc/tc.c | 2 +- + drivers/tty/cyclades.c | 10 ++++----- + drivers/tty/mips_ejtag_fdc.c | 2 +- + drivers/tty/moxa.c | 4 ++-- + drivers/tty/serial/8250/8250_gsc.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 6 +++--- + drivers/tty/serial/8250/8250_port.c | 2 +- + drivers/tty/serial/dz.c | 2 +- + drivers/tty/serial/lantiq.c | 2 +- + drivers/tty/serial/meson_uart.c | 2 +- + drivers/tty/serial/mux.c | 2 +- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/pic32_uart.c | 2 +- + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/sb1250-duart.c | 4 ++-- + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/serial/zs.c | 2 +- + drivers/tty/synclink.c | 4 ++-- + drivers/tty/synclink_gt.c | 2 +- + drivers/tty/synclinkmp.c | 8 ++++---- + drivers/usb/core/hcd-pci.c | 2 +- + drivers/usb/early/xhci-dbc.c | 2 +- + drivers/usb/gadget/udc/amd5536udc_pci.c | 2 +- + drivers/usb/gadget/udc/goku_udc.c | 2 +- + drivers/usb/gadget/udc/net2272.c | 6 +++--- + drivers/usb/gadget/udc/net2280.c | 2 +- + drivers/usb/host/ehci-pmcmsp.c | 6 +++--- + drivers/usb/host/pci-quirks.c | 2 +- + drivers/usb/isp1760/isp1760-if.c | 4 ++-- + drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- + drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- + .../vfio/platform/reset/vfio_platform_amdxgbe.c | 4 ++-- + .../vfio/platform/reset/vfio_platform_bcmflexrm.c | 2 +- + .../platform/reset/vfio_platform_calxedaxgmac.c | 2 +- + drivers/vfio/platform/vfio_platform_common.c | 4 ++-- + drivers/video/fbdev/carminefb.c | 4 ++-- + drivers/video/fbdev/i810/i810_main.c | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/kyro/fbdev.c | 2 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- + drivers/video/fbdev/mbx/mbxfb.c | 4 ++-- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 2 +- + drivers/video/fbdev/pm2fb.c | 2 +- + drivers/video/fbdev/pm3fb.c | 4 ++-- + drivers/video/fbdev/pmag-aa-fb.c | 4 ++-- + drivers/video/fbdev/pmag-ba-fb.c | 4 ++-- + drivers/video/fbdev/pmagb-b-fb.c | 4 ++-- + drivers/video/fbdev/pvr2fb.c | 4 ++-- + drivers/video/fbdev/pxa168fb.c | 2 +- + drivers/video/fbdev/s1d13xxxfb.c | 4 ++-- + drivers/video/fbdev/sh7760fb.c | 2 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 +- + drivers/video/fbdev/sstfb.c | 4 ++-- + drivers/video/fbdev/stifb.c | 4 ++-- + drivers/video/fbdev/tdfxfb.c | 2 +- + drivers/video/fbdev/tgafb.c | 2 +- + drivers/video/fbdev/tridentfb.c | 4 ++-- + drivers/video/fbdev/valkyriefb.c | 2 +- + drivers/video/fbdev/vermilion/cr_pll.c | 2 +- + drivers/video/fbdev/vermilion/vermilion.c | 4 ++-- + drivers/video/fbdev/via/via-core.c | 2 +- + drivers/video/fbdev/w100fb.c | 6 +++--- + drivers/vme/boards/vme_vmivme7805.c | 2 +- + drivers/vme/bridges/vme_ca91cx42.c | 4 ++-- + drivers/vme/bridges/vme_tsi148.c | 4 ++-- + drivers/w1/masters/matrox_w1.c | 2 +- + drivers/watchdog/bcm63xx_wdt.c | 2 +- + drivers/watchdog/intel_scu_watchdog.c | 2 +- + drivers/watchdog/rc32434_wdt.c | 4 ++-- + include/asm-generic/io.h | 4 ---- + include/asm-generic/iomap.h | 4 ++-- + include/linux/io.h | 6 ++---- + lib/devres.c | 20 ------------------ + scripts/coccinelle/free/devm_free.cocci | 4 ---- + scripts/coccinelle/free/iounmap.cocci | 2 +- + sound/drivers/ml403-ac97cr.c | 2 +- + sound/isa/msnd/msnd_pinnacle.c | 2 +- + sound/parisc/harmony.c | 2 +- + sound/pci/aw2/aw2-alsa.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/echoaudio/echoaudio.c | 2 +- + sound/pci/nm256/nm256.c | 6 +++--- + sound/pci/rme32.c | 2 +- + sound/pci/rme96.c | 2 +- + sound/pci/rme9652/hdsp.c | 2 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/pci/rme9652/rme9652.c | 2 +- + sound/pci/sis7019.c | 2 +- + sound/pci/ymfpci/ymfpci_main.c | 2 +- + sound/soc/au1x/ac97c.c | 2 +- + sound/soc/au1x/i2sc.c | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 10 ++++----- + sound/soc/sh/fsi.c | 2 +- + sound/x86/intel_hdmi_audio.c | 2 +- + tools/testing/nvdimm/Kbuild | 3 +-- + tools/testing/nvdimm/test/iomap.c | 12 +++-------- + tools/testing/nvdimm/test/nfit_test.h | 2 -- + 368 files changed, 509 insertions(+), 603 deletions(-) +Merging kunit-next/kunit (c79f46a28239 Linux 5.5-rc5) +$ git merge kunit-next/kunit +Already up to date. +Merging akpm-current/current (3d23629963c7 ipc/msg.c: Adjust indentation in ksys_msgctl) +$ git merge --no-ff akpm-current/current +Auto-merging mm/vmalloc.c +Auto-merging mm/slub.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/compression.c +Auto-merging drivers/thermal/intel/intel_pch_thermal.c +Auto-merging drivers/thermal/armada_thermal.c +Auto-merging drivers/net/wireless/intel/iwlegacy/4965-mac.c +Auto-merging arch/x86/mm/fault.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 29 +++ + Documentation/admin-guide/kernel-parameters.txt | 12 + + Documentation/memory-barriers.txt | 16 +- + Documentation/process/deprecated.rst | 10 +- + arch/s390/boot/compressed/decompressor.c | 8 +- + arch/s390/boot/ipl_parm.c | 14 ++ + arch/s390/include/asm/setup.h | 7 + + arch/s390/kernel/setup.c | 1 + + arch/x86/mm/fault.c | 26 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/acpi/thermal.c | 34 +-- + drivers/block/zram/zram_drv.c | 10 +- + drivers/iio/adc/qcom-vadc-common.c | 6 +- + drivers/iio/adc/qcom-vadc-common.h | 1 - + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 3 +- + drivers/net/wireless/intel/iwlegacy/4965.c | 11 +- + drivers/net/wireless/intel/iwlegacy/common.h | 3 - + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 6 +- + drivers/nvme/host/hwmon.c | 13 +- + drivers/platform/x86/asus-wmi.c | 7 +- + drivers/platform/x86/intel_menlow.c | 9 +- + drivers/thermal/armada_thermal.c | 2 - + .../intel/int340x_thermal/int340x_thermal_zone.c | 7 +- + drivers/thermal/intel/intel_pch_thermal.c | 3 +- + fs/aio.c | 9 +- + fs/binfmt_elf.c | 144 +++++------ + fs/btrfs/compression.c | 2 +- + fs/btrfs/zlib.c | 118 ++++++--- + fs/buffer.c | 56 ++++- + fs/exec.c | 5 + + fs/ocfs2/cluster/quorum.c | 2 +- + fs/ocfs2/dlm/Makefile | 2 - + fs/ocfs2/dlm/dlmast.c | 8 +- + fs/ocfs2/dlm/dlmconvert.c | 8 +- + fs/ocfs2/dlm/dlmdebug.c | 8 +- + fs/ocfs2/dlm/dlmdomain.c | 8 +- + fs/ocfs2/dlm/dlmlock.c | 8 +- + fs/ocfs2/dlm/dlmmaster.c | 10 +- + fs/ocfs2/dlm/dlmrecovery.c | 10 +- + fs/ocfs2/dlm/dlmthread.c | 8 +- + fs/ocfs2/dlm/dlmunlock.c | 8 +- + fs/ocfs2/dlmfs/Makefile | 2 - + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/ocfs2/dlmfs/userdlm.c | 6 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/proc/page.c | 70 ++++-- + fs/ramfs/inode.c | 12 + + fs/reiserfs/stree.c | 3 +- + include/linux/fs.h | 6 +- + include/linux/hugetlb.h | 3 +- + include/linux/io-mapping.h | 5 +- + include/linux/memory.h | 2 - + include/linux/memremap.h | 6 + + include/linux/mm.h | 33 ++- + include/linux/mmzone.h | 5 +- + include/linux/sched.h | 9 + + include/linux/string.h | 45 ++++ + include/linux/thermal.h | 11 - + include/linux/units.h | 84 +++++++ + include/linux/vmalloc.h | 5 +- + include/linux/wait.h | 4 +- + include/linux/zlib.h | 6 + + include/trace/events/kmem.h | 4 +- + include/trace/events/vmscan.h | 71 +++++- + init/Kconfig | 1 - + init/main.c | 34 ++- + ipc/mqueue.c | 105 ++++++-- + ipc/msg.c | 62 +++-- + ipc/sem.c | 72 +++--- + kernel/hung_task.c | 44 ++++ + kernel/notifier.c | 2 +- + kernel/signal.c | 3 +- + kernel/watchdog.c | 4 +- + lib/Kconfig | 22 ++ + lib/Kconfig.debug | 6 + + lib/Makefile | 1 + + lib/decompress_inflate.c | 13 + + lib/scatterlist.c | 2 +- + lib/zlib_deflate/deflate.c | 85 ++++--- + lib/zlib_deflate/deflate_syms.c | 1 + + lib/zlib_deflate/deftree.c | 54 ---- + lib/zlib_deflate/defutil.h | 134 +++++++++- + lib/zlib_dfltcc/Makefile | 11 + + lib/zlib_dfltcc/dfltcc.c | 55 ++++ + lib/zlib_dfltcc/dfltcc.h | 147 +++++++++++ + lib/zlib_dfltcc/dfltcc_deflate.c | 280 +++++++++++++++++++++ + lib/zlib_dfltcc/dfltcc_inflate.c | 149 +++++++++++ + lib/zlib_dfltcc/dfltcc_syms.c | 17 ++ + lib/zlib_dfltcc/dfltcc_util.h | 124 +++++++++ + lib/zlib_inflate/inflate.c | 32 ++- + lib/zlib_inflate/inflate.h | 8 + + lib/zlib_inflate/infutil.h | 18 +- + mm/early_ioremap.c | 8 +- + mm/filemap.c | 34 +-- + mm/huge_memory.c | 38 +-- + mm/hugetlb_cgroup.c | 198 ++++++++++++++- + mm/kmemleak.c | 112 ++++----- + mm/memcontrol.c | 44 +--- + mm/memory_hotplug.c | 73 ++---- + mm/mempolicy.c | 10 +- + mm/memremap.c | 34 ++- + mm/mmap.c | 79 +++--- + mm/nommu.c | 10 +- + mm/oom_kill.c | 67 +++-- + mm/page-writeback.c | 10 +- + mm/page_alloc.c | 139 +++++----- + mm/shmem.c | 7 +- + mm/slab.c | 4 +- + mm/slub.c | 90 +++---- + mm/sparse.c | 9 +- + mm/vmalloc.c | 15 +- + mm/vmscan.c | 22 +- + scripts/checkpatch.pl | 24 ++ + scripts/spelling.txt | 13 + + 115 files changed, 2669 insertions(+), 914 deletions(-) + create mode 100644 include/linux/units.h + create mode 100644 lib/zlib_dfltcc/Makefile + create mode 100644 lib/zlib_dfltcc/dfltcc.c + create mode 100644 lib/zlib_dfltcc/dfltcc.h + create mode 100644 lib/zlib_dfltcc/dfltcc_deflate.c + create mode 100644 lib/zlib_dfltcc/dfltcc_inflate.c + create mode 100644 lib/zlib_dfltcc/dfltcc_syms.c + create mode 100644 lib/zlib_dfltcc/dfltcc_util.h +$ git am -3 ../patches/0001-mm-debug_pagealloc-need-to-export-_debug_pagealloc_e.patch +Applying: mm, debug_pagealloc: need to export _debug_pagealloc_enabled_early +$ git reset HEAD^ +Unstaged changes after reset: +M mm/page_alloc.c +$ git add -A . +$ git commit -v -a --amend +[master 27e80eab9d66] Merge branch 'akpm-current/current' + Date: Tue Jan 7 16:01:28 2020 +1100 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/block/null_blk_main.c: fix layout +Applying: drivers/block/null_blk_main.c: fix uninitialized var warnings +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: mm: remove __krealloc +Applying: mm: add generic p?d_leaf() macros +Applying: arc: mm: add p?d_leaf() definitions +Applying: arm: mm: add p?d_leaf() definitions +Applying: arm64: mm: add p?d_leaf() definitions +Applying: mips: mm: add p?d_leaf() definitions +Applying: powerpc: mm: add p?d_leaf() definitions +Applying: riscv: mm: add p?d_leaf() definitions +Applying: s390: mm: add p?d_leaf() definitions +Applying: sparc: mm: add p?d_leaf() definitions +Applying: x86: mm: add p?d_leaf() definitions +Applying: mm: pagewalk: add p4d_entry() and pgd_entry() +Applying: mm: pagewalk: allow walking without vma +Applying: mm: pagewalk: don't lock PTEs for walk_page_range_novma() +Applying: mm: pagewalk: fix termination condition in walk_pte_range() +Applying: mm: pagewalk: add 'depth' parameter to pte_hole +Applying: x86: mm: point to struct seq_file from struct pg_state +Applying: x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct +Applying: x86: mm: convert ptdump_walk_pgd_level_debugfs() to take an mm_struct +Applying: mm: add generic ptdump +Applying: x86: mm: convert dump_pagetables to use walk_page_range +Applying: arm64: mm: convert mm/dump.c to use walk_page_range() +Applying: arm64: mm: display non-present entries in ptdump +Applying: mm: ptdump: reduce level numbers by 1 in note_page() +Applying: proc: decouple proc from VFS with "struct proc_ops" +Applying: proc: convert everything to "struct proc_ops" +Applying: proc-convert-everything-to-struct-proc_ops-fix +Applying: lib/string: add strnchrnul() +Applying: bitops: more BITS_TO_* macros +Applying: bitops-more-bits_to_-macros-fix +Applying: bitops-more-bits_to_-macros-fix-fix +Applying: lib: add test for bitmap_parse() +Applying: fix rebase issue +Applying: lib: make bitmap_parse_user a wrapper on bitmap_parse +Applying: lib: rework bitmap_parse() +Using index info to reconstruct a base tree... +M include/linux/bitmap.h +Falling back to patching base and 3-way merge... +Auto-merging include/linux/bitmap.h +CONFLICT (content): Merge conflict in include/linux/bitmap.h +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch' to see the failed patch +Patch failed at 0038 lib: rework bitmap_parse() +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Applying: lib: new testcases for bitmap_parse{_user} +Applying: include/linux/cpumask.h: don't calculate length of the input string +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 + + 33f79c898690...1929d737563a akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (1929d737563a drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/alpha/kernel/srm_env.c | 17 +- + arch/arc/include/asm/pgtable.h | 1 + + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/kernel/atags_proc.c | 8 +- + arch/arm/mm/alignment.c | 14 +- + arch/arm64/Kconfig | 1 + + arch/arm64/Kconfig.debug | 19 +- + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/include/asm/ptdump.h | 8 +- + arch/arm64/mm/Makefile | 4 +- + arch/arm64/mm/dump.c | 148 ++++------ + arch/arm64/mm/mmu.c | 4 +- + arch/arm64/mm/ptdump_debugfs.c | 2 +- + arch/ia64/kernel/salinfo.c | 24 +- + arch/m68k/kernel/bootinfo_proc.c | 8 +- + arch/mips/include/asm/pgtable.h | 5 + + arch/mips/lasat/picvue_proc.c | 31 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 3 + + arch/powerpc/kernel/proc_powerpc.c | 10 +- + arch/powerpc/kernel/rtas-proc.c | 70 ++--- + arch/powerpc/kernel/rtas_flash.c | 34 +-- + arch/powerpc/kernel/rtasd.c | 14 +- + arch/powerpc/mm/numa.c | 12 +- + arch/powerpc/platforms/pseries/lpar.c | 24 +- + arch/powerpc/platforms/pseries/lparcfg.c | 14 +- + arch/powerpc/platforms/pseries/reconfig.c | 8 +- + arch/powerpc/platforms/pseries/scanlog.c | 15 +- + arch/riscv/include/asm/pgtable-64.h | 7 + + arch/riscv/include/asm/pgtable.h | 7 + + arch/s390/include/asm/pgtable.h | 2 + + arch/sh/mm/alignment.c | 17 +- + arch/sparc/include/asm/pgtable_64.h | 2 + + arch/sparc/kernel/led.c | 15 +- + arch/um/drivers/mconsole_kern.c | 9 +- + arch/um/kernel/exitcode.c | 15 +- + arch/um/kernel/process.c | 15 +- + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 20 +- + arch/x86/include/asm/pgtable.h | 10 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 26 +- + arch/x86/kernel/cpu/mtrr/if.c | 21 +- + arch/x86/mm/Makefile | 4 +- + arch/x86/mm/debug_pagetables.c | 8 +- + arch/x86/mm/dump_pagetables.c | 320 +++++---------------- + arch/x86/platform/efi/efi_32.c | 2 +- + arch/x86/platform/efi/efi_64.c | 4 +- + arch/x86/platform/uv/tlb_uv.c | 14 +- + arch/xtensa/platforms/iss/simdisk.c | 10 +- + drivers/acpi/battery.c | 15 +- + drivers/acpi/proc.c | 15 +- + drivers/block/null_blk_main.c | 56 ++-- + drivers/firmware/efi/arm-runtime.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 15 +- + drivers/ide/ide-proc.c | 19 +- + drivers/input/input.c | 28 +- + drivers/isdn/capi/kcapi_proc.c | 6 +- + drivers/macintosh/via-pmu.c | 17 +- + drivers/md/md.c | 15 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/misc/sgi-gru/gruprocfs.c | 42 +-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 3 +- + drivers/net/wireless/cisco/airo.c | 98 +++---- + drivers/net/wireless/intel/ipw2x00/libipw_module.c | 15 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 4 +- + drivers/net/wireless/intersil/hostap/hostap_proc.c | 14 +- + drivers/net/wireless/intersil/hostap/hostap_wlan.h | 2 +- + drivers/net/wireless/ray_cs.c | 20 +- + drivers/parisc/led.c | 17 +- + drivers/pci/proc.c | 25 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/platform/x86/thinkpad_acpi.c | 15 +- + drivers/platform/x86/toshiba_acpi.c | 60 ++-- + drivers/pnp/isapnp/proc.c | 9 +- + drivers/pnp/pnpbios/proc.c | 17 +- + drivers/s390/block/dasd_proc.c | 15 +- + drivers/s390/cio/blacklist.c | 14 +- + drivers/s390/cio/css.c | 11 +- + drivers/scsi/esas2r/esas2r_main.c | 9 +- + drivers/scsi/scsi_devinfo.c | 15 +- + drivers/scsi/scsi_proc.c | 29 +- + drivers/scsi/sg.c | 30 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 14 +- + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/sysrq.c | 8 +- + drivers/usb/gadget/function/rndis.c | 17 +- + drivers/video/fbdev/via/viafbdev.c | 105 ++++--- + drivers/zorro/proc.c | 9 +- + fs/cifs/cifs_debug.c | 108 +++---- + fs/cifs/dfs_cache.c | 13 +- + fs/cifs/dfs_cache.h | 2 +- + fs/fscache/internal.h | 2 +- + fs/fscache/object-list.c | 11 +- + fs/fscache/proc.c | 2 +- + fs/jbd2/journal.c | 13 +- + fs/jfs/jfs_debug.c | 14 +- + fs/lockd/procfs.c | 12 +- + fs/nfsd/nfsctl.c | 13 +- + fs/nfsd/stats.c | 12 +- + fs/ocfs2/dlm/dlmcommon.h | 4 +- + fs/proc/cpuinfo.c | 12 +- + fs/proc/generic.c | 38 ++- + fs/proc/inode.c | 76 ++--- + fs/proc/internal.h | 5 +- + fs/proc/kcore.c | 13 +- + fs/proc/kmsg.c | 14 +- + fs/proc/page.c | 24 +- + fs/proc/proc_net.c | 32 +-- + fs/proc/proc_sysctl.c | 2 +- + fs/proc/root.c | 2 +- + fs/proc/stat.c | 12 +- + fs/proc/task_mmu.c | 4 +- + fs/proc/vmcore.c | 10 +- + include/asm-generic/pgtable.h | 20 ++ + include/linux/bitmap.h | 8 +- + include/linux/bitops.h | 5 +- + include/linux/cpumask.h | 4 +- + include/linux/pagewalk.h | 46 ++- + include/linux/proc_fs.h | 23 +- + include/linux/ptdump.h | 22 ++ + include/linux/seq_file.h | 13 + + include/linux/slab.h | 1 - + include/linux/string.h | 1 + + include/linux/sunrpc/stats.h | 4 +- + ipc/util.c | 14 +- + kernel/configs.c | 9 +- + kernel/irq/proc.c | 42 +-- + kernel/kallsyms.c | 12 +- + kernel/latencytop.c | 14 +- + kernel/locking/lockdep_proc.c | 15 +- + kernel/module.c | 12 +- + kernel/profile.c | 24 +- + kernel/sched/psi.c | 48 ++-- + lib/bitmap.c | 193 ++++++------- + lib/string.c | 17 ++ + lib/test_bitmap.c | 104 ++++++- + mm/Kconfig.debug | 21 ++ + mm/Makefile | 1 + + mm/hmm.c | 59 ++-- + mm/migrate.c | 5 +- + mm/mincore.c | 1 + + mm/pagewalk.c | 156 +++++++--- + mm/ptdump.c | 139 +++++++++ + mm/slab_common.c | 37 +-- + mm/swapfile.c | 14 +- + net/atm/mpoa_proc.c | 17 +- + net/atm/proc.c | 8 +- + net/core/pktgen.c | 44 +-- + net/ipv4/ipconfig.c | 10 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 +- + net/ipv4/route.c | 24 +- + net/netfilter/xt_recent.c | 17 +- + net/sunrpc/auth_gss/svcauth_gss.c | 10 +- + net/sunrpc/cache.c | 45 ++- + net/sunrpc/stats.c | 21 +- + samples/kfifo/bytestream-example.c | 11 +- + samples/kfifo/inttype-example.c | 11 +- + samples/kfifo/record-example.c | 11 +- + scripts/coccinelle/free/devm_free.cocci | 4 - + sound/core/info.c | 36 ++- + tools/include/linux/bitops.h | 9 +- + 161 files changed, 1926 insertions(+), 1745 deletions(-) + create mode 100644 include/linux/ptdump.h + create mode 100644 mm/ptdump.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..125d385f20a1 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 5.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..15c12be35283 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200107 |